From ef1f9ead0ba44c67185dccc616846646d7ce9257 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 23 Jan 2020 14:46:03 -0500 Subject: Document Trainer Tower scripts --- data/event_scripts.s | 27 +- .../layouts/SevenIsland_TrainerTower_1F/border.bin | Bin 8 -> 0 bytes data/layouts/SevenIsland_TrainerTower_1F/map.bin | Bin 612 -> 0 bytes .../layouts/SevenIsland_TrainerTower_2F/border.bin | Bin 8 -> 0 bytes data/layouts/SevenIsland_TrainerTower_2F/map.bin | Bin 612 -> 0 bytes .../layouts/SevenIsland_TrainerTower_3F/border.bin | Bin 8 -> 0 bytes data/layouts/SevenIsland_TrainerTower_3F/map.bin | Bin 612 -> 0 bytes .../layouts/SevenIsland_TrainerTower_4F/border.bin | Bin 8 -> 0 bytes data/layouts/SevenIsland_TrainerTower_4F/map.bin | Bin 612 -> 0 bytes .../layouts/SevenIsland_TrainerTower_5F/border.bin | Bin 8 -> 0 bytes data/layouts/SevenIsland_TrainerTower_5F/map.bin | Bin 612 -> 0 bytes .../layouts/SevenIsland_TrainerTower_6F/border.bin | Bin 8 -> 0 bytes data/layouts/SevenIsland_TrainerTower_6F/map.bin | Bin 612 -> 0 bytes .../layouts/SevenIsland_TrainerTower_7F/border.bin | Bin 8 -> 0 bytes data/layouts/SevenIsland_TrainerTower_7F/map.bin | Bin 612 -> 0 bytes .../layouts/SevenIsland_TrainerTower_8F/border.bin | Bin 8 -> 0 bytes data/layouts/SevenIsland_TrainerTower_8F/map.bin | Bin 612 -> 0 bytes .../SevenIsland_TrainerTower_Elevator/border.bin | Bin 8 -> 0 bytes .../SevenIsland_TrainerTower_Elevator/map.bin | 1 - .../SevenIsland_TrainerTower_Lobby/border.bin | Bin 8 -> 0 bytes .../layouts/SevenIsland_TrainerTower_Lobby/map.bin | 1 - .../SevenIsland_TrainerTower_Roof/border.bin | 1 - data/layouts/SevenIsland_TrainerTower_Roof/map.bin | 1 - data/layouts/TrainerTower_1F/border.bin | Bin 0 -> 8 bytes data/layouts/TrainerTower_1F/map.bin | Bin 0 -> 612 bytes data/layouts/TrainerTower_1F_Doubles/border.bin | Bin 0 -> 8 bytes data/layouts/TrainerTower_1F_Doubles/map.bin | Bin 0 -> 612 bytes data/layouts/TrainerTower_1F_Knockout/border.bin | Bin 0 -> 8 bytes data/layouts/TrainerTower_1F_Knockout/map.bin | Bin 0 -> 612 bytes data/layouts/TrainerTower_2F/border.bin | Bin 0 -> 8 bytes data/layouts/TrainerTower_2F/map.bin | Bin 0 -> 612 bytes data/layouts/TrainerTower_2F_Doubles/border.bin | Bin 0 -> 8 bytes data/layouts/TrainerTower_2F_Doubles/map.bin | Bin 0 -> 612 bytes data/layouts/TrainerTower_2F_Knockout/border.bin | Bin 0 -> 8 bytes data/layouts/TrainerTower_2F_Knockout/map.bin | Bin 0 -> 612 bytes data/layouts/TrainerTower_3F/border.bin | Bin 0 -> 8 bytes data/layouts/TrainerTower_3F/map.bin | Bin 0 -> 612 bytes data/layouts/TrainerTower_3F_Doubles/border.bin | Bin 0 -> 8 bytes data/layouts/TrainerTower_3F_Doubles/map.bin | Bin 0 -> 612 bytes data/layouts/TrainerTower_3F_Knockout/border.bin | Bin 0 -> 8 bytes data/layouts/TrainerTower_3F_Knockout/map.bin | Bin 0 -> 612 bytes data/layouts/TrainerTower_4F/border.bin | Bin 0 -> 8 bytes data/layouts/TrainerTower_4F/map.bin | Bin 0 -> 612 bytes data/layouts/TrainerTower_4F_Doubles/border.bin | Bin 0 -> 8 bytes data/layouts/TrainerTower_4F_Doubles/map.bin | Bin 0 -> 612 bytes data/layouts/TrainerTower_4F_Knockout/border.bin | Bin 0 -> 8 bytes data/layouts/TrainerTower_4F_Knockout/map.bin | Bin 0 -> 612 bytes data/layouts/TrainerTower_5F/border.bin | Bin 0 -> 8 bytes data/layouts/TrainerTower_5F/map.bin | Bin 0 -> 612 bytes data/layouts/TrainerTower_5F_Doubles/border.bin | Bin 0 -> 8 bytes data/layouts/TrainerTower_5F_Doubles/map.bin | Bin 0 -> 612 bytes data/layouts/TrainerTower_5F_Knockout/border.bin | Bin 0 -> 8 bytes data/layouts/TrainerTower_5F_Knockout/map.bin | Bin 0 -> 612 bytes data/layouts/TrainerTower_6F/border.bin | Bin 0 -> 8 bytes data/layouts/TrainerTower_6F/map.bin | Bin 0 -> 612 bytes data/layouts/TrainerTower_6F_Doubles/border.bin | Bin 0 -> 8 bytes data/layouts/TrainerTower_6F_Doubles/map.bin | Bin 0 -> 612 bytes data/layouts/TrainerTower_6F_Knockout/border.bin | Bin 0 -> 8 bytes data/layouts/TrainerTower_6F_Knockout/map.bin | Bin 0 -> 612 bytes data/layouts/TrainerTower_7F/border.bin | Bin 0 -> 8 bytes data/layouts/TrainerTower_7F/map.bin | Bin 0 -> 612 bytes data/layouts/TrainerTower_7F_Doubles/border.bin | Bin 0 -> 8 bytes data/layouts/TrainerTower_7F_Doubles/map.bin | Bin 0 -> 612 bytes data/layouts/TrainerTower_7F_Knockout/border.bin | Bin 0 -> 8 bytes data/layouts/TrainerTower_7F_Knockout/map.bin | Bin 0 -> 612 bytes data/layouts/TrainerTower_8F/border.bin | Bin 0 -> 8 bytes data/layouts/TrainerTower_8F/map.bin | Bin 0 -> 612 bytes data/layouts/TrainerTower_8F_Doubles/border.bin | Bin 0 -> 8 bytes data/layouts/TrainerTower_8F_Doubles/map.bin | Bin 0 -> 612 bytes data/layouts/TrainerTower_8F_Knockout/border.bin | Bin 0 -> 8 bytes data/layouts/TrainerTower_8F_Knockout/map.bin | Bin 0 -> 612 bytes data/layouts/TrainerTower_Elevator/border.bin | Bin 0 -> 8 bytes data/layouts/TrainerTower_Elevator/map.bin | 1 + data/layouts/TrainerTower_Lobby/border.bin | Bin 0 -> 8 bytes data/layouts/TrainerTower_Lobby/map.bin | 1 + data/layouts/TrainerTower_Roof/border.bin | 1 + data/layouts/TrainerTower_Roof/map.bin | 1 + data/layouts/UnusedLayout_834BC2C/border.bin | Bin 8 -> 0 bytes data/layouts/UnusedLayout_834BC2C/map.bin | Bin 612 -> 0 bytes data/layouts/UnusedLayout_834BEB4/border.bin | Bin 8 -> 0 bytes data/layouts/UnusedLayout_834BEB4/map.bin | Bin 612 -> 0 bytes data/layouts/UnusedLayout_834C13C/border.bin | Bin 8 -> 0 bytes data/layouts/UnusedLayout_834C13C/map.bin | Bin 612 -> 0 bytes data/layouts/UnusedLayout_834C3C4/border.bin | Bin 8 -> 0 bytes data/layouts/UnusedLayout_834C3C4/map.bin | Bin 612 -> 0 bytes data/layouts/UnusedLayout_834C64C/border.bin | Bin 8 -> 0 bytes data/layouts/UnusedLayout_834C64C/map.bin | Bin 612 -> 0 bytes data/layouts/UnusedLayout_834C8D4/border.bin | Bin 8 -> 0 bytes data/layouts/UnusedLayout_834C8D4/map.bin | Bin 612 -> 0 bytes data/layouts/UnusedLayout_834CB5C/border.bin | Bin 8 -> 0 bytes data/layouts/UnusedLayout_834CB5C/map.bin | Bin 612 -> 0 bytes data/layouts/UnusedLayout_834CDE4/border.bin | Bin 8 -> 0 bytes data/layouts/UnusedLayout_834CDE4/map.bin | Bin 612 -> 0 bytes data/layouts/UnusedLayout_834D06C/border.bin | Bin 8 -> 0 bytes data/layouts/UnusedLayout_834D06C/map.bin | Bin 612 -> 0 bytes data/layouts/UnusedLayout_834D2F4/border.bin | Bin 8 -> 0 bytes data/layouts/UnusedLayout_834D2F4/map.bin | Bin 612 -> 0 bytes data/layouts/UnusedLayout_834D57C/border.bin | Bin 8 -> 0 bytes data/layouts/UnusedLayout_834D57C/map.bin | Bin 612 -> 0 bytes data/layouts/UnusedLayout_834D804/border.bin | Bin 8 -> 0 bytes data/layouts/UnusedLayout_834D804/map.bin | Bin 612 -> 0 bytes data/layouts/UnusedLayout_834DA8C/border.bin | Bin 8 -> 0 bytes data/layouts/UnusedLayout_834DA8C/map.bin | Bin 612 -> 0 bytes data/layouts/UnusedLayout_834DD14/border.bin | Bin 8 -> 0 bytes data/layouts/UnusedLayout_834DD14/map.bin | Bin 612 -> 0 bytes data/layouts/UnusedLayout_834DF9C/border.bin | Bin 8 -> 0 bytes data/layouts/UnusedLayout_834DF9C/map.bin | Bin 612 -> 0 bytes data/layouts/UnusedLayout_834E224/border.bin | Bin 8 -> 0 bytes data/layouts/UnusedLayout_834E224/map.bin | Bin 612 -> 0 bytes data/layouts/layouts.json | 216 ++++---- .../scripts.inc | 2 +- data/maps/RocketHideout_Elevator/scripts.inc | 2 +- data/maps/SevenIsland_TrainerTower/map.json | 2 +- data/maps/SevenIsland_TrainerTower_1F/map.json | 128 ----- data/maps/SevenIsland_TrainerTower_1F/scripts.inc | 60 --- data/maps/SevenIsland_TrainerTower_2F/map.json | 135 ----- data/maps/SevenIsland_TrainerTower_2F/scripts.inc | 25 - data/maps/SevenIsland_TrainerTower_3F/map.json | 135 ----- data/maps/SevenIsland_TrainerTower_3F/scripts.inc | 25 - data/maps/SevenIsland_TrainerTower_4F/map.json | 135 ----- data/maps/SevenIsland_TrainerTower_4F/scripts.inc | 25 - data/maps/SevenIsland_TrainerTower_5F/map.json | 135 ----- data/maps/SevenIsland_TrainerTower_5F/scripts.inc | 25 - data/maps/SevenIsland_TrainerTower_6F/map.json | 135 ----- data/maps/SevenIsland_TrainerTower_6F/scripts.inc | 25 - data/maps/SevenIsland_TrainerTower_7F/map.json | 135 ----- data/maps/SevenIsland_TrainerTower_7F/scripts.inc | 25 - data/maps/SevenIsland_TrainerTower_8F/map.json | 135 ----- data/maps/SevenIsland_TrainerTower_8F/scripts.inc | 25 - .../SevenIsland_TrainerTower_Elevator/map.json | 35 -- .../SevenIsland_TrainerTower_Elevator/scripts.inc | 80 --- data/maps/SevenIsland_TrainerTower_Lobby/map.json | 125 ----- .../SevenIsland_TrainerTower_Lobby/scripts.inc | 235 -------- data/maps/SevenIsland_TrainerTower_Lobby/text.inc | 118 ----- data/maps/SevenIsland_TrainerTower_Roof/map.json | 48 -- .../maps/SevenIsland_TrainerTower_Roof/scripts.inc | 8 - data/maps/SilphCo_Elevator/scripts.inc | 2 +- data/maps/TrainerTower_1F/map.json | 128 +++++ data/maps/TrainerTower_1F/scripts.inc | 27 + data/maps/TrainerTower_2F/map.json | 135 +++++ data/maps/TrainerTower_2F/scripts.inc | 27 + data/maps/TrainerTower_3F/map.json | 135 +++++ data/maps/TrainerTower_3F/scripts.inc | 27 + data/maps/TrainerTower_4F/map.json | 135 +++++ data/maps/TrainerTower_4F/scripts.inc | 27 + data/maps/TrainerTower_5F/map.json | 135 +++++ data/maps/TrainerTower_5F/scripts.inc | 27 + data/maps/TrainerTower_6F/map.json | 135 +++++ data/maps/TrainerTower_6F/scripts.inc | 27 + data/maps/TrainerTower_7F/map.json | 135 +++++ data/maps/TrainerTower_7F/scripts.inc | 27 + data/maps/TrainerTower_8F/map.json | 135 +++++ data/maps/TrainerTower_8F/scripts.inc | 27 + data/maps/TrainerTower_Elevator/map.json | 35 ++ data/maps/TrainerTower_Elevator/scripts.inc | 80 +++ data/maps/TrainerTower_Lobby/map.json | 125 +++++ data/maps/TrainerTower_Lobby/scripts.inc | 226 ++++++++ data/maps/TrainerTower_Lobby/text.inc | 120 +++++ data/maps/TrainerTower_Roof/map.json | 48 ++ data/maps/TrainerTower_Roof/scripts.inc | 10 + data/maps/map_groups.json | 22 +- data/scripts/trainer_tower.inc | 588 ++++++++++----------- data/specials.inc | 4 +- 163 files changed, 2347 insertions(+), 2416 deletions(-) delete mode 100644 data/layouts/SevenIsland_TrainerTower_1F/border.bin delete mode 100644 data/layouts/SevenIsland_TrainerTower_1F/map.bin delete mode 100644 data/layouts/SevenIsland_TrainerTower_2F/border.bin delete mode 100644 data/layouts/SevenIsland_TrainerTower_2F/map.bin delete mode 100644 data/layouts/SevenIsland_TrainerTower_3F/border.bin delete mode 100644 data/layouts/SevenIsland_TrainerTower_3F/map.bin delete mode 100644 data/layouts/SevenIsland_TrainerTower_4F/border.bin delete mode 100644 data/layouts/SevenIsland_TrainerTower_4F/map.bin delete mode 100644 data/layouts/SevenIsland_TrainerTower_5F/border.bin delete mode 100644 data/layouts/SevenIsland_TrainerTower_5F/map.bin delete mode 100644 data/layouts/SevenIsland_TrainerTower_6F/border.bin delete mode 100644 data/layouts/SevenIsland_TrainerTower_6F/map.bin delete mode 100644 data/layouts/SevenIsland_TrainerTower_7F/border.bin delete mode 100644 data/layouts/SevenIsland_TrainerTower_7F/map.bin delete mode 100644 data/layouts/SevenIsland_TrainerTower_8F/border.bin delete mode 100644 data/layouts/SevenIsland_TrainerTower_8F/map.bin delete mode 100644 data/layouts/SevenIsland_TrainerTower_Elevator/border.bin delete mode 100644 data/layouts/SevenIsland_TrainerTower_Elevator/map.bin delete mode 100644 data/layouts/SevenIsland_TrainerTower_Lobby/border.bin delete mode 100644 data/layouts/SevenIsland_TrainerTower_Lobby/map.bin delete mode 100644 data/layouts/SevenIsland_TrainerTower_Roof/border.bin delete mode 100644 data/layouts/SevenIsland_TrainerTower_Roof/map.bin create mode 100644 data/layouts/TrainerTower_1F/border.bin create mode 100644 data/layouts/TrainerTower_1F/map.bin create mode 100644 data/layouts/TrainerTower_1F_Doubles/border.bin create mode 100644 data/layouts/TrainerTower_1F_Doubles/map.bin create mode 100644 data/layouts/TrainerTower_1F_Knockout/border.bin create mode 100644 data/layouts/TrainerTower_1F_Knockout/map.bin create mode 100644 data/layouts/TrainerTower_2F/border.bin create mode 100644 data/layouts/TrainerTower_2F/map.bin create mode 100644 data/layouts/TrainerTower_2F_Doubles/border.bin create mode 100644 data/layouts/TrainerTower_2F_Doubles/map.bin create mode 100644 data/layouts/TrainerTower_2F_Knockout/border.bin create mode 100644 data/layouts/TrainerTower_2F_Knockout/map.bin create mode 100644 data/layouts/TrainerTower_3F/border.bin create mode 100644 data/layouts/TrainerTower_3F/map.bin create mode 100644 data/layouts/TrainerTower_3F_Doubles/border.bin create mode 100644 data/layouts/TrainerTower_3F_Doubles/map.bin create mode 100644 data/layouts/TrainerTower_3F_Knockout/border.bin create mode 100644 data/layouts/TrainerTower_3F_Knockout/map.bin create mode 100644 data/layouts/TrainerTower_4F/border.bin create mode 100644 data/layouts/TrainerTower_4F/map.bin create mode 100644 data/layouts/TrainerTower_4F_Doubles/border.bin create mode 100644 data/layouts/TrainerTower_4F_Doubles/map.bin create mode 100644 data/layouts/TrainerTower_4F_Knockout/border.bin create mode 100644 data/layouts/TrainerTower_4F_Knockout/map.bin create mode 100644 data/layouts/TrainerTower_5F/border.bin create mode 100644 data/layouts/TrainerTower_5F/map.bin create mode 100644 data/layouts/TrainerTower_5F_Doubles/border.bin create mode 100644 data/layouts/TrainerTower_5F_Doubles/map.bin create mode 100644 data/layouts/TrainerTower_5F_Knockout/border.bin create mode 100644 data/layouts/TrainerTower_5F_Knockout/map.bin create mode 100644 data/layouts/TrainerTower_6F/border.bin create mode 100644 data/layouts/TrainerTower_6F/map.bin create mode 100644 data/layouts/TrainerTower_6F_Doubles/border.bin create mode 100644 data/layouts/TrainerTower_6F_Doubles/map.bin create mode 100644 data/layouts/TrainerTower_6F_Knockout/border.bin create mode 100644 data/layouts/TrainerTower_6F_Knockout/map.bin create mode 100644 data/layouts/TrainerTower_7F/border.bin create mode 100644 data/layouts/TrainerTower_7F/map.bin create mode 100644 data/layouts/TrainerTower_7F_Doubles/border.bin create mode 100644 data/layouts/TrainerTower_7F_Doubles/map.bin create mode 100644 data/layouts/TrainerTower_7F_Knockout/border.bin create mode 100644 data/layouts/TrainerTower_7F_Knockout/map.bin create mode 100644 data/layouts/TrainerTower_8F/border.bin create mode 100644 data/layouts/TrainerTower_8F/map.bin create mode 100644 data/layouts/TrainerTower_8F_Doubles/border.bin create mode 100644 data/layouts/TrainerTower_8F_Doubles/map.bin create mode 100644 data/layouts/TrainerTower_8F_Knockout/border.bin create mode 100644 data/layouts/TrainerTower_8F_Knockout/map.bin create mode 100644 data/layouts/TrainerTower_Elevator/border.bin create mode 100644 data/layouts/TrainerTower_Elevator/map.bin create mode 100644 data/layouts/TrainerTower_Lobby/border.bin create mode 100644 data/layouts/TrainerTower_Lobby/map.bin create mode 100644 data/layouts/TrainerTower_Roof/border.bin create mode 100644 data/layouts/TrainerTower_Roof/map.bin delete mode 100644 data/layouts/UnusedLayout_834BC2C/border.bin delete mode 100644 data/layouts/UnusedLayout_834BC2C/map.bin delete mode 100644 data/layouts/UnusedLayout_834BEB4/border.bin delete mode 100644 data/layouts/UnusedLayout_834BEB4/map.bin delete mode 100644 data/layouts/UnusedLayout_834C13C/border.bin delete mode 100644 data/layouts/UnusedLayout_834C13C/map.bin delete mode 100644 data/layouts/UnusedLayout_834C3C4/border.bin delete mode 100644 data/layouts/UnusedLayout_834C3C4/map.bin delete mode 100644 data/layouts/UnusedLayout_834C64C/border.bin delete mode 100644 data/layouts/UnusedLayout_834C64C/map.bin delete mode 100644 data/layouts/UnusedLayout_834C8D4/border.bin delete mode 100644 data/layouts/UnusedLayout_834C8D4/map.bin delete mode 100644 data/layouts/UnusedLayout_834CB5C/border.bin delete mode 100644 data/layouts/UnusedLayout_834CB5C/map.bin delete mode 100644 data/layouts/UnusedLayout_834CDE4/border.bin delete mode 100644 data/layouts/UnusedLayout_834CDE4/map.bin delete mode 100644 data/layouts/UnusedLayout_834D06C/border.bin delete mode 100644 data/layouts/UnusedLayout_834D06C/map.bin delete mode 100644 data/layouts/UnusedLayout_834D2F4/border.bin delete mode 100644 data/layouts/UnusedLayout_834D2F4/map.bin delete mode 100644 data/layouts/UnusedLayout_834D57C/border.bin delete mode 100644 data/layouts/UnusedLayout_834D57C/map.bin delete mode 100644 data/layouts/UnusedLayout_834D804/border.bin delete mode 100644 data/layouts/UnusedLayout_834D804/map.bin delete mode 100644 data/layouts/UnusedLayout_834DA8C/border.bin delete mode 100644 data/layouts/UnusedLayout_834DA8C/map.bin delete mode 100644 data/layouts/UnusedLayout_834DD14/border.bin delete mode 100644 data/layouts/UnusedLayout_834DD14/map.bin delete mode 100644 data/layouts/UnusedLayout_834DF9C/border.bin delete mode 100644 data/layouts/UnusedLayout_834DF9C/map.bin delete mode 100644 data/layouts/UnusedLayout_834E224/border.bin delete mode 100644 data/layouts/UnusedLayout_834E224/map.bin delete mode 100644 data/maps/SevenIsland_TrainerTower_1F/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_1F/scripts.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_2F/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_2F/scripts.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_3F/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_3F/scripts.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_4F/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_4F/scripts.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_5F/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_5F/scripts.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_6F/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_6F/scripts.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_7F/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_7F/scripts.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_8F/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_8F/scripts.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_Elevator/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_Lobby/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_Lobby/text.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_Roof/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_Roof/scripts.inc create mode 100644 data/maps/TrainerTower_1F/map.json create mode 100644 data/maps/TrainerTower_1F/scripts.inc create mode 100644 data/maps/TrainerTower_2F/map.json create mode 100644 data/maps/TrainerTower_2F/scripts.inc create mode 100644 data/maps/TrainerTower_3F/map.json create mode 100644 data/maps/TrainerTower_3F/scripts.inc create mode 100644 data/maps/TrainerTower_4F/map.json create mode 100644 data/maps/TrainerTower_4F/scripts.inc create mode 100644 data/maps/TrainerTower_5F/map.json create mode 100644 data/maps/TrainerTower_5F/scripts.inc create mode 100644 data/maps/TrainerTower_6F/map.json create mode 100644 data/maps/TrainerTower_6F/scripts.inc create mode 100644 data/maps/TrainerTower_7F/map.json create mode 100644 data/maps/TrainerTower_7F/scripts.inc create mode 100644 data/maps/TrainerTower_8F/map.json create mode 100644 data/maps/TrainerTower_8F/scripts.inc create mode 100644 data/maps/TrainerTower_Elevator/map.json create mode 100644 data/maps/TrainerTower_Elevator/scripts.inc create mode 100644 data/maps/TrainerTower_Lobby/map.json create mode 100644 data/maps/TrainerTower_Lobby/scripts.inc create mode 100644 data/maps/TrainerTower_Lobby/text.inc create mode 100644 data/maps/TrainerTower_Roof/map.json create mode 100644 data/maps/TrainerTower_Roof/scripts.inc (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 4cb25db68..1830919ea 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -17,6 +17,7 @@ #include "constants/spawn_points.h" #include "constants/field_effects.h" #include "constants/trainers.h" +#include "constants/trainer_tower.h" #include "constants/object_events.h" #include "constants/fame_checker.h" #include "constants/seagallop.h" @@ -208,17 +209,17 @@ gStdScriptsEnd:: .include "data/maps/SixIsland_PatternBush/scripts.inc" .include "data/maps/SixIsland_AlteringCave/scripts.inc" .include "data/maps/NavelRock_Exterior/scripts.inc" - .include "data/maps/SevenIsland_TrainerTower_1F/scripts.inc" - .include "data/maps/SevenIsland_TrainerTower_2F/scripts.inc" - .include "data/maps/SevenIsland_TrainerTower_3F/scripts.inc" - .include "data/maps/SevenIsland_TrainerTower_4F/scripts.inc" - .include "data/maps/SevenIsland_TrainerTower_5F/scripts.inc" - .include "data/maps/SevenIsland_TrainerTower_6F/scripts.inc" - .include "data/maps/SevenIsland_TrainerTower_7F/scripts.inc" - .include "data/maps/SevenIsland_TrainerTower_8F/scripts.inc" - .include "data/maps/SevenIsland_TrainerTower_Roof/scripts.inc" - .include "data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc" - .include "data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc" + .include "data/maps/TrainerTower_1F/scripts.inc" + .include "data/maps/TrainerTower_2F/scripts.inc" + .include "data/maps/TrainerTower_3F/scripts.inc" + .include "data/maps/TrainerTower_4F/scripts.inc" + .include "data/maps/TrainerTower_5F/scripts.inc" + .include "data/maps/TrainerTower_6F/scripts.inc" + .include "data/maps/TrainerTower_7F/scripts.inc" + .include "data/maps/TrainerTower_8F/scripts.inc" + .include "data/maps/TrainerTower_Roof/scripts.inc" + .include "data/maps/TrainerTower_Lobby/scripts.inc" + .include "data/maps/TrainerTower_Elevator/scripts.inc" .include "data/maps/FiveIsland_LostCave_Entrance/scripts.inc" .include "data/maps/FiveIsland_LostCave_Room1/scripts.inc" .include "data/maps/FiveIsland_LostCave_Room2/scripts.inc" @@ -593,7 +594,7 @@ gStdScriptsEnd:: .include "data/maps/FiveIsland_RocketWarehouse/text.inc" .include "data/maps/SixIsland_DottedHole_SapphireRoom/text.inc" .include "data/maps/SixIsland_PatternBush/text.inc" - .include "data/maps/SevenIsland_TrainerTower_Lobby/text.inc" + .include "data/maps/TrainerTower_Lobby/text.inc" .include "data/maps/FiveIsland_LostCave_Room1/text.inc" .include "data/maps/FiveIsland_LostCave_Room4/text.inc" .include "data/maps/FiveIsland_LostCave_Room10/text.inc" @@ -1462,7 +1463,7 @@ Route18_EastEntrance_1F_EventScript_1A77C1:: @ 81A77C1 .include "data/scripts/route23.inc" -EventScript_1A7AB9:: @ 81A7AB9 +EventScript_GetElevatorFloor:: @ 81A7AB9 special Special_GetElevatorFloor return diff --git a/data/layouts/SevenIsland_TrainerTower_1F/border.bin b/data/layouts/SevenIsland_TrainerTower_1F/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/SevenIsland_TrainerTower_1F/border.bin and /dev/null differ diff --git a/data/layouts/SevenIsland_TrainerTower_1F/map.bin b/data/layouts/SevenIsland_TrainerTower_1F/map.bin deleted file mode 100644 index 812cea451..000000000 Binary files a/data/layouts/SevenIsland_TrainerTower_1F/map.bin and /dev/null differ diff --git a/data/layouts/SevenIsland_TrainerTower_2F/border.bin b/data/layouts/SevenIsland_TrainerTower_2F/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/SevenIsland_TrainerTower_2F/border.bin and /dev/null differ diff --git a/data/layouts/SevenIsland_TrainerTower_2F/map.bin b/data/layouts/SevenIsland_TrainerTower_2F/map.bin deleted file mode 100644 index 7ae889af1..000000000 Binary files a/data/layouts/SevenIsland_TrainerTower_2F/map.bin and /dev/null differ diff --git a/data/layouts/SevenIsland_TrainerTower_3F/border.bin b/data/layouts/SevenIsland_TrainerTower_3F/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/SevenIsland_TrainerTower_3F/border.bin and /dev/null differ diff --git a/data/layouts/SevenIsland_TrainerTower_3F/map.bin b/data/layouts/SevenIsland_TrainerTower_3F/map.bin deleted file mode 100644 index c01e70c2f..000000000 Binary files a/data/layouts/SevenIsland_TrainerTower_3F/map.bin and /dev/null differ diff --git a/data/layouts/SevenIsland_TrainerTower_4F/border.bin b/data/layouts/SevenIsland_TrainerTower_4F/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/SevenIsland_TrainerTower_4F/border.bin and /dev/null differ diff --git a/data/layouts/SevenIsland_TrainerTower_4F/map.bin b/data/layouts/SevenIsland_TrainerTower_4F/map.bin deleted file mode 100644 index 057d7f955..000000000 Binary files a/data/layouts/SevenIsland_TrainerTower_4F/map.bin and /dev/null differ diff --git a/data/layouts/SevenIsland_TrainerTower_5F/border.bin b/data/layouts/SevenIsland_TrainerTower_5F/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/SevenIsland_TrainerTower_5F/border.bin and /dev/null differ diff --git a/data/layouts/SevenIsland_TrainerTower_5F/map.bin b/data/layouts/SevenIsland_TrainerTower_5F/map.bin deleted file mode 100644 index d580e7d2d..000000000 Binary files a/data/layouts/SevenIsland_TrainerTower_5F/map.bin and /dev/null differ diff --git a/data/layouts/SevenIsland_TrainerTower_6F/border.bin b/data/layouts/SevenIsland_TrainerTower_6F/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/SevenIsland_TrainerTower_6F/border.bin and /dev/null differ diff --git a/data/layouts/SevenIsland_TrainerTower_6F/map.bin b/data/layouts/SevenIsland_TrainerTower_6F/map.bin deleted file mode 100644 index 3c2c3165c..000000000 Binary files a/data/layouts/SevenIsland_TrainerTower_6F/map.bin and /dev/null differ diff --git a/data/layouts/SevenIsland_TrainerTower_7F/border.bin b/data/layouts/SevenIsland_TrainerTower_7F/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/SevenIsland_TrainerTower_7F/border.bin and /dev/null differ diff --git a/data/layouts/SevenIsland_TrainerTower_7F/map.bin b/data/layouts/SevenIsland_TrainerTower_7F/map.bin deleted file mode 100644 index d9bb110cf..000000000 Binary files a/data/layouts/SevenIsland_TrainerTower_7F/map.bin and /dev/null differ diff --git a/data/layouts/SevenIsland_TrainerTower_8F/border.bin b/data/layouts/SevenIsland_TrainerTower_8F/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/SevenIsland_TrainerTower_8F/border.bin and /dev/null differ diff --git a/data/layouts/SevenIsland_TrainerTower_8F/map.bin b/data/layouts/SevenIsland_TrainerTower_8F/map.bin deleted file mode 100644 index 6ba6588be..000000000 Binary files a/data/layouts/SevenIsland_TrainerTower_8F/map.bin and /dev/null differ diff --git a/data/layouts/SevenIsland_TrainerTower_Elevator/border.bin b/data/layouts/SevenIsland_TrainerTower_Elevator/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/SevenIsland_TrainerTower_Elevator/border.bin and /dev/null differ diff --git a/data/layouts/SevenIsland_TrainerTower_Elevator/map.bin b/data/layouts/SevenIsland_TrainerTower_Elevator/map.bin deleted file mode 100644 index 42e08c38d..000000000 --- a/data/layouts/SevenIsland_TrainerTower_Elevator/map.bin +++ /dev/null @@ -1 +0,0 @@ -222222222222222 \ No newline at end of file diff --git a/data/layouts/SevenIsland_TrainerTower_Lobby/border.bin b/data/layouts/SevenIsland_TrainerTower_Lobby/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/SevenIsland_TrainerTower_Lobby/border.bin and /dev/null differ diff --git a/data/layouts/SevenIsland_TrainerTower_Lobby/map.bin b/data/layouts/SevenIsland_TrainerTower_Lobby/map.bin deleted file mode 100644 index b98077279..000000000 --- a/data/layouts/SevenIsland_TrainerTower_Lobby/map.bin +++ /dev/null @@ -1 +0,0 @@ -222222222222222222222w2v222222b2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222 \ No newline at end of file diff --git a/data/layouts/SevenIsland_TrainerTower_Roof/border.bin b/data/layouts/SevenIsland_TrainerTower_Roof/border.bin deleted file mode 100644 index f94adee61..000000000 --- a/data/layouts/SevenIsland_TrainerTower_Roof/border.bin +++ /dev/null @@ -1 +0,0 @@ -//// \ No newline at end of file diff --git a/data/layouts/SevenIsland_TrainerTower_Roof/map.bin b/data/layouts/SevenIsland_TrainerTower_Roof/map.bin deleted file mode 100644 index 37d57f3fe..000000000 --- a/data/layouts/SevenIsland_TrainerTower_Roof/map.bin +++ /dev/null @@ -1 +0,0 @@ -pT[[[[[[[[[[[[PzEpT[[[[[[[[[[[[PzEpT[[[[[[[[[[[[PzEpT[[[h[[[[h[[[PzEpJIIIi[[[[jMNOKzEp`abQJIIIIKUVWSzEpcde33RQQQQS3333mEpfg_33Z3333333333tEp33333333333333tExq333333333333s|Cyrrrrrrrrrrrr{@A;!"((((((((((((%&<;)*080808080808-.<;12#$+,#$#$+,#$56<;9:#$34#$#$34#$=><;)F#$kl#$#$kl#$G.< \ No newline at end of file diff --git a/data/layouts/TrainerTower_1F/border.bin b/data/layouts/TrainerTower_1F/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/TrainerTower_1F/border.bin differ diff --git a/data/layouts/TrainerTower_1F/map.bin b/data/layouts/TrainerTower_1F/map.bin new file mode 100644 index 000000000..812cea451 Binary files /dev/null and b/data/layouts/TrainerTower_1F/map.bin differ diff --git a/data/layouts/TrainerTower_1F_Doubles/border.bin b/data/layouts/TrainerTower_1F_Doubles/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/TrainerTower_1F_Doubles/border.bin differ diff --git a/data/layouts/TrainerTower_1F_Doubles/map.bin b/data/layouts/TrainerTower_1F_Doubles/map.bin new file mode 100644 index 000000000..891ae066e Binary files /dev/null and b/data/layouts/TrainerTower_1F_Doubles/map.bin differ diff --git a/data/layouts/TrainerTower_1F_Knockout/border.bin b/data/layouts/TrainerTower_1F_Knockout/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/TrainerTower_1F_Knockout/border.bin differ diff --git a/data/layouts/TrainerTower_1F_Knockout/map.bin b/data/layouts/TrainerTower_1F_Knockout/map.bin new file mode 100644 index 000000000..3e3ebcc94 Binary files /dev/null and b/data/layouts/TrainerTower_1F_Knockout/map.bin differ diff --git a/data/layouts/TrainerTower_2F/border.bin b/data/layouts/TrainerTower_2F/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/TrainerTower_2F/border.bin differ diff --git a/data/layouts/TrainerTower_2F/map.bin b/data/layouts/TrainerTower_2F/map.bin new file mode 100644 index 000000000..7ae889af1 Binary files /dev/null and b/data/layouts/TrainerTower_2F/map.bin differ diff --git a/data/layouts/TrainerTower_2F_Doubles/border.bin b/data/layouts/TrainerTower_2F_Doubles/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/TrainerTower_2F_Doubles/border.bin differ diff --git a/data/layouts/TrainerTower_2F_Doubles/map.bin b/data/layouts/TrainerTower_2F_Doubles/map.bin new file mode 100644 index 000000000..ab44abb18 Binary files /dev/null and b/data/layouts/TrainerTower_2F_Doubles/map.bin differ diff --git a/data/layouts/TrainerTower_2F_Knockout/border.bin b/data/layouts/TrainerTower_2F_Knockout/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/TrainerTower_2F_Knockout/border.bin differ diff --git a/data/layouts/TrainerTower_2F_Knockout/map.bin b/data/layouts/TrainerTower_2F_Knockout/map.bin new file mode 100644 index 000000000..cfc96995c Binary files /dev/null and b/data/layouts/TrainerTower_2F_Knockout/map.bin differ diff --git a/data/layouts/TrainerTower_3F/border.bin b/data/layouts/TrainerTower_3F/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/TrainerTower_3F/border.bin differ diff --git a/data/layouts/TrainerTower_3F/map.bin b/data/layouts/TrainerTower_3F/map.bin new file mode 100644 index 000000000..c01e70c2f Binary files /dev/null and b/data/layouts/TrainerTower_3F/map.bin differ diff --git a/data/layouts/TrainerTower_3F_Doubles/border.bin b/data/layouts/TrainerTower_3F_Doubles/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/TrainerTower_3F_Doubles/border.bin differ diff --git a/data/layouts/TrainerTower_3F_Doubles/map.bin b/data/layouts/TrainerTower_3F_Doubles/map.bin new file mode 100644 index 000000000..514cb7239 Binary files /dev/null and b/data/layouts/TrainerTower_3F_Doubles/map.bin differ diff --git a/data/layouts/TrainerTower_3F_Knockout/border.bin b/data/layouts/TrainerTower_3F_Knockout/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/TrainerTower_3F_Knockout/border.bin differ diff --git a/data/layouts/TrainerTower_3F_Knockout/map.bin b/data/layouts/TrainerTower_3F_Knockout/map.bin new file mode 100644 index 000000000..da9cc3f75 Binary files /dev/null and b/data/layouts/TrainerTower_3F_Knockout/map.bin differ diff --git a/data/layouts/TrainerTower_4F/border.bin b/data/layouts/TrainerTower_4F/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/TrainerTower_4F/border.bin differ diff --git a/data/layouts/TrainerTower_4F/map.bin b/data/layouts/TrainerTower_4F/map.bin new file mode 100644 index 000000000..057d7f955 Binary files /dev/null and b/data/layouts/TrainerTower_4F/map.bin differ diff --git a/data/layouts/TrainerTower_4F_Doubles/border.bin b/data/layouts/TrainerTower_4F_Doubles/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/TrainerTower_4F_Doubles/border.bin differ diff --git a/data/layouts/TrainerTower_4F_Doubles/map.bin b/data/layouts/TrainerTower_4F_Doubles/map.bin new file mode 100644 index 000000000..d9a50b7a1 Binary files /dev/null and b/data/layouts/TrainerTower_4F_Doubles/map.bin differ diff --git a/data/layouts/TrainerTower_4F_Knockout/border.bin b/data/layouts/TrainerTower_4F_Knockout/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/TrainerTower_4F_Knockout/border.bin differ diff --git a/data/layouts/TrainerTower_4F_Knockout/map.bin b/data/layouts/TrainerTower_4F_Knockout/map.bin new file mode 100644 index 000000000..cf5e1e94e Binary files /dev/null and b/data/layouts/TrainerTower_4F_Knockout/map.bin differ diff --git a/data/layouts/TrainerTower_5F/border.bin b/data/layouts/TrainerTower_5F/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/TrainerTower_5F/border.bin differ diff --git a/data/layouts/TrainerTower_5F/map.bin b/data/layouts/TrainerTower_5F/map.bin new file mode 100644 index 000000000..d580e7d2d Binary files /dev/null and b/data/layouts/TrainerTower_5F/map.bin differ diff --git a/data/layouts/TrainerTower_5F_Doubles/border.bin b/data/layouts/TrainerTower_5F_Doubles/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/TrainerTower_5F_Doubles/border.bin differ diff --git a/data/layouts/TrainerTower_5F_Doubles/map.bin b/data/layouts/TrainerTower_5F_Doubles/map.bin new file mode 100644 index 000000000..37b4aba85 Binary files /dev/null and b/data/layouts/TrainerTower_5F_Doubles/map.bin differ diff --git a/data/layouts/TrainerTower_5F_Knockout/border.bin b/data/layouts/TrainerTower_5F_Knockout/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/TrainerTower_5F_Knockout/border.bin differ diff --git a/data/layouts/TrainerTower_5F_Knockout/map.bin b/data/layouts/TrainerTower_5F_Knockout/map.bin new file mode 100644 index 000000000..1f10bfff1 Binary files /dev/null and b/data/layouts/TrainerTower_5F_Knockout/map.bin differ diff --git a/data/layouts/TrainerTower_6F/border.bin b/data/layouts/TrainerTower_6F/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/TrainerTower_6F/border.bin differ diff --git a/data/layouts/TrainerTower_6F/map.bin b/data/layouts/TrainerTower_6F/map.bin new file mode 100644 index 000000000..3c2c3165c Binary files /dev/null and b/data/layouts/TrainerTower_6F/map.bin differ diff --git a/data/layouts/TrainerTower_6F_Doubles/border.bin b/data/layouts/TrainerTower_6F_Doubles/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/TrainerTower_6F_Doubles/border.bin differ diff --git a/data/layouts/TrainerTower_6F_Doubles/map.bin b/data/layouts/TrainerTower_6F_Doubles/map.bin new file mode 100644 index 000000000..2df5cd891 Binary files /dev/null and b/data/layouts/TrainerTower_6F_Doubles/map.bin differ diff --git a/data/layouts/TrainerTower_6F_Knockout/border.bin b/data/layouts/TrainerTower_6F_Knockout/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/TrainerTower_6F_Knockout/border.bin differ diff --git a/data/layouts/TrainerTower_6F_Knockout/map.bin b/data/layouts/TrainerTower_6F_Knockout/map.bin new file mode 100644 index 000000000..fe3d6f908 Binary files /dev/null and b/data/layouts/TrainerTower_6F_Knockout/map.bin differ diff --git a/data/layouts/TrainerTower_7F/border.bin b/data/layouts/TrainerTower_7F/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/TrainerTower_7F/border.bin differ diff --git a/data/layouts/TrainerTower_7F/map.bin b/data/layouts/TrainerTower_7F/map.bin new file mode 100644 index 000000000..d9bb110cf Binary files /dev/null and b/data/layouts/TrainerTower_7F/map.bin differ diff --git a/data/layouts/TrainerTower_7F_Doubles/border.bin b/data/layouts/TrainerTower_7F_Doubles/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/TrainerTower_7F_Doubles/border.bin differ diff --git a/data/layouts/TrainerTower_7F_Doubles/map.bin b/data/layouts/TrainerTower_7F_Doubles/map.bin new file mode 100644 index 000000000..e977b7e26 Binary files /dev/null and b/data/layouts/TrainerTower_7F_Doubles/map.bin differ diff --git a/data/layouts/TrainerTower_7F_Knockout/border.bin b/data/layouts/TrainerTower_7F_Knockout/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/TrainerTower_7F_Knockout/border.bin differ diff --git a/data/layouts/TrainerTower_7F_Knockout/map.bin b/data/layouts/TrainerTower_7F_Knockout/map.bin new file mode 100644 index 000000000..241077797 Binary files /dev/null and b/data/layouts/TrainerTower_7F_Knockout/map.bin differ diff --git a/data/layouts/TrainerTower_8F/border.bin b/data/layouts/TrainerTower_8F/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/TrainerTower_8F/border.bin differ diff --git a/data/layouts/TrainerTower_8F/map.bin b/data/layouts/TrainerTower_8F/map.bin new file mode 100644 index 000000000..6ba6588be Binary files /dev/null and b/data/layouts/TrainerTower_8F/map.bin differ diff --git a/data/layouts/TrainerTower_8F_Doubles/border.bin b/data/layouts/TrainerTower_8F_Doubles/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/TrainerTower_8F_Doubles/border.bin differ diff --git a/data/layouts/TrainerTower_8F_Doubles/map.bin b/data/layouts/TrainerTower_8F_Doubles/map.bin new file mode 100644 index 000000000..e358d2f3d Binary files /dev/null and b/data/layouts/TrainerTower_8F_Doubles/map.bin differ diff --git a/data/layouts/TrainerTower_8F_Knockout/border.bin b/data/layouts/TrainerTower_8F_Knockout/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/TrainerTower_8F_Knockout/border.bin differ diff --git a/data/layouts/TrainerTower_8F_Knockout/map.bin b/data/layouts/TrainerTower_8F_Knockout/map.bin new file mode 100644 index 000000000..bb5ccf05c Binary files /dev/null and b/data/layouts/TrainerTower_8F_Knockout/map.bin differ diff --git a/data/layouts/TrainerTower_Elevator/border.bin b/data/layouts/TrainerTower_Elevator/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/TrainerTower_Elevator/border.bin differ diff --git a/data/layouts/TrainerTower_Elevator/map.bin b/data/layouts/TrainerTower_Elevator/map.bin new file mode 100644 index 000000000..42e08c38d --- /dev/null +++ b/data/layouts/TrainerTower_Elevator/map.bin @@ -0,0 +1 @@ +222222222222222 \ No newline at end of file diff --git a/data/layouts/TrainerTower_Lobby/border.bin b/data/layouts/TrainerTower_Lobby/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/TrainerTower_Lobby/border.bin differ diff --git a/data/layouts/TrainerTower_Lobby/map.bin b/data/layouts/TrainerTower_Lobby/map.bin new file mode 100644 index 000000000..b98077279 --- /dev/null +++ b/data/layouts/TrainerTower_Lobby/map.bin @@ -0,0 +1 @@ +222222222222222222222w2v222222b2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222 \ No newline at end of file diff --git a/data/layouts/TrainerTower_Roof/border.bin b/data/layouts/TrainerTower_Roof/border.bin new file mode 100644 index 000000000..f94adee61 --- /dev/null +++ b/data/layouts/TrainerTower_Roof/border.bin @@ -0,0 +1 @@ +//// \ No newline at end of file diff --git a/data/layouts/TrainerTower_Roof/map.bin b/data/layouts/TrainerTower_Roof/map.bin new file mode 100644 index 000000000..37d57f3fe --- /dev/null +++ b/data/layouts/TrainerTower_Roof/map.bin @@ -0,0 +1 @@ +pT[[[[[[[[[[[[PzEpT[[[[[[[[[[[[PzEpT[[[[[[[[[[[[PzEpT[[[h[[[[h[[[PzEpJIIIi[[[[jMNOKzEp`abQJIIIIKUVWSzEpcde33RQQQQS3333mEpfg_33Z3333333333tEp33333333333333tExq333333333333s|Cyrrrrrrrrrrrr{@A;!"((((((((((((%&<;)*080808080808-.<;12#$+,#$#$+,#$56<;9:#$34#$#$34#$=><;)F#$kl#$#$kl#$G.< \ No newline at end of file diff --git a/data/layouts/UnusedLayout_834BC2C/border.bin b/data/layouts/UnusedLayout_834BC2C/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/UnusedLayout_834BC2C/border.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834BC2C/map.bin b/data/layouts/UnusedLayout_834BC2C/map.bin deleted file mode 100644 index 891ae066e..000000000 Binary files a/data/layouts/UnusedLayout_834BC2C/map.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834BEB4/border.bin b/data/layouts/UnusedLayout_834BEB4/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/UnusedLayout_834BEB4/border.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834BEB4/map.bin b/data/layouts/UnusedLayout_834BEB4/map.bin deleted file mode 100644 index ab44abb18..000000000 Binary files a/data/layouts/UnusedLayout_834BEB4/map.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834C13C/border.bin b/data/layouts/UnusedLayout_834C13C/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/UnusedLayout_834C13C/border.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834C13C/map.bin b/data/layouts/UnusedLayout_834C13C/map.bin deleted file mode 100644 index 514cb7239..000000000 Binary files a/data/layouts/UnusedLayout_834C13C/map.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834C3C4/border.bin b/data/layouts/UnusedLayout_834C3C4/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/UnusedLayout_834C3C4/border.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834C3C4/map.bin b/data/layouts/UnusedLayout_834C3C4/map.bin deleted file mode 100644 index d9a50b7a1..000000000 Binary files a/data/layouts/UnusedLayout_834C3C4/map.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834C64C/border.bin b/data/layouts/UnusedLayout_834C64C/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/UnusedLayout_834C64C/border.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834C64C/map.bin b/data/layouts/UnusedLayout_834C64C/map.bin deleted file mode 100644 index 37b4aba85..000000000 Binary files a/data/layouts/UnusedLayout_834C64C/map.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834C8D4/border.bin b/data/layouts/UnusedLayout_834C8D4/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/UnusedLayout_834C8D4/border.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834C8D4/map.bin b/data/layouts/UnusedLayout_834C8D4/map.bin deleted file mode 100644 index 2df5cd891..000000000 Binary files a/data/layouts/UnusedLayout_834C8D4/map.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834CB5C/border.bin b/data/layouts/UnusedLayout_834CB5C/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/UnusedLayout_834CB5C/border.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834CB5C/map.bin b/data/layouts/UnusedLayout_834CB5C/map.bin deleted file mode 100644 index e977b7e26..000000000 Binary files a/data/layouts/UnusedLayout_834CB5C/map.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834CDE4/border.bin b/data/layouts/UnusedLayout_834CDE4/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/UnusedLayout_834CDE4/border.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834CDE4/map.bin b/data/layouts/UnusedLayout_834CDE4/map.bin deleted file mode 100644 index e358d2f3d..000000000 Binary files a/data/layouts/UnusedLayout_834CDE4/map.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834D06C/border.bin b/data/layouts/UnusedLayout_834D06C/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/UnusedLayout_834D06C/border.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834D06C/map.bin b/data/layouts/UnusedLayout_834D06C/map.bin deleted file mode 100644 index 3e3ebcc94..000000000 Binary files a/data/layouts/UnusedLayout_834D06C/map.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834D2F4/border.bin b/data/layouts/UnusedLayout_834D2F4/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/UnusedLayout_834D2F4/border.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834D2F4/map.bin b/data/layouts/UnusedLayout_834D2F4/map.bin deleted file mode 100644 index cfc96995c..000000000 Binary files a/data/layouts/UnusedLayout_834D2F4/map.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834D57C/border.bin b/data/layouts/UnusedLayout_834D57C/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/UnusedLayout_834D57C/border.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834D57C/map.bin b/data/layouts/UnusedLayout_834D57C/map.bin deleted file mode 100644 index da9cc3f75..000000000 Binary files a/data/layouts/UnusedLayout_834D57C/map.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834D804/border.bin b/data/layouts/UnusedLayout_834D804/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/UnusedLayout_834D804/border.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834D804/map.bin b/data/layouts/UnusedLayout_834D804/map.bin deleted file mode 100644 index cf5e1e94e..000000000 Binary files a/data/layouts/UnusedLayout_834D804/map.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834DA8C/border.bin b/data/layouts/UnusedLayout_834DA8C/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/UnusedLayout_834DA8C/border.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834DA8C/map.bin b/data/layouts/UnusedLayout_834DA8C/map.bin deleted file mode 100644 index 1f10bfff1..000000000 Binary files a/data/layouts/UnusedLayout_834DA8C/map.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834DD14/border.bin b/data/layouts/UnusedLayout_834DD14/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/UnusedLayout_834DD14/border.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834DD14/map.bin b/data/layouts/UnusedLayout_834DD14/map.bin deleted file mode 100644 index fe3d6f908..000000000 Binary files a/data/layouts/UnusedLayout_834DD14/map.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834DF9C/border.bin b/data/layouts/UnusedLayout_834DF9C/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/UnusedLayout_834DF9C/border.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834DF9C/map.bin b/data/layouts/UnusedLayout_834DF9C/map.bin deleted file mode 100644 index 241077797..000000000 Binary files a/data/layouts/UnusedLayout_834DF9C/map.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834E224/border.bin b/data/layouts/UnusedLayout_834E224/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/UnusedLayout_834E224/border.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_834E224/map.bin b/data/layouts/UnusedLayout_834E224/map.bin deleted file mode 100644 index bb5ccf05c..000000000 Binary files a/data/layouts/UnusedLayout_834E224/map.bin and /dev/null differ diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index 63fc06562..8f09ae939 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -3356,136 +3356,136 @@ "blockdata_filepath": "data/layouts/FourIsland_IcefallCave_Back/map.bin" }, { - "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY", - "name": "SevenIsland_TrainerTower_Lobby_Layout", + "id": "LAYOUT_TRAINER_TOWER_LOBBY", + "name": "TrainerTower_Lobby_Layout", "width": 19, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/SevenIsland_TrainerTower_Lobby/border.bin", - "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_Lobby/map.bin" + "border_filepath": "data/layouts/TrainerTower_Lobby/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_Lobby/map.bin" }, { - "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F", - "name": "SevenIsland_TrainerTower_1F_Layout", + "id": "LAYOUT_TRAINER_TOWER_1F", + "name": "TrainerTower_1F_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/SevenIsland_TrainerTower_1F/border.bin", - "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_1F/map.bin" + "border_filepath": "data/layouts/TrainerTower_1F/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_1F/map.bin" }, { - "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_2F", - "name": "SevenIsland_TrainerTower_2F_Layout", + "id": "LAYOUT_TRAINER_TOWER_2F", + "name": "TrainerTower_2F_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/SevenIsland_TrainerTower_2F/border.bin", - "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_2F/map.bin" + "border_filepath": "data/layouts/TrainerTower_2F/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_2F/map.bin" }, { - "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_3F", - "name": "SevenIsland_TrainerTower_3F_Layout", + "id": "LAYOUT_TRAINER_TOWER_3F", + "name": "TrainerTower_3F_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/SevenIsland_TrainerTower_3F/border.bin", - "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_3F/map.bin" + "border_filepath": "data/layouts/TrainerTower_3F/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_3F/map.bin" }, { - "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_4F", - "name": "SevenIsland_TrainerTower_4F_Layout", + "id": "LAYOUT_TRAINER_TOWER_4F", + "name": "TrainerTower_4F_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/SevenIsland_TrainerTower_4F/border.bin", - "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_4F/map.bin" + "border_filepath": "data/layouts/TrainerTower_4F/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_4F/map.bin" }, { - "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_5F", - "name": "SevenIsland_TrainerTower_5F_Layout", + "id": "LAYOUT_TRAINER_TOWER_5F", + "name": "TrainerTower_5F_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/SevenIsland_TrainerTower_5F/border.bin", - "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_5F/map.bin" + "border_filepath": "data/layouts/TrainerTower_5F/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_5F/map.bin" }, { - "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_6F", - "name": "SevenIsland_TrainerTower_6F_Layout", + "id": "LAYOUT_TRAINER_TOWER_6F", + "name": "TrainerTower_6F_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/SevenIsland_TrainerTower_6F/border.bin", - "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_6F/map.bin" + "border_filepath": "data/layouts/TrainerTower_6F/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_6F/map.bin" }, { - "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_7F", - "name": "SevenIsland_TrainerTower_7F_Layout", + "id": "LAYOUT_TRAINER_TOWER_7F", + "name": "TrainerTower_7F_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/SevenIsland_TrainerTower_7F/border.bin", - "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_7F/map.bin" + "border_filepath": "data/layouts/TrainerTower_7F/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_7F/map.bin" }, { - "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_8F", - "name": "SevenIsland_TrainerTower_8F_Layout", + "id": "LAYOUT_TRAINER_TOWER_8F", + "name": "TrainerTower_8F_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/SevenIsland_TrainerTower_8F/border.bin", - "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_8F/map.bin" + "border_filepath": "data/layouts/TrainerTower_8F/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_8F/map.bin" }, { - "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ROOF", - "name": "SevenIsland_TrainerTower_Roof_Layout", + "id": "LAYOUT_TRAINER_TOWER_ROOF", + "name": "TrainerTower_Roof_Layout", "width": 18, "height": 16, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/SevenIsland_TrainerTower_Roof/border.bin", - "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_Roof/map.bin" + "border_filepath": "data/layouts/TrainerTower_Roof/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_Roof/map.bin" }, { - "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "name": "SevenIsland_TrainerTower_Elevator_Layout", + "id": "LAYOUT_TRAINER_TOWER_ELEVATOR", + "name": "TrainerTower_Elevator_Layout", "width": 5, "height": 7, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D4ECC", - "border_filepath": "data/layouts/SevenIsland_TrainerTower_Elevator/border.bin", - "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_Elevator/map.bin" + "border_filepath": "data/layouts/TrainerTower_Elevator/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_Elevator/map.bin" }, { "id": "LAYOUT_CERULEAN_CITY_HOUSE5", @@ -4184,196 +4184,196 @@ "blockdata_filepath": "data/layouts/NavelRock_Fork/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834BC2C", - "name": "UnusedLayout_834BC2C_Layout", + "id": "LAYOUT_TRAINER_TOWER_1F_DOUBLES", + "name": "TrainerTower_1F_Doubles_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834BC2C/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834BC2C/map.bin" + "border_filepath": "data/layouts/TrainerTower_1F_Doubles/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_1F_Doubles/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834BEB4", - "name": "UnusedLayout_834BEB4_Layout", + "id": "LAYOUT_TRAINER_TOWER_2F_DOUBLES", + "name": "TrainerTower_2F_Doubles_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834BEB4/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834BEB4/map.bin" + "border_filepath": "data/layouts/TrainerTower_2F_Doubles/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_2F_Doubles/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834C13C", - "name": "UnusedLayout_834C13C_Layout", + "id": "LAYOUT_TRAINER_TOWER_3F_DOUBLES", + "name": "TrainerTower_3F_Doubles_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834C13C/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834C13C/map.bin" + "border_filepath": "data/layouts/TrainerTower_3F_Doubles/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_3F_Doubles/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834C3C4", - "name": "UnusedLayout_834C3C4_Layout", + "id": "LAYOUT_TRAINER_TOWER_4F_DOUBLES", + "name": "TrainerTower_4F_Doubles_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834C3C4/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834C3C4/map.bin" + "border_filepath": "data/layouts/TrainerTower_4F_Doubles/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_4F_Doubles/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834C64C", - "name": "UnusedLayout_834C64C_Layout", + "id": "LAYOUT_TRAINER_TOWER_5F_DOUBLES", + "name": "TrainerTower_5F_Doubles_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834C64C/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834C64C/map.bin" + "border_filepath": "data/layouts/TrainerTower_5F_Doubles/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_5F_Doubles/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834C8D4", - "name": "UnusedLayout_834C8D4_Layout", + "id": "LAYOUT_TRAINER_TOWER_6F_DOUBLES", + "name": "TrainerTower_6F_Doubles_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834C8D4/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834C8D4/map.bin" + "border_filepath": "data/layouts/TrainerTower_6F_Doubles/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_6F_Doubles/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834CB5C", - "name": "UnusedLayout_834CB5C_Layout", + "id": "LAYOUT_TRAINER_TOWER_7F_DOUBLES", + "name": "TrainerTower_7F_Doubles_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834CB5C/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834CB5C/map.bin" + "border_filepath": "data/layouts/TrainerTower_7F_Doubles/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_7F_Doubles/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834CDE4", - "name": "UnusedLayout_834CDE4_Layout", + "id": "LAYOUT_TRAINER_TOWER_8F_DOUBLES", + "name": "TrainerTower_8F_Doubles_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834CDE4/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834CDE4/map.bin" + "border_filepath": "data/layouts/TrainerTower_8F_Doubles/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_8F_Doubles/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834D06C", - "name": "UnusedLayout_834D06C_Layout", + "id": "LAYOUT_TRAINER_TOWER_1F_KNOCKOUT", + "name": "TrainerTower_1F_Knockout_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834D06C/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834D06C/map.bin" + "border_filepath": "data/layouts/TrainerTower_1F_Knockout/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_1F_Knockout/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834D2F4", - "name": "UnusedLayout_834D2F4_Layout", + "id": "LAYOUT_TRAINER_TOWER_2F_KNOCKOUT", + "name": "TrainerTower_2F_Knockout_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834D2F4/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834D2F4/map.bin" + "border_filepath": "data/layouts/TrainerTower_2F_Knockout/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_2F_Knockout/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834D57C", - "name": "UnusedLayout_834D57C_Layout", + "id": "LAYOUT_TRAINER_TOWER_3F_KNOCKOUT", + "name": "TrainerTower_3F_Knockout_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834D57C/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834D57C/map.bin" + "border_filepath": "data/layouts/TrainerTower_3F_Knockout/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_3F_Knockout/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834D804", - "name": "UnusedLayout_834D804_Layout", + "id": "LAYOUT_TRAINER_TOWER_4F_KNOCKOUT", + "name": "TrainerTower_4F_Knockout_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834D804/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834D804/map.bin" + "border_filepath": "data/layouts/TrainerTower_4F_Knockout/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_4F_Knockout/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834DA8C", - "name": "UnusedLayout_834DA8C_Layout", + "id": "LAYOUT_TRAINER_TOWER_5F_KNOCKOUT", + "name": "TrainerTower_5F_Knockout_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834DA8C/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834DA8C/map.bin" + "border_filepath": "data/layouts/TrainerTower_5F_Knockout/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_5F_Knockout/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834DD14", - "name": "UnusedLayout_834DD14_Layout", + "id": "LAYOUT_TRAINER_TOWER_6F_KNOCKOUT", + "name": "TrainerTower_6F_Knockout_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834DD14/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834DD14/map.bin" + "border_filepath": "data/layouts/TrainerTower_6F_Knockout/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_6F_Knockout/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834DF9C", - "name": "UnusedLayout_834DF9C_Layout", + "id": "LAYOUT_TRAINER_TOWER_7F_KNOCKOUT", + "name": "TrainerTower_7F_Knockout_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834DF9C/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834DF9C/map.bin" + "border_filepath": "data/layouts/TrainerTower_7F_Knockout/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_7F_Knockout/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834E224", - "name": "UnusedLayout_834E224_Layout", + "id": "LAYOUT_TRAINER_TOWER_8F_KNOCKOUT", + "name": "TrainerTower_8F_Knockout_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834E224/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834E224/map.bin" + "border_filepath": "data/layouts/TrainerTower_8F_Knockout/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_8F_Knockout/map.bin" }, { "id": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1", diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index 14198db2f..5992525c9 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -4,7 +4,7 @@ CeladonCity_DepartmentStore_Elevator_MapScripts:: @ 816C152 CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153 lockall setvar VAR_0x8004, 3 - call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 + call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special Special_DrawElevatorCurrentFloorWindow message Text_WantWhichFloor diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc index f649e5c40..e797e98a9 100644 --- a/data/maps/RocketHideout_Elevator/scripts.inc +++ b/data/maps/RocketHideout_Elevator/scripts.inc @@ -5,7 +5,7 @@ RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9 lockall goto_if_unset FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT, EventScript_16161B setvar VAR_0x8004, 2 - call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 + call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special Special_DrawElevatorCurrentFloorWindow message Text_WantWhichFloor diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json index 47fb5fa98..31a250297 100644 --- a/data/maps/SevenIsland_TrainerTower/map.json +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -51,7 +51,7 @@ "x": 58, "y": 7, "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY", + "dest_map": "MAP_TRAINER_TOWER_LOBBY", "dest_warp_id": 1 } ], diff --git a/data/maps/SevenIsland_TrainerTower_1F/map.json b/data/maps/SevenIsland_TrainerTower_1F/map.json deleted file mode 100644 index 924dbbcba..000000000 --- a/data/maps/SevenIsland_TrainerTower_1F/map.json +++ /dev/null @@ -1,128 +0,0 @@ -{ - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_1F", - "name": "SevenIsland_TrainerTower_1F", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F", - "music": "MUS_T_TOWER", - "region_map_section": "MAPSEC_TRAINER_TOWER_2", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", - "x": 9, - "y": 7, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "0x0", - "flag": "FLAG_TEMP_6" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", - "x": 11, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_1F_EventScript_1646C8", - "flag": "FLAG_TEMP_2" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", - "x": 15, - "y": 13, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_LEFT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_1F_EventScript_1646CE", - "flag": "FLAG_TEMP_3" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", - "x": 10, - "y": 16, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_UP", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_1F_EventScript_1646D4", - "flag": "FLAG_TEMP_4" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", - "x": 10, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_1F_EventScript_1646DA", - "flag": "FLAG_TEMP_5" - } - ], - "warp_events": [ - { - "x": 15, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F", - "dest_warp_id": 1 - }, - { - "x": 4, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY", - "dest_warp_id": 0 - } - ], - "coord_events": [ - { - "type": "trigger", - "x": 10, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_E", - "var_value": 0, - "script": "SevenIsland_TrainerTower_1F_EventScript_1C54AF" - }, - { - "type": "trigger", - "x": 9, - "y": 12, - "elevation": 0, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_1F_EventScript_1C54B4" - }, - { - "type": "trigger", - "x": 9, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_1F_EventScript_1C54EA" - } - ], - "bg_events": [] -} diff --git a/data/maps/SevenIsland_TrainerTower_1F/scripts.inc b/data/maps/SevenIsland_TrainerTower_1F/scripts.inc deleted file mode 100644 index 4987c1142..000000000 --- a/data/maps/SevenIsland_TrainerTower_1F/scripts.inc +++ /dev/null @@ -1,60 +0,0 @@ -SevenIsland_TrainerTower_1F_MapScripts:: @ 81646B8 - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_1F_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_1F_MapScript2_1C4F62 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_1F_MapScript3_1C5046 - .byte 0 - -SevenIsland_TrainerTower_2F_EventScript_1646C8:: @ 81646C8 -SevenIsland_TrainerTower_4F_EventScript_1646C8:: @ 81646C8 -SevenIsland_TrainerTower_6F_EventScript_1646C8:: @ 81646C8 -SevenIsland_TrainerTower_8F_EventScript_1646C8:: @ 81646C8 -SevenIsland_TrainerTower_5F_EventScript_1646C8:: @ 81646C8 -SevenIsland_TrainerTower_7F_EventScript_1646C8:: @ 81646C8 -SevenIsland_TrainerTower_3F_EventScript_1646C8:: @ 81646C8 -SevenIsland_TrainerTower_1F_EventScript_1646C8:: @ 81646C8 - call EventScript_1C52F4 - end - -SevenIsland_TrainerTower_2F_EventScript_1646CE:: @ 81646CE -SevenIsland_TrainerTower_4F_EventScript_1646CE:: @ 81646CE -SevenIsland_TrainerTower_6F_EventScript_1646CE:: @ 81646CE -SevenIsland_TrainerTower_8F_EventScript_1646CE:: @ 81646CE -SevenIsland_TrainerTower_5F_EventScript_1646CE:: @ 81646CE -SevenIsland_TrainerTower_7F_EventScript_1646CE:: @ 81646CE -SevenIsland_TrainerTower_3F_EventScript_1646CE:: @ 81646CE -SevenIsland_TrainerTower_1F_EventScript_1646CE:: @ 81646CE - call EventScript_1C533B - end - -SevenIsland_TrainerTower_2F_EventScript_1646D4:: @ 81646D4 -SevenIsland_TrainerTower_4F_EventScript_1646D4:: @ 81646D4 -SevenIsland_TrainerTower_6F_EventScript_1646D4:: @ 81646D4 -SevenIsland_TrainerTower_8F_EventScript_1646D4:: @ 81646D4 -SevenIsland_TrainerTower_5F_EventScript_1646D4:: @ 81646D4 -SevenIsland_TrainerTower_7F_EventScript_1646D4:: @ 81646D4 -SevenIsland_TrainerTower_3F_EventScript_1646D4:: @ 81646D4 -SevenIsland_TrainerTower_1F_EventScript_1646D4:: @ 81646D4 - call EventScript_1C5382 - end - -SevenIsland_TrainerTower_2F_EventScript_1646DA:: @ 81646DA -SevenIsland_TrainerTower_4F_EventScript_1646DA:: @ 81646DA -SevenIsland_TrainerTower_6F_EventScript_1646DA:: @ 81646DA -SevenIsland_TrainerTower_8F_EventScript_1646DA:: @ 81646DA -SevenIsland_TrainerTower_5F_EventScript_1646DA:: @ 81646DA -SevenIsland_TrainerTower_7F_EventScript_1646DA:: @ 81646DA -SevenIsland_TrainerTower_3F_EventScript_1646DA:: @ 81646DA -SevenIsland_TrainerTower_1F_EventScript_1646DA:: @ 81646DA - call EventScript_1C538C - end - -SevenIsland_TrainerTower_2F_EventScript_1646E0:: @ 81646E0 -SevenIsland_TrainerTower_4F_EventScript_1646E0:: @ 81646E0 -SevenIsland_TrainerTower_6F_EventScript_1646E0:: @ 81646E0 -SevenIsland_TrainerTower_8F_EventScript_1646E0:: @ 81646E0 -SevenIsland_TrainerTower_7F_EventScript_1646E0:: @ 81646E0 -SevenIsland_TrainerTower_Roof_EventScript_1646E0:: @ 81646E0 -SevenIsland_TrainerTower_5F_EventScript_1646E0:: @ 81646E0 -SevenIsland_TrainerTower_3F_EventScript_1646E0:: @ 81646E0 - call EventScript_1C53AA - end diff --git a/data/maps/SevenIsland_TrainerTower_2F/map.json b/data/maps/SevenIsland_TrainerTower_2F/map.json deleted file mode 100644 index 6d0fbaa4c..000000000 --- a/data/maps/SevenIsland_TrainerTower_2F/map.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F", - "name": "SevenIsland_TrainerTower_2F", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_2F", - "music": "MUS_T_TOWER", - "region_map_section": "MAPSEC_TRAINER_TOWER_2", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", - "x": 9, - "y": 7, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_2F_EventScript_1646E0", - "flag": "FLAG_TEMP_6" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", - "x": 10, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_2F_EventScript_1646C8", - "flag": "FLAG_TEMP_2" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", - "x": 15, - "y": 13, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_LEFT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_2F_EventScript_1646CE", - "flag": "FLAG_TEMP_3" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", - "x": 10, - "y": 16, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_UP", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_2F_EventScript_1646D4", - "flag": "FLAG_TEMP_4" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", - "x": 11, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_2F_EventScript_1646DA", - "flag": "FLAG_TEMP_5" - } - ], - "warp_events": [ - { - "x": 15, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F", - "dest_warp_id": 1 - }, - { - "x": 4, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_1F", - "dest_warp_id": 0 - }, - { - "x": 13, - "y": 5, - "elevation": 0, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 - } - ], - "coord_events": [ - { - "type": "trigger", - "x": 10, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_E", - "var_value": 0, - "script": "SevenIsland_TrainerTower_2F_EventScript_1C54AF" - }, - { - "type": "trigger", - "x": 9, - "y": 12, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_2F_EventScript_1C54B4" - }, - { - "type": "trigger", - "x": 9, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_2F_EventScript_1C54EA" - } - ], - "bg_events": [] -} diff --git a/data/maps/SevenIsland_TrainerTower_2F/scripts.inc b/data/maps/SevenIsland_TrainerTower_2F/scripts.inc deleted file mode 100644 index 9e61d0dfd..000000000 --- a/data/maps/SevenIsland_TrainerTower_2F/scripts.inc +++ /dev/null @@ -1,25 +0,0 @@ -SevenIsland_TrainerTower_2F_MapScripts:: @ 81646E6 - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_2F_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_2F_MapScript2_1C4F62 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_2F_MapScript3_1C5046 - .byte 0 - -SevenIsland_TrainerTower_2F_EventScript_1646F6:: @ 81646F6 - call EventScript_1C52F4 - end - -EventScript_1646FC:: @ 81646FC - call EventScript_1C533B - end - -EventScript_164702:: @ 8164702 - call EventScript_1C5382 - end - -EventScript_164708:: @ 8164708 - call EventScript_1C538C - end - -EventScript_16470E:: @ 816470E - call EventScript_1C53AA - end diff --git a/data/maps/SevenIsland_TrainerTower_3F/map.json b/data/maps/SevenIsland_TrainerTower_3F/map.json deleted file mode 100644 index 780878898..000000000 --- a/data/maps/SevenIsland_TrainerTower_3F/map.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F", - "name": "SevenIsland_TrainerTower_3F", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_3F", - "music": "MUS_T_TOWER", - "region_map_section": "MAPSEC_TRAINER_TOWER_2", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", - "x": 9, - "y": 7, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_3F_EventScript_1646E0", - "flag": "FLAG_TEMP_6" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", - "x": 10, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_3F_EventScript_1646C8", - "flag": "FLAG_TEMP_2" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", - "x": 15, - "y": 13, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_LEFT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_3F_EventScript_1646CE", - "flag": "FLAG_TEMP_3" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", - "x": 10, - "y": 16, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_UP", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_3F_EventScript_1646D4", - "flag": "FLAG_TEMP_4" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", - "x": 11, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_3F_EventScript_1646DA", - "flag": "FLAG_TEMP_5" - } - ], - "warp_events": [ - { - "x": 15, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_4F", - "dest_warp_id": 1 - }, - { - "x": 4, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F", - "dest_warp_id": 0 - }, - { - "x": 13, - "y": 5, - "elevation": 0, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 - } - ], - "coord_events": [ - { - "type": "trigger", - "x": 10, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_E", - "var_value": 0, - "script": "SevenIsland_TrainerTower_3F_EventScript_1C54AF" - }, - { - "type": "trigger", - "x": 9, - "y": 12, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_3F_EventScript_1C54B4" - }, - { - "type": "trigger", - "x": 9, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_3F_EventScript_1C54EA" - } - ], - "bg_events": [] -} diff --git a/data/maps/SevenIsland_TrainerTower_3F/scripts.inc b/data/maps/SevenIsland_TrainerTower_3F/scripts.inc deleted file mode 100644 index e9afcff6c..000000000 --- a/data/maps/SevenIsland_TrainerTower_3F/scripts.inc +++ /dev/null @@ -1,25 +0,0 @@ -SevenIsland_TrainerTower_3F_MapScripts:: @ 8164714 - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_3F_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_3F_MapScript2_1C4F62 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_3F_MapScript3_1C5046 - .byte 0 - -SevenIsland_TrainerTower_3F_EventScript_164724:: @ 8164724 - call EventScript_1C52F4 - end - -EventScript_16472A:: @ 816472A - call EventScript_1C533B - end - -EventScript_164730:: @ 8164730 - call EventScript_1C5382 - end - -EventScript_164736:: @ 8164736 - call EventScript_1C538C - end - -EventScript_16473C:: @ 816473C - call EventScript_1C53AA - end diff --git a/data/maps/SevenIsland_TrainerTower_4F/map.json b/data/maps/SevenIsland_TrainerTower_4F/map.json deleted file mode 100644 index d4a021ff3..000000000 --- a/data/maps/SevenIsland_TrainerTower_4F/map.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_4F", - "name": "SevenIsland_TrainerTower_4F", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_4F", - "music": "MUS_T_TOWER", - "region_map_section": "MAPSEC_TRAINER_TOWER_2", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", - "x": 9, - "y": 7, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_4F_EventScript_1646E0", - "flag": "FLAG_TEMP_6" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", - "x": 10, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_4F_EventScript_1646C8", - "flag": "FLAG_TEMP_2" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", - "x": 15, - "y": 13, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_LEFT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_4F_EventScript_1646CE", - "flag": "FLAG_TEMP_3" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", - "x": 10, - "y": 16, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_UP", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_4F_EventScript_1646D4", - "flag": "FLAG_TEMP_4" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", - "x": 11, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_4F_EventScript_1646DA", - "flag": "FLAG_TEMP_5" - } - ], - "warp_events": [ - { - "x": 15, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_5F", - "dest_warp_id": 1 - }, - { - "x": 4, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F", - "dest_warp_id": 0 - }, - { - "x": 13, - "y": 5, - "elevation": 0, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 - } - ], - "coord_events": [ - { - "type": "trigger", - "x": 10, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_E", - "var_value": 0, - "script": "SevenIsland_TrainerTower_4F_EventScript_1C54AF" - }, - { - "type": "trigger", - "x": 9, - "y": 12, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_4F_EventScript_1C54B4" - }, - { - "type": "trigger", - "x": 9, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_4F_EventScript_1C54EA" - } - ], - "bg_events": [] -} diff --git a/data/maps/SevenIsland_TrainerTower_4F/scripts.inc b/data/maps/SevenIsland_TrainerTower_4F/scripts.inc deleted file mode 100644 index cfa0be11b..000000000 --- a/data/maps/SevenIsland_TrainerTower_4F/scripts.inc +++ /dev/null @@ -1,25 +0,0 @@ -SevenIsland_TrainerTower_4F_MapScripts:: @ 8164742 - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_4F_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_4F_MapScript2_1C4F62 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_4F_MapScript3_1C5046 - .byte 0 - -SevenIsland_TrainerTower_4F_EventScript_164752:: @ 8164752 - call EventScript_1C52F4 - end - -EventScript_164758:: @ 8164758 - call EventScript_1C533B - end - -EventScript_16475E:: @ 816475E - call EventScript_1C5382 - end - -EventScript_164764:: @ 8164764 - call EventScript_1C538C - end - -EventScript_16476A:: @ 816476A - call EventScript_1C53AA - end diff --git a/data/maps/SevenIsland_TrainerTower_5F/map.json b/data/maps/SevenIsland_TrainerTower_5F/map.json deleted file mode 100644 index 1ee41e1b4..000000000 --- a/data/maps/SevenIsland_TrainerTower_5F/map.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_5F", - "name": "SevenIsland_TrainerTower_5F", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_5F", - "music": "MUS_T_TOWER", - "region_map_section": "MAPSEC_TRAINER_TOWER_2", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", - "x": 9, - "y": 7, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_5F_EventScript_1646E0", - "flag": "FLAG_TEMP_6" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", - "x": 10, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_5F_EventScript_1646C8", - "flag": "FLAG_TEMP_2" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", - "x": 15, - "y": 13, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_LEFT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_5F_EventScript_1646CE", - "flag": "FLAG_TEMP_3" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", - "x": 10, - "y": 16, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_UP", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_5F_EventScript_1646D4", - "flag": "FLAG_TEMP_4" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", - "x": 11, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_5F_EventScript_1646DA", - "flag": "FLAG_TEMP_5" - } - ], - "warp_events": [ - { - "x": 15, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_6F", - "dest_warp_id": 1 - }, - { - "x": 4, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_4F", - "dest_warp_id": 0 - }, - { - "x": 13, - "y": 5, - "elevation": 0, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 - } - ], - "coord_events": [ - { - "type": "trigger", - "x": 10, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_E", - "var_value": 0, - "script": "SevenIsland_TrainerTower_5F_EventScript_1C54AF" - }, - { - "type": "trigger", - "x": 9, - "y": 12, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_5F_EventScript_1C54B4" - }, - { - "type": "trigger", - "x": 9, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_5F_EventScript_1C54EA" - } - ], - "bg_events": [] -} diff --git a/data/maps/SevenIsland_TrainerTower_5F/scripts.inc b/data/maps/SevenIsland_TrainerTower_5F/scripts.inc deleted file mode 100644 index 35ccdf129..000000000 --- a/data/maps/SevenIsland_TrainerTower_5F/scripts.inc +++ /dev/null @@ -1,25 +0,0 @@ -SevenIsland_TrainerTower_5F_MapScripts:: @ 8164770 - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_5F_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_5F_MapScript2_1C4F62 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_5F_MapScript3_1C5046 - .byte 0 - -SevenIsland_TrainerTower_5F_EventScript_164780:: @ 8164780 - call EventScript_1C52F4 - end - -EventScript_164786:: @ 8164786 - call EventScript_1C533B - end - -EventScript_16478C:: @ 816478C - call EventScript_1C5382 - end - -EventScript_164792:: @ 8164792 - call EventScript_1C538C - end - -EventScript_164798:: @ 8164798 - call EventScript_1C53AA - end diff --git a/data/maps/SevenIsland_TrainerTower_6F/map.json b/data/maps/SevenIsland_TrainerTower_6F/map.json deleted file mode 100644 index abaab80d6..000000000 --- a/data/maps/SevenIsland_TrainerTower_6F/map.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_6F", - "name": "SevenIsland_TrainerTower_6F", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_6F", - "music": "MUS_T_TOWER", - "region_map_section": "MAPSEC_TRAINER_TOWER_2", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", - "x": 9, - "y": 7, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_6F_EventScript_1646E0", - "flag": "FLAG_TEMP_6" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", - "x": 10, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_6F_EventScript_1646C8", - "flag": "FLAG_TEMP_2" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", - "x": 15, - "y": 13, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_LEFT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_6F_EventScript_1646CE", - "flag": "FLAG_TEMP_3" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", - "x": 10, - "y": 16, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_UP", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_6F_EventScript_1646D4", - "flag": "FLAG_TEMP_4" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", - "x": 11, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_6F_EventScript_1646DA", - "flag": "FLAG_TEMP_5" - } - ], - "warp_events": [ - { - "x": 15, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_7F", - "dest_warp_id": 1 - }, - { - "x": 4, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_5F", - "dest_warp_id": 0 - }, - { - "x": 13, - "y": 5, - "elevation": 0, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 - } - ], - "coord_events": [ - { - "type": "trigger", - "x": 10, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_E", - "var_value": 0, - "script": "SevenIsland_TrainerTower_6F_EventScript_1C54AF" - }, - { - "type": "trigger", - "x": 9, - "y": 12, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_6F_EventScript_1C54B4" - }, - { - "type": "trigger", - "x": 9, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_6F_EventScript_1C54EA" - } - ], - "bg_events": [] -} diff --git a/data/maps/SevenIsland_TrainerTower_6F/scripts.inc b/data/maps/SevenIsland_TrainerTower_6F/scripts.inc deleted file mode 100644 index 361c92749..000000000 --- a/data/maps/SevenIsland_TrainerTower_6F/scripts.inc +++ /dev/null @@ -1,25 +0,0 @@ -SevenIsland_TrainerTower_6F_MapScripts:: @ 816479E - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_6F_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_6F_MapScript2_1C4F62 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_6F_MapScript3_1C5046 - .byte 0 - -SevenIsland_TrainerTower_6F_EventScript_1647AE:: @ 81647AE - call EventScript_1C52F4 - end - -EventScript_1647B4:: @ 81647B4 - call EventScript_1C533B - end - -EventScript_1647BA:: @ 81647BA - call EventScript_1C5382 - end - -EventScript_1647C0:: @ 81647C0 - call EventScript_1C538C - end - -EventScript_1647C6:: @ 81647C6 - call EventScript_1C53AA - end diff --git a/data/maps/SevenIsland_TrainerTower_7F/map.json b/data/maps/SevenIsland_TrainerTower_7F/map.json deleted file mode 100644 index 827c6c9ca..000000000 --- a/data/maps/SevenIsland_TrainerTower_7F/map.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_7F", - "name": "SevenIsland_TrainerTower_7F", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_7F", - "music": "MUS_T_TOWER", - "region_map_section": "MAPSEC_TRAINER_TOWER_2", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", - "x": 9, - "y": 7, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_7F_EventScript_1646E0", - "flag": "FLAG_TEMP_6" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", - "x": 10, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_7F_EventScript_1646C8", - "flag": "FLAG_TEMP_2" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", - "x": 15, - "y": 13, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_LEFT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_7F_EventScript_1646CE", - "flag": "FLAG_TEMP_3" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", - "x": 10, - "y": 16, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_UP", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_7F_EventScript_1646D4", - "flag": "FLAG_TEMP_4" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", - "x": 11, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_7F_EventScript_1646DA", - "flag": "FLAG_TEMP_5" - } - ], - "warp_events": [ - { - "x": 15, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_8F", - "dest_warp_id": 1 - }, - { - "x": 4, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_6F", - "dest_warp_id": 0 - }, - { - "x": 13, - "y": 5, - "elevation": 0, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 - } - ], - "coord_events": [ - { - "type": "trigger", - "x": 10, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_E", - "var_value": 0, - "script": "SevenIsland_TrainerTower_7F_EventScript_1C54AF" - }, - { - "type": "trigger", - "x": 9, - "y": 12, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_7F_EventScript_1C54B4" - }, - { - "type": "trigger", - "x": 9, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_7F_EventScript_1C54EA" - } - ], - "bg_events": [] -} diff --git a/data/maps/SevenIsland_TrainerTower_7F/scripts.inc b/data/maps/SevenIsland_TrainerTower_7F/scripts.inc deleted file mode 100644 index be0036605..000000000 --- a/data/maps/SevenIsland_TrainerTower_7F/scripts.inc +++ /dev/null @@ -1,25 +0,0 @@ -SevenIsland_TrainerTower_7F_MapScripts:: @ 81647CC - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_7F_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_7F_MapScript2_1C4F62 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_7F_MapScript3_1C5046 - .byte 0 - -SevenIsland_TrainerTower_7F_EventScript_1647DC:: @ 81647DC - call EventScript_1C52F4 - end - -EventScript_1647E2:: @ 81647E2 - call EventScript_1C533B - end - -EventScript_1647E8:: @ 81647E8 - call EventScript_1C5382 - end - -EventScript_1647EE:: @ 81647EE - call EventScript_1C538C - end - -EventScript_1647F4:: @ 81647F4 - call EventScript_1C53AA - end diff --git a/data/maps/SevenIsland_TrainerTower_8F/map.json b/data/maps/SevenIsland_TrainerTower_8F/map.json deleted file mode 100644 index ed9ba908f..000000000 --- a/data/maps/SevenIsland_TrainerTower_8F/map.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_8F", - "name": "SevenIsland_TrainerTower_8F", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_8F", - "music": "MUS_T_TOWER", - "region_map_section": "MAPSEC_TRAINER_TOWER_2", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", - "x": 9, - "y": 7, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_8F_EventScript_1646E0", - "flag": "FLAG_TEMP_6" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", - "x": 10, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_8F_EventScript_1646C8", - "flag": "FLAG_TEMP_2" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", - "x": 15, - "y": 13, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_LEFT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_8F_EventScript_1646CE", - "flag": "FLAG_TEMP_3" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", - "x": 10, - "y": 16, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_UP", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_8F_EventScript_1646D4", - "flag": "FLAG_TEMP_4" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", - "x": 11, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_8F_EventScript_1646DA", - "flag": "FLAG_TEMP_5" - } - ], - "warp_events": [ - { - "x": 15, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ROOF", - "dest_warp_id": 1 - }, - { - "x": 4, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_7F", - "dest_warp_id": 0 - }, - { - "x": 13, - "y": 5, - "elevation": 0, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 - } - ], - "coord_events": [ - { - "type": "trigger", - "x": 10, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_E", - "var_value": 0, - "script": "SevenIsland_TrainerTower_8F_EventScript_1C54AF" - }, - { - "type": "trigger", - "x": 9, - "y": 12, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_8F_EventScript_1C54B4" - }, - { - "type": "trigger", - "x": 9, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_8F_EventScript_1C54EA" - } - ], - "bg_events": [] -} diff --git a/data/maps/SevenIsland_TrainerTower_8F/scripts.inc b/data/maps/SevenIsland_TrainerTower_8F/scripts.inc deleted file mode 100644 index b51982f48..000000000 --- a/data/maps/SevenIsland_TrainerTower_8F/scripts.inc +++ /dev/null @@ -1,25 +0,0 @@ -SevenIsland_TrainerTower_8F_MapScripts:: @ 81647FA - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_8F_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_8F_MapScript2_1C4F62 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_8F_MapScript3_1C5046 - .byte 0 - -SevenIsland_TrainerTower_8F_EventScript_16480A:: @ 816480A - call EventScript_1C52F4 - end - -EventScript_164810:: @ 8164810 - call EventScript_1C533B - end - -EventScript_164816:: @ 8164816 - call EventScript_1C5382 - end - -EventScript_16481C:: @ 816481C - call EventScript_1C538C - end - -EventScript_164822:: @ 8164822 - call EventScript_1C53AA - end diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/map.json b/data/maps/SevenIsland_TrainerTower_Elevator/map.json deleted file mode 100644 index fef686312..000000000 --- a/data/maps/SevenIsland_TrainerTower_Elevator/map.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "name": "SevenIsland_TrainerTower_Elevator", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "music": "MUS_T_TOWER", - "region_map_section": "MAPSEC_TRAINER_TOWER_2", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [], - "warp_events": [ - { - "x": 2, - "y": 5, - "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 - } - ], - "coord_events": [], - "bg_events": [ - { - "type": "bg_event_type_0", - "x": 0, - "y": 2, - "elevation": 0, - "script": "SevenIsland_TrainerTower_Elevator_EventScript_164B03" - } - ] -} diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc deleted file mode 100644 index f84c67295..000000000 --- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc +++ /dev/null @@ -1,80 +0,0 @@ -SevenIsland_TrainerTower_Elevator_MapScripts:: @ 8164AF8 - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_Elevator_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_Elevator_MapScript2_1C5046 - .byte 0 - -SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03 - lockall - setvar VAR_0x8004, 6 - call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 - copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR - special Special_DrawElevatorCurrentFloorWindow - message Text_WantWhichFloor - waitmessage - setvar VAR_0x8004, 6 - specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos - switch VAR_RESULT - case 0, EventScript_164B46 - case 1, EventScript_164B52 - end - -EventScript_164B46:: @ 8164B46 - multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 0, FALSE - goto EventScript_164B5E - end - -EventScript_164B52:: @ 8164B52 - multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 1, FALSE - goto EventScript_164B5E - end - -EventScript_164B5E:: @ 8164B5E - switch VAR_RESULT - case 0, EventScript_164BCD - case 1, EventScript_164B90 - case 2, EventScript_164BD3 - case 127, EventScript_164BD3 - end - -EventScript_164B90:: @ 8164B90 - setvar VAR_0x8006, 3 - setdynamicwarp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8 - compare VAR_ELEVATOR_FLOOR, 3 - goto_if_eq EventScript_164BD3 - call EventScript_164BD8 - setvar VAR_ELEVATOR_FLOOR, 3 - special Special_CloseElevatorCurrentFloorWindow - delay 25 - applymovement OBJ_EVENT_ID_PLAYER, Movement_164BE5 - waitmovement 0 - warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8 - waitstate - releaseall - end - -EventScript_164BCD:: @ 8164BCD - goto EventScript_164BD3 - end - -EventScript_164BD3:: @ 8164BD3 - special Special_CloseElevatorCurrentFloorWindow - releaseall - end - -EventScript_164BD8:: @ 8164BD8 - special Special_CloseElevatorCurrentFloorWindow - closemessage - waitse - special Special_AnimateElevator - waitstate - setflag FLAG_TEMP_2 - return - -Movement_164BE5:: @ 8164BE5 - walk_in_place_fastest_down - delay_16 - walk_down - walk_right - walk_right - walk_down - step_end diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/map.json b/data/maps/SevenIsland_TrainerTower_Lobby/map.json deleted file mode 100644 index 3f553ce47..000000000 --- a/data/maps/SevenIsland_TrainerTower_Lobby/map.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY", - "name": "SevenIsland_TrainerTower_Lobby", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY", - "music": "MUS_T_TOWER", - "region_map_section": "MAPSEC_TRAINER_TOWER_2", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", - "x": 4, - "y": 9, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_Lobby_EventScript_16495D", - "flag": "0" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", - "x": 14, - "y": 9, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_Lobby_EventScript_164992", - "flag": "0" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", - "x": 11, - "y": 7, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_LEFT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_Lobby_EventScript_164966", - "flag": "0" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", - "x": 12, - "y": 13, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_Lobby_EventScript_164AE6", - "flag": "0" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", - "x": 2, - "y": 12, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_Lobby_EventScript_164AEF", - "flag": "0" - } - ], - "warp_events": [ - { - "x": 9, - "y": 2, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_1F", - "dest_warp_id": 1 - }, - { - "x": 9, - "y": 15, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER", - "dest_warp_id": 0 - }, - { - "x": 17, - "y": 8, - "elevation": 0, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 - } - ], - "coord_events": [ - { - "type": "trigger", - "x": 9, - "y": 7, - "elevation": 3, - "var": "VAR_MAP_SCENE_TRAINER_TOWER", - "var_value": 0, - "script": "SevenIsland_TrainerTower_Lobby_EventScript_1649CE" - } - ], - "bg_events": [ - { - "type": "bg_event_type_1", - "x": 8, - "y": 10, - "elevation": 0, - "script": "SevenIsland_TrainerTower_Lobby_EventScript_164AD8" - } - ] -} diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc deleted file mode 100644 index 0558b5a8b..000000000 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ /dev/null @@ -1,235 +0,0 @@ -SevenIsland_TrainerTower_Lobby_MapScripts:: @ 8164839 - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_Lobby_OnResume - map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, SevenIsland_TrainerTower_Lobby_OnReturnToField - map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_Lobby_OnTransition - map_script MAP_SCRIPT_ON_LOAD, SevenIsland_TrainerTower_Lobby_OnLoad - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_Lobby_OnFrame - .byte 0 - -SevenIsland_TrainerTower_Lobby_OnResume:: @ 8164853 - setvar VAR_TEMP_2, 0 - setvar VAR_0x8004, 10 - special sub_815D9E8 - setvar VAR_0x8004, 18 - special sub_815D9E8 - compare VAR_RESULT, 0 - goto_if_eq EventScript_164886 - setvar VAR_TEMP_0, 0 - setobjectxy OBJ_EVENT_ID_PLAYER, 9, 7 - applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4 - -EventScript_164886:: @ 8164886 - end - -SevenIsland_TrainerTower_Lobby_OnReturnToField:: @ 8164887 - addobject 1 - addobject 2 - addobject 3 - addobject 4 - addobject 5 - end - -SevenIsland_TrainerTower_Lobby_OnLoad:: @ 8164897 - compare VAR_TEMP_D, 17 - call_if_eq EventScript_1648A3 - end - -EventScript_1648A3:: @ 81648A3 - setmetatile 17, 10, 647, 0 - return - -SevenIsland_TrainerTower_Lobby_OnTransition:: @ 81648AD - setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY - getplayerxy VAR_TEMP_D, VAR_RESULT - end - -SevenIsland_TrainerTower_Lobby_OnFrame:: @ 81648B6 - map_script_2 VAR_TEMP_0, 0, EventScript_1648ED - map_script_2 VAR_TEMP_D, 0x11, EventScript_1648C8 - .2byte 0 - -EventScript_1648C8:: @ 81648C8 - lockall - applymovement OBJ_EVENT_ID_PLAYER, Movement_1648EA - waitmovement 0 - setmetatile 17, 10, 692, 1 - special DrawWholeMapView - playse SE_TK_KASYA - waitse - setvar VAR_TEMP_D, 0 - releaseall - end - -Movement_1648EA:: @ 81648EA - walk_down - walk_down - step_end - -EventScript_1648ED:: @ 81648ED - setvar VAR_TEMP_0, 1 - setvar VAR_0x8004, 12 - special sub_815D9E8 - switch VAR_RESULT - case 0, EventScript_164920 - case 1, EventScript_164938 - case 2, EventScript_16495C - -EventScript_164920:: @ 8164920 - lock - faceplayer - applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4 - textcolor 1 - msgbox gUnknown_817C937 - goto EventScript_16494B - -EventScript_164938:: @ 8164938 - lock - faceplayer - applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4 - textcolor 1 - msgbox gUnknown_817C9C0 - -EventScript_16494B:: @ 816494B - closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD6 - waitmovement 0 - setvar VAR_MAP_SCENE_TRAINER_TOWER, 0 - release - -EventScript_16495C:: @ 816495C - end - -SevenIsland_TrainerTower_Lobby_EventScript_16495D:: @ 816495D - lock - faceplayer - call EventScript_PkmnCenterNurse - release - end - -SevenIsland_TrainerTower_Lobby_EventScript_164966:: @ 8164966 - lock - faceplayer - setvar VAR_0x8004, 20 - special sub_815D9E8 - compare VAR_RESULT, 1 - goto_if_eq EventScript_164988 - msgbox gUnknown_817C9A2 - goto EventScript_164990 - -EventScript_164988:: @ 8164988 - msgbox gUnknown_817CE1F - -EventScript_164990:: @ 8164990 - release - end - -SevenIsland_TrainerTower_Lobby_EventScript_164992:: @ 8164992 - goto_if_questlog EventScript_ReleaseEnd - lock - faceplayer - message Text_MayIHelpYou - waitmessage - pokemart Items_1649B8 - msgbox Text_PleaseComeAgain - release - end - - .align 2 -Items_1649B8:: @ 81649B8 - .2byte ITEM_ULTRA_BALL - .2byte ITEM_GREAT_BALL - .2byte ITEM_FULL_RESTORE - .2byte ITEM_MAX_POTION - .2byte ITEM_HYPER_POTION - .2byte ITEM_REVIVE - .2byte ITEM_FULL_HEAL - .2byte ITEM_ESCAPE_ROPE - .2byte ITEM_MAX_REPEL - .2byte ITEM_NONE - release - end - -SevenIsland_TrainerTower_Lobby_EventScript_1649CE:: @ 81649CE - lockall - applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4 - textcolor 1 - msgbox gUnknown_817C794 - setvar VAR_0x8004, 17 - special sub_815D9E8 - compare VAR_RESULT, 0 - goto_if_eq EventScript_164A00 - msgbox gUnknown_817C7D9 - goto EventScript_164A08 - -EventScript_164A00:: @ 8164A00 - msgbox gUnknown_817C850 - -EventScript_164A08:: @ 8164A08 - message Text_17C88D - waitmessage - multichoice 18, 6, MULTICHOICE_YES_NO_INFO, FALSE - switch VAR_RESULT - case 0, EventScript_164A53 - case 1, EventScript_164ABF - case 2, EventScript_164A45 - case 127, EventScript_164ABF - end - -EventScript_164A45:: @ 8164A45 - msgbox gUnknown_817CCC9 - goto EventScript_164A08 - end - -EventScript_164A53:: @ 8164A53 - multichoice 13, 3, MULTICHOICE_TRAINER_TOWER_MODE, FALSE - switch VAR_RESULT - case 0, EventScript_164AA0 - case 1, EventScript_164AA0 - case 2, EventScript_164AA0 - case 3, EventScript_164AA0 - case 4, EventScript_164ABF - case 127, EventScript_164ABF - end - -EventScript_164AA0:: @ 8164AA0 - copyvar VAR_0x8005, VAR_RESULT - setvar VAR_MAP_SCENE_TRAINER_TOWER, 1 - special HealPlayerParty - msgbox gUnknown_817C8BF - setvar VAR_0x8004, 6 - special sub_815D9E8 - releaseall - end - -EventScript_164ABF:: @ 8164ABF - msgbox gUnknown_817C91D - closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD6 - waitmovement 0 - releaseall - end - -Movement_164AD4:: @ 8164AD4 - face_right - step_end - -Movement_164AD6:: @ 8164AD6 - walk_down - step_end - -SevenIsland_TrainerTower_Lobby_EventScript_164AD8:: @ 8164AD8 - lockall - fadescreen FADE_TO_BLACK - setvar VAR_0x8004, 1 - special Special_BattleRecords - waitstate - releaseall - end - -SevenIsland_TrainerTower_Lobby_EventScript_164AE6:: @ 8164AE6 - msgbox gUnknown_817CE38, MSGBOX_NPC - end - -SevenIsland_TrainerTower_Lobby_EventScript_164AEF:: @ 8164AEF - msgbox gUnknown_817CE9F, MSGBOX_NPC - end diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/text.inc b/data/maps/SevenIsland_TrainerTower_Lobby/text.inc deleted file mode 100644 index bf1e73b91..000000000 --- a/data/maps/SevenIsland_TrainerTower_Lobby/text.inc +++ /dev/null @@ -1,118 +0,0 @@ -gUnknown_817C794:: @ 817C794 - .string "Hello!\p" - .string "Welcome to TRAINER TOWER where\n" - .string "TRAINERS gather from all over!$" - -gUnknown_817C7D9:: @ 817C7D9 - .string "TRAINERS from all over the world\n" - .string "gather here to battle.\p" - .string "Let me see…\p" - .string "Right now, there are TRAINERS only\n" - .string "up to Floor {STR_VAR_1}.$" - -gUnknown_817C850:: @ 817C850 - .string "TRAINERS are awaiting your\n" - .string "challenge up to the eighth floor.$" - -Text_17C88D:: @ 817C88D - .string "Would you like to challenge the\n" - .string "waiting TRAINERS?$" - -gUnknown_817C8BF:: @ 817C8BF - .string "Okay, I'll get the clock started,\n" - .string "so give it everything you have.\p" - .string "On your marks…\p" - .string "Get set…\p" - .string "Go!$" - -gUnknown_817C91D:: @ 817C91D - .string "Please do visit us again!$" - -gUnknown_817C937:: @ 817C937 - .string "That was too bad.\p" - .string "I think you put in a tremendous\n" - .string "effort in your battling.\p" - .string "Please come back and try again!$" - -gUnknown_817C9A2:: @ 817C9A2 - .string "I hope you give it your best.$" - -gUnknown_817C9C0:: @ 817C9C0 - .string "When the TRAINERS switch places,\n" - .string "the movement can be hectic.\p" - .string "To avoid the stampede, we moved\n" - .string "the reception counter here.\p" - .string "I'm sorry for the inconvenience.$" - -Text_17CA5A:: @ 817CA5A - .string "Hello…\p" - .string "I am the owner of this TOWER…\p" - .string "How the sky soars above this\n" - .string "rooftop…\p" - .string "The caress of the winds up here…\p" - .string "It's all so perfect…\p" - .string "The way you battled…\n" - .string "It, too, was perfection…$" - -Text_17CB09:: @ 817CB09 - .string "This is for you…$" - -Text_17CB1A:: @ 817CB1A - .string "Oh!\n" - .string "Stupendous!\p" - .string "It's marvelous how you've come up\n" - .string "here so quickly.\p" - .string "The fact is, you've done it in\n" - .string "record time…\p" - .string "I'll have your record posted at\n" - .string "the reception counter.$" - -Text_17CBC0:: @ 817CBC0 - .string "You seem to have taken your sweet\n" - .string "time getting here…$" - -Text_17CBF5:: @ 817CBF5 - .string "What I would like to see is a\n" - .string "better time out of you…\p" - .string "I'm counting on you.\p" - .string "Until then, farewell…$" - -Text_17CC56:: @ 817CC56 - .string "{STR_VAR_1} min. {STR_VAR_2}.{STR_VAR_3} sec.$" - -Text_17CC69:: @ 817CC69 - .string "せいせきひょうです$" - -Text_17CC73:: @ 817CC73 - .string "This is a two-on-two battle.\p" - .string "You may not battle unless you have\n" - .string "at least two POKéMON.$" - -gUnknown_817CCC9:: @ 817CCC9 - .string "Here at TRAINER TOWER, there is an\n" - .string "event called TIME ATTACK.\p" - .string "You will be timed on how quickly\n" - .string "you can get from the reception\l" - .string "counter to the OWNER on the roof.\p" - .string "The best times will be recorded on\n" - .string "the Time Board.\p" - .string "Try competing with friends to see\n" - .string "who can beat it the fastest.\p" - .string "You will not earn any EXP. Points\n" - .string "or money by beating TRAINERS here.$" - -gUnknown_817CE1F:: @ 817CE1F - .string "Thank you for competing!$" - -gUnknown_817CE38:: @ 817CE38 - .string "I'm here to see how good I am.\p" - .string "I wonder what kinds of TRAINERS\n" - .string "are waiting for me?\p" - .string "It's nerve-racking!$" - -gUnknown_817CE9F:: @ 817CE9F - .string "Gasp, gasp…\n" - .string "Gasp…\p" - .string "Never mind battling! These stairs…\n" - .string "They're tougher than any battle…$" - diff --git a/data/maps/SevenIsland_TrainerTower_Roof/map.json b/data/maps/SevenIsland_TrainerTower_Roof/map.json deleted file mode 100644 index ee3dbe4c0..000000000 --- a/data/maps/SevenIsland_TrainerTower_Roof/map.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ROOF", - "name": "SevenIsland_TrainerTower_Roof", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ROOF", - "music": "MUS_T_TOWER", - "region_map_section": "MAPSEC_TRAINER_TOWER_2", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", - "x": 9, - "y": 7, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_Roof_EventScript_1646E0", - "flag": "FLAG_TEMP_6" - } - ], - "warp_events": [ - { - "x": 13, - "y": 5, - "elevation": 0, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 - }, - { - "x": 4, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_8F", - "dest_warp_id": 0 - } - ], - "coord_events": [], - "bg_events": [] -} diff --git a/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc b/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc deleted file mode 100644 index 6ae4ed2be..000000000 --- a/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower_Roof_MapScripts:: @ 8164828 - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_Roof_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_Roof_MapScript2_1C5046 - .byte 0 - -SevenIsland_TrainerTower_Roof_EventScript_164833:: @ 8164833 - call EventScript_1C53AA - end diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc index 87ed62c9b..abc60756a 100644 --- a/data/maps/SilphCo_Elevator/scripts.inc +++ b/data/maps/SilphCo_Elevator/scripts.inc @@ -4,7 +4,7 @@ SilphCo_Elevator_MapScripts:: @ 8161F6E SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F lockall setvar VAR_0x8004, 1 - call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 + call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special Special_DrawElevatorCurrentFloorWindow message Text_WantWhichFloor diff --git a/data/maps/TrainerTower_1F/map.json b/data/maps/TrainerTower_1F/map.json new file mode 100644 index 000000000..925dbdd69 --- /dev/null +++ b/data/maps/TrainerTower_1F/map.json @@ -0,0 +1,128 @@ +{ + "id": "MAP_TRAINER_TOWER_1F", + "name": "TrainerTower_1F", + "layout": "LAYOUT_TRAINER_TOWER_1F", + "music": "MUS_T_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_TEMP_6" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer1", + "flag": "FLAG_TEMP_2" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_SinglesTrainer", + "flag": "FLAG_TEMP_3" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_KnockoutTrainer", + "flag": "FLAG_TEMP_4" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer2", + "flag": "FLAG_TEMP_5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_2F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_LOBBY", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_E", + "var_value": 0, + "script": "TrainerTower_EventScript_SingleBattleTrigger" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 0, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" + } + ], + "bg_events": [] +} diff --git a/data/maps/TrainerTower_1F/scripts.inc b/data/maps/TrainerTower_1F/scripts.inc new file mode 100644 index 000000000..77917c4a4 --- /dev/null +++ b/data/maps/TrainerTower_1F/scripts.inc @@ -0,0 +1,27 @@ +TrainerTower_1F_MapScripts:: @ 81646B8 + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +@ All Trainer Tower floors/roof share these scripts for their object events + +TrainerTower_EventScript_DoublesTrainer1:: @ 81646C8 + call TrainerTower_EventScript_SpeakToDoublesTrainer1 + end + +TrainerTower_EventScript_SinglesTrainer:: @ 81646CE + call TrainerTower_EventScript_SpeakToSinglesTrainer + end + +TrainerTower_EventScript_KnockoutTrainer:: @ 81646D4 + call TrainerTower_EventScript_SpeakToKnockoutTrainer + end + +TrainerTower_EventScript_DoublesTrainer2:: @ 81646DA + call TrainerTower_EventScript_SpeakToDoublesTrainer2 + end + +TrainerTower_EventScript_Owner:: @ 81646E0 + call TrainerTower_EventScript_SpeakToOwner + end diff --git a/data/maps/TrainerTower_2F/map.json b/data/maps/TrainerTower_2F/map.json new file mode 100644 index 000000000..e2e2f4c97 --- /dev/null +++ b/data/maps/TrainerTower_2F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_TRAINER_TOWER_2F", + "name": "TrainerTower_2F", + "layout": "LAYOUT_TRAINER_TOWER_2F", + "music": "MUS_T_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_Owner", + "flag": "FLAG_TEMP_6" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer1", + "flag": "FLAG_TEMP_2" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_SinglesTrainer", + "flag": "FLAG_TEMP_3" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_KnockoutTrainer", + "flag": "FLAG_TEMP_4" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer2", + "flag": "FLAG_TEMP_5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_3F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_1F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_E", + "var_value": 0, + "script": "TrainerTower_EventScript_SingleBattleTrigger" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" + } + ], + "bg_events": [] +} diff --git a/data/maps/TrainerTower_2F/scripts.inc b/data/maps/TrainerTower_2F/scripts.inc new file mode 100644 index 000000000..c34f36a34 --- /dev/null +++ b/data/maps/TrainerTower_2F/scripts.inc @@ -0,0 +1,27 @@ +TrainerTower_2F_MapScripts:: @ 81646E6 + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +@ Below scripts are unused, the identical versions in the 1F script are used instead + +TrainerTower_2F_EventScript_DoublesTrainer1:: @ 81646F6 + call TrainerTower_EventScript_SpeakToDoublesTrainer1 + end + +TrainerTower_2F_EventScript_SinglesTrainer:: @ 81646FC + call TrainerTower_EventScript_SpeakToSinglesTrainer + end + +TrainerTower_2F_EventScript_KnockoutTrainer:: @ 8164702 + call TrainerTower_EventScript_SpeakToKnockoutTrainer + end + +TrainerTower_2F_EventScript_DoublesTrainer2:: @ 8164708 + call TrainerTower_EventScript_SpeakToDoublesTrainer2 + end + +TrainerTower_2F_EventScript_Owner:: @ 816470E + call TrainerTower_EventScript_SpeakToOwner + end diff --git a/data/maps/TrainerTower_3F/map.json b/data/maps/TrainerTower_3F/map.json new file mode 100644 index 000000000..8db22b61d --- /dev/null +++ b/data/maps/TrainerTower_3F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_TRAINER_TOWER_3F", + "name": "TrainerTower_3F", + "layout": "LAYOUT_TRAINER_TOWER_3F", + "music": "MUS_T_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_Owner", + "flag": "FLAG_TEMP_6" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer1", + "flag": "FLAG_TEMP_2" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_SinglesTrainer", + "flag": "FLAG_TEMP_3" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_KnockoutTrainer", + "flag": "FLAG_TEMP_4" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer2", + "flag": "FLAG_TEMP_5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_4F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_2F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_E", + "var_value": 0, + "script": "TrainerTower_EventScript_SingleBattleTrigger" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" + } + ], + "bg_events": [] +} diff --git a/data/maps/TrainerTower_3F/scripts.inc b/data/maps/TrainerTower_3F/scripts.inc new file mode 100644 index 000000000..0c8d434eb --- /dev/null +++ b/data/maps/TrainerTower_3F/scripts.inc @@ -0,0 +1,27 @@ +TrainerTower_3F_MapScripts:: @ 8164714 + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +@ Below scripts are unused, the identical versions in the 1F script are used instead + +TrainerTower_3F_EventScript_DoublesTrainer1:: @ 8164724 + call TrainerTower_EventScript_SpeakToDoublesTrainer1 + end + +TrainerTower_3F_EventScript_SinglesTrainer:: @ 816472A + call TrainerTower_EventScript_SpeakToSinglesTrainer + end + +TrainerTower_3F_EventScript_KnockoutTrainer:: @ 8164730 + call TrainerTower_EventScript_SpeakToKnockoutTrainer + end + +TrainerTower_3F_EventScript_DoublesTrainer2:: @ 8164736 + call TrainerTower_EventScript_SpeakToDoublesTrainer2 + end + +TrainerTower_3F_EventScript_Owner:: @ 816473C + call TrainerTower_EventScript_SpeakToOwner + end diff --git a/data/maps/TrainerTower_4F/map.json b/data/maps/TrainerTower_4F/map.json new file mode 100644 index 000000000..32c868e91 --- /dev/null +++ b/data/maps/TrainerTower_4F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_TRAINER_TOWER_4F", + "name": "TrainerTower_4F", + "layout": "LAYOUT_TRAINER_TOWER_4F", + "music": "MUS_T_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_Owner", + "flag": "FLAG_TEMP_6" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer1", + "flag": "FLAG_TEMP_2" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_SinglesTrainer", + "flag": "FLAG_TEMP_3" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_KnockoutTrainer", + "flag": "FLAG_TEMP_4" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer2", + "flag": "FLAG_TEMP_5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_5F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_3F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_E", + "var_value": 0, + "script": "TrainerTower_EventScript_SingleBattleTrigger" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" + } + ], + "bg_events": [] +} diff --git a/data/maps/TrainerTower_4F/scripts.inc b/data/maps/TrainerTower_4F/scripts.inc new file mode 100644 index 000000000..6e0e7e09f --- /dev/null +++ b/data/maps/TrainerTower_4F/scripts.inc @@ -0,0 +1,27 @@ +TrainerTower_4F_MapScripts:: @ 8164742 + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +@ Below scripts are unused, the identical versions in the 1F script are used instead + +TrainerTower_4F_EventScript_DoublesTrainer1:: @ 8164752 + call TrainerTower_EventScript_SpeakToDoublesTrainer1 + end + +TrainerTower_4F_EventScript_SinglesTrainer:: @ 8164758 + call TrainerTower_EventScript_SpeakToSinglesTrainer + end + +TrainerTower_4F_EventScript_KnockoutTrainer:: @ 816475E + call TrainerTower_EventScript_SpeakToKnockoutTrainer + end + +TrainerTower_4F_EventScript_DoublesTrainer2:: @ 8164764 + call TrainerTower_EventScript_SpeakToDoublesTrainer2 + end + +TrainerTower_4F_EventScript_Owner:: @ 816476A + call TrainerTower_EventScript_SpeakToOwner + end diff --git a/data/maps/TrainerTower_5F/map.json b/data/maps/TrainerTower_5F/map.json new file mode 100644 index 000000000..7a32b597c --- /dev/null +++ b/data/maps/TrainerTower_5F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_TRAINER_TOWER_5F", + "name": "TrainerTower_5F", + "layout": "LAYOUT_TRAINER_TOWER_5F", + "music": "MUS_T_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_Owner", + "flag": "FLAG_TEMP_6" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer1", + "flag": "FLAG_TEMP_2" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_SinglesTrainer", + "flag": "FLAG_TEMP_3" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_KnockoutTrainer", + "flag": "FLAG_TEMP_4" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer2", + "flag": "FLAG_TEMP_5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_6F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_4F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_E", + "var_value": 0, + "script": "TrainerTower_EventScript_SingleBattleTrigger" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" + } + ], + "bg_events": [] +} diff --git a/data/maps/TrainerTower_5F/scripts.inc b/data/maps/TrainerTower_5F/scripts.inc new file mode 100644 index 000000000..71af237be --- /dev/null +++ b/data/maps/TrainerTower_5F/scripts.inc @@ -0,0 +1,27 @@ +TrainerTower_5F_MapScripts:: @ 8164770 + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +@ Below scripts are unused, the identical versions in the 1F script are used instead + +TrainerTower_5F_EventScript_DoublesTrainer1:: @ 8164780 + call TrainerTower_EventScript_SpeakToDoublesTrainer1 + end + +TrainerTower_5F_EventScript_SinglesTrainer:: @ 8164786 + call TrainerTower_EventScript_SpeakToSinglesTrainer + end + +TrainerTower_5F_EventScript_KnockoutTrainer:: @ 816478C + call TrainerTower_EventScript_SpeakToKnockoutTrainer + end + +TrainerTower_5F_EventScript_DoublesTrainer2:: @ 8164792 + call TrainerTower_EventScript_SpeakToDoublesTrainer2 + end + +TrainerTower_5F_EventScript_Owner:: @ 8164798 + call TrainerTower_EventScript_SpeakToOwner + end diff --git a/data/maps/TrainerTower_6F/map.json b/data/maps/TrainerTower_6F/map.json new file mode 100644 index 000000000..05491cf05 --- /dev/null +++ b/data/maps/TrainerTower_6F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_TRAINER_TOWER_6F", + "name": "TrainerTower_6F", + "layout": "LAYOUT_TRAINER_TOWER_6F", + "music": "MUS_T_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_Owner", + "flag": "FLAG_TEMP_6" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer1", + "flag": "FLAG_TEMP_2" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_SinglesTrainer", + "flag": "FLAG_TEMP_3" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_KnockoutTrainer", + "flag": "FLAG_TEMP_4" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer2", + "flag": "FLAG_TEMP_5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_7F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_5F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_E", + "var_value": 0, + "script": "TrainerTower_EventScript_SingleBattleTrigger" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" + } + ], + "bg_events": [] +} diff --git a/data/maps/TrainerTower_6F/scripts.inc b/data/maps/TrainerTower_6F/scripts.inc new file mode 100644 index 000000000..8b9e1dd38 --- /dev/null +++ b/data/maps/TrainerTower_6F/scripts.inc @@ -0,0 +1,27 @@ +TrainerTower_6F_MapScripts:: @ 816479E + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +@ Below scripts are unused, the identical versions in the 1F script are used instead + +TrainerTower_6F_EventScript_DoublesTrainer1:: @ 81647AE + call TrainerTower_EventScript_SpeakToDoublesTrainer1 + end + +TrainerTower_6F_EventScript_SinglesTrainer:: @ 81647B4 + call TrainerTower_EventScript_SpeakToSinglesTrainer + end + +TrainerTower_6F_EventScript_KnockoutTrainer:: @ 81647BA + call TrainerTower_EventScript_SpeakToKnockoutTrainer + end + +TrainerTower_6F_EventScript_DoublesTrainer2:: @ 81647C0 + call TrainerTower_EventScript_SpeakToDoublesTrainer2 + end + +TrainerTower_6F_EventScript_Owner:: @ 81647C6 + call TrainerTower_EventScript_SpeakToOwner + end diff --git a/data/maps/TrainerTower_7F/map.json b/data/maps/TrainerTower_7F/map.json new file mode 100644 index 000000000..76f2a53f4 --- /dev/null +++ b/data/maps/TrainerTower_7F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_TRAINER_TOWER_7F", + "name": "TrainerTower_7F", + "layout": "LAYOUT_TRAINER_TOWER_7F", + "music": "MUS_T_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_Owner", + "flag": "FLAG_TEMP_6" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer1", + "flag": "FLAG_TEMP_2" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_SinglesTrainer", + "flag": "FLAG_TEMP_3" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_KnockoutTrainer", + "flag": "FLAG_TEMP_4" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer2", + "flag": "FLAG_TEMP_5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_8F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_6F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_E", + "var_value": 0, + "script": "TrainerTower_EventScript_SingleBattleTrigger" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" + } + ], + "bg_events": [] +} diff --git a/data/maps/TrainerTower_7F/scripts.inc b/data/maps/TrainerTower_7F/scripts.inc new file mode 100644 index 000000000..de47276ca --- /dev/null +++ b/data/maps/TrainerTower_7F/scripts.inc @@ -0,0 +1,27 @@ +TrainerTower_7F_MapScripts:: @ 81647CC + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +@ Below scripts are unused, the identical versions in the 1F script are used instead + +TrainerTower_7F_EventScript_DoublesTrainer1:: @ 81647DC + call TrainerTower_EventScript_SpeakToDoublesTrainer1 + end + +TrainerTower_7F_EventScript_SinglesTrainer:: @ 81647E2 + call TrainerTower_EventScript_SpeakToSinglesTrainer + end + +TrainerTower_7F_EventScript_KnockoutTrainer:: @ 81647E8 + call TrainerTower_EventScript_SpeakToKnockoutTrainer + end + +TrainerTower_7F_EventScript_DoublesTrainer2:: @ 81647EE + call TrainerTower_EventScript_SpeakToDoublesTrainer2 + end + +TrainerTower_7F_EventScript_Owner:: @ 81647F4 + call TrainerTower_EventScript_SpeakToOwner + end diff --git a/data/maps/TrainerTower_8F/map.json b/data/maps/TrainerTower_8F/map.json new file mode 100644 index 000000000..26cabfb06 --- /dev/null +++ b/data/maps/TrainerTower_8F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_TRAINER_TOWER_8F", + "name": "TrainerTower_8F", + "layout": "LAYOUT_TRAINER_TOWER_8F", + "music": "MUS_T_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_Owner", + "flag": "FLAG_TEMP_6" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer1", + "flag": "FLAG_TEMP_2" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_SinglesTrainer", + "flag": "FLAG_TEMP_3" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_KnockoutTrainer", + "flag": "FLAG_TEMP_4" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer2", + "flag": "FLAG_TEMP_5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_ROOF", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_7F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_E", + "var_value": 0, + "script": "TrainerTower_EventScript_SingleBattleTrigger" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" + } + ], + "bg_events": [] +} diff --git a/data/maps/TrainerTower_8F/scripts.inc b/data/maps/TrainerTower_8F/scripts.inc new file mode 100644 index 000000000..fc168780b --- /dev/null +++ b/data/maps/TrainerTower_8F/scripts.inc @@ -0,0 +1,27 @@ +TrainerTower_8F_MapScripts:: @ 81647FA + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +@ Below scripts are unused, the identical versions in the 1F script are used instead + +TrainerTower_8F_EventScript_DoublesTrainer1:: @ 816480A + call TrainerTower_EventScript_SpeakToDoublesTrainer1 + end + +TrainerTower_8F_EventScript_SinglesTrainer:: @ 8164810 + call TrainerTower_EventScript_SpeakToSinglesTrainer + end + +TrainerTower_8F_EventScript_KnockoutTrainer:: @ 8164816 + call TrainerTower_EventScript_SpeakToKnockoutTrainer + end + +TrainerTower_8F_EventScript_DoublesTrainer2:: @ 816481C + call TrainerTower_EventScript_SpeakToDoublesTrainer2 + end + +TrainerTower_8F_EventScript_Owner:: @ 8164822 + call TrainerTower_EventScript_SpeakToOwner + end diff --git a/data/maps/TrainerTower_Elevator/map.json b/data/maps/TrainerTower_Elevator/map.json new file mode 100644 index 000000000..7d004c2df --- /dev/null +++ b/data/maps/TrainerTower_Elevator/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_TRAINER_TOWER_ELEVATOR", + "name": "TrainerTower_Elevator", + "layout": "LAYOUT_TRAINER_TOWER_ELEVATOR", + "music": "MUS_T_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 0, + "y": 2, + "elevation": 0, + "script": "TrainerTower_Elevator_EventScript_FloorSelect" + } + ] +} diff --git a/data/maps/TrainerTower_Elevator/scripts.inc b/data/maps/TrainerTower_Elevator/scripts.inc new file mode 100644 index 000000000..349667102 --- /dev/null +++ b/data/maps/TrainerTower_Elevator/scripts.inc @@ -0,0 +1,80 @@ +TrainerTower_Elevator_MapScripts:: @ 8164AF8 + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +TrainerTower_Elevator_EventScript_FloorSelect:: @ 8164B03 + lockall + setvar VAR_0x8004, 6 + call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor + copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR + special Special_DrawElevatorCurrentFloorWindow + message Text_WantWhichFloor + waitmessage + setvar VAR_0x8004, 6 + specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos + switch VAR_RESULT + case 0, TrainerTower_Elevator_EventScript_FloorSelectFromRoof + case 1, TrainerTower_Elevator_EventScript_FloorSelectFromLobby + end + +TrainerTower_Elevator_EventScript_FloorSelectFromRoof:: @ 8164B46 + multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 0, FALSE + goto TrainerTower_Elevator_EventScript_ChooseFloor + end + +TrainerTower_Elevator_EventScript_FloorSelectFromLobby:: @ 8164B52 + multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 1, FALSE + goto TrainerTower_Elevator_EventScript_ChooseFloor + end + +TrainerTower_Elevator_EventScript_ChooseFloor:: @ 8164B5E + switch VAR_RESULT + case 0, TrainerTower_Elevator_EventScript_SelectRoof + case 1, TrainerTower_Elevator_EventScript_SelectLobby + case 2, TrainerTower_Elevator_EventScript_CloseFloorSelect + case SCR_MENU_CANCEL, TrainerTower_Elevator_EventScript_CloseFloorSelect + end + +TrainerTower_Elevator_EventScript_SelectLobby:: @ 8164B90 + setvar VAR_0x8006, 3 + setdynamicwarp MAP_TRAINER_TOWER_LOBBY, 255, 17, 8 + compare VAR_ELEVATOR_FLOOR, 3 + goto_if_eq TrainerTower_Elevator_EventScript_CloseFloorSelect + call TrainerTower_Elevator_EventScript_MoveElevator + setvar VAR_ELEVATOR_FLOOR, 3 + special Special_CloseElevatorCurrentFloorWindow + delay 25 + applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Elevator_Movement_ExitElevator + waitmovement 0 + warp MAP_TRAINER_TOWER_LOBBY, 255, 17, 8 + waitstate + releaseall + end + +TrainerTower_Elevator_EventScript_SelectRoof:: @ 8164BCD + goto TrainerTower_Elevator_EventScript_CloseFloorSelect + end + +TrainerTower_Elevator_EventScript_CloseFloorSelect:: @ 8164BD3 + special Special_CloseElevatorCurrentFloorWindow + releaseall + end + +TrainerTower_Elevator_EventScript_MoveElevator:: @ 8164BD8 + special Special_CloseElevatorCurrentFloorWindow + closemessage + waitse + special Special_AnimateElevator + waitstate + setflag FLAG_TEMP_2 + return + +TrainerTower_Elevator_Movement_ExitElevator:: @ 8164BE5 + walk_in_place_fastest_down + delay_16 + walk_down + walk_right + walk_right + walk_down + step_end diff --git a/data/maps/TrainerTower_Lobby/map.json b/data/maps/TrainerTower_Lobby/map.json new file mode 100644 index 000000000..23e8456c0 --- /dev/null +++ b/data/maps/TrainerTower_Lobby/map.json @@ -0,0 +1,125 @@ +{ + "id": "MAP_TRAINER_TOWER_LOBBY", + "name": "TrainerTower_Lobby", + "layout": "LAYOUT_TRAINER_TOWER_LOBBY", + "music": "MUS_T_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "x": 4, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_Lobby_EventScript_Nurse", + "flag": "0" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", + "x": 14, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_Lobby_EventScript_MartClerk", + "flag": "0" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", + "x": 11, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_Lobby_EventScript_Receptionist", + "flag": "0" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "x": 12, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_Lobby_EventScript_CooltrainerF", + "flag": "0" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "x": 2, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_Lobby_EventScript_BaldingMan", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 2, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_1F", + "dest_warp_id": 1 + }, + { + "x": 9, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 8, + "elevation": 0, + "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 9, + "y": 7, + "elevation": 3, + "var": "VAR_MAP_SCENE_TRAINER_TOWER", + "var_value": 0, + "script": "TrainerTower_Lobby_EventScript_EntryTrigger" + } + ], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 8, + "y": 10, + "elevation": 0, + "script": "TrainerTower_Lobby_EventScript_ShowRecords" + } + ] +} diff --git a/data/maps/TrainerTower_Lobby/scripts.inc b/data/maps/TrainerTower_Lobby/scripts.inc new file mode 100644 index 000000000..0fc2422b6 --- /dev/null +++ b/data/maps/TrainerTower_Lobby/scripts.inc @@ -0,0 +1,226 @@ +TrainerTower_Lobby_MapScripts:: @ 8164839 + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_Lobby_OnResume + map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, TrainerTower_Lobby_OnReturnToField + map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_Lobby_OnTransition + map_script MAP_SCRIPT_ON_LOAD, TrainerTower_Lobby_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_Lobby_OnFrame + .byte 0 + +TrainerTower_Lobby_OnResume:: @ 8164853 + setvar VAR_TEMP_2, 0 + ttower_resumetimer + ttower_shouldexit + compare VAR_RESULT, FALSE + goto_if_eq TrainerTower_Lobby_OnResumeEnd + @ Never reached, above always FALSE + setvar VAR_TEMP_0, 0 + setobjectxy OBJ_EVENT_ID_PLAYER, 9, 7 + applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist +TrainerTower_Lobby_OnResumeEnd:: @ 8164886 + end + +TrainerTower_Lobby_OnReturnToField:: @ 8164887 + addobject 1 + addobject 2 + addobject 3 + addobject 4 + addobject 5 + end + +TrainerTower_Lobby_OnLoad:: @ 8164897 + compare VAR_TEMP_D, 17 + call_if_eq TrainerTower_Lobby_OpenCounterBarrier + end + +TrainerTower_Lobby_OpenCounterBarrier:: @ 81648A3 + setmetatile 17, 10, METATILE_TrainerTower_Floor_ShadeBottomLeft, 0 + return + +TrainerTower_Lobby_OnTransition:: @ 81648AD + setworldmapflag FLAG_WORLD_MAP_TRAINER_TOWER_LOBBY + getplayerxy VAR_TEMP_D, VAR_RESULT + end + +TrainerTower_Lobby_OnFrame:: @ 81648B6 + map_script_2 VAR_TEMP_0, 0, TrainerTower_Lobby_EventScript_Enter + map_script_2 VAR_TEMP_D, 17, TrainerTower_Lobby_EventScript_ExitElevator + .2byte 0 + +TrainerTower_Lobby_EventScript_ExitElevator:: @ 81648C8 + lockall + applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_ExitElevator + waitmovement 0 + setmetatile 17, 10, METATILE_TrainerTower_CounterBarrier, 1 + special DrawWholeMapView + playse SE_TK_KASYA + waitse + setvar VAR_TEMP_D, 0 + releaseall + end + +TrainerTower_Lobby_Movement_ExitElevator:: @ 81648EA + walk_down + walk_down + step_end + +TrainerTower_Lobby_EventScript_Enter:: @ 81648ED + setvar VAR_TEMP_0, 1 + ttower_getchallengestatus + switch VAR_RESULT + case CHALLENGE_STATUS_LOST, TrainerTower_Lobby_EventScript_LostChallenge + case CHALLENGE_STATUS_UNK, TrainerTower_Lobby_EventScript_164938 + case CHALLENGE_STATUS_NORMAL, TrainerTower_Lobby_EventScript_EnterEnd + +TrainerTower_Lobby_EventScript_LostChallenge:: @ 8164920 + lock + faceplayer + applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist + textcolor 1 + msgbox TrainerTower_Lobby_Text_TooBadComeBackTryAgain + goto TrainerTower_Lobby_EventScript_ExitChallenge + +@ Presumably E-Reader related +TrainerTower_Lobby_EventScript_164938:: @ 8164938 + lock + faceplayer + applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist + textcolor 1 + msgbox TrainerTower_Lobby_Text_MoveCounterHereWhenTrainersSwitch +TrainerTower_Lobby_EventScript_ExitChallenge:: @ 816494B + closemessage + applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_WalkDown + waitmovement 0 + setvar VAR_MAP_SCENE_TRAINER_TOWER, 0 + release +TrainerTower_Lobby_EventScript_EnterEnd:: @ 816495C + end + +TrainerTower_Lobby_EventScript_Nurse:: @ 816495D + lock + faceplayer + call EventScript_PkmnCenterNurse + release + end + +TrainerTower_Lobby_EventScript_Receptionist:: @ 8164966 + lock + faceplayer + ttower_getbeatchallenge + compare VAR_RESULT, TRUE + goto_if_eq TrainerTower_Lobby_EventScript_ThanksForCompeting + msgbox TrainerTower_Lobby_Text_GiveItYourBest + goto TrainerTower_Lobby_EventScript_ReceptionistEnd + +TrainerTower_Lobby_EventScript_ThanksForCompeting:: @ 8164988 + msgbox TrainerTower_Lobby_Text_ThanksForCompeting +TrainerTower_Lobby_EventScript_ReceptionistEnd:: @ 8164990 + release + end + +TrainerTower_Lobby_EventScript_MartClerk:: @ 8164992 + goto_if_questlog EventScript_ReleaseEnd + lock + faceplayer + message Text_MayIHelpYou + waitmessage + pokemart TrainerTower_Lobby_Mart_Items + msgbox Text_PleaseComeAgain + release + end + + .align 2 +TrainerTower_Lobby_Mart_Items:: @ 81649B8 + .2byte ITEM_ULTRA_BALL + .2byte ITEM_GREAT_BALL + .2byte ITEM_FULL_RESTORE + .2byte ITEM_MAX_POTION + .2byte ITEM_HYPER_POTION + .2byte ITEM_REVIVE + .2byte ITEM_FULL_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_MAX_REPEL + .2byte ITEM_NONE + release + end + +TrainerTower_Lobby_EventScript_EntryTrigger:: @ 81649CE + lockall + applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist + textcolor 1 + msgbox TrainerTower_Lobby_Text_WelcomeToTrainerTower + ttower_getnumfloors + compare VAR_RESULT, FALSE + goto_if_eq TrainerTower_Lobby_EventScript_AllFloorsUsed + msgbox TrainerTower_Lobby_Text_TrainersUpToFloorNum + goto TrainerTower_Lobby_EventScript_AskEnterChallenge + +TrainerTower_Lobby_EventScript_AllFloorsUsed:: @ 8164A00 + msgbox TrainerTower_Lobby_Text_TrainersUpEighthFloor +TrainerTower_Lobby_EventScript_AskEnterChallenge:: @ 8164A08 + message TrainerTower_Lobby_Text_LikeToChallengeTrainers + waitmessage + multichoice 18, 6, MULTICHOICE_YES_NO_INFO, FALSE + switch VAR_RESULT + case 0, TrainerTower_Lobby_EventScript_ChooseChallenge + case 1, TrainerTower_Lobby_EventScript_DeclineChallenge + case 2, TrainerTower_Lobby_EventScript_ChallengeInfo + case SCR_MENU_CANCEL, TrainerTower_Lobby_EventScript_DeclineChallenge + end + +TrainerTower_Lobby_EventScript_ChallengeInfo:: @ 8164A45 + msgbox TrainerTower_Lobby_Text_ExplainTrainerTower + goto TrainerTower_Lobby_EventScript_AskEnterChallenge + end + +TrainerTower_Lobby_EventScript_ChooseChallenge:: @ 8164A53 + multichoice 13, 3, MULTICHOICE_TRAINER_TOWER_MODE, FALSE + switch VAR_RESULT + case 0, TrainerTower_Lobby_EventScript_BeginChallenge + case 1, TrainerTower_Lobby_EventScript_BeginChallenge + case 2, TrainerTower_Lobby_EventScript_BeginChallenge + case 3, TrainerTower_Lobby_EventScript_BeginChallenge + case 4, TrainerTower_Lobby_EventScript_DeclineChallenge + case SCR_MENU_CANCEL, TrainerTower_Lobby_EventScript_DeclineChallenge + end + +TrainerTower_Lobby_EventScript_BeginChallenge:: @ 8164AA0 + copyvar VAR_0x8005, VAR_RESULT + setvar VAR_MAP_SCENE_TRAINER_TOWER, 1 + special HealPlayerParty + msgbox TrainerTower_Lobby_Text_StartClockGetSetGo + ttower_startchallenge + releaseall + end + +TrainerTower_Lobby_EventScript_DeclineChallenge:: @ 8164ABF + msgbox TrainerTower_Lobby_Text_PleaseVisitUsAgain + closemessage + applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_WalkDown + waitmovement 0 + releaseall + end + +TrainerTower_Lobby_Movement_FaceReceptionist:: @ 8164AD4 + face_right + step_end + +TrainerTower_Lobby_Movement_WalkDown:: @ 8164AD6 + walk_down + step_end + +TrainerTower_Lobby_EventScript_ShowRecords:: @ 8164AD8 + lockall + fadescreen FADE_TO_BLACK + setvar VAR_0x8004, 1 + special Special_BattleRecords + waitstate + releaseall + end + +TrainerTower_Lobby_EventScript_CooltrainerF:: @ 8164AE6 + msgbox TrainerTower_Lobby_Text_WonderWhatKindsOfTrainers, MSGBOX_NPC + end + +TrainerTower_Lobby_EventScript_BaldingMan:: @ 8164AEF + msgbox TrainerTower_Lobby_Text_StairsTougherThanAnyBattle, MSGBOX_NPC + end diff --git a/data/maps/TrainerTower_Lobby/text.inc b/data/maps/TrainerTower_Lobby/text.inc new file mode 100644 index 000000000..4e6bb8b07 --- /dev/null +++ b/data/maps/TrainerTower_Lobby/text.inc @@ -0,0 +1,120 @@ +@ All Trainer Tower text (Lobby and Roof) is interleaved here + +TrainerTower_Lobby_Text_WelcomeToTrainerTower:: @ 817C794 + .string "Hello!\p" + .string "Welcome to TRAINER TOWER where\n" + .string "TRAINERS gather from all over!$" + +TrainerTower_Lobby_Text_TrainersUpToFloorNum:: @ 817C7D9 + .string "TRAINERS from all over the world\n" + .string "gather here to battle.\p" + .string "Let me see…\p" + .string "Right now, there are TRAINERS only\n" + .string "up to Floor {STR_VAR_1}.$" + +TrainerTower_Lobby_Text_TrainersUpEighthFloor:: @ 817C850 + .string "TRAINERS are awaiting your\n" + .string "challenge up to the eighth floor.$" + +TrainerTower_Lobby_Text_LikeToChallengeTrainers:: @ 817C88D + .string "Would you like to challenge the\n" + .string "waiting TRAINERS?$" + +TrainerTower_Lobby_Text_StartClockGetSetGo:: @ 817C8BF + .string "Okay, I'll get the clock started,\n" + .string "so give it everything you have.\p" + .string "On your marks…\p" + .string "Get set…\p" + .string "Go!$" + +TrainerTower_Lobby_Text_PleaseVisitUsAgain:: @ 817C91D + .string "Please do visit us again!$" + +TrainerTower_Lobby_Text_TooBadComeBackTryAgain:: @ 817C937 + .string "That was too bad.\p" + .string "I think you put in a tremendous\n" + .string "effort in your battling.\p" + .string "Please come back and try again!$" + +TrainerTower_Lobby_Text_GiveItYourBest:: @ 817C9A2 + .string "I hope you give it your best.$" + +TrainerTower_Lobby_Text_MoveCounterHereWhenTrainersSwitch:: @ 817C9C0 + .string "When the TRAINERS switch places,\n" + .string "the movement can be hectic.\p" + .string "To avoid the stampede, we moved\n" + .string "the reception counter here.\p" + .string "I'm sorry for the inconvenience.$" + +TrainerTower_Roof_Text_ImOwnerBattledPerfectly:: @ 817CA5A + .string "Hello…\p" + .string "I am the owner of this TOWER…\p" + .string "How the sky soars above this\n" + .string "rooftop…\p" + .string "The caress of the winds up here…\p" + .string "It's all so perfect…\p" + .string "The way you battled…\n" + .string "It, too, was perfection…$" + +TrainerTower_Roof_Text_ThisIsForYou:: @ 817CB09 + .string "This is for you…$" + +TrainerTower_Roof_Text_DoneItInRecordTime:: @ 817CB1A + .string "Oh!\n" + .string "Stupendous!\p" + .string "It's marvelous how you've come up\n" + .string "here so quickly.\p" + .string "The fact is, you've done it in\n" + .string "record time…\p" + .string "I'll have your record posted at\n" + .string "the reception counter.$" + +TrainerTower_Roof_Text_TookSweetTimeGettingHere:: @ 817CBC0 + .string "You seem to have taken your sweet\n" + .string "time getting here…$" + +TrainerTower_Roof_Text_IdLikeToSeeBetterTime:: @ 817CBF5 + .string "What I would like to see is a\n" + .string "better time out of you…\p" + .string "I'm counting on you.\p" + .string "Until then, farewell…$" + +TrainerTower_Text_XMinYZSec:: @ 817CC56 + .string "{STR_VAR_1} min. {STR_VAR_2}.{STR_VAR_3} sec.$" + +TrainerTower_Lobby_Text_HereAreTheResults:: @ 817CC69 + .string "せいせきひょうです$" + +TrainerTower_Lobby_Text_NeedTwoMonsForDouble:: @ 817CC73 + .string "This is a two-on-two battle.\p" + .string "You may not battle unless you have\n" + .string "at least two POKéMON.$" + +TrainerTower_Lobby_Text_ExplainTrainerTower:: @ 817CCC9 + .string "Here at TRAINER TOWER, there is an\n" + .string "event called TIME ATTACK.\p" + .string "You will be timed on how quickly\n" + .string "you can get from the reception\l" + .string "counter to the OWNER on the roof.\p" + .string "The best times will be recorded on\n" + .string "the Time Board.\p" + .string "Try competing with friends to see\n" + .string "who can beat it the fastest.\p" + .string "You will not earn any EXP. Points\n" + .string "or money by beating TRAINERS here.$" + +TrainerTower_Lobby_Text_ThanksForCompeting:: @ 817CE1F + .string "Thank you for competing!$" + +TrainerTower_Lobby_Text_WonderWhatKindsOfTrainers:: @ 817CE38 + .string "I'm here to see how good I am.\p" + .string "I wonder what kinds of TRAINERS\n" + .string "are waiting for me?\p" + .string "It's nerve-racking!$" + +TrainerTower_Lobby_Text_StairsTougherThanAnyBattle:: @ 817CE9F + .string "Gasp, gasp…\n" + .string "Gasp…\p" + .string "Never mind battling! These stairs…\n" + .string "They're tougher than any battle…$" + diff --git a/data/maps/TrainerTower_Roof/map.json b/data/maps/TrainerTower_Roof/map.json new file mode 100644 index 000000000..c9a98a144 --- /dev/null +++ b/data/maps/TrainerTower_Roof/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_TRAINER_TOWER_ROOF", + "name": "TrainerTower_Roof", + "layout": "LAYOUT_TRAINER_TOWER_ROOF", + "music": "MUS_T_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_Owner", + "flag": "FLAG_TEMP_6" + } + ], + "warp_events": [ + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_8F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} diff --git a/data/maps/TrainerTower_Roof/scripts.inc b/data/maps/TrainerTower_Roof/scripts.inc new file mode 100644 index 000000000..b338e3a62 --- /dev/null +++ b/data/maps/TrainerTower_Roof/scripts.inc @@ -0,0 +1,10 @@ +TrainerTower_Roof_MapScripts:: @ 8164828 + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +@ Below script is unused, the identical version in the 1F script is used instead + +TrainerTower_Roof_EventScript_Owner:: @ 8164833 + call TrainerTower_EventScript_SpeakToOwner + end diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 05f1cd544..3793fd9fc 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -178,17 +178,17 @@ ], "gMapGroup2": [ "NavelRock_Exterior", - "SevenIsland_TrainerTower_1F", - "SevenIsland_TrainerTower_2F", - "SevenIsland_TrainerTower_3F", - "SevenIsland_TrainerTower_4F", - "SevenIsland_TrainerTower_5F", - "SevenIsland_TrainerTower_6F", - "SevenIsland_TrainerTower_7F", - "SevenIsland_TrainerTower_8F", - "SevenIsland_TrainerTower_Roof", - "SevenIsland_TrainerTower_Lobby", - "SevenIsland_TrainerTower_Elevator", + "TrainerTower_1F", + "TrainerTower_2F", + "TrainerTower_3F", + "TrainerTower_4F", + "TrainerTower_5F", + "TrainerTower_6F", + "TrainerTower_7F", + "TrainerTower_8F", + "TrainerTower_Roof", + "TrainerTower_Lobby", + "TrainerTower_Elevator", "FiveIsland_LostCave_Entrance", "FiveIsland_LostCave_Room1", "FiveIsland_LostCave_Room2", diff --git a/data/scripts/trainer_tower.inc b/data/scripts/trainer_tower.inc index 2a5a84f72..224bbdd19 100644 --- a/data/scripts/trainer_tower.inc +++ b/data/scripts/trainer_tower.inc @@ -1,320 +1,297 @@ -SevenIsland_TrainerTower_1F_MapScript1_1C4F54:: @ 81C4F54 -SevenIsland_TrainerTower_2F_MapScript1_1C4F54:: @ 81C4F54 -SevenIsland_TrainerTower_3F_MapScript1_1C4F54:: @ 81C4F54 -SevenIsland_TrainerTower_4F_MapScript1_1C4F54:: @ 81C4F54 -SevenIsland_TrainerTower_5F_MapScript1_1C4F54:: @ 81C4F54 -SevenIsland_TrainerTower_6F_MapScript1_1C4F54:: @ 81C4F54 -SevenIsland_TrainerTower_7F_MapScript1_1C4F54:: @ 81C4F54 -SevenIsland_TrainerTower_8F_MapScript1_1C4F54:: @ 81C4F54 -SevenIsland_TrainerTower_Elevator_MapScript1_1C4F54:: @ 81C4F54 -SevenIsland_TrainerTower_Roof_MapScript1_1C4F54:: @ 81C4F54 +@ Local IDs apply to all floors (not lobby or roof) +.equ LOCALID_TRAINER_DOUBLES1, 2 +.equ LOCALID_TRAINER_SINGLES, 3 +.equ LOCALID_TRAINER_KNOCKOUT, 4 +.equ LOCALID_TRAINER_DOUBLES2, 5 + +.equ HIDE_TRAINER_DOUBLES1, FLAG_TEMP_2 +.equ HIDE_TRAINER_SINGLES, FLAG_TEMP_3 +.equ HIDE_TRAINER_KNOCKOUT, FLAG_TEMP_4 +.equ HIDE_TRAINER_DOUBLES2, FLAG_TEMP_5 +.equ HIDE_OWNER, FLAG_TEMP_6 + +.equ DISABLE_SINGLES_TRIGGER, VAR_TEMP_E +.equ DISABLE_DOUBLES_TRIGGER, VAR_TEMP_F + + +@@ Map scripts + +TrainerTower_OnResume:: @ 81C4F54 setvar VAR_TEMP_2, 0 - setvar VAR_0x8004, 10 - special sub_815D9E8 + ttower_resumetimer end -SevenIsland_TrainerTower_1F_MapScript2_1C4F62:: @ 81C4F62 -SevenIsland_TrainerTower_2F_MapScript2_1C4F62:: @ 81C4F62 -SevenIsland_TrainerTower_3F_MapScript2_1C4F62:: @ 81C4F62 -SevenIsland_TrainerTower_4F_MapScript2_1C4F62:: @ 81C4F62 -SevenIsland_TrainerTower_5F_MapScript2_1C4F62:: @ 81C4F62 -SevenIsland_TrainerTower_6F_MapScript2_1C4F62:: @ 81C4F62 -SevenIsland_TrainerTower_7F_MapScript2_1C4F62:: @ 81C4F62 -SevenIsland_TrainerTower_8F_MapScript2_1C4F62:: @ 81C4F62 - setvar VAR_0x8004, 0 - special sub_815D9E8 +TrainerTower_OnTransition:: @ 81C4F62 + ttower_initfloor switch VAR_RESULT - case 0, EventScript_1C4FA7 - case 1, EventScript_1C4FC5 - case 2, EventScript_1C5019 - setflag FLAG_TEMP_2 - setflag FLAG_TEMP_3 - setflag FLAG_TEMP_4 - setflag FLAG_TEMP_5 - setvar VAR_TEMP_E, 1 - setvar VAR_TEMP_F, 1 + case CHALLENGE_TYPE_SINGLE, TrainerTower_EventScript_SetObjectsSingles + case CHALLENGE_TYPE_DOUBLE, TrainerTower_EventScript_SetObjectsDoubles + case CHALLENGE_TYPE_KNOCKOUT, TrainerTower_EventScript_SetObjectsKnockout + setflag HIDE_TRAINER_DOUBLES1 + setflag HIDE_TRAINER_SINGLES + setflag HIDE_TRAINER_KNOCKOUT + setflag HIDE_TRAINER_DOUBLES2 + setvar DISABLE_SINGLES_TRIGGER, TRUE + setvar DISABLE_DOUBLES_TRIGGER, TRUE end -EventScript_1C4FA7:: @ 81C4FA7 - setflag FLAG_TEMP_2 - setflag FLAG_TEMP_4 - setflag FLAG_TEMP_5 - setvar VAR_TEMP_F, 1 - setobjectxyperm 3, 15, 13 - setobjectmovementtype 3, 9 - goto EventScript_1C5042 - -EventScript_1C4FC5:: @ 81C4FC5 - setflag FLAG_TEMP_3 - setflag FLAG_TEMP_4 - setvar VAR_TEMP_E, 1 - setvar VAR_0x8004, 5 - special sub_815D9E8 - compare VAR_RESULT, 1 - goto_if_eq EventScript_1C4FFE - setobjectxyperm 2, 10, 12 - setobjectmovementtype 2, 9 - setobjectxyperm 5, 10, 13 - setobjectmovementtype 5, 9 - goto EventScript_1C5042 - -EventScript_1C4FFE:: @ 81C4FFE - setobjectxyperm 2, 10, 12 - setobjectmovementtype 2, 8 - setobjectxyperm 5, 11, 12 - setobjectmovementtype 5, 8 - goto EventScript_1C5042 - -EventScript_1C5019:: @ 81C5019 - setflag FLAG_TEMP_5 - setvar VAR_TEMP_F, 1 - setobjectxyperm 2, 10, 10 - setobjectmovementtype 2, 8 - setobjectxyperm 3, 14, 13 - setobjectmovementtype 3, 9 - setobjectxyperm 4, 10, 16 - setobjectmovementtype 4, 7 -EventScript_1C5042: - setflag FLAG_TEMP_6 +TrainerTower_EventScript_SetObjectsSingles:: @ 81C4FA7 + setflag HIDE_TRAINER_DOUBLES1 + setflag HIDE_TRAINER_KNOCKOUT + setflag HIDE_TRAINER_DOUBLES2 + setvar DISABLE_DOUBLES_TRIGGER, TRUE + setobjectxyperm LOCALID_TRAINER_SINGLES, 15, 13 + setobjectmovementtype LOCALID_TRAINER_SINGLES, MOVEMENT_TYPE_FACE_LEFT + goto TrainerTower_EventScript_HideOwner + +TrainerTower_EventScript_SetObjectsDoubles:: @ 81C4FC5 + setflag HIDE_TRAINER_SINGLES + setflag HIDE_TRAINER_KNOCKOUT + setvar DISABLE_SINGLES_TRIGGER, TRUE + ttower_isfloorbeaten + compare VAR_RESULT, TRUE + goto_if_eq TrainerTower_EventScript_SetObjectsDoublesAlreadyBeaten + setobjectxyperm LOCALID_TRAINER_DOUBLES1, 10, 12 + setobjectmovementtype LOCALID_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_TRAINER_DOUBLES2, 10, 13 + setobjectmovementtype LOCALID_TRAINER_DOUBLES2, MOVEMENT_TYPE_FACE_LEFT + goto TrainerTower_EventScript_HideOwner + +TrainerTower_EventScript_SetObjectsDoublesAlreadyBeaten:: @ 81C4FFE + setobjectxyperm LOCALID_TRAINER_DOUBLES1, 10, 12 + setobjectmovementtype LOCALID_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_DOWN + setobjectxyperm LOCALID_TRAINER_DOUBLES2, 11, 12 + setobjectmovementtype LOCALID_TRAINER_DOUBLES2, MOVEMENT_TYPE_FACE_DOWN + goto TrainerTower_EventScript_HideOwner + +@ Knockout challenge re-uses trainer objects +TrainerTower_EventScript_SetObjectsKnockout:: @ 81C5019 + setflag HIDE_TRAINER_DOUBLES2 + setvar DISABLE_DOUBLES_TRIGGER, TRUE + setobjectxyperm LOCALID_TRAINER_DOUBLES1, 10, 10 + setobjectmovementtype LOCALID_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_DOWN + setobjectxyperm LOCALID_TRAINER_SINGLES, 14, 13 + setobjectmovementtype LOCALID_TRAINER_SINGLES, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_TRAINER_KNOCKOUT, 10, 16 + setobjectmovementtype LOCALID_TRAINER_KNOCKOUT, MOVEMENT_TYPE_FACE_UP +TrainerTower_EventScript_HideOwner: + setflag HIDE_OWNER end -SevenIsland_TrainerTower_1F_MapScript3_1C5046:: @ 81C5046 -SevenIsland_TrainerTower_2F_MapScript3_1C5046:: @ 81C5046 -SevenIsland_TrainerTower_3F_MapScript3_1C5046:: @ 81C5046 -SevenIsland_TrainerTower_4F_MapScript3_1C5046:: @ 81C5046 -SevenIsland_TrainerTower_5F_MapScript3_1C5046:: @ 81C5046 -SevenIsland_TrainerTower_6F_MapScript3_1C5046:: @ 81C5046 -SevenIsland_TrainerTower_7F_MapScript3_1C5046:: @ 81C5046 -SevenIsland_TrainerTower_8F_MapScript3_1C5046:: @ 81C5046 -SevenIsland_TrainerTower_Elevator_MapScript2_1C5046:: @ 81C5046 -SevenIsland_TrainerTower_Roof_MapScript2_1C5046:: @ 81C5046 - map_script_2 VAR_TEMP_2, 0, EventScript_1C5050 +TrainerTower_OnFrame:: @ 81C5046 + map_script_2 VAR_TEMP_2, 0, TrainerTower_EventScript_EnterFloor .2byte 0 -EventScript_1C5050:: @ 81C5050 +TrainerTower_EventScript_EnterFloor:: @ 81C5050 setvar VAR_TEMP_2, 1 - setvar VAR_0x8004, 5 - special sub_815D9E8 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C5072 - setvar VAR_TEMP_E, 1 - setvar VAR_TEMP_F, 1 -EventScript_1C5072: - setvar VAR_0x8004, 18 - special sub_815D9E8 - compare VAR_RESULT, 1 - goto_if_eq EventScript_1C5086 + ttower_isfloorbeaten + compare VAR_RESULT, FALSE + goto_if_eq TrainerTower_EventScript_EndEnterFloor + setvar DISABLE_SINGLES_TRIGGER, TRUE + setvar DISABLE_DOUBLES_TRIGGER, TRUE +TrainerTower_EventScript_EndEnterFloor: + ttower_shouldexit + compare VAR_RESULT, TRUE + goto_if_eq TrainerTower_EventScript_WarpToLobby end -EventScript_1C5086:: @ 81C5086 - warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 9, 7 +@ Never reached +TrainerTower_EventScript_WarpToLobby:: @ 81C5086 + warp MAP_TRAINER_TOWER_LOBBY, 255, 9, 7 waitstate -EventScript_1C508F:: - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 0 - special sub_815D9E8 + + +@@ Battle scripts + +TrainerTower_EventScript_TriggerBattle:: + ttower_getchallengetype switch VAR_RESULT - case 0, EventScript_1C50C2 - case 1, EventScript_1C510D - case 2, EventScript_1C515C -EventScript_1C50C2: - setvar VAR_0x8004, 19 - special sub_815D9E8 - applymovement 3, Movement_ExclamationMark + case CHALLENGE_TYPE_SINGLE, TrainerTower_EventScript_DoSingleBattle + case CHALLENGE_TYPE_DOUBLE, TrainerTower_EventScript_DoDoubleBattle + case CHALLENGE_TYPE_KNOCKOUT, TrainerTower_EventScript_DoKnockoutBattle + +TrainerTower_EventScript_DoSingleBattle: + ttower_encountermusic + applymovement LOCALID_TRAINER_SINGLES, Movement_ExclamationMark waitmovement 0 - applymovement 3, Movement_Delay48 + applymovement LOCALID_TRAINER_SINGLES, Movement_Delay48 waitmovement 0 - setvar VAR_TEMP_E, 1 - applymovement 3, Movement_1C5541 + setvar DISABLE_SINGLES_TRIGGER, TRUE + applymovement LOCALID_TRAINER_SINGLES, TrainerTower_Movement_SingleTrainerApproach waitmovement 0 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 0 - special sub_815D9E8 + ttower_getspeech TRAINER_TOWER_TEXT_INTRO, 0 msgbox gStringVar4 closemessage - goto EventScript_1C5219 + goto TrainerTower_EventScript_DoBattle -EventScript_1C510D:: @ 81C510D - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_TEMP_3 - special sub_815D9E8 +TrainerTower_EventScript_DoDoubleBattle:: @ 81C510D + ttower_getspeech TRAINER_TOWER_TEXT_INTRO, VAR_TEMP_3 msgbox gStringVar4 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 + setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_SPEECH + setvar VAR_0x8005, TRAINER_TOWER_TEXT_INTRO addvar VAR_TEMP_3, 1 compare VAR_TEMP_3, 1 - goto_if_eq EventScript_1C5146 + goto_if_eq TrainerTower_EventScript_DoSecondTrainerIntro setvar VAR_TEMP_3, 0 -EventScript_1C5146: +TrainerTower_EventScript_DoSecondTrainerIntro: copyvar VAR_0x8006, VAR_TEMP_3 - special sub_815D9E8 + special CallTrainerTowerFunc msgbox gStringVar4 closemessage - goto EventScript_1C5219 + goto TrainerTower_EventScript_DoBattle -EventScript_1C515C:: @ 81C515C +TrainerTower_EventScript_DoKnockoutBattle:: @ 81C515C switch VAR_TEMP_1 - case 0, EventScript_1C5182 - case 1, EventScript_1C51AD - case 2, EventScript_1C51D8 -EventScript_1C5182: - setvar VAR_0x8004, 19 - special sub_815D9E8 - applymovement 4, Movement_ExclamationMark + case 0, TrainerTower_EventScript_DoKnockoutBattle1 + case 1, TrainerTower_EventScript_DoKnockoutBattle2 + case 2, TrainerTower_EventScript_DoKnockoutBattle3 + +TrainerTower_EventScript_DoKnockoutBattle1: + ttower_encountermusic + applymovement LOCALID_TRAINER_KNOCKOUT, Movement_ExclamationMark waitmovement 0 - applymovement 4, Movement_Delay48 + applymovement LOCALID_TRAINER_KNOCKOUT, Movement_Delay48 waitmovement 0 - applymovement 4, Movement_1C5546 + applymovement LOCALID_TRAINER_KNOCKOUT, TrainerTower_Movement_BottomKnockoutTrainerApproach waitmovement 0 - goto EventScript_1C51FE + goto TrainerTower_EventScript_DoKnockoutBattleIntro -EventScript_1C51AD:: @ 81C51AD - setvar VAR_0x8004, 19 - special sub_815D9E8 - applymovement 2, Movement_ExclamationMark +TrainerTower_EventScript_DoKnockoutBattle2:: @ 81C51AD + ttower_encountermusic + applymovement LOCALID_TRAINER_DOUBLES1, Movement_ExclamationMark waitmovement 0 - applymovement 2, Movement_Delay48 + applymovement LOCALID_TRAINER_DOUBLES1, Movement_Delay48 waitmovement 0 - applymovement 2, Movement_1C5549 + applymovement LOCALID_TRAINER_DOUBLES1, TrainerTower_Movement_TopKnockoutTrainerApproach waitmovement 0 - goto EventScript_1C51FE + goto TrainerTower_EventScript_DoKnockoutBattleIntro -EventScript_1C51D8:: @ 81C51D8 - setvar VAR_0x8004, 19 - special sub_815D9E8 - applymovement 3, Movement_ExclamationMark +TrainerTower_EventScript_DoKnockoutBattle3:: @ 81C51D8 + ttower_encountermusic + applymovement LOCALID_TRAINER_SINGLES, Movement_ExclamationMark waitmovement 0 - applymovement 3, Movement_Delay48 + applymovement LOCALID_TRAINER_SINGLES, Movement_Delay48 waitmovement 0 - applymovement 3, Movement_1C5542 + applymovement LOCALID_TRAINER_SINGLES, TrainerTower_Movement_RightKnockoutTrainerApproach waitmovement 0 -EventScript_1C51FE: - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_TEMP_1 - special sub_815D9E8 +TrainerTower_EventScript_DoKnockoutBattleIntro: + ttower_getspeech TRAINER_TOWER_TEXT_INTRO, VAR_TEMP_1 msgbox gStringVar4 closemessage -EventScript_1C5219: - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - special sub_815D9E8 +TrainerTower_EventScript_DoBattle: + ttower_dobattle waitstate switch VAR_RESULT - case 1, EventScript_1C524D - case 2, EventScript_1C52E0 - case 3, EventScript_1C52E0 -EventScript_1C524D: - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 0 - special sub_815D9E8 + case B_OUTCOME_WON, TrainerTower_EventScript_WonBattle + case B_OUTCOME_LOST, TrainerTower_EventScript_WarpToLobbyLost + case B_OUTCOME_DREW, TrainerTower_EventScript_WarpToLobbyLost +TrainerTower_EventScript_WonBattle: + ttower_getchallengetype switch VAR_RESULT - case 0, EventScript_1C52D7 - case 1, EventScript_1C52BA - case 2, EventScript_1C5280 -EventScript_1C5280: + case CHALLENGE_TYPE_SINGLE, TrainerTower_EventScript_SetFloorCleared + case CHALLENGE_TYPE_DOUBLE, TrainerTower_EventScript_MoveDoublesTrainers + case CHALLENGE_TYPE_KNOCKOUT, TrainerTower_EventScript_CheckNextKnockoutBattle + +TrainerTower_EventScript_CheckNextKnockoutBattle: switch VAR_TEMP_1 - case 0, EventScript_1C52A6 - case 1, EventScript_1C52B0 - case 2, EventScript_1C52D0 -EventScript_1C52A6: + case 0, TrainerTower_EventScript_DoSecondKnockoutBattle + case 1, TrainerTower_EventScript_DoThirdKnockoutBattle + case 2, TrainerTower_EventScript_MoveLastKnockoutTrainer + +TrainerTower_EventScript_DoSecondKnockoutBattle: addvar VAR_TEMP_1, 1 - goto EventScript_1C515C + goto TrainerTower_EventScript_DoKnockoutBattle -EventScript_1C52B0:: @ 81C52B0 +TrainerTower_EventScript_DoThirdKnockoutBattle:: @ 81C52B0 addvar VAR_TEMP_1, 1 - goto EventScript_1C515C + goto TrainerTower_EventScript_DoKnockoutBattle -EventScript_1C52BA:: @ 81C52BA - applymovement 5, Movement_1C554C +TrainerTower_EventScript_MoveDoublesTrainers:: @ 81C52BA + applymovement LOCALID_TRAINER_DOUBLES2, TrainerTower_Movement_DoublesTrainer2OutOfWay waitmovement 0 - applymovement 2, Movement_1C5550 - goto EventScript_1C52D7 - -EventScript_1C52D0:: @ 81C52D0 - applymovement 3, Movement_1C554D -EventScript_1C52D7: - setvar VAR_0x8004, 4 - special sub_815D9E8 + applymovement LOCALID_TRAINER_DOUBLES1, TrainerTower_Movement_DoublesTrainer1FaceDown + goto TrainerTower_EventScript_SetFloorCleared + +TrainerTower_EventScript_MoveLastKnockoutTrainer:: @ 81C52D0 + applymovement LOCALID_TRAINER_SINGLES, TrainerTower_Movement_LastKnockoutTrainerOutOfWay +TrainerTower_EventScript_SetFloorCleared: + ttower_clearedfloor end -EventScript_1C52E0:: @ 81C52E0 +TrainerTower_EventScript_WarpToLobbyLost:: @ 81C52E0 special HealPlayerParty - setvar VAR_0x8004, 11 - special sub_815D9E8 - warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 9, 7 + ttower_setlost + warp MAP_TRAINER_TOWER_LOBBY, 255, 9, 7 waitstate -EventScript_1C52F4:: @ 81C52F4 - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 0 - special sub_815D9E8 + +@@ Speaking to trainers after battle + +TrainerTower_EventScript_SpeakToDoublesTrainer1:: @ 81C52F4 + ttower_getchallengetype switch VAR_RESULT - case 0, EventScript_1C5327 - case 1, EventScript_1C5327 - case 2, EventScript_1C5331 -EventScript_1C5327: + case CHALLENGE_TYPE_SINGLE, TrainerTower_EventScript_DoublesTrainer1PostBattle + case CHALLENGE_TYPE_DOUBLE, TrainerTower_EventScript_DoublesTrainer1PostBattle + case CHALLENGE_TYPE_KNOCKOUT, TrainerTower_EventScript_KnockoutTrainer2PostBattle +TrainerTower_EventScript_DoublesTrainer1PostBattle: setvar VAR_0x8006, 0 - goto EventScript_1C5391 + goto TrainerTower_EventScript_DoPostBattleText -EventScript_1C5331:: @ 81C5331 +TrainerTower_EventScript_KnockoutTrainer2PostBattle:: @ 81C5331 setvar VAR_0x8006, 1 - goto EventScript_1C5391 + goto TrainerTower_EventScript_DoPostBattleText -EventScript_1C533B:: @ 81C533B - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 0 - special sub_815D9E8 +TrainerTower_EventScript_SpeakToSinglesTrainer:: @ 81C533B + ttower_getchallengetype switch VAR_RESULT - case 0, EventScript_1C536E - case 1, EventScript_1C536E - case 2, EventScript_1C5378 -EventScript_1C536E: + case CHALLENGE_TYPE_SINGLE, TrainerTower_EventScript_SinglesTrainerPostBattle + case CHALLENGE_TYPE_DOUBLE, TrainerTower_EventScript_SinglesTrainerPostBattle + case CHALLENGE_TYPE_KNOCKOUT, TrainerTower_EventScript_KnockoutTrainer3PostBattle +TrainerTower_EventScript_SinglesTrainerPostBattle: setvar VAR_0x8006, 0 - goto EventScript_1C5391 + goto TrainerTower_EventScript_DoPostBattleText -EventScript_1C5378:: @ 81C5378 +TrainerTower_EventScript_KnockoutTrainer3PostBattle:: @ 81C5378 setvar VAR_0x8006, 2 - goto EventScript_1C5391 + goto TrainerTower_EventScript_DoPostBattleText -EventScript_1C5382:: @ 81C5382 +TrainerTower_EventScript_SpeakToKnockoutTrainer:: @ 81C5382 setvar VAR_0x8006, 0 - goto EventScript_1C5391 + goto TrainerTower_EventScript_DoPostBattleText -EventScript_1C538C:: @ 81C538C +TrainerTower_EventScript_SpeakToDoublesTrainer2:: @ 81C538C setvar VAR_0x8006, 1 -EventScript_1C5391: - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 5 - special sub_815D9E8 +TrainerTower_EventScript_DoPostBattleText: + ttower_getspeech TRAINER_TOWER_TEXT_AFTER lock faceplayer msgbox gStringVar4 release return -EventScript_1C53AA:: @ 81C53AA + +@@ Speaking to owner + +TrainerTower_EventScript_SpeakToOwner:: @ 81C53AA lock faceplayer - setvar VAR_0x8004, 7 - special sub_815D9E8 + ttower_getownerstate switch VAR_RESULT - case 0, EventScript_1C53DA - case 1, EventScript_1C53E2 - case 2, EventScript_1C5492 -EventScript_1C53DA: - msgbox Text_17CA5A -EventScript_1C53E2: - setvar VAR_0x8004, 8 - special sub_815D9E8 + case 0, TrainerTower_Roof_EventScript_Arrived + case 1, TrainerTower_Roof_EventScript_GivePrize + case 2, TrainerTower_Roof_EventScript_OwnerEnd + +TrainerTower_Roof_EventScript_Arrived: + msgbox TrainerTower_Roof_Text_ImOwnerBattledPerfectly +TrainerTower_Roof_EventScript_GivePrize: + ttower_giveprize switch VAR_RESULT - case 0, EventScript_1C5410 - case 1, EventScript_1C543A - case 2, EventScript_1C544F -EventScript_1C5410: - msgbox Text_17CB09 + case 0, TrainerTower_Roof_EventScript_ReceivePrize + case 1, TrainerTower_Roof_EventScript_NoRoomForPrize + case 2, TrainerTower_Roof_EventScript_CheckFinalTime + +TrainerTower_Roof_EventScript_ReceivePrize: + msgbox TrainerTower_Roof_Text_ThisIsForYou textcolor 3 playfanfare MUS_FANFA1 message Text_ObtainedTheX @@ -323,128 +300,105 @@ EventScript_1C5410: getstdstring 2, STDSTRING_ITEMS_POCKET msgbox Text_PutItemAway call EventScript_1A6675 - goto EventScript_1C544F + goto TrainerTower_Roof_EventScript_CheckFinalTime -EventScript_1C543A:: @ 81C543A - msgbox Text_17CB09 +TrainerTower_Roof_EventScript_NoRoomForPrize:: @ 81C543A + msgbox TrainerTower_Roof_Text_ThisIsForYou msgbox Text_BagIsFull - goto EventScript_1C544F + goto TrainerTower_Roof_EventScript_CheckFinalTime -EventScript_1C544F:: @ 81C544F - setvar VAR_0x8004, 9 - special sub_815D9E8 +TrainerTower_Roof_EventScript_CheckFinalTime:: @ 81C544F + ttower_checkfinaltime switch VAR_RESULT - case 0, EventScript_1C547D - case 1, EventScript_1C548A - case 2, EventScript_1C5492 -EventScript_1C547D: - msgbox Text_17CB1A - goto EventScript_1C5492 - -EventScript_1C548A:: @ 81C548A - msgbox Text_17CBC0 -EventScript_1C5492: - msgbox Text_17CBF5 + case 0, TrainerTower_Roof_EventScript_NewRecord + case 1, TrainerTower_Roof_EventScript_NoNewRecord + case 2, TrainerTower_Roof_EventScript_OwnerEnd + +TrainerTower_Roof_EventScript_NewRecord: + msgbox TrainerTower_Roof_Text_DoneItInRecordTime + goto TrainerTower_Roof_EventScript_OwnerEnd + +TrainerTower_Roof_EventScript_NoNewRecord:: @ 81C548A + msgbox TrainerTower_Roof_Text_TookSweetTimeGettingHere +TrainerTower_Roof_EventScript_OwnerEnd: + msgbox TrainerTower_Roof_Text_IdLikeToSeeBetterTime release return -EventScript_1C549C:: @ 81C549C +TrainerTower_EventScript_ShowTime:: @ 81C549C lockall - setvar VAR_0x8004, 13 - special sub_815D9E8 - msgbox Text_17CC56 + ttower_gettime + msgbox TrainerTower_Text_XMinYZSec releaseall end -SevenIsland_TrainerTower_2F_EventScript_1C54AF:: @ 81C54AF -SevenIsland_TrainerTower_4F_EventScript_1C54AF:: @ 81C54AF -SevenIsland_TrainerTower_6F_EventScript_1C54AF:: @ 81C54AF -SevenIsland_TrainerTower_8F_EventScript_1C54AF:: @ 81C54AF -SevenIsland_TrainerTower_5F_EventScript_1C54AF:: @ 81C54AF -SevenIsland_TrainerTower_7F_EventScript_1C54AF:: @ 81C54AF -SevenIsland_TrainerTower_3F_EventScript_1C54AF:: @ 81C54AF -SevenIsland_TrainerTower_1F_EventScript_1C54AF:: @ 81C54AF - goto EventScript_1C508F - -SevenIsland_TrainerTower_2F_EventScript_1C54B4:: @ 81C54B4 -SevenIsland_TrainerTower_4F_EventScript_1C54B4:: @ 81C54B4 -SevenIsland_TrainerTower_6F_EventScript_1C54B4:: @ 81C54B4 -SevenIsland_TrainerTower_8F_EventScript_1C54B4:: @ 81C54B4 -SevenIsland_TrainerTower_5F_EventScript_1C54B4:: @ 81C54B4 -SevenIsland_TrainerTower_7F_EventScript_1C54B4:: @ 81C54B4 -SevenIsland_TrainerTower_3F_EventScript_1C54B4:: @ 81C54B4 -SevenIsland_TrainerTower_1F_EventScript_1C54B4:: @ 81C54B4 + +@@ Battle triggers + +TrainerTower_EventScript_SingleBattleTrigger:: @ 81C54AF + goto TrainerTower_EventScript_TriggerBattle + +TrainerTower_EventScript_DoubleBattleTriggerTop:: @ 81C54B4 setvar VAR_TEMP_3, 0 - setvar VAR_0x8004, 16 - special sub_815D9E8 - compare VAR_RESULT, 0 - goto_if_ne EventScript_1C5528 - setvar VAR_0x8004, 19 - special sub_815D9E8 - applymovement 2, Movement_ExclamationMark + ttower_checkdoubles + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS + goto_if_ne TrainerTower_EventScript_IneligibleForDoubleBattle + ttower_encountermusic + applymovement LOCALID_TRAINER_DOUBLES1, Movement_ExclamationMark waitmovement 0 - applymovement 2, Movement_Delay48 - goto EventScript_1C551B - -SevenIsland_TrainerTower_2F_EventScript_1C54EA:: @ 81C54EA -SevenIsland_TrainerTower_4F_EventScript_1C54EA:: @ 81C54EA -SevenIsland_TrainerTower_6F_EventScript_1C54EA:: @ 81C54EA -SevenIsland_TrainerTower_8F_EventScript_1C54EA:: @ 81C54EA -SevenIsland_TrainerTower_5F_EventScript_1C54EA:: @ 81C54EA -SevenIsland_TrainerTower_7F_EventScript_1C54EA:: @ 81C54EA -SevenIsland_TrainerTower_3F_EventScript_1C54EA:: @ 81C54EA -SevenIsland_TrainerTower_1F_EventScript_1C54EA:: @ 81C54EA + applymovement LOCALID_TRAINER_DOUBLES1, Movement_Delay48 + goto TrainerTower_EventScript_TriggerDoubleBattle + +TrainerTower_EventScript_DoubleBattleTriggerBottom:: @ 81C54EA setvar VAR_TEMP_3, 1 - setvar VAR_0x8004, 16 - special sub_815D9E8 - compare VAR_RESULT, 0 - goto_if_ne EventScript_1C5528 - setvar VAR_0x8004, 19 - special sub_815D9E8 - applymovement 5, Movement_ExclamationMark + ttower_checkdoubles + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS + goto_if_ne TrainerTower_EventScript_IneligibleForDoubleBattle + ttower_encountermusic + applymovement LOCALID_TRAINER_DOUBLES2, Movement_ExclamationMark waitmovement 0 - applymovement 5, Movement_Delay48 -EventScript_1C551B: + applymovement LOCALID_TRAINER_DOUBLES2, Movement_Delay48 +TrainerTower_EventScript_TriggerDoubleBattle: waitmovement 0 - setvar VAR_TEMP_F, 1 - goto EventScript_1C508F + setvar DISABLE_DOUBLES_TRIGGER, TRUE + goto TrainerTower_EventScript_TriggerBattle -EventScript_1C5528:: @ 81C5528 +TrainerTower_EventScript_IneligibleForDoubleBattle:: @ 81C5528 lockall playse SE_PINPON - msgbox Text_17CC73 + msgbox TrainerTower_Lobby_Text_NeedTwoMonsForDouble closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1C5544 + applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Movement_PushPlayerBack waitmovement 0 releaseall end -Movement_1C5541: +TrainerTower_Movement_SingleTrainerApproach: walk_left -Movement_1C5542:: @ 81C5542 +TrainerTower_Movement_RightKnockoutTrainerApproach:: @ 81C5542 walk_left walk_left -Movement_1C5544: +TrainerTower_Movement_PushPlayerBack: walk_left step_end -Movement_1C5546:: @ 81C5546 +TrainerTower_Movement_BottomKnockoutTrainerApproach:: @ 81C5546 walk_up walk_up step_end -Movement_1C5549:: @ 81C5549 +TrainerTower_Movement_TopKnockoutTrainerApproach:: @ 81C5549 walk_down walk_down step_end -Movement_1C554C:: @ 81C554C +TrainerTower_Movement_DoublesTrainer2OutOfWay:: @ 81C554C walk_right -Movement_1C554D: +TrainerTower_Movement_LastKnockoutTrainerOutOfWay: walk_up face_down step_end -Movement_1C5550:: @ 81C5550 +TrainerTower_Movement_DoublesTrainer1FaceDown:: @ 81C5550 face_down step_end diff --git a/data/specials.inc b/data/specials.inc index 92256dfab..4313c0d16 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -412,7 +412,7 @@ gSpecials:: @ 815FD60 def_special Special_SSAnneDepartureCutscene def_special IsPokemonJumpSpeciesInParty def_special IsNationalPokedexEnabled - def_special sub_815D9E8 + def_special CallTrainerTowerFunc def_special ShowPokemonJumpRecords def_special Special_ItemIsTM_GetMoveName def_special Special_DaisyMassageServices @@ -439,7 +439,7 @@ gSpecials:: @ 815FD60 def_special Special_SetDeoxysTriangleObjectPal def_special sub_8147594 def_special Special_BadEggInParty - def_special sub_815D834 + def_special ReadTrainerHillAndValidate def_special HasAllMons def_special Special_PlayerIsNotInTrainerTowerLobby def_special Special_BrailleCursorToggle -- cgit v1.2.3 From c63a889bf45d9cd6da0668703fad55941e531fa2 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 24 Jan 2020 05:09:50 -0500 Subject: Floor beaten --> floor cleared --- data/scripts/trainer_tower.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/scripts/trainer_tower.inc b/data/scripts/trainer_tower.inc index 224bbdd19..45ffc285d 100644 --- a/data/scripts/trainer_tower.inc +++ b/data/scripts/trainer_tower.inc @@ -48,7 +48,7 @@ TrainerTower_EventScript_SetObjectsDoubles:: @ 81C4FC5 setflag HIDE_TRAINER_SINGLES setflag HIDE_TRAINER_KNOCKOUT setvar DISABLE_SINGLES_TRIGGER, TRUE - ttower_isfloorbeaten + ttower_isfloorcleared compare VAR_RESULT, TRUE goto_if_eq TrainerTower_EventScript_SetObjectsDoublesAlreadyBeaten setobjectxyperm LOCALID_TRAINER_DOUBLES1, 10, 12 @@ -84,7 +84,7 @@ TrainerTower_OnFrame:: @ 81C5046 TrainerTower_EventScript_EnterFloor:: @ 81C5050 setvar VAR_TEMP_2, 1 - ttower_isfloorbeaten + ttower_isfloorcleared compare VAR_RESULT, FALSE goto_if_eq TrainerTower_EventScript_EndEnterFloor setvar DISABLE_SINGLES_TRIGGER, TRUE -- cgit v1.2.3 From 35c0e1f60abcd81543c596df8ede65b418e79bd9 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 25 Jan 2020 02:05:30 -0500 Subject: Document Celadon City scripts --- data/event_scripts.s | 429 ++------------------- data/maps/CeladonCity/map.json | 36 +- data/maps/CeladonCity/scripts.inc | 72 ++-- data/maps/CeladonCity/text.inc | 36 +- data/maps/CeladonCity_Condominiums_1F/map.json | 12 +- data/maps/CeladonCity_Condominiums_1F/scripts.inc | 36 +- data/maps/CeladonCity_Condominiums_1F/text.inc | 16 +- data/maps/CeladonCity_Condominiums_2F/map.json | 8 +- data/maps/CeladonCity_Condominiums_2F/scripts.inc | 4 +- data/maps/CeladonCity_Condominiums_2F/text.inc | 2 +- data/maps/CeladonCity_Condominiums_3F/map.json | 24 +- data/maps/CeladonCity_Condominiums_3F/scripts.inc | 44 +-- data/maps/CeladonCity_Condominiums_3F/text.inc | 18 +- data/maps/CeladonCity_Condominiums_Roof/map.json | 4 +- .../maps/CeladonCity_Condominiums_Roof/scripts.inc | 4 +- data/maps/CeladonCity_Condominiums_Roof/text.inc | 2 +- .../CeladonCity_Condominiums_RoofRoom/map.json | 10 +- .../CeladonCity_Condominiums_RoofRoom/scripts.inc | 86 ++--- .../CeladonCity_Condominiums_RoofRoom/text.inc | 18 +- data/maps/CeladonCity_DepartmentStore_1F/map.json | 6 +- .../CeladonCity_DepartmentStore_1F/scripts.inc | 12 +- data/maps/CeladonCity_DepartmentStore_1F/text.inc | 6 +- data/maps/CeladonCity_DepartmentStore_2F/map.json | 10 +- .../CeladonCity_DepartmentStore_2F/scripts.inc | 24 +- data/maps/CeladonCity_DepartmentStore_2F/text.inc | 12 +- data/maps/CeladonCity_DepartmentStore_3F/map.json | 30 +- .../CeladonCity_DepartmentStore_3F/scripts.inc | 44 +-- data/maps/CeladonCity_DepartmentStore_3F/text.inc | 50 ++- data/maps/CeladonCity_DepartmentStore_4F/map.json | 8 +- .../CeladonCity_DepartmentStore_4F/scripts.inc | 18 +- data/maps/CeladonCity_DepartmentStore_4F/text.inc | 29 +- data/maps/CeladonCity_DepartmentStore_5F/map.json | 10 +- .../CeladonCity_DepartmentStore_5F/scripts.inc | 24 +- data/maps/CeladonCity_DepartmentStore_5F/text.inc | 6 +- .../CeladonCity_DepartmentStore_Elevator/map.json | 4 +- .../scripts.inc | 94 +++-- .../maps/CeladonCity_DepartmentStore_Roof/map.json | 12 +- .../CeladonCity_DepartmentStore_Roof/scripts.inc | 250 ++++++------ .../maps/CeladonCity_DepartmentStore_Roof/text.inc | 36 +- data/maps/CeladonCity_GameCorner/map.json | 70 ++-- data/maps/CeladonCity_GameCorner/scripts.inc | 382 +++++++++--------- data/maps/CeladonCity_GameCorner/text.inc | 70 ++-- .../maps/CeladonCity_GameCorner_PrizeRoom/map.json | 10 +- .../CeladonCity_GameCorner_PrizeRoom/scripts.inc | 258 ++++++------- .../maps/CeladonCity_GameCorner_PrizeRoom/text.inc | 18 +- data/maps/CeladonCity_Gym/map.json | 20 +- data/maps/CeladonCity_Gym/scripts.inc | 78 ++-- data/maps/CeladonCity_Gym/text.inc | 80 ++-- data/maps/CeladonCity_Hotel/map.json | 8 +- data/maps/CeladonCity_Hotel/scripts.inc | 16 +- data/maps/CeladonCity_Hotel/text.inc | 11 +- data/maps/CeladonCity_House1/map.json | 6 +- data/maps/CeladonCity_House1/scripts.inc | 12 +- data/maps/CeladonCity_House1/text.inc | 6 +- data/maps/CeladonCity_PokemonCenter_1F/map.json | 8 +- data/maps/CeladonCity_PokemonCenter_1F/scripts.inc | 14 +- data/maps/CeladonCity_PokemonCenter_1F/text.inc | 6 +- data/maps/CeladonCity_Restaurant/map.json | 10 +- data/maps/CeladonCity_Restaurant/scripts.inc | 34 +- data/maps/CeladonCity_Restaurant/text.inc | 16 +- data/scripts/fame_checker.inc | 8 +- data/scripts/trainer_card.inc | 384 ++++++++++++++++++ data/text/fame_checker.inc | 197 +--------- data/text/trainer_card.inc | 167 ++++++++ 64 files changed, 1696 insertions(+), 1739 deletions(-) create mode 100644 data/scripts/trainer_card.inc create mode 100644 data/text/trainer_card.inc (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index ab8c2d023..6b7b60349 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -21,6 +21,7 @@ #include "constants/fame_checker.h" #include "constants/seagallop.h" #include "constants/game_stat.h" +#include "constants/coins.h" #include "constants/menu.h" #include "constants/battle_setup.h" #include "constants/map_scripts.h" @@ -1707,419 +1708,35 @@ Text_1ACD45:: @ 81ACD45 .include "data/scripts/fame_checker.inc" .include "data/text/fame_checker.inc" -CeladonCity_GameCorner_EventScript_1B2867:: @ 81B2867 - lockall - showmoneybox 0, 0, 0 - msgbox gUnknown_81B1D7D, MSGBOX_YESNO - compare VAR_RESULT, NO - goto_if_eq EventScript_1B2926 - checkmoney 50, 0 - compare VAR_RESULT, FALSE - goto_if_eq EventScript_1B292B - playse SE_SHOP - removemoney 50, 0 - updatemoneybox 0, 0, 0 - waitse - message gUnknown_81B1E24 - waitmessage - multichoice 21, 0, MULTICHOICE_TRAINER_CARD_ICON_TINT, TRUE - switch VAR_RESULT - case 0, EventScript_1B28DB - case 1, EventScript_1B28E6 - case 2, EventScript_1B28F1 - case 3, EventScript_1B28FC - end - -EventScript_1B28DB:: @ 81B28DB - setvar VAR_0x8004, 0 - goto EventScript_1B2907 - -EventScript_1B28E5:: @ 81B28E5 - end - -EventScript_1B28E6:: @ 81B28E6 - setvar VAR_0x8004, 1 - goto EventScript_1B2907 - -EventScript_1B28F0:: @ 81B28F0 - end - -EventScript_1B28F1:: @ 81B28F1 - setvar VAR_0x8004, 2 - goto EventScript_1B2907 - -EventScript_1B28FB:: @ 81B28FB - end - -EventScript_1B28FC:: @ 81B28FC - setvar VAR_0x8004, 3 - goto EventScript_1B2907 - -EventScript_1B2906:: @ 81B2906 - end - -EventScript_1B2907:: @ 81B2907 - message gUnknown_81B1E42 - waitmessage - playse MUS_ME_PHOTO - dofieldeffect FLDEFF_UNK_45 - delay 60 - special Special_UpdateTrainerCardPhotoIcons - msgbox gUnknown_81B1E7D - hidemoneybox 0, 0 - releaseall - end - -EventScript_1B2926:: @ 81B2926 - hidemoneybox 0, 0 - releaseall - end - -EventScript_1B292B:: @ 81B292B - msgbox gUnknown_81B1E07 - hidemoneybox 0, 0 - releaseall - end - -FourIsland_House2_EventScript_1B2938:: @ 81B2938 - lock - specialvar VAR_0x8008, Special_StickerLadyGetBragFlags - goto_if_unset FLAG_MET_STICKER_LADY, EventScript_1B2951 - goto_if_set FLAG_MET_STICKER_LADY, EventScript_1B2994 - end - -EventScript_1B2951:: @ 81B2951 - setflag FLAG_MET_STICKER_LADY - msgbox gUnknown_81B1EB3 - applymovement 1, Movement_FacePlayer - waitmovement 0 - playse SE_PIN - applymovement 1, Movement_ExclamationMark - waitmovement 0 - applymovement 1, Movement_Delay48 - waitmovement 0 - compare VAR_0x8008, 0 - goto_if_eq EventScript_1B2B8E - message gUnknown_81B1EF8 - waitmessage - goto EventScript_1B29D0 - -EventScript_1B2993:: @ 81B2993 - end - -EventScript_1B2994:: @ 81B2994 - applymovement 1, Movement_FacePlayer - waitmovement 0 - goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 - compare VAR_0x8008, 0 - goto_if_eq EventScript_1B29C6 - message gUnknown_81B2025 - waitmessage - goto EventScript_1B29D0 - -EventScript_1B29C5:: @ 81B29C5 - end - -EventScript_1B29C6:: @ 81B29C6 - msgbox gUnknown_81B1FEF - release - end - -EventScript_1B29D0:: @ 81B29D0 - switch VAR_0x8008 - case 1, EventScript_1B2A23 - case 2, EventScript_1B2A4F - case 4, EventScript_1B2A7B - case 3, EventScript_1B2AA7 - case 5, EventScript_1B2ADE - case 6, EventScript_1B2B15 - case 7, EventScript_1B2B4C - end - -EventScript_1B2A23:: @ 81B2A23 - multichoice 15, 8, MULTICHOICE_HOF_QUIT, FALSE - switch VAR_RESULT - case 0, EventScript_1B2B98 - case 1, EventScript_1B2DF6 - case SCR_MENU_CANCEL, EventScript_1B2DF6 - end - -EventScript_1B2A4F:: @ 81B2A4F - multichoice 16, 8, MULTICHOICE_EGGS_QUIT, FALSE - switch VAR_RESULT - case 0, EventScript_1B2C62 - case 1, EventScript_1B2DF6 - case SCR_MENU_CANCEL, EventScript_1B2DF6 - end - -EventScript_1B2A7B:: @ 81B2A7B - multichoice 15, 8, MULTICHOICE_VICTORIES_QUIT, FALSE - switch VAR_RESULT - case 0, EventScript_1B2D2C - case 1, EventScript_1B2DF6 - case SCR_MENU_CANCEL, EventScript_1B2DF6 - end - -EventScript_1B2AA7:: @ 81B2AA7 - multichoice 15, 6, MULTICHOICE_HOF_EGGS_QUIT, FALSE - switch VAR_RESULT - case 0, EventScript_1B2B98 - case 1, EventScript_1B2C62 - case 2, EventScript_1B2DF6 - case SCR_MENU_CANCEL, EventScript_1B2DF6 - end - -EventScript_1B2ADE:: @ 81B2ADE - multichoice 15, 6, MULTICHOICE_HOF_VICTORIES_QUIT, FALSE - switch VAR_RESULT - case 0, EventScript_1B2B98 - case 1, EventScript_1B2D2C - case 2, EventScript_1B2DF6 - case SCR_MENU_CANCEL, EventScript_1B2DF6 - end - -EventScript_1B2B15:: @ 81B2B15 - multichoice 15, 6, MULTICHOICE_EGGS_VICTORIES_QUIT, FALSE - switch VAR_RESULT - case 0, EventScript_1B2C62 - case 1, EventScript_1B2D2C - case 2, EventScript_1B2DF6 - case SCR_MENU_CANCEL, EventScript_1B2DF6 - end - -EventScript_1B2B4C:: @ 81B2B4C - multichoice 15, 5, MULTICHOICE_HOF_EGGS_VICTORIES_QUIT, FALSE - switch VAR_RESULT - case 0, EventScript_1B2B98 - case 1, EventScript_1B2C62 - case 2, EventScript_1B2D2C - case 3, EventScript_1B2DF6 - case SCR_MENU_CANCEL, EventScript_1B2DF6 - end - -EventScript_1B2B8E:: @ 81B2B8E - msgbox gUnknown_81B1EF8 - release - end - -EventScript_1B2B98:: @ 81B2B98 - compare VAR_0x8004, 39 - goto_if_le EventScript_1B2BC5 - compare VAR_0x8004, 99 - goto_if_le EventScript_1B2BE3 - compare VAR_0x8004, 199 - goto_if_le EventScript_1B2C01 - compare VAR_0x8004, 200 - goto_if_ge EventScript_1B2C1F - end - -EventScript_1B2BC5:: @ 81B2BC5 - compare VAR_HOF_BRAG_STATE, 1 - goto_if_eq EventScript_1B2C3D - setvar VAR_HOF_BRAG_STATE, 1 - msgbox gUnknown_81B206E - goto EventScript_1B2C51 - -EventScript_1B2BE2:: @ 81B2BE2 - end - -EventScript_1B2BE3:: @ 81B2BE3 - compare VAR_HOF_BRAG_STATE, 2 - goto_if_eq EventScript_1B2C3D - setvar VAR_HOF_BRAG_STATE, 2 - msgbox gUnknown_81B20CF - goto EventScript_1B2C51 - -EventScript_1B2C00:: @ 81B2C00 - end - -EventScript_1B2C01:: @ 81B2C01 - compare VAR_HOF_BRAG_STATE, 3 - goto_if_eq EventScript_1B2C3D - setvar VAR_HOF_BRAG_STATE, 3 - msgbox gUnknown_81B2133 - goto EventScript_1B2C51 - -EventScript_1B2C1E:: @ 81B2C1E - end - -EventScript_1B2C1F:: @ 81B2C1F - compare VAR_HOF_BRAG_STATE, 4 - goto_if_eq EventScript_1B2C47 - setvar VAR_HOF_BRAG_STATE, 4 - msgbox gUnknown_81B21C4 - goto EventScript_1B2C51 - -EventScript_1B2C3C:: @ 81B2C3C - end - -EventScript_1B2C3D:: @ 81B2C3D - msgbox gUnknown_81B227C - release - end - -EventScript_1B2C47:: @ 81B2C47 - msgbox gUnknown_81B22B0 - release - end - -EventScript_1B2C51:: @ 81B2C51 - textcolor 3 - playfanfare MUS_FANFA1 - message gUnknown_81B2242 - waitmessage - waitfanfare - delay 90 - release - end - -EventScript_1B2C62:: @ 81B2C62 - compare VAR_0x8005, 99 - goto_if_le EventScript_1B2C8F - compare VAR_0x8005, 199 - goto_if_le EventScript_1B2CAD - compare VAR_0x8005, 299 - goto_if_le EventScript_1B2CCB - compare VAR_0x8005, 300 - goto_if_ge EventScript_1B2CE9 - end - -EventScript_1B2C8F:: @ 81B2C8F - compare VAR_EGG_BRAG_STATE, 1 - goto_if_eq EventScript_1B2D07 - setvar VAR_EGG_BRAG_STATE, 1 - msgbox gUnknown_81B2308 - goto EventScript_1B2D1B - -EventScript_1B2CAC:: @ 81B2CAC - end - -EventScript_1B2CAD:: @ 81B2CAD - compare VAR_EGG_BRAG_STATE, 2 - goto_if_eq EventScript_1B2D07 - setvar VAR_EGG_BRAG_STATE, 2 - msgbox gUnknown_81B2372 - goto EventScript_1B2D1B - -EventScript_1B2CCA:: @ 81B2CCA - end - -EventScript_1B2CCB:: @ 81B2CCB - compare VAR_EGG_BRAG_STATE, 3 - goto_if_eq EventScript_1B2D07 - setvar VAR_EGG_BRAG_STATE, 3 - msgbox gUnknown_81B23E0 - goto EventScript_1B2D1B - -EventScript_1B2CE8:: @ 81B2CE8 - end +gUnknown_81B1C8B:: @ 81B1C8B + .string "Hmm…\n" + .string "Is that right…$" -EventScript_1B2CE9:: @ 81B2CE9 - compare VAR_EGG_BRAG_STATE, 4 - goto_if_eq EventScript_1B2D11 - setvar VAR_EGG_BRAG_STATE, 4 - msgbox gUnknown_81B2448 - goto EventScript_1B2D1B +gUnknown_81B1C9F:: @ 81B1C9F + .string "Oh!\n" + .string "Look, look!$" -EventScript_1B2D06:: @ 81B2D06 - end - -EventScript_1B2D07:: @ 81B2D07 - msgbox gUnknown_81B251B - release - end - -EventScript_1B2D11:: @ 81B2D11 - msgbox gUnknown_81B254F - release - end - -EventScript_1B2D1B:: @ 81B2D1B - textcolor 3 - playfanfare MUS_FANFA1 - message gUnknown_81B24EA - waitmessage - waitfanfare - delay 90 - release - end - -EventScript_1B2D2C:: @ 81B2D2C - compare VAR_0x8006, 19 - goto_if_le EventScript_1B2D59 - compare VAR_0x8006, 49 - goto_if_le EventScript_1B2D77 - compare VAR_0x8006, 99 - goto_if_le EventScript_1B2D95 - compare VAR_0x8006, 100 - goto_if_ge EventScript_1B2DB3 - end - -EventScript_1B2D59:: @ 81B2D59 - compare VAR_LINK_WIN_BRAG_STATE, 1 - goto_if_eq EventScript_1B2DD1 - setvar VAR_LINK_WIN_BRAG_STATE, 1 - msgbox gUnknown_81B25A7 - goto EventScript_1B2DE5 - -EventScript_1B2D76:: @ 81B2D76 - end - -EventScript_1B2D77:: @ 81B2D77 - compare VAR_LINK_WIN_BRAG_STATE, 2 - goto_if_eq EventScript_1B2DD1 - setvar VAR_LINK_WIN_BRAG_STATE, 2 - msgbox gUnknown_81B2609 - goto EventScript_1B2DE5 +gUnknown_81B1CAF:: @ 81B1CAF + .string "Read it, read it!$" -EventScript_1B2D94:: @ 81B2D94 - end - -EventScript_1B2D95:: @ 81B2D95 - compare VAR_LINK_WIN_BRAG_STATE, 3 - goto_if_eq EventScript_1B2DD1 - setvar VAR_LINK_WIN_BRAG_STATE, 3 - msgbox gUnknown_81B267B - goto EventScript_1B2DE5 - -EventScript_1B2DB2:: @ 81B2DB2 - end - -EventScript_1B2DB3:: @ 81B2DB3 - compare VAR_LINK_WIN_BRAG_STATE, 4 - goto_if_eq EventScript_1B2DDB - setvar VAR_LINK_WIN_BRAG_STATE, 4 - msgbox gUnknown_81B26F6 - goto EventScript_1B2DE5 +gUnknown_81B1CC1:: @ 81B1CC1 + .string "TRAINER TIPS\p" + .string "Press START to open the MENU!$" -EventScript_1B2DD0:: @ 81B2DD0 - end +gUnknown_81B1CEC:: @ 81B1CEC + .string "Signs are useful, aren't they?$" -EventScript_1B2DD1:: @ 81B2DD1 - msgbox gUnknown_81B27DB - release - end +gUnknown_81B1D0B:: @ 81B1D0B + .string "Look, look!\p" + .string "I copied what it said on one of\n" + .string "those TRAINER TIPS signs!$" -EventScript_1B2DDB:: @ 81B2DDB - msgbox gUnknown_81B280F - release - end - -EventScript_1B2DE5:: @ 81B2DE5 - textcolor 3 - playfanfare MUS_FANFA1 - message gUnknown_81B27A6 - waitmessage - waitfanfare - delay 90 - release - end - -EventScript_1B2DF6:: @ 81B2DF6 - release - end +gUnknown_81B1D51:: @ 81B1D51 + .string "TRAINER TIPS!\p" + .string "Press START to open the MENU!$" + .include "data/text/trainer_card.inc" + .include "data/scripts/trainer_card.inc" .include "data/text/help_system.inc" .include "data/scripts/cable_club.inc" .include "data/scripts/field_moves.inc" diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index 5a4644854..706d9fa35 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166CFA", + "script": "CeladonCity_EventScript_RocketGrunt1", "flag": "FLAG_HIDE_CELADON_ROCKETS" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166CC5", + "script": "CeladonCity_EventScript_FatMan", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166CDC", + "script": "CeladonCity_EventScript_Poliwrath", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 4, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166C99", + "script": "CeladonCity_EventScript_LittleGirl", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 5, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166CAD", + "script": "CeladonCity_EventScript_Woman", "flag": "0" }, { @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166CB6", + "script": "CeladonCity_EventScript_OldMan2", "flag": "0" }, { @@ -125,7 +125,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166D03", + "script": "CeladonCity_EventScript_RocketGrunt2", "flag": "FLAG_HIDE_CELADON_ROCKETS" }, { @@ -138,7 +138,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166CA2", + "script": "CeladonCity_EventScript_OldMan1", "flag": "0" }, { @@ -177,7 +177,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166D0C", + "script": "CeladonCity_EventScript_Boy", "flag": "0" }, { @@ -216,7 +216,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166D15", + "script": "CeladonCity_EventScript_SilphCoScientist", "flag": "FLAG_HIDE_CELADON_ROCKETS" } ], @@ -320,56 +320,56 @@ "x": 45, "y": 23, "elevation": 0, - "script": "CeladonCity_EventScript_166D5A" + "script": "CeladonCity_EventScript_TrainerTips2" }, { "type": "bg_event_type_0", "x": 38, "y": 23, "elevation": 0, - "script": "CeladonCity_EventScript_166D63" + "script": "CeladonCity_EventScript_PrizeExchangeSign" }, { "type": "bg_event_type_0", "x": 33, "y": 23, "elevation": 0, - "script": "CeladonCity_EventScript_166D6C" + "script": "CeladonCity_EventScript_GameCornerSign" }, { "type": "bg_event_type_0", "x": 22, "y": 18, "elevation": 3, - "script": "CeladonCity_EventScript_166D27" + "script": "CeladonCity_EventScript_CitySign" }, { "type": "bg_event_type_0", "x": 26, "y": 11, "elevation": 0, - "script": "CeladonCity_EventScript_166D48" + "script": "CeladonCity_EventScript_MansionSign" }, { "type": "bg_event_type_0", "x": 33, "y": 16, "elevation": 0, - "script": "CeladonCity_EventScript_166D1E" + "script": "CeladonCity_EventScript_TrainerTips1" }, { "type": "bg_event_type_0", "x": 18, "y": 14, "elevation": 3, - "script": "CeladonCity_EventScript_166D51" + "script": "CeladonCity_EventScript_DeptStoreSign" }, { "type": "bg_event_type_0", "x": 16, "y": 31, "elevation": 0, - "script": "CeladonCity_EventScript_166D30" + "script": "CeladonCity_EventScript_GymSign" }, { "type": "hidden_item", diff --git a/data/maps/CeladonCity/scripts.inc b/data/maps/CeladonCity/scripts.inc index b27d12178..a7d7eddc4 100644 --- a/data/maps/CeladonCity/scripts.inc +++ b/data/maps/CeladonCity/scripts.inc @@ -6,44 +6,44 @@ CeladonCity_OnTransition:: @ 8166C95 setworldmapflag FLAG_WORLD_MAP_CELADON_CITY end -CeladonCity_EventScript_166C99:: @ 8166C99 - msgbox gUnknown_817FEC3, MSGBOX_NPC +CeladonCity_EventScript_LittleGirl:: @ 8166C99 + msgbox CeladonCity_Text_GotMyKoffingInCinnabar, MSGBOX_NPC end -CeladonCity_EventScript_166CA2:: @ 8166CA2 +CeladonCity_EventScript_OldMan1:: @ 8166CA2 lock - msgbox gUnknown_817FF1C + msgbox CeladonCity_Text_GymIsGreatFullOfWomen release end -CeladonCity_EventScript_166CAD:: @ 8166CAD - msgbox gUnknown_817FF4A, MSGBOX_NPC +CeladonCity_EventScript_Woman:: @ 8166CAD + msgbox CeladonCity_Text_GameCornerIsBadForCitysImage, MSGBOX_NPC end -CeladonCity_EventScript_166CB6:: @ 8166CB6 - msgbox gUnknown_817FFC5, MSGBOX_NPC +CeladonCity_EventScript_OldMan2:: @ 8166CB6 + msgbox CeladonCity_Text_BlewItAllAtSlots, MSGBOX_NPC end CeladonCity_EventScript_SoftboiledTutor:: @ 8166CBF goto EventScript_SoftboiledTutor end -CeladonCity_EventScript_166CC5:: @ 8166CC5 +CeladonCity_EventScript_FatMan:: @ 8166CC5 lock faceplayer - msgbox gUnknown_818001B + msgbox CeladonCity_Text_MyTrustedPalPoliwrath closemessage applymovement 2, Movement_FaceOriginalDirection waitmovement 0 release end -CeladonCity_EventScript_166CDC:: @ 8166CDC +CeladonCity_EventScript_Poliwrath:: @ 8166CDC lock faceplayer waitse playmoncry SPECIES_POLIWRATH, 0 - msgbox gUnknown_8180075 + msgbox CeladonCity_Text_Poliwrath closemessage waitmoncry applymovement 3, Movement_FaceOriginalDirection @@ -51,53 +51,53 @@ CeladonCity_EventScript_166CDC:: @ 8166CDC release end -CeladonCity_EventScript_166CFA:: @ 8166CFA - msgbox gUnknown_81800C2, MSGBOX_NPC +CeladonCity_EventScript_RocketGrunt1:: @ 8166CFA + msgbox CeladonCity_Text_KeepOutOfTeamRocketsWay, MSGBOX_NPC end -CeladonCity_EventScript_166D03:: @ 8166D03 - msgbox gUnknown_818008C, MSGBOX_NPC +CeladonCity_EventScript_RocketGrunt2:: @ 8166D03 + msgbox CeladonCity_Text_GetLostOrIllPunchYou, MSGBOX_NPC end -CeladonCity_EventScript_166D0C:: @ 8166D0C - msgbox gUnknown_8180300, MSGBOX_NPC +CeladonCity_EventScript_Boy:: @ 8166D0C + msgbox CeladonCity_Text_ScaldedTongueOnTea, MSGBOX_NPC end -CeladonCity_EventScript_166D15:: @ 8166D15 - msgbox gUnknown_81804E1, MSGBOX_NPC +CeladonCity_EventScript_SilphCoScientist:: @ 8166D15 + msgbox CeladonCity_Text_SomeoneStoleSilphScope, MSGBOX_NPC end -CeladonCity_EventScript_166D1E:: @ 8166D1E - msgbox gUnknown_81800E1, MSGBOX_SIGN +CeladonCity_EventScript_TrainerTips1:: @ 8166D1E + msgbox CeladonCity_Text_ExplainXAccuracyDireHit, MSGBOX_SIGN end -CeladonCity_EventScript_166D27:: @ 8166D27 - msgbox gUnknown_818017A, MSGBOX_SIGN +CeladonCity_EventScript_CitySign:: @ 8166D27 + msgbox CeladonCity_Text_CitySign, MSGBOX_SIGN end -CeladonCity_EventScript_166D30:: @ 8166D30 +CeladonCity_EventScript_GymSign:: @ 8166D30 lockall famechecker FAMECHECKER_ERIKA, 0 - msgbox gUnknown_81801A2 + msgbox CeladonCity_Text_GymSign releaseall end -CeladonCity_EventScript_166D48:: @ 8166D48 - msgbox gUnknown_81801E5, MSGBOX_SIGN +CeladonCity_EventScript_MansionSign:: @ 8166D48 + msgbox CeladonCity_Text_MansionSign, MSGBOX_SIGN end -CeladonCity_EventScript_166D51:: @ 8166D51 - msgbox gUnknown_81801F5, MSGBOX_SIGN +CeladonCity_EventScript_DeptStoreSign:: @ 8166D51 + msgbox CeladonCity_Text_DeptStoreSign, MSGBOX_SIGN end -CeladonCity_EventScript_166D5A:: @ 8166D5A - msgbox gUnknown_8180224, MSGBOX_SIGN +CeladonCity_EventScript_TrainerTips2:: @ 8166D5A + msgbox CeladonCity_Text_GuardSpecProtectsFromStatus, MSGBOX_SIGN end -CeladonCity_EventScript_166D63:: @ 8166D63 - msgbox gUnknown_81802A4, MSGBOX_SIGN +CeladonCity_EventScript_PrizeExchangeSign:: @ 8166D63 + msgbox CeladonCity_Text_PrizeExchangeSign, MSGBOX_SIGN end -CeladonCity_EventScript_166D6C:: @ 8166D6C - msgbox gUnknown_81802CF, MSGBOX_SIGN +CeladonCity_EventScript_GameCornerSign:: @ 8166D6C + msgbox CeladonCity_Text_GameCornerSign, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity/text.inc b/data/maps/CeladonCity/text.inc index 40f489e3c..a61cdba6d 100644 --- a/data/maps/CeladonCity/text.inc +++ b/data/maps/CeladonCity/text.inc @@ -1,40 +1,40 @@ -gUnknown_817FEC3:: @ 817FEC3 +CeladonCity_Text_GotMyKoffingInCinnabar:: @ 817FEC3 .string "I got my KOFFING in CINNABAR.\p" .string "It's usually nice, but it breathes\n" .string "poison when it's angry.$" -gUnknown_817FF1C:: @ 817FF1C +CeladonCity_Text_GymIsGreatFullOfWomen:: @ 817FF1C .string "Heheh! This GYM is great!\n" .string "It's full of women!$" -gUnknown_817FF4A:: @ 817FF4A +CeladonCity_Text_GameCornerIsBadForCitysImage:: @ 817FF4A .string "CELADON takes pride in its efforts\n" .string "to keep the city beautiful.\p" .string "That's why the new GAME CORNER is\n" .string "bad for our city's image.$" -gUnknown_817FFC5:: @ 817FFC5 +CeladonCity_Text_BlewItAllAtSlots:: @ 817FFC5 .string "Moan…\n" .string "I blew it all at the slots!\p" .string "I knew I should have cashed in my\n" .string "COINS for prizes!$" -gUnknown_818001B:: @ 818001B +CeladonCity_Text_MyTrustedPalPoliwrath:: @ 818001B .string "This is my trusted pal, POLIWRATH.\p" .string "It evolved from a POLIWHIRL when\n" .string "I used a WATER STONE.$" -gUnknown_8180075:: @ 8180075 +CeladonCity_Text_Poliwrath:: @ 8180075 .string "POLIWRATH: Ribi ribit!$" -gUnknown_818008C:: @ 818008C +CeladonCity_Text_GetLostOrIllPunchYou:: @ 818008C .string "What are you staring at?\n" .string "Get lost, or I'll punch you.$" -gUnknown_81800C2:: @ 81800C2 +CeladonCity_Text_KeepOutOfTeamRocketsWay:: @ 81800C2 .string "Keep out of TEAM ROCKET's way!$" -gUnknown_81800E1:: @ 81800E1 +CeladonCity_Text_ExplainXAccuracyDireHit:: @ 81800E1 .string "TRAINER TIPS\p" .string "X ACCURACY boosts the accuracy of\n" .string "techniques.\p" @@ -43,23 +43,23 @@ gUnknown_81800E1:: @ 81800E1 .string "Get your items at the CELADON\n" .string "DEPT. STORE!$" -gUnknown_818017A:: @ 818017A +CeladonCity_Text_CitySign:: @ 818017A .string "CELADON CITY\n" .string "The City of Rainbow Dreams$" -gUnknown_81801A2:: @ 81801A2 +CeladonCity_Text_GymSign:: @ 81801A2 .string "CELADON CITY POKéMON GYM\n" .string "LEADER: ERIKA\l" .string "The Nature-Loving Princess!$" -gUnknown_81801E5:: @ 81801E5 +CeladonCity_Text_MansionSign:: @ 81801E5 .string "CELADON MANSION$" -gUnknown_81801F5:: @ 81801F5 +CeladonCity_Text_DeptStoreSign:: @ 81801F5 .string "Find what you need at the\n" .string "CELADON DEPT. STORE!$" -gUnknown_8180224:: @ 8180224 +CeladonCity_Text_GuardSpecProtectsFromStatus:: @ 8180224 .string "TRAINER TIPS\p" .string "GUARD SPEC. protects POKéMON\n" .string "from status-reduction moves during\l" @@ -67,15 +67,15 @@ gUnknown_8180224:: @ 8180224 .string "Get your items at the\n" .string "CELADON DEPT. STORE!$" -gUnknown_81802A4:: @ 81802A4 +CeladonCity_Text_PrizeExchangeSign:: @ 81802A4 .string "COINS exchanged for prizes!\n" .string "PRIZE EXCHANGE$" -gUnknown_81802CF:: @ 81802CF +CeladonCity_Text_GameCornerSign:: @ 81802CF .string "ROCKET GAME CORNER\n" .string "The playground for grown-ups!$" -gUnknown_8180300:: @ 8180300 +CeladonCity_Text_ScaldedTongueOnTea:: @ 8180300 .string "Aaaagh, ow…\n" .string "I scalded my tongue!\p" .string "This nice old lady in the MANSION\n" @@ -104,7 +104,7 @@ Text_SoftboiledWhichMon:: @ 8180484 Text_SoftboiledTaught:: @ 81804C4 .string "I wish you the best of luck!$" -gUnknown_81804E1:: @ 81804E1 +CeladonCity_Text_SomeoneStoleSilphScope:: @ 81804E1 .string "Oh, what am I to do…\p" .string "Someone stole our SILPH SCOPE.\p" .string "The thief came running this way,\n" diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json index a6f29e9d7..bcb4f815c 100644 --- a/data/maps/CeladonCity_Condominiums_1F/map.json +++ b/data/maps/CeladonCity_Condominiums_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_1F_EventScript_16C38E", + "script": "CeladonCity_Condominiums_1F_EventScript_Meowth", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_1F_EventScript_16C3A1", + "script": "CeladonCity_Condominiums_1F_EventScript_Clefairy", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_1F_EventScript_16C3B4", + "script": "CeladonCity_Condominiums_1F_EventScript_Nidoran", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_1F_EventScript_16C321", + "script": "CeladonCity_Condominiums_1F_EventScript_TeaWoman", "flag": "0" } ], @@ -117,14 +117,14 @@ "x": 8, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_1F_EventScript_16C3C7" + "script": "CeladonCity_Condominiums_1F_EventScript_SuiteSign" }, { "type": "bg_event_type_0", "x": 7, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_1F_EventScript_16C3C7" + "script": "CeladonCity_Condominiums_1F_EventScript_SuiteSign" } ] } diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc index 41912748b..0703d8cc4 100644 --- a/data/maps/CeladonCity_Condominiums_1F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_1F/scripts.inc @@ -1,63 +1,63 @@ CeladonCity_Condominiums_1F_MapScripts:: @ 816C320 .byte 0 -CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321 +CeladonCity_Condominiums_1F_EventScript_TeaWoman:: @ 816C321 lock faceplayer - goto_if_set FLAG_TALKED_TO_TEA_LADY_AFTER_HOF, EventScript_16C36A - goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_16C374 - goto_if_set FLAG_GOT_TEA, EventScript_16C36A - msgbox gUnknown_81960C9 + goto_if_set FLAG_TALKED_TO_TEA_LADY_AFTER_HOF, CeladonCity_Condominiums_1F_EventScript_TeaWomanAfterTea + goto_if_set FLAG_SYS_GAME_CLEAR, CeladonCity_Condominiums_1F_EventScript_TeaWomanMentionDaisy + goto_if_set FLAG_GOT_TEA, CeladonCity_Condominiums_1F_EventScript_TeaWomanAfterTea + msgbox CeladonCity_Condominiums_1F_Text_TryThisDrinkInstead setflag FLAG_GOT_TEA giveitem ITEM_TEA compare VAR_RESULT, FALSE goto_if_eq EventScript_BagIsFull - msgbox gUnknown_8196109 + msgbox CeladonCity_Condominiums_1F_Text_NothingBeatsThirstLikeTea release end -EventScript_16C36A:: @ 816C36A - msgbox gUnknown_8196148 +CeladonCity_Condominiums_1F_EventScript_TeaWomanAfterTea:: @ 816C36A + msgbox CeladonCity_Condominiums_1F_Text_MyDearMonsKeepMeCompany release end -EventScript_16C374:: @ 816C374 +CeladonCity_Condominiums_1F_EventScript_TeaWomanMentionDaisy:: @ 816C374 famechecker FAMECHECKER_DAISY, 4 setflag FLAG_TALKED_TO_TEA_LADY_AFTER_HOF - msgbox gUnknown_8196188 + msgbox CeladonCity_Condominiums_1F_Text_DaisyComesToBuyTea release end -CeladonCity_Condominiums_1F_EventScript_16C38E:: @ 816C38E +CeladonCity_Condominiums_1F_EventScript_Meowth:: @ 816C38E lock faceplayer waitse playmoncry SPECIES_MEOWTH, 0 - msgbox gUnknown_81960BB + msgbox CeladonCity_Condominiums_1F_Text_Meowth waitmoncry release end -CeladonCity_Condominiums_1F_EventScript_16C3A1:: @ 816C3A1 +CeladonCity_Condominiums_1F_EventScript_Clefairy:: @ 816C3A1 lock faceplayer waitse playmoncry SPECIES_CLEFAIRY, 0 - msgbox gUnknown_819625B + msgbox CeladonCity_Condominiums_1F_Text_Clefairy waitmoncry release end -CeladonCity_Condominiums_1F_EventScript_16C3B4:: @ 816C3B4 +CeladonCity_Condominiums_1F_EventScript_Nidoran:: @ 816C3B4 lock faceplayer waitse playmoncry SPECIES_NIDORAN_F, 0 - msgbox gUnknown_8196272 + msgbox CeladonCity_Condominiums_1F_Text_Nidoran waitmoncry release end -CeladonCity_Condominiums_1F_EventScript_16C3C7:: @ 816C3C7 - msgbox gUnknown_8196287, MSGBOX_SIGN +CeladonCity_Condominiums_1F_EventScript_SuiteSign:: @ 816C3C7 + msgbox CeladonCity_Condominiums_1F_Text_ManagersSuite, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_1F/text.inc b/data/maps/CeladonCity_Condominiums_1F/text.inc index 7cfb9c2a1..fa0512f76 100644 --- a/data/maps/CeladonCity_Condominiums_1F/text.inc +++ b/data/maps/CeladonCity_Condominiums_1F/text.inc @@ -1,21 +1,21 @@ -gUnknown_81960BB:: @ 81960BB +CeladonCity_Condominiums_1F_Text_Meowth:: @ 81960BB .string "MEOWTH: Meow!$" -gUnknown_81960C9:: @ 81960C9 +CeladonCity_Condominiums_1F_Text_TryThisDrinkInstead:: @ 81960C9 .string "You shouldn't spend all your money\n" .string "on drinks.\p" .string "Try this instead.$" -gUnknown_8196109:: @ 8196109 +CeladonCity_Condominiums_1F_Text_NothingBeatsThirstLikeTea:: @ 8196109 .string "Nothing beats thirst like some hot\n" .string "TEA.\p" .string "It really is the best.$" -gUnknown_8196148:: @ 8196148 +CeladonCity_Condominiums_1F_Text_MyDearMonsKeepMeCompany:: @ 8196148 .string "My dear POKéMON keep me company.\n" .string "MEOWTH even brings money home!$" -gUnknown_8196188:: @ 8196188 +CeladonCity_Condominiums_1F_Text_DaisyComesToBuyTea:: @ 8196188 .string "Oh, hello, dearie.\n" .string "Did you enjoy my TEA?\p" .string "By the way, dear. Are you, by any\n" @@ -25,13 +25,13 @@ gUnknown_8196188:: @ 8196188 .string "She visits the CELADON DEPT. STORE\n" .string "to buy some TEA.$" -gUnknown_819625B:: @ 819625B +CeladonCity_Condominiums_1F_Text_Clefairy:: @ 819625B .string "CLEFAIRY: Pi pippippi!$" -gUnknown_8196272:: @ 8196272 +CeladonCity_Condominiums_1F_Text_Nidoran:: @ 8196272 .string "NIDORAN♀: Kya kyaoo!$" -gUnknown_8196287:: @ 8196287 +CeladonCity_Condominiums_1F_Text_ManagersSuite:: @ 8196287 .string "CELADON MANSION\n" .string "Manager's Suite$" diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json index 33248a953..10e5eb1c6 100644 --- a/data/maps/CeladonCity_Condominiums_2F/map.json +++ b/data/maps/CeladonCity_Condominiums_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_2F_EventScript_1ACE9D", + "script": "CeladonCity_Condominiums_2F_EventScript_PokemonJournalErika", "flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_2F_EventScript_1ACE9D", + "script": "CeladonCity_Condominiums_2F_EventScript_PokemonJournalErika", "flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS" } ], @@ -77,14 +77,14 @@ "x": 8, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_2F_EventScript_16C3D1" + "script": "CeladonCity_Condominiums_2F_EventScript_MeetingRoomSign" }, { "type": "bg_event_type_0", "x": 7, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_2F_EventScript_16C3D1" + "script": "CeladonCity_Condominiums_2F_EventScript_MeetingRoomSign" } ] } diff --git a/data/maps/CeladonCity_Condominiums_2F/scripts.inc b/data/maps/CeladonCity_Condominiums_2F/scripts.inc index 53c0a90c0..9d952f2d7 100644 --- a/data/maps/CeladonCity_Condominiums_2F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_2F/scripts.inc @@ -1,6 +1,6 @@ CeladonCity_Condominiums_2F_MapScripts:: @ 816C3D0 .byte 0 -CeladonCity_Condominiums_2F_EventScript_16C3D1:: @ 816C3D1 - msgbox gUnknown_81962A7, MSGBOX_SIGN +CeladonCity_Condominiums_2F_EventScript_MeetingRoomSign:: @ 816C3D1 + msgbox CeladonCity_Condominiums_2F_Text_GameFreakMeetingRoom, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_2F/text.inc b/data/maps/CeladonCity_Condominiums_2F/text.inc index 1913e1529..30ab60a1d 100644 --- a/data/maps/CeladonCity_Condominiums_2F/text.inc +++ b/data/maps/CeladonCity_Condominiums_2F/text.inc @@ -1,3 +1,3 @@ -gUnknown_81962A7:: @ 81962A7 +CeladonCity_Condominiums_2F_Text_GameFreakMeetingRoom:: @ 81962A7 .string "GAME FREAK Meeting Room$" diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json index e491e8112..4a1fb023c 100644 --- a/data/maps/CeladonCity_Condominiums_3F/map.json +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C3DB", + "script": "CeladonCity_Condominiums_3F_EventScript_Programmer", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C3F6", + "script": "CeladonCity_Condominiums_3F_EventScript_Designer", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C3E4", + "script": "CeladonCity_Condominiums_3F_EventScript_GraphicArtist", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C3ED", + "script": "CeladonCity_Condominiums_3F_EventScript_Writer", "flag": "0" } ], @@ -103,56 +103,56 @@ "x": 8, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C435" + "script": "CeladonCity_Condominiums_3F_EventScript_DevelopmentRoomSign" }, { "type": "bg_event_type_1", "x": 1, "y": 9, "elevation": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C43E" + "script": "CeladonCity_Condominiums_3F_EventScript_Computer1" }, { "type": "bg_event_type_1", "x": 5, "y": 9, "elevation": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C447" + "script": "CeladonCity_Condominiums_3F_EventScript_Computer2" }, { "type": "bg_event_type_1", "x": 1, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C450" + "script": "CeladonCity_Condominiums_3F_EventScript_Computer3" }, { "type": "bg_event_type_0", "x": 7, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C435" + "script": "CeladonCity_Condominiums_3F_EventScript_DevelopmentRoomSign" }, { "type": "bg_event_type_1", "x": 0, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C450" + "script": "CeladonCity_Condominiums_3F_EventScript_Computer3" }, { "type": "bg_event_type_1", "x": 0, "y": 9, "elevation": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C43E" + "script": "CeladonCity_Condominiums_3F_EventScript_Computer1" }, { "type": "bg_event_type_1", "x": 4, "y": 9, "elevation": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C447" + "script": "CeladonCity_Condominiums_3F_EventScript_Computer2" } ] } diff --git a/data/maps/CeladonCity_Condominiums_3F/scripts.inc b/data/maps/CeladonCity_Condominiums_3F/scripts.inc index d7bb14293..878ed63e8 100644 --- a/data/maps/CeladonCity_Condominiums_3F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_3F/scripts.inc @@ -1,34 +1,34 @@ CeladonCity_Condominiums_3F_MapScripts:: @ 816C3DA .byte 0 -CeladonCity_Condominiums_3F_EventScript_16C3DB:: @ 816C3DB - msgbox gUnknown_81962BF, MSGBOX_NPC +CeladonCity_Condominiums_3F_EventScript_Programmer:: @ 816C3DB + msgbox CeladonCity_Condominiums_3F_Text_ImTheProgrammer, MSGBOX_NPC end -CeladonCity_Condominiums_3F_EventScript_16C3E4:: @ 816C3E4 - msgbox gUnknown_81962D7, MSGBOX_NPC +CeladonCity_Condominiums_3F_EventScript_GraphicArtist:: @ 816C3E4 + msgbox CeladonCity_Condominiums_3F_Text_ImTheGraphicArtist, MSGBOX_NPC end -CeladonCity_Condominiums_3F_EventScript_16C3ED:: @ 816C3ED - msgbox gUnknown_81962FB, MSGBOX_NPC +CeladonCity_Condominiums_3F_EventScript_Writer:: @ 816C3ED + msgbox CeladonCity_Condominiums_3F_Text_IWroteTheStory, MSGBOX_NPC end -CeladonCity_Condominiums_3F_EventScript_16C3F6:: @ 816C3F6 +CeladonCity_Condominiums_3F_EventScript_Designer:: @ 816C3F6 lock faceplayer specialvar VAR_RESULT, HasAllKantoMons - compare VAR_RESULT, 1 - goto_if_eq EventScript_16C412 - msgbox gUnknown_8196356 + compare VAR_RESULT, TRUE + goto_if_eq CeladonCity_Condominiums_3F_EventScript_CompletedPokedex + msgbox CeladonCity_Condominiums_3F_Text_ImGameDesignerShowMeFinishedPokedex release end -EventScript_16C412:: @ 816C412 - goto EventScript_16C418 +CeladonCity_Condominiums_3F_EventScript_CompletedPokedex:: @ 816C412 + goto CeladonCity_Condominiums_3F_EventScript_ShowDiploma end -EventScript_16C418:: @ 816C418 - message Text_1963CD +CeladonCity_Condominiums_3F_EventScript_ShowDiploma:: @ 816C418 + message CeladonCity_Condominiums_3F_Text_CompletedPokedexCongratulations waitmessage delay 60 goto_if_questlog EventScript_ReleaseEnd @@ -37,18 +37,18 @@ EventScript_16C418:: @ 816C418 release end -CeladonCity_Condominiums_3F_EventScript_16C435:: @ 816C435 - msgbox gUnknown_81964A8, MSGBOX_SIGN +CeladonCity_Condominiums_3F_EventScript_DevelopmentRoomSign:: @ 816C435 + msgbox CeladonCity_Condominiums_3F_Text_GameFreakDevelopmentRoom, MSGBOX_SIGN end -CeladonCity_Condominiums_3F_EventScript_16C43E:: @ 816C43E - msgbox gUnknown_819640C, MSGBOX_SIGN +CeladonCity_Condominiums_3F_EventScript_Computer1:: @ 816C43E + msgbox CeladonCity_Condominiums_3F_Text_ItsTheGameProgram, MSGBOX_SIGN end -CeladonCity_Condominiums_3F_EventScript_16C447:: @ 816C447 - msgbox gUnknown_819644B, MSGBOX_SIGN +CeladonCity_Condominiums_3F_EventScript_Computer2:: @ 816C447 + msgbox CeladonCity_Condominiums_3F_Text_SomeonesPlayingGame, MSGBOX_SIGN end -CeladonCity_Condominiums_3F_EventScript_16C450:: @ 816C450 - msgbox gUnknown_8196478, MSGBOX_SIGN +CeladonCity_Condominiums_3F_EventScript_Computer3:: @ 816C450 + msgbox CeladonCity_Condominiums_3F_Text_ItsScriptBetterNotLookAtEnding, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_3F/text.inc b/data/maps/CeladonCity_Condominiums_3F/text.inc index 3f7179dfe..d4f91594a 100644 --- a/data/maps/CeladonCity_Condominiums_3F/text.inc +++ b/data/maps/CeladonCity_Condominiums_3F/text.inc @@ -1,42 +1,42 @@ -gUnknown_81962BF:: @ 81962BF +CeladonCity_Condominiums_3F_Text_ImTheProgrammer:: @ 81962BF .string "Me?\n" .string "I'm the programmer!$" -gUnknown_81962D7:: @ 81962D7 +CeladonCity_Condominiums_3F_Text_ImTheGraphicArtist:: @ 81962D7 .string "I'm the graphic artist!\n" .string "I drew you!$" -gUnknown_81962FB:: @ 81962FB +CeladonCity_Condominiums_3F_Text_IWroteTheStory:: @ 81962FB .string "I wrote the story!\n" .string "Isn't ERIKA cute?\p" .string "I like MISTY a lot, too!\n" .string "Oh, and SABRINA, I like her!$" -gUnknown_8196356:: @ 8196356 +CeladonCity_Condominiums_3F_Text_ImGameDesignerShowMeFinishedPokedex:: @ 8196356 .string "Is that right?\p" .string "I'm the game designer!\p" .string "Filling up your POKéDEX is tough,\n" .string "but don't quit!\p" .string "When you finish, come tell me!$" -Text_1963CD:: @ 81963CD +CeladonCity_Condominiums_3F_Text_CompletedPokedexCongratulations:: @ 81963CD .string "Wow! Excellent!\n" .string "You completed your POKéDEX!\l" .string "Congratulations!\l" .string "…$" -gUnknown_819640C:: @ 819640C +CeladonCity_Condominiums_3F_Text_ItsTheGameProgram:: @ 819640C .string "It's the game program! Messing with\n" .string "it could bug out the game!$" -gUnknown_819644B:: @ 819644B +CeladonCity_Condominiums_3F_Text_SomeonesPlayingGame:: @ 819644B .string "Someone's playing a game instead of\n" .string "working!$" -gUnknown_8196478:: @ 8196478 +CeladonCity_Condominiums_3F_Text_ItsScriptBetterNotLookAtEnding:: @ 8196478 .string "It's the script!\n" .string "Better not look at the ending!$" -gUnknown_81964A8:: @ 81964A8 +CeladonCity_Condominiums_3F_Text_GameFreakDevelopmentRoom:: @ 81964A8 .string "GAME FREAK Development Room$" diff --git a/data/maps/CeladonCity_Condominiums_Roof/map.json b/data/maps/CeladonCity_Condominiums_Roof/map.json index 7680f5f68..c929b62fc 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/map.json +++ b/data/maps/CeladonCity_Condominiums_Roof/map.json @@ -43,14 +43,14 @@ "x": 4, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_Roof_EventScript_16C45A" + "script": "CeladonCity_Condominiums_Roof_EventScript_Sign" }, { "type": "bg_event_type_0", "x": 3, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_Roof_EventScript_16C45A" + "script": "CeladonCity_Condominiums_Roof_EventScript_Sign" } ] } diff --git a/data/maps/CeladonCity_Condominiums_Roof/scripts.inc b/data/maps/CeladonCity_Condominiums_Roof/scripts.inc index 59631d86c..98013e38f 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_Roof/scripts.inc @@ -1,6 +1,6 @@ CeladonCity_Condominiums_Roof_MapScripts:: @ 816C459 .byte 0 -CeladonCity_Condominiums_Roof_EventScript_16C45A:: @ 816C45A - msgbox gUnknown_81964C4, MSGBOX_SIGN +CeladonCity_Condominiums_Roof_EventScript_Sign:: @ 816C45A + msgbox CeladonCity_Condominiums_Roof_Text_IKnowEverything, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_Roof/text.inc b/data/maps/CeladonCity_Condominiums_Roof/text.inc index 02398e70b..f3012fd31 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/text.inc +++ b/data/maps/CeladonCity_Condominiums_Roof/text.inc @@ -1,3 +1,3 @@ -gUnknown_81964C4:: @ 81964C4 +CeladonCity_Condominiums_Roof_Text_IKnowEverything:: @ 81964C4 .string "I KNOW EVERYTHING!$" diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index 717bfc4a1..d229e7fdd 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C464", + "script": "CeladonCity_Condominiums_RoofRoom_EventScript_BlackBelt", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C46D", + "script": "CeladonCity_Condominiums_RoofRoom_EventScript_EeveeBall", "flag": "FLAG_HIDE_EEVEE_BALL" } ], @@ -70,21 +70,21 @@ "x": 4, "y": 1, "elevation": 0, - "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C522" + "script": "CeladonCity_Condominiums_RoofRoom_EventScript_Blackboard" }, { "type": "bg_event_type_0", "x": 5, "y": 1, "elevation": 0, - "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C522" + "script": "CeladonCity_Condominiums_RoofRoom_EventScript_Blackboard" }, { "type": "bg_event_type_0", "x": 4, "y": 4, "elevation": 0, - "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C519" + "script": "CeladonCity_Condominiums_RoofRoom_EventScript_TMsPamphlet" } ] } diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index 73c55afd8..3f3363674 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -1,109 +1,109 @@ CeladonCity_Condominiums_RoofRoom_MapScripts:: @ 816C463 .byte 0 -CeladonCity_Condominiums_RoofRoom_EventScript_16C464:: @ 816C464 - msgbox gUnknown_81964D7, MSGBOX_NPC +CeladonCity_Condominiums_RoofRoom_EventScript_BlackBelt:: @ 816C464 + msgbox CeladonCity_Condominiums_RoofRoom_Text_TheresNothingIDontKnow, MSGBOX_NPC end -CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D +CeladonCity_Condominiums_RoofRoom_EventScript_EeveeBall:: @ 816C46D lock faceplayer setvar VAR_TEMP_1, SPECIES_EEVEE givemon SPECIES_EEVEE, 25, ITEM_NONE compare VAR_RESULT, 0 - goto_if_eq EventScript_16C4A6 + goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveeParty compare VAR_RESULT, 1 - goto_if_eq EventScript_16C4DA + goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveePC compare VAR_RESULT, 2 goto_if_eq EventScript_NoMoreRoomForPokemon release end -EventScript_16C4A6:: @ 816C4A6 +CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveeParty:: @ 816C4A6 removeobject 2 playfanfare MUS_FANFA1 - message Text_196591 + message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee waitmessage waitfanfare getspeciesname 0, SPECIES_EEVEE msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16C514 + goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee call EventScript_GetGiftMonPartySlot call EventScript_ChangePokemonNickname - goto EventScript_16C514 + goto CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee end -EventScript_16C4DA:: @ 816C4DA +CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveePC:: @ 816C4DA removeobject 2 playfanfare MUS_FANFA1 - message Text_196591 + message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee waitmessage waitfanfare getspeciesname 0, SPECIES_EEVEE msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16C509 + goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_TransferEeveeToPC call EventScript_NameReceivedBoxMon - goto EventScript_16C509 + goto CeladonCity_Condominiums_RoofRoom_EventScript_TransferEeveeToPC end -EventScript_16C509:: @ 816C509 +CeladonCity_Condominiums_RoofRoom_EventScript_TransferEeveeToPC:: @ 816C509 call EventScript_TransferredToPC - goto EventScript_16C514 + goto CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee end -EventScript_16C514:: @ 816C514 +CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee:: @ 816C514 setflag FLAG_GOT_EEVEE release end -CeladonCity_Condominiums_RoofRoom_EventScript_16C519:: @ 816C519 - msgbox gUnknown_81967E3, MSGBOX_SIGN +CeladonCity_Condominiums_RoofRoom_EventScript_TMsPamphlet:: @ 816C519 + msgbox CeladonCity_Condominiums_RoofRoom_Text_PamphletOnTMs, MSGBOX_SIGN end -CeladonCity_Condominiums_RoofRoom_EventScript_16C522:: @ 816C522 +CeladonCity_Condominiums_RoofRoom_EventScript_Blackboard:: @ 816C522 lockall - msgbox gUnknown_81965C2 - message Text_1965F4 + msgbox CeladonCity_Condominiums_RoofRoom_Text_WirelessAdapterLecture + message CeladonCity_Condominiums_RoofRoom_Text_ReadWhichHeading waitmessage setvar VAR_0x8004, 4 multichoice 0, 0, MULTICHOICE_LINKED_DIRECT_UNION, FALSE switch VAR_RESULT - case 0, EventScript_16C5C0 - case 1, EventScript_16C5CE - case 2, EventScript_16C5DC - case 3, EventScript_16C5EA - case 127, EventScript_16C5EA + case 0, CeladonCity_Condominiums_RoofRoom_EventScript_WirelessClub + case 1, CeladonCity_Condominiums_RoofRoom_EventScript_DirectCorner + case 2, CeladonCity_Condominiums_RoofRoom_EventScript_UnionRoom + case 3, CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard + case 127, CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard end -EventScript_16C578:: @ 816C578 - message Text_1965F4 +CeladonCity_Condominiums_RoofRoom_EventScript_ReadAnotherHeading:: @ 816C578 + message CeladonCity_Condominiums_RoofRoom_Text_ReadWhichHeading waitmessage multichoice 0, 0, MULTICHOICE_LINKED_DIRECT_UNION, FALSE switch VAR_RESULT - case 0, EventScript_16C5C0 - case 1, EventScript_16C5CE - case 2, EventScript_16C5DC - case 3, EventScript_16C5EA - case 127, EventScript_16C5EA + case 0, CeladonCity_Condominiums_RoofRoom_EventScript_WirelessClub + case 1, CeladonCity_Condominiums_RoofRoom_EventScript_DirectCorner + case 2, CeladonCity_Condominiums_RoofRoom_EventScript_UnionRoom + case 3, CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard + case 127, CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard end -EventScript_16C5C0:: @ 816C5C0 - msgbox gUnknown_8196617 - goto EventScript_16C578 +CeladonCity_Condominiums_RoofRoom_EventScript_WirelessClub:: @ 816C5C0 + msgbox CeladonCity_Condominiums_RoofRoom_Text_ExplainWirelessClub + goto CeladonCity_Condominiums_RoofRoom_EventScript_ReadAnotherHeading end -EventScript_16C5CE:: @ 816C5CE - msgbox gUnknown_8196695 - goto EventScript_16C578 +CeladonCity_Condominiums_RoofRoom_EventScript_DirectCorner:: @ 816C5CE + msgbox CeladonCity_Condominiums_RoofRoom_Text_ExplainDirectCorner + goto CeladonCity_Condominiums_RoofRoom_EventScript_ReadAnotherHeading end -EventScript_16C5DC:: @ 816C5DC - msgbox gUnknown_819673C - goto EventScript_16C578 +CeladonCity_Condominiums_RoofRoom_EventScript_UnionRoom:: @ 816C5DC + msgbox CeladonCity_Condominiums_RoofRoom_Text_ExplainUnionRoom + goto CeladonCity_Condominiums_RoofRoom_EventScript_ReadAnotherHeading end -EventScript_16C5EA:: @ 816C5EA +CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard:: @ 816C5EA releaseall end diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc index bb09c8ce3..9e43f06ce 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc @@ -1,4 +1,4 @@ -gUnknown_81964D7:: @ 81964D7 +CeladonCity_Condominiums_RoofRoom_Text_TheresNothingIDontKnow:: @ 81964D7 .string "There is nothing that I don't know,\n" .string "like I wrote on the blackboard.\p" .string "I know about the world of POKéMON\n" @@ -6,27 +6,27 @@ gUnknown_81964D7:: @ 81964D7 .string "Get together with your friends and\n" .string "enjoy trading POKéMON!$" -Text_196591:: @ 8196591 +CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee:: @ 8196591 .string "{PLAYER} obtained an EEVEE!$" -Text_1965A7:: @ 81965A7 +CeladonCity_Condominiums_RoofRoom_Text_BoxIsFull:: @ 81965A7 .string "ポケモンが　いっぱいだ\n" .string "ボックスを　かえて　きなさい$" -gUnknown_81965C2:: @ 81965C2 +CeladonCity_Condominiums_RoofRoom_Text_WirelessAdapterLecture:: @ 81965C2 .string "POKéMON Lecture\p" .string "Playing with the Wireless Adapter$" -Text_1965F4:: @ 81965F4 +CeladonCity_Condominiums_RoofRoom_Text_ReadWhichHeading:: @ 81965F4 .string "Which heading do you want to read?$" -gUnknown_8196617:: @ 8196617 +CeladonCity_Condominiums_RoofRoom_Text_ExplainWirelessClub:: @ 8196617 .string "The POKéMON WIRELESS CLUB is\n" .string "upstairs at any POKéMON CENTER.\p" .string "Visit one to link up with friend(s)\n" .string "using your Wireless Adapter.$" -gUnknown_8196695:: @ 8196695 +CeladonCity_Condominiums_RoofRoom_Text_ExplainDirectCorner:: @ 8196695 .string "To link only with a friend, go to\n" .string "the DIRECT CORNER.\p" .string "It is the right counter at the\n" @@ -34,7 +34,7 @@ gUnknown_8196695:: @ 8196695 .string "Go into the TRADE CORNER or the\n" .string "COLOSSEUM with your friend.$" -gUnknown_819673C:: @ 819673C +CeladonCity_Condominiums_RoofRoom_Text_ExplainUnionRoom:: @ 819673C .string "To link and communicate with\n" .string "anyone, go to the UNION ROOM.\p" .string "It is the left counter at the\n" @@ -42,7 +42,7 @@ gUnknown_819673C:: @ 819673C .string "Go to the UNION ROOM and enjoy\n" .string "meeting other TRAINERS.$" -gUnknown_81967E3:: @ 81967E3 +CeladonCity_Condominiums_RoofRoom_Text_PamphletOnTMs:: @ 81967E3 .string "It's a pamphlet on TMs.\p" .string "… …\p" .string "There are fifty TMs in all.\p" diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json index afa57c1aa..d4e20b168 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_1F_EventScript_16BAD9", + "script": "CeladonCity_DepartmentStore_1F_EventScript_Receptionist", "flag": "0" } ], @@ -92,14 +92,14 @@ "x": 9, "y": 11, "elevation": 0, - "script": "CeladonCity_DepartmentStore_1F_EventScript_16BAE2" + "script": "CeladonCity_DepartmentStore_1F_EventScript_LayoutSign" }, { "type": "bg_event_type_0", "x": 8, "y": 1, "elevation": 0, - "script": "CeladonCity_DepartmentStore_1F_EventScript_16BAEB" + "script": "CeladonCity_DepartmentStore_1F_EventScript_FloorSign" } ] } diff --git a/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc index 4e5bcc05e..08aa687f8 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc @@ -1,14 +1,14 @@ CeladonCity_DepartmentStore_1F_MapScripts:: @ 816BAD8 .byte 0 -CeladonCity_DepartmentStore_1F_EventScript_16BAD9:: @ 816BAD9 - msgbox gUnknown_81954DD, MSGBOX_NPC +CeladonCity_DepartmentStore_1F_EventScript_Receptionist:: @ 816BAD9 + msgbox CeladonCity_DepartmentStore_1F_Text_WelcomeToDeptStore, MSGBOX_NPC end -CeladonCity_DepartmentStore_1F_EventScript_16BAE2:: @ 816BAE2 - msgbox gUnknown_8195537, MSGBOX_SIGN +CeladonCity_DepartmentStore_1F_EventScript_LayoutSign:: @ 816BAE2 + msgbox CeladonCity_DepartmentStore_1F_Text_FloorDescriptions, MSGBOX_SIGN end -CeladonCity_DepartmentStore_1F_EventScript_16BAEB:: @ 816BAEB - msgbox gUnknown_81955B3, MSGBOX_SIGN +CeladonCity_DepartmentStore_1F_EventScript_FloorSign:: @ 816BAEB + msgbox CeladonCity_DepartmentStore_1F_Text_ServiceCounter, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_DepartmentStore_1F/text.inc b/data/maps/CeladonCity_DepartmentStore_1F/text.inc index e78a8c6d2..f1d1877e4 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_1F/text.inc @@ -1,10 +1,10 @@ -gUnknown_81954DD:: @ 81954DD +CeladonCity_DepartmentStore_1F_Text_WelcomeToDeptStore:: @ 81954DD .string "Hello!\n" .string "Welcome to CELADON DEPT. STORE.\p" .string "The board on the right describes\n" .string "the store layout.$" -gUnknown_8195537:: @ 8195537 +CeladonCity_DepartmentStore_1F_Text_FloorDescriptions:: @ 8195537 .string "1F: SERVICE COUNTER\p" .string "2F: TRAINER'S MARKET\p" .string "3F: TV GAME SHOP\p" @@ -12,6 +12,6 @@ gUnknown_8195537:: @ 8195537 .string "5F: DRUGSTORE\p" .string "ROOFTOP SQUARE: VENDING MACHINES$" -gUnknown_81955B3:: @ 81955B3 +CeladonCity_DepartmentStore_1F_Text_ServiceCounter:: @ 81955B3 .string "1F: SERVICE COUNTER$" diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json index fdb27ab7e..e4e6f2f29 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_2F_EventScript_16BAFE", + "script": "CeladonCity_DepartmentStore_2F_EventScript_Lass", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_2F_EventScript_16BB10", + "script": "CeladonCity_DepartmentStore_2F_EventScript_ClerkItems", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_2F_EventScript_16BB4E", + "script": "CeladonCity_DepartmentStore_2F_EventScript_ClerkTMs", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_2F_EventScript_1AD053", + "script": "CeladonCity_DepartmentStore_2F_EventScript_Woman", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], @@ -96,7 +96,7 @@ "x": 4, "y": 1, "elevation": 0, - "script": "CeladonCity_DepartmentStore_2F_EventScript_16BB07" + "script": "CeladonCity_DepartmentStore_2F_EventScript_FloorSign" } ] } diff --git a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc index 24d4771b2..f7e89886d 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc @@ -1,31 +1,31 @@ CeladonCity_DepartmentStore_2F_MapScripts:: @ 816BAF4 .byte 0 -CeladonCity_DepartmentStore_2F_EventScript_16BAF5:: @ 816BAF5 - msgbox gUnknown_81955C7, MSGBOX_NPC +CeladonCity_DepartmentStore_2F_EventScript_UnusedNPC:: @ 816BAF5 + msgbox CeladonCity_DepartmentStore_2F_Text_SuperRepelMorePowerfulRepel, MSGBOX_NPC end -CeladonCity_DepartmentStore_2F_EventScript_16BAFE:: @ 816BAFE - msgbox gUnknown_819560F, MSGBOX_NPC +CeladonCity_DepartmentStore_2F_EventScript_Lass:: @ 816BAFE + msgbox CeladonCity_DepartmentStore_2F_Text_BuyReviveForLongOutings, MSGBOX_NPC end -CeladonCity_DepartmentStore_2F_EventScript_16BB07:: @ 816BB07 - msgbox gUnknown_8195638, MSGBOX_SIGN +CeladonCity_DepartmentStore_2F_EventScript_FloorSign:: @ 816BB07 + msgbox CeladonCity_DepartmentStore_2F_Text_FloorSign, MSGBOX_SIGN end -CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10 +CeladonCity_DepartmentStore_2F_EventScript_ClerkItems:: @ 816BB10 goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_16BB38 + pokemart CeladonCity_DepartmentStore_2F_Items msgbox Text_PleaseComeAgain release end .align 2 -Items_16BB38:: @ 816BB38 +CeladonCity_DepartmentStore_2F_Items:: @ 816BB38 .2byte ITEM_GREAT_BALL .2byte ITEM_SUPER_POTION .2byte ITEM_REVIVE @@ -39,19 +39,19 @@ Items_16BB38:: @ 816BB38 release end -CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E +CeladonCity_DepartmentStore_2F_EventScript_ClerkTMs:: @ 816BB4E goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_16BB74 + pokemart CeladonCity_DepartmentStore_2F_TMs msgbox Text_PleaseComeAgain release end .align 2 -Items_16BB74:: @ 816BB74 +CeladonCity_DepartmentStore_2F_TMs:: @ 816BB74 .2byte ITEM_TM05 .2byte ITEM_TM15 .2byte ITEM_TM28 diff --git a/data/maps/CeladonCity_DepartmentStore_2F/text.inc b/data/maps/CeladonCity_DepartmentStore_2F/text.inc index 22bf6b36c..77466521a 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_2F/text.inc @@ -1,13 +1,19 @@ -gUnknown_81955C7:: @ 81955C7 +CeladonCity_DepartmentStore_2F_Text_SuperRepelMorePowerfulRepel:: @ 81955C7 .string "SUPER REPEL keeps weak POKéMON at\n" .string "bay…\p" .string "Hmm, it's a more powerful REPEL.$" -gUnknown_819560F:: @ 819560F +CeladonCity_DepartmentStore_2F_Text_BuyReviveForLongOutings:: @ 819560F .string "For long outings, you should buy\n" .string "REVIVE.$" -gUnknown_8195638:: @ 8195638 +CeladonCity_DepartmentStore_2F_Text_FloorSign:: @ 8195638 .string "Top-Grade Items for TRAINERS!\p" .string "2F: TRAINER'S MARKET$" +CeladonCity_DepartmentStore_2F_Text_LanceComesToBuyCapes:: @ 819566B + .string "We have a customer, LANCE, who\n" + .string "occasionally comes.\p" + .string "He always buys capes.\p" + .string "I wonder… Does he have many\n" + .string "identical capes at home?$" diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json index 76bc95d25..37132845e 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB8B", + "script": "CeladonCity_DepartmentStore_3F_EventScript_GBAKid1", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB9D", + "script": "CeladonCity_DepartmentStore_3F_EventScript_GBAKid3", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB94", + "script": "CeladonCity_DepartmentStore_3F_EventScript_GBAKid2", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBA6", + "script": "CeladonCity_DepartmentStore_3F_EventScript_LittleGirl", "flag": "0" } ], @@ -109,77 +109,77 @@ "x": 8, "y": 1, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBDC" + "script": "CeladonCity_DepartmentStore_3F_EventScript_FloorSign" }, { "type": "bg_event_type_1", "x": 2, "y": 8, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBB8" + "script": "CeladonCity_DepartmentStore_3F_EventScript_TV1" }, { "type": "bg_event_type_1", "x": 5, "y": 8, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBC1" + "script": "CeladonCity_DepartmentStore_3F_EventScript_TV2" }, { "type": "bg_event_type_1", "x": 2, "y": 11, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBCA" + "script": "CeladonCity_DepartmentStore_3F_EventScript_TV3" }, { "type": "bg_event_type_1", "x": 5, "y": 11, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBD3" + "script": "CeladonCity_DepartmentStore_3F_EventScript_TV4" }, { "type": "bg_event_type_0", "x": 1, "y": 8, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF" + "script": "CeladonCity_DepartmentStore_3F_EventScript_SuperNES" }, { "type": "bg_event_type_0", "x": 1, "y": 11, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF" + "script": "CeladonCity_DepartmentStore_3F_EventScript_SuperNES" }, { "type": "bg_event_type_0", "x": 4, "y": 8, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF" + "script": "CeladonCity_DepartmentStore_3F_EventScript_SuperNES" }, { "type": "bg_event_type_0", "x": 4, "y": 11, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF" + "script": "CeladonCity_DepartmentStore_3F_EventScript_SuperNES" }, { "type": "bg_event_type_1", "x": 2, "y": 4, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBE5" + "script": "CeladonCity_DepartmentStore_3F_EventScript_Poster" }, { "type": "bg_event_type_1", "x": 0, "y": 4, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBE5" + "script": "CeladonCity_DepartmentStore_3F_EventScript_Poster" } ] } diff --git a/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc index f4faca037..e7af53078 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc @@ -5,46 +5,46 @@ CeladonCity_DepartmentStore_3F_EventScript_CounterTutor:: @ 816BB85 goto EventScript_CounterTutor end -CeladonCity_DepartmentStore_3F_EventScript_16BB8B:: @ 816BB8B - msgbox gUnknown_81956E9, MSGBOX_NPC +CeladonCity_DepartmentStore_3F_EventScript_GBAKid1:: @ 816BB8B + msgbox CeladonCity_DepartmentStore_3F_Text_OTStandsForOriginalTrainer, MSGBOX_NPC end -CeladonCity_DepartmentStore_3F_EventScript_16BB94:: @ 816BB94 - msgbox gUnknown_8195769, MSGBOX_NPC +CeladonCity_DepartmentStore_3F_EventScript_GBAKid2:: @ 816BB94 + msgbox CeladonCity_DepartmentStore_3F_Text_BuddyTradingKangaskhanForHaunter, MSGBOX_NPC end -CeladonCity_DepartmentStore_3F_EventScript_16BB9D:: @ 816BB9D - msgbox gUnknown_81957B0, MSGBOX_NPC +CeladonCity_DepartmentStore_3F_EventScript_GBAKid3:: @ 816BB9D + msgbox CeladonCity_DepartmentStore_3F_Text_HaunterEvolvedOnTrade, MSGBOX_NPC end -CeladonCity_DepartmentStore_3F_EventScript_16BBA6:: @ 816BBA6 - msgbox gUnknown_8195823, MSGBOX_NPC +CeladonCity_DepartmentStore_3F_EventScript_LittleGirl:: @ 816BBA6 + msgbox CeladonCity_DepartmentStore_3F_Text_CanIdentifyTradeMonsByID, MSGBOX_NPC end -CeladonCity_DepartmentStore_3F_EventScript_16BBAF:: @ 816BBAF - msgbox gUnknown_8195863, MSGBOX_SIGN +CeladonCity_DepartmentStore_3F_EventScript_SuperNES:: @ 816BBAF + msgbox CeladonCity_DepartmentStore_3F_Text_ItsSuperNES, MSGBOX_SIGN end -CeladonCity_DepartmentStore_3F_EventScript_16BBB8:: @ 816BBB8 - msgbox gUnknown_8195875, MSGBOX_SIGN +CeladonCity_DepartmentStore_3F_EventScript_TV1:: @ 816BBB8 + msgbox CeladonCity_DepartmentStore_3F_Text_AnRPG, MSGBOX_SIGN end -CeladonCity_DepartmentStore_3F_EventScript_16BBC1:: @ 816BBC1 - msgbox gUnknown_8195897, MSGBOX_SIGN +CeladonCity_DepartmentStore_3F_EventScript_TV2:: @ 816BBC1 + msgbox CeladonCity_DepartmentStore_3F_Text_SportsGame, MSGBOX_SIGN end -CeladonCity_DepartmentStore_3F_EventScript_16BBCA:: @ 816BBCA - msgbox gUnknown_81958B8, MSGBOX_SIGN +CeladonCity_DepartmentStore_3F_EventScript_TV3:: @ 816BBCA + msgbox CeladonCity_DepartmentStore_3F_Text_PuzzleGame, MSGBOX_SIGN end -CeladonCity_DepartmentStore_3F_EventScript_16BBD3:: @ 816BBD3 - msgbox gUnknown_81958D8, MSGBOX_SIGN +CeladonCity_DepartmentStore_3F_EventScript_TV4:: @ 816BBD3 + msgbox CeladonCity_DepartmentStore_3F_Text_FightingGame, MSGBOX_SIGN end -CeladonCity_DepartmentStore_3F_EventScript_16BBDC:: @ 816BBDC - msgbox gUnknown_81958F6, MSGBOX_SIGN +CeladonCity_DepartmentStore_3F_EventScript_FloorSign:: @ 816BBDC + msgbox CeladonCity_DepartmentStore_3F_Text_TVGameShop, MSGBOX_SIGN end -CeladonCity_DepartmentStore_3F_EventScript_16BBE5:: @ 816BBE5 - msgbox gUnknown_8195907, MSGBOX_SIGN +CeladonCity_DepartmentStore_3F_EventScript_Poster:: @ 816BBE5 + msgbox CeladonCity_DepartmentStore_3F_Text_RedGreenBothArePokemon, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_DepartmentStore_3F/text.inc b/data/maps/CeladonCity_DepartmentStore_3F/text.inc index 7d4db12cc..3533884a5 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_3F/text.inc @@ -1,22 +1,15 @@ -Text_19566B:: @ 819566B - .string "We have a customer, LANCE, who\n" - .string "occasionally comes.\p" - .string "He always buys capes.\p" - .string "I wonder… Does he have many\n" - .string "identical capes at home?$" - -gUnknown_81956E9:: @ 81956E9 +CeladonCity_DepartmentStore_3F_Text_OTStandsForOriginalTrainer:: @ 81956E9 .string "Captured POKéMON are registered\n" .string "with an ID No. and the OT.\p" .string "OT stands for “Original TRAINER” -\n" .string "the TRAINER that caught it first.$" -gUnknown_8195769:: @ 8195769 +CeladonCity_DepartmentStore_3F_Text_BuddyTradingKangaskhanForHaunter:: @ 8195769 .string "All right!\p" .string "My buddy's going to trade me his\n" .string "KANGASKHAN for my HAUNTER!$" -gUnknown_81957B0:: @ 81957B0 +CeladonCity_DepartmentStore_3F_Text_HaunterEvolvedOnTrade:: @ 81957B0 .string "Come on, HAUNTER!\p" .string "I love HAUNTER!\n" .string "I collect them!\p" @@ -24,33 +17,54 @@ gUnknown_81957B0:: @ 81957B0 .string "HAUNTER turned into a different\n" .string "POKéMON while being traded!$" -gUnknown_8195823:: @ 8195823 +CeladonCity_DepartmentStore_3F_Text_CanIdentifyTradeMonsByID:: @ 8195823 .string "You can identify POKéMON you get\n" .string "in trades by their ID Numbers.$" -gUnknown_8195863:: @ 8195863 +CeladonCity_DepartmentStore_3F_Text_ItsSuperNES:: @ 8195863 .string "It's a Super NES.$" -gUnknown_8195875:: @ 8195875 +CeladonCity_DepartmentStore_3F_Text_AnRPG:: @ 8195875 .string "An RPG!\n" .string "There's no time for that!$" -gUnknown_8195897:: @ 8195897 +CeladonCity_DepartmentStore_3F_Text_SportsGame:: @ 8195897 .string "A sports game!\n" .string "Dad'll like that!$" -gUnknown_81958B8:: @ 81958B8 +CeladonCity_DepartmentStore_3F_Text_PuzzleGame:: @ 81958B8 .string "A puzzle game!\n" .string "Looks addictive!$" -gUnknown_81958D8:: @ 81958D8 +CeladonCity_DepartmentStore_3F_Text_FightingGame:: @ 81958D8 .string "A fighting game!\n" .string "Looks tough!$" -gUnknown_81958F6:: @ 81958F6 +CeladonCity_DepartmentStore_3F_Text_TVGameShop:: @ 81958F6 .string "3F: TV GAME SHOP$" -gUnknown_8195907:: @ 8195907 +CeladonCity_DepartmentStore_3F_Text_RedGreenBothArePokemon:: @ 8195907 .string "Red and Green!\n" .string "Both are POKéMON!$" +Text_CounterTeach:: @ 8195928 + .string "Oh, hi!\n" + .string "I finally finished POKéMON.\p" + .string "Not done yet? How about I teach\n" + .string "you a good move?\p" + .string "The move I have in mind is\n" + .string "COUNTER.\p" + .string "Not like the one I'm leaning on,\n" + .string "mind you!$" + +Text_CounterDeclined:: @ 81959CC + .string "You're not interested? Come see\n" + .string "me if you change your mind.$" + +Text_CounterWhichMon:: @ 8195A08 + .string "Which POKéMON should I teach\n" + .string "COUNTER to?$" + +Text_CounterTaught:: @ 8195A31 + .string "Are you using that COUNTER move\n" + .string "I taught your POKéMON?$" diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json index 059ff30e3..d1130b058 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_4F_EventScript_16BBEF", + "script": "CeladonCity_DepartmentStore_4F_EventScript_Man", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_4F_EventScript_16BBF8", + "script": "CeladonCity_DepartmentStore_4F_EventScript_Youngster", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_4F_EventScript_16BC0A", + "script": "CeladonCity_DepartmentStore_4F_EventScript_Clerk", "flag": "0" } ], @@ -83,7 +83,7 @@ "x": 4, "y": 1, "elevation": 0, - "script": "CeladonCity_DepartmentStore_4F_EventScript_16BC01" + "script": "CeladonCity_DepartmentStore_4F_EventScript_FloorSign" } ] } diff --git a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc index f04968b1e..e9aba025a 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc @@ -1,31 +1,31 @@ CeladonCity_DepartmentStore_4F_MapScripts:: @ 816BBEE .byte 0 -CeladonCity_DepartmentStore_4F_EventScript_16BBEF:: @ 816BBEF - msgbox gUnknown_8195A68, MSGBOX_NPC +CeladonCity_DepartmentStore_4F_EventScript_Man:: @ 816BBEF + msgbox CeladonCity_DepartmentStore_4F_Text_GettingPokeDollAsPresent, MSGBOX_NPC end -CeladonCity_DepartmentStore_4F_EventScript_16BBF8:: @ 816BBF8 - msgbox gUnknown_8195AC9, MSGBOX_NPC +CeladonCity_DepartmentStore_4F_EventScript_Youngster:: @ 816BBF8 + msgbox CeladonCity_DepartmentStore_4F_Text_CanRunAwayWithPokeDoll, MSGBOX_NPC end -CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01 - msgbox gUnknown_8195B5B, MSGBOX_SIGN +CeladonCity_DepartmentStore_4F_EventScript_FloorSign:: @ 816BC01 + msgbox CeladonCity_DepartmentStore_4F_Text_FloorSign, MSGBOX_SIGN end -CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A +CeladonCity_DepartmentStore_4F_EventScript_Clerk:: @ 816BC0A goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_16BC30 + pokemart CeladonCity_DepartmentStore_4F_Items msgbox Text_PleaseComeAgain release end .align 2 -Items_16BC30:: @ 816BC30 +CeladonCity_DepartmentStore_4F_Items:: @ 816BC30 .2byte ITEM_POKE_DOLL .2byte ITEM_RETRO_MAIL .2byte ITEM_FIRE_STONE diff --git a/data/maps/CeladonCity_DepartmentStore_4F/text.inc b/data/maps/CeladonCity_DepartmentStore_4F/text.inc index 426cc2c82..80121023e 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_4F/text.inc @@ -1,41 +1,18 @@ -Text_CounterTeach:: @ 8195928 - .string "Oh, hi!\n" - .string "I finally finished POKéMON.\p" - .string "Not done yet? How about I teach\n" - .string "you a good move?\p" - .string "The move I have in mind is\n" - .string "COUNTER.\p" - .string "Not like the one I'm leaning on,\n" - .string "mind you!$" - -Text_CounterDeclined:: @ 81959CC - .string "You're not interested? Come see\n" - .string "me if you change your mind.$" - -Text_CounterWhichMon:: @ 8195A08 - .string "Which POKéMON should I teach\n" - .string "COUNTER to?$" - -Text_CounterTaught:: @ 8195A31 - .string "Are you using that COUNTER move\n" - .string "I taught your POKéMON?$" - -gUnknown_8195A68:: @ 8195A68 +CeladonCity_DepartmentStore_4F_Text_GettingPokeDollAsPresent:: @ 8195A68 .string "I'm getting a present for my\n" .string "girlfriend.\p" .string "I guess a POKé DOLL will be it.\n" .string "It's the popular thing.$" -gUnknown_8195AC9:: @ 8195AC9 +CeladonCity_DepartmentStore_4F_Text_CanRunAwayWithPokeDoll:: @ 8195AC9 .string "I heard something useful.\p" .string "If a wild POKéMON appears, you can\n" .string "distract it with a POKé DOLL.\p" .string "You can run away while the wild\n" .string "POKéMON is distracted.$" -gUnknown_8195B5B:: @ 8195B5B +CeladonCity_DepartmentStore_4F_Text_FloorSign:: @ 8195B5B .string "Express yourself with gifts!\n" .string "4F: WISE MAN GIFTS\p" .string "Evolution Special!\n" .string "Element STONES on sale now!$" - diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json index 65b0fe9bc..b90f5f8e9 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC41", + "script": "CeladonCity_DepartmentStore_5F_EventScript_Gentleman", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC4A", + "script": "CeladonCity_DepartmentStore_5F_EventScript_Sailor", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC5C", + "script": "CeladonCity_DepartmentStore_5F_EventScript_ClerkXItems", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC96", + "script": "CeladonCity_DepartmentStore_5F_EventScript_ClerkVitamins", "flag": "0" } ], @@ -96,7 +96,7 @@ "x": 8, "y": 1, "elevation": 0, - "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC53" + "script": "CeladonCity_DepartmentStore_5F_EventScript_FloorSign" } ] } diff --git a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc index 9056d2b2d..e854a6a65 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc @@ -1,31 +1,31 @@ CeladonCity_DepartmentStore_5F_MapScripts:: @ 816BC40 .byte 0 -CeladonCity_DepartmentStore_5F_EventScript_16BC41:: @ 816BC41 - msgbox gUnknown_8195BBA, MSGBOX_NPC +CeladonCity_DepartmentStore_5F_EventScript_Gentleman:: @ 816BC41 + msgbox CeladonCity_DepartmentStore_5F_Text_ExplainStatEnhancers, MSGBOX_NPC end -CeladonCity_DepartmentStore_5F_EventScript_16BC4A:: @ 816BC4A - msgbox gUnknown_8195CA0, MSGBOX_NPC +CeladonCity_DepartmentStore_5F_EventScript_Sailor:: @ 816BC4A + msgbox CeladonCity_DepartmentStore_5F_Text_HereForStatEnhancers, MSGBOX_NPC end -CeladonCity_DepartmentStore_5F_EventScript_16BC53:: @ 816BC53 - msgbox gUnknown_8195D14, MSGBOX_SIGN +CeladonCity_DepartmentStore_5F_EventScript_FloorSign:: @ 816BC53 + msgbox CeladonCity_DepartmentStore_5F_Text_Drugstore, MSGBOX_SIGN end -CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C +CeladonCity_DepartmentStore_5F_EventScript_ClerkXItems:: @ 816BC5C goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_16BC84 + pokemart CeladonCity_DepartmentStore_5F_XItems msgbox Text_PleaseComeAgain release end .align 2 -Items_16BC84:: @ 816BC84 +CeladonCity_DepartmentStore_5F_XItems:: @ 816BC84 .2byte ITEM_X_ATTACK .2byte ITEM_X_DEFEND .2byte ITEM_X_SPEED @@ -37,19 +37,19 @@ Items_16BC84:: @ 816BC84 release end -CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96 +CeladonCity_DepartmentStore_5F_EventScript_ClerkVitamins:: @ 816BC96 goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_16BCBC + pokemart CeladonCity_DepartmentStore_5F_Vitamins msgbox Text_PleaseComeAgain release end .align 2 -Items_16BCBC:: @ 816BCBC +CeladonCity_DepartmentStore_5F_Vitamins:: @ 816BCBC .2byte ITEM_HP_UP .2byte ITEM_PROTEIN .2byte ITEM_IRON diff --git a/data/maps/CeladonCity_DepartmentStore_5F/text.inc b/data/maps/CeladonCity_DepartmentStore_5F/text.inc index b8cee5afa..638f07320 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_5F/text.inc @@ -1,4 +1,4 @@ -gUnknown_8195BBA:: @ 8195BBA +CeladonCity_DepartmentStore_5F_Text_ExplainStatEnhancers:: @ 8195BBA .string "POKéMON stat enhancers can be\n" .string "bought only here.\p" .string "HP UP increases the base HP of a\n" @@ -10,7 +10,7 @@ gUnknown_8195BBA:: @ 8195BBA .string "CARBOS enhances the base SPEED\n" .string "stat.$" -gUnknown_8195CA0:: @ 8195CA0 +CeladonCity_DepartmentStore_5F_Text_HereForStatEnhancers:: @ 8195CA0 .string "I'm here for POKéMON stat\n" .string "enhancers.\p" .string "PROTEIN increases the base ATTACK\n" @@ -18,6 +18,6 @@ gUnknown_8195CA0:: @ 8195CA0 .string "IRON increases the base DEFENSE\n" .string "stat.$" -gUnknown_8195D14:: @ 8195D14 +CeladonCity_DepartmentStore_5F_Text_Drugstore:: @ 8195D14 .string "5F: DRUGSTORE$" diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json index a2a7d1b48..5fe6f9885 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json @@ -36,14 +36,14 @@ "x": 0, "y": 2, "elevation": 0, - "script": "CeladonCity_DepartmentStore_Elevator_EventScript_16C153" + "script": "CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelect" }, { "type": "bg_event_type_0", "x": 4, "y": 1, "elevation": 0, - "script": "CeladonCity_DepartmentStore_Elevator_EventScript_16C153" + "script": "CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelect" } ] } diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index 14198db2f..7a3737610 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -1,7 +1,7 @@ CeladonCity_DepartmentStore_Elevator_MapScripts:: @ 816C152 .byte 0 -CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153 +CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelect:: @ 816C153 lockall setvar VAR_0x8004, 3 call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 @@ -12,107 +12,105 @@ CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153 setvar VAR_0x8004, 3 specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos switch VAR_RESULT - case 0, EventScript_16C1B7 - case 1, EventScript_16C1C3 - case 2, EventScript_16C1CF - case 3, EventScript_16C1DB - case 4, EventScript_16C1E7 + case 0, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom5F + case 1, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom4F + case 2, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom3F + case 3, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom2F + case 4, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom1F end -EventScript_16C1B7:: @ 816C1B7 +CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom5F:: @ 816C1B7 multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 0, FALSE - goto EventScript_16C1F3 - -EventScript_16C1C2:: @ 816C1C2 + goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor end -EventScript_16C1C3:: @ 816C1C3 +CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom4F:: @ 816C1C3 multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 1, FALSE - goto EventScript_16C1F3 + goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor end -EventScript_16C1CF:: @ 816C1CF +CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom3F:: @ 816C1CF multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 2, FALSE - goto EventScript_16C1F3 + goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor end -EventScript_16C1DB:: @ 816C1DB +CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom2F:: @ 816C1DB multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 3, FALSE - goto EventScript_16C1F3 + goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor end -EventScript_16C1E7:: @ 816C1E7 +CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom1F:: @ 816C1E7 multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 4, FALSE - goto EventScript_16C1F3 + goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor end -EventScript_16C1F3:: @ 816C1F3 +CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor:: @ 816C1F3 switch VAR_RESULT - case 0, EventScript_16C2E6 - case 1, EventScript_16C2BE - case 2, EventScript_16C296 - case 3, EventScript_16C26E - case 4, EventScript_16C246 - case 5, EventScript_16C30E - case 127, EventScript_16C30E + case 0, CeladonCity_DepartmentStore_Elevator_EventScript_To5F + case 1, CeladonCity_DepartmentStore_Elevator_EventScript_To4F + case 2, CeladonCity_DepartmentStore_Elevator_EventScript_To3F + case 3, CeladonCity_DepartmentStore_Elevator_EventScript_To2F + case 4, CeladonCity_DepartmentStore_Elevator_EventScript_To1F + case 5, CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect + case 127, CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect end -EventScript_16C246:: @ 816C246 +CeladonCity_DepartmentStore_Elevator_EventScript_To1F:: @ 816C246 setvar VAR_0x8006, 4 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_1F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 4 - goto_if_eq EventScript_16C30E - call EventScript_16C313 + goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect + call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 4 - goto EventScript_16C30E + goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect end -EventScript_16C26E:: @ 816C26E +CeladonCity_DepartmentStore_Elevator_EventScript_To2F:: @ 816C26E setvar VAR_0x8006, 5 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_2F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 5 - goto_if_eq EventScript_16C30E - call EventScript_16C313 + goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect + call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 5 - goto EventScript_16C30E + goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect end -EventScript_16C296:: @ 816C296 +CeladonCity_DepartmentStore_Elevator_EventScript_To3F:: @ 816C296 setvar VAR_0x8006, 6 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_3F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 6 - goto_if_eq EventScript_16C30E - call EventScript_16C313 + goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect + call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 6 - goto EventScript_16C30E + goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect end -EventScript_16C2BE:: @ 816C2BE +CeladonCity_DepartmentStore_Elevator_EventScript_To4F:: @ 816C2BE setvar VAR_0x8006, 7 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_4F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 7 - goto_if_eq EventScript_16C30E - call EventScript_16C313 + goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect + call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 7 - goto EventScript_16C30E + goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect end -EventScript_16C2E6:: @ 816C2E6 +CeladonCity_DepartmentStore_Elevator_EventScript_To5F:: @ 816C2E6 setvar VAR_0x8006, 8 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_5F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 8 - goto_if_eq EventScript_16C30E - call EventScript_16C313 + goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect + call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 8 - goto EventScript_16C30E + goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect end -EventScript_16C30E:: @ 816C30E +CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect:: @ 816C30E special Special_CloseElevatorCurrentFloorWindow releaseall end -EventScript_16C313:: @ 816C313 +CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator:: @ 816C313 special Special_CloseElevatorCurrentFloorWindow closemessage waitse diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json index 71eea9cee..17077ebbd 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C022", + "script": "CeladonCity_DepartmentStore_Roof_EventScript_CooltrainerM", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_Roof_EventScript_16BCCD", + "script": "CeladonCity_DepartmentStore_Roof_EventScript_ThirstyGirl", "flag": "0" } ], @@ -56,28 +56,28 @@ "x": 14, "y": 3, "elevation": 0, - "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C02B" + "script": "CeladonCity_DepartmentStore_Roof_EventScript_FloorSign" }, { "type": "bg_event_type_0", "x": 10, "y": 3, "elevation": 0, - "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C034" + "script": "CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine" }, { "type": "bg_event_type_0", "x": 11, "y": 3, "elevation": 0, - "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C034" + "script": "CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine" }, { "type": "bg_event_type_0", "x": 12, "y": 3, "elevation": 0, - "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C034" + "script": "CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine" } ] } diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index 48f682567..bd05d824d 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -1,152 +1,152 @@ CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC .byte 0 -CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD +CeladonCity_DepartmentStore_Roof_EventScript_ThirstyGirl:: @ 816BCCD goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lock faceplayer - call EventScript_16BCF6 + call CeladonCity_DepartmentStore_Roof_EventScript_CheckPlayerHasDrinks compare VAR_TEMP_1, 0 - goto_if_eq EventScript_16C00E - goto EventScript_16BD3E + goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_IWantDrink + goto CeladonCity_DepartmentStore_Roof_EventScript_AskGiveDrink end -EventScript_16BCF6:: @ 816BCF6 +CeladonCity_DepartmentStore_Roof_EventScript_CheckPlayerHasDrinks:: @ 816BCF6 setvar VAR_TEMP_1, 0 checkitem ITEM_FRESH_WATER, 1 compare VAR_RESULT, TRUE - call_if_eq EventScript_16BD2C + call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_SetHasFreshWater checkitem ITEM_SODA_POP, 1 compare VAR_RESULT, TRUE - call_if_eq EventScript_16BD32 + call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_SetHasSodaPop checkitem ITEM_LEMONADE, 1 compare VAR_RESULT, TRUE - call_if_eq EventScript_16BD38 + call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_SetHasLemonade return -EventScript_16BD2C:: @ 816BD2C +CeladonCity_DepartmentStore_Roof_EventScript_SetHasFreshWater:: @ 816BD2C addvar VAR_TEMP_1, 1 return -EventScript_16BD32:: @ 816BD32 +CeladonCity_DepartmentStore_Roof_EventScript_SetHasSodaPop:: @ 816BD32 addvar VAR_TEMP_1, 2 return -EventScript_16BD38:: @ 816BD38 +CeladonCity_DepartmentStore_Roof_EventScript_SetHasLemonade:: @ 816BD38 addvar VAR_TEMP_1, 4 return -EventScript_16BD3E:: @ 816BD3E - msgbox gUnknown_8195D22, MSGBOX_YESNO +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveDrink:: @ 816BD3E + msgbox CeladonCity_DepartmentStore_Roof_Text_ImThirstyGiveHerDrink, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16C00C + goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink textcolor 3 - message Text_195D5F + message CeladonCity_DepartmentStore_Roof_Text_GiveWhichDrink waitmessage textcolor 1 switch VAR_TEMP_1 - case 1, EventScript_16BDAE - case 2, EventScript_16BDDA - case 3, EventScript_16BE06 - case 4, EventScript_16BE3D - case 5, EventScript_16BE69 - case 6, EventScript_16BEA0 - case 7, EventScript_16BED7 + case 1, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWater + case 2, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveSodaPop + case 3, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWaterSodaPop + case 4, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveLemonade + case 5, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWaterLemonade + case 6, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveSodaPopLemonade + case 7, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveAllDrinks end -EventScript_16BDAE:: @ 816BDAE +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWater:: @ 816BDAE multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER, FALSE switch VAR_RESULT - case 0, EventScript_16BF19 - case 1, EventScript_16C00C - case 127, EventScript_16C00C + case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater + case 1, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink + case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink end -EventScript_16BDDA:: @ 816BDDA +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveSodaPop:: @ 816BDDA multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_SODA_POP, FALSE switch VAR_RESULT - case 0, EventScript_16BF3A - case 1, EventScript_16C00C - case 127, EventScript_16C00C + case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop + case 1, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink + case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink end -EventScript_16BE06:: @ 816BE06 +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWaterSodaPop:: @ 816BE06 multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_SODA_POP, FALSE switch VAR_RESULT - case 0, EventScript_16BF19 - case 1, EventScript_16BF3A - case 2, EventScript_16C00C - case 127, EventScript_16C00C + case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater + case 1, CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop + case 2, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink + case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink end -EventScript_16BE3D:: @ 816BE3D +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveLemonade:: @ 816BE3D multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_LEMONADE, FALSE switch VAR_RESULT - case 0, EventScript_16BF5B - case 1, EventScript_16C00C - case 127, EventScript_16C00C + case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade + case 1, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink + case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink end -EventScript_16BE69:: @ 816BE69 +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWaterLemonade:: @ 816BE69 multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_LEMONADE, FALSE switch VAR_RESULT - case 0, EventScript_16BF19 - case 1, EventScript_16BF5B - case 2, EventScript_16C00C - case 127, EventScript_16C00C + case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater + case 1, CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade + case 2, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink + case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink end -EventScript_16BEA0:: @ 816BEA0 +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveSodaPopLemonade:: @ 816BEA0 multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_SODA_POP_LEMONADE, FALSE switch VAR_RESULT - case 0, EventScript_16BF3A - case 1, EventScript_16BF5B - case 2, EventScript_16C00C - case 127, EventScript_16C00C + case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop + case 1, CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade + case 2, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink + case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink end -EventScript_16BED7:: @ 816BED7 +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveAllDrinks:: @ 816BED7 multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_SODA_POP_LEMONADE, FALSE switch VAR_RESULT - case 0, EventScript_16BF19 - case 1, EventScript_16BF3A - case 2, EventScript_16BF5B - case 3, EventScript_16C00C - case 127, EventScript_16C00C + case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater + case 1, CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop + case 2, CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade + case 3, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink + case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink end -EventScript_16BF19:: @ 816BF19 +CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater:: @ 816BF19 setvar VAR_0x8008, ITEM_FRESH_WATER setvar VAR_0x8009, ITEM_TM16 - goto_if_set FLAG_GOT_TM16_FROM_THIRSTY_GIRL, EventScript_16C018 - msgbox gUnknown_8195D75 - goto EventScript_16BF7C + goto_if_set FLAG_GOT_TM16_FROM_THIRSTY_GIRL, CeladonCity_DepartmentStore_Roof_EventScript_NotThirstyAfterAll + msgbox CeladonCity_DepartmentStore_Roof_Text_YayFreshWaterHaveThis + goto CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink end -EventScript_16BF3A:: @ 816BF3A +CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop:: @ 816BF3A setvar VAR_0x8008, ITEM_SODA_POP setvar VAR_0x8009, ITEM_TM20 - goto_if_set FLAG_GOT_TM20_FROM_THIRSTY_GIRL, EventScript_16C018 - msgbox gUnknown_8195E33 - goto EventScript_16BF7C + goto_if_set FLAG_GOT_TM20_FROM_THIRSTY_GIRL, CeladonCity_DepartmentStore_Roof_EventScript_NotThirstyAfterAll + msgbox CeladonCity_DepartmentStore_Roof_Text_YaySodaPopHaveThis + goto CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink end -EventScript_16BF5B:: @ 816BF5B +CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade:: @ 816BF5B setvar VAR_0x8008, ITEM_LEMONADE setvar VAR_0x8009, ITEM_TM33 - goto_if_set FLAG_GOT_TM33_FROM_THIRSTY_GIRL, EventScript_16C018 - msgbox gUnknown_8195EBF - goto EventScript_16BF7C + goto_if_set FLAG_GOT_TM33_FROM_THIRSTY_GIRL, CeladonCity_DepartmentStore_Roof_EventScript_NotThirstyAfterAll + msgbox CeladonCity_DepartmentStore_Roof_Text_YayLemonadeHaveThis + goto CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink end -EventScript_16BF7C:: @ 816BF7C +CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink:: @ 816BF7C getitemname 0, VAR_0x8008 getitemname 1, VAR_0x8009 removeitem VAR_0x8008, 1 checkitemspace VAR_0x8009, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16C002 + goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForReward additem VAR_0x8009 textcolor 3 playfanfare MUS_FANFA1 @@ -156,142 +156,142 @@ EventScript_16BF7C:: @ 816BF7C putitemaway VAR_0x8009 call EventScript_1A6675 compare VAR_0x8008, ITEM_FRESH_WATER - call_if_eq EventScript_16BFDE + call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM16 compare VAR_0x8008, ITEM_SODA_POP - call_if_eq EventScript_16BFEA + call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM20 compare VAR_0x8008, ITEM_LEMONADE - call_if_eq EventScript_16BFF6 + call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM33 release end -EventScript_16BFDE:: @ 816BFDE +CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM16:: @ 816BFDE setflag FLAG_GOT_TM16_FROM_THIRSTY_GIRL - msgbox gUnknown_8195DD4 + msgbox CeladonCity_DepartmentStore_Roof_Text_ExplainTM16 return -EventScript_16BFEA:: @ 816BFEA +CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM20:: @ 816BFEA setflag FLAG_GOT_TM20_FROM_THIRSTY_GIRL - msgbox gUnknown_8195E68 + msgbox CeladonCity_DepartmentStore_Roof_Text_ExplainTM20 return -EventScript_16BFF6:: @ 816BFF6 +CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM33:: @ 816BFF6 setflag FLAG_GOT_TM33_FROM_THIRSTY_GIRL - msgbox gUnknown_8195EF4 + msgbox CeladonCity_DepartmentStore_Roof_Text_ExplainTM33 return -EventScript_16C002:: @ 816C002 - msgbox gUnknown_8195F4F +CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForReward:: @ 816C002 + msgbox CeladonCity_DepartmentStore_Roof_Text_DontHaveSpaceForThis release end -EventScript_16C00C:: @ 816C00C +CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink:: @ 816C00C release end -EventScript_16C00E:: @ 816C00E - msgbox gUnknown_8195FEF +CeladonCity_DepartmentStore_Roof_EventScript_IWantDrink:: @ 816C00E + msgbox CeladonCity_DepartmentStore_Roof_Text_ImThirstyIWantDrink release end -EventScript_16C018:: @ 816C018 - msgbox gUnknown_8195F6E +CeladonCity_DepartmentStore_Roof_EventScript_NotThirstyAfterAll:: @ 816C018 + msgbox CeladonCity_DepartmentStore_Roof_Text_ImNotThirstyAfterAll release end -CeladonCity_DepartmentStore_Roof_EventScript_16C022:: @ 816C022 - msgbox gUnknown_8195F98, MSGBOX_NPC +CeladonCity_DepartmentStore_Roof_EventScript_CooltrainerM:: @ 816C022 + msgbox CeladonCity_DepartmentStore_Roof_Text_MySisterIsImmature, MSGBOX_NPC end -CeladonCity_DepartmentStore_Roof_EventScript_16C02B:: @ 816C02B - msgbox gUnknown_8196017, MSGBOX_SIGN +CeladonCity_DepartmentStore_Roof_EventScript_FloorSign:: @ 816C02B + msgbox CeladonCity_DepartmentStore_Roof_Text_FloorSign, MSGBOX_SIGN end -CeladonCity_DepartmentStore_Roof_EventScript_16C034:: @ 816C034 +CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine:: @ 816C034 lockall - message Text_196038 + message CeladonCity_DepartmentStore_Roof_Text_VendingMachineWhatDoesItHave waitmessage showmoneybox 0, 0, 0 - goto EventScript_16C045 + goto CeladonCity_DepartmentStore_Roof_EventScript_ChooseDrink end -EventScript_16C045:: @ 816C045 +CeladonCity_DepartmentStore_Roof_EventScript_ChooseDrink:: @ 816C045 multichoice 12, 0, MULTICHOICE_CELADON_VENDING_MACHINE, FALSE copyvar VAR_TEMP_1, VAR_RESULT switch VAR_TEMP_1 - case 0, EventScript_16C083 - case 1, EventScript_16C094 - case 2, EventScript_16C0A5 - msgbox gUnknown_81960AE - goto EventScript_16C14D + case 0, CeladonCity_DepartmentStore_Roof_EventScript_BuyFreshWater + case 1, CeladonCity_DepartmentStore_Roof_EventScript_BuySodaPop + case 2, CeladonCity_DepartmentStore_Roof_EventScript_BuyLemonade + msgbox CeladonCity_DepartmentStore_Roof_Text_NotThirsty + goto CeladonCity_DepartmentStore_Roof_EventScript_ExitVendingMachine end -EventScript_16C083:: @ 816C083 +CeladonCity_DepartmentStore_Roof_EventScript_BuyFreshWater:: @ 816C083 setvar VAR_TEMP_0, ITEM_FRESH_WATER checkmoney 200, 0 - goto EventScript_16C0CB + goto CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink end -EventScript_16C094:: @ 816C094 +CeladonCity_DepartmentStore_Roof_EventScript_BuySodaPop:: @ 816C094 setvar VAR_TEMP_0, ITEM_SODA_POP checkmoney 300, 0 - goto EventScript_16C0CB + goto CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink end -EventScript_16C0A5:: @ 816C0A5 +CeladonCity_DepartmentStore_Roof_EventScript_BuyLemonade:: @ 816C0A5 setvar VAR_TEMP_0, ITEM_LEMONADE checkmoney 350, 0 - goto EventScript_16C0CB + goto CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink end -EventScript_16C0B6:: @ 816C0B6 +CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyFreshWater:: @ 816C0B6 removemoney 200, 0 return -EventScript_16C0BD:: @ 816C0BD +CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneySodaPop:: @ 816C0BD removemoney 300, 0 return -EventScript_16C0C4:: @ 816C0C4 +CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyLemonade:: @ 816C0C4 removemoney 350, 0 return -EventScript_16C0CB:: @ 816C0CB +CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink:: @ 816C0CB compare VAR_RESULT, FALSE - goto_if_eq EventScript_16C131 + goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NotEnoughMoney checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16C13F + goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForDrink compare VAR_TEMP_1, 0 - call_if_eq EventScript_16C0B6 + call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyFreshWater compare VAR_TEMP_1, 1 - call_if_eq EventScript_16C0BD + call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneySodaPop compare VAR_TEMP_1, 2 - call_if_eq EventScript_16C0C4 + call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyLemonade updatemoneybox 0, 0, 0 getitemname 0, VAR_TEMP_0 playse SE_JIHANKI - msgbox gUnknown_8196076 + msgbox CeladonCity_DepartmentStore_Roof_Text_DrinkCanPoppedOut additem VAR_TEMP_0 - goto EventScript_16C125 + goto CeladonCity_DepartmentStore_Roof_EventScript_ChooseNewDrink end -EventScript_16C125:: @ 816C125 - message Text_196038 +CeladonCity_DepartmentStore_Roof_EventScript_ChooseNewDrink:: @ 816C125 + message CeladonCity_DepartmentStore_Roof_Text_VendingMachineWhatDoesItHave waitmessage - goto EventScript_16C045 + goto CeladonCity_DepartmentStore_Roof_EventScript_ChooseDrink end -EventScript_16C131:: @ 816C131 - msgbox gUnknown_819605E - goto EventScript_16C14D +CeladonCity_DepartmentStore_Roof_EventScript_NotEnoughMoney:: @ 816C131 + msgbox CeladonCity_DepartmentStore_Roof_Text_NotEnoughMoney + goto CeladonCity_DepartmentStore_Roof_EventScript_ExitVendingMachine end -EventScript_16C13F:: @ 816C13F - msgbox gUnknown_819608E - goto EventScript_16C14D +CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForDrink:: @ 816C13F + msgbox CeladonCity_DepartmentStore_Roof_Text_NoMoreRoomForStuff + goto CeladonCity_DepartmentStore_Roof_EventScript_ExitVendingMachine end -EventScript_16C14D:: @ 816C14D +CeladonCity_DepartmentStore_Roof_EventScript_ExitVendingMachine:: @ 816C14D hidemoneybox 0, 0 releaseall end diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/text.inc b/data/maps/CeladonCity_DepartmentStore_Roof/text.inc index 65b9a3162..2c6944373 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/text.inc @@ -1,12 +1,12 @@ -gUnknown_8195D22:: @ 8195D22 +CeladonCity_DepartmentStore_Roof_Text_ImThirstyGiveHerDrink:: @ 8195D22 .string "I'm thirsty!\n" .string "I want something to drink!\p" .string "{SIZE}ÁGive her a drink?$" -Text_195D5F:: @ 8195D5F +CeladonCity_DepartmentStore_Roof_Text_GiveWhichDrink:: @ 8195D5F .string "Give her which drink?$" -gUnknown_8195D75:: @ 8195D75 +CeladonCity_DepartmentStore_Roof_Text_YayFreshWaterHaveThis:: @ 8195D75 .string "Yay!\p" .string "FRESH WATER!\p" .string "Thank you!\n" @@ -16,67 +16,67 @@ Text_ReceivedItemFromLittleGirl:: @ 8195DAD .string "{PLAYER} received a {STR_VAR_2}\n" .string "from the little girl.$" -gUnknown_8195DD4:: @ 8195DD4 +CeladonCity_DepartmentStore_Roof_Text_ExplainTM16:: @ 8195DD4 .string "TM16 contains LIGHT SCREEN.\p" .string "It's a move that weakens the power\n" .string "of special attacks by your foe.$" -gUnknown_8195E33:: @ 8195E33 +CeladonCity_DepartmentStore_Roof_Text_YaySodaPopHaveThis:: @ 8195E33 .string "Yay!\p" .string "SODA POP!\p" .string "Thank you!\n" .string "You can have this from me!$" -gUnknown_8195E68:: @ 8195E68 +CeladonCity_DepartmentStore_Roof_Text_ExplainTM20:: @ 8195E68 .string "TM20 contains SAFEGUARD.\p" .string "It's a move that prevents status\n" .string "problems among your POKéMON.$" -gUnknown_8195EBF:: @ 8195EBF +CeladonCity_DepartmentStore_Roof_Text_YayLemonadeHaveThis:: @ 8195EBF .string "Yay!\p" .string "LEMONADE!\p" .string "Thank you!\n" .string "You can have this from me!$" -gUnknown_8195EF4:: @ 8195EF4 +CeladonCity_DepartmentStore_Roof_Text_ExplainTM33:: @ 8195EF4 .string "TM33 contains REFLECT.\p" .string "It's a move that weakens the power\n" .string "of physical attacks by your foe.$" -gUnknown_8195F4F:: @ 8195F4F +CeladonCity_DepartmentStore_Roof_Text_DontHaveSpaceForThis:: @ 8195F4F .string "You don't have space for this!$" -gUnknown_8195F6E:: @ 8195F6E +CeladonCity_DepartmentStore_Roof_Text_ImNotThirstyAfterAll:: @ 8195F6E .string "No, thank you!\n" .string "I'm not thirsty after all!$" -gUnknown_8195F98:: @ 8195F98 +CeladonCity_DepartmentStore_Roof_Text_MySisterIsImmature:: @ 8195F98 .string "My sister is a TRAINER, believe it\n" .string "or not.\p" .string "But, she's so immature, she drives\n" .string "me nuts!$" -gUnknown_8195FEF:: @ 8195FEF +CeladonCity_DepartmentStore_Roof_Text_ImThirstyIWantDrink:: @ 8195FEF .string "I'm thirsty!\n" .string "I want something to drink!$" -gUnknown_8196017:: @ 8196017 +CeladonCity_DepartmentStore_Roof_Text_FloorSign:: @ 8196017 .string "ROOFTOP SQUARE:\n" .string "VENDING MACHINES$" -Text_196038:: @ 8196038 +CeladonCity_DepartmentStore_Roof_Text_VendingMachineWhatDoesItHave:: @ 8196038 .string "A vending machine!\n" .string "What does it have?$" -gUnknown_819605E:: @ 819605E +CeladonCity_DepartmentStore_Roof_Text_NotEnoughMoney:: @ 819605E .string "Oops, not enough money!$" -gUnknown_8196076:: @ 8196076 +CeladonCity_DepartmentStore_Roof_Text_DrinkCanPoppedOut:: @ 8196076 .string "A can of {STR_VAR_1} popped out!$" -gUnknown_819608E:: @ 819608E +CeladonCity_DepartmentStore_Roof_Text_NoMoreRoomForStuff:: @ 819608E .string "There's no more room for stuff!$" -gUnknown_81960AE:: @ 81960AE +CeladonCity_DepartmentStore_Roof_Text_NotThirsty:: @ 81960AE .string "Not thirsty!$" diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json index 081d3fac9..79ba87c7f 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C684", + "script": "CeladonCity_GameCorner_EventScript_InfoClerk", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C68D", + "script": "CeladonCity_GameCorner_EventScript_CoinsClerk", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C7BA", + "script": "CeladonCity_GameCorner_EventScript_BaldingMan", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C7D7", + "script": "CeladonCity_GameCorner_EventScript_Woman1", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C7E7", + "script": "CeladonCity_GameCorner_EventScript_Fisher", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C857", + "script": "CeladonCity_GameCorner_EventScript_GymGuy", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C87E", + "script": "CeladonCity_GameCorner_EventScript_Woman2", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C88E", + "script": "CeladonCity_GameCorner_EventScript_OldMan", "flag": "0" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C89E", + "script": "CeladonCity_GameCorner_EventScript_Scientist", "flag": "0" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C8FE", + "script": "CeladonCity_GameCorner_EventScript_Gentleman", "flag": "0" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16CAF5", + "script": "CeladonCity_GameCorner_EventScript_RocketGrunt", "flag": "FLAG_HIDE_GAME_CORNER_ROCKET" } ], @@ -314,168 +314,168 @@ "x": 0, "y": 7, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16C95E" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine0" }, { "type": "bg_event_type_4", "x": 0, "y": 9, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16C9A4" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine1" }, { "type": "bg_event_type_4", "x": 0, "y": 10, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16C9B0" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine2" }, { "type": "bg_event_type_3", "x": 5, "y": 6, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16C9BC" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine3" }, { "type": "bg_event_type_3", "x": 5, "y": 8, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CB5A" + "script": "CeladonCity_GameCorner_EventScript_UnusableSlotMachine1" }, { "type": "bg_event_type_3", "x": 5, "y": 9, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16C9D4" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine5" }, { "type": "bg_event_type_3", "x": 5, "y": 10, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16C9E0" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine6" }, { "type": "bg_event_type_4", "x": 6, "y": 6, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16C9EC" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine7" }, { "type": "bg_event_type_4", "x": 6, "y": 7, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16C9F8" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine8" }, { "type": "bg_event_type_4", "x": 6, "y": 9, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA04" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine9" }, { "type": "bg_event_type_3", "x": 11, "y": 6, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA10" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine10" }, { "type": "bg_event_type_3", "x": 11, "y": 7, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA1C" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine11" }, { "type": "bg_event_type_3", "x": 11, "y": 8, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA28" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine12" }, { "type": "bg_event_type_3", "x": 11, "y": 10, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA34" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine13" }, { "type": "bg_event_type_4", "x": 12, "y": 6, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA40" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine14" }, { "type": "bg_event_type_4", "x": 12, "y": 8, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CB63" + "script": "CeladonCity_GameCorner_EventScript_UnusableSlotMachine2" }, { "type": "bg_event_type_4", "x": 12, "y": 9, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA58" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine16" }, { "type": "bg_event_type_4", "x": 12, "y": 10, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA64" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine17" }, { "type": "bg_event_type_3", "x": 17, "y": 6, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CB6C" + "script": "CeladonCity_GameCorner_EventScript_UnusableSlotMachine3" }, { "type": "bg_event_type_3", "x": 17, "y": 7, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA7C" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine19" }, { "type": "bg_event_type_3", "x": 17, "y": 8, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA88" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine20" }, { "type": "bg_event_type_3", "x": 17, "y": 9, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA94" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine21" }, { "type": "bg_event_type_0", "x": 11, "y": 1, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CAAA" + "script": "CeladonCity_GameCorner_EventScript_Poster" }, { "type": "bg_event_type_3", "x": 17, "y": 13, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_1B2867" + "script": "CeladonCity_GameCorner_EventScript_PhotoPrinter" } ] } diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 20b2ba04c..c206f38b4 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -3,443 +3,443 @@ CeladonCity_GameCorner_MapScripts:: @ 816C646 .byte 0 CeladonCity_GameCorner_OnLoad:: @ 816C64C - call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, EventScript_16C656 + call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, CeladonCity_GameCorner_EventScript_HideRocketHideout end -EventScript_16C656:: @ 816C656 - setmetatile 15, 2, 658, 0 - setmetatile 16, 2, 658, 0 - setmetatile 17, 2, 658, 0 - setmetatile 16, 3, 719, 1 - setmetatile 17, 3, 719, 1 +CeladonCity_GameCorner_EventScript_HideRocketHideout:: @ 816C656 + setmetatile 15, 2, METATILE_GameCorner_Floor_ShadeFull, 0 + setmetatile 16, 2, METATILE_GameCorner_Floor_ShadeFull, 0 + setmetatile 17, 2, METATILE_GameCorner_Floor_ShadeFull, 0 + setmetatile 16, 3, METATILE_GameCorner_PurpleWall_Floor, 1 + setmetatile 17, 3, METATILE_GameCorner_PurpleWall_Floor, 1 return -CeladonCity_GameCorner_EventScript_16C684:: @ 816C684 - msgbox gUnknown_8196940, MSGBOX_NPC +CeladonCity_GameCorner_EventScript_InfoClerk:: @ 816C684 + msgbox CeladonCity_GameCorner_Text_CanExchangeCoinsNextDoor, MSGBOX_NPC end -CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D +CeladonCity_GameCorner_EventScript_CoinsClerk:: @ 816C68D goto_if_questlog EventScript_ReleaseEnd lock faceplayer showmoneybox 0, 0, 0 showcoinsbox 0, 5 - message Text_196984 + message CeladonCity_GameCorner_Text_WelcomeBuySomeCoins waitmessage multichoice 13, 0, MULTICHOICE_GAME_CORNER_COIN_PURCHASE_COUNTER, FALSE copyvar VAR_0x8009, VAR_RESULT switch VAR_RESULT - case 0, EventScript_16C6E6 - case 1, EventScript_16C6E6 - case 2, EventScript_16C782 - case 127, EventScript_16C782 + case 0, CeladonCity_GameCorner_EventScript_BuyCoins + case 1, CeladonCity_GameCorner_EventScript_BuyCoins + case 2, CeladonCity_GameCorner_EventScript_ClerkDeclineBuy + case 127, CeladonCity_GameCorner_EventScript_ClerkDeclineBuy end -EventScript_16C6E6:: @ 816C6E6 - goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C790 +CeladonCity_GameCorner_EventScript_BuyCoins:: @ 816C6E6 + goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_ClerkNoCoinCase compare VAR_0x8009, 0 - goto_if_eq EventScript_16C734 + goto_if_eq CeladonCity_GameCorner_EventScript_Buy50Coins compare VAR_0x8009, 1 - goto_if_eq EventScript_16C706 + goto_if_eq CeladonCity_GameCorner_EventScript_Buy500Coins end -EventScript_16C706:: @ 816C706 +CeladonCity_GameCorner_EventScript_Buy500Coins:: @ 816C706 checkcoins VAR_TEMP_1 - compare VAR_TEMP_1, 9500 - goto_if_ge EventScript_16C79E + compare VAR_TEMP_1, (MAX_COINS + 1) - 500 + goto_if_ge CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins checkmoney 10000, 0 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16C7AC + goto_if_eq CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney addcoins 500 removemoney 10000, 0 - goto EventScript_16C762 + goto CeladonCity_GameCorner_EventScript_BoughtCoins end -EventScript_16C734:: @ 816C734 +CeladonCity_GameCorner_EventScript_Buy50Coins:: @ 816C734 checkcoins VAR_TEMP_1 - compare VAR_TEMP_1, 9950 - goto_if_ge EventScript_16C79E + compare VAR_TEMP_1, (MAX_COINS + 1) - 50 + goto_if_ge CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins checkmoney 1000, 0 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16C7AC + goto_if_eq CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney addcoins 50 removemoney 1000, 0 - goto EventScript_16C762 + goto CeladonCity_GameCorner_EventScript_BoughtCoins end -EventScript_16C762:: @ 816C762 +CeladonCity_GameCorner_EventScript_BoughtCoins:: @ 816C762 updatemoneybox 0, 0, 0 updatecoinsbox 0, 5 playse SE_SHOP - msgbox gUnknown_8196A62 - goto EventScript_16C77A + msgbox CeladonCity_GameCorner_Text_HereAreYourCoins + goto CeladonCity_GameCorner_EventScript_ClerkEnd end -EventScript_16C77A:: @ 816C77A +CeladonCity_GameCorner_EventScript_ClerkEnd:: @ 816C77A hidemoneybox 0, 0 hidecoinsbox 0, 5 release end -EventScript_16C782:: @ 816C782 - msgbox gUnknown_81969DC - goto EventScript_16C77A +CeladonCity_GameCorner_EventScript_ClerkDeclineBuy:: @ 816C782 + msgbox CeladonCity_GameCorner_Text_ComePlaySometime + goto CeladonCity_GameCorner_EventScript_ClerkEnd end -EventScript_16C790:: @ 816C790 - msgbox gUnknown_81969FB - goto EventScript_16C77A +CeladonCity_GameCorner_EventScript_ClerkNoCoinCase:: @ 816C790 + msgbox CeladonCity_GameCorner_Text_SorryDontHaveCoinCase + goto CeladonCity_GameCorner_EventScript_ClerkEnd end -EventScript_16C79E:: @ 816C79E - msgbox gUnknown_8196A26 - goto EventScript_16C77A +CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins:: @ 816C79E + msgbox CeladonCity_GameCorner_Text_CoinCaseIsFull + goto CeladonCity_GameCorner_EventScript_ClerkEnd end -EventScript_16C7AC:: @ 816C7AC - msgbox gUnknown_8196A46 - goto EventScript_16C77A +CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney:: @ 816C7AC + msgbox CeladonCity_GameCorner_Text_CantAffordCoins + goto CeladonCity_GameCorner_EventScript_ClerkEnd end -CeladonCity_GameCorner_EventScript_16C7BA:: @ 816C7BA +CeladonCity_GameCorner_EventScript_BaldingMan:: @ 816C7BA lock faceplayer - msgbox gUnknown_8196A82 - goto EventScript_16C7CA + msgbox CeladonCity_GameCorner_Text_RumoredTeamRocketRunsThisPlace + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -EventScript_16C7CA:: @ 816C7CA +CeladonCity_GameCorner_EventScript_FaceSlotMachine:: @ 816C7CA closemessage applymovement VAR_LAST_TALKED, Movement_FaceOriginalDirection waitmovement 0 release end -CeladonCity_GameCorner_EventScript_16C7D7:: @ 816C7D7 +CeladonCity_GameCorner_EventScript_Woman1:: @ 816C7D7 lock faceplayer - msgbox gUnknown_8196AC7 - goto EventScript_16C7CA + msgbox CeladonCity_GameCorner_Text_ThinkMachinesHaveDifferentOdds + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7 +CeladonCity_GameCorner_EventScript_Fisher:: @ 816C7E7 lock faceplayer - goto_if_set FLAG_GOT_10_COINS_FROM_GAMBLER, EventScript_16C849 - msgbox gUnknown_8196AF3 - goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839 + goto_if_set FLAG_GOT_10_COINS_FROM_GAMBLER, CeladonCity_GameCorner_EventScript_FisherAlreadyGotCoins + msgbox CeladonCity_GameCorner_Text_DoYouWantToPlay + goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_GamblerNoCoinCase checkcoins VAR_TEMP_1 - compare VAR_TEMP_1, 9990 - goto_if_ge EventScript_16C82B + compare VAR_TEMP_1, (MAX_COINS + 1) - 10 + goto_if_ge CeladonCity_GameCorner_EventScript_FisherNoRoomForCoins addcoins 10 textcolor 3 - msgbox gUnknown_8196B0D + msgbox CeladonCity_GameCorner_Text_Received10CoinsFromMan playse SE_SHOP waitse setflag FLAG_GOT_10_COINS_FROM_GAMBLER - goto EventScript_16C7CA + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -EventScript_16C82B:: @ 816C82B - msgbox gUnknown_8196B30 - goto EventScript_16C7CA +CeladonCity_GameCorner_EventScript_FisherNoRoomForCoins:: @ 816C82B + msgbox CeladonCity_GameCorner_Text_DontNeedMyCoins + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -EventScript_16C839:: @ 816C839 +CeladonCity_GameCorner_EventScript_GamblerNoCoinCase:: @ 816C839 textcolor 3 - msgbox gUnknown_8196F26 - goto EventScript_16C7CA + msgbox CeladonCity_GameCorner_Text_DontHaveCoinCase + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -EventScript_16C849:: @ 816C849 - msgbox gUnknown_8196B49 - goto EventScript_16C7CA +CeladonCity_GameCorner_EventScript_FisherAlreadyGotCoins:: @ 816C849 + msgbox CeladonCity_GameCorner_Text_WinsComeAndGo + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_16C857:: @ 816C857 +CeladonCity_GameCorner_EventScript_GymGuy:: @ 816C857 lock faceplayer - goto_if_set FLAG_DEFEATED_ERIKA, EventScript_16C870 - msgbox gUnknown_8196BAD - goto EventScript_16C7CA + goto_if_set FLAG_DEFEATED_ERIKA, CeladonCity_GameCorner_EventScript_GymGuyPostVictory + msgbox CeladonCity_GameCorner_Text_GymGuyAdvice + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -EventScript_16C870:: @ 816C870 - msgbox gUnknown_8196CA1 - goto EventScript_16C7CA +CeladonCity_GameCorner_EventScript_GymGuyPostVictory:: @ 816C870 + msgbox CeladonCity_GameCorner_Text_RareMonsForCoins + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_16C87E:: @ 816C87E +CeladonCity_GameCorner_EventScript_Woman2:: @ 816C87E lock faceplayer - msgbox gUnknown_8196B7B - goto EventScript_16C7CA + msgbox CeladonCity_GameCorner_Text_WinOrLoseItsOnlyLuck + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_16C88E:: @ 816C88E +CeladonCity_GameCorner_EventScript_OldMan:: @ 816C88E lock faceplayer - msgbox gUnknown_8196CFE - goto EventScript_16C7CA + msgbox CeladonCity_GameCorner_Text_SoEasyToGetHooked + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E +CeladonCity_GameCorner_EventScript_Scientist:: @ 816C89E lock faceplayer - goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER, EventScript_16C8F0 - msgbox gUnknown_8196D2B - goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839 + goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER, CeladonCity_GameCorner_EventScript_ScientistAlreadyGotCoins + msgbox CeladonCity_GameCorner_Text_WantSomeCoins + goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_GamblerNoCoinCase checkcoins VAR_TEMP_1 - compare VAR_TEMP_1, 9980 - goto_if_ge EventScript_16C8E2 + compare VAR_TEMP_1, (MAX_COINS + 1) - 20 + goto_if_ge CeladonCity_GameCorner_EventScript_ScientistNoRoomForCoins addcoins 20 textcolor 3 - msgbox gUnknown_8196D47 + msgbox CeladonCity_GameCorner_Text_Received20CoinsFromNiceGuy playse SE_SHOP waitse setflag FLAG_GOT_20_COINS_FROM_GAMBLER - goto EventScript_16C7CA + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -EventScript_16C8E2:: @ 816C8E2 - msgbox gUnknown_8196D6F - goto EventScript_16C7CA +CeladonCity_GameCorner_EventScript_ScientistNoRoomForCoins:: @ 816C8E2 + msgbox CeladonCity_GameCorner_Text_YouHaveLotsOfCoins + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -EventScript_16C8F0:: @ 816C8F0 - msgbox gUnknown_8196D87 - goto EventScript_16C7CA +CeladonCity_GameCorner_EventScript_ScientistAlreadyGotCoins:: @ 816C8F0 + msgbox CeladonCity_GameCorner_Text_NeedMoreCoinsForMonIWant + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE +CeladonCity_GameCorner_EventScript_Gentleman:: @ 816C8FE lock faceplayer - goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER_2, EventScript_16C950 - msgbox gUnknown_8196DB7 - goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839 + goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER_2, CeladonCity_GameCorner_EventScript_GentlemanAlreadyGotCoins + msgbox CeladonCity_GameCorner_Text_HereAreSomeCoinsShoo + goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_GamblerNoCoinCase checkcoins VAR_TEMP_1 - compare VAR_TEMP_1, 9980 - goto_if_ge EventScript_16C942 + compare VAR_TEMP_1, (MAX_COINS + 1) - 20 + goto_if_ge CeladonCity_GameCorner_EventScript_GentlemanNoRoomForCoins addcoins 20 textcolor 3 - msgbox gUnknown_8196DF8 + msgbox CeladonCity_GameCorner_Text_Received20CoinsFromMan playse SE_SHOP waitse setflag FLAG_GOT_20_COINS_FROM_GAMBLER_2 - goto EventScript_16C7CA + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -EventScript_16C942:: @ 816C942 - msgbox gUnknown_8196E1B - goto EventScript_16C7CA +CeladonCity_GameCorner_EventScript_GentlemanNoRoomForCoins:: @ 816C942 + msgbox CeladonCity_GameCorner_Text_YouveGotPlentyCoins + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -EventScript_16C950:: @ 816C950 - msgbox gUnknown_8196E40 - goto EventScript_16C7CA +CeladonCity_GameCorner_EventScript_GentlemanAlreadyGotCoins:: @ 816C950 + msgbox CeladonCity_GameCorner_Text_WatchReelsClosely + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_16C95E:: @ 816C95E +CeladonCity_GameCorner_EventScript_SlotMachine0:: @ 816C95E lockall setvar VAR_0x8004, 0 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -EventScript_16C96A:: @ 816C96A +CeladonCity_GameCorner_EventScript_DontPlaySlotMachine:: @ 816C96A releaseall end -EventScript_16C96C:: @ 816C96C - goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CAA0 - msgbox gUnknown_8196F46, MSGBOX_YESNO +CeladonCity_GameCorner_EventScript_SlotMachine:: @ 816C96C + goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_SlotMachineNoCoinCase + msgbox CeladonCity_GameCorner_Text_SlotMachineWantToPlay, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16C96A + goto_if_eq CeladonCity_GameCorner_EventScript_DontPlaySlotMachine setfieldeffectarg 0, 255 setfieldeffectarg 1, 10 setfieldeffectarg 2, 14 - dofieldeffect 64 - waitfieldeffect 64 + dofieldeffect FLDEFF_UNK_40 + waitfieldeffect FLDEFF_UNK_40 @ Smile icon? specialvar VAR_RESULT, Special_GetRandomSlotMachine playslotmachine VAR_RESULT releaseall end -CeladonCity_GameCorner_EventScript_16C9A4:: @ 816C9A4 +CeladonCity_GameCorner_EventScript_SlotMachine1:: @ 816C9A4 lockall setvar VAR_0x8004, 1 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16C9B0:: @ 816C9B0 +CeladonCity_GameCorner_EventScript_SlotMachine2:: @ 816C9B0 lockall setvar VAR_0x8004, 2 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16C9BC:: @ 816C9BC +CeladonCity_GameCorner_EventScript_SlotMachine3:: @ 816C9BC lockall setvar VAR_0x8004, 3 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -EventScript_16C9C8:: @ 816C9C8 +CeladonCity_GameCorner_EventScript_SlotMachine4:: @ 816C9C8 lockall setvar VAR_0x8004, 4 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16C9D4:: @ 816C9D4 +CeladonCity_GameCorner_EventScript_SlotMachine5:: @ 816C9D4 lockall setvar VAR_0x8004, 5 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16C9E0:: @ 816C9E0 +CeladonCity_GameCorner_EventScript_SlotMachine6:: @ 816C9E0 lockall setvar VAR_0x8004, 6 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16C9EC:: @ 816C9EC +CeladonCity_GameCorner_EventScript_SlotMachine7:: @ 816C9EC lockall setvar VAR_0x8004, 7 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16C9F8:: @ 816C9F8 +CeladonCity_GameCorner_EventScript_SlotMachine8:: @ 816C9F8 lockall setvar VAR_0x8004, 8 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA04:: @ 816CA04 +CeladonCity_GameCorner_EventScript_SlotMachine9:: @ 816CA04 lockall setvar VAR_0x8004, 9 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA10:: @ 816CA10 +CeladonCity_GameCorner_EventScript_SlotMachine10:: @ 816CA10 lockall setvar VAR_0x8004, 10 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA1C:: @ 816CA1C +CeladonCity_GameCorner_EventScript_SlotMachine11:: @ 816CA1C lockall setvar VAR_0x8004, 11 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA28:: @ 816CA28 +CeladonCity_GameCorner_EventScript_SlotMachine12:: @ 816CA28 lockall setvar VAR_0x8004, 12 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA34:: @ 816CA34 +CeladonCity_GameCorner_EventScript_SlotMachine13:: @ 816CA34 lockall setvar VAR_0x8004, 13 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA40:: @ 816CA40 +CeladonCity_GameCorner_EventScript_SlotMachine14:: @ 816CA40 lockall setvar VAR_0x8004, 14 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -EventScript_16CA4C:: @ 816CA4C +CeladonCity_GameCorner_EventScript_SlotMachine15:: @ 816CA4C lockall setvar VAR_0x8004, 15 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA58:: @ 816CA58 +CeladonCity_GameCorner_EventScript_SlotMachine16:: @ 816CA58 lockall setvar VAR_0x8004, 16 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA64:: @ 816CA64 +CeladonCity_GameCorner_EventScript_SlotMachine17:: @ 816CA64 lockall setvar VAR_0x8004, 17 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -EventScript_16CA70:: @ 816CA70 +CeladonCity_GameCorner_EventScript_SlotMachine18:: @ 816CA70 lockall setvar VAR_0x8004, 18 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA7C:: @ 816CA7C +CeladonCity_GameCorner_EventScript_SlotMachine19:: @ 816CA7C lockall setvar VAR_0x8004, 19 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA88:: @ 816CA88 +CeladonCity_GameCorner_EventScript_SlotMachine20:: @ 816CA88 lockall setvar VAR_0x8004, 20 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA94:: @ 816CA94 +CeladonCity_GameCorner_EventScript_SlotMachine21:: @ 816CA94 lockall setvar VAR_0x8004, 21 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -EventScript_16CAA0:: @ 816CAA0 - msgbox gUnknown_8196F0D +CeladonCity_GameCorner_EventScript_SlotMachineNoCoinCase:: @ 816CAA0 + msgbox CeladonCity_GameCorner_Text_CoinCaseIsRequired releaseall end -CeladonCity_GameCorner_EventScript_16CAAA:: @ 816CAAA +CeladonCity_GameCorner_EventScript_Poster:: @ 816CAAA lockall - msgbox gUnknown_8196EDC - call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, EventScript_16CABE + msgbox CeladonCity_GameCorner_Text_SwitchBehindPosterPushIt + call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, CeladonCity_GameCorner_EventScript_OpenRocketHideout releaseall end -EventScript_16CABE:: @ 816CABE +CeladonCity_GameCorner_EventScript_OpenRocketHideout:: @ 816CABE playse SE_KI_GASYAN - setmetatile 15, 2, 669, 0 - setmetatile 16, 2, 670, 1 - setmetatile 17, 2, 671, 1 - setmetatile 16, 3, 678, 1 - setmetatile 17, 3, 679, 1 + setmetatile 15, 2, METATILE_GameCorner_Floor_StairsTop, 0 + setmetatile 16, 2, METATILE_GameCorner_StairsTop, 1 + setmetatile 17, 2, METATILE_GameCorner_StairsBottom, 1 + setmetatile 16, 3, METATILE_GameCorner_PurpleWall_StairsTop, 1 + setmetatile 17, 3, METATILE_GameCorner_PurpleWall_stairsBottom, 1 special DrawWholeMapView setflag FLAG_OPENED_ROCKET_HIDEOUT return -CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_7, Text_196E69, Text_196E95, EventScript_16CB10 - msgbox gUnknown_8196E9B, MSGBOX_AUTOCLOSE +CeladonCity_GameCorner_EventScript_RocketGrunt:: @ 816CAF5 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_7, CeladonCity_GameCorner_Text_GruntIntro, CeladonCity_GameCorner_Text_GruntDefeat, CeladonCity_GameCorner_Text_DefeatedGrunt + msgbox CeladonCity_GameCorner_Text_GruntPostBattle, MSGBOX_AUTOCLOSE end -EventScript_16CB10:: @ 816CB10 - msgbox gUnknown_8196E9B +CeladonCity_GameCorner_Text_DefeatedGrunt:: @ 816CB10 + msgbox CeladonCity_GameCorner_Text_GruntPostBattle closemessage compare VAR_FACING, DIR_WEST - call_if_eq EventScript_16CB34 + call_if_eq CeladonCity_GameCorner_Text_GruntExitWest compare VAR_FACING, DIR_WEST - call_if_ne EventScript_16CB3F + call_if_ne CeladonCity_GameCorner_Text_GruntExit removeobject 11 release end -EventScript_16CB34:: @ 816CB34 - applymovement 11, Movement_16CB4A +CeladonCity_GameCorner_Text_GruntExitWest:: @ 816CB34 + applymovement 11, CeladonCity_GameCorner_Movement_GruntExitWest waitmovement 0 return -EventScript_16CB3F:: @ 816CB3F - applymovement 11, Movement_16CB53 +CeladonCity_GameCorner_Text_GruntExit:: @ 816CB3F + applymovement 11, CeladonCity_GameCorner_Movement_GruntExit waitmovement 0 return -Movement_16CB4A:: @ 816CB4A +CeladonCity_GameCorner_Movement_GruntExitWest:: @ 816CB4A walk_down walk_right walk_right @@ -450,7 +450,7 @@ Movement_16CB4A:: @ 816CB4A walk_right step_end -Movement_16CB53:: @ 816CB53 +CeladonCity_GameCorner_Movement_GruntExit:: @ 816CB53 walk_right walk_right walk_right @@ -459,14 +459,14 @@ Movement_16CB53:: @ 816CB53 walk_right step_end -CeladonCity_GameCorner_EventScript_16CB5A:: @ 816CB5A - msgbox gUnknown_8196F64, MSGBOX_SIGN +CeladonCity_GameCorner_EventScript_UnusableSlotMachine1:: @ 816CB5A + msgbox CeladonCity_GameCorner_Text_OutOfOrder, MSGBOX_SIGN end -CeladonCity_GameCorner_EventScript_16CB63:: @ 816CB63 - msgbox gUnknown_8196F81, MSGBOX_SIGN +CeladonCity_GameCorner_EventScript_UnusableSlotMachine2:: @ 816CB63 + msgbox CeladonCity_GameCorner_Text_OutToLunch, MSGBOX_SIGN end -CeladonCity_GameCorner_EventScript_16CB6C:: @ 816CB6C - msgbox gUnknown_8196FA0, MSGBOX_SIGN +CeladonCity_GameCorner_EventScript_UnusableSlotMachine3:: @ 816CB6C + msgbox CeladonCity_GameCorner_Text_SomeonesKeys, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_GameCorner/text.inc b/data/maps/CeladonCity_GameCorner/text.inc index a388a736f..6813330ab 100644 --- a/data/maps/CeladonCity_GameCorner/text.inc +++ b/data/maps/CeladonCity_GameCorner/text.inc @@ -1,60 +1,60 @@ -gUnknown_8196940:: @ 8196940 +CeladonCity_GameCorner_Text_CanExchangeCoinsNextDoor:: @ 8196940 .string "Welcome!\p" .string "You can exchange your COINS for\n" .string "fabulous prizes next door.$" -Text_196984:: @ 8196984 +CeladonCity_GameCorner_Text_WelcomeBuySomeCoins:: @ 8196984 .string "Welcome to ROCKET GAME CORNER!\p" .string "Do you need some game COINS?\n" .string "Would you like to buy some?$" -gUnknown_81969DC:: @ 81969DC +CeladonCity_GameCorner_Text_ComePlaySometime:: @ 81969DC .string "No?\n" .string "Please come play sometime!$" -gUnknown_81969FB:: @ 81969FB +CeladonCity_GameCorner_Text_SorryDontHaveCoinCase:: @ 81969FB .string "Oh, I'm sorry.\n" .string "You don't have a COIN CASE.$" -gUnknown_8196A26:: @ 8196A26 +CeladonCity_GameCorner_Text_CoinCaseIsFull:: @ 8196A26 .string "Whoops!\n" .string "Your COIN CASE is full.$" -gUnknown_8196A46:: @ 8196A46 +CeladonCity_GameCorner_Text_CantAffordCoins:: @ 8196A46 .string "You can't afford the COINS.$" -gUnknown_8196A62:: @ 8196A62 +CeladonCity_GameCorner_Text_HereAreYourCoins:: @ 8196A62 .string "Thank you.\n" .string "Here are your COINS!$" -gUnknown_8196A82:: @ 8196A82 +CeladonCity_GameCorner_Text_RumoredTeamRocketRunsThisPlace:: @ 8196A82 .string "Keep this quiet.\p" .string "It's rumored that this place is run\n" .string "by TEAM ROCKET.$" -gUnknown_8196AC7:: @ 8196AC7 +CeladonCity_GameCorner_Text_ThinkMachinesHaveDifferentOdds:: @ 8196AC7 .string "I think these machines have\n" .string "different odds.$" -gUnknown_8196AF3:: @ 8196AF3 +CeladonCity_GameCorner_Text_DoYouWantToPlay:: @ 8196AF3 .string "Kid, do you want to play?$" -gUnknown_8196B0D:: @ 8196B0D +CeladonCity_GameCorner_Text_Received10CoinsFromMan:: @ 8196B0D .string "{PLAYER} received 10 COINS\n" .string "from the man.$" -gUnknown_8196B30:: @ 8196B30 +CeladonCity_GameCorner_Text_DontNeedMyCoins:: @ 8196B30 .string "You don't need my COINS!$" -gUnknown_8196B49:: @ 8196B49 +CeladonCity_GameCorner_Text_WinsComeAndGo:: @ 8196B49 .string "Wins seem to come and go.\n" .string "Nothing's a sure thing.$" -gUnknown_8196B7B:: @ 8196B7B +CeladonCity_GameCorner_Text_WinOrLoseItsOnlyLuck:: @ 8196B7B .string "These slot games…\n" .string "Win or lose, it's only by luck.$" -gUnknown_8196BAD:: @ 8196BAD +CeladonCity_GameCorner_Text_GymGuyAdvice:: @ 8196BAD .string "Hey!\p" .string "You have better things to do,\n" .string "champ in the making!\p" @@ -66,83 +66,83 @@ gUnknown_8196BAD:: @ 8196BAD .string "But she's not one to be taken\n" .string "lightly!$" -gUnknown_8196CA1:: @ 8196CA1 +CeladonCity_GameCorner_Text_RareMonsForCoins:: @ 8196CA1 .string "They offer rare POKéMON that can\n" .string "be exchanged for your COINS.\p" .string "But, I just can't seem to win!$" -gUnknown_8196CFE:: @ 8196CFE +CeladonCity_GameCorner_Text_SoEasyToGetHooked:: @ 8196CFE .string "Games are scary!\n" .string "It's so easy to get hooked!$" -gUnknown_8196D2B:: @ 8196D2B +CeladonCity_GameCorner_Text_WantSomeCoins:: @ 8196D2B .string "What's up?\n" .string "Want some COINS?$" -gUnknown_8196D47:: @ 8196D47 +CeladonCity_GameCorner_Text_Received20CoinsFromNiceGuy:: @ 8196D47 .string "{PLAYER} received 20 COINS\n" .string "from the nice guy.$" -gUnknown_8196D6F:: @ 8196D6F +CeladonCity_GameCorner_Text_YouHaveLotsOfCoins:: @ 8196D6F .string "You have lots of COINS!$" -gUnknown_8196D87:: @ 8196D87 +CeladonCity_GameCorner_Text_NeedMoreCoinsForMonIWant:: @ 8196D87 .string "Darn! I need more COINS for the\n" .string "POKéMON I want!$" -gUnknown_8196DB7:: @ 8196DB7 +CeladonCity_GameCorner_Text_HereAreSomeCoinsShoo:: @ 8196DB7 .string "Hey, what? You're throwing me off!\n" .string "Here are some COINS, so shoo!$" -gUnknown_8196DF8:: @ 8196DF8 +CeladonCity_GameCorner_Text_Received20CoinsFromMan:: @ 8196DF8 .string "{PLAYER} received 20 COINS\n" .string "from the man.$" -gUnknown_8196E1B:: @ 8196E1B +CeladonCity_GameCorner_Text_YouveGotPlentyCoins:: @ 8196E1B .string "You've got plenty of your own\n" .string "COINS!$" -gUnknown_8196E40:: @ 8196E40 +CeladonCity_GameCorner_Text_WatchReelsClosely:: @ 8196E40 .string "The trick is to watch the reels\n" .string "closely.$" -Text_196E69:: @ 8196E69 +CeladonCity_GameCorner_Text_GruntIntro:: @ 8196E69 .string "I'm guarding this poster!\n" .string "Go away, or else!$" -Text_196E95:: @ 8196E95 +CeladonCity_GameCorner_Text_GruntDefeat:: @ 8196E95 .string "Dang!$" -gUnknown_8196E9B:: @ 8196E9B +CeladonCity_GameCorner_Text_GruntPostBattle:: @ 8196E9B .string "The TEAM ROCKET HIDEOUT might\n" .string "be discovered!\p" .string "I better tell BOSS!$" -gUnknown_8196EDC:: @ 8196EDC +CeladonCity_GameCorner_Text_SwitchBehindPosterPushIt:: @ 8196EDC .string "Hey!\p" .string "A switch behind the poster!?\n" .string "Let's push it!$" -gUnknown_8196F0D:: @ 8196F0D +CeladonCity_GameCorner_Text_CoinCaseIsRequired:: @ 8196F0D .string "A COIN CASE is required…$" -gUnknown_8196F26:: @ 8196F26 +CeladonCity_GameCorner_Text_DontHaveCoinCase:: @ 8196F26 .string "Oops!\n" .string "Don't have the COIN CASE!$" -gUnknown_8196F46:: @ 8196F46 +CeladonCity_GameCorner_Text_SlotMachineWantToPlay:: @ 8196F46 .string "A slot machine!\n" .string "Want to play?$" -gUnknown_8196F64:: @ 8196F64 +CeladonCity_GameCorner_Text_OutOfOrder:: @ 8196F64 .string "OUT OF ORDER\n" .string "This is broken.$" -gUnknown_8196F81:: @ 8196F81 +CeladonCity_GameCorner_Text_OutToLunch:: @ 8196F81 .string "OUT TO LUNCH\n" .string "This is reserved.$" -gUnknown_8196FA0:: @ 8196FA0 +CeladonCity_GameCorner_Text_SomeonesKeys:: @ 8196FA0 .string "Someone's keys!\n" .string "They'll be back.$" diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json index c873cd0bb..99a1a54d4 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CB76", + "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_BaldingMan", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F", + "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_OldMan", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88", + "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkMons", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D", + "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkTMs", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88", + "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkItems", "flag": "0" } ], diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 329f829d3..ca8119594 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -1,44 +1,44 @@ CeladonCity_GameCorner_PrizeRoom_MapScripts:: @ 816CB75 .byte 0 -CeladonCity_GameCorner_PrizeRoom_EventScript_16CB76:: @ 816CB76 - msgbox gUnknown_8196FC1, MSGBOX_NPC +CeladonCity_GameCorner_PrizeRoom_EventScript_BaldingMan:: @ 816CB76 + msgbox CeladonCity_GameCorner_PrizeRoom_Text_FancyThatPorygon, MSGBOX_NPC end -CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F:: @ 816CB7F - msgbox gUnknown_8196FFF, MSGBOX_NPC +CeladonCity_GameCorner_PrizeRoom_EventScript_OldMan:: @ 816CB7F + msgbox CeladonCity_GameCorner_PrizeRoom_Text_RakedItInToday, MSGBOX_NPC end -CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88 +CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkMons:: @ 816CB88 lock faceplayer - goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99 + goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_PrizeRoom_EventScript_NeedCoinCase goto_if_questlog EventScript_ReleaseEnd showcoinsbox 0, 0 - msgbox gUnknown_8197057 - goto EventScript_16CBB2 + msgbox CeladonCity_GameCorner_PrizeRoom_Text_WeExchangeCoinsForPrizes + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeMon end -EventScript_16CBB2:: @ 816CBB2 - message Text_19707A +CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeMon:: @ 816CBB2 + message CeladonCity_GameCorner_PrizeRoom_Text_WhichPrize waitmessage multichoice 11, 0, MULTICHOICE_GAME_CORNER_POKEMON_PRIZES, FALSE switch VAR_RESULT - case 0, EventScript_16CC15 - case 1, EventScript_16CC25 - case 2, EventScript_16CC35 - case 3, EventScript_16CC45 - case 4, EventScript_16CC55 - case 5, EventScript_16CC10 - case 127, EventScript_16CC10 + case 0, CeladonCity_GameCorner_PrizeRoom_EventScript_Abra + case 1, CeladonCity_GameCorner_PrizeRoom_EventScript_Clefairy + case 2, CeladonCity_GameCorner_PrizeRoom_EventScript_DratiniPinsir + case 3, CeladonCity_GameCorner_PrizeRoom_EventScript_ScytherDratini + case 4, CeladonCity_GameCorner_PrizeRoom_EventScript_Porygon + case 5, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange + case 127, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -EventScript_16CC10:: @ 816CC10 +CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange:: @ 816CC10 hidecoinsbox 0, 0 release end -EventScript_16CC15:: @ 816CC15 +CeladonCity_GameCorner_PrizeRoom_EventScript_Abra:: @ 816CC15 .ifdef FIRERED setvar VAR_TEMP_1, SPECIES_ABRA setvar VAR_TEMP_2, 180 @@ -48,10 +48,10 @@ EventScript_16CC15:: @ 816CC15 setvar VAR_TEMP_2, 120 .endif .endif - goto EventScript_16CC65 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon end -EventScript_16CC25:: @ 816CC25 +CeladonCity_GameCorner_PrizeRoom_EventScript_Clefairy:: @ 816CC25 .ifdef FIRERED setvar VAR_TEMP_1, SPECIES_CLEFAIRY setvar VAR_TEMP_2, 500 @@ -61,10 +61,10 @@ EventScript_16CC25:: @ 816CC25 setvar VAR_TEMP_2, 750 .endif .endif - goto EventScript_16CC65 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon end -EventScript_16CC35:: @ 816CC35 +CeladonCity_GameCorner_PrizeRoom_EventScript_DratiniPinsir:: @ 816CC35 .ifdef FIRERED setvar VAR_TEMP_1, SPECIES_DRATINI setvar VAR_TEMP_2, 2800 @@ -74,10 +74,10 @@ EventScript_16CC35:: @ 816CC35 setvar VAR_TEMP_2, 2500 .endif .endif - goto EventScript_16CC65 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon end -EventScript_16CC45:: @ 816CC45 +CeladonCity_GameCorner_PrizeRoom_EventScript_ScytherDratini:: @ 816CC45 .ifdef FIRERED setvar VAR_TEMP_1, SPECIES_SCYTHER setvar VAR_TEMP_2, 5500 @@ -87,10 +87,10 @@ EventScript_16CC45:: @ 816CC45 setvar VAR_TEMP_2, 4600 .endif .endif - goto EventScript_16CC65 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon end -EventScript_16CC55:: @ 816CC55 +CeladonCity_GameCorner_PrizeRoom_EventScript_Porygon:: @ 816CC55 .ifdef FIRERED setvar VAR_TEMP_1, SPECIES_PORYGON setvar VAR_TEMP_2, 9999 @@ -100,28 +100,28 @@ EventScript_16CC55:: @ 816CC55 setvar VAR_TEMP_2, 6500 .endif .endif - goto EventScript_16CC65 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon end -EventScript_16CC65:: @ 816CC65 +CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon:: @ 816CC65 getspeciesname 0, VAR_TEMP_1 - msgbox gUnknown_819709D, MSGBOX_YESNO + msgbox CeladonCity_GameCorner_PrizeRoom_Text_YouWantPrize, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16CC10 + goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange checkcoins VAR_RESULT compare VAR_RESULT, VAR_TEMP_2 - goto_if_lt EventScript_16CDA5 + goto_if_lt CeladonCity_GameCorner_PrizeRoom_EventScript_NotEnoughCoins textcolor 3 switch VAR_TEMP_1 - case SPECIES_ABRA, EventScript_16CCD4 - case SPECIES_CLEFAIRY, EventScript_16CCE9 - case SPECIES_DRATINI, EventScript_16CCFE - case SPECIES_SCYTHER, EventScript_16CD13 - case SPECIES_PORYGON, EventScript_16CD28 - case SPECIES_PINSIR, EventScript_16CD3D + case SPECIES_ABRA, CeladonCity_GameCorner_PrizeRoom_EventScript_GiveAbra + case SPECIES_CLEFAIRY, CeladonCity_GameCorner_PrizeRoom_EventScript_GiveClefairy + case SPECIES_DRATINI, CeladonCity_GameCorner_PrizeRoom_EventScript_GiveDratini + case SPECIES_SCYTHER, CeladonCity_GameCorner_PrizeRoom_EventScript_GiveScyther + case SPECIES_PORYGON, CeladonCity_GameCorner_PrizeRoom_EventScript_GivePorygon + case SPECIES_PINSIR, CeladonCity_GameCorner_PrizeRoom_EventScript_GivePinsir end -EventScript_16CCD4:: @ 816CCD4 +CeladonCity_GameCorner_PrizeRoom_EventScript_GiveAbra:: @ 816CCD4 .ifdef FIRERED givemon VAR_TEMP_1, 9, ITEM_NONE .else @@ -129,10 +129,10 @@ EventScript_16CCD4:: @ 816CCD4 givemon VAR_TEMP_1, 7, ITEM_NONE .endif .endif - goto EventScript_16CD52 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon end -EventScript_16CCE9:: @ 816CCE9 +CeladonCity_GameCorner_PrizeRoom_EventScript_GiveClefairy:: @ 816CCE9 .ifdef FIRERED givemon VAR_TEMP_1, 8, ITEM_NONE .else @@ -140,10 +140,10 @@ EventScript_16CCE9:: @ 816CCE9 givemon VAR_TEMP_1, 12, ITEM_NONE .endif .endif - goto EventScript_16CD52 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon end -EventScript_16CCFE:: @ 816CCFE +CeladonCity_GameCorner_PrizeRoom_EventScript_GiveDratini:: @ 816CCFE .ifdef FIRERED givemon VAR_TEMP_1, 18, ITEM_NONE .else @@ -151,15 +151,15 @@ EventScript_16CCFE:: @ 816CCFE givemon VAR_TEMP_1, 24, ITEM_NONE .endif .endif - goto EventScript_16CD52 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon end -EventScript_16CD13:: @ 816CD13 +CeladonCity_GameCorner_PrizeRoom_EventScript_GiveScyther:: @ 816CD13 givemon VAR_TEMP_1, 25, ITEM_NONE - goto EventScript_16CD52 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon end -EventScript_16CD28:: @ 816CD28 +CeladonCity_GameCorner_PrizeRoom_EventScript_GivePorygon:: @ 816CD28 .ifdef FIRERED givemon VAR_TEMP_1, 26, ITEM_NONE .else @@ -167,50 +167,50 @@ EventScript_16CD28:: @ 816CD28 givemon VAR_TEMP_1, 18, ITEM_NONE .endif .endif - goto EventScript_16CD52 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon end -EventScript_16CD3D:: @ 816CD3D +CeladonCity_GameCorner_PrizeRoom_EventScript_GivePinsir:: @ 816CD3D givemon VAR_TEMP_1, 18, ITEM_NONE - goto EventScript_16CD52 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon end -EventScript_16CD52:: @ 816CD52 +CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon:: @ 816CD52 compare VAR_RESULT, 0 - goto_if_eq EventScript_16CDB3 + goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonParty compare VAR_RESULT, 1 - goto_if_eq EventScript_16CDE0 + goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonPC compare VAR_RESULT, 2 - goto_if_eq EventScript_16CD74 + goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_PartyFull end -EventScript_16CD74:: @ 816CD74 +CeladonCity_GameCorner_PrizeRoom_EventScript_PartyFull:: @ 816CD74 textcolor 3 msgbox Text_NoMoreRoomForPokemon hidecoinsbox 0, 0 release end -EventScript_16CD83:: @ 816CD83 +CeladonCity_GameCorner_PrizeRoom_EventScript_NicknamePartyMon:: @ 816CD83 getpartysize subvar VAR_RESULT, 1 copyvar VAR_0x8004, VAR_RESULT call EventScript_ChangePokemonNickname - goto EventScript_16CC10 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -EventScript_16CD99:: @ 816CD99 +CeladonCity_GameCorner_PrizeRoom_EventScript_NeedCoinCase:: @ 816CD99 textcolor 3 - msgbox gUnknown_819703E + msgbox CeladonCity_GameCorner_PrizeRoom_Text_CoinCaseRequired release end -EventScript_16CDA5:: @ 816CDA5 - msgbox gUnknown_81970D5 - goto EventScript_16CC10 +CeladonCity_GameCorner_PrizeRoom_EventScript_NotEnoughCoins:: @ 816CDA5 + msgbox CeladonCity_GameCorner_PrizeRoom_Text_NeedMoreCoins + goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -EventScript_16CDB3:: @ 816CDB3 +CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonParty:: @ 816CDB3 removecoins VAR_TEMP_2 updatecoinsbox 0, 5 getspeciesname 0, VAR_TEMP_1 @@ -220,11 +220,11 @@ EventScript_16CDB3:: @ 816CDB3 waitfanfare msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_16CD83 - goto EventScript_16CC10 + goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_NicknamePartyMon + goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -EventScript_16CDE0:: @ 816CDE0 +CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonPC:: @ 816CDE0 removecoins VAR_TEMP_2 updatecoinsbox 0, 5 getspeciesname 0, VAR_TEMP_1 @@ -234,161 +234,161 @@ EventScript_16CDE0:: @ 816CDE0 waitfanfare msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16CE12 + goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_TransferredToPC call EventScript_NameReceivedBoxMon - goto EventScript_16CE12 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_TransferredToPC end -EventScript_16CE12:: @ 816CE12 +CeladonCity_GameCorner_PrizeRoom_EventScript_TransferredToPC:: @ 816CE12 call EventScript_TransferredToPC - goto EventScript_16CC10 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D +CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkTMs:: @ 816CE1D lock faceplayer - goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99 + goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_PrizeRoom_EventScript_NeedCoinCase goto_if_questlog EventScript_ReleaseEnd showcoinsbox 0, 0 - msgbox gUnknown_8197057 - goto EventScript_16CE47 + msgbox CeladonCity_GameCorner_PrizeRoom_Text_WeExchangeCoinsForPrizes + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeTM end -EventScript_16CE47:: @ 816CE47 - message Text_19707A +CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeTM:: @ 816CE47 + message CeladonCity_GameCorner_PrizeRoom_Text_WhichPrize waitmessage multichoice 11, 0, MULTICHOICE_GAME_CORNER_TMPRIZES, FALSE switch VAR_RESULT - case 0, EventScript_16CEA5 - case 1, EventScript_16CEB9 - case 2, EventScript_16CECD - case 3, EventScript_16CEE1 - case 4, EventScript_16CEF5 - case 5, EventScript_16CC10 - case 127, EventScript_16CC10 + case 0, CeladonCity_GameCorner_PrizeRoom_EventScript_TM13 + case 1, CeladonCity_GameCorner_PrizeRoom_EventScript_TM23 + case 2, CeladonCity_GameCorner_PrizeRoom_EventScript_TM24 + case 3, CeladonCity_GameCorner_PrizeRoom_EventScript_TM30 + case 4, CeladonCity_GameCorner_PrizeRoom_EventScript_TM35 + case 5, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange + case 127, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -EventScript_16CEA5:: @ 816CEA5 +CeladonCity_GameCorner_PrizeRoom_EventScript_TM13:: @ 816CEA5 setvar VAR_TEMP_1, ITEM_TM13 setvar VAR_TEMP_2, 4000 getmovename 1, MOVE_ICE_BEAM - goto EventScript_16CF09 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM end -EventScript_16CEB9:: @ 816CEB9 +CeladonCity_GameCorner_PrizeRoom_EventScript_TM23:: @ 816CEB9 setvar VAR_TEMP_1, ITEM_TM23 setvar VAR_TEMP_2, 3500 getmovename 1, MOVE_IRON_TAIL - goto EventScript_16CF09 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM end -EventScript_16CECD:: @ 816CECD +CeladonCity_GameCorner_PrizeRoom_EventScript_TM24:: @ 816CECD setvar VAR_TEMP_1, ITEM_TM24 setvar VAR_TEMP_2, 4000 getmovename 1, MOVE_THUNDERBOLT - goto EventScript_16CF09 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM end -EventScript_16CEE1:: @ 816CEE1 +CeladonCity_GameCorner_PrizeRoom_EventScript_TM30:: @ 816CEE1 setvar VAR_TEMP_1, ITEM_TM30 setvar VAR_TEMP_2, 4500 getmovename 1, MOVE_SHADOW_BALL - goto EventScript_16CF09 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM end -EventScript_16CEF5:: @ 816CEF5 +CeladonCity_GameCorner_PrizeRoom_EventScript_TM35:: @ 816CEF5 setvar VAR_TEMP_1, ITEM_TM35 setvar VAR_TEMP_2, 4000 getmovename 1, MOVE_FLAMETHROWER - goto EventScript_16CF09 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM end -EventScript_16CF09:: @ 816CF09 - msgbox gUnknown_81970B2, MSGBOX_YESNO +CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM:: @ 816CF09 + msgbox CeladonCity_GameCorner_PrizeRoom_Text_YouWantTM, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16CC10 - goto EventScript_16CF3F + goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange + goto CeladonCity_GameCorner_PrizeRoom_EventScript_TryGivePrize end -EventScript_16CF22:: @ 816CF22 +CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem:: @ 816CF22 getitemname 0, VAR_TEMP_1 - msgbox gUnknown_819709D, MSGBOX_YESNO + msgbox CeladonCity_GameCorner_PrizeRoom_Text_YouWantPrize, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16CC10 - goto EventScript_16CF3F + goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange + goto CeladonCity_GameCorner_PrizeRoom_EventScript_TryGivePrize end -EventScript_16CF3F:: @ 816CF3F +CeladonCity_GameCorner_PrizeRoom_EventScript_TryGivePrize:: @ 816CF3F getitemname 0, VAR_TEMP_1 checkcoins VAR_RESULT compare VAR_RESULT, VAR_TEMP_2 - goto_if_lt EventScript_16CDA5 + goto_if_lt CeladonCity_GameCorner_PrizeRoom_EventScript_NotEnoughCoins checkitemspace VAR_TEMP_1, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16CF79 + goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_BagFull removecoins VAR_TEMP_2 updatecoinsbox 0, 5 giveitem VAR_TEMP_1 - goto EventScript_16CC10 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -EventScript_16CF79:: @ 816CF79 +CeladonCity_GameCorner_PrizeRoom_EventScript_BagFull:: @ 816CF79 textcolor 3 msgbox Text_TooBadBagFull hidecoinsbox 0, 0 release end -CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88 +CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkItems:: @ 816CF88 lock faceplayer - goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99 + goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_PrizeRoom_EventScript_NeedCoinCase goto_if_questlog EventScript_ReleaseEnd showcoinsbox 0, 0 - msgbox gUnknown_8197057 - goto EventScript_16CFB2 + msgbox CeladonCity_GameCorner_PrizeRoom_Text_WeExchangeCoinsForPrizes + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeItem end -EventScript_16CFB2:: @ 816CFB2 - message Text_19707A +CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeItem:: @ 816CFB2 + message CeladonCity_GameCorner_PrizeRoom_Text_WhichPrize waitmessage multichoice 10, 0, MULTICHOICE_GAME_CORNER_BATTLE_ITEM_PRIZES, FALSE switch VAR_RESULT - case 0, EventScript_16D010 - case 1, EventScript_16D020 - case 2, EventScript_16D030 - case 3, EventScript_16D040 - case 4, EventScript_16D050 - case 5, EventScript_16CC10 - case 127, EventScript_16CC10 + case 0, CeladonCity_GameCorner_PrizeRoom_EventScript_SmokeBall + case 1, CeladonCity_GameCorner_PrizeRoom_EventScript_MiracleSeed + case 2, CeladonCity_GameCorner_PrizeRoom_EventScript_Charcoal + case 3, CeladonCity_GameCorner_PrizeRoom_EventScript_MysticWater + case 4, CeladonCity_GameCorner_PrizeRoom_EventScript_YellowFlute + case 5, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange + case 127, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -EventScript_16D010:: @ 816D010 +CeladonCity_GameCorner_PrizeRoom_EventScript_SmokeBall:: @ 816D010 setvar VAR_TEMP_1, ITEM_SMOKE_BALL setvar VAR_TEMP_2, 800 - goto EventScript_16CF22 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem end -EventScript_16D020:: @ 816D020 +CeladonCity_GameCorner_PrizeRoom_EventScript_MiracleSeed:: @ 816D020 setvar VAR_TEMP_1, ITEM_MIRACLE_SEED setvar VAR_TEMP_2, 1000 - goto EventScript_16CF22 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem end -EventScript_16D030:: @ 816D030 +CeladonCity_GameCorner_PrizeRoom_EventScript_Charcoal:: @ 816D030 setvar VAR_TEMP_1, ITEM_CHARCOAL setvar VAR_TEMP_2, 1000 - goto EventScript_16CF22 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem end -EventScript_16D040:: @ 816D040 +CeladonCity_GameCorner_PrizeRoom_EventScript_MysticWater:: @ 816D040 setvar VAR_TEMP_1, ITEM_MYSTIC_WATER setvar VAR_TEMP_2, 1000 - goto EventScript_16CF22 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem end -EventScript_16D050:: @ 816D050 +CeladonCity_GameCorner_PrizeRoom_EventScript_YellowFlute:: @ 816D050 setvar VAR_TEMP_1, ITEM_YELLOW_FLUTE setvar VAR_TEMP_2, 1600 - goto EventScript_16CF22 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem end diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc index a5a21b9bc..140c98958 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc @@ -1,31 +1,31 @@ -gUnknown_8196FC1:: @ 8196FC1 +CeladonCity_GameCorner_PrizeRoom_Text_FancyThatPorygon:: @ 8196FC1 .string "I sure do fancy that PORYGON!\n" .string "But, it's hard to win at slots!$" -gUnknown_8196FFF:: @ 8196FFF +CeladonCity_GameCorner_PrizeRoom_Text_RakedItInToday:: @ 8196FFF .string "Gahaha! I raked it in today!\n" .string "If only every day were like this…$" -gUnknown_819703E:: @ 819703E +CeladonCity_GameCorner_PrizeRoom_Text_CoinCaseRequired:: @ 819703E .string "A COIN CASE is required…$" -gUnknown_8197057:: @ 8197057 +CeladonCity_GameCorner_PrizeRoom_Text_WeExchangeCoinsForPrizes:: @ 8197057 .string "We exchange your COINS for prizes.$" -Text_19707A:: @ 819707A +CeladonCity_GameCorner_PrizeRoom_Text_WhichPrize:: @ 819707A .string "Which prize would you like?$" -gUnknown_8197096:: @ 8197096 +CeladonCity_GameCorner_PrizeRoom_Text_HereYouGo:: @ 8197096 .string "はい どうぞ$" -gUnknown_819709D:: @ 819709D +CeladonCity_GameCorner_PrizeRoom_Text_YouWantPrize:: @ 819709D .string "So, you want the {STR_VAR_1}?$" -gUnknown_81970B2:: @ 81970B2 +CeladonCity_GameCorner_PrizeRoom_Text_YouWantTM:: @ 81970B2 .string "Okay, a TM of {STR_VAR_2}\n" .string "is what you want?$" -gUnknown_81970D5:: @ 81970D5 +CeladonCity_GameCorner_PrizeRoom_Text_NeedMoreCoins:: @ 81970D5 .string "Sorry, you'll need more COINS\n" .string "than that.$" diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json index 88187cdc9..f0a86b8e5 100644 --- a/data/maps/CeladonCity_Gym/map.json +++ b/data/maps/CeladonCity_Gym/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "CeladonCity_Gym_EventScript_16D111", + "script": "CeladonCity_Gym_EventScript_Kay", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "CeladonCity_Gym_EventScript_16D163", + "script": "CeladonCity_Gym_EventScript_Bridget", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "CeladonCity_Gym_EventScript_16D14C", + "script": "CeladonCity_Gym_EventScript_Tina", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "CeladonCity_Gym_EventScript_16D17A", + "script": "CeladonCity_Gym_EventScript_Tamia", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "CeladonCity_Gym_EventScript_16D19E", + "script": "CeladonCity_Gym_EventScript_Lori", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "CeladonCity_Gym_EventScript_16D128", + "script": "CeladonCity_Gym_EventScript_Lisa", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Gym_EventScript_16D061", + "script": "CeladonCity_Gym_EventScript_Erika", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "CeladonCity_Gym_EventScript_16D1B5", + "script": "CeladonCity_Gym_EventScript_Mary", "flag": "0" }, { @@ -187,14 +187,14 @@ "x": 4, "y": 16, "elevation": 0, - "script": "CeladonCity_Gym_EventScript_16D1CC" + "script": "CeladonCity_Gym_EventScript_GymStatue" }, { "type": "bg_event_type_0", "x": 8, "y": 16, "elevation": 0, - "script": "CeladonCity_Gym_EventScript_16D1CC" + "script": "CeladonCity_Gym_EventScript_GymStatue" } ] } diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc index 60a945e21..8291ad757 100644 --- a/data/maps/CeladonCity_Gym/scripts.inc +++ b/data/maps/CeladonCity_Gym/scripts.inc @@ -1,85 +1,85 @@ CeladonCity_Gym_MapScripts:: @ 816D060 .byte 0 -CeladonCity_Gym_EventScript_16D061:: @ 816D061 +CeladonCity_Gym_EventScript_Erika:: @ 816D061 famechecker FAMECHECKER_ERIKA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle_single TRAINER_LEADER_ERIKA, Text_197114, Text_197260, EventScript_16D0A0, NO_MUSIC - goto_if_unset FLAG_GOT_TM19_FROM_ERIKA, EventScript_16D0C6 + trainerbattle_single TRAINER_LEADER_ERIKA, CeladonCity_Gym_Text_ErikaIntro, CeladonCity_Gym_Text_ErikaDefeat, CeladonCity_Gym_EventScript_DefeatedErika, NO_MUSIC + goto_if_unset FLAG_GOT_TM19_FROM_ERIKA, CeladonCity_Gym_EventScript_GiveTM19 famechecker FAMECHECKER_ERIKA, 4 - msgbox gUnknown_81972B8 + msgbox CeladonCity_Gym_Text_ErikaPostBattle release end -EventScript_16D0A0:: @ 816D0A0 +CeladonCity_Gym_EventScript_DefeatedErika:: @ 816D0A0 famechecker FAMECHECKER_ERIKA, 1 clearflag FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS setflag FLAG_DEFEATED_ERIKA setflag FLAG_BADGE04_GET set_gym_trainers 4 - goto EventScript_16D0C6 + goto CeladonCity_Gym_EventScript_GiveTM19 end -EventScript_16D0C6:: @ 816D0C6 - msgbox gUnknown_8197327 +CeladonCity_Gym_EventScript_GiveTM19:: @ 816D0C6 + msgbox CeladonCity_Gym_Text_ExplainRainbowBadgeTakeThis checkitemspace ITEM_TM19, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16D107 - giveitem_msg gUnknown_81973BA, ITEM_TM19 + goto_if_eq CeladonCity_Gym_EventScript_NoRoomForTM19 + giveitem_msg CeladonCity_Gym_Text_ReceivedTM19FromErika, ITEM_TM19 setflag FLAG_GOT_TM19_FROM_ERIKA - msgbox gUnknown_81973D7 + msgbox CeladonCity_Gym_Text_ExplainTM19 release end -EventScript_16D107:: @ 816D107 - msgbox gUnknown_819745D +CeladonCity_Gym_EventScript_NoRoomForTM19:: @ 816D107 + msgbox CeladonCity_Gym_Text_ShouldMakeRoomForThis release end -CeladonCity_Gym_EventScript_16D111:: @ 816D111 - trainerbattle_single TRAINER_LASS_KAY, Text_19747C, Text_1974C4 - msgbox gUnknown_81974D6, MSGBOX_AUTOCLOSE +CeladonCity_Gym_EventScript_Kay:: @ 816D111 + trainerbattle_single TRAINER_LASS_KAY, CeladonCity_Gym_Text_KayIntro, CeladonCity_Gym_Text_KayDefeat + msgbox CeladonCity_Gym_Text_KayPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_Gym_EventScript_16D128:: @ 816D128 - trainerbattle_single TRAINER_LASS_LISA, Text_1976C5, Text_1976FF +CeladonCity_Gym_EventScript_Lisa:: @ 816D128 + trainerbattle_single TRAINER_LASS_LISA, CeladonCity_Gym_Text_LisaIntro, CeladonCity_Gym_Text_LisaDefeat famechecker FAMECHECKER_ERIKA, 2 - msgbox gUnknown_8197708, MSGBOX_AUTOCLOSE + msgbox CeladonCity_Gym_Text_LisaPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_Gym_EventScript_16D14C:: @ 816D14C - trainerbattle_single TRAINER_PICNICKER_TINA, Text_197595, Text_1975BB - msgbox gUnknown_81975D1, MSGBOX_AUTOCLOSE +CeladonCity_Gym_EventScript_Tina:: @ 816D14C + trainerbattle_single TRAINER_PICNICKER_TINA, CeladonCity_Gym_Text_TinaIntro, CeladonCity_Gym_Text_TinaDefeat + msgbox CeladonCity_Gym_Text_TinaPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_Gym_EventScript_16D163:: @ 816D163 - trainerbattle_single TRAINER_BEAUTY_BRIDGET, Text_1974FA, Text_19751C - msgbox gUnknown_8197527, MSGBOX_AUTOCLOSE +CeladonCity_Gym_EventScript_Bridget:: @ 816D163 + trainerbattle_single TRAINER_BEAUTY_BRIDGET, CeladonCity_Gym_Text_BridgetIntro, CeladonCity_Gym_Text_BridgetDefeat + msgbox CeladonCity_Gym_Text_BridgetPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_Gym_EventScript_16D17A:: @ 816D17A - trainerbattle_single TRAINER_BEAUTY_TAMIA, Text_19760B, Text_197660 +CeladonCity_Gym_EventScript_Tamia:: @ 816D17A + trainerbattle_single TRAINER_BEAUTY_TAMIA, CeladonCity_Gym_Text_TamiaIntro, CeladonCity_Gym_Text_TamiaDefeat famechecker FAMECHECKER_ERIKA, 3 - msgbox gUnknown_8197664, MSGBOX_AUTOCLOSE + msgbox CeladonCity_Gym_Text_TamiaPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_Gym_EventScript_16D19E:: @ 816D19E - trainerbattle_single TRAINER_BEAUTY_LORI, Text_197747, Text_19777A - msgbox gUnknown_8197788, MSGBOX_AUTOCLOSE +CeladonCity_Gym_EventScript_Lori:: @ 816D19E + trainerbattle_single TRAINER_BEAUTY_LORI, CeladonCity_Gym_Text_LoriIntro, CeladonCity_Gym_Text_LoriDefeat + msgbox CeladonCity_Gym_Text_LoriPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5 - trainerbattle_single TRAINER_COOLTRAINER_MARY, Text_1977E5, Text_197832 - msgbox gUnknown_819783E, MSGBOX_AUTOCLOSE +CeladonCity_Gym_EventScript_Mary:: @ 816D1B5 + trainerbattle_single TRAINER_COOLTRAINER_MARY, CeladonCity_Gym_Text_MaryIntro, CeladonCity_Gym_Text_MaryDefeat + msgbox CeladonCity_Gym_Text_MaryPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_Gym_EventScript_16D1CC:: @ 816D1CC +CeladonCity_Gym_EventScript_GymStatue:: @ 816D1CC lockall - goto_if_set FLAG_BADGE04_GET, EventScript_16D1E0 - msgbox gUnknown_8197874 + goto_if_set FLAG_BADGE04_GET, CeladonCity_Gym_EventScript_GymStatuePostVictory + msgbox CeladonCity_Gym_Text_GymStatue releaseall end -EventScript_16D1E0:: @ 816D1E0 - msgbox gUnknown_81978AB +CeladonCity_Gym_EventScript_GymStatuePostVictory:: @ 816D1E0 + msgbox CeladonCity_Gym_Text_GymStatuePlayerWon releaseall end diff --git a/data/maps/CeladonCity_Gym/text.inc b/data/maps/CeladonCity_Gym/text.inc index 02c39a95c..02ded4fb0 100644 --- a/data/maps/CeladonCity_Gym/text.inc +++ b/data/maps/CeladonCity_Gym/text.inc @@ -1,168 +1,156 @@ -gUnknown_81970FE:: @ 81970FE - .string "おきゃくさん もう もてないよ$" @ I'm sorry I don't have any more +Text_SorryDontHaveAnyMore:: @ 81970FE + .string "おきゃくさん もう もてないよ$" -gUnknown_819710E:: @ 819710E - .string "あっ そう$" @ I see +Text_ISee:: @ 819710E + .string "あっ そう$" -Text_197114:: @ 8197114 +CeladonCity_Gym_Text_ErikaIntro:: @ 8197114 .string "Hello…\n" .string "Lovely weather, isn't it?\l" .string "It's so pleasant…\p" - .string "…Oh, dear…\n" .string "I must have dozed off. Welcome.\p" - .string "My name is ERIKA.\n" .string "I am the LEADER of CELADON GYM.\p" - .string "I am a student of the art of\n" .string "flower arranging.\p" - .string "My POKéMON are solely of the\n" .string "GRASS type.\p" - .string "…Oh, I'm sorry, I had no idea that\n" .string "you wished to challenge me.\p" - .string "Very well, but I shall not lose.{PLAY_BGM MUS_EXEYE}$" -Text_197260:: @ 8197260 +CeladonCity_Gym_Text_ErikaDefeat:: @ 8197260 .string "Oh!\n" .string "I concede defeat.\l" .string "You are remarkably strong.\p" - .string "I must confer on you the\n" .string "RAINBOWBADGE.$" -gUnknown_81972B8:: @ 81972B8 +CeladonCity_Gym_Text_ErikaPostBattle:: @ 81972B8 .string "You are cataloging POKéMON?\n" .string "I must say I'm impressed.\p" - .string "I would never collect POKéMON if\n" .string "they were unattractive.$" -gUnknown_8197327:: @ 8197327 +CeladonCity_Gym_Text_ExplainRainbowBadgeTakeThis:: @ 8197327 .string "The RAINBOWBADGE will make\n" .string "POKéMON up to Lv. 50 obey.\p" - .string "It also allows POKéMON to use\n" .string "STRENGTH in and out of battle.\p" - .string "Please also take this with you.$" -gUnknown_81973BA:: @ 81973BA +CeladonCity_Gym_Text_ReceivedTM19FromErika:: @ 81973BA .string "{PLAYER} received TM19\n" .string "from ERIKA.$" -gUnknown_81973D7:: @ 81973D7 +CeladonCity_Gym_Text_ExplainTM19:: @ 81973D7 .string "TM19 contains GIGA DRAIN.\p" - .string "Half the damage it inflicts is\n" .string "drained to heal your POKéMON.\p" - .string "Wouldn't you agree that it's a\n" .string "wonderful move?$" -gUnknown_819745D:: @ 819745D +CeladonCity_Gym_Text_ShouldMakeRoomForThis:: @ 819745D .string "You should make room for this.$" -Text_19747C:: @ 819747C +CeladonCity_Gym_Text_KayIntro:: @ 819747C .string "I should tell you about this GYM.\p" .string "Only real ladies are allowed in\n" .string "here!$" -Text_1974C4:: @ 81974C4 +CeladonCity_Gym_Text_KayDefeat:: @ 81974C4 .string "You're too rough!$" -gUnknown_81974D6:: @ 81974D6 +CeladonCity_Gym_Text_KayPostBattle:: @ 81974D6 .string "Bleaah!\n" .string "I hope ERIKA wipes you out!$" -Text_1974FA:: @ 81974FA +CeladonCity_Gym_Text_BridgetIntro:: @ 81974FA .string "Oh, welcome.\n" .string "I was getting bored.$" -Text_19751C:: @ 819751C +CeladonCity_Gym_Text_BridgetDefeat:: @ 819751C .string "My makeup!$" -gUnknown_8197527:: @ 8197527 +CeladonCity_Gym_Text_BridgetPostBattle:: @ 8197527 .string "GRASS-type POKéMON are tough\n" .string "against the WATER type.\p" .string "They also have an edge on ROCK-\n" .string "and GROUND-type POKéMON.$" -Text_197595:: @ 8197595 +CeladonCity_Gym_Text_TinaIntro:: @ 8197595 .string "…Weren't you peeking in here\n" .string "earlier?$" -Text_1975BB:: @ 81975BB +CeladonCity_Gym_Text_TinaDefeat:: @ 81975BB .string "You're an eye-opener!$" -gUnknown_81975D1:: @ 81975D1 +CeladonCity_Gym_Text_TinaPostBattle:: @ 81975D1 .string "Oh, you were looking at ERIKA…\n" .string "You weren't looking at me…$" -Text_19760B:: @ 819760B +CeladonCity_Gym_Text_TamiaIntro:: @ 819760B .string "Look, look!\n" .string "See my POKéMON!\p" .string "I like the GRASS type.\n" .string "I like how they're easy to raise.$" -Text_197660:: @ 8197660 +CeladonCity_Gym_Text_TamiaDefeat:: @ 8197660 .string "No!$" -gUnknown_8197664:: @ 8197664 +CeladonCity_Gym_Text_TamiaPostBattle:: @ 8197664 .string "We only use GRASS-type POKéMON at\n" .string "our GYM.\p" .string "Why? We also use them for making\n" .string "flower arrangements!$" -Text_1976C5:: @ 81976C5 +CeladonCity_Gym_Text_LisaIntro:: @ 81976C5 .string "Oh, hey!\p" .string "We don't like BUG- or FIRE-type\n" .string "POKéMON in here!$" -Text_1976FF:: @ 81976FF +CeladonCity_Gym_Text_LisaDefeat:: @ 81976FF .string "Oh!\n" .string "You!$" -gUnknown_8197708:: @ 8197708 +CeladonCity_Gym_Text_LisaPostBattle:: @ 8197708 .string "Our LEADER ERIKA might be quiet,\n" .string "but she's famous around here.$" -Text_197747:: @ 8197747 +CeladonCity_Gym_Text_LoriIntro:: @ 8197747 .string "Pleased to meet you.\n" .string "My hobby is POKéMON training.$" -Text_19777A:: @ 819777A +CeladonCity_Gym_Text_LoriDefeat:: @ 819777A .string "Oh!\n" .string "Splendid!$" -gUnknown_8197788:: @ 8197788 +CeladonCity_Gym_Text_LoriPostBattle:: @ 8197788 .string "I have a blind date coming up.\n" .string "I have to learn to be polite,\l" .string "especially if I have to battle.$" -Text_1977E5:: @ 81977E5 +CeladonCity_Gym_Text_MaryIntro:: @ 81977E5 .string "Welcome to CELADON GYM!\p" .string "You'd better not underestimate\n" .string "the nice ladies here.$" -Text_197832:: @ 8197832 +CeladonCity_Gym_Text_MaryDefeat:: @ 8197832 .string "Oh!\n" .string "Beaten!$" -gUnknown_819783E:: @ 819783E +CeladonCity_Gym_Text_MaryPostBattle:: @ 819783E .string "I didn't bring my best POKéMON.\n" .string "Wait until next time!$" -gUnknown_8197874:: @ 8197874 +CeladonCity_Gym_Text_GymStatue:: @ 8197874 .string "CELADON POKéMON GYM\n" .string "LEADER: ERIKA\p" .string "WINNING TRAINERS:\n" .string "{RIVAL}$" -gUnknown_81978AB:: @ 81978AB +CeladonCity_Gym_Text_GymStatuePlayerWon:: @ 81978AB .string "CELADON POKéMON GYM\n" .string "LEADER: ERIKA\p" .string "WINNING TRAINERS:\n" diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json index 6ab82e945..80b4df1cd 100644 --- a/data/maps/CeladonCity_Hotel/map.json +++ b/data/maps/CeladonCity_Hotel/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Hotel_EventScript_16D284", + "script": "CeladonCity_Hotel_EventScript_Receptionist", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Hotel_EventScript_16D28D", + "script": "CeladonCity_Hotel_EventScript_Beauty", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Hotel_EventScript_16D296", + "script": "CeladonCity_Hotel_EventScript_BeautyBoyfriend", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Hotel_EventScript_16D29F", + "script": "CeladonCity_Hotel_EventScript_BeautyBrother", "flag": "0" } ], diff --git a/data/maps/CeladonCity_Hotel/scripts.inc b/data/maps/CeladonCity_Hotel/scripts.inc index 4f136bad3..be366a705 100644 --- a/data/maps/CeladonCity_Hotel/scripts.inc +++ b/data/maps/CeladonCity_Hotel/scripts.inc @@ -1,18 +1,18 @@ CeladonCity_Hotel_MapScripts:: @ 816D283 .byte 0 -CeladonCity_Hotel_EventScript_16D284:: @ 816D284 - msgbox gUnknown_8197B77, MSGBOX_NPC +CeladonCity_Hotel_EventScript_Receptionist:: @ 816D284 + msgbox CeladonCity_Hotel_Text_ThisHotelIsForPeople, MSGBOX_NPC end -CeladonCity_Hotel_EventScript_16D28D:: @ 816D28D - msgbox gUnknown_8197BBE, MSGBOX_NPC +CeladonCity_Hotel_EventScript_Beauty:: @ 816D28D + msgbox CeladonCity_Hotel_Text_OnVacationWithBrotherAndBoyfriend, MSGBOX_NPC end -CeladonCity_Hotel_EventScript_16D296:: @ 816D296 - msgbox gUnknown_8197C0C, MSGBOX_NPC +CeladonCity_Hotel_EventScript_BeautyBoyfriend:: @ 816D296 + msgbox CeladonCity_Hotel_Text_WhyDidSheBringBrother, MSGBOX_NPC end -CeladonCity_Hotel_EventScript_16D29F:: @ 816D29F - msgbox gUnknown_8197C30, MSGBOX_NPC +CeladonCity_Hotel_EventScript_BeautyBrother:: @ 816D29F + msgbox CeladonCity_Hotel_Text_SisBroughtMeOnVacation, MSGBOX_NPC end diff --git a/data/maps/CeladonCity_Hotel/text.inc b/data/maps/CeladonCity_Hotel/text.inc index b1c989120..3932c4633 100644 --- a/data/maps/CeladonCity_Hotel/text.inc +++ b/data/maps/CeladonCity_Hotel/text.inc @@ -1,21 +1,22 @@ -Text_197B6F:: @ 8197B6F +@ Odd, doesnt seem to be corresponding text in RB. Unclear what this was meant for +Text_BuddhistAltar:: @ 8197B6F .string "ぶつだん　だ‥$" -gUnknown_8197B77:: @ 8197B77 +CeladonCity_Hotel_Text_ThisHotelIsForPeople:: @ 8197B77 .string "POKéMON?\n" .string "No, this is a hotel for people.\p" .string "We're full up, unfortunately.$" -gUnknown_8197BBE:: @ 8197BBE +CeladonCity_Hotel_Text_OnVacationWithBrotherAndBoyfriend:: @ 8197BBE .string "I'm on vacation with my brother and\n" .string "boyfriend.\p" .string "CELADON is such a pretty city!$" -gUnknown_8197C0C:: @ 8197C0C +CeladonCity_Hotel_Text_WhyDidSheBringBrother:: @ 8197C0C .string "Why?\n" .string "Why did she bring her brother?$" -gUnknown_8197C30:: @ 8197C30 +CeladonCity_Hotel_Text_SisBroughtMeOnVacation:: @ 8197C30 .string "Yippee! I'm on vacation!\n" .string "My sis brought me along! Awesome!$" diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json index 455e9d836..0fccecd67 100644 --- a/data/maps/CeladonCity_House1/map.json +++ b/data/maps/CeladonCity_House1/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_House1_EventScript_16D268", + "script": "CeladonCity_House1_EventScript_RocketChief", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 5, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_House1_EventScript_16D271", + "script": "CeladonCity_House1_EventScript_Rocket1", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 5, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_House1_EventScript_16D27A", + "script": "CeladonCity_House1_EventScript_Rocket2", "flag": "0" } ], diff --git a/data/maps/CeladonCity_House1/scripts.inc b/data/maps/CeladonCity_House1/scripts.inc index 6c8dab4ff..4a05ae97d 100644 --- a/data/maps/CeladonCity_House1/scripts.inc +++ b/data/maps/CeladonCity_House1/scripts.inc @@ -1,14 +1,14 @@ CeladonCity_House1_MapScripts:: @ 816D267 .byte 0 -CeladonCity_House1_EventScript_16D268:: @ 816D268 - msgbox gUnknown_8197A9F, MSGBOX_NPC +CeladonCity_House1_EventScript_RocketChief:: @ 816D268 + msgbox CeladonCity_House1_Text_SlotsReelInTheDough, MSGBOX_NPC end -CeladonCity_House1_EventScript_16D271:: @ 816D271 - msgbox gUnknown_8197AD3, MSGBOX_NPC +CeladonCity_House1_EventScript_Rocket1:: @ 816D271 + msgbox CeladonCity_House1_Text_ShippedMonsAsSlotPrizes, MSGBOX_NPC end -CeladonCity_House1_EventScript_16D27A:: @ 816D27A - msgbox gUnknown_8197B20, MSGBOX_NPC +CeladonCity_House1_EventScript_Rocket2:: @ 816D27A + msgbox CeladonCity_House1_Text_DontTouchGameCornerPoster, MSGBOX_NPC end diff --git a/data/maps/CeladonCity_House1/text.inc b/data/maps/CeladonCity_House1/text.inc index df6acb986..49bf8e3fe 100644 --- a/data/maps/CeladonCity_House1/text.inc +++ b/data/maps/CeladonCity_House1/text.inc @@ -1,15 +1,15 @@ -gUnknown_8197A9F:: @ 8197A9F +CeladonCity_House1_Text_SlotsReelInTheDough:: @ 8197A9F .string "Hehehe!\p" .string "The slots just reel in the dough,\n" .string "big-time!$" -gUnknown_8197AD3:: @ 8197AD3 +CeladonCity_House1_Text_ShippedMonsAsSlotPrizes:: @ 8197AD3 .string "CHIEF!\p" .string "We just shipped two thousand\n" .string "more POKéMON as slot prizes\l" .string "again today!$" -gUnknown_8197B20:: @ 8197B20 +CeladonCity_House1_Text_DontTouchGameCornerPoster:: @ 8197B20 .string "Don't touch the poster at the GAME\n" .string "CORNER!\p" .string "There's no secret switch behind it!$" diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json index 7d2af91a9..c37be2dc6 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_PokemonCenter_1F_EventScript_16C5FB", + "script": "CeladonCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_PokemonCenter_1F_EventScript_16C604", + "script": "CeladonCity_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_PokemonCenter_1F_EventScript_16C60D", + "script": "CeladonCity_PokemonCenter_1F_EventScript_CooltrainerF", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_PokemonCenter_1F_EventScript_16C616", + "script": "CeladonCity_PokemonCenter_1F_EventScript_Youngster", "flag": "0" } ], diff --git a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc index 322968550..b98b49824 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc @@ -7,21 +7,21 @@ CeladonCity_PokemonCenter_1F_OnTransition:: @ 816C5F7 setrespawn SPAWN_CELADON_CITY end -CeladonCity_PokemonCenter_1F_EventScript_16C5FB:: @ 816C5FB +CeladonCity_PokemonCenter_1F_EventScript_Nurse:: @ 816C5FB lock faceplayer call EventScript_PkmnCenterNurse release end -CeladonCity_PokemonCenter_1F_EventScript_16C604:: @ 816C604 - msgbox gUnknown_819685B, MSGBOX_NPC +CeladonCity_PokemonCenter_1F_EventScript_Gentleman:: @ 816C604 + msgbox CeladonCity_PokemonCenter_1F_Text_PokeFluteAwakensSleepingMons, MSGBOX_NPC end -CeladonCity_PokemonCenter_1F_EventScript_16C60D:: @ 816C60D - msgbox gUnknown_81968C2, MSGBOX_NPC +CeladonCity_PokemonCenter_1F_EventScript_CooltrainerF:: @ 816C60D + msgbox CeladonCity_PokemonCenter_1F_Text_RodeHereFromFuchsia, MSGBOX_NPC end -CeladonCity_PokemonCenter_1F_EventScript_16C616:: @ 816C616 - msgbox gUnknown_8196913, MSGBOX_NPC +CeladonCity_PokemonCenter_1F_EventScript_Youngster:: @ 816C616 + msgbox CeladonCity_PokemonCenter_1F_Text_GoToCyclingRoadIfIHadBike, MSGBOX_NPC end diff --git a/data/maps/CeladonCity_PokemonCenter_1F/text.inc b/data/maps/CeladonCity_PokemonCenter_1F/text.inc index 098582351..6aa628f39 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/text.inc +++ b/data/maps/CeladonCity_PokemonCenter_1F/text.inc @@ -1,15 +1,15 @@ -gUnknown_819685B:: @ 819685B +CeladonCity_PokemonCenter_1F_Text_PokeFluteAwakensSleepingMons:: @ 819685B .string "A POKé FLUTE awakens sleeping\n" .string "POKéMON. You know that.\p" .string "It does so with a sound that only\n" .string "they can hear.$" -gUnknown_81968C2:: @ 81968C2 +CeladonCity_PokemonCenter_1F_Text_RodeHereFromFuchsia:: @ 81968C2 .string "I rode here from FUCHSIA.\p" .string "It's an uphill ride on CYCLING\n" .string "ROAD, so I'm exhausted.$" -gUnknown_8196913:: @ 8196913 +CeladonCity_PokemonCenter_1F_Text_GoToCyclingRoadIfIHadBike:: @ 8196913 .string "If I had a BIKE, I would go to\n" .string "CYCLING ROAD!$" diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json index 9681ddfb2..dafc84778 100644 --- a/data/maps/CeladonCity_Restaurant/map.json +++ b/data/maps/CeladonCity_Restaurant/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Restaurant_EventScript_16D1EB", + "script": "CeladonCity_Restaurant_EventScript_Chef", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 2, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Restaurant_EventScript_16D1F4", + "script": "CeladonCity_Restaurant_EventScript_Woman", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Restaurant_EventScript_16D25E", + "script": "CeladonCity_Restaurant_EventScript_FatMan", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Restaurant_EventScript_16D1FD", + "script": "CeladonCity_Restaurant_EventScript_CoinCaseMan", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Restaurant_EventScript_16D255", + "script": "CeladonCity_Restaurant_EventScript_WorkerM", "flag": "0" } ], diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc index c8ab9469a..9613406e4 100644 --- a/data/maps/CeladonCity_Restaurant/scripts.inc +++ b/data/maps/CeladonCity_Restaurant/scripts.inc @@ -1,41 +1,41 @@ CeladonCity_Restaurant_MapScripts:: @ 816D1EA .byte 0 -CeladonCity_Restaurant_EventScript_16D1EB:: @ 816D1EB - msgbox gUnknown_81978E6, MSGBOX_NPC +CeladonCity_Restaurant_EventScript_Chef:: @ 816D1EB + msgbox CeladonCity_Restaurant_Text_TakingBreakRightNow, MSGBOX_NPC end -CeladonCity_Restaurant_EventScript_16D1F4:: @ 816D1F4 - msgbox gUnknown_8197915, MSGBOX_NPC +CeladonCity_Restaurant_EventScript_Woman:: @ 816D1F4 + msgbox CeladonCity_Restaurant_Text_OftenGoToDrugstore, MSGBOX_NPC end -CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD +CeladonCity_Restaurant_EventScript_CoinCaseMan:: @ 816D1FD lock faceplayer - goto_if_set FLAG_GOT_COIN_CASE, EventScript_16D24B - msgbox gUnknown_81979C1 + goto_if_set FLAG_GOT_COIN_CASE, CeladonCity_Restaurant_EventScript_AlreadyGotCoinCase + msgbox CeladonCity_Restaurant_Text_TakeThisImBusted checkitemspace ITEM_COIN_CASE, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16D241 - giveitem_msg gUnknown_8197A38, ITEM_COIN_CASE + goto_if_eq CeladonCity_Restaurant_EventScript_NoRoomForCoinCase + giveitem_msg CeladonCity_Restaurant_Text_ReceivedCoinCaseFromMan, ITEM_COIN_CASE setflag FLAG_GOT_COIN_CASE release end -EventScript_16D241:: @ 816D241 - msgbox gUnknown_8197A5E +CeladonCity_Restaurant_EventScript_NoRoomForCoinCase:: @ 816D241 + msgbox CeladonCity_Restaurant_Text_MakeRoomForThis release end -EventScript_16D24B:: @ 816D24B - msgbox gUnknown_8197A72 +CeladonCity_Restaurant_EventScript_AlreadyGotCoinCase:: @ 816D24B + msgbox CeladonCity_Restaurant_Text_ThoughtIdWinItBack release end -CeladonCity_Restaurant_EventScript_16D255:: @ 816D255 - msgbox gUnknown_8197952, MSGBOX_NPC +CeladonCity_Restaurant_EventScript_WorkerM:: @ 816D255 + msgbox CeladonCity_Restaurant_Text_PsstBasementUnderGameCorner, MSGBOX_NPC end -CeladonCity_Restaurant_EventScript_16D25E:: @ 816D25E - msgbox gUnknown_819798A, MSGBOX_NPC +CeladonCity_Restaurant_EventScript_FatMan:: @ 816D25E + msgbox CeladonCity_Restaurant_Text_ManLostItAllAtSlots, MSGBOX_NPC end diff --git a/data/maps/CeladonCity_Restaurant/text.inc b/data/maps/CeladonCity_Restaurant/text.inc index 87edeb186..e6c27c2bd 100644 --- a/data/maps/CeladonCity_Restaurant/text.inc +++ b/data/maps/CeladonCity_Restaurant/text.inc @@ -1,22 +1,22 @@ -gUnknown_81978E6:: @ 81978E6 +CeladonCity_Restaurant_Text_TakingBreakRightNow:: @ 81978E6 .string "Hi!\p" .string "Sorry, but we're taking a break\n" .string "right now.$" -gUnknown_8197915:: @ 8197915 +CeladonCity_Restaurant_Text_OftenGoToDrugstore:: @ 8197915 .string "My POKéMON are weak, so I often\n" .string "have to go to the DRUGSTORE.$" -gUnknown_8197952:: @ 8197952 +CeladonCity_Restaurant_Text_PsstBasementUnderGameCorner:: @ 8197952 .string "Psst! There's a basement under the\n" .string "GAME CORNER, I hear.$" -gUnknown_819798A:: @ 819798A +CeladonCity_Restaurant_Text_ManLostItAllAtSlots:: @ 819798A .string "Munch…\p" .string "The man at that table lost it all\n" .string "at the slots.$" -gUnknown_81979C1:: @ 81979C1 +CeladonCity_Restaurant_Text_TakeThisImBusted:: @ 81979C1 .string "Go ahead! Laugh!\n" .string "I'm flat-out busted!\p" .string "No more slots for me!\n" @@ -24,14 +24,14 @@ gUnknown_81979C1:: @ 81979C1 .string "Here!\n" .string "I won't be needing this anymore!$" -gUnknown_8197A38:: @ 8197A38 +CeladonCity_Restaurant_Text_ReceivedCoinCaseFromMan:: @ 8197A38 .string "{PLAYER} received a COIN CASE\n" .string "from the man.$" -gUnknown_8197A5E:: @ 8197A5E +CeladonCity_Restaurant_Text_MakeRoomForThis:: @ 8197A5E .string "Make room for this!$" -gUnknown_8197A72:: @ 8197A72 +CeladonCity_Restaurant_Text_ThoughtIdWinItBack:: @ 8197A72 .string "I always thought I was going to\n" .string "win it back…$" diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index 6fe5607dd..1564717c0 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -92,12 +92,12 @@ VermilionCity_PokemonCenter_1F_EventScript_PokemonJournalLtSurge:: @ 81ACE83 releaseall end -CeladonCity_Condominiums_2F_EventScript_1ACE9D:: @ 81ACE9D +CeladonCity_Condominiums_2F_EventScript_PokemonJournalErika:: @ 81ACE9D lock faceplayer famechecker FAMECHECKER_ERIKA, 5 textcolor 3 - msgbox gUnknown_81B161B + msgbox PokemonJournal_Text_SpecialFeatureErika release end @@ -227,11 +227,11 @@ SaffronCity_EventScript_1AD03A:: @ 81AD03A release end -CeladonCity_DepartmentStore_2F_EventScript_1AD053:: @ 81AD053 +CeladonCity_DepartmentStore_2F_EventScript_Woman:: @ 81AD053 lock faceplayer famechecker FAMECHECKER_LANCE, 3 - msgbox Text_19566B + msgbox CeladonCity_DepartmentStore_2F_Text_LanceComesToBuyCapes release end diff --git a/data/scripts/trainer_card.inc b/data/scripts/trainer_card.inc new file mode 100644 index 000000000..906744fa8 --- /dev/null +++ b/data/scripts/trainer_card.inc @@ -0,0 +1,384 @@ +CeladonCity_GameCorner_EventScript_PhotoPrinter:: @ 81B2867 + lockall + showmoneybox 0, 0, 0 + msgbox gUnknown_81B1D7D, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq EventScript_1B2926 + checkmoney 50, 0 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_1B292B + playse SE_SHOP + removemoney 50, 0 + updatemoneybox 0, 0, 0 + waitse + message gUnknown_81B1E24 + waitmessage + multichoice 21, 0, MULTICHOICE_TRAINER_CARD_ICON_TINT, TRUE + switch VAR_RESULT + case 0, EventScript_1B28DB + case 1, EventScript_1B28E6 + case 2, EventScript_1B28F1 + case 3, EventScript_1B28FC + end + +EventScript_1B28DB:: @ 81B28DB + setvar VAR_0x8004, 0 + goto EventScript_1B2907 + end + +EventScript_1B28E6:: @ 81B28E6 + setvar VAR_0x8004, 1 + goto EventScript_1B2907 + end + +EventScript_1B28F1:: @ 81B28F1 + setvar VAR_0x8004, 2 + goto EventScript_1B2907 + end + +EventScript_1B28FC:: @ 81B28FC + setvar VAR_0x8004, 3 + goto EventScript_1B2907 + end + +EventScript_1B2907:: @ 81B2907 + message gUnknown_81B1E42 + waitmessage + playse MUS_ME_PHOTO + dofieldeffect FLDEFF_UNK_45 + delay 60 + special Special_UpdateTrainerCardPhotoIcons + msgbox gUnknown_81B1E7D + hidemoneybox 0, 0 + releaseall + end + +EventScript_1B2926:: @ 81B2926 + hidemoneybox 0, 0 + releaseall + end + +EventScript_1B292B:: @ 81B292B + msgbox gUnknown_81B1E07 + hidemoneybox 0, 0 + releaseall + end + +FourIsland_House2_EventScript_1B2938:: @ 81B2938 + lock + specialvar VAR_0x8008, Special_StickerLadyGetBragFlags + goto_if_unset FLAG_MET_STICKER_LADY, EventScript_1B2951 + goto_if_set FLAG_MET_STICKER_LADY, EventScript_1B2994 + end + +EventScript_1B2951:: @ 81B2951 + setflag FLAG_MET_STICKER_LADY + msgbox gUnknown_81B1EB3 + applymovement 1, Movement_FacePlayer + waitmovement 0 + playse SE_PIN + applymovement 1, Movement_ExclamationMark + waitmovement 0 + applymovement 1, Movement_Delay48 + waitmovement 0 + compare VAR_0x8008, 0 + goto_if_eq EventScript_1B2B8E + message gUnknown_81B1EF8 + waitmessage + goto EventScript_1B29D0 + end + +EventScript_1B2994:: @ 81B2994 + applymovement 1, Movement_FacePlayer + waitmovement 0 + goto_if_questlog EventScript_ReleaseEnd + special sub_8112364 + compare VAR_0x8008, 0 + goto_if_eq EventScript_1B29C6 + message gUnknown_81B2025 + waitmessage + goto EventScript_1B29D0 + end + +EventScript_1B29C6:: @ 81B29C6 + msgbox gUnknown_81B1FEF + release + end + +EventScript_1B29D0:: @ 81B29D0 + switch VAR_0x8008 + case 1, EventScript_1B2A23 + case 2, EventScript_1B2A4F + case 4, EventScript_1B2A7B + case 3, EventScript_1B2AA7 + case 5, EventScript_1B2ADE + case 6, EventScript_1B2B15 + case 7, EventScript_1B2B4C + end + +EventScript_1B2A23:: @ 81B2A23 + multichoice 15, 8, MULTICHOICE_HOF_QUIT, FALSE + switch VAR_RESULT + case 0, EventScript_1B2B98 + case 1, EventScript_1B2DF6 + case SCR_MENU_CANCEL, EventScript_1B2DF6 + end + +EventScript_1B2A4F:: @ 81B2A4F + multichoice 16, 8, MULTICHOICE_EGGS_QUIT, FALSE + switch VAR_RESULT + case 0, EventScript_1B2C62 + case 1, EventScript_1B2DF6 + case SCR_MENU_CANCEL, EventScript_1B2DF6 + end + +EventScript_1B2A7B:: @ 81B2A7B + multichoice 15, 8, MULTICHOICE_VICTORIES_QUIT, FALSE + switch VAR_RESULT + case 0, EventScript_1B2D2C + case 1, EventScript_1B2DF6 + case SCR_MENU_CANCEL, EventScript_1B2DF6 + end + +EventScript_1B2AA7:: @ 81B2AA7 + multichoice 15, 6, MULTICHOICE_HOF_EGGS_QUIT, FALSE + switch VAR_RESULT + case 0, EventScript_1B2B98 + case 1, EventScript_1B2C62 + case 2, EventScript_1B2DF6 + case SCR_MENU_CANCEL, EventScript_1B2DF6 + end + +EventScript_1B2ADE:: @ 81B2ADE + multichoice 15, 6, MULTICHOICE_HOF_VICTORIES_QUIT, FALSE + switch VAR_RESULT + case 0, EventScript_1B2B98 + case 1, EventScript_1B2D2C + case 2, EventScript_1B2DF6 + case SCR_MENU_CANCEL, EventScript_1B2DF6 + end + +EventScript_1B2B15:: @ 81B2B15 + multichoice 15, 6, MULTICHOICE_EGGS_VICTORIES_QUIT, FALSE + switch VAR_RESULT + case 0, EventScript_1B2C62 + case 1, EventScript_1B2D2C + case 2, EventScript_1B2DF6 + case SCR_MENU_CANCEL, EventScript_1B2DF6 + end + +EventScript_1B2B4C:: @ 81B2B4C + multichoice 15, 5, MULTICHOICE_HOF_EGGS_VICTORIES_QUIT, FALSE + switch VAR_RESULT + case 0, EventScript_1B2B98 + case 1, EventScript_1B2C62 + case 2, EventScript_1B2D2C + case 3, EventScript_1B2DF6 + case SCR_MENU_CANCEL, EventScript_1B2DF6 + end + +EventScript_1B2B8E:: @ 81B2B8E + msgbox gUnknown_81B1EF8 + release + end + +EventScript_1B2B98:: @ 81B2B98 + compare VAR_0x8004, 39 + goto_if_le EventScript_1B2BC5 + compare VAR_0x8004, 99 + goto_if_le EventScript_1B2BE3 + compare VAR_0x8004, 199 + goto_if_le EventScript_1B2C01 + compare VAR_0x8004, 200 + goto_if_ge EventScript_1B2C1F + end + +EventScript_1B2BC5:: @ 81B2BC5 + compare VAR_HOF_BRAG_STATE, 1 + goto_if_eq EventScript_1B2C3D + setvar VAR_HOF_BRAG_STATE, 1 + msgbox gUnknown_81B206E + goto EventScript_1B2C51 + +EventScript_1B2BE2:: @ 81B2BE2 + end + +EventScript_1B2BE3:: @ 81B2BE3 + compare VAR_HOF_BRAG_STATE, 2 + goto_if_eq EventScript_1B2C3D + setvar VAR_HOF_BRAG_STATE, 2 + msgbox gUnknown_81B20CF + goto EventScript_1B2C51 + +EventScript_1B2C00:: @ 81B2C00 + end + +EventScript_1B2C01:: @ 81B2C01 + compare VAR_HOF_BRAG_STATE, 3 + goto_if_eq EventScript_1B2C3D + setvar VAR_HOF_BRAG_STATE, 3 + msgbox gUnknown_81B2133 + goto EventScript_1B2C51 + +EventScript_1B2C1E:: @ 81B2C1E + end + +EventScript_1B2C1F:: @ 81B2C1F + compare VAR_HOF_BRAG_STATE, 4 + goto_if_eq EventScript_1B2C47 + setvar VAR_HOF_BRAG_STATE, 4 + msgbox gUnknown_81B21C4 + goto EventScript_1B2C51 + +EventScript_1B2C3C:: @ 81B2C3C + end + +EventScript_1B2C3D:: @ 81B2C3D + msgbox gUnknown_81B227C + release + end + +EventScript_1B2C47:: @ 81B2C47 + msgbox gUnknown_81B22B0 + release + end + +EventScript_1B2C51:: @ 81B2C51 + textcolor 3 + playfanfare MUS_FANFA1 + message gUnknown_81B2242 + waitmessage + waitfanfare + delay 90 + release + end + +EventScript_1B2C62:: @ 81B2C62 + compare VAR_0x8005, 99 + goto_if_le EventScript_1B2C8F + compare VAR_0x8005, 199 + goto_if_le EventScript_1B2CAD + compare VAR_0x8005, 299 + goto_if_le EventScript_1B2CCB + compare VAR_0x8005, 300 + goto_if_ge EventScript_1B2CE9 + end + +EventScript_1B2C8F:: @ 81B2C8F + compare VAR_EGG_BRAG_STATE, 1 + goto_if_eq EventScript_1B2D07 + setvar VAR_EGG_BRAG_STATE, 1 + msgbox gUnknown_81B2308 + goto EventScript_1B2D1B + end + +EventScript_1B2CAD:: @ 81B2CAD + compare VAR_EGG_BRAG_STATE, 2 + goto_if_eq EventScript_1B2D07 + setvar VAR_EGG_BRAG_STATE, 2 + msgbox gUnknown_81B2372 + goto EventScript_1B2D1B + end + +EventScript_1B2CCB:: @ 81B2CCB + compare VAR_EGG_BRAG_STATE, 3 + goto_if_eq EventScript_1B2D07 + setvar VAR_EGG_BRAG_STATE, 3 + msgbox gUnknown_81B23E0 + goto EventScript_1B2D1B + end + +EventScript_1B2CE9:: @ 81B2CE9 + compare VAR_EGG_BRAG_STATE, 4 + goto_if_eq EventScript_1B2D11 + setvar VAR_EGG_BRAG_STATE, 4 + msgbox gUnknown_81B2448 + goto EventScript_1B2D1B + end + +EventScript_1B2D07:: @ 81B2D07 + msgbox gUnknown_81B251B + release + end + +EventScript_1B2D11:: @ 81B2D11 + msgbox gUnknown_81B254F + release + end + +EventScript_1B2D1B:: @ 81B2D1B + textcolor 3 + playfanfare MUS_FANFA1 + message gUnknown_81B24EA + waitmessage + waitfanfare + delay 90 + release + end + +EventScript_1B2D2C:: @ 81B2D2C + compare VAR_0x8006, 19 + goto_if_le EventScript_1B2D59 + compare VAR_0x8006, 49 + goto_if_le EventScript_1B2D77 + compare VAR_0x8006, 99 + goto_if_le EventScript_1B2D95 + compare VAR_0x8006, 100 + goto_if_ge EventScript_1B2DB3 + end + +EventScript_1B2D59:: @ 81B2D59 + compare VAR_LINK_WIN_BRAG_STATE, 1 + goto_if_eq EventScript_1B2DD1 + setvar VAR_LINK_WIN_BRAG_STATE, 1 + msgbox gUnknown_81B25A7 + goto EventScript_1B2DE5 + end + +EventScript_1B2D77:: @ 81B2D77 + compare VAR_LINK_WIN_BRAG_STATE, 2 + goto_if_eq EventScript_1B2DD1 + setvar VAR_LINK_WIN_BRAG_STATE, 2 + msgbox gUnknown_81B2609 + goto EventScript_1B2DE5 + end + +EventScript_1B2D95:: @ 81B2D95 + compare VAR_LINK_WIN_BRAG_STATE, 3 + goto_if_eq EventScript_1B2DD1 + setvar VAR_LINK_WIN_BRAG_STATE, 3 + msgbox gUnknown_81B267B + goto EventScript_1B2DE5 + end + +EventScript_1B2DB3:: @ 81B2DB3 + compare VAR_LINK_WIN_BRAG_STATE, 4 + goto_if_eq EventScript_1B2DDB + setvar VAR_LINK_WIN_BRAG_STATE, 4 + msgbox gUnknown_81B26F6 + goto EventScript_1B2DE5 + end + +EventScript_1B2DD1:: @ 81B2DD1 + msgbox gUnknown_81B27DB + release + end + +EventScript_1B2DDB:: @ 81B2DDB + msgbox gUnknown_81B280F + release + end + +EventScript_1B2DE5:: @ 81B2DE5 + textcolor 3 + playfanfare MUS_FANFA1 + message gUnknown_81B27A6 + waitmessage + waitfanfare + delay 90 + release + end + +EventScript_1B2DF6:: @ 81B2DF6 + release + end diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc index 8be9aec80..252c5ce7d 100644 --- a/data/text/fame_checker.inc +++ b/data/text/fame_checker.inc @@ -1396,7 +1396,7 @@ PokemonJournal_Text_SpecialFeatureLtSurge:: @ 81B1558 .string "He used the electricity generated\n" .string "by POKéMON to power his plane.$" -gUnknown_81B161B:: @ 81B161B +PokemonJournal_Text_SpecialFeatureErika:: @ 81B161B .string "POKéMON JOURNAL\p" .string "Special Feature: CELADON GYM\n" .string "LEADER ERIKA!\p" @@ -1485,198 +1485,3 @@ PokemonJournal_Text_SpecialFeatureMrFuji:: @ 81B1BD1 .string "down our interview requests.\p" .string "He is a kindly man who is adored\n" .string "and respected in LAVENDER TOWN.$" - -gUnknown_81B1C8B:: @ 81B1C8B - .string "Hmm…\n" - .string "Is that right…$" - -gUnknown_81B1C9F:: @ 81B1C9F - .string "Oh!\n" - .string "Look, look!$" - -gUnknown_81B1CAF:: @ 81B1CAF - .string "Read it, read it!$" - -gUnknown_81B1CC1:: @ 81B1CC1 - .string "TRAINER TIPS\p" - .string "Press START to open the MENU!$" - -gUnknown_81B1CEC:: @ 81B1CEC - .string "Signs are useful, aren't they?$" - -gUnknown_81B1D0B:: @ 81B1D0B - .string "Look, look!\p" - .string "I copied what it said on one of\n" - .string "those TRAINER TIPS signs!$" - -gUnknown_81B1D51:: @ 81B1D51 - .string "TRAINER TIPS!\p" - .string "Press START to open the MENU!$" - -gUnknown_81B1D7D:: @ 81B1D7D - .string "It's a POKéMON PRINTER!\p" - .string "It can put a print of your POKéMON\n" - .string "on the back of your TRAINER CARD.\p" - .string "It costs only ¥50.\n" - .string "Would you like to try it?$" - -gUnknown_81B1E07:: @ 81B1E07 - .string "You don't have enough money.$" - -gUnknown_81B1E24:: @ 81B1E24 - .string "Please choose the print type.$" - -gUnknown_81B1E42:: @ 81B1E42 - .string "A big smile for the photo, please!\n" - .string "Three… Two… One…\p" - .string "Flash!$" - -gUnknown_81B1E7D:: @ 81B1E7D - .string "Your POKéMON print is ready!\n" - .string "Check your TRAINER CARD.$" - -gUnknown_81B1EB3:: @ 81B1EB3 - .string "Giggle…\n" - .string "I collected a ton of STICKERS.\l" - .string "I wish I could show them off…$" - -gUnknown_81B1EF8:: @ 81B1EF8 - .string "Oh, excellent!\n" - .string "You've come to the right place!\p" - .string "Look, look! See? See?\n" - .string "These are my STICKERS!\l" - .string "Look how many I got!\p" - .string "I bet you want some.\n" - .string "I bet you do!\p" - .string "I'll give a STICKER if you can tell\n" - .string "me something awesome about\l" - .string "yourself.\p" - .string "What will you brag about?$" - -gUnknown_81B1FEF:: @ 81B1FEF - .string "Brag about something for me.\n" - .string "I'll give you a STICKER.$" - -gUnknown_81B2025:: @ 81B2025 - .string "Oh, hi!\n" - .string "Here comes the braggart.\p" - .string "What are you going to brag about\n" - .string "today?$" - -gUnknown_81B206E:: @ 81B206E - .string "Oh, wow, you made it into the\n" - .string "HALL OF FAME.\p" - .string "That's pretty good, yup!\n" - .string "I'll give you one of these.$" - -gUnknown_81B20CF:: @ 81B20CF - .string "Oh, wow, you've entered the\n" - .string "HALL OF FAME often!\p" - .string "That's impressive, yup!\n" - .string "I'll give you one of these.$" - -gUnknown_81B2133:: @ 81B2133 - .string "Whoa! You've made it into the\n" - .string "HALL OF FAME that often?\l" - .string "That's seriously incredible, yup!\p" - .string "You own the POKéMON LEAGUE!\n" - .string "I'll give you one of these.$" - -gUnknown_81B21C4:: @ 81B21C4 - .string "No way! You've gone into the\n" - .string "HALL OF FAME that many times?\p" - .string "You're beyond incredible, yup!\n" - .string "That's it, I have to give you this.$" - -gUnknown_81B2242:: @ 81B2242 - .string "The HALL OF FAME STICKER was\n" - .string "applied to the TRAINER CARD.$" - -gUnknown_81B227C:: @ 81B227C - .string "Hmm…\p" - .string "Come back with a better story next\n" - .string "time, okay?$" - -gUnknown_81B22B0:: @ 81B22B0 - .string "Oh, no, no can do.\p" - .string "You're practically a living legend.\n" - .string "I have no SITCKERS left to give.$" - -gUnknown_81B2308:: @ 81B2308 - .string "Oh, wow, there are POKéMON EGGS?\n" - .string "I didn't know that!\p" - .string "That's pretty good, yup!\n" - .string "I'll give you one of these.$" - -gUnknown_81B2372:: @ 81B2372 - .string "You've hatched that many EGGS?\n" - .string "You really must like them!\p" - .string "That's impressive, yup!\n" - .string "I'll give you one of these.$" - -gUnknown_81B23E0:: @ 81B23E0 - .string "Whoa! You've hatched a whole\n" - .string "bunch of EGGS!\p" - .string "You're an EGG-hatching machine!\n" - .string "I'll give you one of these.$" - -gUnknown_81B2448:: @ 81B2448 - .string "Wh… You hatched that many EGGS?\p" - .string "What's behind your love of EGGS?\n" - .string "It's beyond incredible, yup!\p" - .string "You're too awesome, I tell you.\n" - .string "That's it, I have to give you this.$" - -gUnknown_81B24EA:: @ 81B24EA - .string "The EGG STICKER was applied\n" - .string "to the TRAINER CARD.$" - -gUnknown_81B251B:: @ 81B251B - .string "Hmm…\p" - .string "Come back with a better story next\n" - .string "time, okay?$" - -gUnknown_81B254F:: @ 81B254F - .string "Oh, no, no can do.\p" - .string "You're practically a living legend.\n" - .string "I have no SITCKERS left to give.$" - -gUnknown_81B25A7:: @ 81B25A7 - .string "Oh, wow, you've had success\n" - .string "link battling?\p" - .string "You're pretty strong, yup!\n" - .string "I'll give you one of these.$" - -gUnknown_81B2609:: @ 81B2609 - .string "You've beaten your friends a lot\n" - .string "link battling, huh?\p" - .string "You're impressively strong, yup!\n" - .string "I'll give you one of these.$" - -gUnknown_81B267B:: @ 81B267B - .string "Whoa! You've beaten your friends\n" - .string "a frightful number of times.\p" - .string "Have you lost friends over this?\n" - .string "I'll give you one of these.$" - -gUnknown_81B26F6:: @ 81B26F6 - .string "Wh… Wickedly whoa!\n" - .string "You've won mind-blowingly often!\p" - .string "It just knocks me out thinking\n" - .string "about how tough you are.\p" - .string "You're the stuff of nightmares!\n" - .string "That's it, I have to give you this.$" - -gUnknown_81B27A6:: @ 81B27A6 - .string "The VICTORY STICKER was applied\n" - .string "to the TRAINER CARD.$" - -gUnknown_81B27DB:: @ 81B27DB - .string "Hmm…\p" - .string "Come back with a better story next\n" - .string "time, okay?$" - -gUnknown_81B280F:: @ 81B280F - .string "Oh, no, no can do.\p" - .string "You're practically a living legend.\n" - .string "I have no SITCKERS left to give.$" diff --git a/data/text/trainer_card.inc b/data/text/trainer_card.inc new file mode 100644 index 000000000..3a6557cca --- /dev/null +++ b/data/text/trainer_card.inc @@ -0,0 +1,167 @@ +gUnknown_81B1D7D:: @ 81B1D7D + .string "It's a POKéMON PRINTER!\p" + .string "It can put a print of your POKéMON\n" + .string "on the back of your TRAINER CARD.\p" + .string "It costs only ¥50.\n" + .string "Would you like to try it?$" + +gUnknown_81B1E07:: @ 81B1E07 + .string "You don't have enough money.$" + +gUnknown_81B1E24:: @ 81B1E24 + .string "Please choose the print type.$" + +gUnknown_81B1E42:: @ 81B1E42 + .string "A big smile for the photo, please!\n" + .string "Three… Two… One…\p" + .string "Flash!$" + +gUnknown_81B1E7D:: @ 81B1E7D + .string "Your POKéMON print is ready!\n" + .string "Check your TRAINER CARD.$" + +gUnknown_81B1EB3:: @ 81B1EB3 + .string "Giggle…\n" + .string "I collected a ton of STICKERS.\l" + .string "I wish I could show them off…$" + +gUnknown_81B1EF8:: @ 81B1EF8 + .string "Oh, excellent!\n" + .string "You've come to the right place!\p" + .string "Look, look! See? See?\n" + .string "These are my STICKERS!\l" + .string "Look how many I got!\p" + .string "I bet you want some.\n" + .string "I bet you do!\p" + .string "I'll give a STICKER if you can tell\n" + .string "me something awesome about\l" + .string "yourself.\p" + .string "What will you brag about?$" + +gUnknown_81B1FEF:: @ 81B1FEF + .string "Brag about something for me.\n" + .string "I'll give you a STICKER.$" + +gUnknown_81B2025:: @ 81B2025 + .string "Oh, hi!\n" + .string "Here comes the braggart.\p" + .string "What are you going to brag about\n" + .string "today?$" + +gUnknown_81B206E:: @ 81B206E + .string "Oh, wow, you made it into the\n" + .string "HALL OF FAME.\p" + .string "That's pretty good, yup!\n" + .string "I'll give you one of these.$" + +gUnknown_81B20CF:: @ 81B20CF + .string "Oh, wow, you've entered the\n" + .string "HALL OF FAME often!\p" + .string "That's impressive, yup!\n" + .string "I'll give you one of these.$" + +gUnknown_81B2133:: @ 81B2133 + .string "Whoa! You've made it into the\n" + .string "HALL OF FAME that often?\l" + .string "That's seriously incredible, yup!\p" + .string "You own the POKéMON LEAGUE!\n" + .string "I'll give you one of these.$" + +gUnknown_81B21C4:: @ 81B21C4 + .string "No way! You've gone into the\n" + .string "HALL OF FAME that many times?\p" + .string "You're beyond incredible, yup!\n" + .string "That's it, I have to give you this.$" + +gUnknown_81B2242:: @ 81B2242 + .string "The HALL OF FAME STICKER was\n" + .string "applied to the TRAINER CARD.$" + +gUnknown_81B227C:: @ 81B227C + .string "Hmm…\p" + .string "Come back with a better story next\n" + .string "time, okay?$" + +gUnknown_81B22B0:: @ 81B22B0 + .string "Oh, no, no can do.\p" + .string "You're practically a living legend.\n" + .string "I have no SITCKERS left to give.$" + +gUnknown_81B2308:: @ 81B2308 + .string "Oh, wow, there are POKéMON EGGS?\n" + .string "I didn't know that!\p" + .string "That's pretty good, yup!\n" + .string "I'll give you one of these.$" + +gUnknown_81B2372:: @ 81B2372 + .string "You've hatched that many EGGS?\n" + .string "You really must like them!\p" + .string "That's impressive, yup!\n" + .string "I'll give you one of these.$" + +gUnknown_81B23E0:: @ 81B23E0 + .string "Whoa! You've hatched a whole\n" + .string "bunch of EGGS!\p" + .string "You're an EGG-hatching machine!\n" + .string "I'll give you one of these.$" + +gUnknown_81B2448:: @ 81B2448 + .string "Wh… You hatched that many EGGS?\p" + .string "What's behind your love of EGGS?\n" + .string "It's beyond incredible, yup!\p" + .string "You're too awesome, I tell you.\n" + .string "That's it, I have to give you this.$" + +gUnknown_81B24EA:: @ 81B24EA + .string "The EGG STICKER was applied\n" + .string "to the TRAINER CARD.$" + +gUnknown_81B251B:: @ 81B251B + .string "Hmm…\p" + .string "Come back with a better story next\n" + .string "time, okay?$" + +gUnknown_81B254F:: @ 81B254F + .string "Oh, no, no can do.\p" + .string "You're practically a living legend.\n" + .string "I have no SITCKERS left to give.$" + +gUnknown_81B25A7:: @ 81B25A7 + .string "Oh, wow, you've had success\n" + .string "link battling?\p" + .string "You're pretty strong, yup!\n" + .string "I'll give you one of these.$" + +gUnknown_81B2609:: @ 81B2609 + .string "You've beaten your friends a lot\n" + .string "link battling, huh?\p" + .string "You're impressively strong, yup!\n" + .string "I'll give you one of these.$" + +gUnknown_81B267B:: @ 81B267B + .string "Whoa! You've beaten your friends\n" + .string "a frightful number of times.\p" + .string "Have you lost friends over this?\n" + .string "I'll give you one of these.$" + +gUnknown_81B26F6:: @ 81B26F6 + .string "Wh… Wickedly whoa!\n" + .string "You've won mind-blowingly often!\p" + .string "It just knocks me out thinking\n" + .string "about how tough you are.\p" + .string "You're the stuff of nightmares!\n" + .string "That's it, I have to give you this.$" + +gUnknown_81B27A6:: @ 81B27A6 + .string "The VICTORY STICKER was applied\n" + .string "to the TRAINER CARD.$" + +gUnknown_81B27DB:: @ 81B27DB + .string "Hmm…\p" + .string "Come back with a better story next\n" + .string "time, okay?$" + +gUnknown_81B280F:: @ 81B280F + .string "Oh, no, no can do.\p" + .string "You're practically a living legend.\n" + .string "I have no SITCKERS left to give.$" -- cgit v1.2.3 From 351d85f57d45dfcd6042b37aa36d77bec1d0a487 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 25 Jan 2020 14:56:58 -0500 Subject: Update JP altar text comment --- data/maps/CeladonCity_Hotel/text.inc | 4 ---- data/maps/CeladonCity_House1/text.inc | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'data') diff --git a/data/maps/CeladonCity_Hotel/text.inc b/data/maps/CeladonCity_Hotel/text.inc index 3932c4633..5ac6ac99c 100644 --- a/data/maps/CeladonCity_Hotel/text.inc +++ b/data/maps/CeladonCity_Hotel/text.inc @@ -1,7 +1,3 @@ -@ Odd, doesnt seem to be corresponding text in RB. Unclear what this was meant for -Text_BuddhistAltar:: @ 8197B6F - .string "ぶつだん　だ‥$" - CeladonCity_Hotel_Text_ThisHotelIsForPeople:: @ 8197B77 .string "POKéMON?\n" .string "No, this is a hotel for people.\p" diff --git a/data/maps/CeladonCity_House1/text.inc b/data/maps/CeladonCity_House1/text.inc index 49bf8e3fe..d07d4a0e4 100644 --- a/data/maps/CeladonCity_House1/text.inc +++ b/data/maps/CeladonCity_House1/text.inc @@ -14,3 +14,7 @@ CeladonCity_House1_Text_DontTouchGameCornerPoster:: @ 8197B20 .string "CORNER!\p" .string "There's no secret switch behind it!$" +@ Text for the replaced altars in the rocket chiefs house / celadon mansion +@ In English RB, this is westernized as "It's a sculpture of DIGLETT.", and is removed altogether in FRLG +Text_ItsABuddhistAltar:: @ 8197B6F + .string "ぶつだん　だ‥$" -- cgit v1.2.3 From ce9f821b4e993fd86122476d17870afd0527513a Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 25 Jan 2020 15:54:20 -0500 Subject: Document Saffron City scripts --- data/event_scripts.s | 16 +- .../SaffronCity_CopycatsHouse_1F/border.bin | Bin 0 -> 8 bytes data/layouts/SaffronCity_CopycatsHouse_1F/map.bin | 1 + .../SaffronCity_CopycatsHouse_2F/border.bin | Bin 0 -> 8 bytes data/layouts/SaffronCity_CopycatsHouse_2F/map.bin | Bin 0 -> 216 bytes data/layouts/SaffronCity_House1_1F/border.bin | Bin 8 -> 0 bytes data/layouts/SaffronCity_House1_1F/map.bin | 1 - data/layouts/SaffronCity_House1_2F/border.bin | Bin 8 -> 0 bytes data/layouts/SaffronCity_House1_2F/map.bin | Bin 216 -> 0 bytes data/layouts/layouts.json | 16 +- data/maps/IndigoPlateau_PokemonCenter_1F/text.inc | 19 ++ data/maps/OneIsland/text.inc | 9 - data/maps/Route5_PokemonDayCare/text.inc | 8 + data/maps/Route5_SouthEntrance/map.json | 8 +- data/maps/Route5_SouthEntrance/scripts.inc | 60 ++--- data/maps/Route5_SouthEntrance/text.inc | 16 +- data/maps/Route6_NorthEntrance/map.json | 8 +- data/maps/Route6_NorthEntrance/scripts.inc | 60 ++--- data/maps/Route6_NorthEntrance/text.inc | 8 +- data/maps/Route7_EastEntrance/map.json | 8 +- data/maps/Route7_EastEntrance/scripts.inc | 60 ++--- data/maps/Route7_EastEntrance/text.inc | 8 +- data/maps/Route8_WestEntrance/map.json | 8 +- data/maps/Route8_WestEntrance/scripts.inc | 70 +++--- data/maps/Route8_WestEntrance/text.inc | 8 +- data/maps/SaffronCity/map.json | 54 ++-- data/maps/SaffronCity/scripts.inc | 102 ++++---- data/maps/SaffronCity/text.inc | 57 +++-- data/maps/SaffronCity_CopycatsHouse_1F/map.json | 88 +++++++ data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc | 20 ++ data/maps/SaffronCity_CopycatsHouse_1F/text.inc | 13 + data/maps/SaffronCity_CopycatsHouse_2F/map.json | 105 ++++++++ data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc | 50 ++++ data/maps/SaffronCity_CopycatsHouse_2F/text.inc | 102 ++++++++ data/maps/SaffronCity_Dojo/map.json | 26 +- data/maps/SaffronCity_Dojo/scripts.inc | 112 ++++----- data/maps/SaffronCity_Dojo/text.inc | 51 ++-- data/maps/SaffronCity_Gym/map.json | 22 +- data/maps/SaffronCity_Gym/scripts.inc | 88 +++---- data/maps/SaffronCity_Gym/text.inc | 64 ++--- data/maps/SaffronCity_House/map.json | 102 ++++++++ data/maps/SaffronCity_House/scripts.inc | 24 ++ data/maps/SaffronCity_House/text.inc | 20 ++ data/maps/SaffronCity_House1_1F/map.json | 88 ------- data/maps/SaffronCity_House1_1F/scripts.inc | 20 -- data/maps/SaffronCity_House1_1F/text.inc | 32 --- data/maps/SaffronCity_House1_2F/map.json | 105 -------- data/maps/SaffronCity_House1_2F/scripts.inc | 50 ---- data/maps/SaffronCity_House1_2F/text.inc | 100 -------- data/maps/SaffronCity_House2/map.json | 102 -------- data/maps/SaffronCity_House2/scripts.inc | 24 -- data/maps/SaffronCity_House2/text.inc | 20 -- data/maps/SaffronCity_House3/map.json | 55 ----- data/maps/SaffronCity_House3/scripts.inc | 26 -- data/maps/SaffronCity_House3/text.inc | 18 -- data/maps/SaffronCity_Mart/map.json | 6 +- data/maps/SaffronCity_Mart/scripts.inc | 14 +- data/maps/SaffronCity_Mart/text.inc | 4 +- data/maps/SaffronCity_MrPsychicsHouse/map.json | 55 +++++ data/maps/SaffronCity_MrPsychicsHouse/scripts.inc | 26 ++ data/maps/SaffronCity_MrPsychicsHouse/text.inc | 18 ++ data/maps/SaffronCity_PokemonCenter_1F/map.json | 12 +- data/maps/SaffronCity_PokemonCenter_1F/scripts.inc | 20 +- data/maps/SaffronCity_PokemonCenter_1F/text.inc | 8 +- .../SaffronCity_PokemonTrainerFanClub/map.json | 20 +- .../SaffronCity_PokemonTrainerFanClub/scripts.inc | 274 +++++++++++---------- .../SaffronCity_PokemonTrainerFanClub/text.inc | 76 +++--- data/maps/map_groups.json | 8 +- data/scripts/fame_checker.inc | 14 +- data/text/fame_checker.inc | 4 +- 70 files changed, 1349 insertions(+), 1342 deletions(-) create mode 100644 data/layouts/SaffronCity_CopycatsHouse_1F/border.bin create mode 100644 data/layouts/SaffronCity_CopycatsHouse_1F/map.bin create mode 100644 data/layouts/SaffronCity_CopycatsHouse_2F/border.bin create mode 100644 data/layouts/SaffronCity_CopycatsHouse_2F/map.bin delete mode 100644 data/layouts/SaffronCity_House1_1F/border.bin delete mode 100644 data/layouts/SaffronCity_House1_1F/map.bin delete mode 100644 data/layouts/SaffronCity_House1_2F/border.bin delete mode 100644 data/layouts/SaffronCity_House1_2F/map.bin create mode 100644 data/maps/SaffronCity_CopycatsHouse_1F/map.json create mode 100644 data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc create mode 100644 data/maps/SaffronCity_CopycatsHouse_1F/text.inc create mode 100644 data/maps/SaffronCity_CopycatsHouse_2F/map.json create mode 100644 data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc create mode 100644 data/maps/SaffronCity_CopycatsHouse_2F/text.inc create mode 100644 data/maps/SaffronCity_House/map.json create mode 100644 data/maps/SaffronCity_House/scripts.inc create mode 100644 data/maps/SaffronCity_House/text.inc delete mode 100644 data/maps/SaffronCity_House1_1F/map.json delete mode 100644 data/maps/SaffronCity_House1_1F/scripts.inc delete mode 100644 data/maps/SaffronCity_House1_1F/text.inc delete mode 100644 data/maps/SaffronCity_House1_2F/map.json delete mode 100644 data/maps/SaffronCity_House1_2F/scripts.inc delete mode 100644 data/maps/SaffronCity_House1_2F/text.inc delete mode 100644 data/maps/SaffronCity_House2/map.json delete mode 100644 data/maps/SaffronCity_House2/scripts.inc delete mode 100644 data/maps/SaffronCity_House2/text.inc delete mode 100644 data/maps/SaffronCity_House3/map.json delete mode 100644 data/maps/SaffronCity_House3/scripts.inc delete mode 100644 data/maps/SaffronCity_House3/text.inc create mode 100644 data/maps/SaffronCity_MrPsychicsHouse/map.json create mode 100644 data/maps/SaffronCity_MrPsychicsHouse/scripts.inc create mode 100644 data/maps/SaffronCity_MrPsychicsHouse/text.inc (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index ab8c2d023..2f7a1e29c 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -415,15 +415,15 @@ gStdScriptsEnd:: .include "data/maps/CinnabarIsland_Mart/scripts.inc" .include "data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc" .include "data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc" - .include "data/maps/SaffronCity_House1_1F/scripts.inc" - .include "data/maps/SaffronCity_House1_2F/scripts.inc" + .include "data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc" + .include "data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc" .include "data/maps/SaffronCity_Dojo/scripts.inc" .include "data/maps/SaffronCity_Gym/scripts.inc" - .include "data/maps/SaffronCity_House2/scripts.inc" + .include "data/maps/SaffronCity_House/scripts.inc" .include "data/maps/SaffronCity_Mart/scripts.inc" .include "data/maps/SaffronCity_PokemonCenter_1F/scripts.inc" .include "data/maps/SaffronCity_PokemonCenter_2F/scripts.inc" - .include "data/maps/SaffronCity_House3/scripts.inc" + .include "data/maps/SaffronCity_MrPsychicsHouse/scripts.inc" .include "data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc" .include "data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc" .include "data/maps/Route2_House/scripts.inc" @@ -728,14 +728,14 @@ gStdScriptsEnd:: .include "data/maps/CinnabarIsland_PokemonCenter_1F/text.inc" .include "data/maps/CinnabarIsland_Mart/text.inc" .include "data/maps/IndigoPlateau_PokemonCenter_1F/text.inc" - .include "data/maps/SaffronCity_House1_1F/text.inc" - .include "data/maps/SaffronCity_House1_2F/text.inc" + .include "data/maps/SaffronCity_CopycatsHouse_1F/text.inc" + .include "data/maps/SaffronCity_CopycatsHouse_2F/text.inc" .include "data/maps/SaffronCity_Dojo/text.inc" .include "data/maps/SaffronCity_Gym/text.inc" - .include "data/maps/SaffronCity_House2/text.inc" + .include "data/maps/SaffronCity_House/text.inc" .include "data/maps/SaffronCity_Mart/text.inc" .include "data/maps/SaffronCity_PokemonCenter_1F/text.inc" - .include "data/maps/SaffronCity_House3/text.inc" + .include "data/maps/SaffronCity_MrPsychicsHouse/text.inc" .include "data/maps/SaffronCity_PokemonTrainerFanClub/text.inc" .include "data/maps/Route2_ViridianForest_SouthEntrance/text.inc" .include "data/maps/Route2_House/text.inc" diff --git a/data/layouts/SaffronCity_CopycatsHouse_1F/border.bin b/data/layouts/SaffronCity_CopycatsHouse_1F/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/SaffronCity_CopycatsHouse_1F/border.bin differ diff --git a/data/layouts/SaffronCity_CopycatsHouse_1F/map.bin b/data/layouts/SaffronCity_CopycatsHouse_1F/map.bin new file mode 100644 index 000000000..6db070ab7 --- /dev/null +++ b/data/layouts/SaffronCity_CopycatsHouse_1F/map.bin @@ -0,0 +1 @@ +500000000000000000000000000000000000000000000000000000000000000000000000000 \ No newline at end of file diff --git a/data/layouts/SaffronCity_CopycatsHouse_2F/border.bin b/data/layouts/SaffronCity_CopycatsHouse_2F/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/SaffronCity_CopycatsHouse_2F/border.bin differ diff --git a/data/layouts/SaffronCity_CopycatsHouse_2F/map.bin b/data/layouts/SaffronCity_CopycatsHouse_2F/map.bin new file mode 100644 index 000000000..c3090f485 Binary files /dev/null and b/data/layouts/SaffronCity_CopycatsHouse_2F/map.bin differ diff --git a/data/layouts/SaffronCity_House1_1F/border.bin b/data/layouts/SaffronCity_House1_1F/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/SaffronCity_House1_1F/border.bin and /dev/null differ diff --git a/data/layouts/SaffronCity_House1_1F/map.bin b/data/layouts/SaffronCity_House1_1F/map.bin deleted file mode 100644 index 6db070ab7..000000000 --- a/data/layouts/SaffronCity_House1_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -500000000000000000000000000000000000000000000000000000000000000000000000000 \ No newline at end of file diff --git a/data/layouts/SaffronCity_House1_2F/border.bin b/data/layouts/SaffronCity_House1_2F/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/SaffronCity_House1_2F/border.bin and /dev/null differ diff --git a/data/layouts/SaffronCity_House1_2F/map.bin b/data/layouts/SaffronCity_House1_2F/map.bin deleted file mode 100644 index c3090f485..000000000 Binary files a/data/layouts/SaffronCity_House1_2F/map.bin and /dev/null differ diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index 63fc06562..37308a99a 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -2504,28 +2504,28 @@ "blockdata_filepath": "data/layouts/RocketHideout_Elevator/map.bin" }, { - "id": "LAYOUT_SAFFRON_CITY_HOUSE1_1F", - "name": "SaffronCity_House1_1F_Layout", + "id": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_1F", + "name": "SaffronCity_CopycatsHouse_1F_Layout", "width": 13, "height": 10, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D4C74", - "border_filepath": "data/layouts/SaffronCity_House1_1F/border.bin", - "blockdata_filepath": "data/layouts/SaffronCity_House1_1F/map.bin" + "border_filepath": "data/layouts/SaffronCity_CopycatsHouse_1F/border.bin", + "blockdata_filepath": "data/layouts/SaffronCity_CopycatsHouse_1F/map.bin" }, { - "id": "LAYOUT_SAFFRON_CITY_HOUSE1_2F", - "name": "SaffronCity_House1_2F_Layout", + "id": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_2F", + "name": "SaffronCity_CopycatsHouse_2F_Layout", "width": 12, "height": 9, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D4C74", - "border_filepath": "data/layouts/SaffronCity_House1_2F/border.bin", - "blockdata_filepath": "data/layouts/SaffronCity_House1_2F/map.bin" + "border_filepath": "data/layouts/SaffronCity_CopycatsHouse_2F/border.bin", + "blockdata_filepath": "data/layouts/SaffronCity_CopycatsHouse_2F/map.bin" }, { "id": "LAYOUT_SAFFRON_CITY_DOJO", diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc index 7a4d158b3..6535f9588 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc @@ -22,3 +22,22 @@ gUnknown_819A943:: @ 819A943 .string "As a result, the POKéMON LEAGUE is\n" .string "closed for the time being.$" +Text_19A9E7:: @ 819A9E7 + .string "AGATHA's GHOST-type POKéMON are\n" + .string "horrifically terrifying in toughness.\p" + .string "I took my FIGHTING-type POKéMON\n" + .string "and raised them to the max.\p" + .string "I went at AGATHA feeling pretty\n" + .string "confident, but she whupped us.\p" + .string "That old lady's also got a really\n" + .string "short fuse, too.\p" + .string "It doesn't take anything to get\n" + .string "that scary lady hollering.$" + +Text_19AB16:: @ 819AB16 + .string "Maybe becoming an ELITE FOUR\n" + .string "member is in the blood.\p" + .string "From what I've heard, LANCE has\n" + .string "a cousin who's a GYM LEADER\l" + .string "somewhere far away.$" + diff --git a/data/maps/OneIsland/text.inc b/data/maps/OneIsland/text.inc index aeccc1e47..d9a6e376a 100644 --- a/data/maps/OneIsland/text.inc +++ b/data/maps/OneIsland/text.inc @@ -1,12 +1,3 @@ -Text_181569:: @ 8181569 - .string "This FAN CLUB…\n" - .string "No one here has a clue!\p" - .string "How could they not recognize\n" - .string "the brilliance that is LANCE?\p" - .string "He stands for justice!\n" - .string "He's cool, and yet passionate!\l" - .string "He's the greatest, LANCE!$" - gUnknown_818161B:: @ 818161B .string "BILL: Here we are!\n" .string "This is ONE ISLAND.\p" diff --git a/data/maps/Route5_PokemonDayCare/text.inc b/data/maps/Route5_PokemonDayCare/text.inc index cada12ea5..b87ca2ca2 100644 --- a/data/maps/Route5_PokemonDayCare/text.inc +++ b/data/maps/Route5_PokemonDayCare/text.inc @@ -58,3 +58,11 @@ Route5_PokemonDayCare_Text_YouveGotNoRoomForIt:: @ 819DFC2 Route5_PokemonDayCare_Text_DontHaveEnoughMoney:: @ 819E001 .string "You don't have enough money.$" + +Text_19E01E:: @ 819E01E + .string "きみの\n" + .string "みてみるかね？$" + +Text_19E02A:: @ 819E02A + .string "わるいけど　ひでんのわざを　もった\n" + .string "ポケモンは　あずかれないなぁ$" diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json index a85de2522..e75bbbf85 100644 --- a/data/maps/Route5_SouthEntrance/map.json +++ b/data/maps/Route5_SouthEntrance/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route5_SouthEntrance_EventScript_16F901", + "script": "Route5_SouthEntrance_EventScript_Guard", "flag": "0" } ], @@ -65,7 +65,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route5_SouthEntrance_EventScript_16F90A" + "script": "Route5_SouthEntrance_EventScript_GuardTriggerLeft" }, { "type": "trigger", @@ -74,7 +74,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route5_SouthEntrance_EventScript_16F916" + "script": "Route5_SouthEntrance_EventScript_GuardTriggerMid" }, { "type": "trigger", @@ -83,7 +83,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route5_SouthEntrance_EventScript_16F922" + "script": "Route5_SouthEntrance_EventScript_GuardTriggerRight" } ], "bg_events": [] diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc index f20da71ae..b06a2aa2c 100644 --- a/data/maps/Route5_SouthEntrance/scripts.inc +++ b/data/maps/Route5_SouthEntrance/scripts.inc @@ -1,87 +1,87 @@ Route5_SouthEntrance_MapScripts:: @ 816F900 .byte 0 -Route5_SouthEntrance_EventScript_16F901:: @ 816F901 - msgbox gUnknown_819E16D, MSGBOX_NPC +Route5_SouthEntrance_EventScript_Guard:: @ 816F901 + msgbox Route5_SouthEntrance_Text_HiHowsItGoing, MSGBOX_NPC end -Route5_SouthEntrance_EventScript_16F90A:: @ 816F90A +Route5_SouthEntrance_EventScript_GuardTriggerLeft:: @ 816F90A lockall setvar VAR_TEMP_1, 0 - goto EventScript_16F92E + goto Route5_SouthEntrance_EventScript_GuardTrigger end -Route5_SouthEntrance_EventScript_16F916:: @ 816F916 +Route5_SouthEntrance_EventScript_GuardTriggerMid:: @ 816F916 lockall setvar VAR_TEMP_1, 1 - goto EventScript_16F92E + goto Route5_SouthEntrance_EventScript_GuardTrigger end -Route5_SouthEntrance_EventScript_16F922:: @ 816F922 +Route5_SouthEntrance_EventScript_GuardTriggerRight:: @ 816F922 lockall setvar VAR_TEMP_1, 2 - goto EventScript_16F92E + goto Route5_SouthEntrance_EventScript_GuardTrigger end -EventScript_16F92E:: @ 816F92E +Route5_SouthEntrance_EventScript_GuardTrigger:: @ 816F92E textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 - goto_if_set FLAG_GOT_TEA, EventScript_16F958 - msgbox gUnknown_819E04B + goto_if_set FLAG_GOT_TEA, Route5_SouthEntrance_EventScript_GiveTea + msgbox Route5_SouthEntrance_Text_ThirstyOnGuardDuty closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9C4 + applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_BlockPlayerEntry waitmovement 0 releaseall end -EventScript_16F958:: @ 816F958 +Route5_SouthEntrance_EventScript_GiveTea:: @ 816F958 removeitem ITEM_TEA, 1 - goto EventScript_16F963 + goto Route5_SouthEntrance_EventScript_GuardDrinkTea end -EventScript_16F963:: @ 816F963 - msgbox gUnknown_819E09B +Route5_SouthEntrance_EventScript_GuardDrinkTea:: @ 816F963 + msgbox Route5_SouthEntrance_Text_ThatTeaLooksTasty closemessage compare VAR_TEMP_1, 0 - call_if_eq EventScript_16F99C + call_if_eq Route5_SouthEntrance_EventScript_WalkToGuardLeft compare VAR_TEMP_1, 1 - call_if_eq EventScript_16F9A7 + call_if_eq Route5_SouthEntrance_EventScript_WalkToGuardMid compare VAR_TEMP_1, 2 - call_if_eq EventScript_16F9B2 - msgbox gUnknown_819E0C1 + call_if_eq Route5_SouthEntrance_EventScript_WalkToGuardRight + msgbox Route5_SouthEntrance_Text_ThanksIllShareTeaWithGuards setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall end -EventScript_16F99C:: @ 816F99C - applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9C2 +Route5_SouthEntrance_EventScript_WalkToGuardLeft:: @ 816F99C + applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardLeft waitmovement 0 return -EventScript_16F9A7:: @ 816F9A7 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9BD +Route5_SouthEntrance_EventScript_WalkToGuardMid:: @ 816F9A7 + applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardMid waitmovement 0 return -EventScript_16F9B2:: @ 816F9B2 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9BF +Route5_SouthEntrance_EventScript_WalkToGuardRight:: @ 816F9B2 + applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardRight waitmovement 0 return -Movement_16F9BD:: @ 816F9BD +Route5_SouthEntrance_Movement_WalkToGuardMid:: @ 816F9BD walk_left step_end -Movement_16F9BF:: @ 816F9BF +Route5_SouthEntrance_Movement_WalkToGuardRight:: @ 816F9BF walk_left walk_left step_end -Movement_16F9C2:: @ 816F9C2 +Route5_SouthEntrance_Movement_WalkToGuardLeft:: @ 816F9C2 walk_in_place_left step_end -Movement_16F9C4:: @ 816F9C4 +Route5_SouthEntrance_Movement_BlockPlayerEntry:: @ 816F9C4 walk_up step_end diff --git a/data/maps/Route5_SouthEntrance/text.inc b/data/maps/Route5_SouthEntrance/text.inc index 749bcabe5..2b740e141 100644 --- a/data/maps/Route5_SouthEntrance/text.inc +++ b/data/maps/Route5_SouthEntrance/text.inc @@ -1,21 +1,13 @@ -Text_19E01E:: @ 819E01E - .string "きみの\n" - .string "みてみるかね？$" - -Text_19E02A:: @ 819E02A - .string "わるいけど　ひでんのわざを　もった\n" - .string "ポケモンは　あずかれないなぁ$" - -gUnknown_819E04B:: @ 819E04B +Route5_SouthEntrance_Text_ThirstyOnGuardDuty:: @ 819E04B .string "I'm on guard duty.\n" .string "Gee, I'm thirsty, though!\p" .string "Oh, wait there, the road's closed.$" -gUnknown_819E09B:: @ 819E09B +Route5_SouthEntrance_Text_ThatTeaLooksTasty:: @ 819E09B .string "Oh, that TEA…\n" .string "It looks awfully tasty…$" -gUnknown_819E0C1:: @ 819E0C1 +Route5_SouthEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E0C1 .string "Huh? I can have this drink?\n" .string "Gee, thanks!\l" .string "… …\l" @@ -29,6 +21,6 @@ gUnknown_819E0C1:: @ 819E0C1 .string "I'll share this TEA with the other\n" .string "guards!$" -gUnknown_819E16D:: @ 819E16D +Route5_SouthEntrance_Text_HiHowsItGoing:: @ 819E16D .string "Hi, how's it going?$" diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json index 8b49e226d..d44503ee4 100644 --- a/data/maps/Route6_NorthEntrance/map.json +++ b/data/maps/Route6_NorthEntrance/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route6_NorthEntrance_EventScript_16F9C7", + "script": "Route6_NorthEntrance_EventScript_Guard", "flag": "0" } ], @@ -65,7 +65,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route6_NorthEntrance_EventScript_16F9D0" + "script": "Route6_NorthEntrance_EventScript_GuardTriggerLeft" }, { "type": "trigger", @@ -74,7 +74,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route6_NorthEntrance_EventScript_16F9DC" + "script": "Route6_NorthEntrance_EventScript_GuardTriggerMid" }, { "type": "trigger", @@ -83,7 +83,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route6_NorthEntrance_EventScript_16F9E8" + "script": "Route6_NorthEntrance_EventScript_GuardTriggerRight" } ], "bg_events": [] diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc index d1b9a4555..5c7add642 100644 --- a/data/maps/Route6_NorthEntrance/scripts.inc +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -1,87 +1,87 @@ Route6_NorthEntrance_MapScripts:: @ 816F9C6 .byte 0 -Route6_NorthEntrance_EventScript_16F9C7:: @ 816F9C7 - msgbox gUnknown_819E2A3, MSGBOX_NPC +Route6_NorthEntrance_EventScript_Guard:: @ 816F9C7 + msgbox Route6_NorthEntrance_Text_HiHowsItGoing, MSGBOX_NPC end -Route6_NorthEntrance_EventScript_16F9D0:: @ 816F9D0 +Route6_NorthEntrance_EventScript_GuardTriggerLeft:: @ 816F9D0 lockall setvar VAR_TEMP_1, 0 - goto EventScript_16F9F4 + goto Route6_NorthEntrance_EventScript_GuardTrigger end -Route6_NorthEntrance_EventScript_16F9DC:: @ 816F9DC +Route6_NorthEntrance_EventScript_GuardTriggerMid:: @ 816F9DC lockall setvar VAR_TEMP_1, 1 - goto EventScript_16F9F4 + goto Route6_NorthEntrance_EventScript_GuardTrigger end -Route6_NorthEntrance_EventScript_16F9E8:: @ 816F9E8 +Route6_NorthEntrance_EventScript_GuardTriggerRight:: @ 816F9E8 lockall setvar VAR_TEMP_1, 2 - goto EventScript_16F9F4 + goto Route6_NorthEntrance_EventScript_GuardTrigger end -EventScript_16F9F4:: @ 816F9F4 +Route6_NorthEntrance_EventScript_GuardTrigger:: @ 816F9F4 textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 - goto_if_set FLAG_GOT_TEA, EventScript_16FA1E - msgbox gUnknown_819E181 + goto_if_set FLAG_GOT_TEA, Route6_NorthEntrance_EventScript_GiveTea + msgbox Route6_NorthEntrance_Text_ThirstyOnGuardDuty closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA8A + applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_BlockPlayerEntry waitmovement 0 releaseall end -EventScript_16FA1E:: @ 816FA1E +Route6_NorthEntrance_EventScript_GiveTea:: @ 816FA1E removeitem ITEM_TEA, 1 - goto EventScript_16FA29 + goto Route6_NorthEntrance_EventScript_GuardDrinkTea end -EventScript_16FA29:: @ 816FA29 - msgbox gUnknown_819E1D1 +Route6_NorthEntrance_EventScript_GuardDrinkTea:: @ 816FA29 + msgbox Route6_NorthEntrance_Text_ThatTeaLooksTasty closemessage compare VAR_TEMP_1, 0 - call_if_eq EventScript_16FA62 + call_if_eq Route6_NorthEntrance_EventScript_WalkToGuardLeft compare VAR_TEMP_1, 1 - call_if_eq EventScript_16FA6D + call_if_eq Route6_NorthEntrance_EventScript_WalkToGuardMid compare VAR_TEMP_1, 2 - call_if_eq EventScript_16FA78 - msgbox gUnknown_819E1F7 + call_if_eq Route6_NorthEntrance_EventScript_WalkToGuardRight + msgbox Route6_NorthEntrance_Text_ThanksIllShareTeaWithGuards setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall end -EventScript_16FA62:: @ 816FA62 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA83 +Route6_NorthEntrance_EventScript_WalkToGuardLeft:: @ 816FA62 + applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardLeft waitmovement 0 return -EventScript_16FA6D:: @ 816FA6D - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA86 +Route6_NorthEntrance_EventScript_WalkToGuardMid:: @ 816FA6D + applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardMid waitmovement 0 return -EventScript_16FA78:: @ 816FA78 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA88 +Route6_NorthEntrance_EventScript_WalkToGuardRight:: @ 816FA78 + applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardRight waitmovement 0 return -Movement_16FA83:: @ 816FA83 +Route6_NorthEntrance_Movement_WalkToGuardLeft:: @ 816FA83 walk_right walk_right step_end -Movement_16FA86:: @ 816FA86 +Route6_NorthEntrance_Movement_WalkToGuardMid:: @ 816FA86 walk_right step_end -Movement_16FA88:: @ 816FA88 +Route6_NorthEntrance_Movement_WalkToGuardRight:: @ 816FA88 walk_in_place_right step_end -Movement_16FA8A:: @ 816FA8A +Route6_NorthEntrance_Movement_BlockPlayerEntry:: @ 816FA8A walk_down step_end diff --git a/data/maps/Route6_NorthEntrance/text.inc b/data/maps/Route6_NorthEntrance/text.inc index 3d581e1fb..09705517c 100644 --- a/data/maps/Route6_NorthEntrance/text.inc +++ b/data/maps/Route6_NorthEntrance/text.inc @@ -1,13 +1,13 @@ -gUnknown_819E181:: @ 819E181 +Route6_NorthEntrance_Text_ThirstyOnGuardDuty:: @ 819E181 .string "I'm on guard duty.\n" .string "Gee, I'm thirsty, though!\p" .string "Oh, wait there, the road's closed.$" -gUnknown_819E1D1:: @ 819E1D1 +Route6_NorthEntrance_Text_ThatTeaLooksTasty:: @ 819E1D1 .string "Oh, that TEA…\n" .string "It looks awfully tasty…$" -gUnknown_819E1F7:: @ 819E1F7 +Route6_NorthEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E1F7 .string "Huh? I can have this drink?\n" .string "Gee, thanks!\l" .string "… …\l" @@ -21,6 +21,6 @@ gUnknown_819E1F7:: @ 819E1F7 .string "I'll share this TEA with the other\n" .string "guards!$" -gUnknown_819E2A3:: @ 819E2A3 +Route6_NorthEntrance_Text_HiHowsItGoing:: @ 819E2A3 .string "Hi, how's it going?$" diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json index 8bd0e7498..fbb8a163d 100644 --- a/data/maps/Route7_EastEntrance/map.json +++ b/data/maps/Route7_EastEntrance/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route7_EastEntrance_EventScript_16FA8E", + "script": "Route7_EastEntrance_EventScript_Guard", "flag": "0" } ], @@ -65,7 +65,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route7_EastEntrance_EventScript_16FA97" + "script": "Route7_EastEntrance_EventScript_GuardTriggerTop" }, { "type": "trigger", @@ -74,7 +74,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route7_EastEntrance_EventScript_16FAA3" + "script": "Route7_EastEntrance_EventScript_GuardTriggerMid" }, { "type": "trigger", @@ -83,7 +83,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route7_EastEntrance_EventScript_16FAAF" + "script": "Route7_EastEntrance_EventScript_GuardTriggerBottom" } ], "bg_events": [] diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc index cac72463b..767601f49 100644 --- a/data/maps/Route7_EastEntrance/scripts.inc +++ b/data/maps/Route7_EastEntrance/scripts.inc @@ -1,87 +1,87 @@ Route7_EastEntrance_MapScripts:: @ 816FA8D .byte 0 -Route7_EastEntrance_EventScript_16FA8E:: @ 816FA8E - msgbox gUnknown_819E3D9, MSGBOX_NPC +Route7_EastEntrance_EventScript_Guard:: @ 816FA8E + msgbox Route7_EastEntrance_Text_HiHowsItGoing, MSGBOX_NPC end -Route7_EastEntrance_EventScript_16FA97:: @ 816FA97 +Route7_EastEntrance_EventScript_GuardTriggerTop:: @ 816FA97 lockall setvar VAR_TEMP_1, 0 - goto EventScript_16FABB + goto Route7_EastEntrance_EventScript_GuardTrigger end -Route7_EastEntrance_EventScript_16FAA3:: @ 816FAA3 +Route7_EastEntrance_EventScript_GuardTriggerMid:: @ 816FAA3 lockall setvar VAR_TEMP_1, 1 - goto EventScript_16FABB + goto Route7_EastEntrance_EventScript_GuardTrigger end -Route7_EastEntrance_EventScript_16FAAF:: @ 816FAAF +Route7_EastEntrance_EventScript_GuardTriggerBottom:: @ 816FAAF lockall setvar VAR_TEMP_1, 2 - goto EventScript_16FABB + goto Route7_EastEntrance_EventScript_GuardTrigger end -EventScript_16FABB:: @ 816FABB +Route7_EastEntrance_EventScript_GuardTrigger:: @ 816FABB textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 - goto_if_set FLAG_GOT_TEA, EventScript_16FAE5 - msgbox gUnknown_819E2B7 + goto_if_set FLAG_GOT_TEA, Route7_EastEntrance_EventScript_GiveTea + msgbox Route7_EastEntrance_Text_ThirstyOnGuardDuty closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB51 + applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_BlockPlayerEntry waitmovement 0 releaseall end -EventScript_16FAE5:: @ 816FAE5 +Route7_EastEntrance_EventScript_GiveTea:: @ 816FAE5 removeitem ITEM_TEA, 1 - goto EventScript_16FAF0 + goto Route7_EastEntrance_EventScript_GuardDrinkTea end -EventScript_16FAF0:: @ 816FAF0 - msgbox gUnknown_819E307 +Route7_EastEntrance_EventScript_GuardDrinkTea:: @ 816FAF0 + msgbox Route7_EastEntrance_Text_ThatTeaLooksTasty closemessage compare VAR_TEMP_1, 0 - call_if_eq EventScript_16FB29 + call_if_eq Route7_EastEntrance_WalkToGuardTop compare VAR_TEMP_1, 1 - call_if_eq EventScript_16FB34 + call_if_eq Route7_EastEntrance_WalkToGuardMid compare VAR_TEMP_1, 2 - call_if_eq EventScript_16FB3F - msgbox gUnknown_819E32D + call_if_eq Route7_EastEntrance_WalkToGuardBottom + msgbox Route7_EastEntrance_Text_ThanksIllShareTeaWithGuards setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall end -EventScript_16FB29:: @ 816FB29 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB4F +Route7_EastEntrance_WalkToGuardTop:: @ 816FB29 + applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardTop waitmovement 0 return -EventScript_16FB34:: @ 816FB34 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB4A +Route7_EastEntrance_WalkToGuardMid:: @ 816FB34 + applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardMid waitmovement 0 return -EventScript_16FB3F:: @ 816FB3F - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB4C +Route7_EastEntrance_WalkToGuardBottom:: @ 816FB3F + applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardBottom waitmovement 0 return -Movement_16FB4A:: @ 816FB4A +Route7_EastEntrance_Movement_WalkToGuardMid:: @ 816FB4A walk_up step_end -Movement_16FB4C:: @ 816FB4C +Route7_EastEntrance_Movement_WalkToGuardBottom:: @ 816FB4C walk_up walk_up step_end -Movement_16FB4F:: @ 816FB4F +Route7_EastEntrance_Movement_WalkToGuardTop:: @ 816FB4F walk_in_place_up step_end -Movement_16FB51:: @ 816FB51 +Route7_EastEntrance_Movement_BlockPlayerEntry:: @ 816FB51 walk_left step_end diff --git a/data/maps/Route7_EastEntrance/text.inc b/data/maps/Route7_EastEntrance/text.inc index 94db43e94..ec98a5867 100644 --- a/data/maps/Route7_EastEntrance/text.inc +++ b/data/maps/Route7_EastEntrance/text.inc @@ -1,13 +1,13 @@ -gUnknown_819E2B7:: @ 819E2B7 +Route7_EastEntrance_Text_ThirstyOnGuardDuty:: @ 819E2B7 .string "I'm on guard duty.\n" .string "Gee, I'm thirsty, though!\p" .string "Oh, wait there, the road's closed.$" -gUnknown_819E307:: @ 819E307 +Route7_EastEntrance_Text_ThatTeaLooksTasty:: @ 819E307 .string "Oh, that TEA…\n" .string "It looks awfully tasty…$" -gUnknown_819E32D:: @ 819E32D +Route7_EastEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E32D .string "Huh? I can have this drink?\n" .string "Gee, thanks!\l" .string "… …\l" @@ -21,6 +21,6 @@ gUnknown_819E32D:: @ 819E32D .string "I'll share this TEA with the other\n" .string "guards!$" -gUnknown_819E3D9:: @ 819E3D9 +Route7_EastEntrance_Text_HiHowsItGoing:: @ 819E3D9 .string "Hi, how's it going?$" diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json index eb6b26e0f..3becdcbc2 100644 --- a/data/maps/Route8_WestEntrance/map.json +++ b/data/maps/Route8_WestEntrance/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route8_WestEntrance_EventScript_16FB54", + "script": "Route8_WestEntrance_EventScript_Guard", "flag": "0" } ], @@ -65,7 +65,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route8_WestEntrance_EventScript_16FB5D" + "script": "Route8_WestEntrance_EventScript_GuardTriggerTop" }, { "type": "trigger", @@ -74,7 +74,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route8_WestEntrance_EventScript_16FB69" + "script": "Route8_WestEntrance_EventScript_GuardTriggerMid" }, { "type": "trigger", @@ -83,7 +83,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route8_WestEntrance_EventScript_16FB75" + "script": "Route8_WestEntrance_EventScript_GuardTriggerBottom" } ], "bg_events": [] diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc index df9d1035c..1b36e9a15 100644 --- a/data/maps/Route8_WestEntrance/scripts.inc +++ b/data/maps/Route8_WestEntrance/scripts.inc @@ -1,97 +1,99 @@ Route8_WestEntrance_MapScripts:: @ 816FB53 .byte 0 -Route8_WestEntrance_EventScript_16FB54:: @ 816FB54 - msgbox gUnknown_819E50F, MSGBOX_NPC +Route8_WestEntrance_EventScript_Guard:: @ 816FB54 + msgbox Route8_WestEntrance_Text_HiHowsItGoing, MSGBOX_NPC end -Route8_WestEntrance_EventScript_16FB5D:: @ 816FB5D +Route8_WestEntrance_EventScript_GuardTriggerTop:: @ 816FB5D lockall setvar VAR_TEMP_1, 0 - goto EventScript_16FB81 + goto Route8_WestEntrance_EventScript_GuardTrigger end -Route8_WestEntrance_EventScript_16FB69:: @ 816FB69 +Route8_WestEntrance_EventScript_GuardTriggerMid:: @ 816FB69 lockall setvar VAR_TEMP_1, 1 - goto EventScript_16FB81 + goto Route8_WestEntrance_EventScript_GuardTrigger end -Route8_WestEntrance_EventScript_16FB75:: @ 816FB75 +Route8_WestEntrance_EventScript_GuardTriggerBottom:: @ 816FB75 lockall setvar VAR_TEMP_1, 2 - goto EventScript_16FB81 + goto Route8_WestEntrance_EventScript_GuardTrigger end -EventScript_16FB81:: @ 816FB81 +Route8_WestEntrance_EventScript_GuardTrigger:: @ 816FB81 textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 - goto_if_set FLAG_GOT_TEA, EventScript_16FBAB - msgbox gUnknown_819E3ED + goto_if_set FLAG_GOT_TEA, Route8_WestEntrance_EventScript_GiveTea + msgbox Route8_WestEntrance_Text_ThirstyOnGuardDuty closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC2D + applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_BlockPlayerEntry waitmovement 0 releaseall end -EventScript_16FBAB:: @ 816FBAB +Route8_WestEntrance_EventScript_GiveTea:: @ 816FBAB removeitem ITEM_TEA, 1 - goto EventScript_16FBCC + goto Route8_WestEntrance_EventScript_GuardDrinkTea end -EventScript_16FBB6:: @ 816FBB6 +@ Unused +Route8_WestEntrance_EventScript_GiveSodaPop:: @ 816FBB6 removeitem ITEM_SODA_POP, 1 - goto EventScript_16FBCC + goto Route8_WestEntrance_EventScript_GuardDrinkTea end -EventScript_16FBC1:: @ 816FBC1 +@ Unused +Route8_WestEntrance_EventScript_GiveLemonade:: @ 816FBC1 removeitem ITEM_LEMONADE, 1 - goto EventScript_16FBCC + goto Route8_WestEntrance_EventScript_GuardDrinkTea end -EventScript_16FBCC:: @ 816FBCC - msgbox gUnknown_819E43D +Route8_WestEntrance_EventScript_GuardDrinkTea:: @ 816FBCC + msgbox Route8_WestEntrance_Text_ThatTeaLooksTasty closemessage compare VAR_TEMP_1, 0 - call_if_eq EventScript_16FC05 + call_if_eq Route8_WestEntrance_EventScript_WalkToGuardTop compare VAR_TEMP_1, 1 - call_if_eq EventScript_16FC10 + call_if_eq Route8_WestEntrance_EventScript_WalkToGuardMid compare VAR_TEMP_1, 2 - call_if_eq EventScript_16FC1B - msgbox gUnknown_819E463 + call_if_eq Route8_WestEntrance_EventScript_WalkToGuardBottom + msgbox Route8_WestEntrance_Text_ThanksIllShareTeaWithGuards setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall end -EventScript_16FC05:: @ 816FC05 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC2B +Route8_WestEntrance_EventScript_WalkToGuardTop:: @ 816FC05 + applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardTop waitmovement 0 return -EventScript_16FC10:: @ 816FC10 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC26 +Route8_WestEntrance_EventScript_WalkToGuardMid:: @ 816FC10 + applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardMid waitmovement 0 return -EventScript_16FC1B:: @ 816FC1B - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC28 +Route8_WestEntrance_EventScript_WalkToGuardBottom:: @ 816FC1B + applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardBottom waitmovement 0 return -Movement_16FC26:: @ 816FC26 +Route8_WestEntrance_Movement_WalkToGuardMid:: @ 816FC26 walk_up step_end -Movement_16FC28:: @ 816FC28 +Route8_WestEntrance_Movement_WalkToGuardBottom:: @ 816FC28 walk_up walk_up step_end -Movement_16FC2B:: @ 816FC2B +Route8_WestEntrance_Movement_WalkToGuardTop:: @ 816FC2B walk_in_place_up step_end -Movement_16FC2D:: @ 816FC2D +Route8_WestEntrance_Movement_BlockPlayerEntry:: @ 816FC2D walk_right step_end diff --git a/data/maps/Route8_WestEntrance/text.inc b/data/maps/Route8_WestEntrance/text.inc index 58e2ee8ef..3c0be19e1 100644 --- a/data/maps/Route8_WestEntrance/text.inc +++ b/data/maps/Route8_WestEntrance/text.inc @@ -1,13 +1,13 @@ -gUnknown_819E3ED:: @ 819E3ED +Route8_WestEntrance_Text_ThirstyOnGuardDuty:: @ 819E3ED .string "I'm on guard duty.\n" .string "Gee, I'm thirsty, though!\p" .string "Oh, wait there, the road's closed.$" -gUnknown_819E43D:: @ 819E43D +Route8_WestEntrance_Text_ThatTeaLooksTasty:: @ 819E43D .string "Oh, that TEA…\n" .string "It looks awfully tasty…$" -gUnknown_819E463:: @ 819E463 +Route8_WestEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E463 .string "Huh? I can have this drink?\n" .string "Gee, thanks!\l" .string "… …\l" @@ -21,6 +21,6 @@ gUnknown_819E463:: @ 819E463 .string "I'll share this TEA with the other\n" .string "guards!$" -gUnknown_819E50F:: @ 819E50F +Route8_WestEntrance_Text_HiHowsItGoing:: @ 819E50F .string "Hi, how's it going?$" diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index 9ca5a540e..83dc3497f 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -45,7 +45,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_16737A", + "script": "SaffronCity_EventScript_RocketGrunt1", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { @@ -58,7 +58,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_167383", + "script": "SaffronCity_EventScript_RocketGrunt2", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { @@ -71,7 +71,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_16738C", + "script": "SaffronCity_EventScript_RocketGrunt3", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { @@ -84,7 +84,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_167395", + "script": "SaffronCity_EventScript_RocketGrunt4", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { @@ -97,7 +97,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_16739E", + "script": "SaffronCity_EventScript_RocketGrunt5", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { @@ -110,7 +110,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_1673B9", + "script": "SaffronCity_EventScript_DoorGuardGrunt", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { @@ -123,7 +123,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_1673B0", + "script": "SaffronCity_EventScript_RocketGrunt7", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { @@ -136,7 +136,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_1673A7", + "script": "SaffronCity_EventScript_RocketGrunt6", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { @@ -149,7 +149,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_1673EC", + "script": "SaffronCity_EventScript_Youngster", "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { @@ -162,7 +162,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_1673E3", + "script": "SaffronCity_EventScript_WorkerM", "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { @@ -175,7 +175,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_16741A", + "script": "SaffronCity_EventScript_Man", "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { @@ -188,7 +188,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_1673FE", + "script": "SaffronCity_EventScript_Boy", "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { @@ -201,7 +201,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_167407", + "script": "SaffronCity_EventScript_Pidgeot", "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { @@ -214,7 +214,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_1673F5", + "script": "SaffronCity_EventScript_Lass", "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { @@ -227,7 +227,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_1AD03A", + "script": "SaffronCity_EventScript_BattleGirl", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], @@ -243,7 +243,7 @@ "x": 22, "y": 14, "elevation": 0, - "dest_map": "MAP_SAFFRON_CITY_HOUSE1_1F", + "dest_map": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F", "dest_warp_id": 1 }, { @@ -264,7 +264,7 @@ "x": 27, "y": 21, "elevation": 0, - "dest_map": "MAP_SAFFRON_CITY_HOUSE2", + "dest_map": "MAP_SAFFRON_CITY_HOUSE", "dest_warp_id": 1 }, { @@ -285,7 +285,7 @@ "x": 43, "y": 38, "elevation": 0, - "dest_map": "MAP_SAFFRON_CITY_HOUSE3", + "dest_map": "MAP_SAFFRON_CITY_MR_PSYCHICS_HOUSE", "dest_warp_id": 1 }, { @@ -345,63 +345,63 @@ "x": 29, "y": 14, "elevation": 0, - "script": "SaffronCity_EventScript_167423" + "script": "SaffronCity_EventScript_CitySign" }, { "type": "bg_event_type_0", "x": 42, "y": 14, "elevation": 0, - "script": "SaffronCity_EventScript_16742C" + "script": "SaffronCity_EventScript_DojoSign" }, { "type": "bg_event_type_0", "x": 13, "y": 25, "elevation": 0, - "script": "SaffronCity_EventScript_167471" + "script": "SaffronCity_EventScript_SilphProductSign" }, { "type": "bg_event_type_0", "x": 18, "y": 30, "elevation": 0, - "script": "SaffronCity_EventScript_167456" + "script": "SaffronCity_EventScript_TrainerTips2" }, { "type": "bg_event_type_0", "x": 29, "y": 31, "elevation": 0, - "script": "SaffronCity_EventScript_16745F" + "script": "SaffronCity_EventScript_SilphCoSign" }, { "type": "bg_event_type_0", "x": 54, "y": 25, "elevation": 0, - "script": "SaffronCity_EventScript_16744D" + "script": "SaffronCity_EventScript_TrainerTips1" }, { "type": "bg_event_type_0", "x": 50, "y": 14, "elevation": 0, - "script": "SaffronCity_EventScript_167435" + "script": "SaffronCity_EventScript_GymSign" }, { "type": "bg_event_type_0", "x": 40, "y": 38, "elevation": 0, - "script": "SaffronCity_EventScript_167468" + "script": "SaffronCity_EventScript_MrPsychicsHouseSign" }, { "type": "bg_event_type_0", "x": 49, "y": 22, "elevation": 0, - "script": "SaffronCity_EventScript_16747A" + "script": "SaffronCity_EventScript_TrainerFanClubSign" } ] } diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc index 53d697ff0..4b74cd43d 100644 --- a/data/maps/SaffronCity/scripts.inc +++ b/data/maps/SaffronCity/scripts.inc @@ -4,121 +4,121 @@ SaffronCity_MapScripts:: @ 816735F SaffronCity_OnTransition:: @ 8167365 setworldmapflag FLAG_WORLD_MAP_SAFFRON_CITY - call_if_unset FLAG_RESCUED_MR_FUJI, EventScript_167372 + call_if_unset FLAG_RESCUED_MR_FUJI, SaffronCity_EventScript_MoveDoorGuardGrunt end -EventScript_167372:: @ 8167372 +SaffronCity_EventScript_MoveDoorGuardGrunt:: @ 8167372 setobjectxyperm 6, 33, 31 return -SaffronCity_EventScript_16737A:: @ 816737A - msgbox gUnknown_8181003, MSGBOX_NPC +SaffronCity_EventScript_RocketGrunt1:: @ 816737A + msgbox SaffronCity_Text_WhatDoYouWantGetLost, MSGBOX_NPC end -SaffronCity_EventScript_167383:: @ 8167383 - msgbox gUnknown_818101F, MSGBOX_NPC +SaffronCity_EventScript_RocketGrunt2:: @ 8167383 + msgbox SaffronCity_Text_BossTakeTownForTeamRocket, MSGBOX_NPC end -SaffronCity_EventScript_16738C:: @ 816738C - msgbox gUnknown_818105A, MSGBOX_NPC +SaffronCity_EventScript_RocketGrunt3:: @ 816738C + msgbox SaffronCity_Text_DontGetDefiantOrIllHurtYou, MSGBOX_NPC end -SaffronCity_EventScript_167395:: @ 8167395 - msgbox gUnknown_8181087, MSGBOX_NPC +SaffronCity_EventScript_RocketGrunt4:: @ 8167395 + msgbox SaffronCity_Text_SaffronBelongsToTeamRocket, MSGBOX_NPC end -SaffronCity_EventScript_16739E:: @ 816739E - msgbox gUnknown_81810A7, MSGBOX_NPC +SaffronCity_EventScript_RocketGrunt5:: @ 816739E + msgbox SaffronCity_Text_CriminalLifeMakesMeFeelAlive, MSGBOX_NPC end -SaffronCity_EventScript_1673A7:: @ 81673A7 - msgbox gUnknown_81810D5, MSGBOX_NPC +SaffronCity_EventScript_RocketGrunt6:: @ 81673A7 + msgbox SaffronCity_Text_WatchWhereYoureWalking, MSGBOX_NPC end -SaffronCity_EventScript_1673B0:: @ 81673B0 - msgbox gUnknown_81810F5, MSGBOX_NPC +SaffronCity_EventScript_RocketGrunt7:: @ 81673B0 + msgbox SaffronCity_Text_WeCanExploitMonsAroundWorld, MSGBOX_NPC end -SaffronCity_EventScript_1673B9:: @ 81673B9 +SaffronCity_EventScript_DoorGuardGrunt:: @ 81673B9 lock - goto_if_set FLAG_RESCUED_MR_FUJI, EventScript_1673D7 + goto_if_set FLAG_RESCUED_MR_FUJI, SaffronCity_EventScript_DoorGuardAsleep applymovement 6, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_81812CA + msgbox SaffronCity_Text_ImASecurityGuard release end -EventScript_1673D7:: @ 81673D7 +SaffronCity_EventScript_DoorGuardAsleep:: @ 81673D7 textcolor 3 - msgbox gUnknown_8181302 + msgbox SaffronCity_Text_HesTakingASnooze release end -SaffronCity_EventScript_1673E3:: @ 81673E3 - msgbox gUnknown_8181159, MSGBOX_NPC +SaffronCity_EventScript_WorkerM:: @ 81673E3 + msgbox SaffronCity_Text_YouBeatTeamRocket, MSGBOX_NPC end -SaffronCity_EventScript_1673EC:: @ 81673EC - msgbox gUnknown_8181189, MSGBOX_NPC +SaffronCity_EventScript_Youngster:: @ 81673EC + msgbox SaffronCity_Text_SafeToGoOutAgain, MSGBOX_NPC end -SaffronCity_EventScript_1673F5:: @ 81673F5 - msgbox gUnknown_81811BF, MSGBOX_NPC +SaffronCity_EventScript_Lass:: @ 81673F5 + msgbox SaffronCity_Text_PeopleComingBackToSaffron, MSGBOX_NPC end -SaffronCity_EventScript_1673FE:: @ 81673FE - msgbox gUnknown_8181225, MSGBOX_NPC +SaffronCity_EventScript_Boy:: @ 81673FE + msgbox SaffronCity_Text_FlewHereOnPidgeot, MSGBOX_NPC end -SaffronCity_EventScript_167407:: @ 8167407 +SaffronCity_EventScript_Pidgeot:: @ 8167407 lock faceplayer waitse playmoncry SPECIES_PIDGEOT, 0 - msgbox gUnknown_8181286 + msgbox SaffronCity_Text_Pidgeot waitmoncry release end -SaffronCity_EventScript_16741A:: @ 816741A - msgbox gUnknown_8181299, MSGBOX_NPC +SaffronCity_EventScript_Man:: @ 816741A + msgbox SaffronCity_Text_SawRocketBossEscaping, MSGBOX_NPC end -SaffronCity_EventScript_167423:: @ 8167423 - msgbox gUnknown_8181326, MSGBOX_SIGN +SaffronCity_EventScript_CitySign:: @ 8167423 + msgbox SaffronCity_Text_CitySign, MSGBOX_SIGN end -SaffronCity_EventScript_16742C:: @ 816742C - msgbox gUnknown_8181354, MSGBOX_SIGN +SaffronCity_EventScript_DojoSign:: @ 816742C + msgbox SaffronCity_Text_FightingDojo, MSGBOX_SIGN end -SaffronCity_EventScript_167435:: @ 8167435 +SaffronCity_EventScript_GymSign:: @ 8167435 lockall famechecker FAMECHECKER_SABRINA, 0 - msgbox gUnknown_8181362 + msgbox SaffronCity_Text_GymSign releaseall end -SaffronCity_EventScript_16744D:: @ 816744D - msgbox gUnknown_81813AA, MSGBOX_SIGN +SaffronCity_EventScript_TrainerTips1:: @ 816744D + msgbox SaffronCity_Text_FullHealCuresStatus, MSGBOX_SIGN end -SaffronCity_EventScript_167456:: @ 8167456 - msgbox gUnknown_8181452, MSGBOX_SIGN +SaffronCity_EventScript_TrainerTips2:: @ 8167456 + msgbox SaffronCity_Text_GreatBallImprovedCatchRate, MSGBOX_SIGN end -SaffronCity_EventScript_16745F:: @ 816745F - msgbox gUnknown_81814B9, MSGBOX_SIGN +SaffronCity_EventScript_SilphCoSign:: @ 816745F + msgbox SaffronCity_Text_SilphCoSign, MSGBOX_SIGN end -SaffronCity_EventScript_167468:: @ 8167468 - msgbox gUnknown_81814D3, MSGBOX_SIGN +SaffronCity_EventScript_MrPsychicsHouseSign:: @ 8167468 + msgbox SaffronCity_Text_MrPsychicsHouse, MSGBOX_SIGN end -SaffronCity_EventScript_167471:: @ 8167471 - msgbox gUnknown_81814E7, MSGBOX_SIGN +SaffronCity_EventScript_SilphProductSign:: @ 8167471 + msgbox SaffronCity_Text_SilphsLatestProduct, MSGBOX_SIGN end -SaffronCity_EventScript_16747A:: @ 816747A - msgbox gUnknown_8181519, MSGBOX_SIGN +SaffronCity_EventScript_TrainerFanClubSign:: @ 816747A + msgbox SaffronCity_Text_TrainerFanClubSign, MSGBOX_SIGN end diff --git a/data/maps/SaffronCity/text.inc b/data/maps/SaffronCity/text.inc index aaa009647..d3044d14b 100644 --- a/data/maps/SaffronCity/text.inc +++ b/data/maps/SaffronCity/text.inc @@ -1,80 +1,80 @@ -gUnknown_8181003:: @ 8181003 +SaffronCity_Text_WhatDoYouWantGetLost:: @ 8181003 .string "What do you want?\n" .string "Get lost!$" -gUnknown_818101F:: @ 818101F +SaffronCity_Text_BossTakeTownForTeamRocket:: @ 818101F .string "BOSS said he'll take this town\n" .string "in the name of TEAM ROCKET!$" -gUnknown_818105A:: @ 818105A +SaffronCity_Text_DontGetDefiantOrIllHurtYou:: @ 818105A .string "Don't get defiant!\n" .string "Or I'll have to hurt you!$" -gUnknown_8181087:: @ 8181087 +SaffronCity_Text_SaffronBelongsToTeamRocket:: @ 8181087 .string "SAFFRON belongs to TEAM ROCKET!$" -gUnknown_81810A7:: @ 81810A7 +SaffronCity_Text_CriminalLifeMakesMeFeelAlive:: @ 81810A7 .string "My life as a criminal makes me feel\n" .string "so alive!$" -gUnknown_81810D5:: @ 81810D5 +SaffronCity_Text_WatchWhereYoureWalking:: @ 81810D5 .string "Ow!\n" .string "Watch where you're walking!$" -gUnknown_81810F5:: @ 81810F5 +SaffronCity_Text_WeCanExploitMonsAroundWorld:: @ 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 +SaffronCity_Text_YouBeatTeamRocket:: @ 8181159 .string "You beat TEAM ROCKET all alone?\n" .string "That's amazing!$" -gUnknown_8181189:: @ 8181189 +SaffronCity_Text_SafeToGoOutAgain:: @ 8181189 .string "Yeah! TEAM ROCKET is gone!\n" .string "It's safe to go out again!$" -gUnknown_81811BF:: @ 81811BF +SaffronCity_Text_PeopleComingBackToSaffron:: @ 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 +SaffronCity_Text_FlewHereOnPidgeot:: @ 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 +SaffronCity_Text_Pidgeot:: @ 8181286 .string "PIDGEOT: Bi bibii!$" -gUnknown_8181299:: @ 8181299 +SaffronCity_Text_SawRocketBossEscaping:: @ 8181299 .string "I saw the ROCKET BOSS escaping\n" .string "SILPH's building.$" -gUnknown_81812CA:: @ 81812CA +SaffronCity_Text_ImASecurityGuard:: @ 81812CA .string "I'm a security guard.\p" .string "Suspicious kids I don't allow in!$" -gUnknown_8181302:: @ 8181302 +SaffronCity_Text_HesTakingASnooze:: @ 8181302 .string "…\n" .string "Snore…\p" .string "Hah! He's taking a snooze!$" -gUnknown_8181326:: @ 8181326 +SaffronCity_Text_CitySign:: @ 8181326 .string "SAFFRON CITY\n" .string "Shining, Golden Land of Commerce$" -gUnknown_8181354:: @ 8181354 +SaffronCity_Text_FightingDojo:: @ 8181354 .string "FIGHTING DOJO$" -gUnknown_8181362:: @ 8181362 +SaffronCity_Text_GymSign:: @ 8181362 .string "SAFFRON CITY POKéMON GYM\n" .string "LEADER: SABRINA\l" .string "The Master of PSYCHIC POKéMON!$" -gUnknown_81813AA:: @ 81813AA +SaffronCity_Text_FullHealCuresStatus:: @ 81813AA .string "TRAINER TIPS\p" .string "FULL HEAL cures all ailments like\n" .string "burns, paralysis, poisoning,\l" @@ -82,25 +82,34 @@ gUnknown_81813AA:: @ 81813AA .string "It costs a bit more, but it's more\n" .string "convenient than buying other items.$" -gUnknown_8181452:: @ 8181452 +SaffronCity_Text_GreatBallImprovedCatchRate:: @ 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 +SaffronCity_Text_SilphCoSign:: @ 81814B9 .string "SILPH CO. OFFICE BUILDING$" -gUnknown_81814D3:: @ 81814D3 +SaffronCity_Text_MrPsychicsHouse:: @ 81814D3 .string "MR. PSYCHIC'S HOUSE$" -gUnknown_81814E7:: @ 81814E7 +SaffronCity_Text_SilphsLatestProduct:: @ 81814E7 .string "SILPH's latest product!\n" .string "Release to be determined…$" -gUnknown_8181519:: @ 8181519 +SaffronCity_Text_TrainerFanClubSign:: @ 8181519 .string "POKéMON TRAINER FAN CLUB\p" .string "Many TRAINERS have scribbled their\n" .string "names on this sign.$" +SaffronCity_Text_HowCanClubNotRecognizeLance:: @ 8181569 + .string "This FAN CLUB…\n" + .string "No one here has a clue!\p" + .string "How could they not recognize\n" + .string "the brilliance that is LANCE?\p" + .string "He stands for justice!\n" + .string "He's cool, and yet passionate!\l" + .string "He's the greatest, LANCE!$" + diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/map.json b/data/maps/SaffronCity_CopycatsHouse_1F/map.json new file mode 100644 index 000000000..bb33e6ea3 --- /dev/null +++ b/data/maps/SaffronCity_CopycatsHouse_1F/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F", + "name": "SaffronCity_CopycatsHouse_1F", + "layout": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_1F", + "music": "MUS_NIBI", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_CopycatsHouse_1F_EventScript_CopycatsDad", + "flag": "0" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", + "x": 3, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_CopycatsHouse_1F_EventScript_CopycatsMom", + "flag": "0" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_CHANSEY", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_CopycatsHouse_1F_EventScript_Chansey", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY", + "dest_warp_id": 1 + }, + { + "x": 10, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc b/data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc new file mode 100644 index 000000000..e6f779e15 --- /dev/null +++ b/data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc @@ -0,0 +1,20 @@ +SaffronCity_CopycatsHouse_1F_MapScripts:: @ 816EB36 + .byte 0 + +SaffronCity_CopycatsHouse_1F_EventScript_CopycatsMom:: @ 816EB37 + msgbox SaffronCity_CopycatsHouse_1F_Text_DaughterIsSelfCentered, MSGBOX_NPC + end + +SaffronCity_CopycatsHouse_1F_EventScript_CopycatsDad:: @ 816EB40 + msgbox SaffronCity_CopycatsHouse_1F_Text_DaughterLikesToMimicPeople, MSGBOX_NPC + end + +SaffronCity_CopycatsHouse_1F_EventScript_Chansey:: @ 816EB49 + lock + faceplayer + waitse + playmoncry SPECIES_CHANSEY, 0 + msgbox SaffronCity_CopycatsHouse_1F_Text_Chansey + waitmoncry + release + end diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/text.inc b/data/maps/SaffronCity_CopycatsHouse_1F/text.inc new file mode 100644 index 000000000..d7efe0281 --- /dev/null +++ b/data/maps/SaffronCity_CopycatsHouse_1F/text.inc @@ -0,0 +1,13 @@ +SaffronCity_CopycatsHouse_1F_Text_DaughterIsSelfCentered:: @ 819AB9B + .string "My daughter is so self-centered.\n" + .string "She has but a few friends.$" + +SaffronCity_CopycatsHouse_1F_Text_DaughterLikesToMimicPeople:: @ 819ABD7 + .string "My daughter likes to mimic people.\n" + .string "It's rather vexing.\p" + .string "Her mimicry has earned her the\n" + .string "nickname COPYCAT around here.$" + +SaffronCity_CopycatsHouse_1F_Text_Chansey:: @ 819AC4B + .string "CHANSEY: Chaan! Sii!$" + diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/map.json b/data/maps/SaffronCity_CopycatsHouse_2F/map.json new file mode 100644 index 000000000..ab920aa73 --- /dev/null +++ b/data/maps/SaffronCity_CopycatsHouse_2F/map.json @@ -0,0 +1,105 @@ +{ + "id": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_2F", + "name": "SaffronCity_CopycatsHouse_2F", + "layout": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_2F", + "music": "MUS_NIBI", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_DODUO", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_CopycatsHouse_2F_EventScript_Doduo", + "flag": "0" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_PIKACHU", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_CopycatsHouse_2F_EventScript_Doll", + "flag": "0" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_JIGGLYPUFF", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_CopycatsHouse_2F_EventScript_Doll", + "flag": "0" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_CopycatsHouse_2F_EventScript_Copycat", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 10, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 1, + "y": 1, + "elevation": 0, + "script": "SaffronCity_CopycatsHouse_2F_EventScript_Computer" + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 5, + "elevation": 0, + "script": "SaffronCity_CopycatsHouse_2F_EventScript_Game" + }, + { + "type": "hidden_item", + "x": 2, + "y": 1, + "elevation": 0, + "item": "ITEM_NUGGET", + "flag": "HIDDEN_ITEM_SAFFRON_CITY_COPYCATS_HOUSE_2F_NUGGET", + "quantity": 1, + "underfoot": false + } + ] +} diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc b/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc new file mode 100644 index 000000000..a8e74c94b --- /dev/null +++ b/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc @@ -0,0 +1,50 @@ +SaffronCity_CopycatsHouse_2F_MapScripts:: @ 816EB5C + .byte 0 + +SaffronCity_CopycatsHouse_2F_EventScript_Doduo:: @ 816EB5D + lock + faceplayer + waitse + playmoncry SPECIES_DODUO, 0 + msgbox SaffronCity_CopycatsHouse_2F_Text_Doduo + waitmoncry + release + end + +SaffronCity_CopycatsHouse_2F_EventScript_Doll:: @ 816EB70 + lock + msgbox SaffronCity_CopycatsHouse_2F_Text_RareMonOnlyDoll + release + end + +SaffronCity_CopycatsHouse_2F_EventScript_Copycat:: @ 816EB7B + goto_if_questlog EventScript_ReleaseEnd + special sub_8112364 + lock + faceplayer + checkitem ITEM_POKE_DOLL, 1 + compare VAR_RESULT, TRUE + goto_if_eq EventScript_MimicTutor + checkplayergender + compare VAR_RESULT, MALE + call_if_eq SaffronCity_CopycatsHouse_2F_EventScript_MimicPlayerMale + compare VAR_RESULT, FEMALE + call_if_eq SaffronCity_CopycatsHouse_2F_EventScript_MimicPlayerFemale + release + end + +SaffronCity_CopycatsHouse_2F_EventScript_MimicPlayerMale:: @ 816EBB7 + msgbox SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyMale + return + +SaffronCity_CopycatsHouse_2F_EventScript_MimicPlayerFemale:: @ 816EBC0 + msgbox SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyFemale + return + +SaffronCity_CopycatsHouse_2F_EventScript_Computer:: @ 816EBC9 + msgbox SaffronCity_CopycatsHouse_2F_Text_MySecrets, MSGBOX_SIGN + end + +SaffronCity_CopycatsHouse_2F_EventScript_Game:: @ 816EBD2 + msgbox SaffronCity_CopycatsHouse_2F_Text_MarioWearingABucket, MSGBOX_SIGN + end diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/text.inc b/data/maps/SaffronCity_CopycatsHouse_2F/text.inc new file mode 100644 index 000000000..978b660f5 --- /dev/null +++ b/data/maps/SaffronCity_CopycatsHouse_2F/text.inc @@ -0,0 +1,102 @@ +SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyMale:: @ 819AC60 + .string "{PLAYER}: Hi!\n" + .string "Do you like POKéMON?\p" + .string "{PLAYER}: Uh, no, I just asked you.\p" + .string "{PLAYER}: Huh?\n" + .string "You're strange!\p" + .string "COPYCAT: Hmm? Quit mimicking?\n" + .string "But, that's my favorite hobby!$" + +SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyFemale:: @ 819ACF1 + .string "{PLAYER}: Hi.\n" + .string "You must like POKéMON.\p" + .string "{PLAYER}: No, not me.\n" + .string "I asked you.\p" + .string "{PLAYER}: Pardon?\n" + .string "You're weird!\l" + .string " \l" + .string "COPYCAT: Hmm? Quit mimicking?\l" + .string "But that's my favorite hobby!$" + +Text_MimicTeach:: @ 819AD85 + .string "Oh wow!\n" + .string "A POKé DOLL!\p" + .string "For me?\n" + .string "Thank you!\p" + .string "You know what?\n" + .string "I can teach the move MIMIC.$" + +Text_MimicDeclined:: @ 819ADD8 + .string "Don't you like MIMIC?$" + +Text_MimicWhichMon:: @ 819ADEE + .string "I really love MIMIC!\n" + .string "Who's going to learn it?$" + +Text_MimicTaughtMale:: @ 819AE1C + .string "{PLAYER}: Hi!\n" + .string "Thanks for earlier!\p" + .string "{PLAYER}: Pardon?\p" + .string "{PLAYER}: Is it that fun to mimic my\n" + .string "every move?\p" + .string "COPYCAT: You bet!\n" + .string "It's a scream!$" + +Text_MimicTaughtFemale:: @ 819AE90 + .string "{PLAYER}: Hi!\n" + .string "Thanks for what you did for us.\p" + .string "{PLAYER}: Pardon?\p" + .string "{PLAYER}: Is it really that fun to\n" + .string "copy what I say and do?\p" + .string "COPYCAT: You bet!\n" + .string "It's a scream!$" + +SaffronCity_CopycatsHouse_2F_Text_TooMuchInBag:: @ 819AF1A + .string "にもつが　いっぱいね！$" + +SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyMaleJP:: @ 819AF26 + .string "{PLAYER}“やあ！　こんにちは！\n" + .string "きみ　ポケモン　すきかい？\p" + .string "{PLAYER}“ぼく　じゃなくって\n" + .string "きみに　きいてるんだ　けど\p" + .string "{PLAYER}“‥‥　えー　なんだよ！\n" + .string "ヘンな　やつ　だなあ！\p" + .string "モノマネむすめ“‥‥　なに？\n" + .string "ひとの　マネ　すんなって？\p" + .string "だって　あたし　\n" + .string "ものまね　しゅみ　なんだ　もん！”$" + +SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyFemaleJP:: @ 819AFB0 + .string "{PLAYER}“こんにちは！\n" + .string "ポケモン　すきなのね？\p" + .string "{PLAYER}“わたし　じゃなくって\n" + .string "あなたに　きいてるんだ　けど\p" + .string "{PLAYER}“‥　えー　なんなの！\n" + .string "おかしなこ　ねー！\p" + .string "モノマネむすめ“‥　なに？\n" + .string "ひとの　マネ　すんなって？\p" + .string "だって　あたし\n" + .string "ものまね　しゅみ　なんだ　もん！$" + +SaffronCity_CopycatsHouse_2F_Text_Doduo:: @ 819B030 + .string "DODUO: Giiih!\p" + .string "PRETTY MIRROR LOOK AT ME,\n" + .string "SEE HOW PRETTY I CAN BE?$" + +SaffronCity_CopycatsHouse_2F_Text_RareMonOnlyDoll:: @ 819B071 + .string "This is a rare POKéMON!\n" + .string "Huh? It's only a doll!$" + +SaffronCity_CopycatsHouse_2F_Text_MarioWearingABucket:: @ 819B0A0 + .string "A game with MARIO wearing a bucket\n" + .string "on his head!$" + +SaffronCity_CopycatsHouse_2F_Text_MySecrets:: @ 819B0D0 + .string "…\p" + .string "My Secrets!\p" + .string "Skill: Mimicry!\n" + .string "Hobby: Collecting dolls!\l" + .string "Favorite POKéMON: CLEFAIRY!$" + +SaffronCity_CopycatsHouse_2F_Text_HuhCantSee:: @ 819B123 + .string "？　みえないぞ‥$" diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index d6e1d9d4d..699ead653 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 7, - "script": "SaffronCity_Dojo_EventScript_16ED46", + "script": "SaffronCity_Dojo_EventScript_Hitoshi", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 7, - "script": "SaffronCity_Dojo_EventScript_16ED5D", + "script": "SaffronCity_Dojo_EventScript_Hideki", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 7, - "script": "SaffronCity_Dojo_EventScript_16ED74", + "script": "SaffronCity_Dojo_EventScript_Aaron", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 7, - "script": "SaffronCity_Dojo_EventScript_16ED8B", + "script": "SaffronCity_Dojo_EventScript_Mike", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SaffronCity_Dojo_EventScript_16EDA2", + "script": "SaffronCity_Dojo_EventScript_MasterKoichi", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Dojo_EventScript_16EC00", + "script": "SaffronCity_Dojo_EventScript_HitmonleeBall", "flag": "FLAG_HIDE_DOJO_HITMONLEE_BALL" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Dojo_EventScript_16EC46", + "script": "SaffronCity_Dojo_EventScript_HitmonchanBall", "flag": "FLAG_HIDE_DOJO_HITMONCHAN_BALL" } ], @@ -136,7 +136,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_SAFFRON_CITY_DOJO", "var_value": 0, - "script": "SaffronCity_Dojo_EventScript_16EBDC" + "script": "SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft" }, { "type": "trigger", @@ -145,7 +145,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_SAFFRON_CITY_DOJO", "var_value": 0, - "script": "SaffronCity_Dojo_EventScript_16EBEE" + "script": "SaffronCity_Dojo_EventScript_TriggerMasterBattleRight" } ], "bg_events": [ @@ -154,28 +154,28 @@ "x": 3, "y": 13, "elevation": 0, - "script": "SaffronCity_Dojo_EventScript_16ED2B" + "script": "SaffronCity_Dojo_EventScript_Statue" }, { "type": "bg_event_type_0", "x": 9, "y": 13, "elevation": 0, - "script": "SaffronCity_Dojo_EventScript_16ED2B" + "script": "SaffronCity_Dojo_EventScript_Statue" }, { "type": "bg_event_type_0", "x": 5, "y": 2, "elevation": 0, - "script": "SaffronCity_Dojo_EventScript_16ED34" + "script": "SaffronCity_Dojo_EventScript_LeftScroll" }, { "type": "bg_event_type_0", "x": 7, "y": 2, "elevation": 0, - "script": "SaffronCity_Dojo_EventScript_16ED3D" + "script": "SaffronCity_Dojo_EventScript_RightScroll" } ] } diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index d5c3e6603..88e53d64c 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -1,157 +1,159 @@ +.equ LOCALID_KARATE_MASTER, 5 + SaffronCity_Dojo_MapScripts:: @ 816EBDB .byte 0 -SaffronCity_Dojo_EventScript_16EBDC:: @ 816EBDC +SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft:: @ 816EBDC lockall setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 - applymovement 5, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestLeft waitmovement 0 releaseall end -SaffronCity_Dojo_EventScript_16EBEE:: @ 816EBEE +SaffronCity_Dojo_EventScript_TriggerMasterBattleRight:: @ 816EBEE lockall setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 - applymovement 5, Movement_WalkInPlaceFastestRight + applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestRight waitmovement 0 releaseall end -SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 +SaffronCity_Dojo_EventScript_HitmonleeBall:: @ 816EC00 lock faceplayer - goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EC3C + goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_AlreadyGotHitmon drawmonpic SPECIES_HITMONLEE, 10, 3 setvar VAR_TEMP_1, SPECIES_HITMONLEE - applymovement 5, Movement_WalkInPlaceFastestUp + applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestUp waitmovement 0 textcolor 0 - msgbox gUnknown_819B44E, MSGBOX_YESNO + msgbox SaffronCity_Dojo_Text_YouWantHitmonlee, MSGBOX_YESNO call EventScript_1A6675 compare VAR_RESULT, YES - goto_if_eq EventScript_16EC82 + goto_if_eq SaffronCity_Dojo_EventScript_GiveHitmon erasemonpic release end -EventScript_16EC3C:: @ 816EC3C - msgbox gUnknown_819B4E1 +SaffronCity_Dojo_EventScript_AlreadyGotHitmon:: @ 816EC3C + msgbox SaffronCity_Dojo_Text_BetterNotGetGreedy release end -SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 +SaffronCity_Dojo_EventScript_HitmonchanBall:: @ 816EC46 lock faceplayer - goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EC3C + goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_AlreadyGotHitmon drawmonpic SPECIES_HITMONCHAN, 10, 3 setvar VAR_TEMP_1, SPECIES_HITMONCHAN - applymovement 5, Movement_WalkInPlaceFastestUp + applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestUp waitmovement 0 textcolor 0 - msgbox gUnknown_819B49E, MSGBOX_YESNO + msgbox SaffronCity_Dojo_Text_YouWantHitmonchan, MSGBOX_YESNO call EventScript_1A6675 compare VAR_RESULT, YES - goto_if_eq EventScript_16EC82 + goto_if_eq SaffronCity_Dojo_EventScript_GiveHitmon erasemonpic release end -EventScript_16EC82:: @ 816EC82 +SaffronCity_Dojo_EventScript_GiveHitmon:: @ 816EC82 erasemonpic givemon VAR_TEMP_1, 25, ITEM_NONE compare VAR_RESULT, 0 - goto_if_eq EventScript_16ECB5 + goto_if_eq SaffronCity_Dojo_EventScript_ReceivedHitmonParty compare VAR_RESULT, 1 - goto_if_eq EventScript_16ECEC + goto_if_eq SaffronCity_Dojo_EventScript_ReceivedHitmonPC compare VAR_RESULT, 2 goto_if_eq EventScript_NoMoreRoomForPokemon release end -EventScript_16ECB5:: @ 816ECB5 +SaffronCity_Dojo_EventScript_ReceivedHitmonParty:: @ 816ECB5 removeobject VAR_LAST_TALKED getspeciesname 0, VAR_TEMP_1 playfanfare MUS_FANFA1 - message Text_19B473 + message SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster waitmessage waitfanfare setflag FLAG_GOT_HITMON_FROM_DOJO msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16ED29 + goto_if_eq SaffronCity_Dojo_EventScript_EndGiveMon call EventScript_GetGiftMonPartySlot call EventScript_ChangePokemonNickname - goto EventScript_16ED29 + goto SaffronCity_Dojo_EventScript_EndGiveMon end -EventScript_16ECEC:: @ 816ECEC +SaffronCity_Dojo_EventScript_ReceivedHitmonPC:: @ 816ECEC removeobject VAR_LAST_TALKED getspeciesname 0, VAR_TEMP_1 playfanfare MUS_FANFA1 - message Text_19B473 + message SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster waitmessage waitfanfare setflag FLAG_GOT_HITMON_FROM_DOJO msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16ED1E + goto_if_eq SaffronCity_Dojo_EventScript_TransferredHitmonToPC call EventScript_NameReceivedBoxMon - goto EventScript_16ED1E + goto SaffronCity_Dojo_EventScript_TransferredHitmonToPC end -EventScript_16ED1E:: @ 816ED1E +SaffronCity_Dojo_EventScript_TransferredHitmonToPC:: @ 816ED1E call EventScript_TransferredToPC - goto EventScript_16ED29 + goto SaffronCity_Dojo_EventScript_EndGiveMon end -EventScript_16ED29:: @ 816ED29 +SaffronCity_Dojo_EventScript_EndGiveMon:: @ 816ED29 release end -SaffronCity_Dojo_EventScript_16ED2B:: @ 816ED2B - msgbox gUnknown_819B52E, MSGBOX_SIGN +SaffronCity_Dojo_EventScript_Statue:: @ 816ED2B + msgbox SaffronCity_Dojo_Text_FightingDojo, MSGBOX_SIGN end -SaffronCity_Dojo_EventScript_16ED34:: @ 816ED34 - msgbox gUnknown_819B4F8, MSGBOX_SIGN +SaffronCity_Dojo_EventScript_LeftScroll:: @ 816ED34 + msgbox SaffronCity_Dojo_Text_EnemiesOnEverySide, MSGBOX_SIGN end -SaffronCity_Dojo_EventScript_16ED3D:: @ 816ED3D - msgbox gUnknown_819B50F, MSGBOX_SIGN +SaffronCity_Dojo_EventScript_RightScroll:: @ 816ED3D + msgbox SaffronCity_Dojo_Text_GoesAroundComesAround, MSGBOX_SIGN end -SaffronCity_Dojo_EventScript_16ED46:: @ 816ED46 - trainerbattle_single TRAINER_BLACK_BELT_HITOSHI, Text_19B3DF, Text_19B40F - msgbox gUnknown_819B41F, MSGBOX_AUTOCLOSE +SaffronCity_Dojo_EventScript_Hitoshi:: @ 816ED46 + trainerbattle_single TRAINER_BLACK_BELT_HITOSHI, SaffronCity_Dojo_Text_HitoshiIntro, SaffronCity_Dojo_Text_HitoshiDefeat + msgbox SaffronCity_Dojo_Text_HitoshiPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Dojo_EventScript_16ED5D:: @ 816ED5D - trainerbattle_single TRAINER_BLACK_BELT_HIDEKI, Text_19B2E0, Text_19B2FD - msgbox gUnknown_819B30F, MSGBOX_AUTOCLOSE +SaffronCity_Dojo_EventScript_Hideki:: @ 816ED5D + trainerbattle_single TRAINER_BLACK_BELT_HIDEKI, SaffronCity_Dojo_Text_HidekiIntro, SaffronCity_Dojo_Text_HidekiDefeat + msgbox SaffronCity_Dojo_Text_HidekiPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Dojo_EventScript_16ED74:: @ 816ED74 - trainerbattle_single TRAINER_BLACK_BELT_AARON, Text_19B341, Text_19B396 - msgbox gUnknown_819B3AC, MSGBOX_AUTOCLOSE +SaffronCity_Dojo_EventScript_Aaron:: @ 816ED74 + trainerbattle_single TRAINER_BLACK_BELT_AARON, SaffronCity_Dojo_Text_AaronIntro, SaffronCity_Dojo_Text_AaronDefeat + msgbox SaffronCity_Dojo_Text_AaronPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Dojo_EventScript_16ED8B:: @ 816ED8B - trainerbattle_single TRAINER_BLACK_BELT_MIKE, Text_19B275, Text_19B292 - msgbox gUnknown_819B29D, MSGBOX_AUTOCLOSE +SaffronCity_Dojo_EventScript_Mike:: @ 816ED8B + trainerbattle_single TRAINER_BLACK_BELT_MIKE, SaffronCity_Dojo_Text_MikeIntro, SaffronCity_Dojo_Text_MikeDefeat + msgbox SaffronCity_Dojo_Text_MikePostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Dojo_EventScript_16EDA2:: @ 816EDA2 - trainerbattle_single TRAINER_BLACK_BELT_KOICHI, Text_19B12C, Text_19B193, EventScript_16EDD0 - goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EDC6 - msgbox gUnknown_819B1A7, MSGBOX_AUTOCLOSE +SaffronCity_Dojo_EventScript_MasterKoichi:: @ 816EDA2 + trainerbattle_single TRAINER_BLACK_BELT_KOICHI, SaffronCity_Dojo_Text_MasterKoichiIntro, SaffronCity_Dojo_Text_MasterKoichiDefeat, SaffronCity_Dojo_EventScript_DefeatedMasterKoichi + goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_MasterKoichiAlreadyGotHitmon + msgbox SaffronCity_Dojo_Text_ChoosePrizedFightingMon, MSGBOX_AUTOCLOSE end -EventScript_16EDC6:: @ 816EDC6 - msgbox gUnknown_819B24C +SaffronCity_Dojo_EventScript_MasterKoichiAlreadyGotHitmon:: @ 816EDC6 + msgbox SaffronCity_Dojo_Text_StayAndTrainWithUs release end -EventScript_16EDD0:: @ 816EDD0 +SaffronCity_Dojo_EventScript_DefeatedMasterKoichi:: @ 816EDD0 setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 release end diff --git a/data/maps/SaffronCity_Dojo/text.inc b/data/maps/SaffronCity_Dojo/text.inc index d85b5a843..9c73ffcb9 100644 --- a/data/maps/SaffronCity_Dojo/text.inc +++ b/data/maps/SaffronCity_Dojo/text.inc @@ -1,7 +1,4 @@ -Text_19B123:: @ 819B123 - .string "？　みえないぞ‥$" - -Text_19B12C:: @ 819B12C +SaffronCity_Dojo_Text_MasterKoichiIntro:: @ 819B12C .string "Grunt!\p" .string "I am the KARATE MASTER!\n" .string "I am the LEADER here!\p" @@ -9,11 +6,11 @@ Text_19B12C:: @ 819B12C .string "Expect no mercy!\p" .string "Fwaaa!$" -Text_19B193:: @ 819B193 +SaffronCity_Dojo_Text_MasterKoichiDefeat:: @ 819B193 .string "Hwa!\n" .string "Arrgh! Beaten!$" -gUnknown_819B1A7:: @ 819B1A7 +SaffronCity_Dojo_Text_ChoosePrizedFightingMon:: @ 819B1A7 .string "Indeed, I have lost!\p" .string "But, I beseech you, do not take\n" .string "our emblem as your trophy!\p" @@ -21,85 +18,85 @@ gUnknown_819B1A7:: @ 819B1A7 .string "FIGHTING POKéMON!\p" .string "Choose whichever one you like!$" -gUnknown_819B24C:: @ 819B24C +SaffronCity_Dojo_Text_StayAndTrainWithUs:: @ 819B24C .string "Grunt!\n" .string "Stay and train at karate with us!$" -Text_19B275:: @ 819B275 +SaffronCity_Dojo_Text_MikeIntro:: @ 819B275 .string "Hoargh!\n" .string "Take your shoes off!$" -Text_19B292:: @ 819B292 +SaffronCity_Dojo_Text_MikeDefeat:: @ 819B292 .string "I give up!$" -gUnknown_819B29D:: @ 819B29D +SaffronCity_Dojo_Text_MikePostBattle:: @ 819B29D .string "You wait 'til you see our MASTER!\n" .string "I'm a small fry compared to him!$" -Text_19B2E0:: @ 819B2E0 +SaffronCity_Dojo_Text_HidekiIntro:: @ 819B2E0 .string "I hear you're good!\n" .string "Show me!$" -Text_19B2FD:: @ 819B2FD +SaffronCity_Dojo_Text_HidekiDefeat:: @ 819B2FD .string "Judge!\n" .string "One point!$" -gUnknown_819B30F:: @ 819B30F +SaffronCity_Dojo_Text_HidekiPostBattle:: @ 819B30F .string "Our MASTER is a pro fighter.\n" .string "Be prepared to lose!$" -Text_19B341:: @ 819B341 +SaffronCity_Dojo_Text_AaronIntro:: @ 819B341 .string "Hiyah!\n" .string "I have no fear for anything tough!\p" .string "I shatter boulders for training\n" .string "every day!$" -Text_19B396:: @ 819B396 +SaffronCity_Dojo_Text_AaronDefeat:: @ 819B396 .string "Yow!\n" .string "Stubbed fingers!$" -gUnknown_819B3AC:: @ 819B3AC +SaffronCity_Dojo_Text_AaronPostBattle:: @ 819B3AC .string "The only thing that frightens us is\n" .string "psychic power!$" -Text_19B3DF:: @ 819B3DF +SaffronCity_Dojo_Text_HitoshiIntro:: @ 819B3DF .string "Hwaah!\p" .string "You're trespassing in our\n" .string "FIGHTING DOJO!$" -Text_19B40F:: @ 819B40F +SaffronCity_Dojo_Text_HitoshiDefeat:: @ 819B40F .string "Oof!\n" .string "I give up!$" -gUnknown_819B41F:: @ 819B41F +SaffronCity_Dojo_Text_HitoshiPostBattle:: @ 819B41F .string "The prime fighters across the land\n" .string "train here.$" -gUnknown_819B44E:: @ 819B44E +SaffronCity_Dojo_Text_YouWantHitmonlee:: @ 819B44E .string "You want the hard-kicking\n" .string "HITMONLEE?$" -Text_19B473:: @ 819B473 +SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster:: @ 819B473 .string "{PLAYER} received the {STR_VAR_1}\n" .string "from the KARATE MASTER.$" -gUnknown_819B49E:: @ 819B49E +SaffronCity_Dojo_Text_YouWantHitmonchan:: @ 819B49E .string "You want the piston-punching\n" .string "HITMONCHAN?$" -Text_19B4C7:: @ 819B4C7 +SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster2:: @ 819B4C7 .string "{PLAYER}は　カラテ　だいおう　から\n" .string "{STR_VAR_1}を　もらった！$" -gUnknown_819B4E1:: @ 819B4E1 +SaffronCity_Dojo_Text_BetterNotGetGreedy:: @ 819B4E1 .string "Better not get greedy…$" -gUnknown_819B4F8:: @ 819B4F8 +SaffronCity_Dojo_Text_EnemiesOnEverySide:: @ 819B4F8 .string "Enemies on every side!$" -gUnknown_819B50F:: @ 819B50F +SaffronCity_Dojo_Text_GoesAroundComesAround:: @ 819B50F .string "What goes around comes around.$" -gUnknown_819B52E:: @ 819B52E +SaffronCity_Dojo_Text_FightingDojo:: @ 819B52E .string "FIGHTING DOJO$" diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json index cfbf00b36..0ebd439e5 100644 --- a/data/maps/SaffronCity_Gym/map.json +++ b/data/maps/SaffronCity_Gym/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SaffronCity_Gym_EventScript_16EEC3", + "script": "SaffronCity_Gym_EventScript_Cameron", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SaffronCity_Gym_EventScript_16EE88", + "script": "SaffronCity_Gym_EventScript_Johan", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SaffronCity_Gym_EventScript_16EEDA", + "script": "SaffronCity_Gym_EventScript_Preston", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SaffronCity_Gym_EventScript_16EEF1", + "script": "SaffronCity_Gym_EventScript_Amanda", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SaffronCity_Gym_EventScript_16EF08", + "script": "SaffronCity_Gym_EventScript_Stacy", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SaffronCity_Gym_EventScript_16EF1F", + "script": "SaffronCity_Gym_EventScript_Tasha", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Gym_EventScript_16EDD8", + "script": "SaffronCity_Gym_EventScript_Sabrina", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SaffronCity_Gym_EventScript_16EE9F", + "script": "SaffronCity_Gym_EventScript_Tyron", "flag": "0" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Gym_EventScript_16EF36", + "script": "SaffronCity_Gym_EventScript_GymGuy", "flag": "0" } ], @@ -371,14 +371,14 @@ "x": 12, "y": 20, "elevation": 0, - "script": "SaffronCity_Gym_EventScript_16EF55" + "script": "SaffronCity_Gym_EventScript_GymStatue" }, { "type": "bg_event_type_0", "x": 16, "y": 20, "elevation": 0, - "script": "SaffronCity_Gym_EventScript_16EF55" + "script": "SaffronCity_Gym_EventScript_GymStatue" } ] } diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc index afe863e89..8b4542fab 100644 --- a/data/maps/SaffronCity_Gym/scripts.inc +++ b/data/maps/SaffronCity_Gym/scripts.inc @@ -1,97 +1,97 @@ SaffronCity_Gym_MapScripts:: @ 816EDD7 .byte 0 -SaffronCity_Gym_EventScript_16EDD8:: @ 816EDD8 +SaffronCity_Gym_EventScript_Sabrina:: @ 816EDD8 famechecker FAMECHECKER_SABRINA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle_single TRAINER_LEADER_SABRINA, Text_19B53C, Text_19B602, EventScript_16EE0A, NO_MUSIC - goto_if_unset FLAG_GOT_TM04_FROM_SABRINA, EventScript_16EE3D - msgbox gUnknown_819B7F2 + trainerbattle_single TRAINER_LEADER_SABRINA, SaffronCity_Gym_Text_SabrinaIntro, SaffronCity_Gym_Text_SabrinaDefeat, SaffronCity_Gym_EventScript_DefeatedSabrina, NO_MUSIC + goto_if_unset FLAG_GOT_TM04_FROM_SABRINA, SaffronCity_Gym_EventScript_GiveTM04 + msgbox SaffronCity_Gym_Text_ExplainTM04 release end -EventScript_16EE0A:: @ 816EE0A +SaffronCity_Gym_EventScript_DefeatedSabrina:: @ 816EE0A famechecker FAMECHECKER_SABRINA, 2 famechecker FAMECHECKER_SABRINA, 3 clearflag FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS setflag FLAG_DEFEATED_SABRINA setflag FLAG_BADGE06_GET set_gym_trainers 6 - goto EventScript_16EE3D + goto SaffronCity_Gym_EventScript_GiveTM04 end -EventScript_16EE3D:: @ 816EE3D - msgbox gUnknown_819B6FA +SaffronCity_Gym_EventScript_GiveTM04:: @ 816EE3D + msgbox SaffronCity_Gym_Text_ExplainMarshBadgeTakeThis checkitemspace ITEM_TM04, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16EE7E - giveitem_msg gUnknown_819B7D3, ITEM_TM04 + goto_if_eq SaffronCity_Gym_EventScript_NoRoomForTM04 + giveitem_msg SaffronCity_Gym_Text_ReceivedTM04FromSabrina, ITEM_TM04 setflag FLAG_GOT_TM04_FROM_SABRINA - msgbox gUnknown_819B685 + msgbox SaffronCity_Gym_Text_SabrinaPostBattle release end -EventScript_16EE7E:: @ 816EE7E - msgbox gUnknown_819B849 +SaffronCity_Gym_EventScript_NoRoomForTM04:: @ 816EE7E + msgbox SaffronCity_Gym_Text_BagFullOfOtherItems release end -SaffronCity_Gym_EventScript_16EE88:: @ 816EE88 - trainerbattle_single TRAINER_PSYCHIC_JOHAN, Text_19B936, Text_19B957 - msgbox gUnknown_819B96D, MSGBOX_AUTOCLOSE +SaffronCity_Gym_EventScript_Johan:: @ 816EE88 + trainerbattle_single TRAINER_PSYCHIC_JOHAN, SaffronCity_Gym_Text_JohanIntro, SaffronCity_Gym_Text_JohanDefeat + msgbox SaffronCity_Gym_Text_JohanPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Gym_EventScript_16EE9F:: @ 816EE9F - trainerbattle_single TRAINER_PSYCHIC_TYRON, Text_19BA45, Text_19BA9E +SaffronCity_Gym_EventScript_Tyron:: @ 816EE9F + trainerbattle_single TRAINER_PSYCHIC_TYRON, SaffronCity_Gym_Text_TyronIntro, SaffronCity_Gym_Text_TyronDefeat famechecker FAMECHECKER_SABRINA, 5 - msgbox gUnknown_819BAB4, MSGBOX_AUTOCLOSE + msgbox SaffronCity_Gym_Text_TyronPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Gym_EventScript_16EEC3:: @ 816EEC3 - trainerbattle_single TRAINER_PSYCHIC_CAMERON, Text_19BB49, Text_19BBA1 - msgbox gUnknown_819BBB3, MSGBOX_AUTOCLOSE +SaffronCity_Gym_EventScript_Cameron:: @ 816EEC3 + trainerbattle_single TRAINER_PSYCHIC_CAMERON, SaffronCity_Gym_Text_CameronIntro, SaffronCity_Gym_Text_CameronDefeat + msgbox SaffronCity_Gym_Text_CameronPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Gym_EventScript_16EEDA:: @ 816EEDA - trainerbattle_single TRAINER_PSYCHIC_PRESTON, Text_19BC57, Text_19BCBC - msgbox gUnknown_819BCC4, MSGBOX_AUTOCLOSE +SaffronCity_Gym_EventScript_Preston:: @ 816EEDA + trainerbattle_single TRAINER_PSYCHIC_PRESTON, SaffronCity_Gym_Text_PrestonIntro, SaffronCity_Gym_Text_PrestonDefeat + msgbox SaffronCity_Gym_Text_PrestonPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Gym_EventScript_16EEF1:: @ 816EEF1 - trainerbattle_single TRAINER_CHANNELER_AMANDA, Text_19B86A, Text_19B8A8 - msgbox gUnknown_819B8B9, MSGBOX_AUTOCLOSE +SaffronCity_Gym_EventScript_Amanda:: @ 816EEF1 + trainerbattle_single TRAINER_CHANNELER_AMANDA, SaffronCity_Gym_Text_AmandaIntro, SaffronCity_Gym_Text_AmandaDefeat + msgbox SaffronCity_Gym_Text_AmandaPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Gym_EventScript_16EF08:: @ 816EF08 - trainerbattle_single TRAINER_CHANNELER_STACY, Text_19B998, Text_19B9EC - msgbox gUnknown_819B9F7, MSGBOX_AUTOCLOSE +SaffronCity_Gym_EventScript_Stacy:: @ 816EF08 + trainerbattle_single TRAINER_CHANNELER_STACY, SaffronCity_Gym_Text_StacyIntro, SaffronCity_Gym_Text_StacyDefeat + msgbox SaffronCity_Gym_Text_StacyPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Gym_EventScript_16EF1F:: @ 816EF1F - trainerbattle_single TRAINER_CHANNELER_TASHA, Text_19BAE8, Text_19BB0D - msgbox gUnknown_819BB1F, MSGBOX_AUTOCLOSE +SaffronCity_Gym_EventScript_Tasha:: @ 816EF1F + trainerbattle_single TRAINER_CHANNELER_TASHA, SaffronCity_Gym_Text_TashaIntro, SaffronCity_Gym_Text_TashaDefeat + msgbox SaffronCity_Gym_Text_TashaPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Gym_EventScript_16EF36:: @ 816EF36 +SaffronCity_Gym_EventScript_GymGuy:: @ 816EF36 lock faceplayer - goto_if_set FLAG_DEFEATED_SABRINA, EventScript_16EF4B - msgbox gUnknown_819BCF6 + goto_if_set FLAG_DEFEATED_SABRINA, SaffronCity_Gym_EventScript_GymGuyPostVictory + msgbox SaffronCity_Gym_Text_GymGuyAdvice release end -EventScript_16EF4B:: @ 816EF4B - msgbox gUnknown_819BDBB +SaffronCity_Gym_EventScript_GymGuyPostVictory:: @ 816EF4B + msgbox SaffronCity_Gym_Text_GymGuyPostVictory release end -SaffronCity_Gym_EventScript_16EF55:: @ 816EF55 +SaffronCity_Gym_EventScript_GymStatue:: @ 816EF55 lockall - goto_if_set FLAG_BADGE06_GET, EventScript_16EF69 - msgbox gUnknown_819BDFE + goto_if_set FLAG_BADGE06_GET, SaffronCity_Gym_EventScript_GymStatuePostVictory + msgbox SaffronCity_Gym_Text_GymStatue releaseall end -EventScript_16EF69:: @ 816EF69 - msgbox gUnknown_819BE37 +SaffronCity_Gym_EventScript_GymStatuePostVictory:: @ 816EF69 + msgbox SaffronCity_Gym_Text_GymStatuePlayerWon releaseall end diff --git a/data/maps/SaffronCity_Gym/text.inc b/data/maps/SaffronCity_Gym/text.inc index ed48d983f..827d4bbd5 100644 --- a/data/maps/SaffronCity_Gym/text.inc +++ b/data/maps/SaffronCity_Gym/text.inc @@ -1,4 +1,4 @@ -Text_19B53C:: @ 819B53C +SaffronCity_Gym_Text_SabrinaIntro:: @ 819B53C .string "I had a vision of your arrival.\p" .string "I have had psychic powers since\n" .string "I was a child.\p" @@ -7,7 +7,7 @@ Text_19B53C:: @ 819B53C .string "I dislike battling, but if you wish,\n" .string "I will show you my powers!{PLAY_BGM}{MUS_EXEYE}$" -Text_19B602:: @ 819B602 +SaffronCity_Gym_Text_SabrinaDefeat:: @ 819B602 .string "This loss shocks me!\n" .string "But, a loss is a loss.\p" .string "I admit, I didn't work hard enough\n" @@ -15,13 +15,13 @@ Text_19B602:: @ 819B602 .string "Your victory has earned you the\n" .string "MARSHBADGE.$" -gUnknown_819B685:: @ 819B685 +SaffronCity_Gym_Text_SabrinaPostBattle:: @ 819B685 .string "Psychic power isn't something that\n" .string "only a few people have.\p" .string "Everyone has psychic power.\n" .string "People just don't realize it.$" -gUnknown_819B6FA:: @ 819B6FA +SaffronCity_Gym_Text_ExplainMarshBadgeTakeThis:: @ 819B6FA .string "The MARSHBADGE makes POKéMON up\n" .string "to Lv. 70 obey you.\p" .string "Stronger POKéMON will become wild,\n" @@ -30,87 +30,87 @@ gUnknown_819B6FA:: @ 819B6FA .string "much to avoid that problem.\p" .string "Wait, please take this TM with you.$" -gUnknown_819B7D3:: @ 819B7D3 +SaffronCity_Gym_Text_ReceivedTM04FromSabrina:: @ 819B7D3 .string "{PLAYER} received TM04 from\n" .string "SABRINA.$" -gUnknown_819B7F2:: @ 819B7F2 +SaffronCity_Gym_Text_ExplainTM04:: @ 819B7F2 .string "TM04 is CALM MIND.\p" .string "It makes the POKéMON concentrate\n" .string "to raise both SP. ATK and SP. DEF.$" -gUnknown_819B849:: @ 819B849 +SaffronCity_Gym_Text_BagFullOfOtherItems:: @ 819B849 .string "Your BAG is full of other items.$" -Text_19B86A:: @ 819B86A +SaffronCity_Gym_Text_AmandaIntro:: @ 819B86A .string "SABRINA is far younger than I,\n" .string "but she has earned my respect.$" -Text_19B8A8:: @ 819B8A8 +SaffronCity_Gym_Text_AmandaDefeat:: @ 819B8A8 .string "Not good enough!$" -gUnknown_819B8B9:: @ 819B8B9 +SaffronCity_Gym_Text_AmandaPostBattle:: @ 819B8B9 .string "In a battle of equals, the one\n" .string "with the stronger will wins.\p" .string "If you wish to beat SABRINA, focus\n" .string "and will yourself to victory.$" -Text_19B936:: @ 819B936 +SaffronCity_Gym_Text_JohanIntro:: @ 819B936 .string "Does our unseen power scare you?$" -Text_19B957:: @ 819B957 +SaffronCity_Gym_Text_JohanDefeat:: @ 819B957 .string "I never foresaw this!$" -gUnknown_819B96D:: @ 819B96D +SaffronCity_Gym_Text_JohanPostBattle:: @ 819B96D .string "PSYCHIC POKéMON fear only ghosts\n" .string "and bugs!$" -Text_19B998:: @ 819B998 +SaffronCity_Gym_Text_StacyIntro:: @ 819B998 .string "POKéMON take on the appearance of\n" .string "their TRAINERS.\p" .string "Your POKéMON must be tough, then!$" -Text_19B9EC:: @ 819B9EC +SaffronCity_Gym_Text_StacyDefeat:: @ 819B9EC .string "I knew it!$" -gUnknown_819B9F7:: @ 819B9F7 +SaffronCity_Gym_Text_StacyPostBattle:: @ 819B9F7 .string "I have much to learn still…\p" .string "I must master PSYCHIC and teach it\n" .string "to my POKéMON…$" -Text_19BA45:: @ 819BA45 +SaffronCity_Gym_Text_TyronIntro:: @ 819BA45 .string "You understand, don't you?\p" .string "That power alone isn't enough to\n" .string "win in the world of POKéMON?$" -Text_19BA9E:: @ 819BA9E +SaffronCity_Gym_Text_TyronDefeat:: @ 819BA9E .string "I don't believe this!$" -gUnknown_819BAB4:: @ 819BAB4 +SaffronCity_Gym_Text_TyronPostBattle:: @ 819BAB4 .string "SABRINA just wiped out the KARATE\n" .string "MASTER next door.$" -Text_19BAE8:: @ 819BAE8 +SaffronCity_Gym_Text_TashaIntro:: @ 819BAE8 .string "You and I, our POKéMON shall\n" .string "battle!$" -Text_19BB0D:: @ 819BB0D +SaffronCity_Gym_Text_TashaDefeat:: @ 819BB0D .string "I lost after all!$" -gUnknown_819BB1F:: @ 819BB1F +SaffronCity_Gym_Text_TashaPostBattle:: @ 819BB1F .string "I knew that this was going to take\n" .string "place.$" -Text_19BB49:: @ 819BB49 +SaffronCity_Gym_Text_CameronIntro:: @ 819BB49 .string "SABRINA is young, but she's also\n" .string "our highly skilled LEADER.\p" .string "You won't reach her easily!$" -Text_19BBA1:: @ 819BBA1 +SaffronCity_Gym_Text_CameronDefeat:: @ 819BBA1 .string "Ow!\n" .string "Down and out!$" -gUnknown_819BBB3:: @ 819BBB3 +SaffronCity_Gym_Text_CameronPostBattle:: @ 819BBB3 .string "There used to be two POKéMON GYMS\n" .string "in SAFFRON.\p" .string "The FIGHTING DOJO next door lost\n" @@ -118,20 +118,20 @@ gUnknown_819BBB3:: @ 819BBB3 .string "We simply creamed them when we\n" .string "decided to have just one GYM.$" -Text_19BC57:: @ 819BC57 +SaffronCity_Gym_Text_PrestonIntro:: @ 819BC57 .string "SAFFRON POKéMON GYM is famous for\n" .string "training psychics.\p" .string "You want to see SABRINA, don't\n" .string "you? I can tell!$" -Text_19BCBC:: @ 819BCBC +SaffronCity_Gym_Text_PrestonDefeat:: @ 819BCBC .string "Arrrgh!$" -gUnknown_819BCC4:: @ 819BCC4 +SaffronCity_Gym_Text_PrestonPostBattle:: @ 819BCC4 .string "That's right! I used telepathy to\n" .string "read your mind!$" -gUnknown_819BCF6:: @ 819BCF6 +SaffronCity_Gym_Text_GymGuyAdvice:: @ 819BCF6 .string "Yo!\n" .string "Champ in the making!\p" .string "SABRINA's POKéMON use psychic\n" @@ -141,18 +141,18 @@ gUnknown_819BCF6:: @ 819BCF6 .string "They'll get destroyed before they\n" .string "can even aim a punch!$" -gUnknown_819BDBB:: @ 819BDBB +SaffronCity_Gym_Text_GymGuyPostVictory:: @ 819BDBB .string "Psychic power, huh?\p" .string "If I had that, I'd make a bundle\n" .string "at the slots!$" -gUnknown_819BDFE:: @ 819BDFE +SaffronCity_Gym_Text_GymStatue:: @ 819BDFE .string "SAFFRON POKéMON GYM\n" .string "LEADER: SABRINA\p" .string "WINNING TRAINERS:\n" .string "{RIVAL}$" -gUnknown_819BE37:: @ 819BE37 +SaffronCity_Gym_Text_GymStatuePlayerWon:: @ 819BE37 .string "SAFFRON POKéMON GYM\n" .string "LEADER: SABRINA\p" .string "WINNING TRAINERS:\n" diff --git a/data/maps/SaffronCity_House/map.json b/data/maps/SaffronCity_House/map.json new file mode 100644 index 000000000..48b569e5e --- /dev/null +++ b/data/maps/SaffronCity_House/map.json @@ -0,0 +1,102 @@ +{ + "id": "MAP_SAFFRON_CITY_HOUSE", + "name": "SaffronCity_House", + "layout": "LAYOUT_HOUSE5", + "music": "MUS_NIBI", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_PIDGEY", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 4, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_House_EventScript_Pidgey", + "flag": "0" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_LASS", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_House_EventScript_Lass", + "flag": "0" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_House_EventScript_Youngster", + "flag": "0" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_CLIPBOARD", + "x": 5, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 5, + "y": 4, + "elevation": 3, + "script": "SaffronCity_House_EventScript_Letter" + } + ] +} diff --git a/data/maps/SaffronCity_House/scripts.inc b/data/maps/SaffronCity_House/scripts.inc new file mode 100644 index 000000000..d94baa8a0 --- /dev/null +++ b/data/maps/SaffronCity_House/scripts.inc @@ -0,0 +1,24 @@ +SaffronCity_House_MapScripts:: @ 816EF73 + .byte 0 + +SaffronCity_House_EventScript_Lass:: @ 816EF74 + msgbox SaffronCity_House_Text_DontLookAtMyLetter, MSGBOX_NPC + end + +SaffronCity_House_EventScript_Youngster:: @ 816EF7D + msgbox SaffronCity_House_Text_GettingCopycatPokeDoll, MSGBOX_NPC + end + +SaffronCity_House_EventScript_Pidgey:: @ 816EF86 + lock + faceplayer + waitse + playmoncry SPECIES_PIDGEY, 0 + msgbox SaffronCity_House_Text_Pidgey + waitmoncry + release + end + +SaffronCity_House_EventScript_Letter:: @ 816EF99 + msgbox SaffronCity_House_Text_ExplainPPUp, MSGBOX_SIGN + end diff --git a/data/maps/SaffronCity_House/text.inc b/data/maps/SaffronCity_House/text.inc new file mode 100644 index 000000000..7d13c13fa --- /dev/null +++ b/data/maps/SaffronCity_House/text.inc @@ -0,0 +1,20 @@ +SaffronCity_House_Text_DontLookAtMyLetter:: @ 819BE74 + .string "…Thank you for writing.\n" + .string "I hope to see you soon!\p" + .string "…Hey!\n" + .string "Don't look at my letter!$" + +SaffronCity_House_Text_Pidgey:: @ 819BEC3 + .string "PIDGEY: Kurukkoo!$" + +SaffronCity_House_Text_GettingCopycatPokeDoll:: @ 819BED5 + .string "The COPYCAT is cute!\n" + .string "I'm getting her a POKé DOLL.$" + +SaffronCity_House_Text_ExplainPPUp:: @ 819BF07 + .string "I was given a PP UP as a gift.\p" + .string "It's used to increase the PP of\n" + .string "a POKéMON's move.\p" + .string "I should use it on a powerful move\n" + .string "with only a few PP.$" + diff --git a/data/maps/SaffronCity_House1_1F/map.json b/data/maps/SaffronCity_House1_1F/map.json deleted file mode 100644 index 4f7e0a241..000000000 --- a/data/maps/SaffronCity_House1_1F/map.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "id": "MAP_SAFFRON_CITY_HOUSE1_1F", - "name": "SaffronCity_House1_1F", - "layout": "LAYOUT_SAFFRON_CITY_HOUSE1_1F", - "music": "MUS_NIBI", - "region_map_section": "MAPSEC_SAFFRON_CITY", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", - "x": 8, - "y": 4, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_LEFT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House1_1F_EventScript_16EB40", - "flag": "0" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", - "x": 3, - "y": 3, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House1_1F_EventScript_16EB37", - "flag": "0" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_CHANSEY", - "x": 4, - "y": 4, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", - "movement_range_x": 1, - "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House1_1F_EventScript_16EB49", - "flag": "0" - } - ], - "warp_events": [ - { - "x": 3, - "y": 8, - "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 1 - }, - { - "x": 4, - "y": 8, - "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 1 - }, - { - "x": 5, - "y": 8, - "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 1 - }, - { - "x": 10, - "y": 2, - "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_HOUSE1_2F", - "dest_warp_id": 0 - } - ], - "coord_events": [], - "bg_events": [] -} diff --git a/data/maps/SaffronCity_House1_1F/scripts.inc b/data/maps/SaffronCity_House1_1F/scripts.inc deleted file mode 100644 index 2f4e435fa..000000000 --- a/data/maps/SaffronCity_House1_1F/scripts.inc +++ /dev/null @@ -1,20 +0,0 @@ -SaffronCity_House1_1F_MapScripts:: @ 816EB36 - .byte 0 - -SaffronCity_House1_1F_EventScript_16EB37:: @ 816EB37 - msgbox gUnknown_819AB9B, MSGBOX_NPC - end - -SaffronCity_House1_1F_EventScript_16EB40:: @ 816EB40 - msgbox gUnknown_819ABD7, MSGBOX_NPC - end - -SaffronCity_House1_1F_EventScript_16EB49:: @ 816EB49 - lock - faceplayer - waitse - playmoncry SPECIES_CHANSEY, 0 - msgbox gUnknown_819AC4B - waitmoncry - release - end diff --git a/data/maps/SaffronCity_House1_1F/text.inc b/data/maps/SaffronCity_House1_1F/text.inc deleted file mode 100644 index 04bedb057..000000000 --- a/data/maps/SaffronCity_House1_1F/text.inc +++ /dev/null @@ -1,32 +0,0 @@ -Text_19A9E7:: @ 819A9E7 - .string "AGATHA's GHOST-type POKéMON are\n" - .string "horrifically terrifying in toughness.\p" - .string "I took my FIGHTING-type POKéMON\n" - .string "and raised them to the max.\p" - .string "I went at AGATHA feeling pretty\n" - .string "confident, but she whupped us.\p" - .string "That old lady's also got a really\n" - .string "short fuse, too.\p" - .string "It doesn't take anything to get\n" - .string "that scary lady hollering.$" - -Text_19AB16:: @ 819AB16 - .string "Maybe becoming an ELITE FOUR\n" - .string "member is in the blood.\p" - .string "From what I've heard, LANCE has\n" - .string "a cousin who's a GYM LEADER\l" - .string "somewhere far away.$" - -gUnknown_819AB9B:: @ 819AB9B - .string "My daughter is so self-centered.\n" - .string "She has but a few friends.$" - -gUnknown_819ABD7:: @ 819ABD7 - .string "My daughter likes to mimic people.\n" - .string "It's rather vexing.\p" - .string "Her mimicry has earned her the\n" - .string "nickname COPYCAT around here.$" - -gUnknown_819AC4B:: @ 819AC4B - .string "CHANSEY: Chaan! Sii!$" - diff --git a/data/maps/SaffronCity_House1_2F/map.json b/data/maps/SaffronCity_House1_2F/map.json deleted file mode 100644 index e7484dfae..000000000 --- a/data/maps/SaffronCity_House1_2F/map.json +++ /dev/null @@ -1,105 +0,0 @@ -{ - "id": "MAP_SAFFRON_CITY_HOUSE1_2F", - "name": "SaffronCity_House1_2F", - "layout": "LAYOUT_SAFFRON_CITY_HOUSE1_2F", - "music": "MUS_NIBI", - "region_map_section": "MAPSEC_SAFFRON_CITY", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_DODUO", - "x": 6, - "y": 8, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House1_2F_EventScript_16EB5D", - "flag": "0" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_PIKACHU", - "x": 4, - "y": 6, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House1_2F_EventScript_16EB70", - "flag": "0" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_JIGGLYPUFF", - "x": 7, - "y": 2, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House1_2F_EventScript_16EB70", - "flag": "0" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", - "x": 9, - "y": 6, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House1_2F_EventScript_16EB7B", - "flag": "0" - } - ], - "warp_events": [ - { - "x": 10, - "y": 2, - "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_HOUSE1_1F", - "dest_warp_id": 3 - } - ], - "coord_events": [], - "bg_events": [ - { - "type": "bg_event_type_0", - "x": 1, - "y": 1, - "elevation": 0, - "script": "SaffronCity_House1_2F_EventScript_16EBC9" - }, - { - "type": "bg_event_type_0", - "x": 3, - "y": 5, - "elevation": 0, - "script": "SaffronCity_House1_2F_EventScript_16EBD2" - }, - { - "type": "hidden_item", - "x": 2, - "y": 1, - "elevation": 0, - "item": "ITEM_NUGGET", - "flag": "HIDDEN_ITEM_SAFFRON_CITY_HOUSE1_2F_NUGGET", - "quantity": 1, - "underfoot": false - } - ] -} diff --git a/data/maps/SaffronCity_House1_2F/scripts.inc b/data/maps/SaffronCity_House1_2F/scripts.inc deleted file mode 100644 index 17714d816..000000000 --- a/data/maps/SaffronCity_House1_2F/scripts.inc +++ /dev/null @@ -1,50 +0,0 @@ -SaffronCity_House1_2F_MapScripts:: @ 816EB5C - .byte 0 - -SaffronCity_House1_2F_EventScript_16EB5D:: @ 816EB5D - lock - faceplayer - waitse - playmoncry SPECIES_DODUO, 0 - msgbox gUnknown_819B030 - waitmoncry - release - end - -SaffronCity_House1_2F_EventScript_16EB70:: @ 816EB70 - lock - msgbox gUnknown_819B071 - release - end - -SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B - goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 - lock - faceplayer - checkitem ITEM_POKE_DOLL, 1 - compare VAR_RESULT, TRUE - goto_if_eq EventScript_MimicTutor - checkplayergender - compare VAR_RESULT, MALE - call_if_eq EventScript_16EBB7 - compare VAR_RESULT, FEMALE - call_if_eq EventScript_16EBC0 - release - end - -EventScript_16EBB7:: @ 816EBB7 - msgbox gUnknown_819AC60 - return - -EventScript_16EBC0:: @ 816EBC0 - msgbox gUnknown_819ACF1 - return - -SaffronCity_House1_2F_EventScript_16EBC9:: @ 816EBC9 - msgbox gUnknown_819B0D0, MSGBOX_SIGN - end - -SaffronCity_House1_2F_EventScript_16EBD2:: @ 816EBD2 - msgbox gUnknown_819B0A0, MSGBOX_SIGN - end diff --git a/data/maps/SaffronCity_House1_2F/text.inc b/data/maps/SaffronCity_House1_2F/text.inc deleted file mode 100644 index 32a666e18..000000000 --- a/data/maps/SaffronCity_House1_2F/text.inc +++ /dev/null @@ -1,100 +0,0 @@ -gUnknown_819AC60:: @ 819AC60 - .string "{PLAYER}: Hi!\n" - .string "Do you like POKéMON?\p" - .string "{PLAYER}: Uh, no, I just asked you.\p" - .string "{PLAYER}: Huh?\n" - .string "You're strange!\p" - .string "COPYCAT: Hmm? Quit mimicking?\n" - .string "But, that's my favorite hobby!$" - -gUnknown_819ACF1:: @ 819ACF1 - .string "{PLAYER}: Hi.\n" - .string "You must like POKéMON.\p" - .string "{PLAYER}: No, not me.\n" - .string "I asked you.\p" - .string "{PLAYER}: Pardon?\n" - .string "You're weird!\l" - .string " \l" - .string "COPYCAT: Hmm? Quit mimicking?\l" - .string "But that's my favorite hobby!$" - -Text_MimicTeach:: @ 819AD85 - .string "Oh wow!\n" - .string "A POKé DOLL!\p" - .string "For me?\n" - .string "Thank you!\p" - .string "You know what?\n" - .string "I can teach the move MIMIC.$" - -Text_MimicDeclined:: @ 819ADD8 - .string "Don't you like MIMIC?$" - -Text_MimicWhichMon:: @ 819ADEE - .string "I really love MIMIC!\n" - .string "Who's going to learn it?$" - -Text_MimicTaughtMale:: @ 819AE1C - .string "{PLAYER}: Hi!\n" - .string "Thanks for earlier!\p" - .string "{PLAYER}: Pardon?\p" - .string "{PLAYER}: Is it that fun to mimic my\n" - .string "every move?\p" - .string "COPYCAT: You bet!\n" - .string "It's a scream!$" - -Text_MimicTaughtFemale:: @ 819AE90 - .string "{PLAYER}: Hi!\n" - .string "Thanks for what you did for us.\p" - .string "{PLAYER}: Pardon?\p" - .string "{PLAYER}: Is it really that fun to\n" - .string "copy what I say and do?\p" - .string "COPYCAT: You bet!\n" - .string "It's a scream!$" - -Text_19AF1A:: @ 819AF1A - .string "にもつが　いっぱいね！$" - -Text_19AF26:: @ 819AF26 - .string "{PLAYER}“やあ！　こんにちは！\n" - .string "きみ　ポケモン　すきかい？\p" - .string "{PLAYER}“ぼく　じゃなくって\n" - .string "きみに　きいてるんだ　けど\p" - .string "{PLAYER}“‥‥　えー　なんだよ！\n" - .string "ヘンな　やつ　だなあ！\p" - .string "モノマネむすめ“‥‥　なに？\n" - .string "ひとの　マネ　すんなって？\p" - .string "だって　あたし　\n" - .string "ものまね　しゅみ　なんだ　もん！”$" - -Text_19AFB0:: @ 819AFB0 - .string "{PLAYER}“こんにちは！\n" - .string "ポケモン　すきなのね？\p" - .string "{PLAYER}“わたし　じゃなくって\n" - .string "あなたに　きいてるんだ　けど\p" - .string "{PLAYER}“‥　えー　なんなの！\n" - .string "おかしなこ　ねー！\p" - .string "モノマネむすめ“‥　なに？\n" - .string "ひとの　マネ　すんなって？\p" - .string "だって　あたし\n" - .string "ものまね　しゅみ　なんだ　もん！$" - -gUnknown_819B030:: @ 819B030 - .string "DODUO: Giiih!\p" - .string "PRETTY MIRROR LOOK AT ME,\n" - .string "SEE HOW PRETTY I CAN BE?$" - -gUnknown_819B071:: @ 819B071 - .string "This is a rare POKéMON!\n" - .string "Huh? It's only a doll!$" - -gUnknown_819B0A0:: @ 819B0A0 - .string "A game with MARIO wearing a bucket\n" - .string "on his head!$" - -gUnknown_819B0D0:: @ 819B0D0 - .string "…\p" - .string "My Secrets!\p" - .string "Skill: Mimicry!\n" - .string "Hobby: Collecting dolls!\l" - .string "Favorite POKéMON: CLEFAIRY!$" - diff --git a/data/maps/SaffronCity_House2/map.json b/data/maps/SaffronCity_House2/map.json deleted file mode 100644 index 41fb0d809..000000000 --- a/data/maps/SaffronCity_House2/map.json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "id": "MAP_SAFFRON_CITY_HOUSE2", - "name": "SaffronCity_House2", - "layout": "LAYOUT_HOUSE5", - "music": "MUS_NIBI", - "region_map_section": "MAPSEC_SAFFRON_CITY", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_PIDGEY", - "x": 0, - "y": 5, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", - "movement_range_x": 1, - "movement_range_y": 4, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House2_EventScript_16EF86", - "flag": "0" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_LASS", - "x": 4, - "y": 4, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House2_EventScript_16EF74", - "flag": "0" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", - "x": 6, - "y": 2, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House2_EventScript_16EF7D", - "flag": "0" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_CLIPBOARD", - "x": 5, - "y": 4, - "elevation": 0, - "movement_type": "MOVEMENT_TYPE_FACE_UP", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "0x0", - "flag": "0" - } - ], - "warp_events": [ - { - "x": 3, - "y": 7, - "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 4 - }, - { - "x": 4, - "y": 7, - "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 4 - }, - { - "x": 5, - "y": 7, - "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 4 - } - ], - "coord_events": [], - "bg_events": [ - { - "type": "bg_event_type_0", - "x": 5, - "y": 4, - "elevation": 3, - "script": "SaffronCity_House2_EventScript_16EF99" - } - ] -} diff --git a/data/maps/SaffronCity_House2/scripts.inc b/data/maps/SaffronCity_House2/scripts.inc deleted file mode 100644 index 03afb1a4c..000000000 --- a/data/maps/SaffronCity_House2/scripts.inc +++ /dev/null @@ -1,24 +0,0 @@ -SaffronCity_House2_MapScripts:: @ 816EF73 - .byte 0 - -SaffronCity_House2_EventScript_16EF74:: @ 816EF74 - msgbox gUnknown_819BE74, MSGBOX_NPC - end - -SaffronCity_House2_EventScript_16EF7D:: @ 816EF7D - msgbox gUnknown_819BED5, MSGBOX_NPC - end - -SaffronCity_House2_EventScript_16EF86:: @ 816EF86 - lock - faceplayer - waitse - playmoncry SPECIES_PIDGEY, 0 - msgbox gUnknown_819BEC3 - waitmoncry - release - end - -SaffronCity_House2_EventScript_16EF99:: @ 816EF99 - msgbox gUnknown_819BF07, MSGBOX_SIGN - end diff --git a/data/maps/SaffronCity_House2/text.inc b/data/maps/SaffronCity_House2/text.inc deleted file mode 100644 index 9558880b7..000000000 --- a/data/maps/SaffronCity_House2/text.inc +++ /dev/null @@ -1,20 +0,0 @@ -gUnknown_819BE74:: @ 819BE74 - .string "…Thank you for writing.\n" - .string "I hope to see you soon!\p" - .string "…Hey!\n" - .string "Don't look at my letter!$" - -gUnknown_819BEC3:: @ 819BEC3 - .string "PIDGEY: Kurukkoo!$" - -gUnknown_819BED5:: @ 819BED5 - .string "The COPYCAT is cute!\n" - .string "I'm getting her a POKé DOLL.$" - -gUnknown_819BF07:: @ 819BF07 - .string "I was given a PP UP as a gift.\p" - .string "It's used to increase the PP of\n" - .string "a POKéMON's move.\p" - .string "I should use it on a powerful move\n" - .string "with only a few PP.$" - diff --git a/data/maps/SaffronCity_House3/map.json b/data/maps/SaffronCity_House3/map.json deleted file mode 100644 index 3d3e7410e..000000000 --- a/data/maps/SaffronCity_House3/map.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "id": "MAP_SAFFRON_CITY_HOUSE3", - "name": "SaffronCity_House3", - "layout": "LAYOUT_HOUSE5", - "music": "MUS_NIBI", - "region_map_section": "MAPSEC_SAFFRON_CITY", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", - "x": 7, - "y": 4, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_LEFT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House3_EventScript_16F05F", - "flag": "0" - } - ], - "warp_events": [ - { - "x": 3, - "y": 7, - "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 7 - }, - { - "x": 4, - "y": 7, - "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 7 - }, - { - "x": 5, - "y": 7, - "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 7 - } - ], - "coord_events": [], - "bg_events": [] -} diff --git a/data/maps/SaffronCity_House3/scripts.inc b/data/maps/SaffronCity_House3/scripts.inc deleted file mode 100644 index 9e177cccb..000000000 --- a/data/maps/SaffronCity_House3/scripts.inc +++ /dev/null @@ -1,26 +0,0 @@ -SaffronCity_House3_MapScripts:: @ 816F05E - .byte 0 - -SaffronCity_House3_EventScript_16F05F:: @ 816F05F - lock - faceplayer - goto_if_set FLAG_GOT_TM29_FROM_MR_PSYCHIC, EventScript_16F0B5 - msgbox gUnknown_819C142 - checkitemspace ITEM_TM29, 1 - compare VAR_RESULT, FALSE - goto_if_eq EventScript_16F0AB - giveitem_msg gUnknown_819C16C, ITEM_TM29 - msgbox gUnknown_819C18F - setflag FLAG_GOT_TM29_FROM_MR_PSYCHIC - release - end - -EventScript_16F0AB:: @ 816F0AB - msgbox gUnknown_819C1FC - release - end - -EventScript_16F0B5:: @ 816F0B5 - msgbox gUnknown_819C18F - release - end diff --git a/data/maps/SaffronCity_House3/text.inc b/data/maps/SaffronCity_House3/text.inc deleted file mode 100644 index 42699924f..000000000 --- a/data/maps/SaffronCity_House3/text.inc +++ /dev/null @@ -1,18 +0,0 @@ -gUnknown_819C142:: @ 819C142 - .string "…Wait! Don't say a word!\p" - .string "You wanted this!$" - -gUnknown_819C16C:: @ 819C16C - .string "{PLAYER} received TM29\n" - .string "from MR. PSYCHIC.$" - -gUnknown_819C18F:: @ 819C18F - .string "You already know, don't you?\n" - .string "TM29 is PSYCHIC.\p" - .string "It's an attack that may also lower\n" - .string "the target's special stats.$" - -gUnknown_819C1FC:: @ 819C1FC - .string "Where do you plan to put this?\n" - .string "You've no room.$" - diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json index 8f3bd6718..ddce0c6d9 100644 --- a/data/maps/SaffronCity_Mart/map.json +++ b/data/maps/SaffronCity_Mart/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Mart_EventScript_16EFB5", + "script": "SaffronCity_Mart_EventScript_Clerk", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Mart_EventScript_16EFAC", + "script": "SaffronCity_Mart_EventScript_Youngster", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Mart_EventScript_16EFA3", + "script": "SaffronCity_Mart_EventScript_Lass", "flag": "0" } ], diff --git a/data/maps/SaffronCity_Mart/scripts.inc b/data/maps/SaffronCity_Mart/scripts.inc index 5361c07a8..c00a93776 100644 --- a/data/maps/SaffronCity_Mart/scripts.inc +++ b/data/maps/SaffronCity_Mart/scripts.inc @@ -1,27 +1,27 @@ SaffronCity_Mart_MapScripts:: @ 816EFA2 .byte 0 -SaffronCity_Mart_EventScript_16EFA3:: @ 816EFA3 - msgbox gUnknown_819BFF1, MSGBOX_NPC +SaffronCity_Mart_EventScript_Lass:: @ 816EFA3 + msgbox SaffronCity_Mart_Text_ReviveIsCostly, MSGBOX_NPC end -SaffronCity_Mart_EventScript_16EFAC:: @ 816EFAC - msgbox gUnknown_819BF8F, MSGBOX_NPC +SaffronCity_Mart_EventScript_Youngster:: @ 816EFAC + msgbox SaffronCity_Mart_Text_MaxRepelMoreEffectiveThanSuper, MSGBOX_NPC end -SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5 +SaffronCity_Mart_EventScript_Clerk:: @ 816EFB5 goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_16EFDC + pokemart SaffronCity_Mart_Items msgbox Text_PleaseComeAgain release end .align 2 -Items_16EFDC:: @ 816EFDC +SaffronCity_Mart_Items:: @ 816EFDC .2byte ITEM_GREAT_BALL .2byte ITEM_HYPER_POTION .2byte ITEM_REVIVE diff --git a/data/maps/SaffronCity_Mart/text.inc b/data/maps/SaffronCity_Mart/text.inc index 5acbdbd9c..edf13f2fe 100644 --- a/data/maps/SaffronCity_Mart/text.inc +++ b/data/maps/SaffronCity_Mart/text.inc @@ -1,10 +1,10 @@ -gUnknown_819BF8F:: @ 819BF8F +SaffronCity_Mart_Text_MaxRepelMoreEffectiveThanSuper:: @ 819BF8F .string "MAX REPEL keeps weaker POKéMON\n" .string "from appearing.\p" .string "MAX REPEL stays effective longer\n" .string "than SUPER REPEL.$" -gUnknown_819BFF1:: @ 819BFF1 +SaffronCity_Mart_Text_ReviveIsCostly:: @ 819BFF1 .string "REVIVE is costly, but it revives\n" .string "fainted POKéMON!$" diff --git a/data/maps/SaffronCity_MrPsychicsHouse/map.json b/data/maps/SaffronCity_MrPsychicsHouse/map.json new file mode 100644 index 000000000..f1d121850 --- /dev/null +++ b/data/maps/SaffronCity_MrPsychicsHouse/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_SAFFRON_CITY_MR_PSYCHICS_HOUSE", + "name": "SaffronCity_MrPsychicsHouse", + "layout": "LAYOUT_HOUSE5", + "music": "MUS_NIBI", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_MrPsychicsHouse_EventScript_MrPsychic", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY", + "dest_warp_id": 7 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY", + "dest_warp_id": 7 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} diff --git a/data/maps/SaffronCity_MrPsychicsHouse/scripts.inc b/data/maps/SaffronCity_MrPsychicsHouse/scripts.inc new file mode 100644 index 000000000..24bd51cc1 --- /dev/null +++ b/data/maps/SaffronCity_MrPsychicsHouse/scripts.inc @@ -0,0 +1,26 @@ +SaffronCity_MrPsychicsHouse_MapScripts:: @ 816F05E + .byte 0 + +SaffronCity_MrPsychicsHouse_EventScript_MrPsychic:: @ 816F05F + lock + faceplayer + goto_if_set FLAG_GOT_TM29_FROM_MR_PSYCHIC, SaffronCity_MrPsychicsHouse_EventScript_AlreadyGotTM29 + msgbox SaffronCity_MrPsychicsHouse_Text_YouWantedThis + checkitemspace ITEM_TM29, 1 + compare VAR_RESULT, FALSE + goto_if_eq SaffronCity_MrPsychicsHouse_EventScript_NoRoomForTM29 + giveitem_msg SaffronCity_MrPsychicsHouse_Text_ReceivedTM29FromMrPsychic, ITEM_TM29 + msgbox SaffronCity_MrPsychicsHouse_Text_ExplainTM29 + setflag FLAG_GOT_TM29_FROM_MR_PSYCHIC + release + end + +SaffronCity_MrPsychicsHouse_EventScript_NoRoomForTM29:: @ 816F0AB + msgbox SaffronCity_MrPsychicsHouse_Text_YouveNoRoom + release + end + +SaffronCity_MrPsychicsHouse_EventScript_AlreadyGotTM29:: @ 816F0B5 + msgbox SaffronCity_MrPsychicsHouse_Text_ExplainTM29 + release + end diff --git a/data/maps/SaffronCity_MrPsychicsHouse/text.inc b/data/maps/SaffronCity_MrPsychicsHouse/text.inc new file mode 100644 index 000000000..31d220c69 --- /dev/null +++ b/data/maps/SaffronCity_MrPsychicsHouse/text.inc @@ -0,0 +1,18 @@ +SaffronCity_MrPsychicsHouse_Text_YouWantedThis:: @ 819C142 + .string "…Wait! Don't say a word!\p" + .string "You wanted this!$" + +SaffronCity_MrPsychicsHouse_Text_ReceivedTM29FromMrPsychic:: @ 819C16C + .string "{PLAYER} received TM29\n" + .string "from MR. PSYCHIC.$" + +SaffronCity_MrPsychicsHouse_Text_ExplainTM29:: @ 819C18F + .string "You already know, don't you?\n" + .string "TM29 is PSYCHIC.\p" + .string "It's an attack that may also lower\n" + .string "the target's special stats.$" + +SaffronCity_MrPsychicsHouse_Text_YouveNoRoom:: @ 819C1FC + .string "Where do you plan to put this?\n" + .string "You've no room.$" + diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json index bb78415b4..1d28ff69a 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonCenter_1F_EventScript_16EFFB", + "script": "SaffronCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonCenter_1F_EventScript_16F004", + "script": "SaffronCity_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonCenter_1F_EventScript_16F00D", + "script": "SaffronCity_PokemonCenter_1F_EventScript_Woman", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonCenter_1F_EventScript_16F016", + "script": "SaffronCity_PokemonCenter_1F_EventScript_Youngster", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonCenter_1F_EventScript_1ACEEC", + "script": "SaffronCity_PokemonCenter_1F_EventScript_PokemonJournalSabrina", "flag": "FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonCenter_1F_EventScript_1ACEEC", + "script": "SaffronCity_PokemonCenter_1F_EventScript_PokemonJournalSabrina", "flag": "FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS" } ], diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc index 8639de5af..b8e2385e6 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc @@ -7,31 +7,31 @@ SaffronCity_PokemonCenter_1F_OnTransition:: @ 816EFF7 setrespawn SPAWN_SAFFRON_CITY end -SaffronCity_PokemonCenter_1F_EventScript_16EFFB:: @ 816EFFB +SaffronCity_PokemonCenter_1F_EventScript_Nurse:: @ 816EFFB lock faceplayer call EventScript_PkmnCenterNurse release end -SaffronCity_PokemonCenter_1F_EventScript_16F004:: @ 816F004 - msgbox gUnknown_819C058, MSGBOX_NPC +SaffronCity_PokemonCenter_1F_EventScript_Gentleman:: @ 816F004 + msgbox SaffronCity_PokemonCenter_1F_Text_SilphCoVictimOfFame, MSGBOX_NPC end -SaffronCity_PokemonCenter_1F_EventScript_16F00D:: @ 816F00D - msgbox gUnknown_819C023, MSGBOX_NPC +SaffronCity_PokemonCenter_1F_EventScript_Woman:: @ 816F00D + msgbox SaffronCity_PokemonCenter_1F_Text_GrowthRatesDifferBySpecies, MSGBOX_NPC end -SaffronCity_PokemonCenter_1F_EventScript_16F016:: @ 816F016 +SaffronCity_PokemonCenter_1F_EventScript_Youngster:: @ 816F016 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_eq EventScript_16F02D - msgbox gUnknown_819C0B4 + goto_if_eq SaffronCity_PokemonCenter_1F_EventScript_YoungsterRocketsGone + msgbox SaffronCity_PokemonCenter_1F_Text_GreatIfEliteFourCameBeatRockets release end -EventScript_16F02D:: @ 816F02D - msgbox gUnknown_819C102 +SaffronCity_PokemonCenter_1F_EventScript_YoungsterRocketsGone:: @ 816F02D + msgbox SaffronCity_PokemonCenter_1F_Text_TeamRocketTookOff release end diff --git a/data/maps/SaffronCity_PokemonCenter_1F/text.inc b/data/maps/SaffronCity_PokemonCenter_1F/text.inc index 8a3e43a10..51d64d42c 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/text.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/text.inc @@ -1,19 +1,19 @@ -gUnknown_819C023:: @ 819C023 +SaffronCity_PokemonCenter_1F_Text_GrowthRatesDifferBySpecies:: @ 819C023 .string "POKéMON growth rates differ from\n" .string "species to species.$" -gUnknown_819C058:: @ 819C058 +SaffronCity_PokemonCenter_1F_Text_SilphCoVictimOfFame:: @ 819C058 .string "SILPH CO. is widely known to all.\p" .string "It's a victim of its own fame - it\n" .string "attracted TEAM ROCKET.$" -gUnknown_819C0B4:: @ 819C0B4 +SaffronCity_PokemonCenter_1F_Text_GreatIfEliteFourCameBeatRockets:: @ 819C0B4 .string "Sigh…\n" .string "Wouldn't this be great?\p" .string "If the ELITE FOUR came and\n" .string "stomped TEAM ROCKET?$" -gUnknown_819C102:: @ 819C102 +SaffronCity_PokemonCenter_1F_Text_TeamRocketTookOff:: @ 819C102 .string "TEAM ROCKET took off!\n" .string "We can go out safely again!\l" .string "That's great!$" diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index 979278cdb..f8f892dca 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F281", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirl", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F36F", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Youngster", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Gentleman", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F45D", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Woman", "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Rocker", "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F521", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Beauty", "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F583", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_BlackBelt", "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_PokemonJournalBruno", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_PokemonJournalBruno", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index ffb4678b2..8df872d7e 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -4,10 +4,10 @@ SaffronCity_PokemonTrainerFanClub_MapScripts:: @ 816F0BF .byte 0 SaffronCity_PokemonTrainerFanClub_OnFrame:: @ 816F0CA - map_script_2 VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1, EventScript_16F0D4 + map_script_2 VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1, SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans .2byte 0 -EventScript_16F0D4:: @ 816F0D4 +SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans:: @ 816F0D4 lockall textcolor 1 applymovement 1, Movement_WalkInPlaceFastestDown @@ -17,18 +17,18 @@ EventScript_16F0D4:: @ 816F0D4 waitmovement 0 applymovement 1, Movement_Delay48 waitmovement 0 - msgbox gUnknown_819C22B + msgbox SaffronCity_PokemonTrainerFanClub_Text_HuhYou closemessage - applymovement 1, Movement_16F124 + applymovement 1, SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox gUnknown_819C235 + msgbox SaffronCity_PokemonTrainerFanClub_Text_YourePlayerWereYourFansNow setvar VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 releaseall end -Movement_16F124:: @ 816F124 +SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer:: @ 816F124 delay_16 delay_8 walk_down @@ -38,7 +38,8 @@ Movement_16F124:: @ 816F124 walk_left step_end -Movement_16F12C:: @ 816F12C +@ Unused, leftover from RS +LilycoveCity_PokemonTrainerFanClub_Movement_FanApproachPlayer:: @ 816F12C delay_8 walk_in_place_fastest_down walk_down @@ -48,7 +49,8 @@ Movement_16F12C:: @ 816F12C walk_left step_end -Movement_16F134:: @ 816F134 +@ Unused, leftover from RS +LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlWatchPlayer:: @ 816F134 walk_fast_left walk_fast_left walk_fast_down @@ -57,12 +59,14 @@ Movement_16F134:: @ 816F134 walk_fast_down step_end -Movement_16F13B:: @ 816F13B +@ Unused, leftover from RS +LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlMoveCloserToPlayer:: @ 816F13B walk_down walk_in_place_fastest_right step_end -Movement_16F13E:: @ 816F13E +@ Unused, leftover from RS +LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlHideFromPlayer:: @ 816F13E jump_in_place_right walk_fast_up walk_fast_up @@ -72,383 +76,383 @@ Movement_16F13E:: @ 816F13E SaffronCity_PokemonTrainerFanClub_OnTransition:: @ 816F144 compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1 - goto_if_eq EventScript_16F267 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_SetMemberPosForFirstMeeting compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 - goto_if_eq EventScript_16F15B + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions end -EventScript_16F15B:: @ 816F15B +SaffronCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions:: @ 816F15B special Special_TryLoseFansFromPlayTime setvar VAR_0x8004, FANCLUB_MEMBER1 specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE - call_if_eq EventScript_16F207 + call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER2 specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE - call_if_eq EventScript_16F213 + call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER3 specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE - call_if_eq EventScript_16F21F + call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER4 specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE - call_if_eq EventScript_16F22B + call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER5 specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE - call_if_eq EventScript_16F237 + call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER6 specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE - call_if_eq EventScript_16F243 + call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER7 specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE - call_if_eq EventScript_16F24F + call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER8 specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE - call_if_eq EventScript_16F25B + call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable end -EventScript_16F207:: @ 816F207 +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable:: @ 816F207 setobjectxyperm 1, 5, 2 setobjectmovementtype 1, 7 return -EventScript_16F213:: @ 816F213 +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable:: @ 816F213 setobjectxyperm 3, 7, 4 setobjectmovementtype 3, 9 return -EventScript_16F21F:: @ 816F21F +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable:: @ 816F21F setobjectxyperm 4, 2, 2 setobjectmovementtype 4, 7 return -EventScript_16F22B:: @ 816F22B +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable:: @ 816F22B setobjectxyperm 2, 3, 4 setobjectmovementtype 2, 10 return -EventScript_16F237:: @ 816F237 +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable:: @ 816F237 setobjectxyperm 6, 4, 6 setobjectmovementtype 6, 7 return -EventScript_16F243:: @ 816F243 +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable:: @ 816F243 setobjectxyperm 5, 10, 3 setobjectmovementtype 5, 7 return -EventScript_16F24F:: @ 816F24F +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable:: @ 816F24F setobjectxyperm 7, 7, 5 setobjectmovementtype 7, 9 return -EventScript_16F25B:: @ 816F25B +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable:: @ 816F25B setobjectxyperm 8, 9, 6 setobjectmovementtype 8, 9 return -EventScript_16F267:: @ 816F267 - call EventScript_16F22B - call EventScript_16F237 - call EventScript_16F243 - call EventScript_16F24F - call EventScript_16F25B +SaffronCity_PokemonTrainerFanClub_EventScript_SetMemberPosForFirstMeeting:: @ 816F267 + call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable + call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable + call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable + call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable + call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable end -SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281 +SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl:: @ 816F281 lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER1 special Special_BufferFanClubTrainerName compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if_eq EventScript_16F2EE + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayerNotChampion specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE - goto_if_eq EventScript_16F2C0 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) - goto_if_eq EventScript_16F2E4 - msgbox gUnknown_819C420 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyNonFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_WasYourFanNotAnymore release end -EventScript_16F2C0:: @ 816F2C0 +SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan:: @ 816F2C0 specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 - goto_if_eq EventScript_16F2DA - msgbox gUnknown_819C390 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou release end -EventScript_16F2DA:: @ 816F2DA - msgbox gUnknown_819C3BD +SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyFan:: @ 816F2DA + msgbox SaffronCity_PokemonTrainerFanClub_Text_IllAlwaysBelieveInYou release end -EventScript_16F2E4:: @ 816F2E4 - msgbox gUnknown_819C4A5 +SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyNonFan:: @ 816F2E4 + msgbox SaffronCity_PokemonTrainerFanClub_Text_EveryonesYourFanButICantBe release end -EventScript_16F2EE:: @ 816F2EE - msgbox gUnknown_819C55C +SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayerNotChampion:: @ 816F2EE + msgbox SaffronCity_PokemonTrainerFanClub_Text_TrainersCoolWhenBattling release end -SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8 +SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirl:: @ 816F2F8 lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER4 special Special_BufferFanClubTrainerName compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if_eq EventScript_16F365 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayerNotChampion specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE - goto_if_eq EventScript_16F337 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) - goto_if_eq EventScript_16F35B - msgbox gUnknown_819CBD3 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyNonFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeSabrina release end -EventScript_16F337:: @ 816F337 +SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan:: @ 816F337 specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 - goto_if_eq EventScript_16F351 - msgbox gUnknown_819CB32 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeYouOneDay release end -EventScript_16F351:: @ 816F351 - msgbox gUnknown_819CB62 +SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyFan:: @ 816F351 + msgbox SaffronCity_PokemonTrainerFanClub_Text_EveryoneButMeStoppedBeingYourFan release end -EventScript_16F35B:: @ 816F35B - msgbox gUnknown_819CC2B +SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyNonFan:: @ 816F35B + msgbox SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingSabrinasFan release end -EventScript_16F365:: @ 816F365 - msgbox gUnknown_819CCC2 +SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayerNotChampion:: @ 816F365 + msgbox SaffronCity_PokemonTrainerFanClub_Text_CanIBecomeCoolTrainerOneDay release end -SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F +SaffronCity_PokemonTrainerFanClub_EventScript_Youngster:: @ 816F36F lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER2 special Special_BufferFanClubTrainerName compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if_eq EventScript_16F3DC + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayerNotChampion specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE - goto_if_eq EventScript_16F3AE + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayersFan specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) - goto_if_eq EventScript_16F3D2 - msgbox gUnknown_819C6BA + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyNonFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_BrocksMyHero release end -EventScript_16F3AE:: @ 816F3AE +SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayersFan:: @ 816F3AE specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 - goto_if_eq EventScript_16F3C8 - msgbox gUnknown_819C5A9 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_CanYouAutographShorts release end -EventScript_16F3C8:: @ 816F3C8 - msgbox gUnknown_819C600 +SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyFan:: @ 816F3C8 + msgbox SaffronCity_PokemonTrainerFanClub_Text_CountingOnYou release end -EventScript_16F3D2:: @ 816F3D2 - msgbox gUnknown_819C73A +SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyNonFan:: @ 816F3D2 + msgbox SaffronCity_PokemonTrainerFanClub_Text_BrocksFanToBitterEnd release end -EventScript_16F3DC:: @ 816F3DC - msgbox gUnknown_819C7C8 +SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayerNotChampion:: @ 816F3DC + msgbox SaffronCity_PokemonTrainerFanClub_Text_BrocksLastWordOnCool release end -SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6 +SaffronCity_PokemonTrainerFanClub_EventScript_Gentleman:: @ 816F3E6 lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER3 special Special_BufferFanClubTrainerName compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if_eq EventScript_16F453 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayerNotChampion specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE - goto_if_eq EventScript_16F425 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayersFan specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) - goto_if_eq EventScript_16F449 - msgbox gUnknown_819C986 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyNonFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_HmmAndYouAre release end -EventScript_16F425:: @ 816F425 +SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayersFan:: @ 816F425 specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 - goto_if_eq EventScript_16F43F - msgbox gUnknown_819C81E + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_HadPleasureOfWatchingYouBattle release end -EventScript_16F43F:: @ 816F43F - msgbox gUnknown_819C8C1 +SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyFan:: @ 816F43F + msgbox SaffronCity_PokemonTrainerFanClub_Text_NeverSeenTrainerOfYourMagnificence release end -EventScript_16F449:: @ 816F449 - msgbox gUnknown_819C9D5 +SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyNonFan:: @ 816F449 + msgbox SaffronCity_PokemonTrainerFanClub_Text_YouveStillAWaysToGo release end -EventScript_16F453:: @ 816F453 - msgbox gUnknown_819CA7C +SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayerNotChampion:: @ 816F453 + msgbox SaffronCity_PokemonTrainerFanClub_Text_YoullBeTalkedAboutIfYouKeepWinning release end -SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D +SaffronCity_PokemonTrainerFanClub_EventScript_Woman:: @ 816F45D lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER6 special Special_BufferFanClubTrainerName specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE - goto_if_eq EventScript_16F491 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) - goto_if_eq EventScript_16F4B5 - msgbox gUnknown_819D01F + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyNonFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_TrainerHasBeenOnFire release end -EventScript_16F491:: @ 816F491 +SaffronCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan:: @ 816F491 specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 - goto_if_eq EventScript_16F4AB - msgbox gUnknown_819CEDF + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_AdoreWayYouBattle release end -EventScript_16F4AB:: @ 816F4AB - msgbox gUnknown_819CF6D +SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyFan:: @ 816F4AB + msgbox SaffronCity_PokemonTrainerFanClub_Text_ImYourNumberOneFan release end -EventScript_16F4B5:: @ 816F4B5 - msgbox gUnknown_819D075 +SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyNonFan:: @ 816F4B5 + msgbox SaffronCity_PokemonTrainerFanClub_Text_EveryoneTalksAboutYou release end -SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF +SaffronCity_PokemonTrainerFanClub_EventScript_Rocker:: @ 816F4BF lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER5 special Special_BufferFanClubTrainerName specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE - goto_if_eq EventScript_16F4F3 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerPlayersFan specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) - goto_if_eq EventScript_16F517 - msgbox gUnknown_819CDDA + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyNonFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_LoveWayTrainerTalks release end -EventScript_16F4F3:: @ 816F4F3 +SaffronCity_PokemonTrainerFanClub_EventScript_RockerPlayersFan:: @ 816F4F3 specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 - goto_if_eq EventScript_16F50D - msgbox gUnknown_819CCF3 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_TheWayYouBattleIsCool release end -EventScript_16F50D:: @ 816F50D - msgbox gUnknown_819CD4E +SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyFan:: @ 816F50D + msgbox SaffronCity_PokemonTrainerFanClub_Text_ImOnlyOneLeftOfYourFans release end -EventScript_16F517:: @ 816F517 - msgbox gUnknown_819CE3A +SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyNonFan:: @ 816F517 + msgbox SaffronCity_PokemonTrainerFanClub_Text_ImLoneTrainerFan release end -SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521 +SaffronCity_PokemonTrainerFanClub_EventScript_Beauty:: @ 816F521 lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER7 special Special_BufferFanClubTrainerName specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE - goto_if_eq EventScript_16F555 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyPlayersFan specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) - goto_if_eq EventScript_16F579 - msgbox gUnknown_819D1AE + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyNonFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_WhyCantOthersSeeMastersDignity release end -EventScript_16F555:: @ 816F555 +SaffronCity_PokemonTrainerFanClub_EventScript_BeautyPlayersFan:: @ 816F555 specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 - goto_if_eq EventScript_16F56F - msgbox gUnknown_819D0E3 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_YouReallyAreAmazing release end -EventScript_16F56F:: @ 816F56F - msgbox gUnknown_819D148 +SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyFan:: @ 816F56F + msgbox SaffronCity_PokemonTrainerFanClub_Text_ImYourOnlyFan release end -EventScript_16F579:: @ 816F579 - msgbox gUnknown_819D211 +SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyNonFan:: @ 816F579 + msgbox SaffronCity_PokemonTrainerFanClub_Text_BelieveInMasterWithAllMyHeart release end -SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583 +SaffronCity_PokemonTrainerFanClub_EventScript_BlackBelt:: @ 816F583 lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER8 special Special_BufferFanClubTrainerName specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE - goto_if_eq EventScript_16F5B7 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltPlayersFan specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) - goto_if_eq EventScript_16F5DB - msgbox gUnknown_819D3D2 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyNonFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_OnlyMasterHasMyRespect release end -EventScript_16F5B7:: @ 816F5B7 +SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltPlayersFan:: @ 816F5B7 specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 - goto_if_eq EventScript_16F5D1 - msgbox gUnknown_819D2B4 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_YourBattleStyleIsEducational release end -EventScript_16F5D1:: @ 816F5D1 - msgbox gUnknown_819D31F +SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyFan:: @ 816F5D1 + msgbox SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingYourFan release end -EventScript_16F5DB:: @ 816F5DB - msgbox gUnknown_819D477 +SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyNonFan:: @ 816F5DB + msgbox SaffronCity_PokemonTrainerFanClub_Text_NeverBeFanOfAnyoneButMaster release end diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc index ecbf0b024..fb9358c70 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc @@ -1,8 +1,8 @@ -gUnknown_819C22B:: @ 819C22B +SaffronCity_PokemonTrainerFanClub_Text_HuhYou:: @ 819C22B .string "Huh?\n" .string "You…$" -gUnknown_819C235:: @ 819C235 +SaffronCity_PokemonTrainerFanClub_Text_YourePlayerWereYourFansNow:: @ 819C235 .string "Are you maybe…\n" .string "… …\p" .string "You are!\n" @@ -19,17 +19,17 @@ gUnknown_819C235:: @ 819C235 .string "That way, maybe other people will\n" .string "become fans just like me.$" -gUnknown_819C390:: @ 819C390 +SaffronCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou:: @ 819C390 .string "I'll always be cheering for you!\p" .string "Go, {PLAYER}, go!$" -gUnknown_819C3BD:: @ 819C3BD +SaffronCity_PokemonTrainerFanClub_Text_IllAlwaysBelieveInYou:: @ 819C3BD .string "I'll always believe in you,\n" .string "{PLAYER}.\p" .string "Please show the others what you're\n" .string "like when you battle seriously.$" -gUnknown_819C420:: @ 819C420 +SaffronCity_PokemonTrainerFanClub_Text_WasYourFanNotAnymore:: @ 819C420 .string "I'm sorry.\n" .string "I was your fan before.\p" .string "But now, you seem to have lost\n" @@ -37,7 +37,7 @@ gUnknown_819C420:: @ 819C420 .string "Lately, I think {STR_VAR_1} has been\n" .string "a lot cooler.$" -gUnknown_819C4A5:: @ 819C4A5 +SaffronCity_PokemonTrainerFanClub_Text_EveryonesYourFanButICantBe:: @ 819C4A5 .string "Oh!\n" .string "{PLAYER}!\p" .string "Everyone's been all excited about\n" @@ -48,12 +48,12 @@ gUnknown_819C4A5:: @ 819C4A5 .string "Once I became {STR_VAR_1}'s fan,\n" .string "I can't just stop being a fan.$" -gUnknown_819C55C:: @ 819C55C +SaffronCity_PokemonTrainerFanClub_Text_TrainersCoolWhenBattling:: @ 819C55C .string "I think TRAINERS are so cool when\n" .string "they're battling.\p" .string "Don't you think so, too?$" -gUnknown_819C5A9:: @ 819C5A9 +SaffronCity_PokemonTrainerFanClub_Text_CanYouAutographShorts:: @ 819C5A9 .string "Oh! It's {PLAYER}!\n" .string "Too cool!\p" .string "Oh!\n" @@ -61,7 +61,7 @@ gUnknown_819C5A9:: @ 819C5A9 .string "Can you autograph something?\n" .string "How about my shorts?$" -gUnknown_819C600:: @ 819C600 +SaffronCity_PokemonTrainerFanClub_Text_CountingOnYou:: @ 819C600 .string "However hot it's been…\p" .string "And however cold it may get…\p" .string "I've always believed in, and worn,\n" @@ -71,7 +71,7 @@ gUnknown_819C600:: @ 819C600 .string "I believe in you just as much as\n" .string "I believe in shorts!$" -gUnknown_819C6BA:: @ 819C6BA +SaffronCity_PokemonTrainerFanClub_Text_BrocksMyHero:: @ 819C6BA .string "BROCK's my hero!\n" .string "He's a man among men!\p" .string "Heheh, I got my mom to do\n" @@ -79,7 +79,7 @@ gUnknown_819C6BA:: @ 819C6BA .string "I got her to embroider “BROCK”\n" .string "on my shorts!$" -gUnknown_819C73A:: @ 819C73A +SaffronCity_PokemonTrainerFanClub_Text_BrocksFanToBitterEnd:: @ 819C73A .string "… …\p" .string "… …\n" .string "I'm BROCK's fan!\p" @@ -88,13 +88,13 @@ gUnknown_819C73A:: @ 819C73A .string "and on my shorts!\p" .string "I'll be his fan to the bitter end!$" -gUnknown_819C7C8:: @ 819C7C8 +SaffronCity_PokemonTrainerFanClub_Text_BrocksLastWordOnCool:: @ 819C7C8 .string "BROCK's the last word on cool,\n" .string "end of story!\p" .string "Now there's a guy who I want to\n" .string "be like!$" -gUnknown_819C81E:: @ 819C81E +SaffronCity_PokemonTrainerFanClub_Text_HadPleasureOfWatchingYouBattle:: @ 819C81E .string "{PLAYER}, I've had the pleasure of\n" .string "watching you battle.\p" .string "It brings back sweet memories of\n" @@ -102,7 +102,7 @@ gUnknown_819C81E:: @ 819C81E .string "May you continue to find success.\n" .string "You have a fan in me!$" -gUnknown_819C8C1:: @ 819C8C1 +SaffronCity_PokemonTrainerFanClub_Text_NeverSeenTrainerOfYourMagnificence:: @ 819C8C1 .string "I have journeyed far and wide\n" .string "across the lands.\p" .string "But never have I seen a TRAINER\n" @@ -112,13 +112,13 @@ gUnknown_819C8C1:: @ 819C8C1 .string "Make that a promise to me,\n" .string "my young idol!$" -gUnknown_819C986:: @ 819C986 +SaffronCity_PokemonTrainerFanClub_Text_HmmAndYouAre:: @ 819C986 .string "Hmm…\n" .string "And you are?\p" .string "Were you hoping to sign up for\n" .string "a membership in our FAN CLUB?$" -gUnknown_819C9D5:: @ 819C9D5 +SaffronCity_PokemonTrainerFanClub_Text_YouveStillAWaysToGo:: @ 819C9D5 .string "Ah, so you are the much-\n" .string "talked-about {PLAYER}.\p" .string "You certainly do have the look of\n" @@ -128,7 +128,7 @@ gUnknown_819C9D5:: @ 819C9D5 .string "… …\p" .string "You've still a ways to go!$" -gUnknown_819CA7C:: @ 819CA7C +SaffronCity_PokemonTrainerFanClub_Text_YoullBeTalkedAboutIfYouKeepWinning:: @ 819CA7C .string "All of us gathered here are fans\n" .string "of POKéMON TRAINERS.\p" .string "The way they look in battle…\n" @@ -136,12 +136,12 @@ gUnknown_819CA7C:: @ 819CA7C .string "Perhaps you will be talked about\n" .string "here, too, if you keep winning.$" -gUnknown_819CB32:: @ 819CB32 +SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeYouOneDay:: @ 819CB32 .string "It's {PLAYER}!\n" .string "It's {PLAYER}!\p" .string "I want to be like {PLAYER} one day!$" -gUnknown_819CB62:: @ 819CB62 +SaffronCity_PokemonTrainerFanClub_Text_EveryoneButMeStoppedBeingYourFan:: @ 819CB62 .string "Everyone stopped being {PLAYER}'s\n" .string "fan…\p" .string "But that means I can have {PLAYER}\n" @@ -149,13 +149,13 @@ gUnknown_819CB62:: @ 819CB62 .string "Yay! Go for it!\n" .string "My one and only {PLAYER}!$" -gUnknown_819CBD3:: @ 819CBD3 +SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeSabrina:: @ 819CBD3 .string "Do you know what?\n" .string "I want to be like SABRINA!\p" .string "I want to be a psychic girl just\n" .string "like her!$" -gUnknown_819CC2B:: @ 819CC2B +SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingSabrinasFan:: @ 819CC2B .string "Even if I'm the only one, I won't\n" .string "stop being SABRINA's fan.\p" .string "My dream is to be like SABRINA,\n" @@ -163,11 +163,11 @@ gUnknown_819CC2B:: @ 819CC2B .string "I want to be a psychic girl just\n" .string "like her!$" -gUnknown_819CCC2:: @ 819CCC2 +SaffronCity_PokemonTrainerFanClub_Text_CanIBecomeCoolTrainerOneDay:: @ 819CCC2 .string "I wonder if I can become a cool\n" .string "TRAINER one day?$" -gUnknown_819CCF3:: @ 819CCF3 +SaffronCity_PokemonTrainerFanClub_Text_TheWayYouBattleIsCool:: @ 819CCF3 .string "Oh, man, oh, man!\n" .string "Cool! Too cool!\p" .string "…Huh?\n" @@ -175,7 +175,7 @@ gUnknown_819CCF3:: @ 819CCF3 .string "Just the way you battle.\n" .string "That's cool.$" -gUnknown_819CD4E:: @ 819CD4E +SaffronCity_PokemonTrainerFanClub_Text_ImOnlyOneLeftOfYourFans:: @ 819CD4E .string "Yo, {PLAYER}!\p" .string "Looks like I'm the only one left\n" .string "out of your fans.\p" @@ -183,13 +183,13 @@ gUnknown_819CD4E:: @ 819CD4E .string "fan… It's less stressful.\p" .string "Keep up and at it!$" -gUnknown_819CDDA:: @ 819CDDA +SaffronCity_PokemonTrainerFanClub_Text_LoveWayTrainerTalks:: @ 819CDDA .string "{STR_VAR_1}'s cool, huh?\n" .string "I love the way he talks.\p" .string "I'd really relish a chance to meet\n" .string "him in person once.$" -gUnknown_819CE3A:: @ 819CE3A +SaffronCity_PokemonTrainerFanClub_Text_ImLoneTrainerFan:: @ 819CE3A .string "Huh, can you believe it?\n" .string "Everyone turned into your fans.\p" .string "So after all we've been through,\n" @@ -197,7 +197,7 @@ gUnknown_819CE3A:: @ 819CE3A .string "Eh, being the one and only\n" .string "{STR_VAR_1} fan's my style, anyway.$" -gUnknown_819CEDF:: @ 819CEDF +SaffronCity_PokemonTrainerFanClub_Text_AdoreWayYouBattle:: @ 819CEDF .string "Oh, my goodness!\n" .string "Is it really you, {PLAYER}?\p" .string "I have to tell you, I adore the\n" @@ -205,7 +205,7 @@ gUnknown_819CEDF:: @ 819CEDF .string "I hope you'll keep at it.\n" .string "I'll be your number one fan!$" -gUnknown_819CF6D:: @ 819CF6D +SaffronCity_PokemonTrainerFanClub_Text_ImYourNumberOneFan:: @ 819CF6D .string "Oh, my goodness!\n" .string "If it isn't {PLAYER}!\p" .string "It's so disappointing… I realized\n" @@ -214,13 +214,13 @@ gUnknown_819CF6D:: @ 819CF6D .string "Let me cheer you on, at least!\p" .string "Hurray, hurray, {PLAYER}!$" -gUnknown_819D01F:: @ 819D01F +SaffronCity_PokemonTrainerFanClub_Text_TrainerHasBeenOnFire:: @ 819D01F .string "Recently, {STR_VAR_1} has been on\n" .string "fire.\p" .string "The way he battles… It's just \n" .string "the way that I like it!$" -gUnknown_819D075:: @ 819D075 +SaffronCity_PokemonTrainerFanClub_Text_EveryoneTalksAboutYou:: @ 819D075 .string "Oh, hello!\n" .string "If it isn't {PLAYER}!\p" .string "Lately, all everyone talks about\n" @@ -228,25 +228,25 @@ gUnknown_819D075:: @ 819D075 .string "I'm feeling lonesome because I\n" .string "prefer {STR_VAR_1}.$" -gUnknown_819D0E3:: @ 819D0E3 +SaffronCity_PokemonTrainerFanClub_Text_YouReallyAreAmazing:: @ 819D0E3 .string "Amazing!\n" .string "{PLAYER}, you really are amazing!\p" .string "Instead of just watching, maybe\n" .string "I should become a TRAINER, too.$" -gUnknown_819D148:: @ 819D148 +SaffronCity_PokemonTrainerFanClub_Text_ImYourOnlyFan:: @ 819D148 .string "I'm your only fan…\n" .string "Sigh… This is lonely…\p" .string "Can't you try harder and make the\n" .string "others take notice of you?$" -gUnknown_819D1AE:: @ 819D1AE +SaffronCity_PokemonTrainerFanClub_Text_WhyCantOthersSeeMastersDignity:: @ 819D1AE .string "Master {STR_VAR_1} is so dignified…\n" .string "He is so my type.\p" .string "Why can't the others see the\n" .string "dignity he simply oozes?$" -gUnknown_819D211:: @ 819D211 +SaffronCity_PokemonTrainerFanClub_Text_BelieveInMasterWithAllMyHeart:: @ 819D211 .string "I believe in Master {STR_VAR_1}\n" .string "with all my heart.\p" .string "Even if I am the only one to\n" @@ -255,14 +255,14 @@ gUnknown_819D211:: @ 819D211 .string "Not if I keep thinking about Master\n" .string "{STR_VAR_1}.$" -gUnknown_819D2B4:: @ 819D2B4 +SaffronCity_PokemonTrainerFanClub_Text_YourBattleStyleIsEducational:: @ 819D2B4 .string "Hiyah!\p" .string "Your battling style is most\n" .string "educational.\p" .string "I hope that you will keep plugging\n" .string "away at success, hiyah!$" -gUnknown_819D31F:: @ 819D31F +SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingYourFan:: @ 819D31F .string "Instead of just watching others\n" .string "battle, battle yourself!\p" .string "…My DOJO's MASTER chewed me out\n" @@ -271,7 +271,7 @@ gUnknown_819D31F:: @ 819D31F .string "being your fan!\p" .string "I can't stop being your fan!$" -gUnknown_819D3D2:: @ 819D3D2 +SaffronCity_PokemonTrainerFanClub_Text_OnlyMasterHasMyRespect:: @ 819D3D2 .string "Hiyah! There is but one TRAINER\n" .string "who has my respect.\p" .string "And that is none other than my\n" @@ -279,7 +279,7 @@ gUnknown_819D3D2:: @ 819D3D2 .string "You should become a fan of my\n" .string "MASTER like me! Hiyah!$" -gUnknown_819D477:: @ 819D477 +SaffronCity_PokemonTrainerFanClub_Text_NeverBeFanOfAnyoneButMaster:: @ 819D477 .string "Hiyah! I respect my MASTER at the\n" .string "FIGHTING DOJO.\p" .string "I will never become a fan of\n" diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 05f1cd544..271bc6407 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -409,15 +409,15 @@ "IndigoPlateau_PokemonCenter_2F" ], "gMapGroup14": [ - "SaffronCity_House1_1F", - "SaffronCity_House1_2F", + "SaffronCity_CopycatsHouse_1F", + "SaffronCity_CopycatsHouse_2F", "SaffronCity_Dojo", "SaffronCity_Gym", - "SaffronCity_House2", + "SaffronCity_House", "SaffronCity_Mart", "SaffronCity_PokemonCenter_1F", "SaffronCity_PokemonCenter_2F", - "SaffronCity_House3", + "SaffronCity_MrPsychicsHouse", "SaffronCity_PokemonTrainerFanClub" ], "gMapGroup15": [ diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index 6fe5607dd..a7facee85 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -118,12 +118,12 @@ SafariZone_North_RestHouse_EventScript_BaldingMan:: @ 81ACED3 release end -SaffronCity_PokemonCenter_1F_EventScript_1ACEEC:: @ 81ACEEC +SaffronCity_PokemonCenter_1F_EventScript_PokemonJournalSabrina:: @ 81ACEEC lock faceplayer famechecker FAMECHECKER_SABRINA, 4 textcolor 3 - msgbox gUnknown_81B1753 + msgbox PokemonJournal_Text_SpecialFeatureSabrina release end @@ -160,12 +160,12 @@ FiveIsland_PokemonCenter_1F_EventScript_1ACF5F:: @ 81ACF5F release end -SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A:: @ 81ACF7A +SaffronCity_PokemonTrainerFanClub_EventScript_PokemonJournalBruno:: @ 81ACF7A lock faceplayer famechecker FAMECHECKER_BRUNO, 2 textcolor 3 - msgbox gUnknown_81B1913 + msgbox PokemonJournal_Text_SpecialFeatureBruno release end @@ -215,15 +215,15 @@ EventScript_1AD021:: @ 81AD021 lock faceplayer famechecker FAMECHECKER_LANCE, 1 - msgbox Text_181569 + msgbox SaffronCity_Text_HowCanClubNotRecognizeLance release end -SaffronCity_EventScript_1AD03A:: @ 81AD03A +SaffronCity_EventScript_BattleGirl:: @ 81AD03A lock faceplayer famechecker FAMECHECKER_LANCE, 2 - msgbox Text_181569 + msgbox SaffronCity_Text_HowCanClubNotRecognizeLance release end diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc index 8be9aec80..59815ea7a 100644 --- a/data/text/fame_checker.inc +++ b/data/text/fame_checker.inc @@ -1413,7 +1413,7 @@ PokemonJournal_Text_SpecialFeatureKoga:: @ 81B16A8 .string "He even concocts medicine to nurse\n" .string "his POKéMON to health.$" -gUnknown_81B1753:: @ 81B1753 +PokemonJournal_Text_SpecialFeatureSabrina:: @ 81B1753 .string "POKéMON JOURNAL\p" .string "Special Feature: SAFFRON GYM\n" .string "LEADER SABRINA!\p" @@ -1437,7 +1437,7 @@ gUnknown_81B187F:: @ 81B187F .string "and cool battling style, LORELEI\l" .string "has a surprising secret!$" -gUnknown_81B1913:: @ 81B1913 +PokemonJournal_Text_SpecialFeatureBruno:: @ 81B1913 .string "POKéMON JOURNAL\p" .string "Special Feature:\n" .string "ELITE FOUR's BRUNO!\p" -- cgit v1.2.3 From 25092f500dc1ec43b1b09b988988cf31b18d7b1d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 26 Jan 2020 00:03:06 -0500 Subject: Document Mt Moon scripts --- data/maps/MtMoon_1F/map.json | 18 +++---- data/maps/MtMoon_1F/scripts.inc | 46 ++++++++--------- data/maps/MtMoon_1F/text.inc | 49 ++++++++++-------- data/maps/MtMoon_B2F/map.json | 16 +++--- data/maps/MtMoon_B2F/scripts.inc | 106 ++++++++++++++++++++------------------- data/maps/MtMoon_B2F/text.inc | 48 ++++++++---------- data/scripts/fame_checker.inc | 4 +- 7 files changed, 145 insertions(+), 142 deletions(-) (limited to 'data') diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json index e32b5f379..b12af5aae 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "MtMoon_1F_EventScript_16063C", + "script": "MtMoon_1F_EventScript_Iris", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "MtMoon_1F_EventScript_160681", + "script": "MtMoon_1F_EventScript_Robby", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "MtMoon_1F_EventScript_160653", + "script": "MtMoon_1F_EventScript_Jovan", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 3, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "MtMoon_1F_EventScript_160625", + "script": "MtMoon_1F_EventScript_Miriam", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "MtMoon_1F_EventScript_16066A", + "script": "MtMoon_1F_EventScript_Kent", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "MtMoon_1F_EventScript_16060E", + "script": "MtMoon_1F_EventScript_Josh", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 2, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "MtMoon_1F_EventScript_1605F7", + "script": "MtMoon_1F_EventScript_Macros", "flag": "0" }, { @@ -192,7 +192,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_1F_EventScript_1ACE03", + "script": "MtMoon_1F_EventScript_BaldingMan", "flag": "0" } ], @@ -233,7 +233,7 @@ "x": 19, "y": 26, "elevation": 0, - "script": "MtMoon_1F_EventScript_1605EE" + "script": "MtMoon_1F_EventScript_ZubatSign" } ] } diff --git a/data/maps/MtMoon_1F/scripts.inc b/data/maps/MtMoon_1F/scripts.inc index 4c80943d1..2ddfef089 100644 --- a/data/maps/MtMoon_1F/scripts.inc +++ b/data/maps/MtMoon_1F/scripts.inc @@ -6,41 +6,41 @@ MtMoon_1F_OnTransition:: @ 81605EA setworldmapflag FLAG_WORLD_MAP_MT_MOON_1F end -MtMoon_1F_EventScript_1605EE:: @ 81605EE - msgbox gUnknown_8172AE0, MSGBOX_SIGN +MtMoon_1F_EventScript_ZubatSign:: @ 81605EE + msgbox MtMoon_1F_Text_ZubatIsABloodsucker, MSGBOX_SIGN end -MtMoon_1F_EventScript_1605F7:: @ 81605F7 - trainerbattle_single TRAINER_HIKER_MARCOS, Text_17279D, Text_1727CB - msgbox gUnknown_81727DF, MSGBOX_AUTOCLOSE +MtMoon_1F_EventScript_Macros:: @ 81605F7 + trainerbattle_single TRAINER_HIKER_MARCOS, MtMoon_1F_Text_MarcosIntro, MtMoon_1F_Text_MarcosDefeat + msgbox MtMoon_1F_Text_MarcosPostBattle, MSGBOX_AUTOCLOSE end -MtMoon_1F_EventScript_16060E:: @ 816060E - trainerbattle_single TRAINER_YOUNGSTER_JOSH, Text_17281D, Text_172844 - msgbox gUnknown_8172863, MSGBOX_AUTOCLOSE +MtMoon_1F_EventScript_Josh:: @ 816060E + trainerbattle_single TRAINER_YOUNGSTER_JOSH, MtMoon_1F_Text_JoshIntro, MtMoon_1F_Text_JoshDefeat + msgbox MtMoon_1F_Text_JoshPostBattle, MSGBOX_AUTOCLOSE end -MtMoon_1F_EventScript_160625:: @ 8160625 - trainerbattle_single TRAINER_LASS_MIRIAM, Text_172896, Text_1728C3 - msgbox gUnknown_81728D2, MSGBOX_AUTOCLOSE +MtMoon_1F_EventScript_Miriam:: @ 8160625 + trainerbattle_single TRAINER_LASS_MIRIAM, MtMoon_1F_Text_MiriamIntro, MtMoon_1F_Text_MiriamDefeat + msgbox MtMoon_1F_Text_MiriamPostBattle, MSGBOX_AUTOCLOSE end -MtMoon_1F_EventScript_16063C:: @ 816063C - trainerbattle_single TRAINER_LASS_IRIS, Text_172972, Text_1729A4 - msgbox gUnknown_81729AC, MSGBOX_AUTOCLOSE +MtMoon_1F_EventScript_Iris:: @ 816063C + trainerbattle_single TRAINER_LASS_IRIS, MtMoon_1F_Text_IrisIntro, MtMoon_1F_Text_IrisDefeat + msgbox MtMoon_1F_Text_IrisPostBattle, MSGBOX_AUTOCLOSE end -MtMoon_1F_EventScript_160653:: @ 8160653 - trainerbattle_single TRAINER_SUPER_NERD_JOVAN, Text_17290B, Text_172927 - msgbox gUnknown_817293C, MSGBOX_AUTOCLOSE +MtMoon_1F_EventScript_Jovan:: @ 8160653 + trainerbattle_single TRAINER_SUPER_NERD_JOVAN, MtMoon_1F_Text_JovanIntro, MtMoon_1F_Text_JovanDefeat + msgbox MtMoon_1F_Text_JovanPostBattle, MSGBOX_AUTOCLOSE end -MtMoon_1F_EventScript_16066A:: @ 816066A - trainerbattle_single TRAINER_BUG_CATCHER_KENT, Text_1729EA, Text_172A1A - msgbox gUnknown_8172A26, MSGBOX_AUTOCLOSE +MtMoon_1F_EventScript_Kent:: @ 816066A + trainerbattle_single TRAINER_BUG_CATCHER_KENT, MtMoon_1F_Text_KentIntro, MtMoon_1F_Text_KentDefeat + msgbox MtMoon_1F_Text_KentPostBattle, MSGBOX_AUTOCLOSE end -MtMoon_1F_EventScript_160681:: @ 8160681 - trainerbattle_single TRAINER_BUG_CATCHER_ROBBY, Text_172A55, Text_172A8F - msgbox gUnknown_8172A97, MSGBOX_AUTOCLOSE +MtMoon_1F_EventScript_Robby:: @ 8160681 + trainerbattle_single TRAINER_BUG_CATCHER_ROBBY, MtMoon_1F_Text_RobbyIntro, MtMoon_1F_Text_RobbyDefeat + msgbox MtMoon_1F_Text_RobbyPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MtMoon_1F/text.inc b/data/maps/MtMoon_1F/text.inc index 86028da5c..249c9dd50 100644 --- a/data/maps/MtMoon_1F/text.inc +++ b/data/maps/MtMoon_1F/text.inc @@ -1,87 +1,92 @@ -Text_17279D:: @ 817279D +MtMoon_1F_Text_MarcosIntro:: @ 817279D .string "WHOA!\n" .string "You shocked me!\l" .string "…Oh, you're just a kid!$" -Text_1727CB:: @ 81727CB +MtMoon_1F_Text_MarcosDefeat:: @ 81727CB .string "Wow!\n" .string "Shocked again!$" -gUnknown_81727DF:: @ 81727DF +MtMoon_1F_Text_MarcosPostBattle:: @ 81727DF .string "Kids like you shouldn't be\n" .string "wandering around here in the dark.$" -Text_17281D:: @ 817281D +MtMoon_1F_Text_JoshIntro:: @ 817281D .string "Did you come to explore the cave,\n" .string "too?$" -Text_172844:: @ 8172844 +MtMoon_1F_Text_JoshDefeat:: @ 8172844 .string "Losing stinks!\n" .string "It's so uncool.$" -gUnknown_8172863:: @ 8172863 +MtMoon_1F_Text_JoshPostBattle:: @ 8172863 .string "I came all the way down here to\n" .string "show off to girls.$" -Text_172896:: @ 8172896 +MtMoon_1F_Text_MiriamIntro:: @ 8172896 .string "Wow! It's way bigger in here than\n" .string "I thought!$" -Text_1728C3:: @ 81728C3 +MtMoon_1F_Text_MiriamDefeat:: @ 81728C3 .string "Oh!\n" .string "I lost it!$" -gUnknown_81728D2:: @ 81728D2 +MtMoon_1F_Text_MiriamPostBattle:: @ 81728D2 .string "How do you get out of here?\n" .string "It's so big, I may get lost.$" -Text_17290B:: @ 817290B +MtMoon_1F_Text_JovanIntro:: @ 817290B .string "What!\n" .string "Don't sneak up on me!$" -Text_172927:: @ 8172927 +MtMoon_1F_Text_JovanDefeat:: @ 8172927 .string "My POKéMON won't do!$" -gUnknown_817293C:: @ 817293C +MtMoon_1F_Text_JovanPostBattle:: @ 817293C .string "I have to find stronger POKéMON.\n" .string "Where might they be?$" -Text_172972:: @ 8172972 +MtMoon_1F_Text_IrisIntro:: @ 8172972 .string "What?\n" .string "I'm waiting for my friends to find\l" .string "me here.$" -Text_1729A4:: @ 81729A4 +MtMoon_1F_Text_IrisDefeat:: @ 81729A4 .string "I lost?$" -gUnknown_81729AC:: @ 81729AC +MtMoon_1F_Text_IrisPostBattle:: @ 81729AC .string "I came because I heard there are\n" .string "some very rare fossils here.$" -Text_1729EA:: @ 81729EA +MtMoon_1F_Text_KentIntro:: @ 81729EA .string "Suspicious men are in the cave.\n" .string "What about you?$" -Text_172A1A:: @ 8172A1A +MtMoon_1F_Text_KentDefeat:: @ 8172A1A .string "You got me!$" -gUnknown_8172A26:: @ 8172A26 +MtMoon_1F_Text_KentPostBattle:: @ 8172A26 .string "I saw them!\n" .string "I'm sure they're from TEAM ROCKET!$" -Text_172A55:: @ 8172A55 +MtMoon_1F_Text_RobbyIntro:: @ 8172A55 .string "You need to go through this cave\n" .string "to get to CERULEAN CITY.$" -Text_172A8F:: @ 8172A8F +MtMoon_1F_Text_RobbyDefeat:: @ 8172A8F .string "I lost.$" -gUnknown_8172A97:: @ 8172A97 +MtMoon_1F_Text_RobbyPostBattle:: @ 8172A97 .string "ZUBAT is tough!\n" .string "But if you can catch one, you'll\l" .string "be able to count on it.$" -gUnknown_8172AE0:: @ 8172AE0 +MtMoon_1F_Text_ZubatIsABloodsucker:: @ 8172AE0 .string "Beware!\n" .string "ZUBAT is a bloodsucker!$" +MtMoon_1F_Text_BrockHelpsExcavateFossils:: @ 8172B00 + .string "Hi, I'm excavating for fossils here\n" + .string "under MT. MOON.\p" + .string "Sometimes, BROCK of PEWTER GYM\n" + .string "lends me a hand.$" diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index ac65802cb..f3c51828c 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_B2F_EventScript_16071B", + "script": "MtMoon_B2F_EventScript_DomeFossil", "flag": "FLAG_HIDE_DOME_FOSSIL" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_B2F_EventScript_16077F", + "script": "MtMoon_B2F_EventScript_HelixFossil", "flag": "FLAG_HIDE_HELIX_FOSSIL" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_B2F_EventScript_1606C2", + "script": "MtMoon_B2F_EventScript_Miguel", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "MtMoon_B2F_EventScript_160829", + "script": "MtMoon_B2F_EventScript_Grunt4", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "MtMoon_B2F_EventScript_1607E4", + "script": "MtMoon_B2F_EventScript_Grunt1", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "MtMoon_B2F_EventScript_160812", + "script": "MtMoon_B2F_EventScript_Grunt3", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "MtMoon_B2F_EventScript_1607FB", + "script": "MtMoon_B2F_EventScript_Grunt2", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { @@ -195,7 +195,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_MT_MOON_B2F", "var_value": 0, - "script": "MtMoon_B2F_EventScript_1606B0" + "script": "MtMoon_B2F_EventScript_MiguelTrigger" } ], "bg_events": [ diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 71c458c12..515242568 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -1,138 +1,142 @@ +.equ LOCALID_DOME_FOSSIL, 1 +.equ LOCALID_HELIX_FOSSIL, 2 +.equ LOCALID_MIGUEL, 3 + MtMoon_B2F_MapScripts:: @ 8160699 map_script MAP_SCRIPT_ON_TRANSITION, MtMoon_B2F_OnTransition .byte 0 MtMoon_B2F_OnTransition:: @ 816069F - call_if_unset FLAG_GOT_FOSSIL_FROM_MT_MOON, EventScript_1606A9 + call_if_unset FLAG_GOT_FOSSIL_FROM_MT_MOON, MtMoon_B2F_EventScript_ShowFossils end -EventScript_1606A9:: @ 81606A9 +MtMoon_B2F_EventScript_ShowFossils:: @ 81606A9 clearflag FLAG_HIDE_DOME_FOSSIL clearflag FLAG_HIDE_HELIX_FOSSIL return -MtMoon_B2F_EventScript_1606B0:: @ 81606B0 +MtMoon_B2F_EventScript_MiguelTrigger:: @ 81606B0 lockall - applymovement 3, Movement_WalkInPlaceFastestRight + applymovement LOCALID_MIGUEL, Movement_WalkInPlaceFastestRight waitmovement 0 - call EventScript_1606DD + call MtMoon_B2F_EventScript_BattleMiguel releaseall end -MtMoon_B2F_EventScript_1606C2:: @ 81606C2 +MtMoon_B2F_EventScript_Miguel:: @ 81606C2 lock faceplayer - goto_if_set FLAG_GOT_FOSSIL_FROM_MT_MOON, EventScript_160707 - goto_if_defeated TRAINER_SUPER_NERD_MIGUEL, EventScript_160711 - call EventScript_1606DD + goto_if_set FLAG_GOT_FOSSIL_FROM_MT_MOON, MtMoon_B2F_EventScript_MiguelFossilPicked + goto_if_defeated TRAINER_SUPER_NERD_MIGUEL, MtMoon_B2F_EventScript_MiguelGoPickFossil + call MtMoon_B2F_EventScript_BattleMiguel release end -EventScript_1606DD:: @ 81606DD +MtMoon_B2F_EventScript_BattleMiguel:: @ 81606DD textcolor 0 - message Text_172B64 + message MtMoon_B2F_Text_MiguelIntro waitmessage playbgm MUS_EXEYE, 0 waitbuttonpress - setvar VAR_LAST_TALKED, 3 - trainerbattle_no_intro TRAINER_SUPER_NERD_MIGUEL, Text_172B99 + setvar VAR_LAST_TALKED, LOCALID_MIGUEL + trainerbattle_no_intro TRAINER_SUPER_NERD_MIGUEL, MtMoon_B2F_Text_MiguelDefeat setvar VAR_MAP_SCENE_MT_MOON_B2F, 1 - msgbox gUnknown_8172BAB + msgbox MtMoon_B2F_Text_WellEachTakeAFossil return -EventScript_160707:: @ 8160707 - msgbox gUnknown_8172BFB +MtMoon_B2F_EventScript_MiguelFossilPicked:: @ 8160707 + msgbox MtMoon_B2F_Text_LabOnCinnabarRegeneratesFossils release end -EventScript_160711:: @ 8160711 - msgbox gUnknown_8172BAB +MtMoon_B2F_EventScript_MiguelGoPickFossil:: @ 8160711 + msgbox MtMoon_B2F_Text_WellEachTakeAFossil release end -MtMoon_B2F_EventScript_16071B:: @ 816071B +MtMoon_B2F_EventScript_DomeFossil:: @ 816071B lock faceplayer - msgbox gUnknown_8172E77, MSGBOX_YESNO + msgbox MtMoon_B2F_Text_YouWantDomeFossil, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1607DE - removeobject 1 - giveitem_msg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, MUS_FAN5 + goto_if_eq MtMoon_B2F_EventScript_DontTakeFossil + removeobject LOCALID_DOME_FOSSIL + giveitem_msg MtMoon_B2F_Text_ObtainedDomeFossil, ITEM_DOME_FOSSIL, 1, MUS_FAN5 closemessage special sub_8112364 delay 10 - applymovement 3, Movement_16077A + applymovement LOCALID_MIGUEL, MtMoon_B2F_Movement_MiguelToHelixFossil waitmovement 0 - moveobjectoffscreen 3 + moveobjectoffscreen LOCALID_MIGUEL textcolor 0 playfanfare MUS_FAN5 - message Text_172BD6 + message MtMoon_B2F_Text_ThenThisFossilIsMine waitmessage waitfanfare - removeobject 2 + removeobject LOCALID_HELIX_FOSSIL setflag FLAG_GOT_DOME_FOSSIL setflag FLAG_GOT_FOSSIL_FROM_MT_MOON release end -Movement_16077A:: @ 816077A +MtMoon_B2F_Movement_MiguelToHelixFossil:: @ 816077A walk_right walk_up walk_up walk_up step_end -MtMoon_B2F_EventScript_16077F:: @ 816077F +MtMoon_B2F_EventScript_HelixFossil:: @ 816077F lock faceplayer - msgbox gUnknown_8172E94, MSGBOX_YESNO + msgbox MtMoon_B2F_Text_YouWantHelixFossil, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1607DE - removeobject 2 - giveitem_msg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, MUS_FAN5 + goto_if_eq MtMoon_B2F_EventScript_DontTakeFossil + removeobject LOCALID_HELIX_FOSSIL + giveitem_msg MtMoon_B2F_Text_ObtainedHelixFossil, ITEM_HELIX_FOSSIL, 1, MUS_FAN5 closemessage special sub_8112364 delay 10 - applymovement 3, Movement_1607E0 + applymovement LOCALID_MIGUEL, MtMoon_B2F_Movement_MiguelToDomeFossil waitmovement 0 - moveobjectoffscreen 3 + moveobjectoffscreen LOCALID_MIGUEL textcolor 0 playfanfare MUS_FAN5 - message Text_172BD6 + message MtMoon_B2F_Text_ThenThisFossilIsMine waitmessage waitfanfare - removeobject 1 + removeobject LOCALID_DOME_FOSSIL setflag FLAG_GOT_HELIX_FOSSIL setflag FLAG_GOT_FOSSIL_FROM_MT_MOON release end -EventScript_1607DE:: @ 81607DE +MtMoon_B2F_EventScript_DontTakeFossil:: @ 81607DE release end -Movement_1607E0:: @ 81607E0 +MtMoon_B2F_Movement_MiguelToDomeFossil:: @ 81607E0 walk_up walk_up walk_up step_end -MtMoon_B2F_EventScript_1607E4:: @ 81607E4 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT, Text_172C5A, Text_172CB8 - msgbox gUnknown_8172CCB, MSGBOX_AUTOCLOSE +MtMoon_B2F_EventScript_Grunt1:: @ 81607E4 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT, MtMoon_B2F_Text_Grunt1Intro, MtMoon_B2F_Text_Grunt1Defeat + msgbox MtMoon_B2F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -MtMoon_B2F_EventScript_1607FB:: @ 81607FB - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_2, Text_172CFC, Text_172D46 - msgbox gUnknown_8172D51, MSGBOX_AUTOCLOSE +MtMoon_B2F_EventScript_Grunt2:: @ 81607FB + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_2, MtMoon_B2F_Text_Grunt2Intro, MtMoon_B2F_Text_Grunt2Defeat + msgbox MtMoon_B2F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end -MtMoon_B2F_EventScript_160812:: @ 8160812 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_3, Text_172D82, Text_172DAF - msgbox gUnknown_8172DC1, MSGBOX_AUTOCLOSE +MtMoon_B2F_EventScript_Grunt3:: @ 8160812 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_3, MtMoon_B2F_Text_Grunt3Intro, MtMoon_B2F_Text_Grunt3Defeat + msgbox MtMoon_B2F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE end -MtMoon_B2F_EventScript_160829:: @ 8160829 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_4, Text_172DF0, Text_172E3E - msgbox gUnknown_8172E4B, MSGBOX_AUTOCLOSE +MtMoon_B2F_EventScript_Grunt4:: @ 8160829 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_4, MtMoon_B2F_Text_Grunt4Intro, MtMoon_B2F_Text_Grunt4Defeat + msgbox MtMoon_B2F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MtMoon_B2F/text.inc b/data/maps/MtMoon_B2F/text.inc index 2f27312db..fd4b564f0 100644 --- a/data/maps/MtMoon_B2F/text.inc +++ b/data/maps/MtMoon_B2F/text.inc @@ -1,90 +1,84 @@ -Text_172B00:: @ 8172B00 - .string "Hi, I'm excavating for fossils here\n" - .string "under MT. MOON.\p" - .string "Sometimes, BROCK of PEWTER GYM\n" - .string "lends me a hand.$" - -Text_172B64:: @ 8172B64 +MtMoon_B2F_Text_MiguelIntro:: @ 8172B64 .string "Hey, stop!\p" .string "I found these fossils!\n" .string "They're both mine!$" -Text_172B99:: @ 8172B99 +MtMoon_B2F_Text_MiguelDefeat:: @ 8172B99 .string "Okay!\n" .string "I'll share!$" -gUnknown_8172BAB:: @ 8172BAB +MtMoon_B2F_Text_WellEachTakeAFossil:: @ 8172BAB .string "We'll each take a fossil!\n" .string "No being greedy!$" -Text_172BD6:: @ 8172BD6 +MtMoon_B2F_Text_ThenThisFossilIsMine:: @ 8172BD6 .string "All right.\n" .string "Then this fossil is mine!$" -gUnknown_8172BFB:: @ 8172BFB +MtMoon_B2F_Text_LabOnCinnabarRegeneratesFossils:: @ 8172BFB .string "Far away, on CINNABAR ISLAND,\n" .string "there's a POKéMON LAB.\p" .string "They do research on regenerating\n" .string "fossils.$" -Text_172C5A:: @ 8172C5A +MtMoon_B2F_Text_Grunt1Intro:: @ 8172C5A .string "We, TEAM ROCKET, shall find the\n" .string "fossils!\p" .string "Reviving POKéMON from them will\n" .string "earn us huge riches!$" -Text_172CB8:: @ 8172CB8 +MtMoon_B2F_Text_Grunt1Defeat:: @ 8172CB8 .string "Urgh!\n" .string "Now I'm mad!$" -gUnknown_8172CCB:: @ 8172CCB +MtMoon_B2F_Text_Grunt1PostBattle:: @ 8172CCB .string "You made me mad!\n" .string "TEAM ROCKET will blacklist you!$" -Text_172CFC:: @ 8172CFC +MtMoon_B2F_Text_Grunt2Intro:: @ 8172CFC .string "We, TEAM ROCKET, are POKéMON\n" .string "gangsters!\l" .string "We strike fear with our strength!$" -Text_172D46:: @ 8172D46 +MtMoon_B2F_Text_Grunt2Defeat:: @ 8172D46 .string "I blew it!$" -gUnknown_8172D51:: @ 8172D51 +MtMoon_B2F_Text_Grunt2PostBattle:: @ 8172D51 .string "Darn it all!\n" .string "My associates won't stand for this!$" -Text_172D82:: @ 8172D82 +MtMoon_B2F_Text_Grunt3Intro:: @ 8172D82 .string "We're pulling a big job here!\n" .string "Get lost, kid!$" -Text_172DAF:: @ 8172DAF +MtMoon_B2F_Text_Grunt3Defeat:: @ 8172DAF .string "So, you are good…$" -gUnknown_8172DC1:: @ 8172DC1 +MtMoon_B2F_Text_Grunt3PostBattle:: @ 8172DC1 .string "If you find a fossil, give it to me\n" .string "and scram!$" -Text_172DF0:: @ 8172DF0 +MtMoon_B2F_Text_Grunt4Intro:: @ 8172DF0 .string "Little kids shouldn't be messing\n" .string "around with grown-ups!\p" .string "It could be bad news!$" -Text_172E3E:: @ 8172E3E +MtMoon_B2F_Text_Grunt4Defeat:: @ 8172E3E .string "I'm steamed!$" -gUnknown_8172E4B:: @ 8172E4B +MtMoon_B2F_Text_Grunt4PostBattle:: @ 8172E4B .string "POKéMON lived here long before\n" .string "people came.$" -gUnknown_8172E77:: @ 8172E77 +MtMoon_B2F_Text_YouWantDomeFossil:: @ 8172E77 .string "Do you want the DOME FOSSIL?$" -gUnknown_8172E94:: @ 8172E94 +MtMoon_B2F_Text_YouWantHelixFossil:: @ 8172E94 .string "Do you want the HELIX FOSSIL?$" -gUnknown_8172EB2:: @ 8172EB2 +MtMoon_B2F_Text_ObtainedHelixFossil:: @ 8172EB2 .string "Obtained the HELIX FOSSIL!$" -gUnknown_8172ECD:: @ 8172ECD +MtMoon_B2F_Text_ObtainedDomeFossil:: @ 8172ECD .string "Obtained the DOME FOSSIL!$" diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index 6fe5607dd..a7726f3e6 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -43,11 +43,11 @@ Route4_EventScript_1ACDEA:: @ 81ACDEA release end -MtMoon_1F_EventScript_1ACE03:: @ 81ACE03 +MtMoon_1F_EventScript_BaldingMan:: @ 81ACE03 lock faceplayer famechecker FAMECHECKER_BROCK, 4 - msgbox Text_172B00 + msgbox MtMoon_1F_Text_BrockHelpsExcavateFossils release end -- cgit v1.2.3 From 493c43f9b1e093db05f27ac8172680b9ddc5625d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 26 Jan 2020 01:50:14 -0500 Subject: Document Rocket Hideout scripts --- data/maps/RocketHideout_B1F/map.json | 10 +-- data/maps/RocketHideout_B1F/scripts.inc | 64 +++++++------- data/maps/RocketHideout_B1F/text.inc | 30 +++---- data/maps/RocketHideout_B2F/map.json | 2 +- data/maps/RocketHideout_B2F/scripts.inc | 6 +- data/maps/RocketHideout_B2F/text.inc | 6 +- data/maps/RocketHideout_B3F/map.json | 4 +- data/maps/RocketHideout_B3F/scripts.inc | 12 +-- data/maps/RocketHideout_B3F/text.inc | 12 +-- data/maps/RocketHideout_B4F/map.json | 8 +- data/maps/RocketHideout_B4F/scripts.inc | 122 ++++++++++++++------------- data/maps/RocketHideout_B4F/text.inc | 24 +++--- data/maps/RocketHideout_Elevator/map.json | 2 +- data/maps/RocketHideout_Elevator/scripts.inc | 78 ++++++++--------- data/maps/RocketHideout_Elevator/text.inc | 2 +- 15 files changed, 188 insertions(+), 194 deletions(-) (limited to 'data') diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json index 586bf0f0d..4314d758f 100644 --- a/data/maps/RocketHideout_B1F/map.json +++ b/data/maps/RocketHideout_B1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "RocketHideout_B1F_EventScript_1611C5", + "script": "RocketHideout_B1F_EventScript_Grunt2", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "RocketHideout_B1F_EventScript_1611AE", + "script": "RocketHideout_B1F_EventScript_Grunt1", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "RocketHideout_B1F_EventScript_1611F3", + "script": "RocketHideout_B1F_EventScript_Grunt4", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "RocketHideout_B1F_EventScript_1611DC", + "script": "RocketHideout_B1F_EventScript_Grunt3", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "RocketHideout_B1F_EventScript_16120A", + "script": "RocketHideout_B1F_EventScript_Grunt5", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc index c27dd99f3..ac95862a2 100644 --- a/data/maps/RocketHideout_B1F/scripts.inc +++ b/data/maps/RocketHideout_B1F/scripts.inc @@ -4,60 +4,60 @@ RocketHideout_B1F_MapScripts:: @ 8161195 .byte 0 RocketHideout_B1F_OnLoad:: @ 81611A0 - call_if_not_defeated TRAINER_TEAM_ROCKET_GRUNT_12 EventScript_161233 + call_if_not_defeated TRAINER_TEAM_ROCKET_GRUNT_12 RocketHideout_B1F_EventScript_SetBarrier end RocketHideout_B1F_OnTransition:: @ 81611AA setworldmapflag FLAG_WORLD_MAP_ROCKET_HIDEOUT_B1F end -RocketHideout_B1F_EventScript_1611AE:: @ 81611AE - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_8, Text_174ECA, Text_174EED - msgbox gUnknown_8174EFA, MSGBOX_AUTOCLOSE +RocketHideout_B1F_EventScript_Grunt1:: @ 81611AE + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_8, RocketHideout_B1F_Text_Grunt1Intro, RocketHideout_B1F_Text_Grunt1Defeat + msgbox RocketHideout_B1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -RocketHideout_B1F_EventScript_1611C5:: @ 81611C5 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_9, Text_174F2C, Text_174F60 - msgbox gUnknown_8174F66, MSGBOX_AUTOCLOSE +RocketHideout_B1F_EventScript_Grunt2:: @ 81611C5 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_9, RocketHideout_B1F_Text_Grunt2Intro, RocketHideout_B1F_Text_Grunt2Defeat + msgbox RocketHideout_B1F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end -RocketHideout_B1F_EventScript_1611DC:: @ 81611DC - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_10, Text_174F94, Text_174FA4 - msgbox gUnknown_8174FB3, MSGBOX_AUTOCLOSE +RocketHideout_B1F_EventScript_Grunt3:: @ 81611DC + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_10, RocketHideout_B1F_Text_Grunt3Intro, RocketHideout_B1F_Text_Grunt3Defeat + msgbox RocketHideout_B1F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE end -RocketHideout_B1F_EventScript_1611F3:: @ 81611F3 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_11, Text_174FE1, Text_174FF8 - msgbox gUnknown_8175007, MSGBOX_AUTOCLOSE +RocketHideout_B1F_EventScript_Grunt4:: @ 81611F3 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_11, RocketHideout_B1F_Text_Grunt4Intro, RocketHideout_B1F_Text_Grunt4Defeat + msgbox RocketHideout_B1F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE end -RocketHideout_B1F_EventScript_16120A:: @ 816120A - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_12, Text_17503A, Text_17505A, EventScript_161225 - msgbox gUnknown_8175060, MSGBOX_AUTOCLOSE +RocketHideout_B1F_EventScript_Grunt5:: @ 816120A + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_12, RocketHideout_B1F_Text_Grunt5Intro, RocketHideout_B1F_Text_Grunt5Defeat, RocketHideout_B1F_EventScript_DefeatedGrunt5 + msgbox RocketHideout_B1F_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE end -EventScript_161225:: @ 8161225 - call EventScript_16126A +RocketHideout_B1F_EventScript_DefeatedGrunt5:: @ 8161225 + call RocketHideout_B1F_EventScript_RemoveBarrier playse SE_KI_GASYAN special DrawWholeMapView waitse release end -EventScript_161233:: @ 8161233 - setmetatile 20, 19, 718, 1 - setmetatile 21, 19, 719, 1 - setmetatile 20, 20, 726, 1 - setmetatile 21, 20, 727, 1 - setmetatile 20, 21, 642, 0 - setmetatile 21, 21, 642, 0 +RocketHideout_B1F_EventScript_SetBarrier:: @ 8161233 + setmetatile 20, 19, METATILE_Hideout_Barrier_TopLeft_Floor, 1 + setmetatile 21, 19, METATILE_Hideout_Barrier_TopRight_Floor, 1 + setmetatile 20, 20, METATILE_Hideout_Barrier_BottomLeft, 1 + setmetatile 21, 20, METATILE_Hideout_Barrier_BottomRight, 1 + setmetatile 20, 21, METATILE_Hideout_Floor_ShadeFull, 0 + setmetatile 21, 21, METATILE_Hideout_Floor_ShadeFull, 0 return -EventScript_16126A:: @ 816126A - setmetatile 20, 19, 642, 0 - setmetatile 21, 19, 641, 0 - setmetatile 20, 20, 642, 0 - setmetatile 21, 20, 641, 0 - setmetatile 20, 21, 642, 0 - setmetatile 21, 21, 641, 0 +RocketHideout_B1F_EventScript_RemoveBarrier:: @ 816126A + setmetatile 20, 19, METATILE_Hideout_Floor_ShadeFull, 0 + setmetatile 21, 19, METATILE_Hideout_Floor, 0 + setmetatile 20, 20, METATILE_Hideout_Floor_ShadeFull, 0 + setmetatile 21, 20, METATILE_Hideout_Floor, 0 + setmetatile 20, 21, METATILE_Hideout_Floor_ShadeFull, 0 + setmetatile 21, 21, METATILE_Hideout_Floor, 0 return diff --git a/data/maps/RocketHideout_B1F/text.inc b/data/maps/RocketHideout_B1F/text.inc index fd7647e2b..9dea66b16 100644 --- a/data/maps/RocketHideout_B1F/text.inc +++ b/data/maps/RocketHideout_B1F/text.inc @@ -1,53 +1,53 @@ -Text_174ECA:: @ 8174ECA +RocketHideout_B1F_Text_Grunt1Intro:: @ 8174ECA .string "Who are you?\n" .string "How did you get here?$" -Text_174EED:: @ 8174EED +RocketHideout_B1F_Text_Grunt1Defeat:: @ 8174EED .string "Oww!\n" .string "Beaten!$" -gUnknown_8174EFA:: @ 8174EFA +RocketHideout_B1F_Text_Grunt1PostBattle:: @ 8174EFA .string "Blast it… You're dissing TEAM\n" .string "ROCKET, aren't you?$" -Text_174F2C:: @ 8174F2C +RocketHideout_B1F_Text_Grunt2Intro:: @ 8174F2C .string "You broke into TEAM ROCKET's\n" .string "operation? What nerve!$" -Text_174F60:: @ 8174F60 +RocketHideout_B1F_Text_Grunt2Defeat:: @ 8174F60 .string "Boom!$" -gUnknown_8174F66:: @ 8174F66 +RocketHideout_B1F_Text_Grunt2PostBattle:: @ 8174F66 .string "You're not going to get away with\n" .string "this, brat!$" -Text_174F94:: @ 8174F94 +RocketHideout_B1F_Text_Grunt3Intro:: @ 8174F94 .string "Intruder alert!$" -Text_174FA4:: @ 8174FA4 +RocketHideout_B1F_Text_Grunt3Defeat:: @ 8174FA4 .string "I can't do it!$" -gUnknown_8174FB3:: @ 8174FB3 +RocketHideout_B1F_Text_Grunt3PostBattle:: @ 8174FB3 .string "SILPH SCOPE? Humph!\n" .string "I don't know where it is.$" -Text_174FE1:: @ 8174FE1 +RocketHideout_B1F_Text_Grunt4Intro:: @ 8174FE1 .string "Why did you come here?$" -Text_174FF8:: @ 8174FF8 +RocketHideout_B1F_Text_Grunt4Defeat:: @ 8174FF8 .string "This won't do!$" -gUnknown_8175007:: @ 8175007 +RocketHideout_B1F_Text_Grunt4PostBattle:: @ 8175007 .string "Okay, I'll talk…\n" .string "Take the elevator to see my BOSS.$" -Text_17503A:: @ 817503A +RocketHideout_B1F_Text_Grunt5Intro:: @ 817503A .string "Are you lost, you little mouse?$" -Text_17505A:: @ 817505A +RocketHideout_B1F_Text_Grunt5Defeat:: @ 817505A .string "Why…?$" -gUnknown_8175060:: @ 8175060 +RocketHideout_B1F_Text_Grunt5PostBattle:: @ 8175060 .string "Uh-oh, that ruckus somehow opened\n" .string "the door!$" diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json index bdc600f55..2c353b5c1 100644 --- a/data/maps/RocketHideout_B2F/map.json +++ b/data/maps/RocketHideout_B2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "RocketHideout_B2F_EventScript_1612A2", + "script": "RocketHideout_B2F_EventScript_Grunt", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { diff --git a/data/maps/RocketHideout_B2F/scripts.inc b/data/maps/RocketHideout_B2F/scripts.inc index 07916ad03..55e7f6a2a 100644 --- a/data/maps/RocketHideout_B2F/scripts.inc +++ b/data/maps/RocketHideout_B2F/scripts.inc @@ -1,7 +1,7 @@ RocketHideout_B2F_MapScripts:: @ 81612A1 .byte 0 -RocketHideout_B2F_EventScript_1612A2:: @ 81612A2 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_13, Text_17508C, Text_1750BF - msgbox gUnknown_81750CC, MSGBOX_AUTOCLOSE +RocketHideout_B2F_EventScript_Grunt:: @ 81612A2 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_13, RocketHideout_B2F_Text_GruntIntro, RocketHideout_B2F_Text_GruntDefeat + msgbox RocketHideout_B2F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RocketHideout_B2F/text.inc b/data/maps/RocketHideout_B2F/text.inc index d21c21555..a27121152 100644 --- a/data/maps/RocketHideout_B2F/text.inc +++ b/data/maps/RocketHideout_B2F/text.inc @@ -1,11 +1,11 @@ -Text_17508C:: @ 817508C +RocketHideout_B2F_Text_GruntIntro:: @ 817508C .string "BOSS said you can see ghosts with\n" .string "the SILPH SCOPE.$" -Text_1750BF:: @ 81750BF +RocketHideout_B2F_Text_GruntDefeat:: @ 81750BF .string "I surrender!$" -gUnknown_81750CC:: @ 81750CC +RocketHideout_B2F_Text_GruntPostBattle:: @ 81750CC .string "The TEAM ROCKET HQ has four\n" .string "underground floors.\p" .string "Think you can reach the BOSS?$" diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json index be88faebf..a4c1a7c72 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "RocketHideout_B3F_EventScript_1612D1", + "script": "RocketHideout_B3F_EventScript_Grunt2", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "RocketHideout_B3F_EventScript_1612BA", + "script": "RocketHideout_B3F_EventScript_Grunt1", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { diff --git a/data/maps/RocketHideout_B3F/scripts.inc b/data/maps/RocketHideout_B3F/scripts.inc index d6a57ab77..ab1fd6bb3 100644 --- a/data/maps/RocketHideout_B3F/scripts.inc +++ b/data/maps/RocketHideout_B3F/scripts.inc @@ -1,12 +1,12 @@ RocketHideout_B3F_MapScripts:: @ 81612B9 .byte 0 -RocketHideout_B3F_EventScript_1612BA:: @ 81612BA - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_14, Text_17511A, Text_17514A - msgbox gUnknown_817515B, MSGBOX_AUTOCLOSE +RocketHideout_B3F_EventScript_Grunt1:: @ 81612BA + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_14, RocketHideout_B3F_Text_Grunt1Intro, RocketHideout_B3F_Text_Grunt1Defeat + msgbox RocketHideout_B3F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -RocketHideout_B3F_EventScript_1612D1:: @ 81612D1 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_15, Text_17519E, Text_1751CE - msgbox gUnknown_81751E0, MSGBOX_AUTOCLOSE +RocketHideout_B3F_EventScript_Grunt2:: @ 81612D1 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_15, RocketHideout_B3F_Text_Grunt2Intro, RocketHideout_B3F_Text_Grunt2Defeat + msgbox RocketHideout_B3F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RocketHideout_B3F/text.inc b/data/maps/RocketHideout_B3F/text.inc index deedfce38..12a9c5a7e 100644 --- a/data/maps/RocketHideout_B3F/text.inc +++ b/data/maps/RocketHideout_B3F/text.inc @@ -1,25 +1,25 @@ -Text_17511A:: @ 817511A +RocketHideout_B3F_Text_Grunt1Intro:: @ 817511A .string "Stop meddling in TEAM ROCKET's\n" .string "affairs or else!$" -Text_17514A:: @ 817514A +RocketHideout_B3F_Text_Grunt1Defeat:: @ 817514A .string "Oof!\n" .string "Taken down!$" -gUnknown_817515B:: @ 817515B +RocketHideout_B3F_Text_Grunt1PostBattle:: @ 817515B .string "SILPH SCOPE?\n" .string "Oh, that machine the BOSS stole.\p" .string "It's here somewhere.$" -Text_17519E:: @ 817519E +RocketHideout_B3F_Text_Grunt2Intro:: @ 817519E .string "We got word from upstairs that you\n" .string "were coming!$" -Text_1751CE:: @ 81751CE +RocketHideout_B3F_Text_Grunt2Defeat:: @ 81751CE .string "What?\n" .string "I lost? No!$" -gUnknown_81751E0:: @ 81751E0 +RocketHideout_B3F_Text_Grunt2PostBattle:: @ 81751E0 .string "Go ahead and go!\p" .string "But you can't run the elevator\n" .string "without the LIFT KEY.$" diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index 1790720b4..da6f7f569 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B4F_EventScript_161317", + "script": "RocketHideout_B4F_EventScript_Giovanni", "flag": "FLAG_HIDE_HIDEOUT_GIOVANNI" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "RocketHideout_B4F_EventScript_161381", + "script": "RocketHideout_B4F_EventScript_Grunt1", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B4F_EventScript_161418", + "script": "RocketHideout_B4F_EventScript_Grunt3", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B4F_EventScript_1613CE", + "script": "RocketHideout_B4F_EventScript_Grunt2", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index 68671a7a8..63fff7d82 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -1,33 +1,39 @@ +.equ LOCALID_GIOVANNI, 1 +.equ LOCALID_SILPH_SCOPE, 2 +.equ LOCALID_LIFT_KEY, 4 + +.equ NUM_DOOR_GRUNTS_DEFEATED, VAR_TEMP_1 + RocketHideout_B4F_MapScripts:: @ 81612E8 map_script MAP_SCRIPT_ON_LOAD, RocketHideout_B4F_OnLoad .byte 0 RocketHideout_B4F_OnLoad:: @ 81612EE - setvar VAR_TEMP_1, 0 - call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, EventScript_161311 - call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, EventScript_161311 - compare VAR_TEMP_1, 2 - call_if_ne EventScript_16146A + setvar NUM_DOOR_GRUNTS_DEFEATED, 0 + call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_EventScript_CountGruntDefeated + call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_EventScript_CountGruntDefeated + compare NUM_DOOR_GRUNTS_DEFEATED, 2 + call_if_ne RocketHideout_B4F_EventScript_SetBarrier end -EventScript_161311:: @ 8161311 - addvar VAR_TEMP_1, 1 +RocketHideout_B4F_EventScript_CountGruntDefeated:: @ 8161311 + addvar NUM_DOOR_GRUNTS_DEFEATED, 1 return -RocketHideout_B4F_EventScript_161317:: @ 8161317 +RocketHideout_B4F_EventScript_Giovanni:: @ 8161317 lock faceplayer famechecker FAMECHECKER_GIOVANNI, 0 - message Text_175226 + message RocketHideout_B4F_Text_GiovanniIntro waitmessage playbgm MUS_ROCKET, 0 waitbuttonpress - trainerbattle_no_intro TRAINER_BOSS_GIOVANNI, Text_175318 - msgbox gUnknown_817532D + trainerbattle_no_intro TRAINER_BOSS_GIOVANNI, RocketHideout_B4F_Text_GiovanniDefeat + msgbox RocketHideout_B4F_Text_GiovanniPostBattle fadescreen FADE_TO_BLACK closemessage - removeobject 1 - addobject 2 + removeobject LOCALID_GIOVANNI + addobject LOCALID_SILPH_SCOPE clearflag FLAG_HIDE_SILPH_SCOPE setflag FLAG_HIDE_CELADON_ROCKETS famechecker FAMECHECKER_GIOVANNI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 @@ -38,22 +44,22 @@ RocketHideout_B4F_EventScript_161317:: @ 8161317 RocketHideout_B4F_EventScript_SilphScope:: @ 8161363 lock faceplayer - removeobject 2 + removeobject LOCALID_SILPH_SCOPE giveitem ITEM_SILPH_SCOPE compare VAR_RESULT, FALSE goto_if_eq EventScript_BagIsFull release end -RocketHideout_B4F_EventScript_161381:: @ 8161381 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_18, Text_175488, Text_1754B9, EventScript_16139D - msgbox gUnknown_81754BD +RocketHideout_B4F_EventScript_Grunt1:: @ 8161381 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_18, RocketHideout_B4F_Text_Grunt1Intro, RocketHideout_B4F_Text_Grunt1Defeat, RocketHideout_B4F_EventScript_DefeatedGrunt1 + msgbox RocketHideout_B4F_Text_Grunt1PostBattle release end -EventScript_16139D:: @ 816139D - msgbox gUnknown_81754BD - addobject 4 +RocketHideout_B4F_EventScript_DefeatedGrunt1:: @ 816139D + msgbox RocketHideout_B4F_Text_Grunt1PostBattle + addobject LOCALID_LIFT_KEY clearflag FLAG_HIDE_LIFT_KEY release end @@ -62,65 +68,65 @@ RocketHideout_B4F_EventScript_LiftKey:: @ 81613AD lock faceplayer setflag FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT - removeobject 4 + removeobject LOCALID_LIFT_KEY giveitem ITEM_LIFT_KEY compare VAR_RESULT, FALSE goto_if_eq EventScript_BagIsFull release end -RocketHideout_B4F_EventScript_1613CE:: @ 81613CE - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_16, Text_1753D0, Text_1753FE, EventScript_1613E9 - msgbox gUnknown_817540C, MSGBOX_AUTOCLOSE +RocketHideout_B4F_EventScript_Grunt2:: @ 81613CE + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_Text_Grunt2Intro, RocketHideout_B4F_Text_Grunt2Defeat, RocketHideout_B4F_EventScript_DefeatedGrunt2 + msgbox RocketHideout_B4F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end -EventScript_1613E9:: @ 81613E9 - setvar VAR_TEMP_1, 0 - call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, EventScript_161311 - call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, EventScript_161311 - compare VAR_TEMP_1, 2 - call_if_eq EventScript_1614A1 - compare VAR_TEMP_1, 2 - call_if_eq EventScript_161462 +RocketHideout_B4F_EventScript_DefeatedGrunt2:: @ 81613E9 + setvar NUM_DOOR_GRUNTS_DEFEATED, 0 + call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_EventScript_CountGruntDefeated + call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_EventScript_CountGruntDefeated + compare NUM_DOOR_GRUNTS_DEFEATED, 2 + call_if_eq RocketHideout_B4F_EventScript_RemoveBarrier + compare NUM_DOOR_GRUNTS_DEFEATED, 2 + call_if_eq RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval release end -RocketHideout_B4F_EventScript_161418:: @ 8161418 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_17, Text_175437, Text_175463, EventScript_161433 - msgbox gUnknown_817546A, MSGBOX_AUTOCLOSE +RocketHideout_B4F_EventScript_Grunt3:: @ 8161418 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_Text_Grunt3Intro, RocketHideout_B4F_Text_Grunt3Defeat, RocketHideout_B4F_EventScript_DefeatedGrunt3 + msgbox RocketHideout_B4F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE end -EventScript_161433:: @ 8161433 - setvar VAR_TEMP_1, 0 - call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, EventScript_161311 - call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, EventScript_161311 - compare VAR_TEMP_1, 2 - call_if_eq EventScript_1614A1 - compare VAR_TEMP_1, 2 - call_if_eq EventScript_161462 +RocketHideout_B4F_EventScript_DefeatedGrunt3:: @ 8161433 + setvar NUM_DOOR_GRUNTS_DEFEATED, 0 + call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_EventScript_CountGruntDefeated + call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_EventScript_CountGruntDefeated + compare NUM_DOOR_GRUNTS_DEFEATED, 2 + call_if_eq RocketHideout_B4F_EventScript_RemoveBarrier + compare NUM_DOOR_GRUNTS_DEFEATED, 2 + call_if_eq RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval release end -EventScript_161462:: @ 8161462 +RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval:: @ 8161462 playse SE_KI_GASYAN special DrawWholeMapView waitse return -EventScript_16146A:: @ 816146A - setmetatile 17, 12, 718, 1 - setmetatile 18, 12, 719, 1 - setmetatile 17, 13, 726, 1 - setmetatile 18, 13, 727, 1 - setmetatile 17, 14, 642, 0 - setmetatile 18, 14, 642, 0 +RocketHideout_B4F_EventScript_SetBarrier:: @ 816146A + setmetatile 17, 12, METATILE_Hideout_Barrier_TopLeft_Floor, 1 + setmetatile 18, 12, METATILE_Hideout_Barrier_TopRight_Floor, 1 + setmetatile 17, 13, METATILE_Hideout_Barrier_BottomLeft, 1 + setmetatile 18, 13, METATILE_Hideout_Barrier_BottomRight, 1 + setmetatile 17, 14, METATILE_Hideout_Floor_ShadeFull, 0 + setmetatile 18, 14, METATILE_Hideout_Floor_ShadeFull, 0 return -EventScript_1614A1:: @ 81614A1 - setmetatile 17, 12, 642, 0 - setmetatile 18, 12, 641, 0 - setmetatile 17, 13, 642, 0 - setmetatile 18, 13, 641, 0 - setmetatile 17, 14, 642, 0 - setmetatile 18, 14, 641, 0 +RocketHideout_B4F_EventScript_RemoveBarrier:: @ 81614A1 + setmetatile 17, 12, METATILE_Hideout_Floor_ShadeFull, 0 + setmetatile 18, 12, METATILE_Hideout_Floor, 0 + setmetatile 17, 13, METATILE_Hideout_Floor_ShadeFull, 0 + setmetatile 18, 13, METATILE_Hideout_Floor, 0 + setmetatile 17, 14, METATILE_Hideout_Floor_ShadeFull, 0 + setmetatile 18, 14, METATILE_Hideout_Floor, 0 return diff --git a/data/maps/RocketHideout_B4F/text.inc b/data/maps/RocketHideout_B4F/text.inc index 4ceba8968..9d11d7502 100644 --- a/data/maps/RocketHideout_B4F/text.inc +++ b/data/maps/RocketHideout_B4F/text.inc @@ -1,4 +1,4 @@ -Text_175226:: @ 8175226 +RocketHideout_B4F_Text_GiovanniIntro:: @ 8175226 .string "So! I must say, I am impressed you\n" .string "got here.\p" .string "TEAM ROCKET captures POKéMON from\n" @@ -9,11 +9,11 @@ Text_175226:: @ 8175226 .string "For your insolence, you will feel a\n" .string "world of pain!$" -Text_175318:: @ 8175318 +RocketHideout_B4F_Text_GiovanniDefeat:: @ 8175318 .string "WHAT!\n" .string "This can't be!$" -gUnknown_817532D:: @ 817532D +RocketHideout_B4F_Text_GiovanniPostBattle:: @ 817532D .string "I see that you raise POKéMON with\n" .string "utmost care.\p" .string "A child like you would never\n" @@ -21,36 +21,36 @@ gUnknown_817532D:: @ 817532D .string "I shall step aside this time!\p" .string "I hope we meet again…$" -Text_1753D0:: @ 81753D0 +RocketHideout_B4F_Text_Grunt2Intro:: @ 81753D0 .string "I know you!\n" .string "You ruined our plans at MT. MOON!$" -Text_1753FE:: @ 81753FE +RocketHideout_B4F_Text_Grunt2Defeat:: @ 81753FE .string "Burned again!$" -gUnknown_817540C:: @ 817540C +RocketHideout_B4F_Text_Grunt2PostBattle:: @ 817540C .string "Do you have something against TEAM\n" .string "ROCKET?$" -Text_175437:: @ 8175437 +RocketHideout_B4F_Text_Grunt3Intro:: @ 8175437 .string "How can you not see the beauty of\n" .string "our evil?$" -Text_175463:: @ 8175463 +RocketHideout_B4F_Text_Grunt3Defeat:: @ 8175463 .string "Ayaya!$" -gUnknown_817546A:: @ 817546A +RocketHideout_B4F_Text_Grunt3PostBattle:: @ 817546A .string "BOSS!\n" .string "I'm sorry I failed you!$" -Text_175488:: @ 8175488 +RocketHideout_B4F_Text_Grunt1Intro:: @ 8175488 .string "The elevator doesn't work?\n" .string "Who has the LIFT KEY?$" -Text_1754B9:: @ 81754B9 +RocketHideout_B4F_Text_Grunt1Defeat:: @ 81754B9 .string "No!$" -gUnknown_81754BD:: @ 81754BD +RocketHideout_B4F_Text_Grunt1PostBattle:: @ 81754BD .string "Oh, no!\n" .string "I dropped the LIFT KEY!$" diff --git a/data/maps/RocketHideout_Elevator/map.json b/data/maps/RocketHideout_Elevator/map.json index dd2191b6d..307ef90df 100644 --- a/data/maps/RocketHideout_Elevator/map.json +++ b/data/maps/RocketHideout_Elevator/map.json @@ -36,7 +36,7 @@ "x": 0, "y": 2, "elevation": 0, - "script": "RocketHideout_Elevator_EventScript_1614D9" + "script": "RocketHideout_Elevator_EventScript_FloorSelect" } ] } diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc index f649e5c40..da059272a 100644 --- a/data/maps/RocketHideout_Elevator/scripts.inc +++ b/data/maps/RocketHideout_Elevator/scripts.inc @@ -1,9 +1,9 @@ RocketHideout_Elevator_MapScripts:: @ 81614D8 .byte 0 -RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9 +RocketHideout_Elevator_EventScript_FloorSelect:: @ 81614D9 lockall - goto_if_unset FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT, EventScript_16161B + goto_if_unset FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT, RocketHideout_Elevator_EventScript_NeedKey setvar VAR_0x8004, 2 call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR @@ -13,83 +13,71 @@ RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9 setvar VAR_0x8004, 2 specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos switch VAR_RESULT - case 0, EventScript_161530 - case 1, EventScript_16153C - case 2, EventScript_161548 + case 0, RocketHideout_Elevator_EventScript_FloorSelectFromB1F + case 1, RocketHideout_Elevator_EventScript_FloorSelectFromB2F + case 2, RocketHideout_Elevator_EventScript_FloorSelectFromB4F end -EventScript_161530:: @ 8161530 +RocketHideout_Elevator_EventScript_FloorSelectFromB1F:: @ 8161530 multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 0, FALSE - goto EventScript_161554 - -EventScript_16153B:: @ 816153B + goto RocketHideout_Elevator_EventScript_ChooseFloor end -EventScript_16153C:: @ 816153C +RocketHideout_Elevator_EventScript_FloorSelectFromB2F:: @ 816153C multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 1, FALSE - goto EventScript_161554 - -EventScript_161547:: @ 8161547 + goto RocketHideout_Elevator_EventScript_ChooseFloor end -EventScript_161548:: @ 8161548 +RocketHideout_Elevator_EventScript_FloorSelectFromB4F:: @ 8161548 multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 2, FALSE - goto EventScript_161554 - -EventScript_161553:: @ 8161553 + goto RocketHideout_Elevator_EventScript_ChooseFloor end -EventScript_161554:: @ 8161554 +RocketHideout_Elevator_EventScript_ChooseFloor:: @ 8161554 switch VAR_RESULT - case 0, EventScript_161591 - case 1, EventScript_1615B9 - case 2, EventScript_1615E1 - case 3, EventScript_161609 - case 127, EventScript_161609 + case 0, RocketHideout_Elevator_EventScript_ToB1F + case 1, RocketHideout_Elevator_EventScript_ToB2F + case 2, RocketHideout_Elevator_EventScript_ToB4F + case 3, RocketHideout_Elevator_EventScript_ExitFloorSelect + case 127, RocketHideout_Elevator_EventScript_ExitFloorSelect end -EventScript_161591:: @ 8161591 +RocketHideout_Elevator_EventScript_ToB1F:: @ 8161591 setvar VAR_0x8006, 3 setdynamicwarp MAP_ROCKET_HIDEOUT_B1F, 255, 24, 25 compare VAR_ELEVATOR_FLOOR, 3 - goto_if_eq EventScript_161609 - call EventScript_16160E + goto_if_eq RocketHideout_Elevator_EventScript_ExitFloorSelect + call RocketHideout_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 3 - goto EventScript_161609 - -EventScript_1615B8:: @ 81615B8 + goto RocketHideout_Elevator_EventScript_ExitFloorSelect end -EventScript_1615B9:: @ 81615B9 +RocketHideout_Elevator_EventScript_ToB2F:: @ 81615B9 setvar VAR_0x8006, 2 setdynamicwarp MAP_ROCKET_HIDEOUT_B2F, 255, 28, 16 compare VAR_ELEVATOR_FLOOR, 2 - goto_if_eq EventScript_161609 - call EventScript_16160E + goto_if_eq RocketHideout_Elevator_EventScript_ExitFloorSelect + call RocketHideout_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 2 - goto EventScript_161609 - -EventScript_1615E0:: @ 81615E0 + goto RocketHideout_Elevator_EventScript_ExitFloorSelect end -EventScript_1615E1:: @ 81615E1 +RocketHideout_Elevator_EventScript_ToB4F:: @ 81615E1 setvar VAR_0x8006, 0 setdynamicwarp MAP_ROCKET_HIDEOUT_B4F, 255, 20, 23 compare VAR_ELEVATOR_FLOOR, 0 - goto_if_eq EventScript_161609 - call EventScript_16160E + goto_if_eq RocketHideout_Elevator_EventScript_ExitFloorSelect + call RocketHideout_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 0 - goto EventScript_161609 - -EventScript_161608:: @ 8161608 + goto RocketHideout_Elevator_EventScript_ExitFloorSelect end -EventScript_161609:: @ 8161609 +RocketHideout_Elevator_EventScript_ExitFloorSelect:: @ 8161609 special Special_CloseElevatorCurrentFloorWindow releaseall end -EventScript_16160E:: @ 816160E +RocketHideout_Elevator_EventScript_MoveElevator:: @ 816160E special Special_CloseElevatorCurrentFloorWindow closemessage waitse @@ -98,7 +86,7 @@ EventScript_16160E:: @ 816160E setflag FLAG_TEMP_2 return -EventScript_16161B:: @ 816161B - msgbox gUnknown_81754DD +RocketHideout_Elevator_EventScript_NeedKey:: @ 816161B + msgbox RocketHideout_Elevator_Text_AppearsToNeedAKey releaseall end diff --git a/data/maps/RocketHideout_Elevator/text.inc b/data/maps/RocketHideout_Elevator/text.inc index 89de8f918..f0e5e09f8 100644 --- a/data/maps/RocketHideout_Elevator/text.inc +++ b/data/maps/RocketHideout_Elevator/text.inc @@ -1,3 +1,3 @@ -gUnknown_81754DD:: @ 81754DD +RocketHideout_Elevator_Text_AppearsToNeedAKey:: @ 81754DD .string "It appears to need a key.$" -- cgit v1.2.3 From bf7bab92e2e144920de20867205c43475406c18c Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 26 Jan 2020 02:26:19 -0500 Subject: Document Rocket Warehouse script --- data/maps/FiveIsland_RocketWarehouse/map.json | 64 ++++----- data/maps/FiveIsland_RocketWarehouse/scripts.inc | 173 ++++++++++++----------- data/maps/FiveIsland_RocketWarehouse/text.inc | 48 +++---- 3 files changed, 147 insertions(+), 138 deletions(-) (limited to 'data') diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index def5fa6fd..58ca4c535 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "FiveIsland_RocketWarehouse_EventScript_163FE6", + "script": "FiveIsland_RocketWarehouse_EventScript_Grunt2", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "FiveIsland_RocketWarehouse_EventScript_163FFD", + "script": "FiveIsland_RocketWarehouse_EventScript_Grunt3", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "FiveIsland_RocketWarehouse_EventScript_164087", + "script": "FiveIsland_RocketWarehouse_EventScript_Admin1", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "FiveIsland_RocketWarehouse_EventScript_164014", + "script": "FiveIsland_RocketWarehouse_EventScript_Admin2", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "FiveIsland_RocketWarehouse_EventScript_164070", + "script": "FiveIsland_RocketWarehouse_EventScript_Grunt1", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F93", + "script": "FiveIsland_RocketWarehouse_EventScript_Gideon", "flag": "0" }, { @@ -161,7 +161,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROCKET_WAREHOUSE", "var_value": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F81" + "script": "FiveIsland_RocketWarehouse_EventScript_Admin2Trigger" }, { "type": "trigger", @@ -170,7 +170,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROCKET_WAREHOUSE", "var_value": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F81" + "script": "FiveIsland_RocketWarehouse_EventScript_Admin2Trigger" }, { "type": "trigger", @@ -179,7 +179,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROCKET_WAREHOUSE", "var_value": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F81" + "script": "FiveIsland_RocketWarehouse_EventScript_Admin2Trigger" } ], "bg_events": [ @@ -188,14 +188,14 @@ "x": 11, "y": 2, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_3", "x": 26, "y": 11, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F78" + "script": "FiveIsland_RocketWarehouse_EventScript_Computer" }, { "type": "hidden_item", @@ -222,147 +222,147 @@ "x": 12, "y": 2, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 10, "y": 2, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 9, "y": 2, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 8, "y": 2, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 7, "y": 2, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 11, "y": 5, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 10, "y": 5, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 11, "y": 4, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 10, "y": 4, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 8, "y": 4, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 7, "y": 4, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 8, "y": 5, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 7, "y": 5, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 5, "y": 3, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 4, "y": 3, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 5, "y": 4, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 4, "y": 4, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 3, "y": 4, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 2, "y": 4, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 2, "y": 5, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 3, "y": 5, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" } ] } diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index 8382d4a72..dfcb6e43f 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -1,3 +1,12 @@ +.equ LOCALID_GRUNT1, 5 +.equ LOCALID_GRUNT2, 1 +.equ LOCALID_GRUNT3, 2 +.equ LOCALID_ADMIN1, 3 +.equ LOCALID_ADMIN2, 4 + +.equ PLAYER_X_POS, VAR_0x8004 +.equ PLAYER_Y_POS, VAR_0x8005 + FiveIsland_RocketWarehouse_MapScripts:: @ 8163F2E map_script MAP_SCRIPT_ON_LOAD, FiveIsland_RocketWarehouse_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_RocketWarehouse_OnTransition @@ -8,82 +17,82 @@ FiveIsland_RocketWarehouse_OnTransition:: @ 8163F39 end FiveIsland_RocketWarehouse_OnLoad:: @ 8163F3D - call_if_defeated TRAINER_TEAM_ROCKET_ADMIN, EventScript_163F47 + call_if_defeated TRAINER_TEAM_ROCKET_ADMIN, FiveIsland_RocketWarehouse_EventScript_SetArrowsForReEntry end -EventScript_163F47:: @ 8163F47 - setmetatile 26, 20, 672, 0 - setmetatile 27, 20, 672, 0 +FiveIsland_RocketWarehouse_EventScript_SetArrowsForReEntry:: @ 8163F47 + setmetatile 26, 20, METATILE_Hideout_Arrow_Up, 0 + setmetatile 27, 20, METATILE_Hideout_Arrow_Up, 0 return -FiveIsland_RocketWarehouse_EventScript_163F5A:: @ 8163F5A +FiveIsland_RocketWarehouse_EventScript_Cage:: @ 8163F5A lockall - goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, EventScript_163F6E - msgbox gUnknown_817B4E3 + goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, FiveIsland_RocketWarehouse_EventScript_CageUnlocked + msgbox FiveIsland_RocketWarehouse_Text_ManyMonsLockedInPen releaseall end -EventScript_163F6E:: @ 8163F6E - msgbox gUnknown_817B512 +FiveIsland_RocketWarehouse_EventScript_CageUnlocked:: @ 8163F6E + msgbox FiveIsland_RocketWarehouse_Text_PenUnlockedMonsFled releaseall end -FiveIsland_RocketWarehouse_EventScript_163F78:: @ 8163F78 - msgbox gUnknown_817BB15, MSGBOX_SIGN +FiveIsland_RocketWarehouse_EventScript_Computer:: @ 8163F78 + msgbox FiveIsland_RocketWarehouse_Text_ReportWithGraphsAndText, MSGBOX_SIGN end -FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81 +FiveIsland_RocketWarehouse_EventScript_Admin2Trigger:: @ 8163F81 lockall - applymovement 4, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_ADMIN2, Movement_WalkInPlaceFastestLeft waitmovement 0 setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1 releaseall end -FiveIsland_RocketWarehouse_EventScript_163F93:: @ 8163F93 - trainerbattle_single TRAINER_SCIENTIST_GIDEON, Text_17BBAF, Text_17BC55, EventScript_163FCD - goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_163FB7 - msgbox gUnknown_817BCA3, MSGBOX_AUTOCLOSE +FiveIsland_RocketWarehouse_EventScript_Gideon:: @ 8163F93 + trainerbattle_single TRAINER_SCIENTIST_GIDEON, FiveIsland_RocketWarehouse_Text_GideonIntro, FiveIsland_RocketWarehouse_Text_GideonDefeat, FiveIsland_RocketWarehouse_EventScript_DefeatedGideon + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, FiveIsland_RocketWarehouse_EventScript_MentionGiovannisKid + msgbox FiveIsland_RocketWarehouse_Text_GetLostLeaveMeBe, MSGBOX_AUTOCLOSE end -EventScript_163FB7:: @ 8163FB7 +FiveIsland_RocketWarehouse_EventScript_MentionGiovannisKid:: @ 8163FB7 famechecker FAMECHECKER_GIOVANNI, 5 - msgbox gUnknown_817BCD7, MSGBOX_AUTOCLOSE + msgbox FiveIsland_RocketWarehouse_Text_GiovannisKidHasRedHair, MSGBOX_AUTOCLOSE end -EventScript_163FCD:: @ 8163FCD - msgbox gUnknown_817BC6C +FiveIsland_RocketWarehouse_EventScript_DefeatedGideon:: @ 8163FCD + msgbox FiveIsland_RocketWarehouse_Text_GideonPostBattle setflag FLAG_RECOVERED_SAPPHIRE giveitem ITEM_SAPPHIRE release end -FiveIsland_RocketWarehouse_EventScript_163FE6:: @ 8163FE6 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_47, Text_17B54D, Text_17B585 - msgbox gUnknown_817B5A6, MSGBOX_AUTOCLOSE +FiveIsland_RocketWarehouse_EventScript_Grunt2:: @ 8163FE6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_47, FiveIsland_RocketWarehouse_Text_Grunt2Intro, FiveIsland_RocketWarehouse_Text_Grunt2Defeat + msgbox FiveIsland_RocketWarehouse_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_RocketWarehouse_EventScript_163FFD:: @ 8163FFD - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_48, Text_17B677, Text_17B6D9 - msgbox gUnknown_817B6EF, MSGBOX_AUTOCLOSE +FiveIsland_RocketWarehouse_EventScript_Grunt3:: @ 8163FFD + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_48, FiveIsland_RocketWarehouse_Text_Grunt3Intro, FiveIsland_RocketWarehouse_Text_Grunt3Defeat + msgbox FiveIsland_RocketWarehouse_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_RocketWarehouse_EventScript_164014:: @ 8164014 - trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN_2, Text_17B8DA, Text_17B9FB, EventScript_16402F - msgbox gUnknown_817BA64, MSGBOX_AUTOCLOSE +FiveIsland_RocketWarehouse_EventScript_Admin2:: @ 8164014 + trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN_2, FiveIsland_RocketWarehouse_Text_Admin2Intro, FiveIsland_RocketWarehouse_Text_Admin2Defeat, FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin2 + msgbox FiveIsland_RocketWarehouse_Text_Admin2PostBattle, MSGBOX_AUTOCLOSE end -EventScript_16402F:: @ 816402F - getplayerxy VAR_0x8004, VAR_0x8005 - compare VAR_0x8004, 24 - call_if_le EventScript_164065 - msgbox gUnknown_817BA64 +FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin2:: @ 816402F + getplayerxy PLAYER_X_POS, PLAYER_Y_POS + compare PLAYER_X_POS, 24 + call_if_le FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin2 + msgbox FiveIsland_RocketWarehouse_Text_Admin2PostBattle closemessage fadescreen FADE_TO_BLACK - removeobject 1 - removeobject 2 - removeobject 4 - removeobject 3 + removeobject LOCALID_GRUNT2 + removeobject LOCALID_GRUNT3 + removeobject LOCALID_ADMIN2 + removeobject LOCALID_ADMIN1 setflag FLAG_HIDE_FIVE_ISLAND_ROCKETS fadescreen FADE_FROM_BLACK setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1 @@ -91,91 +100,91 @@ EventScript_16402F:: @ 816402F release end -EventScript_164065:: @ 8164065 +FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin2:: @ 8164065 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 return -FiveIsland_RocketWarehouse_EventScript_164070:: @ 8164070 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_42, Text_17B5D6, Text_17B62F - msgbox gUnknown_817B642, MSGBOX_AUTOCLOSE +FiveIsland_RocketWarehouse_EventScript_Grunt1:: @ 8164070 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_42, FiveIsland_RocketWarehouse_Text_Grunt1Intro, FiveIsland_RocketWarehouse_Text_Grunt1Defeat + msgbox FiveIsland_RocketWarehouse_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087 - trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN, Text_17B72D, Text_17B79C, EventScript_1640A2 - msgbox gUnknown_817B7FA, MSGBOX_AUTOCLOSE +FiveIsland_RocketWarehouse_EventScript_Admin1:: @ 8164087 + trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN, FiveIsland_RocketWarehouse_Text_Admin1Intro, FiveIsland_RocketWarehouse_Text_Admin1Defeat, FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin1 + msgbox FiveIsland_RocketWarehouse_Text_MadeItSoYouCanComeBackThrough, MSGBOX_AUTOCLOSE end -EventScript_1640A2:: @ 81640A2 - getplayerxy VAR_0x8004, VAR_0x8005 +FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin1:: @ 81640A2 + getplayerxy PLAYER_X_POS, PLAYER_Y_POS specialvar VAR_RESULT, GetPlayerFacingDirection compare VAR_RESULT, DIR_NORTH - call_if_eq EventScript_16412E - msgbox gUnknown_817B7AE + call_if_eq FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin1 + msgbox FiveIsland_RocketWarehouse_Text_Admin1PostBattle closemessage - compare VAR_0x8004, 24 - call_if_le EventScript_164144 - compare VAR_0x8004, 25 - call_if_eq EventScript_16414F - compare VAR_0x8004, 26 - call_if_eq EventScript_16415A - compare VAR_0x8004, 27 - call_if_eq EventScript_16415A + compare PLAYER_X_POS, 24 + call_if_le FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitchFar + compare PLAYER_X_POS, 25 + call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitch + compare PLAYER_X_POS, 26 + call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch + compare PLAYER_X_POS, 27 + call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch playse SE_PIN - call EventScript_163F47 + call FiveIsland_RocketWarehouse_EventScript_SetArrowsForReEntry special DrawWholeMapView waitse - compare VAR_0x8004, 24 - call_if_le EventScript_164165 - compare VAR_0x8004, 25 - call_if_eq EventScript_164165 - compare VAR_0x8004, 26 - call_if_eq EventScript_164165 - compare VAR_0x8004, 27 - call_if_eq EventScript_164170 - msgbox gUnknown_817B7FA + compare PLAYER_X_POS, 24 + call_if_le FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft + compare PLAYER_X_POS, 25 + call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft + compare PLAYER_X_POS, 26 + call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft + compare PLAYER_X_POS, 27 + call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerDown + msgbox FiveIsland_RocketWarehouse_Text_MadeItSoYouCanComeBackThrough release end -EventScript_16412E:: @ 816412E - compare VAR_0x8004, 27 +FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin1:: @ 816412E + compare PLAYER_X_POS, 27 goto_if_eq EventScript_Return applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 return -EventScript_164144:: @ 8164144 - applymovement 3, Movement_16417B +FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitchFar:: @ 8164144 + applymovement LOCALID_ADMIN1, FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitchFar waitmovement 0 return -EventScript_16414F:: @ 816414F - applymovement 3, Movement_16417F +FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitch:: @ 816414F + applymovement LOCALID_ADMIN1, FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitch waitmovement 0 return -EventScript_16415A:: @ 816415A - applymovement 3, Movement_WalkInPlaceFastestUp +FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch:: @ 816415A + applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestUp waitmovement 0 return -EventScript_164165:: @ 8164165 - applymovement 3, Movement_WalkInPlaceFastestLeft +FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft:: @ 8164165 + applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestLeft waitmovement 0 return -EventScript_164170:: @ 8164170 - applymovement 3, Movement_WalkInPlaceFastestDown +FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerDown:: @ 8164170 + applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestDown waitmovement 0 return -Movement_16417B:: @ 816417B +FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitchFar:: @ 816417B walk_right walk_right walk_in_place_fastest_up step_end -Movement_16417F:: @ 816417F +FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitch:: @ 816417F walk_right walk_in_place_fastest_up step_end diff --git a/data/maps/FiveIsland_RocketWarehouse/text.inc b/data/maps/FiveIsland_RocketWarehouse/text.inc index b77ebd7c8..de74a7e67 100644 --- a/data/maps/FiveIsland_RocketWarehouse/text.inc +++ b/data/maps/FiveIsland_RocketWarehouse/text.inc @@ -1,65 +1,65 @@ -gUnknown_817B4E3:: @ 817B4E3 +FiveIsland_RocketWarehouse_Text_ManyMonsLockedInPen:: @ 817B4E3 .string "There are many POKéMON locked\n" .string "away in the pen…$" -gUnknown_817B512:: @ 817B512 +FiveIsland_RocketWarehouse_Text_PenUnlockedMonsFled:: @ 817B512 .string "The pen door is unlocked.\n" .string "The POKéMON appear to have fled.$" -Text_17B54D:: @ 817B54D +FiveIsland_RocketWarehouse_Text_Grunt2Intro:: @ 817B54D .string "Did you come here knowing it's\n" .string "TEAM ROCKET's WAREHOUSE?$" -Text_17B585:: @ 817B585 +FiveIsland_RocketWarehouse_Text_Grunt2Defeat:: @ 817B585 .string "What do you think you're doing?!$" -gUnknown_817B5A6:: @ 817B5A6 +FiveIsland_RocketWarehouse_Text_Grunt2PostBattle:: @ 817B5A6 .string "TEAM ROCKET broke up?\n" .string "What planet are you from?$" -Text_17B5D6:: @ 817B5D6 +FiveIsland_RocketWarehouse_Text_Grunt1Intro:: @ 817B5D6 .string "Oh, now your POKéMON look strong.\n" .string "You're willing to sell them?\p" .string "Oh?\n" .string "You wanted to battle?$" -Text_17B62F:: @ 817B62F +FiveIsland_RocketWarehouse_Text_Grunt1Defeat:: @ 817B62F .string "Oh, but…\n" .string "Too much!$" -gUnknown_817B642:: @ 817B642 +FiveIsland_RocketWarehouse_Text_Grunt1PostBattle:: @ 817B642 .string "We can give you a great price.\n" .string "Sell us your POKéMON!$" -Text_17B677:: @ 817B677 +FiveIsland_RocketWarehouse_Text_Grunt3Intro:: @ 817B677 .string "I got word about you from the\n" .string "others.\p" .string "But there's no way a kid like you'd\n" .string "know our BOSS GIOVANNI!$" -Text_17B6D9:: @ 817B6D9 +FiveIsland_RocketWarehouse_Text_Grunt3Defeat:: @ 817B6D9 .string "Don't…you…dare…laugh…$" -gUnknown_817B6EF:: @ 817B6EF +FiveIsland_RocketWarehouse_Text_Grunt3PostBattle:: @ 817B6EF .string "Don't mess in the doings of adults,\n" .string "you jumped-up pip-squeak!$" -Text_17B72D:: @ 817B72D +FiveIsland_RocketWarehouse_Text_Admin1Intro:: @ 817B72D .string "I don't know or care if what I'm\n" .string "doing is right or wrong…\p" .string "I just put my faith in GIOVANNI\n" .string "and do as I am told.$" -Text_17B79C:: @ 817B79C +FiveIsland_RocketWarehouse_Text_Admin1Defeat:: @ 817B79C .string "I…\n" .string "I'm shattered…$" -gUnknown_817B7AE:: @ 817B7AE +FiveIsland_RocketWarehouse_Text_Admin1PostBattle:: @ 817B7AE .string "You're doing things according to\n" .string "your beliefs and morals.\p" .string "I understand now…$" -gUnknown_817B7FA:: @ 817B7FA +FiveIsland_RocketWarehouse_Text_MadeItSoYouCanComeBackThrough:: @ 817B7FA .string "I've made it so you can come back\n" .string "in through there.\p" .string "Why don't you go get rested and\n" @@ -69,7 +69,7 @@ gUnknown_817B7FA:: @ 817B7FA .string "You'd better steel yourself for one\n" .string "harsh challenge.$" -Text_17B8DA:: @ 817B8DA +FiveIsland_RocketWarehouse_Text_Admin2Intro:: @ 817B8DA .string "That's quite enough of you \n" .string "playing the hero, kid.\p" .string "Spreading lies about how TEAM\n" @@ -81,7 +81,7 @@ Text_17B8DA:: @ 817B8DA .string "And now, I'll show you how scary\n" .string "an angry adult can be!$" -Text_17B9FB:: @ 817B9FB +FiveIsland_RocketWarehouse_Text_Admin2Defeat:: @ 817B9FB .string "Urgh…\n" .string "You were too strong…\p" .string "…\n" @@ -89,7 +89,7 @@ Text_17B9FB:: @ 817B9FB .string "So it's true?\n" .string "TEAM ROCKET really has disbanded?$" -gUnknown_817BA64:: @ 817BA64 +FiveIsland_RocketWarehouse_Text_Admin2PostBattle:: @ 817BA64 .string "We will abandon this WAREHOUSE…\p" .string "But don't think this is over.\n" .string "I won't let this be the end.\p" @@ -98,7 +98,7 @@ gUnknown_817BA64:: @ 817BA64 .string "I will…\p" .string "Until then, farewell!$" -gUnknown_817BB15:: @ 817BB15 +FiveIsland_RocketWarehouse_Text_ReportWithGraphsAndText:: @ 817BB15 .string "A report with graphs and text is on\n" .string "the PC monitor.\p" .string "“The Influence of Magnetic Waves\n" @@ -106,7 +106,7 @@ gUnknown_817BB15:: @ 817BB15 .string "… … … … … …\p" .string "It's too difficult to understand…$" -Text_17BBAF:: @ 817BBAF +FiveIsland_RocketWarehouse_Text_GideonIntro:: @ 817BBAF .string "I almost managed to sell the\n" .string "SAPPHIRE for huge money…\p" .string "Then, you just had to come along\n" @@ -114,19 +114,19 @@ Text_17BBAF:: @ 817BBAF .string "Fufu… Fufufufu…\n" .string "There's no forgiveness for you!$" -Text_17BC55:: @ 817BC55 +FiveIsland_RocketWarehouse_Text_GideonDefeat:: @ 817BC55 .string "Gah! Darn!\n" .string "Darn! Darn!$" -gUnknown_817BC6C:: @ 817BC6C +FiveIsland_RocketWarehouse_Text_GideonPostBattle:: @ 817BC6C .string "If I can't sell it, it's worthless!\n" .string "Go ahead, take it!$" -gUnknown_817BCA3:: @ 817BCA3 +FiveIsland_RocketWarehouse_Text_GetLostLeaveMeBe:: @ 817BCA3 .string "What do you want now?\n" .string "Go on, get lost, leave me be.$" -gUnknown_817BCD7:: @ 817BCD7 +FiveIsland_RocketWarehouse_Text_GiovannisKidHasRedHair:: @ 817BCD7 .string "What, you again?\p" .string "You… You're not GIOVANNI's kid,\n" .string "are you?\p" -- cgit v1.2.3 From f637ade6b3ad2434a3bb3b39b23c77ab3651b02d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 26 Jan 2020 05:41:22 -0500 Subject: Document Silph Co scripts --- data/maps/SilphCo_10F/map.json | 8 +- data/maps/SilphCo_10F/scripts.inc | 26 ++--- data/maps/SilphCo_10F/text.inc | 18 ++-- data/maps/SilphCo_11F/map.json | 14 +-- data/maps/SilphCo_11F/scripts.inc | 95 +++++++++--------- data/maps/SilphCo_11F/text.inc | 34 +++---- data/maps/SilphCo_1F/map.json | 4 +- data/maps/SilphCo_1F/scripts.inc | 8 +- data/maps/SilphCo_1F/text.inc | 6 +- data/maps/SilphCo_2F/map.json | 10 +- data/maps/SilphCo_2F/scripts.inc | 30 +++--- data/maps/SilphCo_2F/text.inc | 26 ++--- data/maps/SilphCo_3F/map.json | 8 +- data/maps/SilphCo_3F/scripts.inc | 26 ++--- data/maps/SilphCo_3F/text.inc | 18 ++-- data/maps/SilphCo_4F/map.json | 10 +- data/maps/SilphCo_4F/scripts.inc | 32 +++--- data/maps/SilphCo_4F/text.inc | 24 ++--- data/maps/SilphCo_5F/map.json | 20 ++-- data/maps/SilphCo_5F/scripts.inc | 50 +++++----- data/maps/SilphCo_5F/text.inc | 43 ++++---- data/maps/SilphCo_6F/map.json | 18 ++-- data/maps/SilphCo_6F/scripts.inc | 72 +++++++------- data/maps/SilphCo_6F/text.inc | 48 ++++----- data/maps/SilphCo_7F/map.json | 22 ++--- data/maps/SilphCo_7F/scripts.inc | 174 ++++++++++++++++----------------- data/maps/SilphCo_7F/text.inc | 60 ++++++------ data/maps/SilphCo_8F/map.json | 12 +-- data/maps/SilphCo_8F/scripts.inc | 32 +++--- data/maps/SilphCo_8F/text.inc | 31 +++--- data/maps/SilphCo_9F/map.json | 10 +- data/maps/SilphCo_9F/scripts.inc | 34 +++---- data/maps/SilphCo_9F/text.inc | 34 +++---- data/maps/SilphCo_Elevator/map.json | 2 +- data/maps/SilphCo_Elevator/scripts.inc | 142 ++++++++++++--------------- data/scripts/fame_checker.inc | 8 +- 36 files changed, 585 insertions(+), 624 deletions(-) (limited to 'data') diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index 7d71b3b26..bebe3f71e 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 2, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SilphCo_10F_EventScript_161DC0", + "script": "SilphCo_10F_EventScript_Travis", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_10F_EventScript_161D96", + "script": "SilphCo_10F_EventScript_WorkerF", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "SilphCo_10F_EventScript_161DD7", + "script": "SilphCo_10F_EventScript_Grunt", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -181,7 +181,7 @@ "x": 7, "y": 1, "elevation": 0, - "script": "SilphCo_10F_EventScript_161DB7" + "script": "SilphCo_10F_EventScript_FloorSign" } ] } diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc index a0ab7219b..20d98d291 100644 --- a/data/maps/SilphCo_10F/scripts.inc +++ b/data/maps/SilphCo_10F/scripts.inc @@ -6,30 +6,30 @@ SilphCo_10F_OnLoad:: @ 8161D8C call_if_unset FLAG_SILPH_10F_DOOR, EventScript_Close10FDoor end -SilphCo_10F_EventScript_161D96:: @ 8161D96 +SilphCo_10F_EventScript_WorkerF:: @ 8161D96 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_161DAD - msgbox gUnknown_8176DBA + goto_if_ge SilphCo_10F_EventScript_WorkerFRocketsGone + msgbox SilphCo_10F_Text_WaaaImScared release end -EventScript_161DAD:: @ 8161DAD - msgbox gUnknown_8176DCE +SilphCo_10F_EventScript_WorkerFRocketsGone:: @ 8161DAD + msgbox SilphCo_10F_Text_KeepMeCryingASecret release end -SilphCo_10F_EventScript_161DB7:: @ 8161DB7 - msgbox gUnknown_8176DF8, MSGBOX_SIGN +SilphCo_10F_EventScript_FloorSign:: @ 8161DB7 + msgbox SilphCo_10F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_10F_EventScript_161DC0:: @ 8161DC0 - trainerbattle_single TRAINER_SCIENTIST_TRAVIS, Text_176D57, Text_176D73 - msgbox gUnknown_8176D86, MSGBOX_AUTOCLOSE +SilphCo_10F_EventScript_Travis:: @ 8161DC0 + trainerbattle_single TRAINER_SCIENTIST_TRAVIS, SilphCo_10F_Text_TravisIntro, SilphCo_10F_Text_TravisDefeat + msgbox SilphCo_10F_Text_TravisPostBattle, MSGBOX_AUTOCLOSE end -SilphCo_10F_EventScript_161DD7:: @ 8161DD7 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_39, Text_176CED, Text_176D18 - msgbox gUnknown_8176D25, MSGBOX_AUTOCLOSE +SilphCo_10F_EventScript_Grunt:: @ 8161DD7 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_39, SilphCo_10F_Text_GruntIntro, SilphCo_10F_Text_GruntDefeat + msgbox SilphCo_10F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_10F/text.inc b/data/maps/SilphCo_10F/text.inc index a910cd435..ac8483558 100644 --- a/data/maps/SilphCo_10F/text.inc +++ b/data/maps/SilphCo_10F/text.inc @@ -1,33 +1,33 @@ -Text_176CED:: @ 8176CED +SilphCo_10F_Text_GruntIntro:: @ 8176CED .string "Welcome to 10F!\n" .string "So good of you to join me!$" -Text_176D18:: @ 8176D18 +SilphCo_10F_Text_GruntDefeat:: @ 8176D18 .string "I'm stunned!$" -gUnknown_8176D25:: @ 8176D25 +SilphCo_10F_Text_GruntPostBattle:: @ 8176D25 .string "Nice try, but the boardroom is up\n" .string "one more floor.$" -Text_176D57:: @ 8176D57 +SilphCo_10F_Text_TravisIntro:: @ 8176D57 .string "Enough of your silly games!$" -Text_176D73:: @ 8176D73 +SilphCo_10F_Text_TravisDefeat:: @ 8176D73 .string "No continues left!$" -gUnknown_8176D86:: @ 8176D86 +SilphCo_10F_Text_TravisPostBattle:: @ 8176D86 .string "Are you satisfied with beating me?\n" .string "Then go on home!$" -gUnknown_8176DBA:: @ 8176DBA +SilphCo_10F_Text_WaaaImScared:: @ 8176DBA .string "Waaaaa!\n" .string "I'm scared!$" -gUnknown_8176DCE:: @ 8176DCE +SilphCo_10F_Text_KeepMeCryingASecret:: @ 8176DCE .string "About me crying…\n" .string "Please keep it a secret.$" -gUnknown_8176DF8:: @ 8176DF8 +SilphCo_10F_Text_FloorSign:: @ 8176DF8 .string "SILPH CO. HEAD OFFICE\n" .string "10F$" diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index 89a1a8bf3..19b187c08 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_11F_EventScript_161DFE", + "script": "SilphCo_11F_EventScript_President", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_11F_EventScript_161E7F", + "script": "SilphCo_11F_EventScript_Secretary", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "SilphCo_11F_EventScript_161F40", + "script": "SilphCo_11F_EventScript_Grunt1", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "SilphCo_11F_EventScript_161F57", + "script": "SilphCo_11F_EventScript_Grunt2", "flag": "FLAG_HIDE_SILPH_ROCKETS" } ], @@ -123,7 +123,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_SILPH_CO_11F", "var_value": 0, - "script": "SilphCo_11F_EventScript_161E88" + "script": "SilphCo_11F_EventScript_GiovanniTriggerLeft" }, { "type": "trigger", @@ -132,7 +132,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_SILPH_CO_11F", "var_value": 0, - "script": "SilphCo_11F_EventScript_161E94" + "script": "SilphCo_11F_EventScript_GiovanniTriggerRight" } ], "bg_events": [ @@ -179,7 +179,7 @@ "x": 8, "y": 1, "elevation": 0, - "script": "SilphCo_11F_EventScript_161F37" + "script": "SilphCo_11F_EventScript_FloorSign" } ] } diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 05f52646e..38de05842 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -6,76 +6,72 @@ SilphCo_11F_OnLoad:: @ 8161DF4 call_if_unset FLAG_SILPH_11F_DOOR, EventScript_Close11FDoor end -SilphCo_11F_EventScript_161DFE:: @ 8161DFE +SilphCo_11F_EventScript_President:: @ 8161DFE lock faceplayer - goto_if_set FLAG_GOT_MASTER_BALL_FROM_SILPH, EventScript_161E75 + goto_if_set FLAG_GOT_MASTER_BALL_FROM_SILPH, SilphCo_11F_EventScript_AlreadyGotMasterBall checkplayergender compare VAR_RESULT, MALE - call_if_eq EventScript_161E59 + call_if_eq SilphCo_11F_EventScript_PresidentThanksMale compare VAR_RESULT, FEMALE - call_if_eq EventScript_161E62 + call_if_eq SilphCo_11F_EventScript_PresidentThanksFemale checkitemspace ITEM_MASTER_BALL, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_161E6B - giveitem_msg gUnknown_8176FBD, ITEM_MASTER_BALL, 1, MUS_FAN5 - msgbox gUnknown_8176FEB + goto_if_eq SilphCo_11F_EventScript_NoRoomForMasterBall + giveitem_msg SilphCo_11F_Text_ObtainedMasterBallFromPresident, ITEM_MASTER_BALL, 1, MUS_FAN5 + msgbox SilphCo_11F_Text_ThatsOurSecretPrototype setflag FLAG_GOT_MASTER_BALL_FROM_SILPH release end -EventScript_161E59:: @ 8161E59 - msgbox gUnknown_8176E12 +SilphCo_11F_EventScript_PresidentThanksMale:: @ 8161E59 + msgbox SilphCo_11F_Text_ThanksForSavingMeDearBoy return -EventScript_161E62:: @ 8161E62 - msgbox gUnknown_8176EE7 +SilphCo_11F_EventScript_PresidentThanksFemale:: @ 8161E62 + msgbox SilphCo_11F_Text_ThanksForSavingMeDearGirl return -EventScript_161E6B:: @ 8161E6B - msgbox gUnknown_817708E +SilphCo_11F_EventScript_NoRoomForMasterBall:: @ 8161E6B + msgbox SilphCo_11F_Text_YouHaveNoRoomForThis release end -EventScript_161E75:: @ 8161E75 - msgbox gUnknown_8176FEB +SilphCo_11F_EventScript_AlreadyGotMasterBall:: @ 8161E75 + msgbox SilphCo_11F_Text_ThatsOurSecretPrototype release end -SilphCo_11F_EventScript_161E7F:: @ 8161E7F - msgbox gUnknown_81770A9, MSGBOX_NPC +SilphCo_11F_EventScript_Secretary:: @ 8161E7F + msgbox SilphCo_11F_Text_ThanksForRescuingUs, MSGBOX_NPC end -SilphCo_11F_EventScript_161E88:: @ 8161E88 +SilphCo_11F_EventScript_GiovanniTriggerLeft:: @ 8161E88 lockall setvar VAR_TEMP_1, 0 - goto EventScript_161EA0 - -EventScript_161E93:: @ 8161E93 + goto SilphCo_11F_EventScript_BattleGiovanni end -SilphCo_11F_EventScript_161E94:: @ 8161E94 +SilphCo_11F_EventScript_GiovanniTriggerRight:: @ 8161E94 lockall setvar VAR_TEMP_1, 1 - goto EventScript_161EA0 - -EventScript_161E9F:: @ 8161E9F + goto SilphCo_11F_EventScript_BattleGiovanni end -EventScript_161EA0:: @ 8161EA0 +SilphCo_11F_EventScript_BattleGiovanni:: @ 8161EA0 textcolor 0 applymovement 3, Movement_WalkInPlaceFastestDown waitmovement 0 delay 25 - msgbox gUnknown_8177108 + msgbox SilphCo_11F_Text_GiovanniIntro closemessage compare VAR_TEMP_1, 0 - call_if_eq EventScript_161F00 + call_if_eq SilphCo_11F_EventScript_GiovanniApproachLeft compare VAR_TEMP_1, 1 - call_if_eq EventScript_161F12 + call_if_eq SilphCo_11F_EventScript_GiovanniApproachRight setvar VAR_LAST_TALKED, 3 - trainerbattle_no_intro TRAINER_BOSS_GIOVANNI_2, Text_1771AB - msgbox gUnknown_81771C2 + trainerbattle_no_intro TRAINER_BOSS_GIOVANNI_2, SilphCo_11F_Text_GiovanniDefeat + msgbox SilphCo_11F_Text_GiovanniPostBattle closemessage fadescreen FADE_TO_BLACK removeobject 3 @@ -88,18 +84,18 @@ EventScript_161EA0:: @ 8161EA0 releaseall end -EventScript_161F00:: @ 8161F00 - applymovement 3, Movement_161F1D - applymovement OBJ_EVENT_ID_PLAYER, Movement_161F27 +SilphCo_11F_EventScript_GiovanniApproachLeft:: @ 8161F00 + applymovement 3, SilphCo_11F_Movement_GiovanniApproachLeft + applymovement OBJ_EVENT_ID_PLAYER, SilphCo_11F_Movement_PlayerFaceGiovanni waitmovement 0 return -EventScript_161F12:: @ 8161F12 - applymovement 3, Movement_161F23 +SilphCo_11F_EventScript_GiovanniApproachRight:: @ 8161F12 + applymovement 3, SilphCo_11F_Movement_GiovanniApproachRight waitmovement 0 return -Movement_161F1D:: @ 8161F1D +SilphCo_11F_Movement_GiovanniApproachLeft:: @ 8161F1D walk_down walk_down walk_down @@ -107,13 +103,13 @@ Movement_161F1D:: @ 8161F1D walk_in_place_fastest_left step_end -Movement_161F23:: @ 8161F23 +SilphCo_11F_Movement_GiovanniApproachRight:: @ 8161F23 walk_down walk_down walk_down step_end -Movement_161F27:: @ 8161F27 +SilphCo_11F_Movement_PlayerFaceGiovanni:: @ 8161F27 delay_16 delay_16 delay_16 @@ -122,20 +118,21 @@ Movement_161F27:: @ 8161F27 walk_in_place_fastest_right step_end -EventScript_161F2E:: @ 8161F2E - msgbox gUnknown_817732B, MSGBOX_SIGN +@ Unused +SilphCo_11F_EventScript_Monitor:: @ 8161F2E + msgbox SilphCo_11F_Text_MonitorHasMonsOnIt, MSGBOX_SIGN end -SilphCo_11F_EventScript_161F37:: @ 8161F37 - msgbox gUnknown_817734A, MSGBOX_SIGN +SilphCo_11F_EventScript_FloorSign:: @ 8161F37 + msgbox SilphCo_11F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_11F_EventScript_161F40:: @ 8161F40 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_40, Text_1772B8, Text_1772E7 - msgbox gUnknown_81772F9, MSGBOX_AUTOCLOSE +SilphCo_11F_EventScript_Grunt1:: @ 8161F40 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_40, SilphCo_11F_Text_Grunt1Intro, SilphCo_11F_Text_Grunt1Defeat + msgbox SilphCo_11F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_11F_EventScript_161F57:: @ 8161F57 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_41, Text_17726A, Text_17728C - msgbox gUnknown_817729B, MSGBOX_AUTOCLOSE +SilphCo_11F_EventScript_Grunt2:: @ 8161F57 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_41, SilphCo_11F_Text_Grunt2Intro, SilphCo_11F_Text_Grunt2Defeat + msgbox SilphCo_11F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_11F/text.inc b/data/maps/SilphCo_11F/text.inc index dcb60219a..83b004f4a 100644 --- a/data/maps/SilphCo_11F/text.inc +++ b/data/maps/SilphCo_11F/text.inc @@ -1,4 +1,4 @@ -gUnknown_8176E12:: @ 8176E12 +SilphCo_11F_Text_ThanksForSavingMeDearBoy:: @ 8176E12 .string "PRESIDENT: Oh, dear boy!\n" .string "Thank you for saving SILPH.\p" .string "I will never forget you saved us in\n" @@ -8,7 +8,7 @@ gUnknown_8176E12:: @ 8176E12 .string "anything.\p" .string "Here, maybe this will do.$" -gUnknown_8176EE7:: @ 8176EE7 +SilphCo_11F_Text_ThanksForSavingMeDearGirl:: @ 8176EE7 .string "PRESIDENT: Oh, dear girl!\n" .string "Thank you for saving SILPH.\p" .string "I will never forget you saved us in\n" @@ -18,11 +18,11 @@ gUnknown_8176EE7:: @ 8176EE7 .string "anything.\p" .string "Here, maybe this will do.$" -gUnknown_8176FBD:: @ 8176FBD +SilphCo_11F_Text_ObtainedMasterBallFromPresident:: @ 8176FBD .string "{PLAYER} obtained a MASTER BALL\n" .string "from the PRESIDENT!$" -gUnknown_8176FEB:: @ 8176FEB +SilphCo_11F_Text_ThatsOurSecretPrototype:: @ 8176FEB .string "PRESIDENT: You can't buy that\n" .string "anywhere.\p" .string "It's our secret prototype MASTER\n" @@ -32,16 +32,16 @@ gUnknown_8176FEB:: @ 8176FEB .string "You should be quiet about using it,\n" .string "though.$" -gUnknown_817708E:: @ 817708E +SilphCo_11F_Text_YouHaveNoRoomForThis:: @ 817708E .string "You have no room for this.$" -gUnknown_81770A9:: @ 81770A9 +SilphCo_11F_Text_ThanksForRescuingUs:: @ 81770A9 .string "SECRETARY: Thank you for rescuing\n" .string "all of us.\p" .string "We, from the PRESIDENT down,\n" .string "are indebted to you.$" -gUnknown_8177108:: @ 8177108 +SilphCo_11F_Text_GiovanniIntro:: @ 8177108 .string "Ah, {PLAYER}!\n" .string "So we meet again!\p" .string "The PRESIDENT and I are discussing\n" @@ -50,11 +50,11 @@ gUnknown_8177108:: @ 8177108 .string "matters…\p" .string "Or, experience a world of pain!$" -Text_1771AB:: @ 81771AB +SilphCo_11F_Text_GiovanniDefeat:: @ 81771AB .string "Arrgh!!\n" .string "I lost again!?$" -gUnknown_81771C2:: @ 81771C2 +SilphCo_11F_Text_GiovanniPostBattle:: @ 81771C2 .string "Blast it all!\n" .string "You ruined our plans for SILPH!\p" .string "But, TEAM ROCKET will never fall!\p" @@ -62,33 +62,33 @@ gUnknown_81771C2:: @ 81771C2 .string "POKéMON exist for TEAM ROCKET!\p" .string "I must go, but I shall return!$" -Text_17726A:: @ 817726A +SilphCo_11F_Text_Grunt2Intro:: @ 817726A .string "Stop right there!\n" .string "Don't you move!$" -Text_17728C:: @ 817728C +SilphCo_11F_Text_Grunt2Defeat:: @ 817728C .string "Don't…\n" .string "Please!$" -gUnknown_817729B:: @ 817729B +SilphCo_11F_Text_Grunt2PostBattle:: @ 817729B .string "So, you want to see my BOSS?$" -Text_1772B8:: @ 81772B8 +SilphCo_11F_Text_Grunt1Intro:: @ 81772B8 .string "Halt! Do you have an appointment\n" .string "with my BOSS?$" -Text_1772E7:: @ 81772E7 +SilphCo_11F_Text_Grunt1Defeat:: @ 81772E7 .string "Gaah!\n" .string "Demolished!$" -gUnknown_81772F9:: @ 81772F9 +SilphCo_11F_Text_Grunt1PostBattle:: @ 81772F9 .string "Watch your step…\n" .string "My BOSS likes his POKéMON tough!$" -gUnknown_817732B:: @ 817732B +SilphCo_11F_Text_MonitorHasMonsOnIt:: @ 817732B .string "The monitor has POKéMON on it!$" -gUnknown_817734A:: @ 817734A +SilphCo_11F_Text_FloorSign:: @ 817734A .string "SILPH CO. HEAD OFFICE\n" .string "11F$" diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json index 277329dfc..b4e329490 100644 --- a/data/maps/SilphCo_1F/map.json +++ b/data/maps/SilphCo_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_1F_EventScript_16162F", + "script": "SilphCo_1F_EventScript_Receptionist", "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" } ], @@ -71,7 +71,7 @@ "x": 30, "y": 1, "elevation": 0, - "script": "SilphCo_1F_EventScript_161638" + "script": "SilphCo_1F_EventScript_FloorSign" } ] } diff --git a/data/maps/SilphCo_1F/scripts.inc b/data/maps/SilphCo_1F/scripts.inc index f10c4d8b3..004d2de0c 100644 --- a/data/maps/SilphCo_1F/scripts.inc +++ b/data/maps/SilphCo_1F/scripts.inc @@ -6,10 +6,10 @@ SilphCo_1F_OnTransition:: @ 816162B setworldmapflag FLAG_WORLD_MAP_SILPH_CO_1F end -SilphCo_1F_EventScript_16162F:: @ 816162F - msgbox gUnknown_81754F7, MSGBOX_NPC +SilphCo_1F_EventScript_Receptionist:: @ 816162F + msgbox SilphCo_1F_Text_WelcomePresidentInBoardroom, MSGBOX_NPC end -SilphCo_1F_EventScript_161638:: @ 8161638 - msgbox gUnknown_8175549, MSGBOX_SIGN +SilphCo_1F_EventScript_FloorSign:: @ 8161638 + msgbox SilphCo_1F_Text_FloorSign, MSGBOX_SIGN end diff --git a/data/maps/SilphCo_1F/text.inc b/data/maps/SilphCo_1F/text.inc index 048102660..808aec46b 100644 --- a/data/maps/SilphCo_1F/text.inc +++ b/data/maps/SilphCo_1F/text.inc @@ -1,13 +1,13 @@ -gUnknown_81754F7:: @ 81754F7 +SilphCo_1F_Text_WelcomePresidentInBoardroom:: @ 81754F7 .string "Welcome.\p" .string "The PRESIDENT is in the boardroom\n" .string "on 11F.$" -Text_17552A:: @ 817552A +SilphCo_1F_Text_17552A:: @ 817552A .string "めちゃめちゃに　こわされてる\n" .string "とうぶん　なおりそうに　ない‥$" -gUnknown_8175549:: @ 8175549 +SilphCo_1F_Text_FloorSign:: @ 8175549 .string "SILPH CO. HEAD OFFICE\n" .string "1F$" diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index fed3b8390..89439ba8a 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "SilphCo_2F_EventScript_1616AE", + "script": "SilphCo_2F_EventScript_Grunt2", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "SilphCo_2F_EventScript_161680", + "script": "SilphCo_2F_EventScript_Jerry", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SilphCo_2F_EventScript_161697", + "script": "SilphCo_2F_EventScript_Grunt1", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_2F_EventScript_161669", + "script": "SilphCo_2F_EventScript_Connor", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -203,7 +203,7 @@ "x": 29, "y": 1, "elevation": 0, - "script": "SilphCo_2F_EventScript_161660" + "script": "SilphCo_2F_EventScript_FloorSign" } ] } diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc index 6f800bbd0..161ddefe6 100644 --- a/data/maps/SilphCo_2F/scripts.inc +++ b/data/maps/SilphCo_2F/scripts.inc @@ -9,30 +9,28 @@ SilphCo_2F_OnLoad:: @ 8161647 SilphCo_2F_EventScript_ThunderWaveTutor:: @ 816165A goto EventScript_ThunderWaveTutor - -EventScript_16165F:: @ 816165F end -SilphCo_2F_EventScript_161660:: @ 8161660 - msgbox gUnknown_8175894, MSGBOX_SIGN +SilphCo_2F_EventScript_FloorSign:: @ 8161660 + msgbox SilphCo_2F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_2F_EventScript_161669:: @ 8161669 - trainerbattle_single TRAINER_SCIENTIST_CONNOR, Text_175562, Text_17557E - msgbox gUnknown_817559F, MSGBOX_AUTOCLOSE +SilphCo_2F_EventScript_Connor:: @ 8161669 + trainerbattle_single TRAINER_SCIENTIST_CONNOR, SilphCo_2F_Text_ConnorIntro, SilphCo_2F_Text_ConnorDefeat + msgbox SilphCo_2F_Text_ConnorPostBattle, MSGBOX_AUTOCLOSE end -SilphCo_2F_EventScript_161680:: @ 8161680 - trainerbattle_single TRAINER_SCIENTIST_JERRY, Text_1755C6, Text_1755E5 - msgbox gUnknown_81755F2, MSGBOX_AUTOCLOSE +SilphCo_2F_EventScript_Jerry:: @ 8161680 + trainerbattle_single TRAINER_SCIENTIST_JERRY, SilphCo_2F_Text_JerryIntro, SilphCo_2F_Text_JerryDefeat + msgbox SilphCo_2F_Text_JerryPostBattle, MSGBOX_AUTOCLOSE end -SilphCo_2F_EventScript_161697:: @ 8161697 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_23, Text_17562D, Text_17564A - msgbox gUnknown_8175651, MSGBOX_AUTOCLOSE +SilphCo_2F_EventScript_Grunt1:: @ 8161697 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_23, SilphCo_2F_Text_Grunt1Intro, SilphCo_2F_Text_Grunt1Defeat + msgbox SilphCo_2F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_2F_EventScript_1616AE:: @ 81616AE - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_24, Text_1756AD, Text_1756D8 - msgbox gUnknown_81756E2, MSGBOX_AUTOCLOSE +SilphCo_2F_EventScript_Grunt2:: @ 81616AE + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_24, SilphCo_2F_Text_Grunt2Intro, SilphCo_2F_Text_Grunt2Defeat + msgbox SilphCo_2F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_2F/text.inc b/data/maps/SilphCo_2F/text.inc index 3dc65664d..82c7bac99 100644 --- a/data/maps/SilphCo_2F/text.inc +++ b/data/maps/SilphCo_2F/text.inc @@ -1,46 +1,46 @@ -Text_175562:: @ 8175562 +SilphCo_2F_Text_ConnorIntro:: @ 8175562 .string "Help!\n" .string "I'm a SILPH employee.$" -Text_17557E:: @ 817557E +SilphCo_2F_Text_ConnorDefeat:: @ 817557E .string "How did you know\n" .string "I was a ROCKET?$" -gUnknown_817559F:: @ 817559F +SilphCo_2F_Text_ConnorPostBattle:: @ 817559F .string "I work for both SILPH and TEAM\n" .string "ROCKET.$" -Text_1755C6:: @ 81755C6 +SilphCo_2F_Text_JerryIntro:: @ 81755C6 .string "It's off-limits here!\n" .string "Go home!$" -Text_1755E5:: @ 81755E5 +SilphCo_2F_Text_JerryDefeat:: @ 81755E5 .string "You're good.$" -gUnknown_81755F2:: @ 81755F2 +SilphCo_2F_Text_JerryPostBattle:: @ 81755F2 .string "Can you solve the maze in here?\n" .string "It's not easy, I tell you!$" -Text_17562D:: @ 817562D +SilphCo_2F_Text_Grunt1Intro:: @ 817562D .string "No kids are allowed in here!$" -Text_17564A:: @ 817564A +SilphCo_2F_Text_Grunt1Defeat:: @ 817564A .string "Tough!$" -gUnknown_8175651:: @ 8175651 +SilphCo_2F_Text_Grunt1PostBattle:: @ 8175651 .string "Diamond-shaped tiles are teleport\n" .string "blocks.\p" .string "They're transporters for this\n" .string "high-tech building.$" -Text_1756AD:: @ 81756AD +SilphCo_2F_Text_Grunt2Intro:: @ 81756AD .string "Hey, kid!\n" .string "What are you wandering here for?$" -Text_1756D8:: @ 81756D8 +SilphCo_2F_Text_Grunt2Defeat:: @ 81756D8 .string "I goofed!$" -gUnknown_81756E2:: @ 81756E2 +SilphCo_2F_Text_Grunt2PostBattle:: @ 81756E2 .string "SILPH CO. will be associated with\n" .string "TEAM ROCKET!$" @@ -68,7 +68,7 @@ Text_ThunderWaveTaught:: @ 81757EC .string "It's an ELECTRIC-type move, so it\n" .string "won't work on some POKéMON.$" -gUnknown_8175894:: @ 8175894 +SilphCo_2F_Text_FloorSign:: @ 8175894 .string "SILPH CO. HEAD OFFICE\n" .string "2F$" diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index 8a81b5118..42a1e6b72 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SilphCo_3F_EventScript_16171F", + "script": "SilphCo_3F_EventScript_Grunt", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_3F_EventScript_1616DE", + "script": "SilphCo_3F_EventScript_WorkerM", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_3F_EventScript_161708", + "script": "SilphCo_3F_EventScript_Jose", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -211,7 +211,7 @@ "x": 29, "y": 1, "elevation": 0, - "script": "SilphCo_3F_EventScript_1616FF" + "script": "SilphCo_3F_EventScript_FloorSign" } ] } diff --git a/data/maps/SilphCo_3F/scripts.inc b/data/maps/SilphCo_3F/scripts.inc index a5e62b667..2fab54a56 100644 --- a/data/maps/SilphCo_3F/scripts.inc +++ b/data/maps/SilphCo_3F/scripts.inc @@ -7,30 +7,30 @@ SilphCo_3F_OnLoad:: @ 81616CB call_if_unset FLAG_SILPH_3F_DOOR_2, EventScript_Close3FDoor2 end -SilphCo_3F_EventScript_1616DE:: @ 81616DE +SilphCo_3F_EventScript_WorkerM:: @ 81616DE lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_1616F5 - msgbox gUnknown_81758AD + goto_if_ge SilphCo_3F_EventScript_WorkerMRocketsGone + msgbox SilphCo_3F_Text_WhatAmIToDo release end -EventScript_1616F5:: @ 81616F5 - msgbox gUnknown_81758D3 +SilphCo_3F_EventScript_WorkerMRocketsGone:: @ 81616F5 + msgbox SilphCo_3F_Text_YouAndYourMonsSavedUs release end -SilphCo_3F_EventScript_1616FF:: @ 81616FF - msgbox gUnknown_81759DC, MSGBOX_SIGN +SilphCo_3F_EventScript_FloorSign:: @ 81616FF + msgbox SilphCo_3F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_3F_EventScript_161708:: @ 8161708 - trainerbattle_single TRAINER_SCIENTIST_JOSE, Text_175948, Text_17597D - msgbox gUnknown_8175990, MSGBOX_AUTOCLOSE +SilphCo_3F_EventScript_Jose:: @ 8161708 + trainerbattle_single TRAINER_SCIENTIST_JOSE, SilphCo_3F_Text_JoseIntro, SilphCo_3F_Text_JoseDefeat + msgbox SilphCo_3F_Text_JosePostBattle, MSGBOX_AUTOCLOSE end -SilphCo_3F_EventScript_16171F:: @ 816171F - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_25, Text_1758F6, Text_175911 - msgbox gUnknown_817591C, MSGBOX_AUTOCLOSE +SilphCo_3F_EventScript_Grunt:: @ 816171F + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_25, SilphCo_3F_Text_GruntIntro, SilphCo_3F_Text_GruntDefeat + msgbox SilphCo_3F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_3F/text.inc b/data/maps/SilphCo_3F/text.inc index 6b8a8d4d1..128865c1b 100644 --- a/data/maps/SilphCo_3F/text.inc +++ b/data/maps/SilphCo_3F/text.inc @@ -1,34 +1,34 @@ -gUnknown_81758AD:: @ 81758AD +SilphCo_3F_Text_WhatAmIToDo:: @ 81758AD .string "I work for SILPH CO.\n" .string "What am I to do?$" -gUnknown_81758D3:: @ 81758D3 +SilphCo_3F_Text_YouAndYourMonsSavedUs:: @ 81758D3 .string "{PLAYER}!\n" .string "You and your POKéMON saved us!$" -Text_1758F6:: @ 81758F6 +SilphCo_3F_Text_GruntIntro:: @ 81758F6 .string "Quit messing with us, kid!$" -Text_175911:: @ 8175911 +SilphCo_3F_Text_GruntDefeat:: @ 8175911 .string "I give up!$" -gUnknown_817591C:: @ 817591C +SilphCo_3F_Text_GruntPostBattle:: @ 817591C .string "A hint? You can open doors with\n" .string "a CARD KEY!$" -Text_175948:: @ 8175948 +SilphCo_3F_Text_JoseIntro:: @ 8175948 .string "I support TEAM ROCKET more than\n" .string "I support SILPH CO.!$" -Text_17597D:: @ 817597D +SilphCo_3F_Text_JoseDefeat:: @ 817597D .string "You really got me!$" -gUnknown_8175990:: @ 8175990 +SilphCo_3F_Text_JosePostBattle:: @ 8175990 .string "Humph…\p" .string "TEAM ROCKET said that if I helped\n" .string "them, they'd let me study POKéMON.$" -gUnknown_81759DC:: @ 81759DC +SilphCo_3F_Text_FloorSign:: @ 81759DC .string "SILPH CO. HEAD OFFICE\n" .string "3F$" diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index fc37a6102..6473f3c5d 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SilphCo_4F_EventScript_1617A7", + "script": "SilphCo_4F_EventScript_Grunt2", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "SilphCo_4F_EventScript_161790", + "script": "SilphCo_4F_EventScript_Grunt1", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SilphCo_4F_EventScript_161779", + "script": "SilphCo_4F_EventScript_Rodney", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_4F_EventScript_16174F", + "script": "SilphCo_4F_EventScript_WorkerM", "flag": "0" }, { @@ -242,7 +242,7 @@ "x": 29, "y": 1, "elevation": 0, - "script": "SilphCo_4F_EventScript_161770" + "script": "SilphCo_4F_EventScript_FloorSign" } ] } diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc index 406e394f1..bd20cb533 100644 --- a/data/maps/SilphCo_4F/scripts.inc +++ b/data/maps/SilphCo_4F/scripts.inc @@ -7,35 +7,35 @@ SilphCo_4F_OnLoad:: @ 816173C call_if_unset FLAG_SILPH_4F_DOOR_2, EventScript_Close4FDoor2 end -SilphCo_4F_EventScript_16174F:: @ 816174F +SilphCo_4F_EventScript_WorkerM:: @ 816174F lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_161766 - msgbox gUnknown_81759F5 + goto_if_ge SilphCo_4F_EventScript_WorkerMRocketsGone + msgbox SilphCo_4F_Text_CantYouSeeImHiding release end -EventScript_161766:: @ 8161766 - msgbox gUnknown_8175A15 +SilphCo_4F_EventScript_WorkerMRocketsGone:: @ 8161766 + msgbox SilphCo_4F_Text_TeamRocketIsGone release end -SilphCo_4F_EventScript_161770:: @ 8161770 - msgbox gUnknown_8175B57, MSGBOX_SIGN +SilphCo_4F_EventScript_FloorSign:: @ 8161770 + msgbox SilphCo_4F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_4F_EventScript_161779:: @ 8161779 - trainerbattle_single TRAINER_SCIENTIST_RODNEY, Text_175A90, Text_175AB0 - msgbox gUnknown_8175AC8, MSGBOX_AUTOCLOSE +SilphCo_4F_EventScript_Rodney:: @ 8161779 + trainerbattle_single TRAINER_SCIENTIST_RODNEY, SilphCo_4F_Text_RodneyIntro, SilphCo_4F_Text_RodneyDefeat + msgbox SilphCo_4F_Text_RodneyPostBattle, MSGBOX_AUTOCLOSE end -SilphCo_4F_EventScript_161790:: @ 8161790 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_26, Text_175A2F, Text_175A5B - msgbox gUnknown_8175A62, MSGBOX_AUTOCLOSE +SilphCo_4F_EventScript_Grunt1:: @ 8161790 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_26, SilphCo_4F_Text_Grunt1Intro, SilphCo_4F_Text_Grunt1Defeat + msgbox SilphCo_4F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_4F_EventScript_1617A7:: @ 81617A7 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_27, Text_175B19, Text_175B2B - msgbox gUnknown_8175B38, MSGBOX_AUTOCLOSE +SilphCo_4F_EventScript_Grunt2:: @ 81617A7 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_27, SilphCo_4F_Text_Grunt2Intro, SilphCo_4F_Text_Grunt2Defeat + msgbox SilphCo_4F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_4F/text.inc b/data/maps/SilphCo_4F/text.inc index d8741f9a3..dd1ed2d20 100644 --- a/data/maps/SilphCo_4F/text.inc +++ b/data/maps/SilphCo_4F/text.inc @@ -1,45 +1,45 @@ -gUnknown_81759F5:: @ 81759F5 +SilphCo_4F_Text_CantYouSeeImHiding:: @ 81759F5 .string "Sssh!\n" .string "Can't you see I'm hiding?$" -gUnknown_8175A15:: @ 8175A15 +SilphCo_4F_Text_TeamRocketIsGone:: @ 8175A15 .string "Huh?\n" .string "TEAM ROCKET is gone?$" -Text_175A2F:: @ 8175A2F +SilphCo_4F_Text_Grunt1Intro:: @ 8175A2F .string "TEAM ROCKET has taken control\n" .string "of SILPH CO.!$" -Text_175A5B:: @ 8175A5B +SilphCo_4F_Text_Grunt1Defeat:: @ 8175A5B .string "Arrgh!$" -gUnknown_8175A62:: @ 8175A62 +SilphCo_4F_Text_Grunt1PostBattle:: @ 8175A62 .string "Fwahahaha!\n" .string "My BOSS has been after this place!$" -Text_175A90:: @ 8175A90 +SilphCo_4F_Text_RodneyIntro:: @ 8175A90 .string "My POKéMON is my loyal servant.$" -Text_175AB0:: @ 8175AB0 +SilphCo_4F_Text_RodneyDefeat:: @ 8175AB0 .string "Darn!\n" .string "You weak POKéMON!$" -gUnknown_8175AC8:: @ 8175AC8 +SilphCo_4F_Text_RodneyPostBattle:: @ 8175AC8 .string "The doors are electronically\n" .string "locked.\p" .string "It takes a CARD KEY to open the\n" .string "doors here.$" -Text_175B19:: @ 8175B19 +SilphCo_4F_Text_Grunt2Intro:: @ 8175B19 .string "Intruder spotted!$" -Text_175B2B:: @ 8175B2B +SilphCo_4F_Text_Grunt2Defeat:: @ 8175B2B .string "Who are you?$" -gUnknown_8175B38:: @ 8175B38 +SilphCo_4F_Text_Grunt2PostBattle:: @ 8175B38 .string "I better tell the BOSS on 11F!$" -gUnknown_8175B57:: @ 8175B57 +SilphCo_4F_Text_FloorSign:: @ 8175B57 .string "SILPH CO. HEAD OFFICE\n" .string "4F$" diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index 9bc1989ff..834d3c9eb 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SilphCo_5F_EventScript_161853", + "script": "SilphCo_5F_EventScript_Grunt2", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "SilphCo_5F_EventScript_16186A", + "script": "SilphCo_5F_EventScript_Dalton", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_5F_EventScript_1617E0", + "script": "SilphCo_5F_EventScript_WorkerM", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SilphCo_5F_EventScript_161825", + "script": "SilphCo_5F_EventScript_Beau", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SilphCo_5F_EventScript_16183C", + "script": "SilphCo_5F_EventScript_Grunt1", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_5F_EventScript_1AD0D4", + "script": "SilphCo_5F_EventScript_Scientist", "flag": "0" } ], @@ -283,21 +283,21 @@ "x": 28, "y": 11, "elevation": 0, - "script": "SilphCo_5F_EventScript_161813" + "script": "SilphCo_5F_EventScript_PokemonReport3" }, { "type": "bg_event_type_0", "x": 30, "y": 13, "elevation": 0, - "script": "SilphCo_5F_EventScript_16180A" + "script": "SilphCo_5F_EventScript_PokemonReport2" }, { "type": "bg_event_type_0", "x": 25, "y": 15, "elevation": 0, - "script": "SilphCo_5F_EventScript_161801" + "script": "SilphCo_5F_EventScript_PokemonReport1" }, { "type": "hidden_item", @@ -314,7 +314,7 @@ "x": 29, "y": 1, "elevation": 0, - "script": "SilphCo_5F_EventScript_16181C" + "script": "SilphCo_5F_EventScript_FloorSign" } ] } diff --git a/data/maps/SilphCo_5F/scripts.inc b/data/maps/SilphCo_5F/scripts.inc index 1a17e3b44..ae195ee09 100644 --- a/data/maps/SilphCo_5F/scripts.inc +++ b/data/maps/SilphCo_5F/scripts.inc @@ -8,52 +8,52 @@ SilphCo_5F_OnLoad:: @ 81617C4 call_if_unset FLAG_SILPH_5F_DOOR_3, EventScript_Close5FDoor3 end -SilphCo_5F_EventScript_1617E0:: @ 81617E0 +SilphCo_5F_EventScript_WorkerM:: @ 81617E0 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_1617F7 - msgbox gUnknown_8175B70 + goto_if_ge SilphCo_5F_EventScript_WorkerMRocketsGone + msgbox SilphCo_5F_Text_RocketsInUproarAboutIntruder release end -EventScript_1617F7:: @ 81617F7 - msgbox gUnknown_8175BB3 +SilphCo_5F_EventScript_WorkerMRocketsGone:: @ 81617F7 + msgbox SilphCo_5F_Text_YoureOurHeroThankYou release end -SilphCo_5F_EventScript_161801:: @ 8161801 - msgbox gUnknown_8175D89, MSGBOX_SIGN +SilphCo_5F_EventScript_PokemonReport1:: @ 8161801 + msgbox SilphCo_5F_Text_PorygonFirstVRMon, MSGBOX_SIGN end -SilphCo_5F_EventScript_16180A:: @ 816180A - msgbox gUnknown_8175DE0, MSGBOX_SIGN +SilphCo_5F_EventScript_PokemonReport2:: @ 816180A + msgbox SilphCo_5F_Text_Over350TechniquesConfirmed, MSGBOX_SIGN end -SilphCo_5F_EventScript_161813:: @ 8161813 - msgbox gUnknown_8175E28, MSGBOX_SIGN +SilphCo_5F_EventScript_PokemonReport3:: @ 8161813 + msgbox SilphCo_5F_Text_SomeMonsEvolveWhenTraded, MSGBOX_SIGN end -SilphCo_5F_EventScript_16181C:: @ 816181C - msgbox gUnknown_8175E80, MSGBOX_SIGN +SilphCo_5F_EventScript_FloorSign:: @ 816181C + msgbox SilphCo_5F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_5F_EventScript_161825:: @ 8161825 - trainerbattle_single TRAINER_SCIENTIST_BEAU, Text_175C40, Text_175C6D - msgbox gUnknown_8175C7D, MSGBOX_AUTOCLOSE +SilphCo_5F_EventScript_Beau:: @ 8161825 + trainerbattle_single TRAINER_SCIENTIST_BEAU, SilphCo_5F_Text_BeauIntro, SilphCo_5F_Text_BeauDefeat + msgbox SilphCo_5F_Text_BeauPostBattle, MSGBOX_AUTOCLOSE end -SilphCo_5F_EventScript_16183C:: @ 816183C - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_28, Text_175BE5, Text_175C09 - msgbox gUnknown_8175C0F, MSGBOX_AUTOCLOSE +SilphCo_5F_EventScript_Grunt1:: @ 816183C + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_28, SilphCo_5F_Text_Grunt1Intro, SilphCo_5F_Text_Grunt1Defeat + msgbox SilphCo_5F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_5F_EventScript_161853:: @ 8161853 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_29, Text_175D28, Text_175D4B - msgbox gUnknown_8175D59, MSGBOX_AUTOCLOSE +SilphCo_5F_EventScript_Grunt2:: @ 8161853 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_29, SilphCo_5F_Text_Grunt2Intro, SilphCo_5F_Text_Grunt2Defeat + msgbox SilphCo_5F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_5F_EventScript_16186A:: @ 816186A - trainerbattle_single TRAINER_JUGGLER_DALTON, Text_175CBD, Text_175CEB - msgbox gUnknown_8175CF9, MSGBOX_AUTOCLOSE +SilphCo_5F_EventScript_Dalton:: @ 816186A + trainerbattle_single TRAINER_JUGGLER_DALTON, SilphCo_5F_Text_DaltonIntro, SilphCo_5F_Text_DaltonDefeat + msgbox SilphCo_5F_Text_DaltonPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_5F/text.inc b/data/maps/SilphCo_5F/text.inc index 5a768d5f5..3161f971c 100644 --- a/data/maps/SilphCo_5F/text.inc +++ b/data/maps/SilphCo_5F/text.inc @@ -1,74 +1,81 @@ -gUnknown_8175B70:: @ 8175B70 +SilphCo_5F_Text_RocketsInUproarAboutIntruder:: @ 8175B70 .string "TEAM ROCKET is in an uproar over\n" .string "some intruder.\p" .string "That's you, right?$" -gUnknown_8175BB3:: @ 8175BB3 +SilphCo_5F_Text_YoureOurHeroThankYou:: @ 8175BB3 .string "TEAM ROCKET took off!\n" .string "You're our hero! Thank you!$" -Text_175BE5:: @ 8175BE5 +SilphCo_5F_Text_Grunt1Intro:: @ 8175BE5 .string "I heard a kid was wandering\n" .string "around.$" -Text_175C09:: @ 8175C09 +SilphCo_5F_Text_Grunt1Defeat:: @ 8175C09 .string "Boom!$" -gUnknown_8175C0F:: @ 8175C0F +SilphCo_5F_Text_Grunt1PostBattle:: @ 8175C0F .string "It's not smart to pick a fight with\n" .string "TEAM ROCKET!$" -Text_175C40:: @ 8175C40 +SilphCo_5F_Text_BeauIntro:: @ 8175C40 .string "We study POKé BALL technology on\n" .string "this floor.$" -Text_175C6D:: @ 8175C6D +SilphCo_5F_Text_BeauDefeat:: @ 8175C6D .string "Dang!\n" .string "Blast it!$" -gUnknown_8175C7D:: @ 8175C7D +SilphCo_5F_Text_BeauPostBattle:: @ 8175C7D .string "We worked on the ultimate POKé\n" .string "BALL which would catch anything.$" -Text_175CBD:: @ 8175CBD +SilphCo_5F_Text_DaltonIntro:: @ 8175CBD .string "Whaaat?\p" .string "There shouldn't be any children\n" .string "here!$" -Text_175CEB:: @ 8175CEB +SilphCo_5F_Text_DaltonDefeat:: @ 8175CEB .string "Oh, goodness!$" -gUnknown_8175CF9:: @ 8175CF9 +SilphCo_5F_Text_DaltonPostBattle:: @ 8175CF9 .string "You're only on 5F.\n" .string "It's a long way to my BOSS!$" -Text_175D28:: @ 8175D28 +SilphCo_5F_Text_Grunt2Intro:: @ 8175D28 .string "Show TEAM ROCKET a little respect!$" -Text_175D4B:: @ 8175D4B +SilphCo_5F_Text_Grunt2Defeat:: @ 8175D4B .string "Cough…\n" .string "Cough…$" -gUnknown_8175D59:: @ 8175D59 +SilphCo_5F_Text_Grunt2PostBattle:: @ 8175D59 .string "Which reminds me.\p" .string "KOFFING evolves into WEEZING!$" -gUnknown_8175D89:: @ 8175D89 +SilphCo_5F_Text_PorygonFirstVRMon:: @ 8175D89 .string "It's a POKéMON REPORT!\p" .string "POKéMON LAB created PORYGON,\n" .string "the first virtual-reality POKéMON.$" -gUnknown_8175DE0:: @ 8175DE0 +SilphCo_5F_Text_Over350TechniquesConfirmed:: @ 8175DE0 .string "It's a POKéMON REPORT!\p" .string "Over 350 POKéMON techniques have\n" .string "been confirmed.$" -gUnknown_8175E28:: @ 8175E28 +SilphCo_5F_Text_SomeMonsEvolveWhenTraded:: @ 8175E28 .string "It's a POKéMON REPORT!\p" .string "Some POKéMON have been confirmed\n" .string "to evolve when they are traded.$" -gUnknown_8175E80:: @ 8175E80 +SilphCo_5F_Text_FloorSign:: @ 8175E80 .string "SILPH CO. HEAD OFFICE\n" .string "5F$" +SilphCo_5F_Text_RocketBossLookingForStrongMons:: @ 8175E99 + .string "Those thugs that took over our\n" + .string "building…\p" + .string "Their BOSS said he was looking for\n" + .string "strong POKéMON.\p" + .string "I hope our PRESIDENT managed to\n" + .string "avoid trouble…$" diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index a1142c5ed..f5e701cf2 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SilphCo_6F_EventScript_161956", + "script": "SilphCo_6F_EventScript_Grunt1", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_6F_EventScript_1618D3", + "script": "SilphCo_6F_EventScript_WorkerM1", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_6F_EventScript_1618F4", + "script": "SilphCo_6F_EventScript_WorkerF1", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_6F_EventScript_161891", + "script": "SilphCo_6F_EventScript_WorkerM2", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_6F_EventScript_1618B2", + "script": "SilphCo_6F_EventScript_WorkerM3", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_6F_EventScript_161915", + "script": "SilphCo_6F_EventScript_WorkerF2", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "SilphCo_6F_EventScript_16193F", + "script": "SilphCo_6F_EventScript_Taylor", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SilphCo_6F_EventScript_16196D", + "script": "SilphCo_6F_EventScript_Grunt2", "flag": "FLAG_HIDE_SILPH_ROCKETS" } ], @@ -226,7 +226,7 @@ "x": 25, "y": 1, "elevation": 0, - "script": "SilphCo_6F_EventScript_161936" + "script": "SilphCo_6F_EventScript_FloorSign" } ] } diff --git a/data/maps/SilphCo_6F/scripts.inc b/data/maps/SilphCo_6F/scripts.inc index 6bc5cd545..478ff3309 100644 --- a/data/maps/SilphCo_6F/scripts.inc +++ b/data/maps/SilphCo_6F/scripts.inc @@ -6,91 +6,91 @@ SilphCo_6F_OnLoad:: @ 8161887 call_if_unset FLAG_SILPH_6F_DOOR, EventScript_Close6FDoor end -SilphCo_6F_EventScript_161891:: @ 8161891 +SilphCo_6F_EventScript_WorkerM2:: @ 8161891 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_1618A8 - msgbox gUnknown_817607E + goto_if_ge SilphCo_6F_EventScript_WorkerM2RocketsGone + msgbox SilphCo_6F_Text_TargetedSilphForOurMonProducts release end -EventScript_1618A8:: @ 81618A8 - msgbox gUnknown_81760B6 +SilphCo_6F_EventScript_WorkerM2RocketsGone:: @ 81618A8 + msgbox SilphCo_6F_Text_ComeWorkForSilphWhenYoureOlder release end -SilphCo_6F_EventScript_1618B2:: @ 81618B2 +SilphCo_6F_EventScript_WorkerM3:: @ 81618B2 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_1618C9 - msgbox gUnknown_8175F24 + goto_if_ge SilphCo_6F_EventScript_WorkerM3RocketsGone + msgbox SilphCo_6F_Text_RocketsTookOverBuilding release end -EventScript_1618C9:: @ 81618C9 - msgbox gUnknown_8175F51 +SilphCo_6F_EventScript_WorkerM3RocketsGone:: @ 81618C9 + msgbox SilphCo_6F_Text_BetterGetBackToWork release end -SilphCo_6F_EventScript_1618D3:: @ 81618D3 +SilphCo_6F_EventScript_WorkerM1:: @ 81618D3 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_1618EA - msgbox gUnknown_8175F70 + goto_if_ge SilphCo_6F_EventScript_WorkerM1RocketsGone + msgbox SilphCo_6F_Text_HelpMePlease release end -EventScript_1618EA:: @ 81618EA - msgbox gUnknown_8175F93 +SilphCo_6F_EventScript_WorkerM1RocketsGone:: @ 81618EA + msgbox SilphCo_6F_Text_WeGotEngaged release end -SilphCo_6F_EventScript_1618F4:: @ 81618F4 +SilphCo_6F_EventScript_WorkerF1:: @ 81618F4 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_16190B - msgbox gUnknown_8175FAA + goto_if_ge SilphCo_6F_EventScript_WorkerF1RocketsGone + msgbox SilphCo_6F_Text_ThatManIsSuchACoward release end -EventScript_16190B:: @ 816190B - msgbox gUnknown_8175FD3 +SilphCo_6F_EventScript_WorkerF1RocketsGone:: @ 816190B + msgbox SilphCo_6F_Text_NeedsMeToLookAfterHim release end -SilphCo_6F_EventScript_161915:: @ 8161915 +SilphCo_6F_EventScript_WorkerF2:: @ 8161915 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_16192C - msgbox gUnknown_8176012 + goto_if_ge SilphCo_6F_EventScript_WorkerF2RocketsGone + msgbox SilphCo_6F_Text_RocketsTryingToConquerWorld release end -EventScript_16192C:: @ 816192C - msgbox gUnknown_817604B +SilphCo_6F_EventScript_WorkerF2RocketsGone:: @ 816192C + msgbox SilphCo_6F_Text_RocketsRanAwayBecauseOfYou release end -SilphCo_6F_EventScript_161936:: @ 8161936 - msgbox gUnknown_817624D, MSGBOX_SIGN +SilphCo_6F_EventScript_FloorSign:: @ 8161936 + msgbox SilphCo_6F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_6F_EventScript_16193F:: @ 816193F - trainerbattle_single TRAINER_SCIENTIST_TAYLOR, Text_176136, Text_1761BD - msgbox gUnknown_81761C4, MSGBOX_AUTOCLOSE +SilphCo_6F_EventScript_Taylor:: @ 816193F + trainerbattle_single TRAINER_SCIENTIST_TAYLOR, SilphCo_6F_Text_TaylorIntro, SilphCo_6F_Text_TaylorDefeat + msgbox SilphCo_6F_Text_TaylorPostBattle, MSGBOX_AUTOCLOSE end -SilphCo_6F_EventScript_161956:: @ 8161956 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_30, Text_1760DE, Text_176104 - msgbox gUnknown_817610F, MSGBOX_AUTOCLOSE +SilphCo_6F_EventScript_Grunt1:: @ 8161956 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_30, SilphCo_6F_Text_Grunt1Intro, SilphCo_6F_Text_Grunt1Defeat + msgbox SilphCo_6F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_6F_EventScript_16196D:: @ 816196D - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_31, Text_1761F1, Text_17620E - msgbox gUnknown_817621B, MSGBOX_AUTOCLOSE +SilphCo_6F_EventScript_Grunt2:: @ 816196D + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_31, SilphCo_6F_Text_Grunt2Intro, SilphCo_6F_Text_Grunt2Defeat + msgbox SilphCo_6F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_6F/text.inc b/data/maps/SilphCo_6F/text.inc index 1de83df51..f0d1084a1 100644 --- a/data/maps/SilphCo_6F/text.inc +++ b/data/maps/SilphCo_6F/text.inc @@ -1,86 +1,78 @@ -Text_175E99:: @ 8175E99 - .string "Those thugs that took over our\n" - .string "building…\p" - .string "Their BOSS said he was looking for\n" - .string "strong POKéMON.\p" - .string "I hope our PRESIDENT managed to\n" - .string "avoid trouble…$" - -gUnknown_8175F24:: @ 8175F24 +SilphCo_6F_Text_RocketsTookOverBuilding:: @ 8175F24 .string "The ROCKETS came and took over\n" .string "the building!$" -gUnknown_8175F51:: @ 8175F51 +SilphCo_6F_Text_BetterGetBackToWork:: @ 8175F51 .string "Well, better get back to work.$" -gUnknown_8175F70:: @ 8175F70 +SilphCo_6F_Text_HelpMePlease:: @ 8175F70 .string "Oh dear, oh dear.\n" .string "Help me, please!$" -gUnknown_8175F93:: @ 8175F93 +SilphCo_6F_Text_WeGotEngaged:: @ 8175F93 .string "We got engaged.\n" .string "Heheh!$" -gUnknown_8175FAA:: @ 8175FAA +SilphCo_6F_Text_ThatManIsSuchACoward:: @ 8175FAA .string "That man next to me…\n" .string "He's such a coward!$" -gUnknown_8175FD3:: @ 8175FD3 +SilphCo_6F_Text_NeedsMeToLookAfterHim:: @ 8175FD3 .string "He's so helpless, he needed\n" .string "someone like me to look after him.$" -gUnknown_8176012:: @ 8176012 +SilphCo_6F_Text_RocketsTryingToConquerWorld:: @ 8176012 .string "TEAM ROCKET is trying to conquer\n" .string "the world with POKéMON.$" -gUnknown_817604B:: @ 817604B +SilphCo_6F_Text_RocketsRanAwayBecauseOfYou:: @ 817604B .string "TEAM ROCKET ran away, and it's all\n" .string "because of you!$" -gUnknown_817607E:: @ 817607E +SilphCo_6F_Text_TargetedSilphForOurMonProducts:: @ 817607E .string "They must have targeted SILPH for\n" .string "our POKéMON products.$" -gUnknown_81760B6:: @ 81760B6 +SilphCo_6F_Text_ComeWorkForSilphWhenYoureOlder:: @ 81760B6 .string "Come work for SILPH when you\n" .string "get older.$" -Text_1760DE:: @ 81760DE +SilphCo_6F_Text_Grunt1Intro:: @ 81760DE .string "I am one of the four ROCKET\n" .string "BROTHERS!$" -Text_176104:: @ 8176104 +SilphCo_6F_Text_Grunt1Defeat:: @ 8176104 .string "Flame out!$" -gUnknown_817610F:: @ 817610F +SilphCo_6F_Text_Grunt1PostBattle:: @ 817610F .string "No matter!\n" .string "My brothers will avenge me!$" -Text_176136:: @ 8176136 +SilphCo_6F_Text_TaylorIntro:: @ 8176136 .string "That rotten PRESIDENT!\p" .string "Serves him right for shipping me\n" .string "off to the TIKSI BRANCH!\p" .string "That's why TEAM ROCKET came after\n" .string "us, I'm sure of it!$" -Text_1761BD:: @ 81761BD +SilphCo_6F_Text_TaylorDefeat:: @ 81761BD .string "Shoot!$" -gUnknown_81761C4:: @ 81761C4 +SilphCo_6F_Text_TaylorPostBattle:: @ 81761C4 .string "TIKSI BRANCH?\n" .string "It's in Russian no-man's-land!$" -Text_1761F1:: @ 81761F1 +SilphCo_6F_Text_Grunt2Intro:: @ 81761F1 .string "You dare betray TEAM ROCKET?$" -Text_17620E:: @ 817620E +SilphCo_6F_Text_Grunt2Defeat:: @ 817620E .string "You traitor!$" -gUnknown_817621B:: @ 817621B +SilphCo_6F_Text_Grunt2PostBattle:: @ 817621B .string "If you stand for justice, you\n" .string "betray us bad guys!$" -gUnknown_817624D:: @ 817624D +SilphCo_6F_Text_FloorSign:: @ 817624D .string "SILPH CO. HEAD OFFICE\n" .string "6F$" diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index 87a1a413c..994088fb0 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_7F_EventScript_161AC8", + "script": "SilphCo_7F_EventScript_LaprasGuy", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "SilphCo_7F_EventScript_161C1A", + "script": "SilphCo_7F_EventScript_Grunt1", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SilphCo_7F_EventScript_161C31", + "script": "SilphCo_7F_EventScript_Grunt2", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SilphCo_7F_EventScript_161C48", + "script": "SilphCo_7F_EventScript_Grunt3", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_7F_EventScript_161BD9", + "script": "SilphCo_7F_EventScript_WorkerF", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_7F_EventScript_161B97", + "script": "SilphCo_7F_EventScript_WorkerM1", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_7F_EventScript_161BB8", + "script": "SilphCo_7F_EventScript_WorkerM2", "flag": "0" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SilphCo_7F_EventScript_161C03", + "script": "SilphCo_7F_EventScript_Joshua", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -209,7 +209,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_SILPH_CO_7F", "var_value": 0, - "script": "SilphCo_7F_EventScript_1619BC" + "script": "SilphCo_7F_EventScript_RivalTriggerTop" }, { "type": "trigger", @@ -218,7 +218,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_SILPH_CO_7F", "var_value": 0, - "script": "SilphCo_7F_EventScript_1619C8" + "script": "SilphCo_7F_EventScript_RivalTriggerBottom" } ], "bg_events": [ @@ -321,7 +321,7 @@ "x": 20, "y": 1, "elevation": 0, - "script": "SilphCo_7F_EventScript_161BFA" + "script": "SilphCo_7F_EventScript_FloorSign" } ] } diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 9ca4f31ec..0bfac0151 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -11,30 +11,26 @@ SilphCo_7F_OnLoad:: @ 816198F SilphCo_7F_OnTransition:: @ 81619AB compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - call_if_ge EventScript_1619B7 + call_if_ge SilphCo_7F_EventScript_SetObjRocketsGone end -EventScript_1619B7:: @ 81619B7 - setobjectmovementtype 8, 7 +SilphCo_7F_EventScript_SetObjRocketsGone:: @ 81619B7 + setobjectmovementtype 8, MOVEMENT_TYPE_FACE_UP return -SilphCo_7F_EventScript_1619BC:: @ 81619BC +SilphCo_7F_EventScript_RivalTriggerTop:: @ 81619BC lockall setvar VAR_TEMP_1, 0 - goto EventScript_1619D4 - -EventScript_1619C7:: @ 81619C7 + goto SilphCo_7F_EventScript_RivalScene end -SilphCo_7F_EventScript_1619C8:: @ 81619C8 +SilphCo_7F_EventScript_RivalTriggerBottom:: @ 81619C8 lockall setvar VAR_TEMP_1, 1 - goto EventScript_1619D4 - -EventScript_1619D3:: @ 81619D3 + goto SilphCo_7F_EventScript_RivalScene end -EventScript_1619D4:: @ 81619D4 +SilphCo_7F_EventScript_RivalScene:: @ 81619D4 textcolor 0 playbgm MUS_RIVAL1, 0 applymovement 1, Movement_ExclamationMark @@ -42,26 +38,26 @@ EventScript_1619D4:: @ 81619D4 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown applymovement 1, Movement_Delay48 waitmovement 0 - msgbox gUnknown_8176710 + msgbox SilphCo_7F_Text_RivalWhatKeptYou compare VAR_TEMP_1, 0 - call_if_eq EventScript_161A73 + call_if_eq SilphCo_7F_EventScript_RivalApproachTop compare VAR_TEMP_1, 1 - call_if_eq EventScript_161A7F - msgbox gUnknown_8176727 + call_if_eq SilphCo_7F_EventScript_RivalApproachBottom + msgbox SilphCo_7F_Text_RivalIntro setvar VAR_LAST_TALKED, 1 compare VAR_STARTER_MON, 2 - call_if_eq EventScript_161A80 + call_if_eq SilphCo_7F_EventScript_RivalSquirtle compare VAR_STARTER_MON, 1 - call_if_eq EventScript_161A8B + call_if_eq SilphCo_7F_EventScript_RivalBulbasaur compare VAR_STARTER_MON, 0 - call_if_eq EventScript_161A96 - msgbox gUnknown_8176827 + call_if_eq SilphCo_7F_EventScript_RivalCharmander + msgbox SilphCo_7F_Text_RivalPostBattle closemessage playbgm MUS_RIVAL2, 0 compare VAR_TEMP_1, 0 - call_if_eq EventScript_161AA1 + call_if_eq SilphCo_7F_EventScript_RivalExitTop compare VAR_TEMP_1, 1 - call_if_eq EventScript_161AAC + call_if_eq SilphCo_7F_EventScript_RivalExitBottom playse SE_TK_WARPIN fadedefaultbgm removeobject 1 @@ -70,42 +66,42 @@ EventScript_1619D4:: @ 81619D4 releaseall end -EventScript_161A73:: @ 8161A73 +SilphCo_7F_EventScript_RivalApproachTop:: @ 8161A73 closemessage - applymovement 1, Movement_161AB7 + applymovement 1, SilphCo_7F_Movement_RivalApproachTop waitmovement 0 return -EventScript_161A7F:: @ 8161A7F +SilphCo_7F_EventScript_RivalApproachBottom:: @ 8161A7F return -EventScript_161A80:: @ 8161A80 - trainerbattle_no_intro TRAINER_RIVAL_SILPH_SQUIRTLE, Text_1767D0 +SilphCo_7F_EventScript_RivalSquirtle:: @ 8161A80 + trainerbattle_no_intro TRAINER_RIVAL_SILPH_SQUIRTLE, SilphCo_7F_Text_RivalDefeat return -EventScript_161A8B:: @ 8161A8B - trainerbattle_no_intro TRAINER_RIVAL_SILPH_BULBASAUR, Text_1767D0 +SilphCo_7F_EventScript_RivalBulbasaur:: @ 8161A8B + trainerbattle_no_intro TRAINER_RIVAL_SILPH_BULBASAUR, SilphCo_7F_Text_RivalDefeat return -EventScript_161A96:: @ 8161A96 - trainerbattle_no_intro TRAINER_RIVAL_SILPH_CHARMANDER, Text_1767D0 +SilphCo_7F_EventScript_RivalCharmander:: @ 8161A96 + trainerbattle_no_intro TRAINER_RIVAL_SILPH_CHARMANDER, SilphCo_7F_Text_RivalDefeat return -EventScript_161AA1:: @ 8161AA1 - applymovement 1, Movement_161AB9 +SilphCo_7F_EventScript_RivalExitTop:: @ 8161AA1 + applymovement 1, SilphCo_7F_Movement_RivalExitTop waitmovement 0 return -EventScript_161AAC:: @ 8161AAC - applymovement 1, Movement_161ABF +SilphCo_7F_EventScript_RivalExitBottom:: @ 8161AAC + applymovement 1, SilphCo_7F_Movement_RivalExitBottom waitmovement 0 return -Movement_161AB7:: @ 8161AB7 +SilphCo_7F_Movement_RivalApproachTop:: @ 8161AB7 walk_up step_end -Movement_161AB9:: @ 8161AB9 +SilphCo_7F_Movement_RivalExitTop:: @ 8161AB9 walk_right walk_right walk_right @@ -113,7 +109,7 @@ Movement_161AB9:: @ 8161AB9 delay_16 step_end -Movement_161ABF:: @ 8161ABF +SilphCo_7F_Movement_RivalExitBottom:: @ 8161ABF walk_left walk_up walk_up @@ -124,136 +120,130 @@ Movement_161ABF:: @ 8161ABF delay_16 step_end -SilphCo_7F_EventScript_161AC8:: @ 8161AC8 +SilphCo_7F_EventScript_LaprasGuy:: @ 8161AC8 lock faceplayer - goto_if_set FLAG_GOT_LAPRAS_FROM_SILPH, EventScript_161B8D - msgbox gUnknown_8176266 + goto_if_set FLAG_GOT_LAPRAS_FROM_SILPH, SilphCo_7F_EventScript_AlreadyGotLapras + msgbox SilphCo_7F_Text_HaveMonForSavingUs setvar VAR_TEMP_1, SPECIES_LAPRAS givemon SPECIES_LAPRAS, 25, ITEM_NONE compare VAR_RESULT, 0 - goto_if_eq EventScript_161B12 + goto_if_eq SilphCo_7F_EventScript_ReceiveLaprasParty compare VAR_RESULT, 1 - goto_if_eq EventScript_161B45 + goto_if_eq SilphCo_7F_EventScript_ReceiveLaprasPC compare VAR_RESULT, 2 goto_if_eq EventScript_NoMoreRoomForPokemon release end -EventScript_161B12:: @ 8161B12 +SilphCo_7F_EventScript_ReceiveLaprasParty:: @ 8161B12 textcolor 3 playfanfare MUS_FANFA1 - message Text_1762D7 + message SilphCo_7F_Text_ObtainedLaprasFromEmployee waitmessage waitfanfare getspeciesname 0, SPECIES_LAPRAS msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_161B7E + goto_if_eq SilphCo_7F_EventScript_EndReceiveLapras call EventScript_GetGiftMonPartySlot call EventScript_ChangePokemonNickname - goto EventScript_161B7E - -EventScript_161B44:: @ 8161B44 + goto SilphCo_7F_EventScript_EndReceiveLapras end -EventScript_161B45:: @ 8161B45 +SilphCo_7F_EventScript_ReceiveLaprasPC:: @ 8161B45 textcolor 3 playfanfare MUS_FANFA1 - message Text_1762D7 + message SilphCo_7F_Text_ObtainedLaprasFromEmployee waitmessage waitfanfare getspeciesname 0, SPECIES_LAPRAS msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_161B73 + goto_if_eq SilphCo_7F_EventScript_LaprasTransferredToPC call EventScript_NameReceivedBoxMon - goto EventScript_161B73 - -EventScript_161B72:: @ 8161B72 + goto SilphCo_7F_EventScript_LaprasTransferredToPC end -EventScript_161B73:: @ 8161B73 +SilphCo_7F_EventScript_LaprasTransferredToPC:: @ 8161B73 call EventScript_TransferredToPC - goto EventScript_161B7E - -EventScript_161B7D:: @ 8161B7D + goto SilphCo_7F_EventScript_EndReceiveLapras end -EventScript_161B7E:: @ 8161B7E +SilphCo_7F_EventScript_EndReceiveLapras:: @ 8161B7E textcolor 0 - msgbox gUnknown_8176305 + msgbox SilphCo_7F_Text_ExplainLapras setflag FLAG_GOT_LAPRAS_FROM_SILPH release end -EventScript_161B8D:: @ 8161B8D - msgbox gUnknown_81763DD +SilphCo_7F_EventScript_AlreadyGotLapras:: @ 8161B8D + msgbox SilphCo_7F_Text_RocketBossWentToBoardroom release end -SilphCo_7F_EventScript_161B97:: @ 8161B97 +SilphCo_7F_EventScript_WorkerM1:: @ 8161B97 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_161BAE - msgbox gUnknown_8176444 + goto_if_ge SilphCo_7F_EventScript_WorkerM1RocketsGone + msgbox SilphCo_7F_Text_RocketsAfterMasterBall release end -EventScript_161BAE:: @ 8161BAE - msgbox gUnknown_8176486 +SilphCo_7F_EventScript_WorkerM1RocketsGone:: @ 8161BAE + msgbox SilphCo_7F_Text_CanceledMasterBallProject release end -SilphCo_7F_EventScript_161BB8:: @ 8161BB8 +SilphCo_7F_EventScript_WorkerM2:: @ 8161BB8 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_161BCF - msgbox gUnknown_81764C2 + goto_if_ge SilphCo_7F_EventScript_WorkerM2RocketsGone + msgbox SilphCo_7F_Text_BadIfTeamRocketTookOver release end -EventScript_161BCF:: @ 8161BCF - msgbox gUnknown_8176501 +SilphCo_7F_EventScript_WorkerM2RocketsGone:: @ 8161BCF + msgbox SilphCo_7F_Text_WowYouChasedOffTeamRocket release end -SilphCo_7F_EventScript_161BD9:: @ 8161BD9 +SilphCo_7F_EventScript_WorkerF:: @ 8161BD9 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_161BF0 - msgbox gUnknown_8176532 + goto_if_ge SilphCo_7F_EventScript_WorkerFRocketsGone + msgbox SilphCo_7F_Text_ReallyDangerousHere release end -EventScript_161BF0:: @ 8161BF0 - msgbox gUnknown_8176573 +SilphCo_7F_EventScript_WorkerFRocketsGone:: @ 8161BF0 + msgbox SilphCo_7F_Text_ThankYouSoMuch release end -SilphCo_7F_EventScript_161BFA:: @ 8161BFA - msgbox gUnknown_8176954, MSGBOX_SIGN +SilphCo_7F_EventScript_FloorSign:: @ 8161BFA + msgbox SilphCo_7F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_7F_EventScript_161C03:: @ 8161C03 - trainerbattle_single TRAINER_SCIENTIST_JOSHUA, Text_1765E2, Text_17660C - msgbox gUnknown_8176616, MSGBOX_AUTOCLOSE +SilphCo_7F_EventScript_Joshua:: @ 8161C03 + trainerbattle_single TRAINER_SCIENTIST_JOSHUA, SilphCo_7F_Text_JoshuaIntro, SilphCo_7F_Text_JoshuaDefeat + msgbox SilphCo_7F_Text_JoshuaPostBattle, MSGBOX_AUTOCLOSE end -SilphCo_7F_EventScript_161C1A:: @ 8161C1A - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_33, Text_176643, Text_176669 - msgbox gUnknown_8176681, MSGBOX_AUTOCLOSE +SilphCo_7F_EventScript_Grunt1:: @ 8161C1A + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_33, SilphCo_7F_Text_Grunt1Intro, SilphCo_7F_Text_Grunt1Defeat + msgbox SilphCo_7F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_7F_EventScript_161C31:: @ 8161C31 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_34, Text_1766B3, Text_1766D7 - msgbox gUnknown_81766E5, MSGBOX_AUTOCLOSE +SilphCo_7F_EventScript_Grunt2:: @ 8161C31 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_34, SilphCo_7F_Text_Grunt2Intro, SilphCo_7F_Text_Grunt2Defeat + msgbox SilphCo_7F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_7F_EventScript_161C48:: @ 8161C48 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_35, Text_176586, Text_1765A5 - msgbox gUnknown_81765B1, MSGBOX_AUTOCLOSE +SilphCo_7F_EventScript_Grunt3:: @ 8161C48 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_35, SilphCo_7F_Text_Grunt3Intro, SilphCo_7F_Text_Grunt3Defeat + msgbox SilphCo_7F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_7F/text.inc b/data/maps/SilphCo_7F/text.inc index d977d816e..27e01c4a5 100644 --- a/data/maps/SilphCo_7F/text.inc +++ b/data/maps/SilphCo_7F/text.inc @@ -1,15 +1,15 @@ -gUnknown_8176266:: @ 8176266 +SilphCo_7F_Text_HaveMonForSavingUs:: @ 8176266 .string "Oh! Hi! You're not a ROCKET!\n" .string "You came to save us?\l" .string "Why, thank you!\p" .string "I want you to have this POKéMON\n" .string "for saving us.$" -Text_1762D7:: @ 81762D7 +SilphCo_7F_Text_ObtainedLaprasFromEmployee:: @ 81762D7 .string "{PLAYER} obtained a LAPRAS from\n" .string "the SILPH employee!$" -gUnknown_8176305:: @ 8176305 +SilphCo_7F_Text_ExplainLapras:: @ 8176305 .string "It's a LAPRAS.\n" .string "It's a very intelligent POKéMON.\p" .string "We kept it in our lab, but it will\n" @@ -19,94 +19,94 @@ gUnknown_8176305:: @ 8176305 .string "It's a good swimmer.\n" .string "It'll give you a lift across water!$" -gUnknown_81763DD:: @ 81763DD +SilphCo_7F_Text_RocketBossWentToBoardroom:: @ 81763DD .string "TEAM ROCKET's BOSS went to the\n" .string "boardroom!\p" .string "Is our PRESIDENT okay?\n" .string "I'm worried.$" -Text_17642B:: @ 817642B +SilphCo_7F_Text_OhNo:: @ 817642B .string "あ‥　もう　もてないぞ$" -Text_176437:: @ 8176437 +SilphCo_7F_Text_SavedAtLast:: @ 8176437 .string "たすかったよ　ありがと！$" -gUnknown_8176444:: @ 8176444 +SilphCo_7F_Text_RocketsAfterMasterBall:: @ 8176444 .string "TEAM ROCKET was after the MASTER\n" .string "BALL, which catches any POKéMON.$" -gUnknown_8176486:: @ 8176486 +SilphCo_7F_Text_CanceledMasterBallProject:: @ 8176486 .string "We canceled the MASTER BALL\n" .string "project because of TEAM ROCKET.$" -gUnknown_81764C2:: @ 81764C2 +SilphCo_7F_Text_BadIfTeamRocketTookOver:: @ 81764C2 .string "It would be bad if TEAM ROCKET\n" .string "took over SILPH or our POKéMON.$" -gUnknown_8176501:: @ 8176501 +SilphCo_7F_Text_WowYouChasedOffTeamRocket:: @ 8176501 .string "Wow!\p" .string "You chased off TEAM ROCKET all by\n" .string "yourself?$" -gUnknown_8176532:: @ 8176532 +SilphCo_7F_Text_ReallyDangerousHere:: @ 8176532 .string "You!\n" .string "It's really dangerous here!\p" .string "You came to save me?\n" .string "You can't!$" -gUnknown_8176573:: @ 8176573 +SilphCo_7F_Text_ThankYouSoMuch:: @ 8176573 .string "Thank you so much!$" -Text_176586:: @ 8176586 +SilphCo_7F_Text_Grunt3Intro:: @ 8176586 .string "Uh-oh!\n" .string "I smell a little mouse!$" -Text_1765A5:: @ 81765A5 +SilphCo_7F_Text_Grunt3Defeat:: @ 81765A5 .string "Lights out!$" -gUnknown_81765B1:: @ 81765B1 +SilphCo_7F_Text_Grunt3PostBattle:: @ 81765B1 .string "You won't find my BOSS by just\n" .string "scurrying around!$" -Text_1765E2:: @ 81765E2 +SilphCo_7F_Text_JoshuaIntro:: @ 81765E2 .string "Heheh!\p" .string "You mistook me for a SILPH worker?$" -Text_17660C:: @ 817660C +SilphCo_7F_Text_JoshuaDefeat:: @ 817660C .string "I'm done!$" -gUnknown_8176616:: @ 8176616 +SilphCo_7F_Text_JoshuaPostBattle:: @ 8176616 .string "Despite your age, you are a\n" .string "skilled TRAINER!$" -Text_176643:: @ 8176643 +SilphCo_7F_Text_Grunt1Intro:: @ 8176643 .string "I am one of the four ROCKET\n" .string "BROTHERS!$" -Text_176669:: @ 8176669 +SilphCo_7F_Text_Grunt1Defeat:: @ 8176669 .string "Aack!\n" .string "Brothers, I lost!$" -gUnknown_8176681:: @ 8176681 +SilphCo_7F_Text_Grunt1PostBattle:: @ 8176681 .string "Doesn't matter.\n" .string "My brothers will repay the favor!$" -Text_1766B3:: @ 81766B3 +SilphCo_7F_Text_Grunt2Intro:: @ 81766B3 .string "A child intruder?\n" .string "That must be you!$" -Text_1766D7:: @ 81766D7 +SilphCo_7F_Text_Grunt2Defeat:: @ 81766D7 .string "Fine!\n" .string "I lost!$" -gUnknown_81766E5:: @ 81766E5 +SilphCo_7F_Text_Grunt2PostBattle:: @ 81766E5 .string "Go on home before my BOSS gets\n" .string "ticked off!$" -gUnknown_8176710:: @ 8176710 +SilphCo_7F_Text_RivalWhatKeptYou:: @ 8176710 .string "{RIVAL}: What kept you, {PLAYER}?$" -gUnknown_8176727:: @ 8176727 +SilphCo_7F_Text_RivalIntro:: @ 8176727 .string "{RIVAL}: Hahaha! I thought you'd\n" .string "turn up if I waited here!\p" .string "I guess TEAM ROCKET slowed you\n" @@ -114,18 +114,18 @@ gUnknown_8176727:: @ 8176727 .string "I saw you in SAFFRON, so I decided\n" .string "to see if you got better!$" -Text_1767D0:: @ 81767D0 +SilphCo_7F_Text_RivalDefeat:: @ 81767D0 .string "Oh, man!\n" .string "So, you are ready for BOSS\l" .string "ROCKET!$" -Text_1767FC:: @ 81767FC +SilphCo_7F_Text_RivalVictory:: @ 81767FC .string "{RIVAL}“おまえなあ‥\p" .string "こんな　うでまえじゃ\n" .string "まだまだ‥\l" .string "いちにんまえ　とは　いえないぜ$" -gUnknown_8176827:: @ 8176827 +SilphCo_7F_Text_RivalPostBattle:: @ 8176827 .string "Well, {PLAYER}!\n" .string "I'm moving on up and ahead!\p" .string "By checking my POKéDEX, I'm\n" @@ -140,7 +140,7 @@ gUnknown_8176827:: @ 8176827 .string "Don't sweat it!\l" .string "Smell ya!$" -gUnknown_8176954:: @ 8176954 +SilphCo_7F_Text_FloorSign:: @ 8176954 .string "SILPH CO. HEAD OFFICE\n" .string "7F$" diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index ef04548df..badb0553e 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "SilphCo_8F_EventScript_161CB0", + "script": "SilphCo_8F_EventScript_Grunt1", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "SilphCo_8F_EventScript_161CC7", + "script": "SilphCo_8F_EventScript_Grunt2", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SilphCo_8F_EventScript_161C99", + "script": "SilphCo_8F_EventScript_Parker", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_8F_EventScript_161C6F", + "script": "SilphCo_8F_EventScript_WorkerM", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_8F_EventScript_1AD0ED", + "script": "SilphCo_8F_EventScript_Scientist", "flag": "0" } ], @@ -188,7 +188,7 @@ "x": 27, "y": 1, "elevation": 0, - "script": "SilphCo_8F_EventScript_161C90" + "script": "SilphCo_8F_EventScript_FloorSign" } ] } diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc index f96188c3f..d888f339e 100644 --- a/data/maps/SilphCo_8F/scripts.inc +++ b/data/maps/SilphCo_8F/scripts.inc @@ -6,35 +6,35 @@ SilphCo_8F_OnLoad:: @ 8161C65 call_if_unset FLAG_SILPH_8F_DOOR, EventScript_Close8FDoor end -SilphCo_8F_EventScript_161C6F:: @ 8161C6F +SilphCo_8F_EventScript_WorkerM:: @ 8161C6F lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_161C86 - msgbox gUnknown_817696D + goto_if_ge SilphCo_8F_EventScript_WorkerMRocketsGone + msgbox SilphCo_8F_Text_WonderIfSilphIsFinished release end -EventScript_161C86:: @ 8161C86 - msgbox gUnknown_817698C +SilphCo_8F_EventScript_WorkerMRocketsGone:: @ 8161C86 + msgbox SilphCo_8F_Text_ThanksForSavingUs release end -SilphCo_8F_EventScript_161C90:: @ 8161C90 - msgbox gUnknown_8176AB2, MSGBOX_SIGN +SilphCo_8F_EventScript_FloorSign:: @ 8161C90 + msgbox SilphCo_8F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_8F_EventScript_161C99:: @ 8161C99 - trainerbattle_single TRAINER_SCIENTIST_PARKER, Text_1769FD, Text_176A19 - msgbox gUnknown_8176A26, MSGBOX_AUTOCLOSE +SilphCo_8F_EventScript_Parker:: @ 8161C99 + trainerbattle_single TRAINER_SCIENTIST_PARKER, SilphCo_8F_Text_ParkerIntro, SilphCo_8F_Text_ParkerDefeat + msgbox SilphCo_8F_Text_ParkerPostBattle, MSGBOX_AUTOCLOSE end -SilphCo_8F_EventScript_161CB0:: @ 8161CB0 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_32, Text_1769A2, Text_1769BE - msgbox gUnknown_81769CF, MSGBOX_AUTOCLOSE +SilphCo_8F_EventScript_Grunt1:: @ 8161CB0 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_32, SilphCo_8F_Text_Grunt1Intro, SilphCo_8F_Text_Grunt1Defeat + msgbox SilphCo_8F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_8F_EventScript_161CC7:: @ 8161CC7 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_36, Text_176A56, Text_176A7C - msgbox gUnknown_8176A90, MSGBOX_AUTOCLOSE +SilphCo_8F_EventScript_Grunt2:: @ 8161CC7 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_36, SilphCo_8F_Text_Grunt2Intro, SilphCo_8F_Text_Grunt2Defeat + msgbox SilphCo_8F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_8F/text.inc b/data/maps/SilphCo_8F/text.inc index 858d5da17..9144cda4e 100644 --- a/data/maps/SilphCo_8F/text.inc +++ b/data/maps/SilphCo_8F/text.inc @@ -1,42 +1,49 @@ -gUnknown_817696D:: @ 817696D +SilphCo_8F_Text_WonderIfSilphIsFinished:: @ 817696D .string "I wonder if SILPH is finished…$" -gUnknown_817698C:: @ 817698C +SilphCo_8F_Text_ThanksForSavingUs:: @ 817698C .string "Thanks for saving us!$" -Text_1769A2:: @ 81769A2 +SilphCo_8F_Text_Grunt1Intro:: @ 81769A2 .string "That's as far as you'll go!$" -Text_1769BE:: @ 81769BE +SilphCo_8F_Text_Grunt1Defeat:: @ 81769BE .string "Not enough grit!$" -gUnknown_81769CF:: @ 81769CF +SilphCo_8F_Text_Grunt1PostBattle:: @ 81769CF .string "If you don't turn back…\n" .string "I'll call for backup!$" -Text_1769FD:: @ 81769FD +SilphCo_8F_Text_ParkerIntro:: @ 81769FD .string "You're causing us problems!$" -Text_176A19:: @ 8176A19 +SilphCo_8F_Text_ParkerDefeat:: @ 8176A19 .string "Huh?\n" .string "I lost?$" -gUnknown_8176A26:: @ 8176A26 +SilphCo_8F_Text_ParkerPostBattle:: @ 8176A26 .string "So, what do you think of SILPH\n" .string "BUILDING's maze?$" -Text_176A56:: @ 8176A56 +SilphCo_8F_Text_Grunt2Intro:: @ 8176A56 .string "I am one of the four ROCKET\n" .string "BROTHERS!$" -Text_176A7C:: @ 8176A7C +SilphCo_8F_Text_Grunt2Defeat:: @ 8176A7C .string "Whoo!\n" .string "Oh, Brothers!$" -gUnknown_8176A90:: @ 8176A90 +SilphCo_8F_Text_Grunt2PostBattle:: @ 8176A90 .string "I'll leave you up to my brothers.$" -gUnknown_8176AB2:: @ 8176AB2 +SilphCo_8F_Text_FloorSign:: @ 8176AB2 .string "SILPH CO. HEAD OFFICE\n" .string "8F$" +SilphCo_8F_Text_ToRocketBossMonsAreTools:: @ 8176ACB + .string "TEAM ROCKET's BOSS is terribly\n" + .string "cruel!\p" + .string "To him, POKéMON are just tools to\n" + .string "be used.\p" + .string "What will happen if that tyrant\n" + .string "takes over our company…$" diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json index e8f39eba5..92a229699 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SilphCo_9F_EventScript_161D41", + "script": "SilphCo_9F_EventScript_Ed", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SilphCo_9F_EventScript_161D6F", + "script": "SilphCo_9F_EventScript_Grunt2", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_9F_EventScript_161D09", + "script": "SilphCo_9F_EventScript_HealWoman", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "SilphCo_9F_EventScript_161D58", + "script": "SilphCo_9F_EventScript_Grunt1", "flag": "FLAG_HIDE_SILPH_ROCKETS" } ], @@ -242,7 +242,7 @@ "x": 17, "y": 1, "elevation": 0, - "script": "SilphCo_9F_EventScript_161D38" + "script": "SilphCo_9F_EventScript_FloorSign" } ] } diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc index 7f4258b5d..5cdfc2c82 100644 --- a/data/maps/SilphCo_9F/scripts.inc +++ b/data/maps/SilphCo_9F/scripts.inc @@ -9,38 +9,38 @@ SilphCo_9F_OnLoad:: @ 8161CE4 call_if_unset FLAG_SILPH_9F_DOOR_4, EventScript_Close9FDoor4 end -SilphCo_9F_EventScript_161D09:: @ 8161D09 +SilphCo_9F_EventScript_HealWoman:: @ 8161D09 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_161D2E - msgbox gUnknown_8176B54 + goto_if_ge SilphCo_9F_EventScript_HealWomanRocketsGone + msgbox SilphCo_9F_Text_YouShouldTakeQuickNap closemessage call EventScript_OutOfCenterPartyHeal - msgbox gUnknown_8176B81 + msgbox SilphCo_9F_Text_DontGiveUp release end -EventScript_161D2E:: @ 8161D2E - msgbox gUnknown_8176B90 +SilphCo_9F_EventScript_HealWomanRocketsGone:: @ 8161D2E + msgbox SilphCo_9F_Text_ThankYouSoMuch release end -SilphCo_9F_EventScript_161D38:: @ 8161D38 - msgbox gUnknown_8176CD4, MSGBOX_SIGN +SilphCo_9F_EventScript_FloorSign:: @ 8161D38 + msgbox SilphCo_9F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_9F_EventScript_161D41:: @ 8161D41 - trainerbattle_single TRAINER_SCIENTIST_ED, Text_176BFB, Text_176C2B - msgbox gUnknown_8176C3C, MSGBOX_AUTOCLOSE +SilphCo_9F_EventScript_Ed:: @ 8161D41 + trainerbattle_single TRAINER_SCIENTIST_ED, SilphCo_9F_Text_EdIntro, SilphCo_9F_Text_EdDefeat + msgbox SilphCo_9F_Text_EdPostBattle, MSGBOX_AUTOCLOSE end -SilphCo_9F_EventScript_161D58:: @ 8161D58 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_37, Text_176BA3, Text_176BC8 - msgbox gUnknown_8176BD0, MSGBOX_AUTOCLOSE +SilphCo_9F_EventScript_Grunt1:: @ 8161D58 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_37, SilphCo_9F_Text_Grunt1Intro, SilphCo_9F_Text_Grunt1Defeat + msgbox SilphCo_9F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_9F_EventScript_161D6F:: @ 8161D6F - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_38, Text_176C7A, Text_176CA0 - msgbox gUnknown_8176CB8, MSGBOX_AUTOCLOSE +SilphCo_9F_EventScript_Grunt2:: @ 8161D6F + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_38, SilphCo_9F_Text_Grunt2Intro, SilphCo_9F_Text_Grunt2Defeat + msgbox SilphCo_9F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_9F/text.inc b/data/maps/SilphCo_9F/text.inc index bf400f768..f89262090 100644 --- a/data/maps/SilphCo_9F/text.inc +++ b/data/maps/SilphCo_9F/text.inc @@ -1,55 +1,47 @@ -Text_176ACB:: @ 8176ACB - .string "TEAM ROCKET's BOSS is terribly\n" - .string "cruel!\p" - .string "To him, POKéMON are just tools to\n" - .string "be used.\p" - .string "What will happen if that tyrant\n" - .string "takes over our company…$" - -gUnknown_8176B54:: @ 8176B54 +SilphCo_9F_Text_YouShouldTakeQuickNap:: @ 8176B54 .string "You look tired.\n" .string "You should take a quick nap.$" -gUnknown_8176B81:: @ 8176B81 +SilphCo_9F_Text_DontGiveUp:: @ 8176B81 .string "Don't give up!$" -gUnknown_8176B90:: @ 8176B90 +SilphCo_9F_Text_ThankYouSoMuch:: @ 8176B90 .string "Thank you so much.$" -Text_176BA3:: @ 8176BA3 +SilphCo_9F_Text_Grunt1Intro:: @ 8176BA3 .string "Your POKéMON seem to adore you,\n" .string "kid!$" -Text_176BC8:: @ 8176BC8 +SilphCo_9F_Text_Grunt1Defeat:: @ 8176BC8 .string "Ghaaah!$" -gUnknown_8176BD0:: @ 8176BD0 +SilphCo_9F_Text_Grunt1PostBattle:: @ 8176BD0 .string "If I had started as a TRAINER at\n" .string "your age…$" -Text_176BFB:: @ 8176BFB +SilphCo_9F_Text_EdIntro:: @ 8176BFB .string "Your POKéMON have weak points!\n" .string "I can nail them!$" -Text_176C2B:: @ 8176C2B +SilphCo_9F_Text_EdDefeat:: @ 8176C2B .string "You hammered me!$" -gUnknown_8176C3C:: @ 8176C3C +SilphCo_9F_Text_EdPostBattle:: @ 8176C3C .string "Exploiting weak spots does work.\n" .string "Think about type advantages.$" -Text_176C7A:: @ 8176C7A +SilphCo_9F_Text_Grunt2Intro:: @ 8176C7A .string "I am one of the four ROCKET\n" .string "BROTHERS!$" -Text_176CA0:: @ 8176CA0 +SilphCo_9F_Text_Grunt2Defeat:: @ 8176CA0 .string "Warg!\n" .string "Brothers, I lost!$" -gUnknown_8176CB8:: @ 8176CB8 +SilphCo_9F_Text_Grunt2PostBattle:: @ 8176CB8 .string "My brothers will avenge me!$" -gUnknown_8176CD4:: @ 8176CD4 +SilphCo_9F_Text_FloorSign:: @ 8176CD4 .string "SILPH CO. HEAD OFFICE\n" .string "9F$" diff --git a/data/maps/SilphCo_Elevator/map.json b/data/maps/SilphCo_Elevator/map.json index 815ed916e..857d5c209 100644 --- a/data/maps/SilphCo_Elevator/map.json +++ b/data/maps/SilphCo_Elevator/map.json @@ -29,7 +29,7 @@ "x": 0, "y": 2, "elevation": 3, - "script": "SilphCo_Elevator_EventScript_161F6F" + "script": "SilphCo_Elevator_EventScript_FloorSelect" } ] } diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc index 87ed62c9b..5daf1e5b8 100644 --- a/data/maps/SilphCo_Elevator/scripts.inc +++ b/data/maps/SilphCo_Elevator/scripts.inc @@ -1,7 +1,7 @@ SilphCo_Elevator_MapScripts:: @ 8161F6E .byte 0 -SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F +SilphCo_Elevator_EventScript_FloorSelect:: @ 8161F6F lockall setvar VAR_0x8004, 1 call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 @@ -14,159 +14,137 @@ SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F special Special_ListMenu waitstate switch VAR_RESULT - case 0, EventScript_1621BF - case 1, EventScript_162197 - case 2, EventScript_16216F - case 3, EventScript_162147 - case 4, EventScript_16211F - case 5, EventScript_1620F7 - case 6, EventScript_1620CF - case 7, EventScript_1620A7 - case 8, EventScript_16207F - case 9, EventScript_162057 - case 10, EventScript_16202F - case 11, EventScript_1621E7 - case 127, EventScript_1621E7 + case 0, SilphCo_Elevator_EventScript_To11F + case 1, SilphCo_Elevator_EventScript_To10F + case 2, SilphCo_Elevator_EventScript_To9F + case 3, SilphCo_Elevator_EventScript_To8F + case 4, SilphCo_Elevator_EventScript_To7F + case 5, SilphCo_Elevator_EventScript_To6F + case 6, SilphCo_Elevator_EventScript_To5F + case 7, SilphCo_Elevator_EventScript_To4F + case 8, SilphCo_Elevator_EventScript_To3F + case 9, SilphCo_Elevator_EventScript_To2F + case 10, SilphCo_Elevator_EventScript_To1F + case 11, SilphCo_Elevator_EventScript_ExitFloorSelect + case 127, SilphCo_Elevator_EventScript_ExitFloorSelect end -EventScript_16202F:: @ 816202F +SilphCo_Elevator_EventScript_To1F:: @ 816202F setvar VAR_0x8006, 4 setdynamicwarp MAP_SILPH_CO_1F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 4 - goto_if_eq EventScript_1621E7 - call EventScript_1621EC + goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect + call SilphCo_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 4 - goto EventScript_1621E7 - -EventScript_162056:: @ 8162056 + goto SilphCo_Elevator_EventScript_ExitFloorSelect end -EventScript_162057:: @ 8162057 +SilphCo_Elevator_EventScript_To2F:: @ 8162057 setvar VAR_0x8006, 5 setdynamicwarp MAP_SILPH_CO_2F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 5 - goto_if_eq EventScript_1621E7 - call EventScript_1621EC + goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect + call SilphCo_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 5 - goto EventScript_1621E7 - -EventScript_16207E:: @ 816207E + goto SilphCo_Elevator_EventScript_ExitFloorSelect end -EventScript_16207F:: @ 816207F +SilphCo_Elevator_EventScript_To3F:: @ 816207F setvar VAR_0x8006, 6 setdynamicwarp MAP_SILPH_CO_3F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 6 - goto_if_eq EventScript_1621E7 - call EventScript_1621EC + goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect + call SilphCo_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 6 - goto EventScript_1621E7 - -EventScript_1620A6:: @ 81620A6 + goto SilphCo_Elevator_EventScript_ExitFloorSelect end -EventScript_1620A7:: @ 81620A7 +SilphCo_Elevator_EventScript_To4F:: @ 81620A7 setvar VAR_0x8006, 7 setdynamicwarp MAP_SILPH_CO_4F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 7 - goto_if_eq EventScript_1621E7 - call EventScript_1621EC + goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect + call SilphCo_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 7 - goto EventScript_1621E7 - -EventScript_1620CE:: @ 81620CE + goto SilphCo_Elevator_EventScript_ExitFloorSelect end -EventScript_1620CF:: @ 81620CF +SilphCo_Elevator_EventScript_To5F:: @ 81620CF setvar VAR_0x8006, 8 setdynamicwarp MAP_SILPH_CO_5F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 8 - goto_if_eq EventScript_1621E7 - call EventScript_1621EC + goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect + call SilphCo_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 8 - goto EventScript_1621E7 - -EventScript_1620F6:: @ 81620F6 + goto SilphCo_Elevator_EventScript_ExitFloorSelect end -EventScript_1620F7:: @ 81620F7 +SilphCo_Elevator_EventScript_To6F:: @ 81620F7 setvar VAR_0x8006, 9 setdynamicwarp MAP_SILPH_CO_6F, 255, 20, 3 compare VAR_ELEVATOR_FLOOR, 9 - goto_if_eq EventScript_1621E7 - call EventScript_1621EC + goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect + call SilphCo_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 9 - goto EventScript_1621E7 - -EventScript_16211E:: @ 816211E + goto SilphCo_Elevator_EventScript_ExitFloorSelect end -EventScript_16211F:: @ 816211F +SilphCo_Elevator_EventScript_To7F:: @ 816211F setvar VAR_0x8006, 10 setdynamicwarp MAP_SILPH_CO_7F, 255, 23, 3 compare VAR_ELEVATOR_FLOOR, 10 - goto_if_eq EventScript_1621E7 - call EventScript_1621EC + goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect + call SilphCo_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 10 - goto EventScript_1621E7 - -EventScript_162146:: @ 8162146 + goto SilphCo_Elevator_EventScript_ExitFloorSelect end -EventScript_162147:: @ 8162147 +SilphCo_Elevator_EventScript_To8F:: @ 8162147 setvar VAR_0x8006, 11 setdynamicwarp MAP_SILPH_CO_8F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 11 - goto_if_eq EventScript_1621E7 - call EventScript_1621EC + goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect + call SilphCo_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 11 - goto EventScript_1621E7 - -EventScript_16216E:: @ 816216E + goto SilphCo_Elevator_EventScript_ExitFloorSelect end -EventScript_16216F:: @ 816216F +SilphCo_Elevator_EventScript_To9F:: @ 816216F setvar VAR_0x8006, 12 setdynamicwarp MAP_SILPH_CO_9F, 255, 24, 3 compare VAR_ELEVATOR_FLOOR, 12 - goto_if_eq EventScript_1621E7 - call EventScript_1621EC + goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect + call SilphCo_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 12 - goto EventScript_1621E7 - -EventScript_162196:: @ 8162196 + goto SilphCo_Elevator_EventScript_ExitFloorSelect end -EventScript_162197:: @ 8162197 +SilphCo_Elevator_EventScript_To10F:: @ 8162197 setvar VAR_0x8006, 13 setdynamicwarp MAP_SILPH_CO_10F, 255, 13, 3 compare VAR_ELEVATOR_FLOOR, 13 - goto_if_eq EventScript_1621E7 - call EventScript_1621EC + goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect + call SilphCo_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 13 - goto EventScript_1621E7 - -EventScript_1621BE:: @ 81621BE + goto SilphCo_Elevator_EventScript_ExitFloorSelect end -EventScript_1621BF:: @ 81621BF +SilphCo_Elevator_EventScript_To11F:: @ 81621BF setvar VAR_0x8006, 14 setdynamicwarp MAP_SILPH_CO_11F, 255, 13, 3 compare VAR_ELEVATOR_FLOOR, 14 - goto_if_eq EventScript_1621E7 - call EventScript_1621EC + goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect + call SilphCo_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 14 - goto EventScript_1621E7 - -EventScript_1621E6:: @ 81621E6 + goto SilphCo_Elevator_EventScript_ExitFloorSelect end -EventScript_1621E7:: @ 81621E7 +SilphCo_Elevator_EventScript_ExitFloorSelect:: @ 81621E7 special Special_CloseElevatorCurrentFloorWindow releaseall end -EventScript_1621EC:: @ 81621EC +SilphCo_Elevator_EventScript_MoveElevator:: @ 81621EC special Special_CloseElevatorCurrentFloorWindow closemessage waitse diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index a7726f3e6..a740b15ed 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -269,18 +269,18 @@ CinnabarIsland_PokemonCenter_1F_EventScript_PokemonJournalMrFuji:: @ 81AD0B9 release end -SilphCo_5F_EventScript_1AD0D4:: @ 81AD0D4 +SilphCo_5F_EventScript_Scientist:: @ 81AD0D4 lock faceplayer famechecker FAMECHECKER_GIOVANNI, 1 - msgbox Text_175E99 + msgbox SilphCo_5F_Text_RocketBossLookingForStrongMons release end -SilphCo_8F_EventScript_1AD0ED:: @ 81AD0ED +SilphCo_8F_EventScript_Scientist:: @ 81AD0ED lock faceplayer famechecker FAMECHECKER_GIOVANNI, 2 - msgbox Text_176ACB + msgbox SilphCo_8F_Text_ToRocketBossMonsAreTools release end -- cgit v1.2.3 From 91844cdfb2e0c3c1fd00fae45d1cec2be763c522 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 26 Jan 2020 16:38:17 -0500 Subject: Document Pokemon League scripts --- data/event_scripts.s | 68 +--------- data/maps/IndigoPlateau_Exterior/scripts.inc | 79 ++++++------ data/maps/IndigoPlateau_PokemonCenter_1F/map.json | 16 +-- .../IndigoPlateau_PokemonCenter_1F/scripts.inc | 32 ++--- data/maps/IndigoPlateau_PokemonCenter_1F/text.inc | 25 +++- data/maps/PokemonLeague_AgathasRoom/map.json | 2 +- data/maps/PokemonLeague_AgathasRoom/scripts.inc | 66 +++++----- data/maps/PokemonLeague_AgathasRoom/text.inc | 8 +- data/maps/PokemonLeague_BrunosRoom/map.json | 2 +- data/maps/PokemonLeague_BrunosRoom/scripts.inc | 88 +++++++------ data/maps/PokemonLeague_BrunosRoom/text.inc | 8 +- data/maps/PokemonLeague_ChampionsRoom/scripts.inc | 143 +++++++++++---------- data/maps/PokemonLeague_ChampionsRoom/text.inc | 18 +-- data/maps/PokemonLeague_HallOfFame/scripts.inc | 14 +- data/maps/PokemonLeague_HallOfFame/text.inc | 2 +- data/maps/PokemonLeague_LancesRoom/map.json | 2 +- data/maps/PokemonLeague_LancesRoom/scripts.inc | 100 +++++++------- data/maps/PokemonLeague_LancesRoom/text.inc | 8 +- data/maps/PokemonLeague_LoreleisRoom/map.json | 2 +- data/maps/PokemonLeague_LoreleisRoom/scripts.inc | 66 +++++----- data/maps/PokemonLeague_LoreleisRoom/text.inc | 8 +- data/maps/SaffronCity_House1_1F/text.inc | 19 --- data/scripts/fame_checker.inc | 12 +- data/scripts/pokemon_league.inc | 64 +++++++++ data/text/fame_checker.inc | 2 +- 25 files changed, 427 insertions(+), 427 deletions(-) create mode 100644 data/scripts/pokemon_league.inc (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index ab8c2d023..f4fa62319 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -980,7 +980,7 @@ Text_HavePokedexRated:: @ 81A5C03 Text_ClosedLinkToProfOaksPC:: @ 81A5C2E .string "Closed link to PROF. OAK's PC.$" -Text_1A5C4D:: @ 81A5C4D +Text_VoiceRangOutDontRunAway:: @ 81A5C4D .string "Someone's voice rang out,\n" .string "“Don't run away!”$" @@ -1272,71 +1272,7 @@ EventScript_1A74F2:: @ 81A74F2 removeitem VAR_0x8004, 1 return -EventScript_1A7506:: @ 81A7506 - applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32 - waitmovement 0 - playse SE_DOOR - call EventScript_1A7538 - special DrawWholeMapView - setflag FLAG_TEMP_4 - return - -EventScript_1A751F:: @ 81A751F - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkUp5 - waitmovement 0 - setflag FLAG_TEMP_2 - playse SE_KI_GASYAN - call EventScript_1A759C - special DrawWholeMapView - return - -EventScript_1A7538:: @ 81A7538 - setmetatile 6, 1, 654, 1 - setmetatile 6, 2, 662, 0 - return - -EventScript_1A754B:: @ 81A754B - lockall - textcolor 0 - msgbox Text_1A5C4D - closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75D3 - waitmovement 0 - releaseall - end - -EventScript_1A7563:: @ 81A7563 - applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32 - waitmovement 0 - playse SE_DOOR - setmetatile 6, 4, 654, 1 - setmetatile 6, 5, 662, 0 - special DrawWholeMapView - setflag FLAG_TEMP_4 - return - -EventScript_1A7589:: @ 81A7589 - setmetatile 6, 4, 654, 1 - setmetatile 6, 5, 662, 0 - return - -EventScript_1A759C:: @ 81A759C - setmetatile 5, 11, 669, 1 - setmetatile 6, 11, 670, 1 - setmetatile 7, 11, 671, 1 - setmetatile 5, 12, 677, 1 - setmetatile 6, 12, 678, 1 - setmetatile 7, 12, 679, 1 - return - -Movement_1A75D3:: @ 81A75D3 - walk_up - step_end - -EventScript_1A75D5:: @ 81A75D5 - special Special_PokemonLeagueLightingEffect - return - + .include "data/scripts/pokemon_league.inc" .include "data/scripts/movement.inc" .include "data/scripts/flavor_text.inc" diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index bc9827037..70831a754 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -1,3 +1,6 @@ +.equ LOCALID_RIVAL, 1 +.equ LOCALID_PROF_OAK, 2 + IndigoPlateau_Exterior_MapScripts:: @ 816723B map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_Exterior_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, IndigoPlateau_Exterior_OnFrame @@ -6,22 +9,23 @@ IndigoPlateau_Exterior_MapScripts:: @ 816723B IndigoPlateau_Exterior_OnTransition:: @ 8167246 setworldmapflag FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR compare VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1 - call_if_eq EventScript_IndigoPlateau_Exterior_PlayCreditsMusic + call_if_eq IndigoPlateau_Exterior_EventScript_PlayCreditsMusic end -EventScript_IndigoPlateau_Exterior_PlayCreditsMusic:: @ 8167255 +IndigoPlateau_Exterior_EventScript_PlayCreditsMusic:: @ 8167255 playbgm MUS_ENDING, 0 return IndigoPlateau_Exterior_OnFrame:: @ 816725A - map_script_2 VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1, EventScript_IndigoPlateau_Exterior_Credits + map_script_2 VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1, IndigoPlateau_Exterior_EventScript_Credits .2byte 0 -EventScript_IndigoPlateau_Exterior_Credits:: @ 8167264 - @ After beating the champion, you are warped to the main - @ entrance of Indigo Plateau. This script starts running - @ immediately after your walking animation. - @ The script is timed to the music. + +@ After beating the champion, you are warped to the main +@ entrance of Indigo Plateau. This script starts running +@ immediately after your walking animation. +@ The script is timed to the music. +IndigoPlateau_Exterior_EventScript_Credits:: @ 8167264 lockall delay 105 @@ -29,60 +33,60 @@ EventScript_IndigoPlateau_Exterior_Credits:: @ 8167264 opendoor 11, 6 waitdooranim special SpawnCameraObject - addobject 1 - applymovement 1, Movement_167346 - applymovement OBJ_EVENT_ID_PLAYER, Movement_167337 + addobject LOCALID_RIVAL + applymovement LOCALID_RIVAL, IndigoPlateau_Exterior_Movement_RivalExitBuilding + applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PushPlayerOutOfWay waitmovement 0 closedoor 11, 6 waitdooranim @ Rival runs off - applymovement OBJ_EVENT_ID_PLAYER, Movement_16731B - applymovement 1, Movement_16733E + applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerWatchRivalLeave + applymovement LOCALID_RIVAL, IndigoPlateau_Exterior_Movement_RivalLeave waitmovement 0 delay 100 @ Oak exits building opendoor 11, 6 waitdooranim - addobject 2 - applymovement 2, Movement_16735D + addobject LOCALID_PROF_OAK + applymovement LOCALID_PROF_OAK, IndigoPlateau_Exterior_Movement_OakExitBuilding waitmovement 0 closedoor 11, 6 waitdooranim delay 160 @ Oak looks at player, then walks off - applymovement OBJ_EVENT_ID_PLAYER, Movement_16731F - applymovement 2, Movement_167348 + applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerWatchOakLeave + applymovement LOCALID_PROF_OAK, IndigoPlateau_Exterior_Movement_OakLeave waitmovement 0 delay 100 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16732E + + @ Player begin to leave + applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerBeginLeave waitmovement 0 delay 155 - - @ Player turns to face the League - applymovement OBJ_EVENT_ID_PLAYER, Movement_16733C + applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerFaceLeague waitmovement 0 delay 90 @ Player runs off - applymovement OBJ_EVENT_ID_PLAYER, Movement_167335 + applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerTurnAround waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_167311 + applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerLeave waitmovement 0 @ Reset the map state and roll the credits special RemoveCameraObject setvar VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 0 - removeobject 1 - removeobject 2 + removeobject LOCALID_RIVAL + removeobject LOCALID_PROF_OAK special Special_Credits @ noreturn waitstate releaseall end -Movement_167311:: @ 8167311 +IndigoPlateau_Exterior_Movement_PlayerLeave:: @ 8167311 player_run_down player_run_down player_run_down @@ -91,18 +95,19 @@ Movement_167311:: @ 8167311 player_run_down step_end -Movement_167318:: @ 8167318 +@ Unused +IndigoPlateau_Exterior_Movement_PlayerExitBuilding:: @ 8167318 walk_down walk_down step_end -Movement_16731B:: @ 816731B +IndigoPlateau_Exterior_Movement_PlayerWatchRivalLeave:: @ 816731B delay_16 delay_4 walk_in_place_fastest_down step_end -Movement_16731F:: @ 816731F +IndigoPlateau_Exterior_Movement_PlayerWatchOakLeave:: @ 816731F delay_8 walk_in_place_fastest_right delay_16 @@ -119,7 +124,7 @@ Movement_16731F:: @ 816731F walk_in_place_fastest_down step_end -Movement_16732E:: @ 816732E +IndigoPlateau_Exterior_Movement_PlayerBeginLeave:: @ 816732E walk_right delay_16 walk_down @@ -128,22 +133,22 @@ Movement_16732E:: @ 816732E delay_16 step_end -Movement_167335:: @ 8167335 +IndigoPlateau_Exterior_Movement_PlayerTurnAround:: @ 8167335 walk_in_place_fastest_down step_end -Movement_167337:: @ 8167337 +IndigoPlateau_Exterior_Movement_PushPlayerOutOfWay:: @ 8167337 face_right lock_facing_direction walk_left unlock_facing_direction step_end -Movement_16733C:: @ 816733C +IndigoPlateau_Exterior_Movement_PlayerFaceLeague:: @ 816733C walk_in_place_fastest_up step_end -Movement_16733E:: @ 816733E +IndigoPlateau_Exterior_Movement_RivalLeave:: @ 816733E walk_fast_down walk_fast_down walk_fast_down @@ -153,11 +158,11 @@ Movement_16733E:: @ 816733E walk_fast_down step_end -Movement_167346:: @ 8167346 +IndigoPlateau_Exterior_Movement_RivalExitBuilding:: @ 8167346 walk_fast_down step_end -Movement_167348:: @ 8167348 +IndigoPlateau_Exterior_Movement_OakLeave:: @ 8167348 walk_in_place_fastest_left delay_16 delay_16 @@ -180,6 +185,6 @@ Movement_167348:: @ 8167348 walk_down step_end -Movement_16735D:: @ 816735D +IndigoPlateau_Exterior_Movement_OakExitBuilding:: @ 816735D walk_down step_end diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json index f214403c3..e862a372e 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "IndigoPlateau_PokemonCenter_1F_EventScript_16EACC", + "script": "IndigoPlateau_PokemonCenter_1F_EventScript_Clerk", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "IndigoPlateau_PokemonCenter_1F_EventScript_16EB06", + "script": "IndigoPlateau_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3", + "script": "IndigoPlateau_PokemonCenter_1F_EventScript_GymGuy", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A", + "script": "IndigoPlateau_PokemonCenter_1F_EventScript_DoorGuard", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1ACFAE", + "script": "IndigoPlateau_PokemonCenter_1F_EventScript_BlackBelt", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C", + "script": "IndigoPlateau_PokemonCenter_1F_EventScript_PokemonJournal", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD087", + "script": "IndigoPlateau_PokemonCenter_1F_EventScript_CooltrainerM", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C", + "script": "IndigoPlateau_PokemonCenter_1F_EventScript_PokemonJournal", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index 67a3e4f6a..e0523d2ee 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -7,52 +7,52 @@ IndigoPlateau_PokemonCenter_1F_OnTransition:: @ 816EA65 setrespawn SPAWN_INDIGO_PLATEAU specialvar VAR_RESULT, IsNationalPokedexEnabled compare VAR_RESULT, TRUE - call_if_eq EventScript_16EA79 + call_if_eq IndigoPlateau_PokemonCenter_1F_EventScript_CheckBlockDoor end -EventScript_16EA79:: @ 816EA79 +IndigoPlateau_PokemonCenter_1F_EventScript_CheckBlockDoor:: @ 816EA79 goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_Return setobjectxyperm 4, 4, 2 return -IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A:: @ 816EA8A +IndigoPlateau_PokemonCenter_1F_EventScript_DoorGuard:: @ 816EA8A lock faceplayer specialvar VAR_RESULT, IsNationalPokedexEnabled compare VAR_RESULT, TRUE - goto_if_eq EventScript_16EAA6 - msgbox gUnknown_819A8D8 + goto_if_eq IndigoPlateau_PokemonCenter_1F_EventScript_CheckSeviiIslandComplete + msgbox IndigoPlateau_PokemonCenter_1F_Text_FaceEliteFourGoodLuck release end -EventScript_16EAA6:: @ 816EAA6 - goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16EAB9 - msgbox gUnknown_819A943 +IndigoPlateau_PokemonCenter_1F_EventScript_CheckSeviiIslandComplete:: @ 816EAA6 + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, IndigoPlateau_PokemonCenter_1F_EventScript_SeviiIslandComplete + msgbox IndigoPlateau_PokemonCenter_1F_Text_LoreleiIsAbsentClosedForTimeBeing release end -EventScript_16EAB9:: @ 816EAB9 - msgbox gUnknown_819A8D8 +IndigoPlateau_PokemonCenter_1F_EventScript_SeviiIslandComplete:: @ 816EAB9 + msgbox IndigoPlateau_PokemonCenter_1F_Text_FaceEliteFourGoodLuck release end -IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3:: @ 816EAC3 - msgbox gUnknown_819A837, MSGBOX_NPC +IndigoPlateau_PokemonCenter_1F_EventScript_GymGuy:: @ 816EAC3 + msgbox IndigoPlateau_PokemonCenter_1F_Text_GymGuyAdvice, MSGBOX_NPC end -IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC +IndigoPlateau_PokemonCenter_1F_EventScript_Clerk:: @ 816EACC goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_16EAF4 + pokemart IndigoPlateau_PokemonCenter_1F_Items msgbox Text_PleaseComeAgain release end .align 2 -Items_16EAF4:: @ 816EAF4 +IndigoPlateau_PokemonCenter_1F_Items:: @ 816EAF4 .2byte ITEM_ULTRA_BALL .2byte ITEM_GREAT_BALL .2byte ITEM_FULL_RESTORE @@ -64,7 +64,7 @@ Items_16EAF4:: @ 816EAF4 release end -IndigoPlateau_PokemonCenter_1F_EventScript_16EB06:: @ 816EB06 +IndigoPlateau_PokemonCenter_1F_EventScript_Nurse:: @ 816EB06 lock faceplayer call EventScript_PkmnCenterNurse diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc index 7a4d158b3..192831d64 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc @@ -1,4 +1,4 @@ -gUnknown_819A837:: @ 819A837 +IndigoPlateau_PokemonCenter_1F_Text_GymGuyAdvice:: @ 819A837 .string "Yo!\n" .string "Champ in the making!\p" .string "At the POKéMON LEAGUE, you will\n" @@ -8,13 +8,13 @@ gUnknown_819A837:: @ 819A837 .string "This is it!\n" .string "Go for it!$" -gUnknown_819A8D8:: @ 819A8D8 +IndigoPlateau_PokemonCenter_1F_Text_FaceEliteFourGoodLuck:: @ 819A8D8 .string "From here on, you face the\n" .string "ELITE FOUR one by one.\p" .string "If you win, a door opens to the\n" .string "next TRAINER. Good luck!$" -gUnknown_819A943:: @ 819A943 +IndigoPlateau_PokemonCenter_1F_Text_LoreleiIsAbsentClosedForTimeBeing:: @ 819A943 .string "I am so sorry, but you've wasted\n" .string "your time coming here.\p" .string "LORELEI of the ELITE FOUR is\n" @@ -22,3 +22,22 @@ gUnknown_819A943:: @ 819A943 .string "As a result, the POKéMON LEAGUE is\n" .string "closed for the time being.$" +IndigoPlateau_PokemonCenter_1F_Text_AgathaWhuppedUs:: @ 819A9E7 + .string "AGATHA's GHOST-type POKéMON are\n" + .string "horrifically terrifying in toughness.\p" + .string "I took my FIGHTING-type POKéMON\n" + .string "and raised them to the max.\p" + .string "I went at AGATHA feeling pretty\n" + .string "confident, but she whupped us.\p" + .string "That old lady's also got a really\n" + .string "short fuse, too.\p" + .string "It doesn't take anything to get\n" + .string "that scary lady hollering.$" + +IndigoPlateau_PokemonCenter_1F_Text_LancesCousinGymLeaderFarAway:: @ 819AB16 + .string "Maybe becoming an ELITE FOUR\n" + .string "member is in the blood.\p" + .string "From what I've heard, LANCE has\n" + .string "a cousin who's a GYM LEADER\l" + .string "somewhere far away.$" + diff --git a/data/maps/PokemonLeague_AgathasRoom/map.json b/data/maps/PokemonLeague_AgathasRoom/map.json index 064480ba0..f71b81bf0 100644 --- a/data/maps/PokemonLeague_AgathasRoom/map.json +++ b/data/maps/PokemonLeague_AgathasRoom/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonLeague_AgathasRoom_EventScript_162877", + "script": "PokemonLeague_AgathasRoom_EventScript_Agatha", "flag": "0" } ], diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc index 62293c1ec..202b9fda4 100644 --- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -7,86 +7,84 @@ PokemonLeague_AgathasRoom_MapScripts:: @ 8162810 PokemonLeague_AgathasRoom_OnResume:: @ 8162825 setvar VAR_0x8004, 2 - call EventScript_1A75D5 + call PokemonLeague_EventScript_DoLightingEffect end PokemonLeague_AgathasRoom_OnLoad:: @ 8162830 - call_if_set FLAG_DEFEATED_AGATHA, EventScript_16284B + call_if_set FLAG_DEFEATED_AGATHA, PokemonLeague_AgathasRoom_EventScript_SetDoorOpen compare VAR_MAP_SCENE_POKEMON_LEAGUE, 3 - call_if_eq EventScript_162845 + call_if_eq PokemonLeague_AgathasRoom_EventScript_CloseEntry end -EventScript_162845:: @ 8162845 - call EventScript_1A759C +PokemonLeague_AgathasRoom_EventScript_CloseEntry:: @ 8162845 + call PokemonLeague_EventScript_CloseEntry return -EventScript_16284B:: @ 816284B - call EventScript_1A7538 +PokemonLeague_AgathasRoom_EventScript_SetDoorOpen:: @ 816284B + call PokemonLeague_EventScript_SetDoorOpen return PokemonLeague_AgathasRoom_OnWarp:: @ 8162851 - map_script_2 VAR_TEMP_1, 0, EventScript_16285B + map_script_2 VAR_TEMP_1, 0, PokemonLeague_AgathasRoom_EventScript_TurnPlayerNorth .2byte 0 -EventScript_16285B:: @ 816285B +PokemonLeague_AgathasRoom_EventScript_TurnPlayerNorth:: @ 816285B turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end PokemonLeague_AgathasRoom_OnFrame:: @ 8162860 - map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 2, EventScript_16286A + map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 2, PokemonLeague_AgathasRoom_EventScript_EnterRoom .2byte 0 -EventScript_16286A:: @ 816286A +PokemonLeague_AgathasRoom_EventScript_EnterRoom:: @ 816286A lockall - call EventScript_1A751F + call PokemonLeague_EventScript_EnterRoom setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 3 releaseall end -PokemonLeague_AgathasRoom_EventScript_162877:: @ 8162877 +PokemonLeague_AgathasRoom_EventScript_Agatha:: @ 8162877 lock faceplayer famechecker FAMECHECKER_AGATHA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - goto_if_set FLAG_DEFEATED_AGATHA, EventScript_162911 + goto_if_set FLAG_DEFEATED_AGATHA, PokemonLeague_AgathasRoom_EventScript_PostBattle famechecker FAMECHECKER_AGATHA, 0 famechecker FAMECHECKER_AGATHA, 4 famechecker FAMECHECKER_OAK, 4 - call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_1628E9 - call_if_set FLAG_SYS_GAME_CLEAR, EventScript_1628F2 + call_if_unset FLAG_SYS_GAME_CLEAR, PokemonLeague_AgathasRoom_EventScript_Intro + call_if_set FLAG_SYS_GAME_CLEAR, PokemonLeague_AgathasRoom_EventScript_RematchIntro setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 - call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_1628FB - call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162906 + call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_AgathasRoom_EventScript_Battle + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_AgathasRoom_EventScript_Rematch clearflag FLAG_TEMP_5 - goto EventScript_16291B - -EventScript_1628E8:: @ 81628E8 + goto PokemonLeague_AgathasRoom_EventScript_DefeatedAgatha end -EventScript_1628E9:: @ 81628E9 - msgbox gUnknown_817844D +PokemonLeague_AgathasRoom_EventScript_Intro:: @ 81628E9 + msgbox PokemonLeague_AgathasRoom_Text_Intro return -EventScript_1628F2:: @ 81628F2 - msgbox gUnknown_817858D +PokemonLeague_AgathasRoom_EventScript_RematchIntro:: @ 81628F2 + msgbox PokemonLeague_AgathasRoom_Text_RematchIntro return -EventScript_1628FB:: @ 81628FB - trainerbattle_no_intro TRAINER_ELITE_FOUR_AGATHA, Text_1786D7 +PokemonLeague_AgathasRoom_EventScript_Battle:: @ 81628FB + trainerbattle_no_intro TRAINER_ELITE_FOUR_AGATHA, PokemonLeague_AgathasRoom_Text_Defeat return -EventScript_162906:: @ 8162906 - trainerbattle_no_intro TRAINER_ELITE_FOUR_AGATHA_2, Text_1786D7 +PokemonLeague_AgathasRoom_EventScript_Rematch:: @ 8162906 + trainerbattle_no_intro TRAINER_ELITE_FOUR_AGATHA_2, PokemonLeague_AgathasRoom_Text_Defeat return -EventScript_162911:: @ 8162911 - msgbox gUnknown_8178700 +PokemonLeague_AgathasRoom_EventScript_PostBattle:: @ 8162911 + msgbox PokemonLeague_AgathasRoom_Text_PostBattle release end -EventScript_16291B:: @ 816291B +PokemonLeague_AgathasRoom_EventScript_DefeatedAgatha:: @ 816291B setflag FLAG_DEFEATED_AGATHA - call EventScript_1A7506 - msgbox gUnknown_8178700 + call PokemonLeague_EventScript_OpenDoor + msgbox PokemonLeague_AgathasRoom_Text_PostBattle release end diff --git a/data/maps/PokemonLeague_AgathasRoom/text.inc b/data/maps/PokemonLeague_AgathasRoom/text.inc index 8a29f185d..06a8af142 100644 --- a/data/maps/PokemonLeague_AgathasRoom/text.inc +++ b/data/maps/PokemonLeague_AgathasRoom/text.inc @@ -1,4 +1,4 @@ -gUnknown_817844D:: @ 817844D +PokemonLeague_AgathasRoom_Text_Intro:: @ 817844D .string "I am AGATHA of the ELITE FOUR.\p" .string "I hear OAK's taken a lot of\n" .string "interest in you, child.\p" @@ -13,7 +13,7 @@ gUnknown_817844D:: @ 817844D .string "{PLAYER}! I'll show you how a real\n" .string "TRAINER battles!{PLAY_BGM}{MUS_EXEYE}$" -gUnknown_817858D:: @ 817858D +PokemonLeague_AgathasRoom_Text_RematchIntro:: @ 817858D .string "I am AGATHA of the ELITE FOUR.\p" .string "You're the child that OAK's taken\n" .string "under his wing, aren't you?\p" @@ -28,11 +28,11 @@ gUnknown_817858D:: @ 817858D .string "{PLAYER}! I'll show you how a real\n" .string "TRAINER battles!{PLAY_BGM}{MUS_EXEYE}$" -Text_1786D7:: @ 81786D7 +PokemonLeague_AgathasRoom_Text_Defeat:: @ 81786D7 .string "Oh, my!\n" .string "You're something special, child!$" -gUnknown_8178700:: @ 8178700 +PokemonLeague_AgathasRoom_Text_PostBattle:: @ 8178700 .string "You win!\p" .string "I see what the old duff sees in\n" .string "you now.\p" diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json index 29e23f75c..a84a63e19 100644 --- a/data/maps/PokemonLeague_BrunosRoom/map.json +++ b/data/maps/PokemonLeague_BrunosRoom/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonLeague_BrunosRoom_EventScript_1626EC", + "script": "PokemonLeague_BrunosRoom_EventScript_Bruno", "flag": "0" } ], diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index 709b5ab03..123c73f51 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -7,118 +7,116 @@ PokemonLeague_BrunosRoom_MapScripts:: @ 8162685 PokemonLeague_BrunosRoom_OnResume:: @ 816269A setvar VAR_0x8004, 1 - call EventScript_1A75D5 + call PokemonLeague_EventScript_DoLightingEffect end PokemonLeague_BrunosRoom_OnLoad:: @ 81626A5 - call_if_set FLAG_DEFEATED_BRUNO, EventScript_1626C0 + call_if_set FLAG_DEFEATED_BRUNO, PokemonLeague_BrunosRoom_EventScript_SetDoorOpen compare VAR_MAP_SCENE_POKEMON_LEAGUE, 2 - call_if_eq EventScript_1626BA + call_if_eq PokemonLeague_BrunosRoom_EventScript_CloseEntry end -EventScript_1626BA:: @ 81626BA - call EventScript_1A759C +PokemonLeague_BrunosRoom_EventScript_CloseEntry:: @ 81626BA + call PokemonLeague_EventScript_CloseEntry return -EventScript_1626C0:: @ 81626C0 - call EventScript_1A7538 +PokemonLeague_BrunosRoom_EventScript_SetDoorOpen:: @ 81626C0 + call PokemonLeague_EventScript_SetDoorOpen return PokemonLeague_BrunosRoom_OnWarp:: @ 81626C6 - map_script_2 VAR_TEMP_1, 0, EventScript_1626D0 + map_script_2 VAR_TEMP_1, 0, PokemonLeague_BrunosRoom_EventScript_TurnPlayerNorth .2byte 0 -EventScript_1626D0:: @ 81626D0 +PokemonLeague_BrunosRoom_EventScript_TurnPlayerNorth:: @ 81626D0 turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end PokemonLeague_BrunosRoom_OnFrame:: @ 81626D5 - map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 1, EventScript_1626DF + map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 1, PokemonLeague_BrunosRoom_EventScript_EnterRoom .2byte 0 -EventScript_1626DF:: @ 81626DF +PokemonLeague_BrunosRoom_EventScript_EnterRoom:: @ 81626DF lockall - call EventScript_1A751F + call PokemonLeague_EventScript_EnterRoom setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 2 releaseall end -PokemonLeague_BrunosRoom_EventScript_1626EC:: @ 81626EC +PokemonLeague_BrunosRoom_EventScript_Bruno:: @ 81626EC lock faceplayer famechecker FAMECHECKER_BRUNO, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - goto_if_set FLAG_DEFEATED_BRUNO, EventScript_162779 + goto_if_set FLAG_DEFEATED_BRUNO, PokemonLeague_BrunosRoom_EventScript_PostBattle famechecker FAMECHECKER_BRUNO, 0 famechecker FAMECHECKER_BRUNO, 1 - call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_162751 - call_if_set FLAG_SYS_GAME_CLEAR, EventScript_16275A + call_if_unset FLAG_SYS_GAME_CLEAR, PokemonLeague_BrunosRoom_EventScript_Intro + call_if_set FLAG_SYS_GAME_CLEAR, PokemonLeague_BrunosRoom_EventScript_RematchIntro setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 - call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162763 - call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16276E + call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_BrunosRoom_EventScript_Battle + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_BrunosRoom_EventScript_Rematch clearflag FLAG_TEMP_5 - goto EventScript_1627B0 - -EventScript_162750:: @ 8162750 + goto PokemonLeague_BrunosRoom_EventScript_DefeatedBruno end -EventScript_162751:: @ 8162751 - msgbox gUnknown_817820F +PokemonLeague_BrunosRoom_EventScript_Intro:: @ 8162751 + msgbox PokemonLeague_BrunosRoom_Text_Intro return -EventScript_16275A:: @ 816275A - msgbox gUnknown_817830C +PokemonLeague_BrunosRoom_EventScript_RematchIntro:: @ 816275A + msgbox PokemonLeague_BrunosRoom_Text_RematchIntro return -EventScript_162763:: @ 8162763 - trainerbattle_no_intro TRAINER_ELITE_FOUR_BRUNO, Text_178409 +PokemonLeague_BrunosRoom_EventScript_Battle:: @ 8162763 + trainerbattle_no_intro TRAINER_ELITE_FOUR_BRUNO, PokemonLeague_BrunosRoom_Text_Defeat return -EventScript_16276E:: @ 816276E - trainerbattle_no_intro TRAINER_ELITE_FOUR_BRUNO_2, Text_178409 +PokemonLeague_BrunosRoom_EventScript_Rematch:: @ 816276E + trainerbattle_no_intro TRAINER_ELITE_FOUR_BRUNO_2, PokemonLeague_BrunosRoom_Text_Defeat return -EventScript_162779:: @ 8162779 - msgbox gUnknown_8178420 +PokemonLeague_BrunosRoom_EventScript_PostBattle:: @ 8162779 + msgbox PokemonLeague_BrunosRoom_Text_PostBattle closemessage compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_1627FA + call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayRight compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_1627EF + call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayLeft compare VAR_FACING, DIR_WEST - call_if_eq EventScript_162805 + call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown compare VAR_FACING, DIR_EAST - call_if_eq EventScript_162805 + call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown release end -EventScript_1627B0:: @ 81627B0 +PokemonLeague_BrunosRoom_EventScript_DefeatedBruno:: @ 81627B0 setflag FLAG_DEFEATED_BRUNO - call EventScript_1A7506 - msgbox gUnknown_8178420 + call PokemonLeague_EventScript_OpenDoor + msgbox PokemonLeague_BrunosRoom_Text_PostBattle closemessage compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_1627FA + call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayRight compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_1627EF + call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayLeft compare VAR_FACING, DIR_WEST - call_if_eq EventScript_162805 + call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown compare VAR_FACING, DIR_EAST - call_if_eq EventScript_162805 + call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown release end -EventScript_1627EF:: @ 81627EF +PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayLeft:: @ 81627EF applymovement 1, Movement_WalkInPlaceFastestLeft waitmovement 0 return -EventScript_1627FA:: @ 81627FA +PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayRight:: @ 81627FA applymovement 1, Movement_WalkInPlaceFastestRight waitmovement 0 return -EventScript_162805:: @ 8162805 +PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown:: @ 8162805 applymovement 1, Movement_WalkInPlaceFastestDown waitmovement 0 return diff --git a/data/maps/PokemonLeague_BrunosRoom/text.inc b/data/maps/PokemonLeague_BrunosRoom/text.inc index 57c66a96b..4c6cb4561 100644 --- a/data/maps/PokemonLeague_BrunosRoom/text.inc +++ b/data/maps/PokemonLeague_BrunosRoom/text.inc @@ -1,4 +1,4 @@ -gUnknown_817820F:: @ 817820F +PokemonLeague_BrunosRoom_Text_Intro:: @ 817820F .string "I am BRUNO of the ELITE FOUR!\p" .string "Through rigorous training, people\n" .string "and POKéMON can become stronger\l" @@ -11,7 +11,7 @@ gUnknown_817820F:: @ 817820F .string "superior power!\p" .string "Hoo hah!{PLAY_BGM}{MUS_EXEYE}$" -gUnknown_817830C:: @ 817830C +PokemonLeague_BrunosRoom_Text_RematchIntro:: @ 817830C .string "I am BRUNO of the ELITE FOUR!\p" .string "Through rigorous training, people\n" .string "and POKéMON can become stronger\l" @@ -24,11 +24,11 @@ gUnknown_817830C:: @ 817830C .string "superior power!\p" .string "Hoo hah!{PLAY_BGM}{MUS_EXEYE}$" -Text_178409:: @ 8178409 +PokemonLeague_BrunosRoom_Text_Defeat:: @ 8178409 .string "Why?\n" .string "How could I lose?$" -gUnknown_8178420:: @ 8178420 +PokemonLeague_BrunosRoom_Text_PostBattle:: @ 8178420 .string "My job is done.\n" .string "Go face your next challenge.$" diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index bf0283a1f..2821da205 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -1,3 +1,6 @@ +.equ LOCALID_RIVAL, 1 +.equ LOCALID_PROF_OAK, 2 + PokemonLeague_ChampionsRoom_MapScripts:: @ 8162AE2 map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_ChampionsRoom_OnWarp map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_ChampionsRoom_OnResume @@ -6,91 +9,91 @@ PokemonLeague_ChampionsRoom_MapScripts:: @ 8162AE2 PokemonLeague_ChampionsRoom_OnResume:: @ 8162AF2 setvar VAR_0x8004, 4 - call EventScript_1A75D5 + call PokemonLeague_EventScript_DoLightingEffect compare VAR_STARTER_MON, 2 - call_if_eq EventScript_162B1E + call_if_eq PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerSquirtle compare VAR_STARTER_MON, 1 - call_if_eq EventScript_162B31 + call_if_eq PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerBulbasaur compare VAR_STARTER_MON, 0 - call_if_eq EventScript_162B44 + call_if_eq PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerCharmander end -EventScript_162B1E:: @ 8162B1E - goto_if_defeated TRAINER_CHAMPION_FIRST_SQUIRTLE, EventScript_162B57 - goto_if_defeated TRAINER_CHAMPION_REMATCH_SQUIRTLE, EventScript_162B57 +PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerSquirtle:: @ 8162B1E + goto_if_defeated TRAINER_CHAMPION_FIRST_SQUIRTLE, PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger + goto_if_defeated TRAINER_CHAMPION_REMATCH_SQUIRTLE, PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger return -EventScript_162B31:: @ 8162B31 - goto_if_defeated TRAINER_CHAMPION_FIRST_BULBASAUR, EventScript_162B57 - goto_if_defeated TRAINER_CHAMPION_REMATCH_BULBASAUR, EventScript_162B57 +PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerBulbasaur:: @ 8162B31 + goto_if_defeated TRAINER_CHAMPION_FIRST_BULBASAUR, PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger + goto_if_defeated TRAINER_CHAMPION_REMATCH_BULBASAUR, PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger return -EventScript_162B44:: @ 8162B44 - goto_if_defeated TRAINER_CHAMPION_FIRST_CHARMANDER, EventScript_162B57 - goto_if_defeated TRAINER_CHAMPION_REMATCH_CHARMANDER, EventScript_162B57 +PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerCharmander:: @ 8162B44 + goto_if_defeated TRAINER_CHAMPION_FIRST_CHARMANDER, PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger + goto_if_defeated TRAINER_CHAMPION_REMATCH_CHARMANDER, PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger return -EventScript_162B57:: @ 8162B57 +PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger:: @ 8162B57 setvar VAR_TEMP_1, 1 return PokemonLeague_ChampionsRoom_OnWarp:: @ 8162B5D - map_script_2 VAR_TEMP_1, 0, EventScript_162B67 + map_script_2 VAR_TEMP_1, 0, PokemonLeague_ChampionsRoom_EventScript_TurnPlayerNorth .2byte 0 -EventScript_162B67:: @ 8162B67 +PokemonLeague_ChampionsRoom_EventScript_TurnPlayerNorth:: @ 8162B67 turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end PokemonLeague_ChampionsRoom_OnFrame:: @ 8162B6C - map_script_2 VAR_TEMP_1, 0, EventScript_162B76 + map_script_2 VAR_TEMP_1, 0, PokemonLeague_ChampionsRoom_EventScript_EnterRoom .2byte 0 -EventScript_162B76:: @ 8162B76 +PokemonLeague_ChampionsRoom_EventScript_EnterRoom:: @ 8162B76 lockall textcolor 0 setflag FLAG_TEMP_2 - applymovement OBJ_EVENT_ID_PLAYER, Movement_162D07 + applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerEnter waitmovement 0 delay 20 - call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_162CB3 - call_if_set FLAG_SYS_GAME_CLEAR, EventScript_162CBC - goto_if_questlog EventScript_162C68 + call_if_unset FLAG_SYS_GAME_CLEAR, PokemonLeague_ChampionsRoom_EventScript_Intro + call_if_set FLAG_SYS_GAME_CLEAR, PokemonLeague_ChampionsRoom_EventScript_RematchIntro + goto_if_questlog PokemonLeague_ChampionsRoom_EventScript_QuestLogEnd setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 savebgm MUS_WIN_GYM - call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162C6F - call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162C91 + call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_ChampionsRoom_EventScript_Battle + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_ChampionsRoom_EventScript_Rematch setflag FLAG_TEMP_4 clearflag FLAG_TEMP_5 setflag FLAG_DEFEATED_CHAMP setflag FLAG_TEMP_4 - msgbox gUnknown_8178F2F + msgbox PokemonLeague_ChampionsRoom_Text_PostBattle playbgm MUS_SLOWMASARA, 0 - addobject 2 - msgbox gUnknown_8178FC6 + addobject LOCALID_PROF_OAK + msgbox PokemonLeague_ChampionsRoom_Text_OakPlayer closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_162D1F - applymovement 1, Movement_162D41 - applymovement 2, Movement_162D2A + applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerWatchOakEnter + applymovement LOCALID_RIVAL, PokemonLeague_ChampionsRoom_Movement_RivalWatchOakEnter + applymovement LOCALID_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakEnter waitmovement 0 delay 25 specialvar VAR_RESULT, ScrSpecial_GetStarter getspeciesname 0, VAR_RESULT - msgbox gUnknown_8178FCF - applymovement 2, Movement_WalkInPlaceFastestRight - applymovement 1, Movement_WalkInPlaceFastestLeft + msgbox PokemonLeague_ChampionsRoom_Text_OakCongratulations + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestRight + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox gUnknown_817908F + msgbox PokemonLeague_ChampionsRoom_Text_OakImDisappointedRival closemessage - applymovement 2, Movement_WalkInPlaceFastestDown + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown waitmovement 0 delay 20 - msgbox gUnknown_81791A3 + msgbox PokemonLeague_ChampionsRoom_Text_OakPlayerComeWithMe closemessage delay 13 - applymovement 2, Movement_162D37 - applymovement OBJ_EVENT_ID_PLAYER, Movement_162D12 + applymovement LOCALID_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakExit + applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerExit waitmovement 0 setvar VAR_TEMP_1, 1 warp MAP_POKEMON_LEAGUE_HALL_OF_FAME, 255, 5, 12 @@ -98,62 +101,62 @@ EventScript_162B76:: @ 8162B76 releaseall end -EventScript_162C68:: @ 8162C68 - call EventScript_162B57 +PokemonLeague_ChampionsRoom_EventScript_QuestLogEnd:: @ 8162C68 + call PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger releaseall end -EventScript_162C6F:: @ 8162C6F +PokemonLeague_ChampionsRoom_EventScript_Battle:: @ 8162C6F compare VAR_STARTER_MON, 2 - call_if_eq EventScript_162CC5 + call_if_eq PokemonLeague_ChampionsRoom_EventScript_BattleSquirtle compare VAR_STARTER_MON, 1 - call_if_eq EventScript_162CD0 + call_if_eq PokemonLeague_ChampionsRoom_EventScript_BattleBulbasaur compare VAR_STARTER_MON, 0 - call_if_eq EventScript_162CDB + call_if_eq PokemonLeague_ChampionsRoom_EventScript_BattleCharmander return -EventScript_162C91:: @ 8162C91 +PokemonLeague_ChampionsRoom_EventScript_Rematch:: @ 8162C91 compare VAR_STARTER_MON, 2 - call_if_eq EventScript_162CE6 + call_if_eq PokemonLeague_ChampionsRoom_EventScript_RematchSquirtle compare VAR_STARTER_MON, 1 - call_if_eq EventScript_162CF1 + call_if_eq PokemonLeague_ChampionsRoom_EventScript_RematchBulbasaur compare VAR_STARTER_MON, 0 - call_if_eq EventScript_162CFC + call_if_eq PokemonLeague_ChampionsRoom_EventScript_RematchCharmander return -EventScript_162CB3:: @ 8162CB3 - msgbox gUnknown_8178B6C +PokemonLeague_ChampionsRoom_EventScript_Intro:: @ 8162CB3 + msgbox PokemonLeague_ChampionsRoom_Text_Intro return -EventScript_162CBC:: @ 8162CBC - msgbox gUnknown_8178CD4 +PokemonLeague_ChampionsRoom_EventScript_RematchIntro:: @ 8162CBC + msgbox PokemonLeague_ChampionsRoom_Text_RematchIntro return -EventScript_162CC5:: @ 8162CC5 - trainerbattle_no_intro TRAINER_CHAMPION_FIRST_SQUIRTLE, Text_178E3F +PokemonLeague_ChampionsRoom_EventScript_BattleSquirtle:: @ 8162CC5 + trainerbattle_no_intro TRAINER_CHAMPION_FIRST_SQUIRTLE, PokemonLeague_ChampionsRoom_Text_Defeat return -EventScript_162CD0:: @ 8162CD0 - trainerbattle_no_intro TRAINER_CHAMPION_FIRST_BULBASAUR, Text_178E3F +PokemonLeague_ChampionsRoom_EventScript_BattleBulbasaur:: @ 8162CD0 + trainerbattle_no_intro TRAINER_CHAMPION_FIRST_BULBASAUR, PokemonLeague_ChampionsRoom_Text_Defeat return -EventScript_162CDB:: @ 8162CDB - trainerbattle_no_intro TRAINER_CHAMPION_FIRST_CHARMANDER, Text_178E3F +PokemonLeague_ChampionsRoom_EventScript_BattleCharmander:: @ 8162CDB + trainerbattle_no_intro TRAINER_CHAMPION_FIRST_CHARMANDER, PokemonLeague_ChampionsRoom_Text_Defeat return -EventScript_162CE6:: @ 8162CE6 - trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_SQUIRTLE, Text_178E3F +PokemonLeague_ChampionsRoom_EventScript_RematchSquirtle:: @ 8162CE6 + trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_SQUIRTLE, PokemonLeague_ChampionsRoom_Text_Defeat return -EventScript_162CF1:: @ 8162CF1 - trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_BULBASAUR, Text_178E3F +PokemonLeague_ChampionsRoom_EventScript_RematchBulbasaur:: @ 8162CF1 + trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_BULBASAUR, PokemonLeague_ChampionsRoom_Text_Defeat return -EventScript_162CFC:: @ 8162CFC - trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_CHARMANDER, Text_178E3F +PokemonLeague_ChampionsRoom_EventScript_RematchCharmander:: @ 8162CFC + trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_CHARMANDER, PokemonLeague_ChampionsRoom_Text_Defeat return -Movement_162D07:: @ 8162D07 +PokemonLeague_ChampionsRoom_Movement_PlayerEnter:: @ 8162D07 walk_up walk_up walk_up @@ -166,7 +169,7 @@ Movement_162D07:: @ 8162D07 walk_up step_end -Movement_162D12:: @ 8162D12 +PokemonLeague_ChampionsRoom_Movement_PlayerExit:: @ 8162D12 delay_16 walk_left walk_up @@ -181,7 +184,7 @@ Movement_162D12:: @ 8162D12 set_invisible step_end -Movement_162D1F:: @ 8162D1F +PokemonLeague_ChampionsRoom_Movement_PlayerWatchOakEnter:: @ 8162D1F delay_8 walk_in_place_fastest_down delay_16 @@ -194,7 +197,7 @@ Movement_162D1F:: @ 8162D1F walk_in_place_fastest_left step_end -Movement_162D2A:: @ 8162D2A +PokemonLeague_ChampionsRoom_Movement_OakEnter:: @ 8162D2A delay_16 delay_16 walk_up @@ -209,7 +212,7 @@ Movement_162D2A:: @ 8162D2A delay_16 step_end -Movement_162D37:: @ 8162D37 +PokemonLeague_ChampionsRoom_Movement_OakExit:: @ 8162D37 walk_up walk_up walk_right @@ -221,7 +224,7 @@ Movement_162D37:: @ 8162D37 set_invisible step_end -Movement_162D41:: @ 8162D41 +PokemonLeague_ChampionsRoom_Movement_RivalWatchOakEnter:: @ 8162D41 delay_16 delay_16 delay_16 diff --git a/data/maps/PokemonLeague_ChampionsRoom/text.inc b/data/maps/PokemonLeague_ChampionsRoom/text.inc index a99db09db..19ba16fa3 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/text.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/text.inc @@ -1,4 +1,4 @@ -gUnknown_8178B6C:: @ 8178B6C +PokemonLeague_ChampionsRoom_Text_Intro:: @ 8178B6C .string "{RIVAL}: Hey, {PLAYER}!\p" .string "I was looking forward to seeing\n" .string "you, {PLAYER}.\p" @@ -16,7 +16,7 @@ gUnknown_8178B6C:: @ 8178B6C .string "I am the most powerful TRAINER in\n" .string "the world!$" -gUnknown_8178CD4:: @ 8178CD4 +PokemonLeague_ChampionsRoom_Text_RematchIntro:: @ 8178CD4 .string "{RIVAL}: Hey, {PLAYER}!\p" .string "You came back, {PLAYER}!\n" .string "Hahah, that is so great!\p" @@ -34,7 +34,7 @@ gUnknown_8178CD4:: @ 8178CD4 .string "I am the most powerful TRAINER in\n" .string "the world!$" -Text_178E3F:: @ 8178E3F +PokemonLeague_ChampionsRoom_Text_Defeat:: @ 8178E3F .string "NO!\n" .string "That can't be!\l" .string "You beat me at my best!\p" @@ -43,7 +43,7 @@ Text_178E3F:: @ 8178E3F .string "My reign is over already?\n" .string "It's not fair!$" -Text_178EC3:: @ 8178EC3 +PokemonLeague_ChampionsRoom_Text_Victory:: @ 8178EC3 .string "はーはッ！\n" .string "かった！　かった！　かった！\p" .string "{PLAYER}に　まける　ような\n" @@ -54,7 +54,7 @@ Text_178EC3:: @ 8178EC3 .string "ほめて　つかわす！\n" .string "はーッ！　はーはッはッ！$" -gUnknown_8178F2F:: @ 8178F2F +PokemonLeague_ChampionsRoom_Text_PostBattle:: @ 8178F2F .string "Why?\n" .string "Why did I lose?\p" .string "I never made any mistakes raising\n" @@ -63,10 +63,10 @@ gUnknown_8178F2F:: @ 8178F2F .string "LEAGUE CHAMPION!\p" .string "Although I don't like to admit it…$" -gUnknown_8178FC6:: @ 8178FC6 +PokemonLeague_ChampionsRoom_Text_OakPlayer:: @ 8178FC6 .string "OAK: {PLAYER}!$" -gUnknown_8178FCF:: @ 8178FCF +PokemonLeague_ChampionsRoom_Text_OakCongratulations:: @ 8178FCF .string "OAK: So, you've won!\n" .string "Sincerely, congratulations!\p" .string "You're the new POKéMON LEAGUE\n" @@ -76,7 +76,7 @@ gUnknown_8178FCF:: @ 8178FCF .string "on the POKéDEX.\p" .string "{PLAYER}, you have come of age!$" -gUnknown_817908F:: @ 817908F +PokemonLeague_ChampionsRoom_Text_OakImDisappointedRival:: @ 817908F .string "OAK: {RIVAL}…\n" .string "I'm disappointed in you.\p" .string "I came when I heard you'd beaten\n" @@ -90,7 +90,7 @@ gUnknown_817908F:: @ 817908F .string "Without them, you will never\n" .string "become a CHAMP again!$" -gUnknown_81791A3:: @ 81791A3 +PokemonLeague_ChampionsRoom_Text_OakPlayerComeWithMe:: @ 81791A3 .string "OAK: {PLAYER}.\p" .string "You understand that your victory\n" .string "was not just your own doing.\p" diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc index 080e65ece..de838a669 100644 --- a/data/maps/PokemonLeague_HallOfFame/scripts.inc +++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc @@ -12,26 +12,26 @@ EventScript_162D61:: @ 8162D61 end PokemonLeague_HallOfFame_OnFrame:: @ 8162D66 - map_script_2 VAR_TEMP_1, 0, EventScript_162D70 + map_script_2 VAR_TEMP_1, 0, PokemonLeague_HallOfFame_EventScript_EnterRoom .2byte 0 -EventScript_162D70:: @ 8162D70 +PokemonLeague_HallOfFame_EventScript_EnterRoom:: @ 8162D70 lockall textcolor 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_162DCD + applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_HallOfFame_Movement_EnterRoom waitmovement 0 applymovement 1, Movement_WalkInPlaceFastestLeft applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 delay 18 - msgbox gUnknown_817922F + msgbox PokemonLeague_HallOfFame_Text_OakCongratulations closemessage applymovement 1, Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 - dofieldeffect 62 - waitfieldeffect 62 + dofieldeffect FLDEFF_HALL_OF_FAME_RECORD + waitfieldeffect FLDEFF_HALL_OF_FAME_RECORD delay 40 setvar VAR_TEMP_1, 1 call EventScript_1A651A @@ -42,7 +42,7 @@ EventScript_162D70:: @ 8162D70 releaseall end -Movement_162DCD:: @ 8162DCD +PokemonLeague_HallOfFame_Movement_EnterRoom:: @ 8162DCD walk_up walk_up walk_up diff --git a/data/maps/PokemonLeague_HallOfFame/text.inc b/data/maps/PokemonLeague_HallOfFame/text.inc index 111f655cc..a5bc2e47a 100644 --- a/data/maps/PokemonLeague_HallOfFame/text.inc +++ b/data/maps/PokemonLeague_HallOfFame/text.inc @@ -1,4 +1,4 @@ -gUnknown_817922F:: @ 817922F +PokemonLeague_HallOfFame_Text_OakCongratulations:: @ 817922F .string "OAK: Er-hem!\n" .string "Congratulations, {PLAYER}!\p" .string "This floor is the POKéMON HALL OF\n" diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json index 3e9571b83..47f3651e5 100644 --- a/data/maps/PokemonLeague_LancesRoom/map.json +++ b/data/maps/PokemonLeague_LancesRoom/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonLeague_LancesRoom_EventScript_162A14", + "script": "PokemonLeague_LancesRoom_EventScript_Lance", "flag": "0" } ], diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 56619200c..2328a777c 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -7,41 +7,41 @@ PokemonLeague_LancesRoom_MapScripts:: @ 816292D PokemonLeague_LancesRoom_OnResume:: @ 8162942 setvar VAR_0x8004, 3 - call EventScript_1A75D5 + call PokemonLeague_EventScript_DoLightingEffect end PokemonLeague_LancesRoom_OnLoad:: @ 816294D compare VAR_MAP_SCENE_POKEMON_LEAGUE, 4 - call_if_eq EventScript_162962 - call_if_set FLAG_DEFEATED_LANCE, EventScript_162968 + call_if_eq PokemonLeague_LancesRoom_EventScript_CloseEntry + call_if_set FLAG_DEFEATED_LANCE, PokemonLeague_LancesRoom_EventScript_SetDoorOpen end -EventScript_162962:: @ 8162962 - call EventScript_1629A8 +PokemonLeague_LancesRoom_EventScript_CloseEntry:: @ 8162962 + call PokemonLeague_LancesRoom_EventScript_SetEntryClosed return -EventScript_162968:: @ 8162968 - call EventScript_1A7589 +PokemonLeague_LancesRoom_EventScript_SetDoorOpen:: @ 8162968 + call PokemonLeague_EventScript_SetDoorOpenLance return PokemonLeague_LancesRoom_OnWarp:: @ 816296E - map_script_2 VAR_TEMP_1, 0, EventScript_162978 + map_script_2 VAR_TEMP_1, 0, PokemonLeague_LancesRoom_EventScript_TurnPlayerNorth .2byte 0 -EventScript_162978:: @ 8162978 +PokemonLeague_LancesRoom_EventScript_TurnPlayerNorth:: @ 8162978 turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end PokemonLeague_LancesRoom_OnFrame:: @ 816297D - map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 3, EventScript_162987 + map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 3, PokemonLeague_LancesRoom_EventScript_EnterRoom .2byte 0 -EventScript_162987:: @ 8162987 +PokemonLeague_LancesRoom_EventScript_EnterRoom:: @ 8162987 lockall - applymovement OBJ_EVENT_ID_PLAYER, Movement_1629F1 + applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_LancesRoom_Movement_WalkThroughCorridor waitmovement 0 setflag FLAG_TEMP_2 - call EventScript_1629A8 + call PokemonLeague_LancesRoom_EventScript_SetEntryClosed playse SE_KI_GASYAN special DrawWholeMapView waitse @@ -49,18 +49,18 @@ EventScript_162987:: @ 8162987 releaseall end -EventScript_1629A8:: @ 81629A8 - setmetatile 5, 14, 669, 1 - setmetatile 6, 14, 670, 1 - setmetatile 7, 14, 671, 1 - setmetatile 5, 15, 677, 1 - setmetatile 6, 15, 678, 1 - setmetatile 7, 15, 679, 1 - setmetatile 6, 16, 785, 0 - setmetatile 7, 16, 785, 0 +PokemonLeague_LancesRoom_EventScript_SetEntryClosed:: @ 81629A8 + setmetatile 5, 14, METATILE_PokemonLeague_Entry_TopLeft_Closed, 1 + setmetatile 6, 14, METATILE_PokemonLeague_Entry_TopMid_Closed, 1 + setmetatile 7, 14, METATILE_PokemonLeague_Entry_TopRight_Closed, 1 + setmetatile 5, 15, METATILE_PokemonLeague_Entry_BottomLeft_Closed, 1 + setmetatile 6, 15, METATILE_PokemonLeague_Entry_BottomMid_Closed, 1 + setmetatile 7, 15, METATILE_PokemonLeague_Entry_BottomRight_Closed, 1 + setmetatile 6, 16, METATILE_PokemonLeague_Floor_ShadeFull_Lance, 0 + setmetatile 7, 16, METATILE_PokemonLeague_Floor_ShadeFull_Lance, 0 return -Movement_1629F1:: @ 81629F1 +PokemonLeague_LancesRoom_Movement_WalkThroughCorridor:: @ 81629F1 walk_up walk_up walk_left @@ -97,72 +97,70 @@ Movement_1629F1:: @ 81629F1 walk_up step_end -PokemonLeague_LancesRoom_EventScript_162A14:: @ 8162A14 +PokemonLeague_LancesRoom_EventScript_Lance:: @ 8162A14 lock faceplayer famechecker FAMECHECKER_LANCE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - goto_if_set FLAG_DEFEATED_LANCE, EventScript_162AA1 + goto_if_set FLAG_DEFEATED_LANCE, PokemonLeague_LancesRoom_EventScript_PostBattle famechecker FAMECHECKER_LANCE, 0 famechecker FAMECHECKER_LANCE, 1 - call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_162A79 - call_if_set FLAG_SYS_GAME_CLEAR, EventScript_162A82 + call_if_unset FLAG_SYS_GAME_CLEAR, PokemonLeague_LancesRoom_EventScript_Intro + call_if_set FLAG_SYS_GAME_CLEAR, PokemonLeague_LancesRoom_EventScript_RematchIntro setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 - call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162A8B - call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162A96 + call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_LancesRoom_EventScript_Battle + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_LancesRoom_EventScript_Rematch clearflag FLAG_TEMP_5 - goto EventScript_162AAB - -EventScript_162A78:: @ 8162A78 + goto PokemonLeague_LancesRoom_EventScript_DefeatedLance end -EventScript_162A79:: @ 8162A79 - msgbox gUnknown_8178764 +PokemonLeague_LancesRoom_EventScript_Intro:: @ 8162A79 + msgbox PokemonLeague_LancesRoom_Text_Intro return -EventScript_162A82:: @ 8162A82 - msgbox gUnknown_81788BD +PokemonLeague_LancesRoom_EventScript_RematchIntro:: @ 8162A82 + msgbox PokemonLeague_LancesRoom_Text_RematchIntro return -EventScript_162A8B:: @ 8162A8B - trainerbattle_no_intro TRAINER_ELITE_FOUR_LANCE, Text_178A15 +PokemonLeague_LancesRoom_EventScript_Battle:: @ 8162A8B + trainerbattle_no_intro TRAINER_ELITE_FOUR_LANCE, PokemonLeague_LancesRoom_Text_Defeat return -EventScript_162A96:: @ 8162A96 - trainerbattle_no_intro TRAINER_ELITE_FOUR_LANCE_2, Text_178A15 +PokemonLeague_LancesRoom_EventScript_Rematch:: @ 8162A96 + trainerbattle_no_intro TRAINER_ELITE_FOUR_LANCE_2, PokemonLeague_LancesRoom_Text_Defeat return -EventScript_162AA1:: @ 8162AA1 - msgbox gUnknown_8178A52 +PokemonLeague_LancesRoom_EventScript_PostBattle:: @ 8162AA1 + msgbox PokemonLeague_LancesRoom_Text_PostBattle release end -EventScript_162AAB:: @ 8162AAB +PokemonLeague_LancesRoom_EventScript_DefeatedLance:: @ 8162AAB setvar VAR_0x8004, 0 special Special_TryGainNewFanFromCounter setflag FLAG_DEFEATED_LANCE - call EventScript_1A7563 - msgbox gUnknown_8178A52 + call PokemonLeague_EventScript_OpenDoorLance + msgbox PokemonLeague_LancesRoom_Text_PostBattle closemessage release end -EventScript_162AC6:: @ 8162AC6 - applymovement 1, Movement_162ADC +PokemonLeague_LancesRoom_EventScript_LanceMoveOutOfWayLeft:: @ 8162AC6 + applymovement 1, PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayLeft waitmovement 0 return -EventScript_162AD1:: @ 8162AD1 - applymovement 1, Movement_162ADF +PokemonLeague_LancesRoom_EventScript_LanceMoveOutOfWayRight:: @ 8162AD1 + applymovement 1, PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayRight waitmovement 0 return -Movement_162ADC:: @ 8162ADC +PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayLeft:: @ 8162ADC walk_left walk_in_place_fastest_right step_end -Movement_162ADF:: @ 8162ADF +PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayRight:: @ 8162ADF walk_right walk_in_place_fastest_left step_end diff --git a/data/maps/PokemonLeague_LancesRoom/text.inc b/data/maps/PokemonLeague_LancesRoom/text.inc index 9565fd4d5..8c726875a 100644 --- a/data/maps/PokemonLeague_LancesRoom/text.inc +++ b/data/maps/PokemonLeague_LancesRoom/text.inc @@ -1,4 +1,4 @@ -gUnknown_8178764:: @ 8178764 +PokemonLeague_LancesRoom_Text_Intro:: @ 8178764 .string "Ah! I've heard about you,\n" .string "{PLAYER}!\p" .string "I lead the ELITE FOUR.\p" @@ -14,7 +14,7 @@ gUnknown_8178764:: @ 8178764 .string "Your LEAGUE challenge ends with\n" .string "me, {PLAYER}!{PLAY_BGM}{MUS_EXEYE}$" -gUnknown_81788BD:: @ 81788BD +PokemonLeague_LancesRoom_Text_RematchIntro:: @ 81788BD .string "Ah!\n" .string "So, you've returned, {PLAYER}!\p" .string "I lead the ELITE FOUR.\p" @@ -30,12 +30,12 @@ gUnknown_81788BD:: @ 81788BD .string "Your LEAGUE challenge ends with\n" .string "me, {PLAYER}!{PLAY_BGM}{MUS_EXEYE}$" -Text_178A15:: @ 8178A15 +PokemonLeague_LancesRoom_Text_Defeat:: @ 8178A15 .string "That's it!\p" .string "I hate to admit it, but you are a\n" .string "POKéMON master!$" -gUnknown_8178A52:: @ 8178A52 +PokemonLeague_LancesRoom_Text_PostBattle:: @ 8178A52 .string "I still can't believe my dragons\n" .string "lost to you, {PLAYER}.\p" .string "You are now the POKéMON LEAGUE\n" diff --git a/data/maps/PokemonLeague_LoreleisRoom/map.json b/data/maps/PokemonLeague_LoreleisRoom/map.json index 6801df803..f33c2a35b 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/map.json +++ b/data/maps/PokemonLeague_LoreleisRoom/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonLeague_LoreleisRoom_EventScript_1625DC", + "script": "PokemonLeague_LoreleisRoom_EventScript_Lorelei", "flag": "0" } ], diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc index e95ecfd98..422029153 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -8,21 +8,21 @@ PokemonLeague_LoreleisRoom_MapScripts:: @ 816256C PokemonLeague_LoreleisRoom_OnResume:: @ 8162586 setvar VAR_0x8004, 0 - call EventScript_1A75D5 + call PokemonLeague_EventScript_DoLightingEffect end PokemonLeague_LoreleisRoom_OnLoad:: @ 8162591 - call_if_set FLAG_DEFEATED_LORELEI, EventScript_1625AC + call_if_set FLAG_DEFEATED_LORELEI, PokemonLeague_LoreleisRoom_EventScript_SetDoorOpen compare VAR_MAP_SCENE_POKEMON_LEAGUE, 1 - call_if_eq EventScript_1625A6 + call_if_eq PokemonLeague_LoreleisRoom_EventScript_CloseEntry end -EventScript_1625A6:: @ 81625A6 - call EventScript_1A759C +PokemonLeague_LoreleisRoom_EventScript_CloseEntry:: @ 81625A6 + call PokemonLeague_EventScript_CloseEntry return -EventScript_1625AC:: @ 81625AC - call EventScript_1A7538 +PokemonLeague_LoreleisRoom_EventScript_SetDoorOpen:: @ 81625AC + call PokemonLeague_EventScript_SetDoorOpen return PokemonLeague_LoreleisRoom_OnTransition:: @ 81625B2 @@ -30,67 +30,65 @@ PokemonLeague_LoreleisRoom_OnTransition:: @ 81625B2 end PokemonLeague_LoreleisRoom_OnWarp:: @ 81625B6 - map_script_2 VAR_TEMP_1, 0, EventScript_1625C0 + map_script_2 VAR_TEMP_1, 0, PokemonLeague_LoreleisRoom_EventScript_TurnPlayerNorth .2byte 0 -EventScript_1625C0:: @ 81625C0 +PokemonLeague_LoreleisRoom_EventScript_TurnPlayerNorth:: @ 81625C0 turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end PokemonLeague_LoreleisRoom_OnFrame:: @ 81625C5 - map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 0, EventScript_1625CF + map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 0, PokemonLeague_LoreleisRoom_EventScript_EnterRoom .2byte 0 -EventScript_1625CF:: @ 81625CF +PokemonLeague_LoreleisRoom_EventScript_EnterRoom:: @ 81625CF lockall - call EventScript_1A751F + call PokemonLeague_EventScript_EnterRoom setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 1 releaseall end -PokemonLeague_LoreleisRoom_EventScript_1625DC:: @ 81625DC +PokemonLeague_LoreleisRoom_EventScript_Lorelei:: @ 81625DC lock faceplayer famechecker FAMECHECKER_LORELEI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - goto_if_set FLAG_DEFEATED_LORELEI, EventScript_162669 + goto_if_set FLAG_DEFEATED_LORELEI, PokemonLeague_LoreleisRoom_EventScript_PostBattle famechecker FAMECHECKER_LORELEI, 0 famechecker FAMECHECKER_LORELEI, 1 - call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162641 - call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16264A + call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_LoreleisRoom_EventScript_Intro + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_LoreleisRoom_EventScript_RematchIntro setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 - call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162653 - call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16265E + call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_LoreleisRoom_EventScript_Battle + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_LoreleisRoom_EventScript_Rematch clearflag FLAG_TEMP_5 - goto EventScript_162673 - -EventScript_162640:: @ 8162640 + goto PokemonLeague_LoreleisRoom_EventScript_DefeatedLorelei end -EventScript_162641:: @ 8162641 - msgbox gUnknown_8177FA4 +PokemonLeague_LoreleisRoom_EventScript_Intro:: @ 8162641 + msgbox PokemonLeague_LoreleisRoom_Text_Intro return -EventScript_16264A:: @ 816264A - msgbox gUnknown_8178089 +PokemonLeague_LoreleisRoom_EventScript_RematchIntro:: @ 816264A + msgbox PokemonLeague_LoreleisRoom_Text_RematchIntro return -EventScript_162653:: @ 8162653 - trainerbattle_no_intro TRAINER_ELITE_FOUR_LORELEI, Text_178191 +PokemonLeague_LoreleisRoom_EventScript_Battle:: @ 8162653 + trainerbattle_no_intro TRAINER_ELITE_FOUR_LORELEI, PokemonLeague_LoreleisRoom_Text_Defeat return -EventScript_16265E:: @ 816265E - trainerbattle_no_intro TRAINER_ELITE_FOUR_LORELEI_2, Text_178191 +PokemonLeague_LoreleisRoom_EventScript_Rematch:: @ 816265E + trainerbattle_no_intro TRAINER_ELITE_FOUR_LORELEI_2, PokemonLeague_LoreleisRoom_Text_Defeat return -EventScript_162669:: @ 8162669 - msgbox gUnknown_81781B0 +PokemonLeague_LoreleisRoom_EventScript_PostBattle:: @ 8162669 + msgbox PokemonLeague_LoreleisRoom_Text_PostBattle release end -EventScript_162673:: @ 8162673 +PokemonLeague_LoreleisRoom_EventScript_DefeatedLorelei:: @ 8162673 setflag FLAG_DEFEATED_LORELEI - call EventScript_1A7506 - msgbox gUnknown_81781B0 + call PokemonLeague_EventScript_OpenDoor + msgbox PokemonLeague_LoreleisRoom_Text_PostBattle release end diff --git a/data/maps/PokemonLeague_LoreleisRoom/text.inc b/data/maps/PokemonLeague_LoreleisRoom/text.inc index 9619ab86b..55e67d764 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/text.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/text.inc @@ -1,4 +1,4 @@ -gUnknown_8177FA4:: @ 8177FA4 +PokemonLeague_LoreleisRoom_Text_Intro:: @ 8177FA4 .string "Welcome to the POKéMON LEAGUE.\p" .string "I am LORELEI of the ELITE FOUR.\p" .string "No one can best me when it comes\n" @@ -9,7 +9,7 @@ gUnknown_8177FA4:: @ 8177FA4 .string "Hahaha!\n" .string "Are you ready?{PLAY_BGM}{MUS_EXEYE}$" -gUnknown_8178089:: @ 8178089 +PokemonLeague_LoreleisRoom_Text_RematchIntro:: @ 8178089 .string "Welcome to the POKéMON LEAGUE.\p" .string "I, LORELEI of the ELITE FOUR,\n" .string "have returned!\p" @@ -22,10 +22,10 @@ gUnknown_8178089:: @ 8178089 .string "Hahaha!\n" .string "Are you ready?{PLAY_BGM}{MUS_EXEYE}$" -Text_178191:: @ 8178191 +PokemonLeague_LoreleisRoom_Text_Defeat:: @ 8178191 .string "…Things shouldn't be this way!$" -gUnknown_81781B0:: @ 81781B0 +PokemonLeague_LoreleisRoom_Text_PostBattle:: @ 81781B0 .string "You're better than I thought.\n" .string "Go on ahead.\p" .string "You only got a taste of the\n" diff --git a/data/maps/SaffronCity_House1_1F/text.inc b/data/maps/SaffronCity_House1_1F/text.inc index 04bedb057..c4f866946 100644 --- a/data/maps/SaffronCity_House1_1F/text.inc +++ b/data/maps/SaffronCity_House1_1F/text.inc @@ -1,22 +1,3 @@ -Text_19A9E7:: @ 819A9E7 - .string "AGATHA's GHOST-type POKéMON are\n" - .string "horrifically terrifying in toughness.\p" - .string "I took my FIGHTING-type POKéMON\n" - .string "and raised them to the max.\p" - .string "I went at AGATHA feeling pretty\n" - .string "confident, but she whupped us.\p" - .string "That old lady's also got a really\n" - .string "short fuse, too.\p" - .string "It doesn't take anything to get\n" - .string "that scary lady hollering.$" - -Text_19AB16:: @ 819AB16 - .string "Maybe becoming an ELITE FOUR\n" - .string "member is in the blood.\p" - .string "From what I've heard, LANCE has\n" - .string "a cousin who's a GYM LEADER\l" - .string "somewhere far away.$" - gUnknown_819AB9B:: @ 819AB9B .string "My daughter is so self-centered.\n" .string "She has but a few friends.$" diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index 6fe5607dd..43bb625da 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -177,12 +177,12 @@ SevenIsland_SevaultCanyon_EventScript_1ACF95:: @ 81ACF95 release end -IndigoPlateau_PokemonCenter_1F_EventScript_1ACFAE:: @ 81ACFAE +IndigoPlateau_PokemonCenter_1F_EventScript_BlackBelt:: @ 81ACFAE lock faceplayer famechecker FAMECHECKER_AGATHA, 1 famechecker FAMECHECKER_AGATHA, 2 - msgbox Text_19A9E7 + msgbox IndigoPlateau_PokemonCenter_1F_Text_AgathaWhuppedUs release end @@ -235,20 +235,20 @@ CeladonCity_DepartmentStore_2F_EventScript_1AD053:: @ 81AD053 release end -IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C:: @ 81AD06C +IndigoPlateau_PokemonCenter_1F_EventScript_PokemonJournal:: @ 81AD06C lock faceplayer famechecker FAMECHECKER_LANCE, 4 textcolor 3 - msgbox gUnknown_81B1A31 + msgbox PokemonJournal_Text_SpecialFeatureLance release end -IndigoPlateau_PokemonCenter_1F_EventScript_1AD087:: @ 81AD087 +IndigoPlateau_PokemonCenter_1F_EventScript_CooltrainerM:: @ 81AD087 lock faceplayer famechecker FAMECHECKER_LANCE, 5 - msgbox Text_19AB16 + msgbox IndigoPlateau_PokemonCenter_1F_Text_LancesCousinGymLeaderFarAway release end diff --git a/data/scripts/pokemon_league.inc b/data/scripts/pokemon_league.inc new file mode 100644 index 000000000..806e0976a --- /dev/null +++ b/data/scripts/pokemon_league.inc @@ -0,0 +1,64 @@ +PokemonLeague_EventScript_OpenDoor:: @ 81A7506 + applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32 + waitmovement 0 + playse SE_DOOR + call PokemonLeague_EventScript_SetDoorOpen + special DrawWholeMapView + setflag FLAG_TEMP_4 + return + +PokemonLeague_EventScript_EnterRoom:: @ 81A751F + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkUp5 + waitmovement 0 + setflag FLAG_TEMP_2 + playse SE_KI_GASYAN + call PokemonLeague_EventScript_CloseEntry + special DrawWholeMapView + return + +PokemonLeague_EventScript_SetDoorOpen:: @ 81A7538 + setmetatile 6, 1, METATILE_PokemonLeague_Door_Top_Open, 1 + setmetatile 6, 2, METATILE_PokemonLeague_Door_Mid_Open, 0 + return + +PokemonLeague_EventScript_PreventExit:: @ 81A754B + lockall + textcolor 0 + msgbox Text_VoiceRangOutDontRunAway + closemessage + applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_Movement_ForcePlayerIn + waitmovement 0 + releaseall + end + +PokemonLeague_EventScript_OpenDoorLance:: @ 81A7563 + applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32 + waitmovement 0 + playse SE_DOOR + setmetatile 6, 4, METATILE_PokemonLeague_Door_Top_Open, 1 + setmetatile 6, 5, METATILE_PokemonLeague_Door_Mid_Open, 0 + special DrawWholeMapView + setflag FLAG_TEMP_4 + return + +PokemonLeague_EventScript_SetDoorOpenLance:: @ 81A7589 + setmetatile 6, 4, METATILE_PokemonLeague_Door_Top_Open, 1 + setmetatile 6, 5, METATILE_PokemonLeague_Door_Mid_Open, 0 + return + +PokemonLeague_EventScript_CloseEntry:: @ 81A759C + setmetatile 5, 11, METATILE_PokemonLeague_Entry_TopLeft_Closed, 1 + setmetatile 6, 11, METATILE_PokemonLeague_Entry_TopMid_Closed, 1 + setmetatile 7, 11, METATILE_PokemonLeague_Entry_TopRight_Closed, 1 + setmetatile 5, 12, METATILE_PokemonLeague_Entry_BottomLeft_Closed, 1 + setmetatile 6, 12, METATILE_PokemonLeague_Entry_BottomMid_Closed, 1 + setmetatile 7, 12, METATILE_PokemonLeague_Entry_BottomRight_Closed, 1 + return + +PokemonLeague_Movement_ForcePlayerIn:: @ 81A75D3 + walk_up + step_end + +PokemonLeague_EventScript_DoLightingEffect:: @ 81A75D5 + special Special_PokemonLeagueLightingEffect + return diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc index 8be9aec80..f39b91e8c 100644 --- a/data/text/fame_checker.inc +++ b/data/text/fame_checker.inc @@ -1453,7 +1453,7 @@ gUnknown_81B19A8:: @ 81B19A8 .string "OAK were rivals who vied for\l" .string "supremacy as TRAINERS.$" -gUnknown_81B1A31:: @ 81B1A31 +PokemonJournal_Text_SpecialFeatureLance:: @ 81B1A31 .string "POKéMON JOURNAL\p" .string "Special Feature:\n" .string "ELITE FOUR's LANCE!\p" -- cgit v1.2.3 From 5106fc1c9a503ba3856267ecaf16d9f6393e5072 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 26 Jan 2020 16:50:32 -0500 Subject: Move ReadTrainerTowerAndValidate --- data/specials.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/specials.inc b/data/specials.inc index 4313c0d16..1e156be66 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -439,7 +439,7 @@ gSpecials:: @ 815FD60 def_special Special_SetDeoxysTriangleObjectPal def_special sub_8147594 def_special Special_BadEggInParty - def_special ReadTrainerHillAndValidate + def_special ReadTrainerTowerAndValidate def_special HasAllMons def_special Special_PlayerIsNotInTrainerTowerLobby def_special Special_BrailleCursorToggle -- cgit v1.2.3 From 8a8bb4fb02b04852f9d4a16ce447c8c5c4870dea Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 28 Jan 2020 03:54:45 -0500 Subject: Document Rock Tunnel scripts --- data/maps/RockTunnel_1F/map.json | 16 ++++++------ data/maps/RockTunnel_1F/scripts.inc | 46 +++++++++++++++++----------------- data/maps/RockTunnel_1F/text.inc | 44 ++++++++++++++++----------------- data/maps/RockTunnel_B1F/map.json | 16 ++++++------ data/maps/RockTunnel_B1F/scripts.inc | 48 ++++++++++++++++++------------------ data/maps/RockTunnel_B1F/text.inc | 48 ++++++++++++++++++------------------ 6 files changed, 109 insertions(+), 109 deletions(-) (limited to 'data') diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index c365ad26e..6dd117e8a 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "RockTunnel_1F_EventScript_162E73", + "script": "RockTunnel_1F_EventScript_Dana", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "RockTunnel_1F_EventScript_162E5C", + "script": "RockTunnel_1F_EventScript_Ariana", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "RockTunnel_1F_EventScript_162E45", + "script": "RockTunnel_1F_EventScript_Leah", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "RockTunnel_1F_EventScript_162E17", + "script": "RockTunnel_1F_EventScript_Lucas", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "RockTunnel_1F_EventScript_162E00", + "script": "RockTunnel_1F_EventScript_Oliver", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "RockTunnel_1F_EventScript_162DE9", + "script": "RockTunnel_1F_EventScript_Lenny", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "RockTunnel_1F_EventScript_162E2E", + "script": "RockTunnel_1F_EventScript_Ashton", "flag": "0" }, { @@ -195,7 +195,7 @@ "x": 14, "y": 33, "elevation": 3, - "script": "RockTunnel_1F_EventScript_162DE0" + "script": "RockTunnel_1F_EventScript_RouteSign" } ] } diff --git a/data/maps/RockTunnel_1F/scripts.inc b/data/maps/RockTunnel_1F/scripts.inc index 49daa21a7..f18e0cd3e 100644 --- a/data/maps/RockTunnel_1F/scripts.inc +++ b/data/maps/RockTunnel_1F/scripts.inc @@ -6,41 +6,41 @@ RockTunnel_1F_OnTransition:: @ 8162DDC setworldmapflag FLAG_WORLD_MAP_ROCK_TUNNEL_1F end -RockTunnel_1F_EventScript_162DE0:: @ 8162DE0 - msgbox gUnknown_817962D, MSGBOX_SIGN +RockTunnel_1F_EventScript_RouteSign:: @ 8162DE0 + msgbox RockTunnel_1F_Text_RouteSign, MSGBOX_SIGN end -RockTunnel_1F_EventScript_162DE9:: @ 8162DE9 - trainerbattle_single TRAINER_HIKER_LENNY, Text_179366, Text_179388 - msgbox gUnknown_8179396, MSGBOX_AUTOCLOSE +RockTunnel_1F_EventScript_Lenny:: @ 8162DE9 + trainerbattle_single TRAINER_HIKER_LENNY, RockTunnel_1F_Text_LennyIntro, RockTunnel_1F_Text_LennyDefeat + msgbox RockTunnel_1F_Text_LennyPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_1F_EventScript_162E00:: @ 8162E00 - trainerbattle_single TRAINER_HIKER_OLIVER, Text_1793F1, Text_17940E - msgbox gUnknown_817943A, MSGBOX_AUTOCLOSE +RockTunnel_1F_EventScript_Oliver:: @ 8162E00 + trainerbattle_single TRAINER_HIKER_OLIVER, RockTunnel_1F_Text_OliverIntro, RockTunnel_1F_Text_OliverDefeat + msgbox RockTunnel_1F_Text_OliverPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_1F_EventScript_162E17:: @ 8162E17 - trainerbattle_single TRAINER_HIKER_LUCAS, Text_17947B, Text_1794AC - msgbox gUnknown_81794B4, MSGBOX_AUTOCLOSE +RockTunnel_1F_EventScript_Lucas:: @ 8162E17 + trainerbattle_single TRAINER_HIKER_LUCAS, RockTunnel_1F_Text_LucasIntro, RockTunnel_1F_Text_LucasDefeat + msgbox RockTunnel_1F_Text_LucasPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_1F_EventScript_162E2E:: @ 8162E2E - trainerbattle_single TRAINER_POKEMANIAC_ASHTON, Text_1794D4, Text_1794EE - msgbox gUnknown_81794F9, MSGBOX_AUTOCLOSE +RockTunnel_1F_EventScript_Ashton:: @ 8162E2E + trainerbattle_single TRAINER_POKEMANIAC_ASHTON, RockTunnel_1F_Text_AshtonIntro, RockTunnel_1F_Text_AshtonDefeat + msgbox RockTunnel_1F_Text_AshtonPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_1F_EventScript_162E45:: @ 8162E45 - trainerbattle_single TRAINER_PICNICKER_LEAH, Text_17951C, Text_179547 - msgbox gUnknown_8179558, MSGBOX_AUTOCLOSE +RockTunnel_1F_EventScript_Leah:: @ 8162E45 + trainerbattle_single TRAINER_PICNICKER_LEAH, RockTunnel_1F_Text_LeahIntro, RockTunnel_1F_Text_LeahDefeat + msgbox RockTunnel_1F_Text_LeahPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_1F_EventScript_162E5C:: @ 8162E5C - trainerbattle_single TRAINER_PICNICKER_ARIANA, Text_1795E5, Text_179604 - msgbox gUnknown_8179613, MSGBOX_AUTOCLOSE +RockTunnel_1F_EventScript_Ariana:: @ 8162E5C + trainerbattle_single TRAINER_PICNICKER_ARIANA, RockTunnel_1F_Text_ArianaIntro, RockTunnel_1F_Text_ArianaDefeat + msgbox RockTunnel_1F_Text_ArianaPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_1F_EventScript_162E73:: @ 8162E73 - trainerbattle_single TRAINER_PICNICKER_DANA, Text_179577, Text_1795A1 - msgbox gUnknown_81795B5, MSGBOX_AUTOCLOSE +RockTunnel_1F_EventScript_Dana:: @ 8162E73 + trainerbattle_single TRAINER_PICNICKER_DANA, RockTunnel_1F_Text_DanaIntro, RockTunnel_1F_Text_DanaDefeat + msgbox RockTunnel_1F_Text_DanaPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RockTunnel_1F/text.inc b/data/maps/RockTunnel_1F/text.inc index 56bc4ecbe..162e20f7d 100644 --- a/data/maps/RockTunnel_1F/text.inc +++ b/data/maps/RockTunnel_1F/text.inc @@ -1,83 +1,83 @@ -Text_179366:: @ 8179366 +RockTunnel_1F_Text_LennyIntro:: @ 8179366 .string "This tunnel goes a long way, kid!$" -Text_179388:: @ 8179388 +RockTunnel_1F_Text_LennyDefeat:: @ 8179388 .string "Doh!\n" .string "You win!$" -gUnknown_8179396:: @ 8179396 +RockTunnel_1F_Text_LennyPostBattle:: @ 8179396 .string "Watch for ONIX.\n" .string "They appear only occasionally.\p" .string "High-level ones can put the\n" .string "squeeze on you!$" -Text_1793F1:: @ 81793F1 +RockTunnel_1F_Text_OliverIntro:: @ 81793F1 .string "Hmm.\n" .string "Maybe I'm lost in here…$" -Text_17940E:: @ 817940E +RockTunnel_1F_Text_OliverDefeat:: @ 817940E .string "Ease up!\n" .string "What am I doing?\l" .string "Which way is out?$" -gUnknown_817943A:: @ 817943A +RockTunnel_1F_Text_OliverPostBattle:: @ 817943A .string "That sleeping POKéMON on ROUTE 12\n" .string "forced me to take this detour.$" -Text_17947B:: @ 817947B +RockTunnel_1F_Text_LucasIntro:: @ 817947B .string "Outsiders like you need to show me\n" .string "some respect!$" -Text_1794AC:: @ 81794AC +RockTunnel_1F_Text_LucasDefeat:: @ 81794AC .string "I give!$" -gUnknown_81794B4:: @ 81794B4 +RockTunnel_1F_Text_LucasPostBattle:: @ 81794B4 .string "You're talented enough to hike!$" -Text_1794D4:: @ 81794D4 +RockTunnel_1F_Text_AshtonIntro:: @ 81794D4 .string "POKéMON fight!\n" .string "Ready, go!$" -Text_1794EE:: @ 81794EE +RockTunnel_1F_Text_AshtonDefeat:: @ 81794EE .string "Game over!$" -gUnknown_81794F9:: @ 81794F9 +RockTunnel_1F_Text_AshtonPostBattle:: @ 81794F9 .string "Oh well, I'll get a ZUBAT as I go!$" -Text_17951C:: @ 817951C +RockTunnel_1F_Text_LeahIntro:: @ 817951C .string "Eek!\p" .string "Don't try anything funny in the\n" .string "dark!$" -Text_179547:: @ 8179547 +RockTunnel_1F_Text_LeahDefeat:: @ 8179547 .string "It was too dark…$" -gUnknown_8179558:: @ 8179558 +RockTunnel_1F_Text_LeahPostBattle:: @ 8179558 .string "I saw a MACHOP in this tunnel.$" -Text_179577:: @ 8179577 +RockTunnel_1F_Text_DanaIntro:: @ 8179577 .string "I came this far looking for wild\n" .string "POKéMON.$" -Text_1795A1:: @ 81795A1 +RockTunnel_1F_Text_DanaDefeat:: @ 81795A1 .string "I'm out of POKéMON!$" -gUnknown_81795B5:: @ 81795B5 +RockTunnel_1F_Text_DanaPostBattle:: @ 81795B5 .string "You looked cute and harmless.\n" .string "Was I ever wrong!$" -Text_1795E5:: @ 81795E5 +RockTunnel_1F_Text_ArianaIntro:: @ 81795E5 .string "You have POKéMON!\n" .string "Let's start!$" -Text_179604:: @ 8179604 +RockTunnel_1F_Text_ArianaDefeat:: @ 8179604 .string "You play hard!$" -gUnknown_8179613:: @ 8179613 +RockTunnel_1F_Text_ArianaPostBattle:: @ 8179613 .string "Whew!\n" .string "I'm all sweaty now.$" -gUnknown_817962D:: @ 817962D +RockTunnel_1F_Text_RouteSign:: @ 817962D .string "ROCK TUNNEL\n" .string "CERULEAN CITY - LAVENDER TOWN$" diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index bbd3f59a7..b680bf4a1 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "RockTunnel_B1F_EventScript_162EFE", + "script": "RockTunnel_B1F_EventScript_Cooper", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "RockTunnel_B1F_EventScript_162EB9", + "script": "RockTunnel_B1F_EventScript_Dudley", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "RockTunnel_B1F_EventScript_162E8B", + "script": "RockTunnel_B1F_EventScript_Sofia", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "RockTunnel_B1F_EventScript_162ED0", + "script": "RockTunnel_B1F_EventScript_Allen", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "RockTunnel_B1F_EventScript_162EE7", + "script": "RockTunnel_B1F_EventScript_Eric", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "RockTunnel_B1F_EventScript_162F15", + "script": "RockTunnel_B1F_EventScript_Steve", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "RockTunnel_B1F_EventScript_162EA2", + "script": "RockTunnel_B1F_EventScript_Martha", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "RockTunnel_B1F_EventScript_162F2C", + "script": "RockTunnel_B1F_EventScript_Winston", "flag": "0" }, { diff --git a/data/maps/RockTunnel_B1F/scripts.inc b/data/maps/RockTunnel_B1F/scripts.inc index e2c34b53e..54d0e8153 100644 --- a/data/maps/RockTunnel_B1F/scripts.inc +++ b/data/maps/RockTunnel_B1F/scripts.inc @@ -1,42 +1,42 @@ RockTunnel_B1F_MapScripts:: @ 8162E8A .byte 0 -RockTunnel_B1F_EventScript_162E8B:: @ 8162E8B - trainerbattle_single TRAINER_PICNICKER_SOFIA, Text_179657, Text_1796B9 - msgbox gUnknown_81796CE, MSGBOX_AUTOCLOSE +RockTunnel_B1F_EventScript_Sofia:: @ 8162E8B + trainerbattle_single TRAINER_PICNICKER_SOFIA, RockTunnel_B1F_Text_SofiaIntro, RockTunnel_B1F_Text_SofiaDefeat + msgbox RockTunnel_B1F_Text_SofiaPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_B1F_EventScript_162EA2:: @ 8162EA2 - trainerbattle_single TRAINER_PICNICKER_MARTHA, Text_1798AD, Text_1798DD - msgbox gUnknown_81798E9, MSGBOX_AUTOCLOSE +RockTunnel_B1F_EventScript_Martha:: @ 8162EA2 + trainerbattle_single TRAINER_PICNICKER_MARTHA, RockTunnel_B1F_Text_MarthaIntro, RockTunnel_B1F_Text_MarthaDefeat + msgbox RockTunnel_B1F_Text_MarthaPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_B1F_EventScript_162EB9:: @ 8162EB9 - trainerbattle_single TRAINER_HIKER_DUDLEY, Text_1796E1, Text_179700 - msgbox gUnknown_8179712, MSGBOX_AUTOCLOSE +RockTunnel_B1F_EventScript_Dudley:: @ 8162EB9 + trainerbattle_single TRAINER_HIKER_DUDLEY, RockTunnel_B1F_Text_DudleyIntro, RockTunnel_B1F_Text_DudleyDefeat + msgbox RockTunnel_B1F_Text_DudleyPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_B1F_EventScript_162ED0:: @ 8162ED0 - trainerbattle_single TRAINER_HIKER_ALLEN, Text_179829, Text_179856 - msgbox gUnknown_817987A, MSGBOX_AUTOCLOSE +RockTunnel_B1F_EventScript_Allen:: @ 8162ED0 + trainerbattle_single TRAINER_HIKER_ALLEN, RockTunnel_B1F_Text_AllenIntro, RockTunnel_B1F_Text_AllenDefeat + msgbox RockTunnel_B1F_Text_AllenPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_B1F_EventScript_162EE7:: @ 8162EE7 - trainerbattle_single TRAINER_HIKER_ERIC, Text_179916, Text_179932 - msgbox gUnknown_817993E, MSGBOX_AUTOCLOSE +RockTunnel_B1F_EventScript_Eric:: @ 8162EE7 + trainerbattle_single TRAINER_HIKER_ERIC, RockTunnel_B1F_Text_EricIntro, RockTunnel_B1F_Text_EricDefeat + msgbox RockTunnel_B1F_Text_EricPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_B1F_EventScript_162EFE:: @ 8162EFE - trainerbattle_single TRAINER_POKEMANIAC_COOPER, Text_17973A, Text_17975F - msgbox gUnknown_8179777, MSGBOX_AUTOCLOSE +RockTunnel_B1F_EventScript_Cooper:: @ 8162EFE + trainerbattle_single TRAINER_POKEMANIAC_COOPER, RockTunnel_B1F_Text_CooperIntro, RockTunnel_B1F_Text_CooperDefeat + msgbox RockTunnel_B1F_Text_CooperPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_B1F_EventScript_162F15:: @ 8162F15 - trainerbattle_single TRAINER_POKEMANIAC_STEVE, Text_1797A4, Text_1797CB - msgbox gUnknown_81797DE, MSGBOX_AUTOCLOSE +RockTunnel_B1F_EventScript_Steve:: @ 8162F15 + trainerbattle_single TRAINER_POKEMANIAC_STEVE, RockTunnel_B1F_Text_SteveIntro, RockTunnel_B1F_Text_SteveDefeat + msgbox RockTunnel_B1F_Text_StevePostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_B1F_EventScript_162F2C:: @ 8162F2C - trainerbattle_single TRAINER_POKEMANIAC_WINSTON, Text_179968, Text_179997 - msgbox gUnknown_81799AC, MSGBOX_AUTOCLOSE +RockTunnel_B1F_EventScript_Winston:: @ 8162F2C + trainerbattle_single TRAINER_POKEMANIAC_WINSTON, RockTunnel_B1F_Text_WinstonIntro, RockTunnel_B1F_Text_WinstonDefeat + msgbox RockTunnel_B1F_Text_WinstonPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RockTunnel_B1F/text.inc b/data/maps/RockTunnel_B1F/text.inc index b82f09657..1bf86a5eb 100644 --- a/data/maps/RockTunnel_B1F/text.inc +++ b/data/maps/RockTunnel_B1F/text.inc @@ -1,95 +1,95 @@ -Text_179657:: @ 8179657 +RockTunnel_B1F_Text_SofiaIntro:: @ 8179657 .string "Do you know how you can avoid\n" .string "getting lost in the mountains?\p" .string "You can bend twigs as trail\n" .string "markers.$" -Text_1796B9:: @ 81796B9 +RockTunnel_B1F_Text_SofiaDefeat:: @ 81796B9 .string "Ohhh!\n" .string "I did my best!$" -gUnknown_81796CE:: @ 81796CE +RockTunnel_B1F_Text_SofiaPostBattle:: @ 81796CE .string "I want to go home!$" -Text_1796E1:: @ 81796E1 +RockTunnel_B1F_Text_DudleyIntro:: @ 81796E1 .string "Hahaha!\n" .string "Can you beat my power?$" -Text_179700:: @ 8179700 +RockTunnel_B1F_Text_DudleyDefeat:: @ 8179700 .string "Oops!\n" .string "Outmuscled!$" -gUnknown_8179712:: @ 8179712 +RockTunnel_B1F_Text_DudleyPostBattle:: @ 8179712 .string "I go for power because I hate\n" .string "thinking.$" -Text_17973A:: @ 817973A +RockTunnel_B1F_Text_CooperIntro:: @ 817973A .string "You have a POKéDEX?\n" .string "I want one, too.$" -Text_17975F:: @ 817975F +RockTunnel_B1F_Text_CooperDefeat:: @ 817975F .string "Shoot!\n" .string "I am so jealous!$" -gUnknown_8179777:: @ 8179777 +RockTunnel_B1F_Text_CooperPostBattle:: @ 8179777 .string "When you finish your POKéDEX,\n" .string "can I have it?$" -Text_1797A4:: @ 81797A4 +RockTunnel_B1F_Text_SteveIntro:: @ 81797A4 .string "Um… Do you know about POKéMON\n" .string "cosplay?$" -Text_1797CB:: @ 81797CB +RockTunnel_B1F_Text_SteveDefeat:: @ 81797CB .string "Well, that's that.$" -gUnknown_81797DE:: @ 81797DE +RockTunnel_B1F_Text_StevePostBattle:: @ 81797DE .string "POKéMON cosplay is dressing up as\n" .string "POKéMON for fun.\p" .string "CLEFAIRY is a favorite.$" -Text_179829:: @ 8179829 +RockTunnel_B1F_Text_AllenIntro:: @ 8179829 .string "My POKéMON techniques will leave\n" .string "you crying!$" -Text_179856:: @ 8179856 +RockTunnel_B1F_Text_AllenDefeat:: @ 8179856 .string "I give!\n" .string "You're a better technician!$" -gUnknown_817987A:: @ 817987A +RockTunnel_B1F_Text_AllenPostBattle:: @ 817987A .string "In mountains, you'll often find\n" .string "ROCK-type POKéMON.$" -Text_1798AD:: @ 81798AD +RockTunnel_B1F_Text_MarthaIntro:: @ 81798AD .string "I don't often come here, but I will\n" .string "battle you.$" -Text_1798DD:: @ 81798DD +RockTunnel_B1F_Text_MarthaDefeat:: @ 81798DD .string "Oh!\n" .string "I lost!$" -gUnknown_81798E9:: @ 81798E9 +RockTunnel_B1F_Text_MarthaPostBattle:: @ 81798E9 .string "I like tiny POKéMON.\n" .string "Big ones are too scary!$" -Text_179916:: @ 8179916 +RockTunnel_B1F_Text_EricIntro:: @ 8179916 .string "Hit me with your best shot!$" -Text_179932:: @ 8179932 +RockTunnel_B1F_Text_EricDefeat:: @ 8179932 .string "Fired away!$" -gUnknown_817993E:: @ 817993E +RockTunnel_B1F_Text_EricPostBattle:: @ 817993E .string "I'll raise my POKéMON to beat\n" .string "yours, kid.$" -Text_179968:: @ 8179968 +RockTunnel_B1F_Text_WinstonIntro:: @ 8179968 .string "I draw illustrations of POKéMON\n" .string "when I'm home.$" -Text_179997:: @ 8179997 +RockTunnel_B1F_Text_WinstonDefeat:: @ 8179997 .string "Whew…\n" .string "I'm exhausted…$" -gUnknown_81799AC:: @ 81799AC +RockTunnel_B1F_Text_WinstonPostBattle:: @ 81799AC .string "I'm an artist, not a fighter.\n" .string "I'll go home to draw.$" -- cgit v1.2.3 From eae373576ddb6893d500d4a4134538f480b0d322 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 28 Jan 2020 04:21:03 -0500 Subject: Document Victory Road scripts --- data/maps/VictoryRoad_1F/map.json | 6 ++-- data/maps/VictoryRoad_1F/scripts.inc | 30 ++++++++-------- data/maps/VictoryRoad_1F/text.inc | 12 +++---- data/maps/VictoryRoad_2F/map.json | 14 ++++---- data/maps/VictoryRoad_2F/scripts.inc | 66 ++++++++++++++++++------------------ data/maps/VictoryRoad_2F/text.inc | 34 +++++++++++-------- data/maps/VictoryRoad_3F/map.json | 14 ++++---- data/maps/VictoryRoad_3F/scripts.inc | 54 ++++++++++++++--------------- data/maps/VictoryRoad_3F/text.inc | 43 +++++++++++------------ 9 files changed, 137 insertions(+), 136 deletions(-) (limited to 'data') diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 03b6b0cdd..9f5ddc540 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "VictoryRoad_1F_EventScript_160F7B", + "script": "VictoryRoad_1F_EventScript_Rolando", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "VictoryRoad_1F_EventScript_160F64", + "script": "VictoryRoad_1F_EventScript_Naomi", "flag": "0" }, { @@ -129,7 +129,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_VICTORY_ROAD_1F", "var_value": 99, - "script": "VictoryRoad_1F_EventScript_160F33" + "script": "VictoryRoad_1F_EventScript_FloorSwitch" } ], "bg_events": [ diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 79d01278f..5bdc91202 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -5,24 +5,24 @@ VictoryRoad_1F_MapScripts:: @ 8160F05 VictoryRoad_1F_OnLoad:: @ 8160F10 compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 - call_if_ne EventScript_160F1C + call_if_ne VictoryRoad_1F_EventScript_SetRockBarrier end -EventScript_160F1C:: @ 8160F1C - setmetatile 12, 14, 775, 1 - setmetatile 12, 15, 791, 1 +VictoryRoad_1F_EventScript_SetRockBarrier:: @ 8160F1C + setmetatile 12, 14, METATILE_Cave_RockBarrier_Top, 1 + setmetatile 12, 15, METATILE_Cave_RockBarrier_Bottom, 1 return VictoryRoad_1F_OnTransition:: @ 8160F2F setworldmapflag FLAG_WORLD_MAP_VICTORY_ROAD_1F end -VictoryRoad_1F_EventScript_160F33:: @ 8160F33 +VictoryRoad_1F_EventScript_FloorSwitch:: @ 8160F33 lockall compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 - goto_if_eq EventScript_160F62 - setmetatile 12, 14, 721, 0 - setmetatile 12, 15, 737, 0 + goto_if_eq VictoryRoad_1F_EventScript_FloorSwitchAlreadyPressed + setmetatile 12, 14, METATILE_Cave_Floor_Ledge_Top, 0 + setmetatile 12, 15, METATILE_Cave_Floor_Ledge_Bottom, 0 playse SE_RU_GASYAN special DrawWholeMapView waitse @@ -31,16 +31,16 @@ VictoryRoad_1F_EventScript_160F33:: @ 8160F33 releaseall end -EventScript_160F62:: @ 8160F62 +VictoryRoad_1F_EventScript_FloorSwitchAlreadyPressed:: @ 8160F62 releaseall end -VictoryRoad_1F_EventScript_160F64:: @ 8160F64 - trainerbattle_single TRAINER_COOLTRAINER_NAOMI, Text_174710, Text_174738 - msgbox gUnknown_8174744, MSGBOX_AUTOCLOSE +VictoryRoad_1F_EventScript_Naomi:: @ 8160F64 + trainerbattle_single TRAINER_COOLTRAINER_NAOMI, VictoryRoad_1F_Text_NaomiIntro, VictoryRoad_1F_Text_NaomiDefeat + msgbox VictoryRoad_1F_Text_NaomiPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_1F_EventScript_160F7B:: @ 8160F7B - trainerbattle_single TRAINER_COOLTRAINER_ROLANDO, Text_174784, Text_1747B8 - msgbox gUnknown_81747C8, MSGBOX_AUTOCLOSE +VictoryRoad_1F_EventScript_Rolando:: @ 8160F7B + trainerbattle_single TRAINER_COOLTRAINER_ROLANDO, VictoryRoad_1F_Text_RolandoIntro, VictoryRoad_1F_Text_RolandoDefeat + msgbox VictoryRoad_1F_Text_RolandoPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/VictoryRoad_1F/text.inc b/data/maps/VictoryRoad_1F/text.inc index 46cd136ad..d83abf202 100644 --- a/data/maps/VictoryRoad_1F/text.inc +++ b/data/maps/VictoryRoad_1F/text.inc @@ -1,22 +1,22 @@ -Text_174710:: @ 8174710 +VictoryRoad_1F_Text_NaomiIntro:: @ 8174710 .string "I wonder if you are good enough\n" .string "for me?$" -Text_174738:: @ 8174738 +VictoryRoad_1F_Text_NaomiDefeat:: @ 8174738 .string "I lost out…$" -gUnknown_8174744:: @ 8174744 +VictoryRoad_1F_Text_NaomiPostBattle:: @ 8174744 .string "I never wanted to lose to anybody,\n" .string "especially to a younger kid…$" -Text_174784:: @ 8174784 +VictoryRoad_1F_Text_RolandoIntro:: @ 8174784 .string "I can see you're good.\n" .string "Let me see exactly how good!$" -Text_1747B8:: @ 81747B8 +VictoryRoad_1F_Text_RolandoDefeat:: @ 81747B8 .string "I had a chance…$" -gUnknown_81747C8:: @ 81747C8 +VictoryRoad_1F_Text_RolandoPostBattle:: @ 81747C8 .string "Tch!\n" .string "I concede, you are better than I!$" diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index bb44ea7d0..33024c025 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "VictoryRoad_2F_EventScript_161037", + "script": "VictoryRoad_2F_EventScript_Dawson", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "VictoryRoad_2F_EventScript_16104E", + "script": "VictoryRoad_2F_EventScript_Daisuke", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "VictoryRoad_2F_EventScript_161065", + "script": "VictoryRoad_2F_EventScript_Nelson", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 4, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "VictoryRoad_2F_EventScript_161093", + "script": "VictoryRoad_2F_EventScript_Vincent", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "VictoryRoad_2F_EventScript_16107C", + "script": "VictoryRoad_2F_EventScript_Gregory", "flag": "0" }, { @@ -256,7 +256,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1", "var_value": 99, - "script": "VictoryRoad_2F_EventScript_160FD5" + "script": "VictoryRoad_2F_EventScript_FloorSwitch1" }, { "type": "trigger", @@ -265,7 +265,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2", "var_value": 99, - "script": "VictoryRoad_2F_EventScript_161006" + "script": "VictoryRoad_2F_EventScript_FloorSwitch2" } ], "bg_events": [] diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index 49d21b7de..1dfd658ae 100644 --- a/data/maps/VictoryRoad_2F/scripts.inc +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -4,27 +4,27 @@ VictoryRoad_2F_MapScripts:: @ 8160F92 VictoryRoad_2F_OnLoad:: @ 8160F98 compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 - call_if_ne EventScript_160FAF + call_if_ne VictoryRoad_2F_EventScript_SetRockBarrier1 compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 - call_if_ne EventScript_160FC2 + call_if_ne VictoryRoad_2F_EventScript_SetRockBarrier2 end -EventScript_160FAF:: @ 8160FAF - setmetatile 13, 10, 775, 1 - setmetatile 13, 11, 791, 1 +VictoryRoad_2F_EventScript_SetRockBarrier1:: @ 8160FAF + setmetatile 13, 10, METATILE_Cave_RockBarrier_Top, 1 + setmetatile 13, 11, METATILE_Cave_RockBarrier_Bottom, 1 return -EventScript_160FC2:: @ 8160FC2 - setmetatile 33, 16, 775, 1 - setmetatile 33, 17, 791, 1 +VictoryRoad_2F_EventScript_SetRockBarrier2:: @ 8160FC2 + setmetatile 33, 16, METATILE_Cave_RockBarrier_Top, 1 + setmetatile 33, 17, METATILE_Cave_RockBarrier_Bottom, 1 return -VictoryRoad_2F_EventScript_160FD5:: @ 8160FD5 +VictoryRoad_2F_EventScript_FloorSwitch1:: @ 8160FD5 lockall compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 - goto_if_eq EventScript_161004 - setmetatile 13, 10, 721, 0 - setmetatile 13, 11, 737, 0 + goto_if_eq VictoryRoad_2F_EventScript_FloorSwitch1AlreadyPressed + setmetatile 13, 10, METATILE_Cave_Floor_Ledge_Top, 0 + setmetatile 13, 11, METATILE_Cave_Floor_Ledge_Bottom, 0 playse SE_RU_GASYAN special DrawWholeMapView waitse @@ -33,16 +33,16 @@ VictoryRoad_2F_EventScript_160FD5:: @ 8160FD5 releaseall end -EventScript_161004:: @ 8161004 +VictoryRoad_2F_EventScript_FloorSwitch1AlreadyPressed:: @ 8161004 releaseall end -VictoryRoad_2F_EventScript_161006:: @ 8161006 +VictoryRoad_2F_EventScript_FloorSwitch2:: @ 8161006 lockall compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 - goto_if_eq EventScript_161035 - setmetatile 33, 16, 721, 0 - setmetatile 33, 17, 737, 0 + goto_if_eq VictoryRoad_2F_EventScript_FloorSwitch2AlreadyPressed + setmetatile 33, 16, METATILE_Cave_Floor_Ledge_Top, 0 + setmetatile 33, 17, METATILE_Cave_Floor_Ledge_Bottom, 0 playse SE_RU_GASYAN special DrawWholeMapView waitse @@ -51,31 +51,31 @@ VictoryRoad_2F_EventScript_161006:: @ 8161006 releaseall end -EventScript_161035:: @ 8161035 +VictoryRoad_2F_EventScript_FloorSwitch2AlreadyPressed:: @ 8161035 releaseall end -VictoryRoad_2F_EventScript_161037:: @ 8161037 - trainerbattle_single TRAINER_POKEMANIAC_DAWSON, Text_1747EF, Text_17482C - msgbox gUnknown_817483E, MSGBOX_AUTOCLOSE +VictoryRoad_2F_EventScript_Dawson:: @ 8161037 + trainerbattle_single TRAINER_POKEMANIAC_DAWSON, VictoryRoad_2F_Text_DawsonIntro, VictoryRoad_2F_Text_DawsonDefeat + msgbox VictoryRoad_2F_Text_DawsonPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_2F_EventScript_16104E:: @ 816104E - trainerbattle_single TRAINER_BLACK_BELT_DAISUKE, Text_174877, Text_1748B4 - msgbox gUnknown_81748BB, MSGBOX_AUTOCLOSE +VictoryRoad_2F_EventScript_Daisuke:: @ 816104E + trainerbattle_single TRAINER_BLACK_BELT_DAISUKE, VictoryRoad_2F_Text_DaisukeIntro, VictoryRoad_2F_Text_DaisukeDefeat + msgbox VictoryRoad_2F_Text_DaisukePostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_2F_EventScript_161065:: @ 8161065 - trainerbattle_single TRAINER_JUGGLER_NELSON, Text_1748EE, Text_17491B - msgbox gUnknown_8174927, MSGBOX_AUTOCLOSE +VictoryRoad_2F_EventScript_Nelson:: @ 8161065 + trainerbattle_single TRAINER_JUGGLER_NELSON, VictoryRoad_2F_Text_NelsonIntro, VictoryRoad_2F_Text_NelsonDefeat + msgbox VictoryRoad_2F_Text_NelsonPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_2F_EventScript_16107C:: @ 816107C - trainerbattle_single TRAINER_JUGGLER_GREGORY, Text_174995, Text_1749B0 - msgbox gUnknown_81749BB, MSGBOX_AUTOCLOSE +VictoryRoad_2F_EventScript_Gregory:: @ 816107C + trainerbattle_single TRAINER_JUGGLER_GREGORY, VictoryRoad_2F_Text_GregoryIntro, VictoryRoad_2F_Text_GregoryDefeat + msgbox VictoryRoad_2F_Text_GregoryPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_2F_EventScript_161093:: @ 8161093 - trainerbattle_single TRAINER_TAMER_VINCENT, Text_174942, Text_17495A - msgbox gUnknown_8174969, MSGBOX_AUTOCLOSE +VictoryRoad_2F_EventScript_Vincent:: @ 8161093 + trainerbattle_single TRAINER_TAMER_VINCENT, VictoryRoad_2F_Text_VincentIntro, VictoryRoad_2F_Text_VincentDefeat + msgbox VictoryRoad_2F_Text_VincentPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/VictoryRoad_2F/text.inc b/data/maps/VictoryRoad_2F/text.inc index d125ef160..301a5f22b 100644 --- a/data/maps/VictoryRoad_2F/text.inc +++ b/data/maps/VictoryRoad_2F/text.inc @@ -1,54 +1,58 @@ -Text_1747EF:: @ 81747EF +VictoryRoad_2F_Text_DawsonIntro:: @ 81747EF .string "If you can get through here,\n" .string "you can go meet the ELITE FOUR.$" -Text_17482C:: @ 817482C +VictoryRoad_2F_Text_DawsonDefeat:: @ 817482C .string "No!\n" .string "Unbelievable!$" -gUnknown_817483E:: @ 817483E +VictoryRoad_2F_Text_DawsonPostBattle:: @ 817483E .string "I can beat you when it comes to\n" .string "knowledge about POKéMON!$" -Text_174877:: @ 8174877 +VictoryRoad_2F_Text_DaisukeIntro:: @ 8174877 .string "This here is VICTORY ROAD.\n" .string "It's the final test for TRAINERS!$" -Text_1748B4:: @ 81748B4 +VictoryRoad_2F_Text_DaisukeDefeat:: @ 81748B4 .string "Atcho!$" -gUnknown_81748BB:: @ 81748BB +VictoryRoad_2F_Text_DaisukePostBattle:: @ 81748BB .string "If you get stuck, try moving some\n" .string "boulders around.$" -Text_1748EE:: @ 81748EE +VictoryRoad_2F_Text_NelsonIntro:: @ 81748EE .string "Ah, so you wish to challenge the\n" .string "ELITE FOUR?$" -Text_17491B:: @ 817491B +VictoryRoad_2F_Text_NelsonDefeat:: @ 817491B .string "You got me!$" -gUnknown_8174927:: @ 8174927 +VictoryRoad_2F_Text_NelsonPostBattle:: @ 8174927 .string "{RIVAL} also came through here.$" -Text_174942:: @ 8174942 +VictoryRoad_2F_Text_VincentIntro:: @ 8174942 .string "Come on!\n" .string "I'll whip you!$" -Text_17495A:: @ 817495A +VictoryRoad_2F_Text_VincentDefeat:: @ 817495A .string "I got whipped!$" -gUnknown_8174969:: @ 8174969 +VictoryRoad_2F_Text_VincentPostBattle:: @ 8174969 .string "You earned the right to be on\n" .string "VICTORY ROAD…$" -Text_174995:: @ 8174995 +VictoryRoad_2F_Text_GregoryIntro:: @ 8174995 .string "Is VICTORY ROAD too tough?$" -Text_1749B0:: @ 81749B0 +VictoryRoad_2F_Text_GregoryDefeat:: @ 81749B0 .string "Well done!$" -gUnknown_81749BB:: @ 81749BB +VictoryRoad_2F_Text_GregoryPostBattle:: @ 81749BB .string "Many TRAINERS give up their\n" .string "challenge here and go home.$" +@ Unused, old text for Moltres +VictoryRoad_2F_Text_Gyaoo:: @ 81749F3 + .string "ギヤーオ！$" + diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index 9d2b982a9..ffde167e7 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "VictoryRoad_3F_EventScript_161103", + "script": "VictoryRoad_3F_EventScript_George", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "VictoryRoad_3F_EventScript_161148", + "script": "VictoryRoad_3F_EventScript_Alexa", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "VictoryRoad_3F_EventScript_16111A", + "script": "VictoryRoad_3F_EventScript_Colby", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "VictoryRoad_3F_EventScript_161131", + "script": "VictoryRoad_3F_EventScript_Caroline", "flag": "0" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "VictoryRoad_3F_EventScript_16115F", + "script": "VictoryRoad_3F_EventScript_Ray", "flag": "0" }, { @@ -166,7 +166,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "VictoryRoad_3F_EventScript_16117A", + "script": "VictoryRoad_3F_EventScript_Tyra", "flag": "0" } ], @@ -215,7 +215,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_VICTORY_ROAD_3F", "var_value": 99, - "script": "VictoryRoad_3F_EventScript_1610CF" + "script": "VictoryRoad_3F_EventScript_FloorSwitch" } ], "bg_events": [] diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index 4cd011f92..f601d83be 100644 --- a/data/maps/VictoryRoad_3F/scripts.inc +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -4,20 +4,20 @@ VictoryRoad_3F_MapScripts:: @ 81610AA VictoryRoad_3F_OnLoad:: @ 81610B0 compare VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 - call_if_ne EventScript_1610BC + call_if_ne VictoryRoad_3F_EventScript_SetRockBarrier end -EventScript_1610BC:: @ 81610BC - setmetatile 12, 12, 775, 1 - setmetatile 12, 13, 791, 1 +VictoryRoad_3F_EventScript_SetRockBarrier:: @ 81610BC + setmetatile 12, 12, METATILE_Cave_RockBarrier_Top, 1 + setmetatile 12, 13, METATILE_Cave_RockBarrier_Bottom, 1 return -VictoryRoad_3F_EventScript_1610CF:: @ 81610CF +VictoryRoad_3F_EventScript_FloorSwitch:: @ 81610CF lockall compare VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 - goto_if_eq EventScript_161101 - setmetatile 12, 12, 721, 0 - setmetatile 12, 13, 737, 0 + goto_if_eq VictoryRoad_3F_EventScript_FloorSwitchAlreadyPressed + setmetatile 12, 12, METATILE_Cave_Floor_Ledge_Top, 0 + setmetatile 12, 13, METATILE_Cave_Floor_Ledge_Bottom, 0 playse SE_RU_GASYAN special DrawWholeMapView waitse @@ -27,36 +27,36 @@ VictoryRoad_3F_EventScript_1610CF:: @ 81610CF releaseall end -EventScript_161101:: @ 8161101 +VictoryRoad_3F_EventScript_FloorSwitchAlreadyPressed:: @ 8161101 releaseall end -VictoryRoad_3F_EventScript_161103:: @ 8161103 - trainerbattle_single TRAINER_COOLTRAINER_GEORGE, Text_174B60, Text_174B83 - msgbox gUnknown_8174B99, MSGBOX_AUTOCLOSE +VictoryRoad_3F_EventScript_George:: @ 8161103 + trainerbattle_single TRAINER_COOLTRAINER_GEORGE, VictoryRoad_3F_Text_GeorgeIntro, VictoryRoad_3F_Text_GeorgeDefeat + msgbox VictoryRoad_3F_Text_GeorgePostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_3F_EventScript_16111A:: @ 816111A - trainerbattle_single TRAINER_COOLTRAINER_COLBY, Text_174C8A, Text_174CA9 - msgbox gUnknown_8174CBD, MSGBOX_AUTOCLOSE +VictoryRoad_3F_EventScript_Colby:: @ 816111A + trainerbattle_single TRAINER_COOLTRAINER_COLBY, VictoryRoad_3F_Text_ColbyIntro, VictoryRoad_3F_Text_ColbyDefeat + msgbox VictoryRoad_3F_Text_ColbyPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_3F_EventScript_161131:: @ 8161131 - trainerbattle_single TRAINER_COOLTRAINER_CAROLINE, Text_174C30, Text_174C5A - msgbox gUnknown_8174C67, MSGBOX_AUTOCLOSE +VictoryRoad_3F_EventScript_Caroline:: @ 8161131 + trainerbattle_single TRAINER_COOLTRAINER_CAROLINE, VictoryRoad_3F_Text_CarolineIntro, VictoryRoad_3F_Text_CarolineDefeat + msgbox VictoryRoad_3F_Text_CarolinePostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_3F_EventScript_161148:: @ 8161148 - trainerbattle_single TRAINER_COOLTRAINER_ALEXA, Text_174BCA, Text_174BF4 - msgbox gUnknown_8174C03, MSGBOX_AUTOCLOSE +VictoryRoad_3F_EventScript_Alexa:: @ 8161148 + trainerbattle_single TRAINER_COOLTRAINER_ALEXA, VictoryRoad_3F_Text_AlexaIntro, VictoryRoad_3F_Text_AlexaDefeat + msgbox VictoryRoad_3F_Text_AlexaPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_3F_EventScript_16115F:: @ 816115F - trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, Text_174D0C, Text_174D45, Text_174D96 - msgbox gUnknown_8174D64, MSGBOX_AUTOCLOSE +VictoryRoad_3F_EventScript_Ray:: @ 816115F + trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, VictoryRoad_3F_Text_RayIntro, VictoryRoad_3F_Text_RayDefeat, VictoryRoad_3F_Text_RayNotEnoughMons + msgbox VictoryRoad_3F_Text_RayPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_3F_EventScript_16117A:: @ 816117A - trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, Text_174E08, Text_174E39, Text_174E8D - msgbox gUnknown_8174E48, MSGBOX_AUTOCLOSE +VictoryRoad_3F_EventScript_Tyra:: @ 816117A + trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, VictoryRoad_3F_Text_TyraIntro, VictoryRoad_3F_Text_TyraDefeat, VictoryRoad_3F_Text_TyraNotEnoughMons + msgbox VictoryRoad_3F_Text_TyraPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/VictoryRoad_3F/text.inc b/data/maps/VictoryRoad_3F/text.inc index 22c42342a..dd60180df 100644 --- a/data/maps/VictoryRoad_3F/text.inc +++ b/data/maps/VictoryRoad_3F/text.inc @@ -1,6 +1,3 @@ -Text_1749F3:: @ 81749F3 - .string "ギヤーオ！$" - Text_DoubleEdgeTeach:: @ 81749F9 .string "You should be proud of yourself,\n" .string "having battled your way through\l" @@ -24,80 +21,80 @@ Text_DoubleEdgeTaught:: @ 8174B0C .string "Take a run at them and knock 'em\n" .string "out!$" -Text_174B60:: @ 8174B60 +VictoryRoad_3F_Text_GeorgeIntro:: @ 8174B60 .string "I heard rumors of a child prodigy.$" -Text_174B83:: @ 8174B83 +VictoryRoad_3F_Text_GeorgeDefeat:: @ 8174B83 .string "The rumors were true!$" -gUnknown_8174B99:: @ 8174B99 +VictoryRoad_3F_Text_GeorgePostBattle:: @ 8174B99 .string "So, it was you who beat GIOVANNI\n" .string "of TEAM ROCKET?$" -Text_174BCA:: @ 8174BCA +VictoryRoad_3F_Text_AlexaIntro:: @ 8174BCA .string "TRAINERS live to seek stronger\n" .string "opponents.$" -Text_174BF4:: @ 8174BF4 +VictoryRoad_3F_Text_AlexaDefeat:: @ 8174BF4 .string "Oh!\n" .string "So strong!$" -gUnknown_8174C03:: @ 8174C03 +VictoryRoad_3F_Text_AlexaPostBattle:: @ 8174C03 .string "By fighting tough battles, you get\n" .string "stronger.$" -Text_174C30:: @ 8174C30 +VictoryRoad_3F_Text_CarolineIntro:: @ 8174C30 .string "I'll show you just how good you\n" .string "are. Not!$" -Text_174C5A:: @ 8174C5A +VictoryRoad_3F_Text_CarolineDefeat:: @ 8174C5A .string "I'm furious!$" -gUnknown_8174C67:: @ 8174C67 +VictoryRoad_3F_Text_CarolinePostBattle:: @ 8174C67 .string "You showed me just how good\n" .string "I was…$" -Text_174C8A:: @ 8174C8A +VictoryRoad_3F_Text_ColbyIntro:: @ 8174C8A .string "Only the chosen can pass here!$" -Text_174CA9:: @ 8174CA9 +VictoryRoad_3F_Text_ColbyDefeat:: @ 8174CA9 .string "I don't believe it!$" -gUnknown_8174CBD:: @ 8174CBD +VictoryRoad_3F_Text_ColbyPostBattle:: @ 8174CBD .string "All TRAINERS here are headed to\n" .string "the POKéMON LEAGUE.\p" .string "Don't let down your guard.$" -Text_174D0C:: @ 8174D0C +VictoryRoad_3F_Text_RayIntro:: @ 8174D0C .string "RAY: Together, the two of us are\n" .string "destined for greatness!$" -Text_174D45:: @ 8174D45 +VictoryRoad_3F_Text_RayDefeat:: @ 8174D45 .string "RAY: Ludicrous!\n" .string "This can't be!$" -gUnknown_8174D64:: @ 8174D64 +VictoryRoad_3F_Text_RayPostBattle:: @ 8174D64 .string "RAY: You've beaten us.\n" .string "Greatness remains elusive…$" -Text_174D96:: @ 8174D96 +VictoryRoad_3F_Text_RayNotEnoughMons:: @ 8174D96 .string "RAY: Together, the two of us are\n" .string "striving for the pinnacle.\p" .string "We need you to bring two POKéMON\n" .string "into battle with us.$" -Text_174E08:: @ 8174E08 +VictoryRoad_3F_Text_TyraIntro:: @ 8174E08 .string "TYRA: We're trying to become\n" .string "champions together.$" -Text_174E39:: @ 8174E39 +VictoryRoad_3F_Text_TyraDefeat:: @ 8174E39 .string "TYRA: Oh, but…$" -gUnknown_8174E48:: @ 8174E48 +VictoryRoad_3F_Text_TyraPostBattle:: @ 8174E48 .string "TYRA: You've taught me that power\n" .string "can be infinite in shape and form.$" -Text_174E8D:: @ 8174E8D +VictoryRoad_3F_Text_TyraNotEnoughMons:: @ 8174E8D .string "TYRA: You can't battle with us if\n" .string "you have only one POKéMON.$" -- cgit v1.2.3 From 0ddd7ebb1d15a8dc03baaa7c581096eb295ac352 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 28 Jan 2020 14:26:18 -0500 Subject: Sync STEB_CB, WEATHER_SHADE --- data/maps/NavelRock_Summit/map.json | 2 +- data/maps/PokemonMansion_1F/map.json | 2 +- data/maps/PokemonMansion_2F/map.json | 2 +- data/maps/PokemonMansion_3F/map.json | 2 +- data/maps/PokemonMansion_B1F/map.json | 2 +- data/maps/ViridianForest/map.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'data') diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index 91981c25d..ef624c9c0 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -5,7 +5,7 @@ "music": "MUS_NANADUNGEON", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_4", "unknown_18": 0, "unknown_19": 6, diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json index 652ffd20b..6ea519092 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -5,7 +5,7 @@ "music": "MUS_POKEYASHI", "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 7, diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json index bc8f10848..a3a9c556e 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -5,7 +5,7 @@ "music": "MUS_POKEYASHI", "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 7, diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index 1e4af29e2..9c0423004 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -5,7 +5,7 @@ "music": "MUS_POKEYASHI", "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 7, diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index 458740163..eea10cb2c 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -5,7 +5,7 @@ "music": "MUS_POKEYASHI", "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 7, diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index 463bc53f5..97f28ced9 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -5,7 +5,7 @@ "music": "MUS_T_MORI", "region_map_section": "MAPSEC_VIRIDIAN_FOREST", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 7, -- cgit v1.2.3 From 30f01c7df68bb9cf80ece491a457c8ce96c52c83 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 28 Jan 2020 14:26:34 -0500 Subject: Document Sevii Island caves --- data/event_scripts.s | 7 +- .../ThreeIsland_DunsparceTunnel_DugOut/border.bin | 1 + .../ThreeIsland_DunsparceTunnel_DugOut/map.bin | 1 + data/layouts/UnusedLayout_83453C0/border.bin | 1 - data/layouts/UnusedLayout_83453C0/map.bin | 1 - data/layouts/layouts.json | 8 +- data/maps/FourIsland_IcefallCave_1F/scripts.inc | 10 +- data/maps/FourIsland_IcefallCave_Back/map.json | 8 +- data/maps/FourIsland_IcefallCave_Back/scripts.inc | 107 +++-- data/maps/FourIsland_IcefallCave_Back/text.inc | 20 +- data/maps/PalletTown_PlayersHouse_1F/text.inc | 62 --- data/maps/SevenIsland_SevaultCanyon/text.inc | 8 + .../SevenIsland_SevaultCanyon_TanobyKey/map.json | 14 +- .../scripts.inc | 92 ++-- .../SevenIsland_SevaultCanyon_TanobyKey/text.inc | 2 +- data/maps/SevenIsland_TanobyRuins/map.json | 8 +- data/maps/SevenIsland_TanobyRuins/text.inc | 52 ++ .../scripts.inc | 2 +- .../scripts.inc | 2 +- .../scripts.inc | 2 +- .../scripts.inc | 2 +- .../scripts.inc | 2 +- .../scripts.inc | 2 +- .../scripts.inc | 2 +- data/maps/SixIsland_DottedHole_1F/scripts.inc | 8 +- data/maps/SixIsland_DottedHole_B1F/map.json | 2 +- data/maps/SixIsland_DottedHole_B2F/map.json | 2 +- data/maps/SixIsland_DottedHole_B3F/map.json | 2 +- data/maps/SixIsland_DottedHole_B4F/map.json | 2 +- .../SixIsland_DottedHole_SapphireRoom/map.json | 4 +- .../SixIsland_DottedHole_SapphireRoom/scripts.inc | 146 +++--- .../SixIsland_DottedHole_SapphireRoom/text.inc | 6 +- data/maps/ThreeIsland_BerryForest/map.json | 2 +- data/maps/ThreeIsland_DunsparceTunnel/map.json | 2 +- data/maps/ThreeIsland_DunsparceTunnel/scripts.inc | 38 +- data/maps/ThreeIsland_DunsparceTunnel/text.inc | 8 +- data/scripts/trainers.inc | 524 ++++++++++----------- data/text/trainers.inc | 8 +- 38 files changed, 591 insertions(+), 579 deletions(-) create mode 100644 data/layouts/ThreeIsland_DunsparceTunnel_DugOut/border.bin create mode 100644 data/layouts/ThreeIsland_DunsparceTunnel_DugOut/map.bin delete mode 100644 data/layouts/UnusedLayout_83453C0/border.bin delete mode 100644 data/layouts/UnusedLayout_83453C0/map.bin create mode 100644 data/maps/SevenIsland_TanobyRuins/text.inc (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index e28093686..0e9c4d6f3 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -25,7 +25,9 @@ #include "constants/battle_setup.h" #include "constants/map_scripts.h" #include "constants/cable_club.h" +#include "constants/field_tasks.h" #include "constants/field_weather.h" +#include "constants/weather.h" #include "constants/union_room.h" #include "constants/trade.h" #include "constants/quest_log.h" @@ -658,6 +660,7 @@ gStdScriptsEnd:: .include "data/maps/SevenIsland_TrainerTower/text.inc" .include "data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc" .include "data/maps/SevenIsland_SevaultCanyon/text.inc" + .include "data/maps/SevenIsland_TanobyRuins/text.inc" .include "data/maps/PalletTown_PlayersHouse_1F/text.inc" .include "data/maps/PalletTown_PlayersHouse_2F/text.inc" .include "data/maps/PalletTown_GarysHouse/text.inc" @@ -1648,9 +1651,9 @@ EventScript_1A8EC0:: @ 81A8EC0 .include "data/scripts/seagallop.inc" .include "data/scripts/static_pokemon.inc" -EventScript_1A925E:: @ 81A925E +EventScript_TryDarkenRuins:: @ 81A925E goto_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, EventScript_Return - setweather 11 + setweather WEATHER_SHADE doweather return diff --git a/data/layouts/ThreeIsland_DunsparceTunnel_DugOut/border.bin b/data/layouts/ThreeIsland_DunsparceTunnel_DugOut/border.bin new file mode 100644 index 000000000..a021ddd4e --- /dev/null +++ b/data/layouts/ThreeIsland_DunsparceTunnel_DugOut/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/ThreeIsland_DunsparceTunnel_DugOut/map.bin b/data/layouts/ThreeIsland_DunsparceTunnel_DugOut/map.bin new file mode 100644 index 000000000..ffc668ba5 --- /dev/null +++ b/data/layouts/ThreeIsland_DunsparceTunnel_DugOut/map.bin @@ -0,0 +1 @@ +2222222 2222222222222222222222222 222222 2222 \ No newline at end of file diff --git a/data/layouts/UnusedLayout_83453C0/border.bin b/data/layouts/UnusedLayout_83453C0/border.bin deleted file mode 100644 index a021ddd4e..000000000 --- a/data/layouts/UnusedLayout_83453C0/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/UnusedLayout_83453C0/map.bin b/data/layouts/UnusedLayout_83453C0/map.bin deleted file mode 100644 index ffc668ba5..000000000 --- a/data/layouts/UnusedLayout_83453C0/map.bin +++ /dev/null @@ -1 +0,0 @@ -2222222 2222222222222222222222222 222222 2222 \ No newline at end of file diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index 63fc06562..f08efe5c7 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -3620,16 +3620,16 @@ "blockdata_filepath": "data/layouts/ThreeIsland_DunsparceTunnel/map.bin" }, { - "id": "LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_2", - "name": "UnusedLayout_83453C0_Layout", + "id": "LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_DUG_OUT", + "name": "ThreeIsland_DunsparceTunnel_DugOut_Layout", "width": 30, "height": 7, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4A94", "secondary_tileset": "gTileset_82D4BFC", - "border_filepath": "data/layouts/UnusedLayout_83453C0/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_83453C0/map.bin" + "border_filepath": "data/layouts/ThreeIsland_DunsparceTunnel_DugOut/border.bin", + "blockdata_filepath": "data/layouts/ThreeIsland_DunsparceTunnel_DugOut/map.bin" }, { "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ENTRANCE", diff --git a/data/maps/FourIsland_IcefallCave_1F/scripts.inc b/data/maps/FourIsland_IcefallCave_1F/scripts.inc index c3e3eaff2..c976122a7 100644 --- a/data/maps/FourIsland_IcefallCave_1F/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_1F/scripts.inc @@ -5,7 +5,7 @@ FourIsland_IcefallCave_1F_MapScripts:: @ 8163D44 .byte 0 FourIsland_IcefallCave_1F_OnResume:: @ 8163D54 - setstepcallback 4 + setstepcallback STEP_CB_ICE end FourIsland_IcefallCave_1F_OnLoad:: @ 8163D57 @@ -13,13 +13,13 @@ FourIsland_IcefallCave_1F_OnLoad:: @ 8163D57 end FourIsland_IcefallCave_1F_OnFrame:: @ 8163D5B - map_script_2 VAR_TEMP_1, 1, EventScript_163D65 + map_script_2 VAR_TEMP_1, 1, FourIsland_IcefallCave_1F_EventScript_FallDownHole .2byte 0 -EventScript_163D65:: @ 8163D65 +FourIsland_IcefallCave_1F_EventScript_FallDownHole:: @ 8163D65 lockall delay 20 - applymovement OBJ_EVENT_ID_PLAYER, Movement_163D7F + applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_1F_Movement_SetInvisible waitmovement 0 playse SE_RU_HYUU delay 60 @@ -28,6 +28,6 @@ EventScript_163D65:: @ 8163D65 releaseall end -Movement_163D7F:: @ 8163D7F +FourIsland_IcefallCave_1F_Movement_SetInvisible:: @ 8163D7F set_invisible step_end diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json index 9af9a6faf..32ca627ba 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_IcefallCave_Back_EventScript_163F25", + "script": "FourIsland_IcefallCave_Back_EventScript_Lorelei", "flag": "FLAG_HIDE_ICEFALL_CAVE_LORELEI" }, { @@ -83,7 +83,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ICEFALL_CAVE_BACK", "var_value": 0, - "script": "FourIsland_IcefallCave_Back_EventScript_163D98" + "script": "FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene" }, { "type": "trigger", @@ -92,7 +92,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ICEFALL_CAVE_BACK", "var_value": 0, - "script": "FourIsland_IcefallCave_Back_EventScript_163D98" + "script": "FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene" }, { "type": "trigger", @@ -101,7 +101,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ICEFALL_CAVE_BACK", "var_value": 0, - "script": "FourIsland_IcefallCave_Back_EventScript_163D98" + "script": "FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene" } ], "bg_events": [] diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index 39eb3f0b4..a0a94d4be 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -1,100 +1,105 @@ +.equ LOCALID_ROCKET1, 1 +.equ LOCALID_ROCKET2, 2 +.equ LOCALID_LORELEI, 3 +.equ LOCALID_ROCKET3, 4 + FourIsland_IcefallCave_Back_MapScripts:: @ 8163D82 map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_IcefallCave_Back_OnTransition .byte 0 FourIsland_IcefallCave_Back_OnTransition:: @ 8163D88 compare VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1 - call_if_eq EventScript_163D94 + call_if_eq FourIsland_IcefallCave_Back_EventScript_HideLorelei end -EventScript_163D94:: @ 8163D94 +FourIsland_IcefallCave_Back_EventScript_HideLorelei:: @ 8163D94 setflag FLAG_HIDE_ICEFALL_CAVE_LORELEI return -FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 +FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene:: @ 8163D98 lockall textcolor 1 - msgbox gUnknown_817B04F - applymovement 1, Movement_163EE8 + msgbox FourIsland_IcefallCave_Back_Text_LoreleiKeepHandsOffMons + applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown waitmovement 0 textcolor 0 - msgbox gUnknown_817B0B9 + msgbox FourIsland_IcefallCave_Back_Text_ShutItLadyLeaveUsBe closemessage playse SE_PIN - applymovement 3, Movement_ExclamationMark + applymovement LOCALID_LORELEI, Movement_ExclamationMark waitmovement 0 - applymovement 3, Movement_WalkInPlaceFastestDown + applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestDown waitmovement 0 - applymovement 3, Movement_Delay48 + applymovement LOCALID_LORELEI, Movement_Delay48 waitmovement 0 textcolor 1 - msgbox gUnknown_817B109 + msgbox FourIsland_IcefallCave_Back_Text_LoreleiPlayerHelpMeKickPoachersOut closemessage - applymovement 3, Movement_WalkInPlaceFastestRight + applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestRight waitmovement 0 delay 18 - applymovement 3, Movement_WalkInPlaceFastestDown + applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestDown waitmovement 0 delay 35 - applymovement 4, Movement_163F11 - applymovement 3, Movement_163F18 - applymovement OBJ_EVENT_ID_PLAYER, Movement_163EDD + applymovement LOCALID_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei + applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiToRockets + applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_Back_Movement_PlayerToRockets waitmovement 0 - applymovement 2, Movement_163EE8 + applymovement LOCALID_ROCKET2, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown waitmovement 0 playbgm MUS_ROCKET, 0 textcolor 0 - msgbox gUnknown_817B20B - setvar VAR_LAST_TALKED, 4 - trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_45, Text_17B251 - applymovement 3, Movement_163F1B + msgbox FourIsland_IcefallCave_Back_Text_GruntIntro + setvar VAR_LAST_TALKED, LOCALID_ROCKET3 + trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_45, FourIsland_IcefallCave_Back_Text_GruntDefeat + applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_WalkInPlaceUp waitmovement 0 textcolor 1 - msgbox gUnknown_817B269 + msgbox FourIsland_IcefallCave_Back_Text_LoreleiWhereHaveYouTakenMons textcolor 0 - msgbox gUnknown_817B2EF + msgbox FourIsland_IcefallCave_Back_Text_NotTellingYouThat textcolor 1 - message Text_17B313 + message FourIsland_IcefallCave_Back_Text_LoreleiWellDeepFreezeYou waitmessage waitse playmoncry SPECIES_LAPRAS, 2 waitbuttonpress waitmoncry - applymovement 1, Movement_163EEE + applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat waitmovement 0 textcolor 0 - msgbox gUnknown_817B399 + msgbox FourIsland_IcefallCave_Back_Text_OkayRocketWareHouseFiveIsland closemessage - applymovement 3, Movement_163F1D - applymovement OBJ_EVENT_ID_PLAYER, Movement_163EE2 - applymovement 1, Movement_163EF0 - applymovement 2, Movement_163EFA - applymovement 4, Movement_163F05 + applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit + applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit + applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1Exit + applymovement LOCALID_ROCKET2, FourIsland_IcefallCave_Back_Movement_Rocket2Exit + applymovement LOCALID_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3Exit waitmovement 0 - removeobject 1 - removeobject 2 - removeobject 4 + removeobject LOCALID_ROCKET1 + removeobject LOCALID_ROCKET2 + removeobject LOCALID_ROCKET3 delay 50 - applymovement 3, Movement_163F23 + applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 textcolor 1 - msgbox gUnknown_817B457 + msgbox FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful setflag FLAG_HIDE_RUIN_VALLEY_SCIENTIST clearflag FLAG_HIDE_LORELEI_IN_HER_HOUSE setvar VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1 releaseall end -Movement_163EDD:: @ 8163EDD +FourIsland_IcefallCave_Back_Movement_PlayerToRockets:: @ 8163EDD walk_up walk_up walk_right walk_up step_end -Movement_163EE2:: @ 8163EE2 +FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit:: @ 8163EE2 delay_16 walk_in_place_fastest_left delay_16 @@ -102,21 +107,21 @@ Movement_163EE2:: @ 8163EE2 walk_in_place_fastest_down step_end -Movement_163EE8:: @ 8163EE8 +FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown:: @ 8163EE8 walk_in_place_down step_end -gUnknown_163EEA:: @ 8163EEA +FourIsland_IcefallCave_Back_Movement_UnusedPushRight:: @ 8163EEA lock_facing_direction walk_right unlock_facing_direction step_end -Movement_163EEE:: @ 8163EEE +FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat:: @ 8163EEE walk_in_place_fast_down step_end -Movement_163EF0:: @ 8163EF0 +FourIsland_IcefallCave_Back_Movement_Rocket1Exit:: @ 8163EF0 walk_right walk_down walk_fast_down @@ -128,7 +133,7 @@ Movement_163EF0:: @ 8163EF0 walk_fast_down step_end -Movement_163EFA:: @ 8163EFA +FourIsland_IcefallCave_Back_Movement_Rocket2Exit:: @ 8163EFA delay_16 walk_left walk_down @@ -141,7 +146,7 @@ Movement_163EFA:: @ 8163EFA walk_fast_down step_end -Movement_163F05:: @ 8163F05 +FourIsland_IcefallCave_Back_Movement_Rocket3Exit:: @ 8163F05 delay_16 walk_down delay_16 @@ -155,27 +160,27 @@ Movement_163F05:: @ 8163F05 walk_fast_down step_end -Movement_163F11:: @ 8163F11 +FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei:: @ 8163F11 delay_16 delay_8 walk_in_place_fastest_right step_end -Movement_163F15:: @ 8163F15 +FourIsland_IcefallCave_Back_Movement_UnusedWalkLeft:: @ 8163F15 walk_left walk_left step_end -Movement_163F18:: @ 8163F18 +FourIsland_IcefallCave_Back_Movement_LoreleiToRockets:: @ 8163F18 walk_left walk_up step_end -Movement_163F1B:: @ 8163F1B +FourIsland_IcefallCave_Back_Movement_WalkInPlaceUp:: @ 8163F1B walk_in_place_up step_end -Movement_163F1D:: @ 8163F1D +FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit:: @ 8163F1D delay_8 walk_in_place_fastest_right delay_16 @@ -183,10 +188,10 @@ Movement_163F1D:: @ 8163F1D walk_in_place_fastest_down step_end -Movement_163F23:: @ 8163F23 +FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer:: @ 8163F23 walk_right step_end -FourIsland_IcefallCave_Back_EventScript_163F25:: @ 8163F25 - msgbox gUnknown_817B457, MSGBOX_NPC +FourIsland_IcefallCave_Back_EventScript_Lorelei:: @ 8163F25 + msgbox FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful, MSGBOX_NPC end diff --git a/data/maps/FourIsland_IcefallCave_Back/text.inc b/data/maps/FourIsland_IcefallCave_Back/text.inc index f65e95854..981041777 100644 --- a/data/maps/FourIsland_IcefallCave_Back/text.inc +++ b/data/maps/FourIsland_IcefallCave_Back/text.inc @@ -1,16 +1,16 @@ -gUnknown_817B04F:: @ 817B04F +FourIsland_IcefallCave_Back_Text_LoreleiKeepHandsOffMons:: @ 817B04F .string "LORELEI: Keep your filthy hands\n" .string "off the POKéMON in the cave!\p" .string "Do as I say, or you'll have me to\n" .string "answer to!$" -gUnknown_817B0B9:: @ 817B0B9 +FourIsland_IcefallCave_Back_Text_ShutItLadyLeaveUsBe:: @ 817B0B9 .string "Aww, shut it, lady, and leave\n" .string "us be.\p" .string "Don't let your glasses get all\n" .string "steamed up!$" -gUnknown_817B109:: @ 817B109 +FourIsland_IcefallCave_Back_Text_LoreleiPlayerHelpMeKickPoachersOut:: @ 817B109 .string "LORELEI: {PLAYER}?!\n" .string "What are you doing here?\p" .string "No, we can catch up later.\n" @@ -22,15 +22,15 @@ gUnknown_817B109:: @ 817B109 .string "Are you ready?\n" .string "You take that one, please!$" -gUnknown_817B20B:: @ 817B20B +FourIsland_IcefallCave_Back_Text_GruntIntro:: @ 817B20B .string "W-what?!\p" .string "Who says we can't do what we want\n" .string "with the POKéMON we catch?$" -Text_17B251:: @ 817B251 +FourIsland_IcefallCave_Back_Text_GruntDefeat:: @ 817B251 .string "We didn't plan on this!$" -gUnknown_817B269:: @ 817B269 +FourIsland_IcefallCave_Back_Text_LoreleiWhereHaveYouTakenMons:: @ 817B269 .string "LORELEI: Humph.\n" .string "So despicably weak.\p" .string "You!\n" @@ -40,11 +40,11 @@ gUnknown_817B269:: @ 817B269 .string "I'm smashing your ring once and\n" .string "for all!$" -gUnknown_817B2EF:: @ 817B2EF +FourIsland_IcefallCave_Back_Text_NotTellingYouThat:: @ 817B2EF .string "N-no way!\n" .string "I'm not telling you that!$" -Text_17B313:: @ 817B313 +FourIsland_IcefallCave_Back_Text_LoreleiWellDeepFreezeYou:: @ 817B313 .string "LORELEI: If you won't confess,\n" .string "we'll deep-freeze you.\p" .string "My LAPRAS is furious for what\n" @@ -52,7 +52,7 @@ Text_17B313:: @ 817B313 .string "Go, LAPRAS!\n" .string "ICE BEAM…$" -gUnknown_817B399:: @ 817B399 +FourIsland_IcefallCave_Back_Text_OkayRocketWareHouseFiveIsland:: @ 817B399 .string "Wawaah! Okay!\n" .string "I'll talk!\p" .string "The POKéMON are in the ROCKET\n" @@ -63,7 +63,7 @@ gUnknown_817B399:: @ 817B399 .string "into the ROCKET WAREHOUSE!\p" .string "Heheheheh!$" -gUnknown_817B457:: @ 817B457 +FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful:: @ 817B457 .string "{PLAYER}, thank you.\n" .string "But this is awful…\p" .string "I was born and raised here on\n" diff --git a/data/maps/PalletTown_PlayersHouse_1F/text.inc b/data/maps/PalletTown_PlayersHouse_1F/text.inc index faa31c9d1..ba40d1729 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/text.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/text.inc @@ -1,65 +1,3 @@ -Text_18CF4D:: @ 818CF4D - .string "Training by oneself is certainly\n" - .string "not a bad thing.\p" - .string "But it's also not bad to aim for\n" - .string "the top with a partner.\p" - .string "Even BRUNO…\n" - .string "He trained with a fellow by the\l" - .string "name of BRAWLY before.$" - -Text_18CFFB:: @ 818CFFB - .string "Do you know anything about this\n" - .string "stone chamber?$" - -Text_18D02A:: @ 818D02A - .string "That was uncalled for.\n" - .string "You didn't have to be so rough.$" - -Text_18D061:: @ 818D061 - .string "The TANOBY RUINS date back at\n" - .string "least 1,500 years.\p" - .string "But it's a baffling mystery as to\n" - .string "why it was built in the first place.$" - -Text_18D0D9:: @ 818D0D9 - .string "A mystic POKéMON is said to sleep\n" - .string "inside here.$" - -Text_18D108:: @ 818D108 - .string "I'm not much good in battle.$" - -Text_18D125:: @ 818D125 - .string "I hear there are other ruins like\n" - .string "the one here.\p" - .string "Might they be the resting places\n" - .string "of other mystic POKéMON?$" - -Text_18D18F:: @ 818D18F - .string "CLIFFORD is teaching me how to\n" - .string "paint.$" - -Text_18D1B5:: @ 818D1B5 - .string "We might get in trouble for being\n" - .string "noisy here.$" - -Text_18D1E3:: @ 818D1E3 - .string "I said that I wanted to paint an\n" - .string "old building.\p" - .string "So CLIFFORD brought me here.$" - -Text_18D22F:: @ 818D22F - .string "Today, in addition to our lesson,\n" - .string "we came to see the chamber.$" - -Text_18D26D:: @ 818D26D - .string "My, how extraordinary.$" - -Text_18D284:: @ 818D284 - .string "Ah, so you are studying POKéMON\n" - .string "on your own…\p" - .string "Yes, you certainly are quite the\n" - .string "extraordinary person, indeed.$" - gUnknown_818D2F0:: @ 818D2F0 .string "MOM: …Right.\n" .string "All boys leave home someday.\l" diff --git a/data/maps/SevenIsland_SevaultCanyon/text.inc b/data/maps/SevenIsland_SevaultCanyon/text.inc index 3d728797a..21c87dbc0 100644 --- a/data/maps/SevenIsland_SevaultCanyon/text.inc +++ b/data/maps/SevenIsland_SevaultCanyon/text.inc @@ -120,3 +120,11 @@ gUnknown_818CF2B:: @ 818CF2B .string "SEVAULT CANYON\n" .string "TANOBY RUINS AHEAD$" +Text_18CF4D:: @ 818CF4D + .string "Training by oneself is certainly\n" + .string "not a bad thing.\p" + .string "But it's also not bad to aim for\n" + .string "the top with a partner.\p" + .string "Even BRUNO…\n" + .string "He trained with a fellow by the\l" + .string "name of BRAWLY before.$" diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index b768509fb..6c16bf0c0 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -122,7 +122,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": 99, - "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch1" }, { "type": "trigger", @@ -131,7 +131,7 @@ "elevation": 3, "var": "VAR_TEMP_7", "var_value": 99, - "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch7" }, { "type": "trigger", @@ -140,7 +140,7 @@ "elevation": 3, "var": "VAR_TEMP_6", "var_value": 99, - "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch6" }, { "type": "trigger", @@ -149,7 +149,7 @@ "elevation": 3, "var": "VAR_TEMP_5", "var_value": 99, - "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch5" }, { "type": "trigger", @@ -158,7 +158,7 @@ "elevation": 3, "var": "VAR_TEMP_4", "var_value": 99, - "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch4" }, { "type": "trigger", @@ -167,7 +167,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": 99, - "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch3" }, { "type": "trigger", @@ -176,7 +176,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": 99, - "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch2" } ], "bg_events": [] diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc index 8758f8517..70ef487b8 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc @@ -1,10 +1,12 @@ +.equ NUM_SWITCHES_PRESSED, VAR_TEMP_8 + SevenIsland_SevaultCanyon_TanobyKey_MapScripts:: @ 8164DCC map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_SevaultCanyon_TanobyKey_OnTransition .byte 0 SevenIsland_SevaultCanyon_TanobyKey_OnTransition:: @ 8164DD2 setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY - call_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, EventScript_164E07 + call_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, SevenIsland_SevaultCanyon_TanobyKey_EventScript_MoveBouldersToSolvedPos setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 setvar VAR_TEMP_3, 0 @@ -12,10 +14,10 @@ SevenIsland_SevaultCanyon_TanobyKey_OnTransition:: @ 8164DD2 setvar VAR_TEMP_5, 0 setvar VAR_TEMP_6, 0 setvar VAR_TEMP_7, 0 - setvar VAR_TEMP_8, 0 + setvar NUM_SWITCHES_PRESSED, 0 end -EventScript_164E07:: @ 8164E07 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_MoveBouldersToSolvedPos:: @ 8164E07 setobjectxyperm 1, 7, 2 setobjectxyperm 2, 4, 4 setobjectxyperm 3, 10, 4 @@ -25,85 +27,85 @@ EventScript_164E07:: @ 8164E07 setobjectxyperm 7, 9, 8 return -SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch1:: @ 8164E39 lockall compare VAR_TEMP_1, 100 - goto_if_eq EventScript_164F8A - call EventScript_164F2E + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed + call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed setvar VAR_TEMP_1, 100 - compare VAR_TEMP_8, 7 - goto_if_eq EventScript_164F8C + compare NUM_SWITCHES_PRESSED, 7 + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved releaseall end -SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C +SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch2:: @ 8164E5C lockall compare VAR_TEMP_2, 100 - goto_if_eq EventScript_164F8A - call EventScript_164F2E + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed + call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed setvar VAR_TEMP_2, 100 - compare VAR_TEMP_8, 7 - goto_if_eq EventScript_164F8C + compare NUM_SWITCHES_PRESSED, 7 + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved releaseall end -SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F +SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch3:: @ 8164E7F lockall compare VAR_TEMP_3, 100 - goto_if_eq EventScript_164F8A - call EventScript_164F2E + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed + call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed setvar VAR_TEMP_3, 100 - compare VAR_TEMP_8, 7 - goto_if_eq EventScript_164F8C + compare NUM_SWITCHES_PRESSED, 7 + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved releaseall end -SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch4:: @ 8164EA2 lockall compare VAR_TEMP_4, 100 - goto_if_eq EventScript_164F8A - call EventScript_164F2E + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed + call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed setvar VAR_TEMP_4, 100 - compare VAR_TEMP_8, 7 - goto_if_eq EventScript_164F8C + compare NUM_SWITCHES_PRESSED, 7 + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved releaseall end -SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch5:: @ 8164EC5 lockall compare VAR_TEMP_5, 100 - goto_if_eq EventScript_164F8A - call EventScript_164F2E + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed + call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed setvar VAR_TEMP_5, 100 - compare VAR_TEMP_8, 7 - goto_if_eq EventScript_164F8C + compare NUM_SWITCHES_PRESSED, 7 + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved releaseall end -SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch6:: @ 8164EE8 lockall compare VAR_TEMP_6, 100 - goto_if_eq EventScript_164F8A - call EventScript_164F2E + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed + call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed setvar VAR_TEMP_6, 100 - compare VAR_TEMP_8, 7 - goto_if_eq EventScript_164F8C + compare NUM_SWITCHES_PRESSED, 7 + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved releaseall end -SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B +SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch7:: @ 8164F0B lockall compare VAR_TEMP_7, 100 - goto_if_eq EventScript_164F8A - call EventScript_164F2E + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed + call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed setvar VAR_TEMP_7, 100 - compare VAR_TEMP_8, 7 - goto_if_eq EventScript_164F8C + compare NUM_SWITCHES_PRESSED, 7 + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved releaseall end -EventScript_164F2E:: @ 8164F2E - addvar VAR_TEMP_8, 1 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed:: @ 8164F2E + addvar NUM_SWITCHES_PRESSED, 1 playse SE_TRACK_MOVE setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 @@ -113,7 +115,7 @@ EventScript_164F2E:: @ 8164F2E delay 60 return -EventScript_164F51:: @ 8164F51 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolvedShakeScreen:: @ 8164F51 setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 10 @@ -130,13 +132,13 @@ EventScript_164F51:: @ 8164F51 waitse return -EventScript_164F8A:: @ 8164F8A +SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed:: @ 8164F8A releaseall end -EventScript_164F8C:: @ 8164F8C - call EventScript_164F51 - msgbox gUnknown_817D31B +SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved:: @ 8164F8C + call SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolvedShakeScreen + msgbox SevenIsland_SevaultCanyon_TanobyKey_Text_MysteriousRumbleFarAway setflag FLAG_SYS_UNLOCKED_TANOBY_RUINS releaseall end diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc index c6f137869..f86669ce4 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc @@ -1,4 +1,4 @@ -gUnknown_817D31B:: @ 817D31B +SevenIsland_SevaultCanyon_TanobyKey_Text_MysteriousRumbleFarAway:: @ 817D31B .string "A mysterious rumble echoed\n" .string "somewhere far away.$" diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json index 42c643af5..3f50db9fe 100644 --- a/data/maps/SevenIsland_TanobyRuins/map.json +++ b/data/maps/SevenIsland_TanobyRuins/map.json @@ -29,7 +29,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SevenIsland_TanobyRuins_EventScript_1ACC4D", + "script": "SevenIsland_TanobyRuins_EventScript_Brandon", "flag": "0" }, { @@ -42,7 +42,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SevenIsland_TanobyRuins_EventScript_1ACC8B", + "script": "SevenIsland_TanobyRuins_EventScript_Benjamin", "flag": "0" }, { @@ -55,7 +55,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SevenIsland_TanobyRuins_EventScript_1ACCC9", + "script": "SevenIsland_TanobyRuins_EventScript_Edna", "flag": "0" }, { @@ -68,7 +68,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SevenIsland_TanobyRuins_EventScript_1ACD07", + "script": "SevenIsland_TanobyRuins_EventScript_Clifford", "flag": "0" } ], diff --git a/data/maps/SevenIsland_TanobyRuins/text.inc b/data/maps/SevenIsland_TanobyRuins/text.inc new file mode 100644 index 000000000..a5453f527 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins/text.inc @@ -0,0 +1,52 @@ +SevenIsland_TanobyRuins_Text_BrandonIntro:: @ 818CFFB + .string "Do you know anything about this\n" + .string "stone chamber?$" + +SevenIsland_TanobyRuins_Text_BrandonDefeat:: @ 818D02A + .string "That was uncalled for.\n" + .string "You didn't have to be so rough.$" + +SevenIsland_TanobyRuins_Text_BrandonPostBattle:: @ 818D061 + .string "The TANOBY RUINS date back at\n" + .string "least 1,500 years.\p" + .string "But it's a baffling mystery as to\n" + .string "why it was built in the first place.$" + +SevenIsland_TanobyRuins_Text_BenjaminIntro:: @ 818D0D9 + .string "A mystic POKéMON is said to sleep\n" + .string "inside here.$" + +SevenIsland_TanobyRuins_Text_BenjaminDefeat:: @ 818D108 + .string "I'm not much good in battle.$" + +SevenIsland_TanobyRuins_Text_BenjaminPostBattle:: @ 818D125 + .string "I hear there are other ruins like\n" + .string "the one here.\p" + .string "Might they be the resting places\n" + .string "of other mystic POKéMON?$" + +SevenIsland_TanobyRuins_Text_EdnaIntro:: @ 818D18F + .string "CLIFFORD is teaching me how to\n" + .string "paint.$" + +SevenIsland_TanobyRuins_Text_EdnaDefeat:: @ 818D1B5 + .string "We might get in trouble for being\n" + .string "noisy here.$" + +SevenIsland_TanobyRuins_Text_EdnaPostBattle:: @ 818D1E3 + .string "I said that I wanted to paint an\n" + .string "old building.\p" + .string "So CLIFFORD brought me here.$" + +SevenIsland_TanobyRuins_Text_CliffordIntro:: @ 818D22F + .string "Today, in addition to our lesson,\n" + .string "we came to see the chamber.$" + +SevenIsland_TanobyRuins_Text_CliffordDefeat:: @ 818D26D + .string "My, how extraordinary.$" + +SevenIsland_TanobyRuins_Text_CliffordPostBattle:: @ 818D284 + .string "Ah, so you are studying POKéMON\n" + .string "on your own…\p" + .string "Yes, you certainly are quite the\n" + .string "extraordinary person, indeed.$" diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc index 847ae472a..0646e661d 100644 --- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc @@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_DilfordChamber_MapScripts:: @ 8164CF6 .byte 0 SevenIsland_TanobyRuins_DilfordChamber_OnTransition:: @ 8164CFC - call EventScript_1A925E + call EventScript_TryDarkenRuins end diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc index b982b77dd..8a606a2c3 100644 --- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc @@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_LiptooChamber_MapScripts:: @ 8164CDE .byte 0 SevenIsland_TanobyRuins_LiptooChamber_OnTransition:: @ 8164CE4 - call EventScript_1A925E + call EventScript_TryDarkenRuins end diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc index d467f79ef..819b2bbc1 100644 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc @@ -4,5 +4,5 @@ SevenIsland_TanobyRuins_MoneanChamber_MapScripts:: @ 8164CCF SevenIsland_TanobyRuins_MoneanChamber_OnTransition:: @ 8164CD5 setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER - call EventScript_1A925E + call EventScript_TryDarkenRuins end diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc index 2f3d604c3..e29694d8f 100644 --- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc @@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_RixyChamber_MapScripts:: @ 8164D0E .byte 0 SevenIsland_TanobyRuins_RixyChamber_OnTransition:: @ 8164D14 - call EventScript_1A925E + call EventScript_TryDarkenRuins end diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc index dd1a73f83..4917ecdf8 100644 --- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc @@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_ScufibChamber_MapScripts:: @ 8164D02 .byte 0 SevenIsland_TanobyRuins_ScufibChamber_OnTransition:: @ 8164D08 - call EventScript_1A925E + call EventScript_TryDarkenRuins end diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc index 131a6ecca..f1a13adcb 100644 --- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc @@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_ViapoisChamber_MapScripts:: @ 8164D1A .byte 0 SevenIsland_TanobyRuins_ViapoisChamber_OnTransition:: @ 8164D20 - call EventScript_1A925E + call EventScript_TryDarkenRuins end diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc index ff6c851ee..3a7720b4c 100644 --- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc @@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_WeepthChamber_MapScripts:: @ 8164CEA .byte 0 SevenIsland_TanobyRuins_WeepthChamber_OnTransition:: @ 8164CF0 - call EventScript_1A925E + call EventScript_TryDarkenRuins end diff --git a/data/maps/SixIsland_DottedHole_1F/scripts.inc b/data/maps/SixIsland_DottedHole_1F/scripts.inc index 26217512e..21a47dcd6 100644 --- a/data/maps/SixIsland_DottedHole_1F/scripts.inc +++ b/data/maps/SixIsland_DottedHole_1F/scripts.inc @@ -6,28 +6,28 @@ SixIsland_DottedHole_1F_OnTransition:: @ 8164188 setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_DOTTED_HOLE_1F end -SixIsland_DottedHole_B1F_EventScript_16418C:: @ 816418C +SixIsland_DottedHole_B1F_EventScript_BrailleUp:: @ 816418C lockall braillemessage Braille_Text_Up waitbuttonpress releaseall end -SixIsland_DottedHole_B4F_EventScript_164195:: @ 8164195 +SixIsland_DottedHole_B4F_EventScript_BrailleDown:: @ 8164195 lockall braillemessage Braille_Text_Down waitbuttonpress releaseall end -SixIsland_DottedHole_B3F_EventScript_16419E:: @ 816419E +SixIsland_DottedHole_B3F_EventScript_BrailleRight:: @ 816419E lockall braillemessage Braille_Text_Right waitbuttonpress releaseall end -SixIsland_DottedHole_B2F_EventScript_1641A7:: @ 81641A7 +SixIsland_DottedHole_B2F_EventScript_BrailleLeft:: @ 81641A7 lockall braillemessage Braille_Text_Left waitbuttonpress diff --git a/data/maps/SixIsland_DottedHole_B1F/map.json b/data/maps/SixIsland_DottedHole_B1F/map.json index 449f0da2d..9d264d645 100644 --- a/data/maps/SixIsland_DottedHole_B1F/map.json +++ b/data/maps/SixIsland_DottedHole_B1F/map.json @@ -57,7 +57,7 @@ "x": 6, "y": 5, "elevation": 0, - "script": "SixIsland_DottedHole_B1F_EventScript_16418C" + "script": "SixIsland_DottedHole_B1F_EventScript_BrailleUp" } ] } diff --git a/data/maps/SixIsland_DottedHole_B2F/map.json b/data/maps/SixIsland_DottedHole_B2F/map.json index 79cf28355..0dd58ba70 100644 --- a/data/maps/SixIsland_DottedHole_B2F/map.json +++ b/data/maps/SixIsland_DottedHole_B2F/map.json @@ -57,7 +57,7 @@ "x": 6, "y": 5, "elevation": 0, - "script": "SixIsland_DottedHole_B2F_EventScript_1641A7" + "script": "SixIsland_DottedHole_B2F_EventScript_BrailleLeft" } ] } diff --git a/data/maps/SixIsland_DottedHole_B3F/map.json b/data/maps/SixIsland_DottedHole_B3F/map.json index 6c7af4456..df77a280c 100644 --- a/data/maps/SixIsland_DottedHole_B3F/map.json +++ b/data/maps/SixIsland_DottedHole_B3F/map.json @@ -57,7 +57,7 @@ "x": 6, "y": 5, "elevation": 0, - "script": "SixIsland_DottedHole_B3F_EventScript_16419E" + "script": "SixIsland_DottedHole_B3F_EventScript_BrailleRight" } ] } diff --git a/data/maps/SixIsland_DottedHole_B4F/map.json b/data/maps/SixIsland_DottedHole_B4F/map.json index 2490d48a7..56e07628d 100644 --- a/data/maps/SixIsland_DottedHole_B4F/map.json +++ b/data/maps/SixIsland_DottedHole_B4F/map.json @@ -57,7 +57,7 @@ "x": 6, "y": 5, "elevation": 0, - "script": "SixIsland_DottedHole_B4F_EventScript_164195" + "script": "SixIsland_DottedHole_B4F_EventScript_BrailleDown" } ] } diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json index e3cce0b89..0acc6464e 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_DottedHole_SapphireRoom_EventScript_1641B5", + "script": "SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire", "flag": "FLAG_HIDE_SAPPHIRE" }, { @@ -63,7 +63,7 @@ "x": 7, "y": 2, "elevation": 0, - "script": "SixIsland_DottedHole_SapphireRoom_EventScript_16441F" + "script": "SixIsland_DottedHole_SapphireRoom_EventScript_BrailleMessage" } ] } diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index a73503f7c..67f4c6a2d 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -1,29 +1,32 @@ +.equ LOCALID_SAPPHIRE, 1 +.equ LOCALID_THIEF, 2 + SixIsland_DottedHole_SapphireRoom_MapScripts:: @ 81641B4 .byte 0 -SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 +SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire:: @ 81641B5 lock faceplayer textcolor 3 playfanfare MUS_FAN5 - message Text_17BD82 + message SixIsland_DottedHole_SapphireRoom_Text_FoundSapphire waitmessage waitfanfare closemessage - setobjectxyperm 2, 5, 0 - addobject 2 + setobjectxyperm LOCALID_THIEF, 5, 0 + addobject LOCALID_THIEF playse SE_RU_HYUU - applymovement 2, Movement_16440F + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefFallIn waitmovement 0 playse SE_W070 compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_16430F + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_16430F + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft compare VAR_FACING, DIR_EAST - call_if_eq EventScript_16431A + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown compare VAR_FACING, DIR_WEST - call_if_eq EventScript_16431A + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 setvar VAR_0x8006, 12 @@ -31,163 +34,164 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 special Special_ShakeScreen delay 60 compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_164325 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_164330 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_16433B + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireEast compare VAR_FACING, DIR_WEST - call_if_eq EventScript_164346 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireWest textcolor 0 - msgbox gUnknown_817BD97 + msgbox SixIsland_DottedHole_SapphireRoom_Text_IWasRightInTailingYou closemessage compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_164351 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_164366 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_16437B + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireEast compare VAR_FACING, DIR_WEST - call_if_eq EventScript_164390 - removeobject 1 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireWest + removeobject LOCALID_SAPPHIRE compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_1642F9 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft2 compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_1642F9 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft2 compare VAR_FACING, DIR_EAST - call_if_eq EventScript_164304 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown2 compare VAR_FACING, DIR_WEST - call_if_eq EventScript_164304 - msgbox gUnknown_817BDD4 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown2 + msgbox SixIsland_DottedHole_SapphireRoom_Text_SellToTeamRocketTellPassword closemessage compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_1643A5 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_1643B7 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_1643C9 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitEast compare VAR_FACING, DIR_WEST - call_if_eq EventScript_1643DB + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitWest playse SE_KAIDAN delay 35 - removeobject 2 + removeobject LOCALID_THIEF setflag FLAG_LEARNED_YES_NAH_CHANSEY release end -EventScript_1642F9:: @ 81642F9 +@ Lots of redundant scripts below +SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft2:: @ 81642F9 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return -EventScript_164304:: @ 8164304 +SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown2:: @ 8164304 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return -EventScript_16430F:: @ 816430F +SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft:: @ 816430F applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return -EventScript_16431A:: @ 816431A +SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown:: @ 816431A applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return -EventScript_164325:: @ 8164325 - applymovement 2, Movement_1643ED +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireNorth:: @ 8164325 + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft waitmovement 0 return -EventScript_164330:: @ 8164330 - applymovement 2, Movement_1643ED +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireSouth:: @ 8164330 + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft waitmovement 0 return -EventScript_16433B:: @ 816433B - applymovement 2, Movement_1643F1 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireEast:: @ 816433B + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow waitmovement 0 return -EventScript_164346:: @ 8164346 - applymovement 2, Movement_1643F1 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireWest:: @ 8164346 + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow waitmovement 0 return -EventScript_164351:: @ 8164351 - applymovement 2, Movement_1643F5 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireNorth:: @ 8164351 + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return -EventScript_164366:: @ 8164366 - applymovement 2, Movement_1643F5 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireSouth:: @ 8164366 + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return -EventScript_16437B:: @ 816437B - applymovement 2, Movement_1643F7 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireEast:: @ 816437B + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 return -EventScript_164390:: @ 8164390 - applymovement 2, Movement_1643F7 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireWest:: @ 8164390 + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return -EventScript_1643A5:: @ 81643A5 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C - applymovement 2, Movement_1643F9 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitNorth:: @ 81643A5 + applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitNorth waitmovement 0 return -EventScript_1643B7:: @ 81643B7 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C - applymovement 2, Movement_164401 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitSouth:: @ 81643B7 + applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitSouth waitmovement 0 return -EventScript_1643C9:: @ 81643C9 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C - applymovement 2, Movement_164409 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitEast:: @ 81643C9 + applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest waitmovement 0 return -EventScript_1643DB:: @ 81643DB - applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C - applymovement 2, Movement_164409 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitWest:: @ 81643DB + applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest waitmovement 0 return -Movement_1643ED:: @ 81643ED +SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft:: @ 81643ED walk_up walk_up walk_in_place_fastest_right step_end -Movement_1643F1:: @ 81643F1 +SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow:: @ 81643F1 walk_right walk_right walk_in_place_fastest_up step_end -Movement_1643F5:: @ 81643F5 +SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft:: @ 81643F5 walk_right step_end -Movement_1643F7:: @ 81643F7 +SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow:: @ 81643F7 walk_up step_end -Movement_1643F9:: @ 81643F9 +SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitNorth:: @ 81643F9 walk_fast_up walk_fast_right walk_fast_right @@ -197,7 +201,7 @@ Movement_1643F9:: @ 81643F9 walk_fast_right step_end -Movement_164401:: @ 8164401 +SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitSouth:: @ 8164401 walk_fast_down walk_fast_right walk_fast_right @@ -207,7 +211,7 @@ Movement_164401:: @ 8164401 walk_fast_right step_end -Movement_164409:: @ 8164409 +SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest:: @ 8164409 walk_fast_right walk_fast_right walk_fast_right @@ -215,7 +219,7 @@ Movement_164409:: @ 8164409 walk_fast_up step_end -Movement_16440F:: @ 816440F +SixIsland_DottedHole_SapphireRoom_Movement_ThiefFallIn:: @ 816440F face_down disable_anim slide_down @@ -230,12 +234,12 @@ Movement_16440F:: @ 816440F restore_anim step_end -Movement_16441C:: @ 816441C +SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit:: @ 816441C delay_16 walk_in_place_fastest_right step_end -SixIsland_DottedHole_SapphireRoom_EventScript_16441F:: @ 816441F +SixIsland_DottedHole_SapphireRoom_EventScript_BrailleMessage:: @ 816441F lockall setvar VAR_0x8005, 130 braillemessage_wait Braille_Text_LetTheTwo diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc index 713e8cadf..4fdef4a5d 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc @@ -1,12 +1,12 @@ -Text_17BD82:: @ 817BD82 +SixIsland_DottedHole_SapphireRoom_Text_FoundSapphire:: @ 817BD82 .string "{PLAYER} found a SAPPHIRE!$" -gUnknown_817BD97:: @ 817BD97 +SixIsland_DottedHole_SapphireRoom_Text_IWasRightInTailingYou:: @ 817BD97 .string "Fufu… Fufufufu…\n" .string "I guessed right.\p" .string "I was right in tailing you!$" -gUnknown_817BDD4:: @ 817BDD4 +SixIsland_DottedHole_SapphireRoom_Text_SellToTeamRocketTellPassword:: @ 817BDD4 .string "I knew that there was a SAPPHIRE\n" .string "here, so it belongs to me!\p" .string "I'll sell it to TEAM ROCKET for\n" diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index f6dd0d71c..d3ba4d3c3 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -5,7 +5,7 @@ "music": "MUS_T_MORI", "region_map_section": "MAPSEC_BERRY_FOREST", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 7, diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json index 22ddfed8b..84f116348 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/map.json +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_DunsparceTunnel_EventScript_164D60", + "script": "ThreeIsland_DunsparceTunnel_EventScript_Prospector", "flag": "0" } ], diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index 46e8e15f8..7729b3536 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -7,49 +7,49 @@ ThreeIsland_DunsparceTunnel_OnTransition:: @ 8164D2C specialvar VAR_RESULT, IsNationalPokedexEnabled copyvar VAR_0x8008, VAR_RESULT compare VAR_0x8008, TRUE - call_if_eq EventScript_164D50 + call_if_eq ThreeIsland_DunsparceTunnel_EventScript_SetLayoutDugOut compare VAR_0x8008, FALSE - call_if_eq EventScript_164D54 + call_if_eq ThreeIsland_DunsparceTunnel_EventScript_MoveProspectorToWall end -EventScript_164D50:: @ 8164D50 - setmaplayoutindex LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_2 +ThreeIsland_DunsparceTunnel_EventScript_SetLayoutDugOut:: @ 8164D50 + setmaplayoutindex LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_DUG_OUT return -EventScript_164D54:: @ 8164D54 +ThreeIsland_DunsparceTunnel_EventScript_MoveProspectorToWall:: @ 8164D54 setobjectxyperm 1, 6, 3 - setobjectmovementtype 1, 10 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT return -ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60 +ThreeIsland_DunsparceTunnel_EventScript_Prospector:: @ 8164D60 lock faceplayer - goto_if_set FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL, EventScript_164DC2 + goto_if_set FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL, ThreeIsland_DunsparceTunnel_EventScript_ProspectorAlreadyGaveNugget specialvar VAR_RESULT, IsNationalPokedexEnabled compare VAR_RESULT, TRUE - goto_if_eq EventScript_164D90 - msgbox gUnknown_817D13B + goto_if_eq ThreeIsland_DunsparceTunnel_EventScript_ProspectorStruckGold + msgbox ThreeIsland_DunsparceTunnel_Text_ProspectingForGold closemessage applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end -EventScript_164D90:: @ 8164D90 - msgbox gUnknown_817D1C9 +ThreeIsland_DunsparceTunnel_EventScript_ProspectorStruckGold:: @ 8164D90 + msgbox ThreeIsland_DunsparceTunnel_Text_StruckGoldThisIsForYou giveitem ITEM_NUGGET - compare VAR_RESULT, 0 - goto_if_eq EventScript_164DB8 + compare VAR_RESULT, FALSE + goto_if_eq ThreeIsland_DunsparceTunnel_EventScript_NoRoomForNugget setflag FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL - goto EventScript_164DC2 + goto ThreeIsland_DunsparceTunnel_EventScript_ProspectorAlreadyGaveNugget end -EventScript_164DB8:: @ 8164DB8 - msgbox gUnknown_817D2DC +ThreeIsland_DunsparceTunnel_EventScript_NoRoomForNugget:: @ 8164DB8 + msgbox ThreeIsland_DunsparceTunnel_Text_WhoopsBagCrammedFull release end -EventScript_164DC2:: @ 8164DC2 - msgbox gUnknown_817D28C +ThreeIsland_DunsparceTunnel_EventScript_ProspectorAlreadyGaveNugget:: @ 8164DC2 + msgbox ThreeIsland_DunsparceTunnel_Text_ThatsANugget release end diff --git a/data/maps/ThreeIsland_DunsparceTunnel/text.inc b/data/maps/ThreeIsland_DunsparceTunnel/text.inc index e8c5269dd..96a0603c4 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/text.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/text.inc @@ -1,4 +1,4 @@ -gUnknown_817D13B:: @ 817D13B +ThreeIsland_DunsparceTunnel_Text_ProspectingForGold:: @ 817D13B .string "Hey, there!\n" .string "How's it going?\p" .string "What am I doing here, you ask?\n" @@ -6,7 +6,7 @@ gUnknown_817D13B:: @ 817D13B .string "When I strike it rich, I'm buying\n" .string "a house in KANTO.$" -gUnknown_817D1C9:: @ 817D1C9 +ThreeIsland_DunsparceTunnel_Text_StruckGoldThisIsForYou:: @ 817D1C9 .string "Hey, there! How's it going?\n" .string "Did you hear? I've struck gold!\p" .string "You remembered that I was\n" @@ -16,12 +16,12 @@ gUnknown_817D1C9:: @ 817D1C9 .string "So, I'll show you!\n" .string "This is for you!$" -gUnknown_817D28C:: @ 817D28C +ThreeIsland_DunsparceTunnel_Text_ThatsANugget:: @ 817D28C .string "That's a NUGGET!\p" .string "I can't give you any nuggets of\n" .string "wisdom, so that'll have to do!$" -gUnknown_817D2DC:: @ 817D2DC +ThreeIsland_DunsparceTunnel_Text_WhoopsBagCrammedFull:: @ 817D2DC .string "Whoops, your BAG is crammed full!\n" .string "I'll give this to you later.$" diff --git a/data/scripts/trainers.inc b/data/scripts/trainers.inc index d08364a6a..5cbb8b589 100644 --- a/data/scripts/trainers.inc +++ b/data/scripts/trainers.inc @@ -1,7 +1,7 @@ Route3_EventScript_1A93C9:: @ 81A93C9 trainerbattle_single TRAINER_YOUNGSTER_BEN, Text_183560, Text_1835A0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A93F0 msgbox Text_1835B4, MSGBOX_AUTOCLOSE end @@ -14,7 +14,7 @@ EventScript_1A93F0:: @ 81A93F0 Route3_EventScript_1A9407:: @ 81A9407 trainerbattle_single TRAINER_YOUNGSTER_CALVIN, Text_183786, Text_1837BD specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A942E msgbox Text_1837CF, MSGBOX_AUTOCLOSE end @@ -27,7 +27,7 @@ EventScript_1A942E:: @ 81A942E Route3_EventScript_1A9445:: @ 81A9445 trainerbattle_single TRAINER_BUG_CATCHER_COLTON, Text_1834E6, Text_183509 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A946C msgbox Text_18351C, MSGBOX_AUTOCLOSE end @@ -40,7 +40,7 @@ EventScript_1A946C:: @ 81A946C Route3_EventScript_1A9483:: @ 81A9483 trainerbattle_single TRAINER_BUG_CATCHER_GREG, Text_183682, Text_1836B3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A94AA msgbox Text_1836D9, MSGBOX_AUTOCLOSE end @@ -53,7 +53,7 @@ EventScript_1A94AA:: @ 81A94AA Route3_EventScript_1A94C1:: @ 81A94C1 trainerbattle_single TRAINER_BUG_CATCHER_JAMES, Text_183807, Text_183837 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A94E8 msgbox Text_183849, MSGBOX_AUTOCLOSE end @@ -66,7 +66,7 @@ EventScript_1A94E8:: @ 81A94E8 Route3_EventScript_1A94FF:: @ 81A94FF trainerbattle_single TRAINER_LASS_JANICE, Text_183616, Text_18363F specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9526 msgbox Text_18364C, MSGBOX_AUTOCLOSE end @@ -79,7 +79,7 @@ EventScript_1A9526:: @ 81A9526 Route3_EventScript_1A953D:: @ 81A953D trainerbattle_single TRAINER_LASS_SALLY, Text_18371B, Text_183746 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9564 msgbox Text_18374F, MSGBOX_AUTOCLOSE end @@ -92,7 +92,7 @@ EventScript_1A9564:: @ 81A9564 Route3_EventScript_1A957B:: @ 81A957B trainerbattle_single TRAINER_LASS_ROBIN, Text_18387A, Text_183891 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A95A2 msgbox Text_18389C, MSGBOX_AUTOCLOSE end @@ -105,7 +105,7 @@ EventScript_1A95A2:: @ 81A95A2 Route4_EventScript_1A95B9:: @ 81A95B9 trainerbattle_single TRAINER_LASS_CRISSY, Text_183906, Text_183938 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A95E0 msgbox Text_183957, MSGBOX_AUTOCLOSE end @@ -118,7 +118,7 @@ EventScript_1A95E0:: @ 81A95E0 Route24_EventScript_1A95F7:: @ 81A95F7 trainerbattle_single TRAINER_YOUNGSTER_TIMMY, Text_188F76, Text_188F95 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A961E msgbox Text_188FA7, MSGBOX_AUTOCLOSE end @@ -131,7 +131,7 @@ EventScript_1A961E:: @ 81A961E Route24_EventScript_1A9635:: @ 81A9635 trainerbattle_single TRAINER_BUG_CATCHER_CALE, Text_18901B, Text_18908C specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A965C msgbox Text_18909E, MSGBOX_AUTOCLOSE end @@ -144,7 +144,7 @@ EventScript_1A965C:: @ 81A965C Route24_EventScript_1A9673:: @ 81A9673 trainerbattle_single TRAINER_LASS_RELI, Text_188F2C, Text_188F46 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A969A msgbox Text_188F53, MSGBOX_AUTOCLOSE end @@ -157,7 +157,7 @@ EventScript_1A969A:: @ 81A969A Route24_EventScript_1A96B1:: @ 81A96B1 trainerbattle_single TRAINER_LASS_ALI, Text_188FC9, Text_188FE7 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A96D8 msgbox Text_188FF9, MSGBOX_AUTOCLOSE end @@ -170,7 +170,7 @@ EventScript_1A96D8:: @ 81A96D8 Route24_EventScript_1A96EF:: @ 81A96EF trainerbattle_single TRAINER_CAMPER_SHANE, Text_188E74, Text_188E94 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9716 msgbox Text_188EA3, MSGBOX_AUTOCLOSE end @@ -183,7 +183,7 @@ EventScript_1A9716:: @ 81A9716 Route24_EventScript_1A972D:: @ 81A972D trainerbattle_single TRAINER_CAMPER_ETHAN, Text_188ED9, Text_188EFA specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9754 msgbox Text_188F0A, MSGBOX_AUTOCLOSE end @@ -196,7 +196,7 @@ EventScript_1A9754:: @ 81A9754 Route25_EventScript_1A976B:: @ 81A976B trainerbattle_single TRAINER_YOUNGSTER_JOEY, Text_1890C0, Text_1890E6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9792 msgbox Text_1890F5, MSGBOX_AUTOCLOSE end @@ -209,7 +209,7 @@ EventScript_1A9792:: @ 81A9792 Route25_EventScript_1A97A9:: @ 81A97A9 trainerbattle_single TRAINER_YOUNGSTER_DAN, Text_189165, Text_1891A6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A97D0 msgbox Text_1891B3, MSGBOX_AUTOCLOSE end @@ -222,7 +222,7 @@ EventScript_1A97D0:: @ 81A97D0 Route25_EventScript_1A97E7:: @ 81A97E7 trainerbattle_single TRAINER_YOUNGSTER_CHAD, Text_1892A9, Text_1892D9 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A980E msgbox Text_1892EF, MSGBOX_AUTOCLOSE end @@ -235,7 +235,7 @@ EventScript_1A980E:: @ 81A980E Route25_EventScript_1A9825:: @ 81A9825 trainerbattle_single TRAINER_PICNICKER_KELSEY, Text_189247, Text_189261 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A984C msgbox Text_189281, MSGBOX_AUTOCLOSE end @@ -248,7 +248,7 @@ EventScript_1A984C:: @ 81A984C Route25_EventScript_1A9863:: @ 81A9863 trainerbattle_single TRAINER_LASS_HALEY, Text_189333, Text_189364 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A988A msgbox Text_189378, MSGBOX_AUTOCLOSE end @@ -261,7 +261,7 @@ EventScript_1A988A:: @ 81A988A Route25_EventScript_1A98A1:: @ 81A98A1 trainerbattle_single TRAINER_HIKER_FRANKLIN, Text_1893A7, Text_1893EA specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A98C8 msgbox Text_1893FB, MSGBOX_AUTOCLOSE end @@ -274,7 +274,7 @@ EventScript_1A98C8:: @ 81A98C8 Route25_EventScript_1A98DF:: @ 81A98DF trainerbattle_single TRAINER_HIKER_NOB, Text_189423, Text_189459 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9906 msgbox Text_18947E, MSGBOX_AUTOCLOSE end @@ -287,7 +287,7 @@ EventScript_1A9906:: @ 81A9906 Route25_EventScript_1A991D:: @ 81A991D trainerbattle_single TRAINER_HIKER_WAYNE, Text_1894DE, Text_18950A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9944 msgbox Text_18951C, MSGBOX_AUTOCLOSE end @@ -300,7 +300,7 @@ EventScript_1A9944:: @ 81A9944 Route25_EventScript_1A995B:: @ 81A995B trainerbattle_single TRAINER_CAMPER_FLINT, Text_1891EB, Text_189212 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9982 msgbox Text_18921D, MSGBOX_AUTOCLOSE end @@ -313,7 +313,7 @@ EventScript_1A9982:: @ 81A9982 Route6_EventScript_1A9999:: @ 81A9999 trainerbattle_single TRAINER_BUG_CATCHER_KEIGO, Text_183E9F, Text_183EC0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A99C0 msgbox Text_183ED4, MSGBOX_AUTOCLOSE end @@ -326,7 +326,7 @@ EventScript_1A99C0:: @ 81A99C0 Route6_EventScript_1A99D7:: @ 81A99D7 trainerbattle_single TRAINER_BUG_CATCHER_ELIJAH, Text_183FF0, Text_18401A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A99FE msgbox Text_18402B, MSGBOX_AUTOCLOSE end @@ -339,7 +339,7 @@ EventScript_1A99FE:: @ 81A99FE Route6_EventScript_1A9A15:: @ 81A9A15 trainerbattle_single TRAINER_CAMPER_RICKY, Text_183E04, Text_183E2A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9A3C msgbox Text_183E3C, MSGBOX_AUTOCLOSE end @@ -352,7 +352,7 @@ EventScript_1A9A3C:: @ 81A9A3C Route6_EventScript_1A9A53:: @ 81A9A53 trainerbattle_single TRAINER_CAMPER_JEFF, Text_183F07, Text_183F24 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9A7A msgbox Text_183F51, MSGBOX_AUTOCLOSE end @@ -365,7 +365,7 @@ EventScript_1A9A7A:: @ 81A9A7A Route6_EventScript_1A9A91:: @ 81A9A91 trainerbattle_single TRAINER_PICNICKER_NANCY, Text_183E4E, Text_183E79 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9AB8 msgbox Text_183E8D, MSGBOX_AUTOCLOSE end @@ -378,7 +378,7 @@ EventScript_1A9AB8:: @ 81A9AB8 Route6_EventScript_1A9ACF:: @ 81A9ACF trainerbattle_single TRAINER_PICNICKER_ISABELLE, Text_183F90, Text_183FAB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9AF6 msgbox Text_183FC4, MSGBOX_AUTOCLOSE end @@ -391,7 +391,7 @@ EventScript_1A9AF6:: @ 81A9AF6 Route11_EventScript_1A9B0D:: @ 81A9B0D trainerbattle_single TRAINER_YOUNGSTER_EDDIE, Text_184FBD, Text_184FD8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9B34 msgbox Text_184FEF, MSGBOX_AUTOCLOSE end @@ -404,7 +404,7 @@ EventScript_1A9B34:: @ 81A9B34 Route11_EventScript_1A9B4B:: @ 81A9B4B trainerbattle_single TRAINER_YOUNGSTER_DILLON, Text_18506A, Text_18509B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9B72 msgbox Text_1850CF, MSGBOX_AUTOCLOSE end @@ -417,7 +417,7 @@ EventScript_1A9B72:: @ 81A9B72 Route11_EventScript_1A9B89:: @ 81A9B89 trainerbattle_single TRAINER_YOUNGSTER_YASU, Text_18517B, Text_1851AC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9BB0 msgbox Text_1851D2, MSGBOX_AUTOCLOSE end @@ -430,7 +430,7 @@ EventScript_1A9BB0:: @ 81A9BB0 Route11_EventScript_1A9BC7:: @ 81A9BC7 trainerbattle_single TRAINER_YOUNGSTER_DAVE, Text_185285, Text_1852C1 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9BEE msgbox Text_1852E3, MSGBOX_AUTOCLOSE end @@ -443,7 +443,7 @@ EventScript_1A9BEE:: @ 81A9BEE Route11_EventScript_1A9C05:: @ 81A9C05 trainerbattle_single TRAINER_ENGINEER_BRAXTON, Text_185011, Text_185037 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9C2C msgbox Text_18504A, MSGBOX_AUTOCLOSE end @@ -456,7 +456,7 @@ EventScript_1A9C2C:: @ 81A9C2C Route11_EventScript_1A9C43:: @ 81A9C43 trainerbattle_single TRAINER_ENGINEER_BERNIE, Text_185236, Text_185250 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9C6A msgbox Text_185266, MSGBOX_AUTOCLOSE end @@ -469,7 +469,7 @@ EventScript_1A9C6A:: @ 81A9C6A Route11_EventScript_1A9C81:: @ 81A9C81 trainerbattle_single TRAINER_GAMER_HUGO, Text_184F01, Text_184F15 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9CA8 msgbox Text_184F2E, MSGBOX_AUTOCLOSE end @@ -482,7 +482,7 @@ EventScript_1A9CA8:: @ 81A9CA8 Route11_EventScript_1A9CBF:: @ 81A9CBF trainerbattle_single TRAINER_GAMER_JASPER, Text_184F5D, Text_184F7E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9CE6 msgbox Text_184F8E, MSGBOX_AUTOCLOSE end @@ -495,7 +495,7 @@ EventScript_1A9CE6:: @ 81A9CE6 Route11_EventScript_1A9CFD:: @ 81A9CFD trainerbattle_single TRAINER_GAMER_DIRK, Text_1850E9, Text_185105 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9D24 msgbox Text_185114, MSGBOX_AUTOCLOSE end @@ -508,7 +508,7 @@ EventScript_1A9D24:: @ 81A9D24 Route11_EventScript_1A9D3B:: @ 81A9D3B trainerbattle_single TRAINER_GAMER_DARIAN, Text_185135, Text_18514E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9D62 msgbox Text_185161, MSGBOX_AUTOCLOSE end @@ -521,7 +521,7 @@ EventScript_1A9D62:: @ 81A9D62 Route9_EventScript_1A9D79:: @ 81A9D79 trainerbattle_single TRAINER_BUG_CATCHER_BRENT, Text_184A2F, Text_184A6A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9DA0 msgbox Text_184A8C, MSGBOX_AUTOCLOSE end @@ -534,7 +534,7 @@ EventScript_1A9DA0:: @ 81A9DA0 Route9_EventScript_1A9DB7:: @ 81A9DB7 trainerbattle_single TRAINER_BUG_CATCHER_CONNER, Text_184B18, Text_184B32 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9DDE msgbox Text_184B3B, MSGBOX_AUTOCLOSE end @@ -547,7 +547,7 @@ EventScript_1A9DDE:: @ 81A9DDE Route9_EventScript_1A9DF5:: @ 81A9DF5 trainerbattle_single TRAINER_CAMPER_CHRIS, Text_184844, Text_18487E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9E1C msgbox Text_184890, MSGBOX_AUTOCLOSE end @@ -560,7 +560,7 @@ EventScript_1A9E1C:: @ 81A9E1C Route9_EventScript_1A9E33:: @ 81A9E33 trainerbattle_single TRAINER_CAMPER_DREW, Text_18489E, Text_1848CC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9E5A msgbox Text_1848DE, MSGBOX_AUTOCLOSE end @@ -573,7 +573,7 @@ EventScript_1A9E5A:: @ 81A9E5A Route9_EventScript_1A9E71:: @ 81A9E71 trainerbattle_single TRAINER_PICNICKER_ALICIA, Text_1847B7, Text_1847DF specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9E98 msgbox Text_1847F0, MSGBOX_AUTOCLOSE end @@ -586,7 +586,7 @@ EventScript_1A9E98:: @ 81A9E98 Route9_EventScript_1A9EAF:: @ 81A9EAF trainerbattle_single TRAINER_PICNICKER_CAITLIN, Text_1848FF, Text_18491C specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9ED6 msgbox Text_184931, MSGBOX_AUTOCLOSE end @@ -599,7 +599,7 @@ EventScript_1A9ED6:: @ 81A9ED6 Route9_EventScript_1A9EED:: @ 81A9EED trainerbattle_single TRAINER_HIKER_ALAN, Text_184ABE, Text_184AD5 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9F14 msgbox Text_184AF1, MSGBOX_AUTOCLOSE end @@ -612,7 +612,7 @@ EventScript_1A9F14:: @ 81A9F14 Route9_EventScript_1A9F2B:: @ 81A9F2B trainerbattle_single TRAINER_HIKER_BRICE, Text_1849DF, Text_184A04 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9F52 msgbox Text_184A11, MSGBOX_AUTOCLOSE end @@ -625,7 +625,7 @@ EventScript_1A9F52:: @ 81A9F52 Route9_EventScript_1A9F69:: @ 81A9F69 trainerbattle_single TRAINER_HIKER_JEREMY, Text_18495E, Text_18497F specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9F90 msgbox Text_1849B0, MSGBOX_AUTOCLOSE end @@ -638,7 +638,7 @@ EventScript_1A9F90:: @ 81A9F90 Route10_EventScript_1A9FA7:: @ 81A9FA7 trainerbattle_single TRAINER_PICNICKER_HEIDI, Text_184CF1, Text_184D31 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9FCE msgbox Text_184D4D, MSGBOX_AUTOCLOSE end @@ -651,7 +651,7 @@ EventScript_1A9FCE:: @ 81A9FCE Route10_EventScript_1A9FE5:: @ 81A9FE5 trainerbattle_single TRAINER_PICNICKER_CAROL, Text_184E04, Text_184E3B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA00C msgbox Text_184E5E, MSGBOX_AUTOCLOSE end @@ -664,7 +664,7 @@ EventScript_1AA00C:: @ 81AA00C Route10_EventScript_1AA023:: @ 81AA023 trainerbattle_single TRAINER_POKEMANIAC_MARK, Text_184B8A, Text_184BE5 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA04A msgbox Text_184BFB, MSGBOX_AUTOCLOSE end @@ -677,7 +677,7 @@ EventScript_1AA04A:: @ 81AA04A Route10_EventScript_1AA061:: @ 81AA061 trainerbattle_single TRAINER_POKEMANIAC_HERMAN, Text_184C86, Text_184CA7 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA088 msgbox Text_184CBB, MSGBOX_AUTOCLOSE end @@ -690,7 +690,7 @@ EventScript_1AA088:: @ 81AA088 Route10_EventScript_1AA09F:: @ 81AA09F trainerbattle_single TRAINER_HIKER_CLARK, Text_184C1D, Text_184C2D specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA0C6 msgbox Text_184C60, MSGBOX_AUTOCLOSE end @@ -703,7 +703,7 @@ EventScript_1AA0C6:: @ 81AA0C6 Route10_EventScript_1AA0DD:: @ 81AA0DD trainerbattle_single TRAINER_HIKER_TRENT, Text_184DAA, Text_184DCE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA104 msgbox Text_184DE4, MSGBOX_AUTOCLOSE end @@ -716,7 +716,7 @@ EventScript_1AA104:: @ 81AA104 Route8_EventScript_1AA11B:: @ 81AA11B trainerbattle_single TRAINER_LASS_PAIGE, Text_1841ED, Text_184210 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA142 msgbox Text_18421B, MSGBOX_AUTOCLOSE end @@ -729,7 +729,7 @@ EventScript_1AA142:: @ 81AA142 Route8_EventScript_1AA159:: @ 81AA159 trainerbattle_single TRAINER_LASS_ANDREA, Text_184321, Text_184346 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA180 msgbox Text_184350, MSGBOX_AUTOCLOSE end @@ -742,7 +742,7 @@ EventScript_1AA180:: @ 81AA180 Route8_EventScript_1AA197:: @ 81AA197 trainerbattle_single TRAINER_LASS_MEGAN, Text_18437A, Text_1843A6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA1BE msgbox Text_1843D2, MSGBOX_AUTOCLOSE end @@ -755,7 +755,7 @@ EventScript_1AA1BE:: @ 81AA1BE Route8_EventScript_1AA1D5:: @ 81AA1D5 trainerbattle_single TRAINER_LASS_JULIA, Text_1844AC, Text_1844D6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA1FC msgbox Text_1844FD, MSGBOX_AUTOCLOSE end @@ -768,7 +768,7 @@ EventScript_1AA1FC:: @ 81AA1FC Route8_EventScript_1AA213:: @ 81AA213 trainerbattle_single TRAINER_SUPER_NERD_AIDAN, Text_1840C5, Text_184100 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA23A msgbox Text_18410E, MSGBOX_AUTOCLOSE end @@ -781,7 +781,7 @@ EventScript_1AA23A:: @ 81AA23A Route8_EventScript_1AA251:: @ 81AA251 trainerbattle_single TRAINER_SUPER_NERD_GLENN, Text_18417C, Text_1841B6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA278 msgbox Text_1841C8, MSGBOX_AUTOCLOSE end @@ -794,7 +794,7 @@ EventScript_1AA278:: @ 81AA278 Route8_EventScript_1AA28F:: @ 81AA28F trainerbattle_single TRAINER_SUPER_NERD_LESLIE, Text_184257, Text_18427A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA2B6 msgbox Text_1842B3, MSGBOX_AUTOCLOSE end @@ -807,7 +807,7 @@ EventScript_1AA2B6:: @ 81AA2B6 Route8_EventScript_1AA2CD:: @ 81AA2CD trainerbattle_single TRAINER_GAMER_STAN, Text_18412F, Text_18414D specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA2F4 msgbox Text_184162, MSGBOX_AUTOCLOSE end @@ -820,7 +820,7 @@ EventScript_1AA2F4:: @ 81AA2F4 Route8_EventScript_1AA30B:: @ 81AA30B trainerbattle_single TRAINER_GAMER_RICH, Text_184432, Text_18444F specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA332 msgbox Text_184466, MSGBOX_AUTOCLOSE end @@ -833,7 +833,7 @@ EventScript_1AA332:: @ 81AA332 Route8_EventScript_1AA349:: @ 81AA349 trainerbattle_double TRAINER_TWINS_ELI_ANNE, Text_1845A4, Text_1845D0, Text_184616 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA374 msgbox Text_1845F2, MSGBOX_AUTOCLOSE end @@ -846,7 +846,7 @@ EventScript_1AA374:: @ 81AA374 Route8_EventScript_1AA38F:: @ 81AA38F trainerbattle_double TRAINER_TWINS_ELI_ANNE, Text_18464A, Text_184675, Text_1846AF specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA3BA msgbox Text_18468B, MSGBOX_AUTOCLOSE end @@ -859,7 +859,7 @@ EventScript_1AA3BA:: @ 81AA3BA Route8_EventScript_1AA3D5:: @ 81AA3D5 trainerbattle_single TRAINER_BIKER_RICARDO, Text_1846E2, Text_1846FC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA3FC msgbox Text_184719, MSGBOX_AUTOCLOSE end @@ -872,7 +872,7 @@ EventScript_1AA3FC:: @ 81AA3FC Route8_EventScript_1AA413:: @ 81AA413 trainerbattle_single TRAINER_BIKER_JAREN, Text_184742, Text_184767 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA43A msgbox Text_18477A, MSGBOX_AUTOCLOSE end @@ -885,7 +885,7 @@ EventScript_1AA43A:: @ 81AA43A Route12_EventScript_1AA451:: @ 81AA451 trainerbattle_single TRAINER_FISHERMAN_NED, Text_185402, Text_18541B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA478 msgbox Text_185432, MSGBOX_AUTOCLOSE end @@ -898,7 +898,7 @@ EventScript_1AA478:: @ 81AA478 Route12_EventScript_1AA48F:: @ 81AA48F trainerbattle_single TRAINER_FISHERMAN_CHIP, Text_18544E, Text_185475 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA4B6 msgbox Text_185488, MSGBOX_AUTOCLOSE end @@ -911,7 +911,7 @@ EventScript_1AA4B6:: @ 81AA4B6 Route12_EventScript_1AA4CD:: @ 81AA4CD trainerbattle_single TRAINER_FISHERMAN_HANK, Text_1855E1, Text_185606 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA4F4 msgbox Text_185616, MSGBOX_AUTOCLOSE end @@ -924,7 +924,7 @@ EventScript_1AA4F4:: @ 81AA4F4 Route12_EventScript_1AA50B:: @ 81AA50B trainerbattle_single TRAINER_FISHERMAN_ELLIOT, Text_185682, Text_1856D0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA532 msgbox Text_1856DF, MSGBOX_AUTOCLOSE end @@ -937,7 +937,7 @@ EventScript_1AA532:: @ 81AA532 Route12_EventScript_1AA549:: @ 81AA549 trainerbattle_single TRAINER_FISHERMAN_ANDREW, Text_18570E, Text_185744 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA570 msgbox Text_18574D, MSGBOX_AUTOCLOSE end @@ -950,7 +950,7 @@ EventScript_1AA570:: @ 81AA570 Route12_EventScript_1AA587:: @ 81AA587 trainerbattle_single TRAINER_ROCKER_LUCA, Text_185547, Text_18559B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA5AE msgbox Text_1855A6, MSGBOX_AUTOCLOSE end @@ -963,7 +963,7 @@ EventScript_1AA5AE:: @ 81AA5AE Route12_EventScript_1AA5C5:: @ 81AA5C5 trainerbattle_single TRAINER_CAMPER_JUSTIN, Text_1854B9, Text_1854ED specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA5EC msgbox Text_1854F2, MSGBOX_AUTOCLOSE end @@ -976,7 +976,7 @@ EventScript_1AA5EC:: @ 81AA5EC Route12_EventScript_1AA603:: @ 81AA603 trainerbattle_double TRAINER_YOUNG_COUPLE_GIA_JES, Text_1857C5, Text_1857F1, Text_185842 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA62E msgbox Text_18581F, MSGBOX_AUTOCLOSE end @@ -989,7 +989,7 @@ EventScript_1AA62E:: @ 81AA62E Route12_EventScript_1AA649:: @ 81AA649 trainerbattle_double TRAINER_YOUNG_COUPLE_GIA_JES, Text_1858A6, Text_1858D0, Text_185908 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA674 msgbox Text_1858E2, MSGBOX_AUTOCLOSE end @@ -1002,7 +1002,7 @@ EventScript_1AA674:: @ 81AA674 Route13_EventScript_1AA68F:: @ 81AA68F trainerbattle_single TRAINER_BIKER_JARED, Text_185D05, Text_185D1D specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA6B6 msgbox Text_185D33, MSGBOX_AUTOCLOSE end @@ -1015,7 +1015,7 @@ EventScript_1AA6B6:: @ 81AA6B6 Route13_EventScript_1AA6CD:: @ 81AA6CD trainerbattle_single TRAINER_BEAUTY_LOLA, Text_185BFC, Text_185C1F specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA6F4 msgbox Text_185C35, MSGBOX_AUTOCLOSE end @@ -1028,7 +1028,7 @@ EventScript_1AA6F4:: @ 81AA6F4 Route13_EventScript_1AA70B:: @ 81AA70B trainerbattle_single TRAINER_BEAUTY_SHEILA, Text_185C69, Text_185C95 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA732 msgbox Text_185CA8, MSGBOX_AUTOCLOSE end @@ -1041,7 +1041,7 @@ EventScript_1AA732:: @ 81AA732 Route13_EventScript_1AA749:: @ 81AA749 trainerbattle_single TRAINER_BIRD_KEEPER_SEBASTIAN, Text_185955, Text_18597E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA770 msgbox Text_1859A2, MSGBOX_AUTOCLOSE end @@ -1054,7 +1054,7 @@ EventScript_1AA770:: @ 81AA770 Route13_EventScript_1AA787:: @ 81AA787 trainerbattle_single TRAINER_BIRD_KEEPER_PERRY, Text_185B8F, Text_185BCA specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA7AE msgbox Text_185BDB, MSGBOX_AUTOCLOSE end @@ -1067,7 +1067,7 @@ EventScript_1AA7AE:: @ 81AA7AE Route13_EventScript_1AA7C5:: @ 81AA7C5 trainerbattle_single TRAINER_BIRD_KEEPER_ROBERT, Text_185D3D, Text_185D7B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA7EC msgbox Text_185D89, MSGBOX_AUTOCLOSE end @@ -1080,7 +1080,7 @@ EventScript_1AA7EC:: @ 81AA7EC Route13_EventScript_1AA803:: @ 81AA803 trainerbattle_single TRAINER_PICNICKER_ALMA, Text_185B12, Text_185B48 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA82A msgbox Text_185B67, MSGBOX_AUTOCLOSE end @@ -1093,7 +1093,7 @@ EventScript_1AA82A:: @ 81AA82A Route13_EventScript_1AA841:: @ 81AA841 trainerbattle_single TRAINER_PICNICKER_SUSIE, Text_1859CF, Text_1859EC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA868 msgbox Text_1859F9, MSGBOX_AUTOCLOSE end @@ -1106,7 +1106,7 @@ EventScript_1AA868:: @ 81AA868 Route13_EventScript_1AA87F:: @ 81AA87F trainerbattle_single TRAINER_PICNICKER_VALERIE, Text_185A37, Text_185A56 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA8A6 msgbox Text_185A62, MSGBOX_AUTOCLOSE end @@ -1119,7 +1119,7 @@ EventScript_1AA8A6:: @ 81AA8A6 Route13_EventScript_1AA8BD:: @ 81AA8BD trainerbattle_single TRAINER_PICNICKER_GWEN, Text_185A91, Text_185AC1 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA8E4 msgbox Text_185ADE, MSGBOX_AUTOCLOSE end @@ -1132,7 +1132,7 @@ EventScript_1AA8E4:: @ 81AA8E4 Route14_EventScript_1AA8FB:: @ 81AA8FB trainerbattle_single TRAINER_BIKER_MALIK, Text_186344, Text_186362 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA922 msgbox Text_18636E, MSGBOX_AUTOCLOSE end @@ -1145,7 +1145,7 @@ EventScript_1AA922:: @ 81AA922 Route14_EventScript_1AA939:: @ 81AA939 trainerbattle_single TRAINER_BIKER_LUKAS, Text_1861F7, Text_186223 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA960 msgbox Text_186239, MSGBOX_AUTOCLOSE end @@ -1158,7 +1158,7 @@ EventScript_1AA960:: @ 81AA960 Route14_EventScript_1AA977:: @ 81AA977 trainerbattle_single TRAINER_BIKER_ISAAC, Text_186263, Text_186291 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA99E msgbox Text_18629D, MSGBOX_AUTOCLOSE end @@ -1171,7 +1171,7 @@ EventScript_1AA99E:: @ 81AA99E Route14_EventScript_1AA9B5:: @ 81AA9B5 trainerbattle_single TRAINER_BIKER_GERALD, Text_1862BD, Text_1862EF specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA9DC msgbox Text_1862F8, MSGBOX_AUTOCLOSE end @@ -1184,7 +1184,7 @@ EventScript_1AA9DC:: @ 81AA9DC Route14_EventScript_1AA9F3:: @ 81AA9F3 trainerbattle_single TRAINER_BIRD_KEEPER_DONALD, Text_1860D9, Text_18610A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAA1A msgbox Text_18611D, MSGBOX_AUTOCLOSE end @@ -1197,7 +1197,7 @@ EventScript_1AAA1A:: @ 81AAA1A Route14_EventScript_1AAA31:: @ 81AAA31 trainerbattle_single TRAINER_BIRD_KEEPER_BENNY, Text_18618E, Text_1861B3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAA58 msgbox Text_1861BE, MSGBOX_AUTOCLOSE end @@ -1210,7 +1210,7 @@ EventScript_1AAA58:: @ 81AAA58 Route14_EventScript_1AAA6F:: @ 81AAA6F trainerbattle_single TRAINER_BIRD_KEEPER_CARTER, Text_185E4D, Text_185E81 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAA96 msgbox Text_185E9C, MSGBOX_AUTOCLOSE end @@ -1223,7 +1223,7 @@ EventScript_1AAA96:: @ 81AAA96 Route14_EventScript_1AAAAD:: @ 81AAAAD trainerbattle_single TRAINER_BIRD_KEEPER_MITCH, Text_185EDF, Text_185F0B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAAD4 msgbox Text_185F1A, MSGBOX_AUTOCLOSE end @@ -1236,7 +1236,7 @@ EventScript_1AAAD4:: @ 81AAAD4 Route14_EventScript_1AAAEB:: @ 81AAAEB trainerbattle_single TRAINER_BIRD_KEEPER_BECK, Text_185F46, Text_185FAE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAB12 msgbox Text_185FBB, MSGBOX_AUTOCLOSE end @@ -1249,7 +1249,7 @@ EventScript_1AAB12:: @ 81AAB12 Route14_EventScript_1AAB29:: @ 81AAB29 trainerbattle_single TRAINER_BIRD_KEEPER_MARLON, Text_186021, Text_18607C specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAB50 msgbox Text_186091, MSGBOX_AUTOCLOSE end @@ -1262,7 +1262,7 @@ EventScript_1AAB50:: @ 81AAB50 Route14_EventScript_1AAB67:: @ 81AAB67 trainerbattle_double TRAINER_TWINS_KIRI_JAN, Text_1863B7, Text_1863EA, Text_18642E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAB92 msgbox Text_18640D, MSGBOX_AUTOCLOSE end @@ -1275,7 +1275,7 @@ EventScript_1AAB92:: @ 81AAB92 Route14_EventScript_1AABAD:: @ 81AABAD trainerbattle_double TRAINER_TWINS_KIRI_JAN, Text_18645B, Text_186487, Text_1864D3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AABD8 msgbox Text_18649C, MSGBOX_AUTOCLOSE end @@ -1288,7 +1288,7 @@ EventScript_1AABD8:: @ 81AABD8 Route15_EventScript_1AABF3:: @ 81AABF3 trainerbattle_single TRAINER_BIKER_ERNEST, Text_1868B6, Text_1868E8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAC1A msgbox Text_1868F1, MSGBOX_AUTOCLOSE end @@ -1301,7 +1301,7 @@ EventScript_1AAC1A:: @ 81AAC1A Route15_EventScript_1AAC31:: @ 81AAC31 trainerbattle_single TRAINER_BIKER_ALEX, Text_186936, Text_186968 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAC58 msgbox Text_18697C, MSGBOX_AUTOCLOSE end @@ -1314,7 +1314,7 @@ EventScript_1AAC58:: @ 81AAC58 Route15_EventScript_1AAC6F:: @ 81AAC6F trainerbattle_single TRAINER_BEAUTY_GRACE, Text_18678B, Text_1867C1 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAC96 msgbox Text_1867DA, MSGBOX_AUTOCLOSE end @@ -1327,7 +1327,7 @@ EventScript_1AAC96:: @ 81AAC96 Route15_EventScript_1AACAD:: @ 81AACAD trainerbattle_single TRAINER_BEAUTY_OLIVIA, Text_18680C, Text_186841 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AACD4 msgbox Text_18686F, MSGBOX_AUTOCLOSE end @@ -1340,7 +1340,7 @@ EventScript_1AACD4:: @ 81AACD4 Route15_EventScript_1AACEB:: @ 81AACEB trainerbattle_single TRAINER_BIRD_KEEPER_EDWIN, Text_18664F, Text_18667A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAD12 msgbox Text_18668D, MSGBOX_AUTOCLOSE end @@ -1353,7 +1353,7 @@ EventScript_1AAD12:: @ 81AAD12 Route15_EventScript_1AAD29:: @ 81AAD29 trainerbattle_single TRAINER_BIRD_KEEPER_CHESTER, Text_1866D1, Text_186707 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAD50 msgbox Text_18671A, MSGBOX_AUTOCLOSE end @@ -1366,7 +1366,7 @@ EventScript_1AAD50:: @ 81AAD50 Route15_EventScript_1AAD67:: @ 81AAD67 trainerbattle_single TRAINER_PICNICKER_YAZMIN, Text_186A22, Text_186A40 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAD8E msgbox Text_186A55, MSGBOX_AUTOCLOSE end @@ -1379,7 +1379,7 @@ EventScript_1AAD8E:: @ 81AAD8E Route15_EventScript_1AADA5:: @ 81AADA5 trainerbattle_single TRAINER_PICNICKER_KINDRA, Text_18650B, Text_186549 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AADCC msgbox Text_18655A, MSGBOX_AUTOCLOSE end @@ -1392,7 +1392,7 @@ EventScript_1AADCC:: @ 81AADCC Route15_EventScript_1AADE3:: @ 81AADE3 trainerbattle_single TRAINER_PICNICKER_BECKY, Text_1865D3, Text_186612 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAE0A msgbox Text_18661D, MSGBOX_AUTOCLOSE end @@ -1405,7 +1405,7 @@ EventScript_1AAE0A:: @ 81AAE0A Route15_EventScript_1AAE21:: @ 81AAE21 trainerbattle_single TRAINER_PICNICKER_CELIA, Text_1869BA, Text_1869E6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAE48 msgbox Text_1869F4, MSGBOX_AUTOCLOSE end @@ -1418,7 +1418,7 @@ EventScript_1AAE48:: @ 81AAE48 Route15_EventScript_1AAE5F:: @ 81AAE5F trainerbattle_double TRAINER_CRUSH_KIN_RON_MYA, Text_186A95, Text_186ACB, Text_186B46 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAE8A msgbox Text_186B0A, MSGBOX_AUTOCLOSE end @@ -1431,7 +1431,7 @@ EventScript_1AAE8A:: @ 81AAE8A Route15_EventScript_1AAEA5:: @ 81AAEA5 trainerbattle_double TRAINER_CRUSH_KIN_RON_MYA, Text_186B89, Text_186BB1, Text_186BFE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAED0 msgbox Text_186BD2, MSGBOX_AUTOCLOSE end @@ -1444,7 +1444,7 @@ EventScript_1AAED0:: @ 81AAED0 Route16_EventScript_1AAEEB:: @ 81AAEEB trainerbattle_single TRAINER_BIKER_LAO, Text_186C4D, Text_186C5F specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAF12 msgbox Text_186C75, MSGBOX_AUTOCLOSE end @@ -1457,7 +1457,7 @@ EventScript_1AAF12:: @ 81AAF12 Route16_EventScript_1AAF29:: @ 81AAF29 trainerbattle_single TRAINER_BIKER_HIDEO, Text_186D39, Text_186D52 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAF50 msgbox Text_186D5A, MSGBOX_AUTOCLOSE end @@ -1470,7 +1470,7 @@ EventScript_1AAF50:: @ 81AAF50 Route16_EventScript_1AAF67:: @ 81AAF67 trainerbattle_single TRAINER_BIKER_RUBEN, Text_186E86, Text_186EB4 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAF8E msgbox Text_186EC7, MSGBOX_AUTOCLOSE end @@ -1483,7 +1483,7 @@ EventScript_1AAF8E:: @ 81AAF8E Route16_EventScript_1AAFA5:: @ 81AAFA5 trainerbattle_single TRAINER_CUE_BALL_KOJI, Text_186CA2, Text_186CBB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAFCC msgbox Text_186CC5, MSGBOX_AUTOCLOSE end @@ -1496,7 +1496,7 @@ EventScript_1AAFCC:: @ 81AAFCC Route16_EventScript_1AAFE3:: @ 81AAFE3 trainerbattle_single TRAINER_CUE_BALL_LUKE, Text_186CE5, Text_186D06 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB00A msgbox Text_186D16, MSGBOX_AUTOCLOSE end @@ -1509,7 +1509,7 @@ EventScript_1AB00A:: @ 81AB00A Route16_EventScript_1AB021:: @ 81AB021 trainerbattle_single TRAINER_CUE_BALL_CAMRON, Text_186DD9, Text_186E0D specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB048 msgbox Text_186E1C, MSGBOX_AUTOCLOSE end @@ -1522,7 +1522,7 @@ EventScript_1AB048:: @ 81AB048 Route16_EventScript_1AB05F:: @ 81AB05F trainerbattle_double TRAINER_YOUNG_COUPLE_LEA_JED, Text_186FBD, Text_186FFA, Text_187057 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB08A msgbox Text_187027, MSGBOX_AUTOCLOSE end @@ -1535,7 +1535,7 @@ EventScript_1AB08A:: @ 81AB08A Route16_EventScript_1AB0A5:: @ 81AB0A5 trainerbattle_double TRAINER_YOUNG_COUPLE_LEA_JED, Text_187097, Text_1870CC, Text_187120 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB0D0 msgbox Text_1870F9, MSGBOX_AUTOCLOSE end @@ -1548,7 +1548,7 @@ EventScript_1AB0D0:: @ 81AB0D0 Route17_EventScript_1AB0EB:: @ 81AB0EB trainerbattle_single TRAINER_BIKER_BILLY, Text_1872BD, Text_1872E3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB112 msgbox Text_1872EB, MSGBOX_AUTOCLOSE end @@ -1561,7 +1561,7 @@ EventScript_1AB112:: @ 81AB112 Route17_EventScript_1AB129:: @ 81AB129 trainerbattle_single TRAINER_BIKER_NIKOLAS, Text_18730A, Text_187325 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB150 msgbox Text_187333, MSGBOX_AUTOCLOSE end @@ -1574,7 +1574,7 @@ EventScript_1AB150:: @ 81AB150 Route17_EventScript_1AB167:: @ 81AB167 trainerbattle_single TRAINER_BIKER_JAXON, Text_187456, Text_187472 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB18E msgbox Text_187479, MSGBOX_AUTOCLOSE end @@ -1587,7 +1587,7 @@ EventScript_1AB18E:: @ 81AB18E Route17_EventScript_1AB1A5:: @ 81AB1A5 trainerbattle_single TRAINER_BIKER_WILLIAM, Text_18749B, Text_1874B6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB1CC msgbox Text_1874C9, MSGBOX_AUTOCLOSE end @@ -1600,7 +1600,7 @@ EventScript_1AB1CC:: @ 81AB1CC Route17_EventScript_1AB1E3:: @ 81AB1E3 trainerbattle_single TRAINER_CUE_BALL_RAUL, Text_18717E, Text_1871AE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB20A msgbox Text_1871BA, MSGBOX_AUTOCLOSE end @@ -1613,7 +1613,7 @@ EventScript_1AB20A:: @ 81AB20A Route17_EventScript_1AB221:: @ 81AB221 trainerbattle_single TRAINER_CUE_BALL_ISAIAH, Text_187228, Text_187254 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB248 msgbox Text_18725A, MSGBOX_AUTOCLOSE end @@ -1626,7 +1626,7 @@ EventScript_1AB248:: @ 81AB248 Route17_EventScript_1AB25F:: @ 81AB25F trainerbattle_single TRAINER_CUE_BALL_ZEEK, Text_187362, Text_187395 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB286 msgbox Text_18739F, MSGBOX_AUTOCLOSE end @@ -1639,7 +1639,7 @@ EventScript_1AB286:: @ 81AB286 Route17_EventScript_1AB29D:: @ 81AB29D trainerbattle_single TRAINER_CUE_BALL_JAMAL, Text_1873D1, Text_1873EB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB2C4 msgbox Text_1873FF, MSGBOX_AUTOCLOSE end @@ -1652,7 +1652,7 @@ EventScript_1AB2C4:: @ 81AB2C4 Route17_EventScript_1AB2DB:: @ 81AB2DB trainerbattle_single TRAINER_CUE_BALL_COREY, Text_18741D, Text_187429 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB302 msgbox Text_187432, MSGBOX_AUTOCLOSE end @@ -1665,7 +1665,7 @@ EventScript_1AB302:: @ 81AB302 Route17_EventScript_1AB319:: @ 81AB319 trainerbattle_single TRAINER_BIKER_VIRGIL, Text_18727D, Text_187295 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB340 msgbox Text_1872A5, MSGBOX_AUTOCLOSE end @@ -1678,7 +1678,7 @@ EventScript_1AB340:: @ 81AB340 Route18_EventScript_1AB357:: @ 81AB357 trainerbattle_single TRAINER_BIRD_KEEPER_WILTON, Text_187640, Text_187672 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB37E msgbox Text_187677, MSGBOX_AUTOCLOSE end @@ -1691,7 +1691,7 @@ EventScript_1AB37E:: @ 81AB37E Route18_EventScript_1AB395:: @ 81AB395 trainerbattle_single TRAINER_BIRD_KEEPER_RAMIRO, Text_18768C, Text_1876B3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB3BC msgbox Text_1876C5, MSGBOX_AUTOCLOSE end @@ -1704,7 +1704,7 @@ EventScript_1AB3BC:: @ 81AB3BC Route18_EventScript_1AB3D3:: @ 81AB3D3 trainerbattle_single TRAINER_BIRD_KEEPER_JACOB, Text_187704, Text_187726 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB3FA msgbox Text_18772C, MSGBOX_AUTOCLOSE end @@ -1717,7 +1717,7 @@ EventScript_1AB3FA:: @ 81AB3FA Route19_EventScript_1AB411:: @ 81AB411 trainerbattle_single TRAINER_SWIMMER_MALE_RICHARD, Text_1877A3, Text_1877DF specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB438 msgbox Text_1877EE, MSGBOX_AUTOCLOSE end @@ -1730,7 +1730,7 @@ EventScript_1AB438:: @ 81AB438 Route19_EventScript_1AB44F:: @ 81AB44F trainerbattle_single TRAINER_SWIMMER_MALE_REECE, Text_187811, Text_18783E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB476 msgbox Text_187852, MSGBOX_AUTOCLOSE end @@ -1743,7 +1743,7 @@ EventScript_1AB476:: @ 81AB476 Route19_EventScript_1AB48D:: @ 81AB48D trainerbattle_single TRAINER_SWIMMER_MALE_MATTHEW, Text_187884, Text_1878A5 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB4B4 msgbox Text_1878B1, MSGBOX_AUTOCLOSE end @@ -1756,7 +1756,7 @@ EventScript_1AB4B4:: @ 81AB4B4 Route19_EventScript_1AB4CB:: @ 81AB4CB trainerbattle_single TRAINER_SWIMMER_MALE_DOUGLAS, Text_1878DD, Text_1878F8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB4F2 msgbox Text_1878FE, MSGBOX_AUTOCLOSE end @@ -1769,7 +1769,7 @@ EventScript_1AB4F2:: @ 81AB4F2 Route19_EventScript_1AB509:: @ 81AB509 trainerbattle_single TRAINER_SWIMMER_MALE_DAVID, Text_187925, Text_187955 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB530 msgbox Text_18795B, MSGBOX_AUTOCLOSE end @@ -1782,7 +1782,7 @@ EventScript_1AB530:: @ 81AB530 Route19_EventScript_1AB547:: @ 81AB547 trainerbattle_single TRAINER_SWIMMER_MALE_TONY, Text_187985, Text_1879C3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB56E msgbox Text_1879D3, MSGBOX_AUTOCLOSE end @@ -1795,7 +1795,7 @@ EventScript_1AB56E:: @ 81AB56E Route19_EventScript_1AB585:: @ 81AB585 trainerbattle_single TRAINER_SWIMMER_MALE_AXLE, Text_187AFA, Text_187B25 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB5AC msgbox Text_187B35, MSGBOX_AUTOCLOSE end @@ -1808,7 +1808,7 @@ EventScript_1AB5AC:: @ 81AB5AC Route19_EventScript_1AB5C3:: @ 81AB5C3 trainerbattle_single TRAINER_SWIMMER_FEMALE_ANYA, Text_187A11, Text_187A44 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB5EA msgbox Text_187A50, MSGBOX_AUTOCLOSE end @@ -1821,7 +1821,7 @@ EventScript_1AB5EA:: @ 81AB5EA Route19_EventScript_1AB601:: @ 81AB601 trainerbattle_single TRAINER_SWIMMER_FEMALE_ALICE, Text_187A9E, Text_187AC1 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB628 msgbox Text_187ACA, MSGBOX_AUTOCLOSE end @@ -1834,7 +1834,7 @@ EventScript_1AB628:: @ 81AB628 Route19_EventScript_1AB63F:: @ 81AB63F trainerbattle_single TRAINER_SWIMMER_FEMALE_CONNIE, Text_187B5D, Text_187B85 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB666 msgbox Text_187B94, MSGBOX_AUTOCLOSE end @@ -1847,7 +1847,7 @@ EventScript_1AB666:: @ 81AB666 Route19_EventScript_1AB67D:: @ 81AB67D trainerbattle_double TRAINER_SIS_AND_BRO_LIA_LUC, Text_187C32, Text_187C6F, Text_187CF2 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB6A8 msgbox Text_187C9E, MSGBOX_AUTOCLOSE end @@ -1860,7 +1860,7 @@ EventScript_1AB6A8:: @ 81AB6A8 Route19_EventScript_1AB6C3:: @ 81AB6C3 trainerbattle_double TRAINER_SIS_AND_BRO_LIA_LUC, Text_187D45, Text_187D7E, Text_187DE8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB6EE msgbox Text_187DAD, MSGBOX_AUTOCLOSE end @@ -1873,7 +1873,7 @@ EventScript_1AB6EE:: @ 81AB6EE Route20_EventScript_1AB709:: @ 81AB709 trainerbattle_single TRAINER_SWIMMER_MALE_BARRY, Text_187E40, Text_187E7B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB730 msgbox Text_187E83, MSGBOX_AUTOCLOSE end @@ -1886,7 +1886,7 @@ EventScript_1AB730:: @ 81AB730 Route20_EventScript_1AB747:: @ 81AB747 trainerbattle_single TRAINER_SWIMMER_MALE_DEAN, Text_187FDB, Text_187FF7 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB76E msgbox Text_187FFE, MSGBOX_AUTOCLOSE end @@ -1899,7 +1899,7 @@ EventScript_1AB76E:: @ 81AB76E Route20_EventScript_1AB785:: @ 81AB785 trainerbattle_single TRAINER_SWIMMER_MALE_DARRIN, Text_18802E, Text_18805C specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB7AC msgbox Text_18806D, MSGBOX_AUTOCLOSE end @@ -1912,7 +1912,7 @@ EventScript_1AB7AC:: @ 81AB7AC Route20_EventScript_1AB7C3:: @ 81AB7C3 trainerbattle_single TRAINER_SWIMMER_FEMALE_TIFFANY, Text_187F24, Text_187F5A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB7EA msgbox Text_187F61, MSGBOX_AUTOCLOSE end @@ -1925,7 +1925,7 @@ EventScript_1AB7EA:: @ 81AB7EA Route20_EventScript_1AB801:: @ 81AB801 trainerbattle_single TRAINER_SWIMMER_FEMALE_NORA, Text_1880F8, Text_188119 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB828 msgbox Text_188139, MSGBOX_AUTOCLOSE end @@ -1938,7 +1938,7 @@ EventScript_1AB828:: @ 81AB828 Route20_EventScript_1AB83F:: @ 81AB83F trainerbattle_single TRAINER_SWIMMER_FEMALE_MELISSA, Text_188218, Text_18825C specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB866 msgbox Text_18827B, MSGBOX_AUTOCLOSE end @@ -1951,7 +1951,7 @@ EventScript_1AB866:: @ 81AB866 Route20_EventScript_1AB87D:: @ 81AB87D trainerbattle_single TRAINER_SWIMMER_FEMALE_SHIRLEY, Text_187EBB, Text_187EED specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB8A4 msgbox Text_187EF6, MSGBOX_AUTOCLOSE end @@ -1964,7 +1964,7 @@ EventScript_1AB8A4:: @ 81AB8A4 Route20_EventScript_1AB8BB:: @ 81AB8BB trainerbattle_single TRAINER_BIRD_KEEPER_ROGER, Text_18808E, Text_1880AB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB8E2 msgbox Text_1880C8, MSGBOX_AUTOCLOSE end @@ -1977,7 +1977,7 @@ EventScript_1AB8E2:: @ 81AB8E2 Route20_EventScript_1AB8F9:: @ 81AB8F9 trainerbattle_single TRAINER_PICNICKER_MISSY, Text_188165, Text_1881A3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB920 msgbox Text_1881B8, MSGBOX_AUTOCLOSE end @@ -1990,7 +1990,7 @@ EventScript_1AB920:: @ 81AB920 Route20_EventScript_1AB937:: @ 81AB937 trainerbattle_single TRAINER_PICNICKER_IRENE, Text_187F78, Text_187F92 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB95E msgbox Text_187FA3, MSGBOX_AUTOCLOSE end @@ -2003,7 +2003,7 @@ EventScript_1AB95E:: @ 81AB95E Route21_North_EventScript_1AB975:: @ 81AB975 trainerbattle_single TRAINER_FISHERMAN_RONALD, Text_18835A, Text_188383 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB99C msgbox Text_188389, MSGBOX_AUTOCLOSE end @@ -2016,7 +2016,7 @@ EventScript_1AB99C:: @ 81AB99C Route21_South_EventScript_1AB9B3:: @ 81AB9B3 trainerbattle_single TRAINER_FISHERMAN_CLAUDE, Text_1885D8, Text_1885F8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB9DA msgbox Text_188632, MSGBOX_AUTOCLOSE end @@ -2029,7 +2029,7 @@ EventScript_1AB9DA:: @ 81AB9DA Route21_North_EventScript_1AB9F1:: @ 81AB9F1 trainerbattle_single TRAINER_FISHERMAN_WADE, Text_1883C6, Text_1883E9 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABA18 msgbox Text_18841D, MSGBOX_AUTOCLOSE end @@ -2042,7 +2042,7 @@ EventScript_1ABA18:: @ 81ABA18 Route21_South_EventScript_1ABA2F:: @ 81ABA2F trainerbattle_single TRAINER_FISHERMAN_NOLAN, Text_18868C, Text_1886AE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABA56 msgbox Text_1886C5, MSGBOX_AUTOCLOSE end @@ -2055,7 +2055,7 @@ EventScript_1ABA56:: @ 81ABA56 Route21_North_EventScript_1ABA6D:: @ 81ABA6D trainerbattle_single TRAINER_SWIMMER_MALE_SPENCER, Text_18843C, Text_18845F specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABA94 msgbox Text_188465, MSGBOX_AUTOCLOSE end @@ -2068,7 +2068,7 @@ EventScript_1ABA94:: @ 81ABA94 Route21_South_EventScript_1ABAAB:: @ 81ABAAB trainerbattle_single TRAINER_SWIMMER_MALE_JACK, Text_1884D4, Text_1884F0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABAD2 msgbox Text_1884FF, MSGBOX_AUTOCLOSE end @@ -2081,7 +2081,7 @@ EventScript_1ABAD2:: @ 81ABAD2 Route21_South_EventScript_1ABAE9:: @ 81ABAE9 trainerbattle_single TRAINER_SWIMMER_MALE_JEROME, Text_18851F, Text_188543 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABB10 msgbox Text_188555, MSGBOX_AUTOCLOSE end @@ -2094,7 +2094,7 @@ EventScript_1ABB10:: @ 81ABB10 Route21_South_EventScript_1ABB27:: @ 81ABB27 trainerbattle_single TRAINER_SWIMMER_MALE_ROLAND, Text_188592, Text_1885B2 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABB4E msgbox Text_1885BF, MSGBOX_AUTOCLOSE end @@ -2107,7 +2107,7 @@ EventScript_1ABB4E:: @ 81ABB4E Route21_North_EventScript_1ABB65:: @ 81ABB65 trainerbattle_double TRAINER_SIS_AND_BRO_LIL_IAN, Text_1886E2, Text_188712, Text_18875E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABB90 msgbox Text_188734, MSGBOX_AUTOCLOSE end @@ -2120,7 +2120,7 @@ EventScript_1ABB90:: @ 81ABB90 Route21_North_EventScript_1ABBAB:: @ 81ABBAB trainerbattle_double TRAINER_SIS_AND_BRO_LIL_IAN, Text_1887B4, Text_1887F1, Text_188850 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABBD6 msgbox Text_188812, MSGBOX_AUTOCLOSE end @@ -2133,7 +2133,7 @@ EventScript_1ABBD6:: @ 81ABBD6 OneIsland_KindleRoad_EventScript_1ABBF1:: @ 81ABBF1 trainerbattle_single TRAINER_SWIMMER_FEMALE_MARIA, Text_18961F, Text_18964D specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABC18 msgbox Text_189657, MSGBOX_AUTOCLOSE end @@ -2146,7 +2146,7 @@ EventScript_1ABC18:: @ 81ABC18 OneIsland_KindleRoad_EventScript_1ABC2F:: @ 81ABC2F trainerbattle_single TRAINER_SWIMMER_FEMALE_ABIGAIL, Text_18968C, Text_1896AC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABC56 msgbox Text_1896C1, MSGBOX_AUTOCLOSE end @@ -2159,7 +2159,7 @@ EventScript_1ABC56:: @ 81ABC56 OneIsland_KindleRoad_EventScript_1ABC6D:: @ 81ABC6D trainerbattle_single TRAINER_SWIMMER_MALE_FINN, Text_1896F9, Text_189728 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABC94 msgbox Text_189740, MSGBOX_AUTOCLOSE end @@ -2172,7 +2172,7 @@ EventScript_1ABC94:: @ 81ABC94 OneIsland_KindleRoad_EventScript_1ABCAB:: @ 81ABCAB trainerbattle_single TRAINER_SWIMMER_MALE_GARRETT, Text_189767, Text_1897A4 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABCD2 msgbox Text_1897C5, MSGBOX_AUTOCLOSE end @@ -2185,7 +2185,7 @@ EventScript_1ABCD2:: @ 81ABCD2 OneIsland_KindleRoad_EventScript_1ABCE9:: @ 81ABCE9 trainerbattle_single TRAINER_FISHERMAN_TOMMY, Text_1897FF, Text_189833 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABD10 msgbox Text_18984B, MSGBOX_AUTOCLOSE end @@ -2198,7 +2198,7 @@ EventScript_1ABD10:: @ 81ABD10 OneIsland_KindleRoad_EventScript_1ABD27:: @ 81ABD27 trainerbattle_single TRAINER_CRUSH_GIRL_SHARON, Text_189883, Text_1898AB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABD4E msgbox Text_1898C4, MSGBOX_AUTOCLOSE end @@ -2211,7 +2211,7 @@ EventScript_1ABD4E:: @ 81ABD4E OneIsland_KindleRoad_EventScript_1ABD65:: @ 81ABD65 trainerbattle_single TRAINER_CRUSH_GIRL_TANYA, Text_1898F0, Text_18991B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABD8C msgbox Text_18992C, MSGBOX_AUTOCLOSE end @@ -2224,7 +2224,7 @@ EventScript_1ABD8C:: @ 81ABD8C OneIsland_KindleRoad_EventScript_1ABDA3:: @ 81ABDA3 trainerbattle_single TRAINER_BLACK_BELT_SHEA, Text_189950, Text_18998C specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABDCA msgbox Text_189998, MSGBOX_AUTOCLOSE end @@ -2237,7 +2237,7 @@ EventScript_1ABDCA:: @ 81ABDCA OneIsland_KindleRoad_EventScript_1ABDE1:: @ 81ABDE1 trainerbattle_single TRAINER_BLACK_BELT_HUGH, Text_1899CE, Text_189A0A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABE08 msgbox Text_189A13, MSGBOX_AUTOCLOSE end @@ -2250,7 +2250,7 @@ EventScript_1ABE08:: @ 81ABE08 OneIsland_KindleRoad_EventScript_1ABE1F:: @ 81ABE1F trainerbattle_single TRAINER_CAMPER_BRYCE, Text_189A53, Text_189A92 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABE46 msgbox Text_189A9F, MSGBOX_AUTOCLOSE end @@ -2263,7 +2263,7 @@ EventScript_1ABE46:: @ 81ABE46 OneIsland_KindleRoad_EventScript_1ABE5D:: @ 81ABE5D trainerbattle_single TRAINER_PICNICKER_CLAIRE, Text_189ACB, Text_189B0B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABE84 msgbox Text_189B24, MSGBOX_AUTOCLOSE end @@ -2276,7 +2276,7 @@ EventScript_1ABE84:: @ 81ABE84 OneIsland_KindleRoad_EventScript_1ABE9B:: @ 81ABE9B trainerbattle_double TRAINER_CRUSH_KIN_MIK_KIA, Text_189B4D, Text_189B84, Text_189BDE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABEC6 msgbox Text_189BA3, MSGBOX_AUTOCLOSE end @@ -2289,7 +2289,7 @@ EventScript_1ABEC6:: @ 81ABEC6 OneIsland_KindleRoad_EventScript_1ABEE1:: @ 81ABEE1 trainerbattle_double TRAINER_CRUSH_KIN_MIK_KIA, Text_189C33, Text_189C62, Text_189CAB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABF0C msgbox Text_189C7E, MSGBOX_AUTOCLOSE end @@ -2302,7 +2302,7 @@ EventScript_1ABF0C:: @ 81ABF0C OneIsland_TreasureBeach_EventScript_1ABF27:: @ 81ABF27 trainerbattle_single TRAINER_SWIMMER_FEMALE_AMARA, Text_189D5A, Text_189D8B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABF4E msgbox Text_189DA3, MSGBOX_AUTOCLOSE end @@ -2315,7 +2315,7 @@ EventScript_1ABF4E:: @ 81ABF4E ThreeIsland_BondBridge_EventScript_1ABF65:: @ 81ABF65 trainerbattle_single TRAINER_AROMA_LADY_NIKKI, Text_189E42, Text_189E72 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABF8C msgbox Text_189E9E, MSGBOX_AUTOCLOSE end @@ -2328,7 +2328,7 @@ EventScript_1ABF8C:: @ 81ABF8C ThreeIsland_BondBridge_EventScript_1ABFA3:: @ 81ABFA3 trainerbattle_single TRAINER_AROMA_LADY_VIOLET, Text_189ED4, Text_189EFA specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABFCA msgbox Text_189F21, MSGBOX_AUTOCLOSE end @@ -2341,7 +2341,7 @@ EventScript_1ABFCA:: @ 81ABFCA ThreeIsland_BondBridge_EventScript_1ABFE1:: @ 81ABFE1 trainerbattle_single TRAINER_TUBER_AMIRA, Text_189F63, Text_189F9A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC008 msgbox Text_189FA8, MSGBOX_AUTOCLOSE end @@ -2354,7 +2354,7 @@ EventScript_1AC008:: @ 81AC008 ThreeIsland_BondBridge_EventScript_1AC01F:: @ 81AC01F trainerbattle_single TRAINER_TUBER_ALEXIS, Text_189FDB, Text_189FEE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC046 msgbox Text_18A000, MSGBOX_AUTOCLOSE end @@ -2367,7 +2367,7 @@ EventScript_1AC046:: @ 81AC046 ThreeIsland_BondBridge_EventScript_1AC05D:: @ 81AC05D trainerbattle_single TRAINER_SWIMMER_FEMALE_TISHA, Text_18A01F, Text_18A053 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC084 msgbox Text_18A082, MSGBOX_AUTOCLOSE end @@ -2380,7 +2380,7 @@ EventScript_1AC084:: @ 81AC084 ThreeIsland_BondBridge_EventScript_1AC09B:: @ 81AC09B trainerbattle_double TRAINER_TWINS_JOY_MEG, Text_18A0C4, Text_18A0F7, Text_18A138 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC0C6 msgbox Text_18A106, MSGBOX_AUTOCLOSE end @@ -2393,7 +2393,7 @@ EventScript_1AC0C6:: @ 81AC0C6 ThreeIsland_BondBridge_EventScript_1AC0E1:: @ 81AC0E1 trainerbattle_double TRAINER_TWINS_JOY_MEG, Text_18A179, Text_18A1A3, Text_18A1CD specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC10C msgbox Text_18A1B2, MSGBOX_AUTOCLOSE end @@ -2406,7 +2406,7 @@ EventScript_1AC10C:: @ 81AC10C FiveIsland_ResortGorgeous_EventScript_1AC127:: @ 81AC127 trainerbattle_single TRAINER_PAINTER_DAISY, Text_18A3E2, Text_18A40E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC14E msgbox Text_18A430, MSGBOX_AUTOCLOSE end @@ -2419,7 +2419,7 @@ EventScript_1AC14E:: @ 81AC14E FiveIsland_ResortGorgeous_EventScript_1AC165:: @ 81AC165 trainerbattle_single TRAINER_PAINTER_CELINA, Text_18A461, Text_18A49E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC18C msgbox Text_18A4C6, MSGBOX_AUTOCLOSE end @@ -2432,7 +2432,7 @@ EventScript_1AC18C:: @ 81AC18C FiveIsland_ResortGorgeous_EventScript_1AC1A3:: @ 81AC1A3 trainerbattle_single TRAINER_PAINTER_RAYNA, Text_18A50E, Text_18A535 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC1CA msgbox Text_18A555, MSGBOX_AUTOCLOSE end @@ -2445,7 +2445,7 @@ EventScript_1AC1CA:: @ 81AC1CA FiveIsland_ResortGorgeous_EventScript_1AC1E1:: @ 81AC1E1 trainerbattle_single TRAINER_LADY_JACKI, Text_18A5B9, Text_18A5EE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC208 msgbox Text_18A601, MSGBOX_AUTOCLOSE end @@ -2458,7 +2458,7 @@ EventScript_1AC208:: @ 81AC208 FiveIsland_ResortGorgeous_EventScript_1AC21F:: @ 81AC21F trainerbattle_single TRAINER_LADY_GILLIAN, Text_18A645, Text_18A67F specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC246 msgbox Text_18A699, MSGBOX_AUTOCLOSE end @@ -2471,7 +2471,7 @@ EventScript_1AC246:: @ 81AC246 FiveIsland_ResortGorgeous_EventScript_1AC25D:: @ 81AC25D trainerbattle_single TRAINER_YOUNGSTER_DESTIN, Text_18A6DA, Text_18A6FE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC284 msgbox Text_18A715, MSGBOX_AUTOCLOSE end @@ -2484,7 +2484,7 @@ EventScript_1AC284:: @ 81AC284 FiveIsland_ResortGorgeous_EventScript_1AC29B:: @ 81AC29B trainerbattle_single TRAINER_SWIMMER_MALE_TOBY, Text_18A74A, Text_18A786 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC2C2 msgbox Text_18A7AC, MSGBOX_AUTOCLOSE end @@ -2497,7 +2497,7 @@ EventScript_1AC2C2:: @ 81AC2C2 FiveIsland_WaterLabyrinth_EventScript_1AC2D9:: @ 81AC2D9 trainerbattle_single TRAINER_PKMN_BREEDER_ALIZE, Text_18AAD5, Text_18AB0B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC300 msgbox Text_18AB37, MSGBOX_AUTOCLOSE end @@ -2510,7 +2510,7 @@ EventScript_1AC300:: @ 81AC300 FiveIsland_MemorialPillar_EventScript_1AC317:: @ 81AC317 trainerbattle_single TRAINER_BIRD_KEEPER_MILO, Text_18AE50, Text_18AEA8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC33E msgbox Text_18AEB6, MSGBOX_AUTOCLOSE end @@ -2523,7 +2523,7 @@ EventScript_1AC33E:: @ 81AC33E FiveIsland_MemorialPillar_EventScript_1AC355:: @ 81AC355 trainerbattle_single TRAINER_BIRD_KEEPER_CHAZ, Text_18AEDC, Text_18AF39 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC37C msgbox Text_18AF45, MSGBOX_AUTOCLOSE end @@ -2536,7 +2536,7 @@ EventScript_1AC37C:: @ 81AC37C FiveIsland_MemorialPillar_EventScript_1AC393:: @ 81AC393 trainerbattle_single TRAINER_BIRD_KEEPER_HAROLD, Text_18AF72, Text_18AFCC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC3BA msgbox Text_18AFF2, MSGBOX_AUTOCLOSE end @@ -2549,7 +2549,7 @@ EventScript_1AC3BA:: @ 81AC3BA SixIsland_OutcastIsland_EventScript_1AC3D1:: @ 81AC3D1 trainerbattle_single TRAINER_FISHERMAN_TYLOR, Text_18B400, Text_18B43B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC3F8 msgbox Text_18B451, MSGBOX_AUTOCLOSE end @@ -2562,7 +2562,7 @@ EventScript_1AC3F8:: @ 81AC3F8 SixIsland_OutcastIsland_EventScript_1AC40F:: @ 81AC40F trainerbattle_single TRAINER_SWIMMER_MALE_MYMO, Text_18B48F, Text_18B4C5 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC436 msgbox Text_18B4D1, MSGBOX_AUTOCLOSE end @@ -2575,7 +2575,7 @@ EventScript_1AC436:: @ 81AC436 SixIsland_OutcastIsland_EventScript_1AC44D:: @ 81AC44D trainerbattle_single TRAINER_SWIMMER_FEMALE_NICOLE, Text_18B4FA, Text_18B539 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC474 msgbox Text_18B573, MSGBOX_AUTOCLOSE end @@ -2588,7 +2588,7 @@ EventScript_1AC474:: @ 81AC474 SixIsland_OutcastIsland_EventScript_1AC48B:: @ 81AC48B trainerbattle_double TRAINER_SIS_AND_BRO_AVA_GEB, Text_18B5C8, Text_18B5F4, Text_18B660 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC4B6 msgbox Text_18B62E, MSGBOX_AUTOCLOSE end @@ -2601,7 +2601,7 @@ EventScript_1AC4B6:: @ 81AC4B6 SixIsland_OutcastIsland_EventScript_1AC4D1:: @ 81AC4D1 trainerbattle_double TRAINER_SIS_AND_BRO_AVA_GEB, Text_18B6C1, Text_18B6EF, Text_18B762 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC4FC msgbox Text_18B720, MSGBOX_AUTOCLOSE end @@ -2614,7 +2614,7 @@ EventScript_1AC4FC:: @ 81AC4FC SixIsland_GreenPath_EventScript_1AC517:: @ 81AC517 trainerbattle_single TRAINER_PSYCHIC_JACLYN, Text_18B7B0, Text_18B7F0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC53E msgbox Text_18B7FD, MSGBOX_AUTOCLOSE end @@ -2627,7 +2627,7 @@ EventScript_1AC53E:: @ 81AC53E SixIsland_WaterPath_EventScript_1AC555:: @ 81AC555 trainerbattle_single TRAINER_AROMA_LADY_ROSE, Text_18B896, Text_18B8C8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC57C msgbox Text_18B8F7, MSGBOX_AUTOCLOSE end @@ -2640,7 +2640,7 @@ EventScript_1AC57C:: @ 81AC57C SixIsland_WaterPath_EventScript_1AC593:: @ 81AC593 trainerbattle_single TRAINER_JUGGLER_EDWARD, Text_18B959, Text_18B988 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC5BA msgbox Text_18B9A5, MSGBOX_AUTOCLOSE end @@ -2653,7 +2653,7 @@ EventScript_1AC5BA:: @ 81AC5BA SixIsland_WaterPath_EventScript_1AC5D1:: @ 81AC5D1 trainerbattle_single TRAINER_SWIMMER_MALE_SAMIR, Text_18B9EC, Text_18BA47 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC5F8 msgbox Text_18BA57, MSGBOX_AUTOCLOSE end @@ -2666,7 +2666,7 @@ EventScript_1AC5F8:: @ 81AC5F8 SixIsland_WaterPath_EventScript_1AC60F:: @ 81AC60F trainerbattle_single TRAINER_SWIMMER_FEMALE_DENISE, Text_18BA86, Text_18BAC0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC636 msgbox Text_18BAE0, MSGBOX_AUTOCLOSE end @@ -2679,7 +2679,7 @@ EventScript_1AC636:: @ 81AC636 SixIsland_WaterPath_EventScript_1AC64D:: @ 81AC64D trainerbattle_double TRAINER_TWINS_MIU_MIA, Text_18BBBA, Text_18BBE2, Text_18BC24 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC678 msgbox Text_18BBF6, MSGBOX_AUTOCLOSE end @@ -2692,7 +2692,7 @@ EventScript_1AC678:: @ 81AC678 SixIsland_WaterPath_EventScript_1AC693:: @ 81AC693 trainerbattle_double TRAINER_TWINS_MIU_MIA, Text_18BC5A, Text_18BC84, Text_18BCCF specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC6BE msgbox Text_18BCAE, MSGBOX_AUTOCLOSE end @@ -2705,7 +2705,7 @@ EventScript_1AC6BE:: @ 81AC6BE SixIsland_WaterPath_EventScript_1AC6D9:: @ 81AC6D9 trainerbattle_single TRAINER_HIKER_EARL, Text_18BB2D, Text_18BB62 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC700 msgbox Text_18BB8B, MSGBOX_AUTOCLOSE end @@ -2718,7 +2718,7 @@ EventScript_1AC700:: @ 81AC700 SixIsland_RuinValley_EventScript_1AC717:: @ 81AC717 trainerbattle_single TRAINER_RUIN_MANIAC_STANLY, Text_18BE5D, Text_18BE9B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC73E msgbox Text_18BEA0, MSGBOX_AUTOCLOSE end @@ -2731,7 +2731,7 @@ EventScript_1AC73E:: @ 81AC73E SixIsland_RuinValley_EventScript_1AC755:: @ 81AC755 trainerbattle_single TRAINER_RUIN_MANIAC_FOSTER, Text_18BF05, Text_18BF33 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC77C msgbox Text_18BF6C, MSGBOX_AUTOCLOSE end @@ -2744,7 +2744,7 @@ EventScript_1AC77C:: @ 81AC77C SixIsland_RuinValley_EventScript_1AC793:: @ 81AC793 trainerbattle_single TRAINER_RUIN_MANIAC_LARRY, Text_18BFC5, Text_18C03B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC7BA msgbox Text_18C04C, MSGBOX_AUTOCLOSE end @@ -2757,7 +2757,7 @@ EventScript_1AC7BA:: @ 81AC7BA SixIsland_RuinValley_EventScript_1AC7D1:: @ 81AC7D1 trainerbattle_single TRAINER_HIKER_DARYL, Text_18C09C, Text_18C0BB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC7F8 msgbox Text_18C0EA, MSGBOX_AUTOCLOSE end @@ -2770,7 +2770,7 @@ EventScript_1AC7F8:: @ 81AC7F8 SixIsland_RuinValley_EventScript_1AC80F:: @ 81AC80F trainerbattle_single TRAINER_POKEMANIAC_HECTOR, Text_18C10A, Text_18C140 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC836 msgbox Text_18C17A, MSGBOX_AUTOCLOSE end @@ -2783,7 +2783,7 @@ EventScript_1AC836:: @ 81AC836 SevenIsland_TrainerTower_EventScript_1AC84D:: @ 81AC84D trainerbattle_single TRAINER_PSYCHIC_DARIO, Text_18C1ED, Text_18C205 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC874 msgbox Text_18C20E, MSGBOX_AUTOCLOSE end @@ -2796,7 +2796,7 @@ EventScript_1AC874:: @ 81AC874 SevenIsland_TrainerTower_EventScript_1AC88B:: @ 81AC88B trainerbattle_single TRAINER_PSYCHIC_RODETTE, Text_18C283, Text_18C2BC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC8B2 msgbox Text_18C2D5, MSGBOX_AUTOCLOSE end @@ -2809,7 +2809,7 @@ EventScript_1AC8B2:: @ 81AC8B2 SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9:: @ 81AC8C9 trainerbattle_single TRAINER_AROMA_LADY_MIAH, Text_18C3BC, Text_18C3E7 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC8F0 msgbox Text_18C3FF, MSGBOX_AUTOCLOSE end @@ -2822,7 +2822,7 @@ EventScript_1AC8F0:: @ 81AC8F0 SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907:: @ 81AC907 trainerbattle_double TRAINER_YOUNG_COUPLE_EVE_JON, Text_18C632, Text_18C662, Text_18C6AB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC932 msgbox Text_18C683, MSGBOX_AUTOCLOSE end @@ -2835,7 +2835,7 @@ EventScript_1AC932:: @ 81AC932 SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D:: @ 81AC94D trainerbattle_double TRAINER_YOUNG_COUPLE_EVE_JON, Text_18C700, Text_18C73B, Text_18C7BD specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC978 msgbox Text_18C773, MSGBOX_AUTOCLOSE end @@ -2848,7 +2848,7 @@ EventScript_1AC978:: @ 81AC978 SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993:: @ 81AC993 trainerbattle_single TRAINER_JUGGLER_MASON, Text_18C44B, Text_18C473 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC9BA msgbox Text_18C4BA, MSGBOX_AUTOCLOSE end @@ -2861,7 +2861,7 @@ EventScript_1AC9BA:: @ 81AC9BA SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1:: @ 81AC9D1 trainerbattle_single TRAINER_PKMN_RANGER_NICOLAS, Text_18C500, Text_18C543 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC9F8 msgbox Text_18C54B, MSGBOX_AUTOCLOSE end @@ -2874,7 +2874,7 @@ EventScript_1AC9F8:: @ 81AC9F8 SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F:: @ 81ACA0F trainerbattle_single TRAINER_PKMN_RANGER_MADELINE, Text_18C5AA, Text_18C5CD specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACA36 msgbox Text_18C5F5, MSGBOX_AUTOCLOSE end @@ -2887,7 +2887,7 @@ EventScript_1ACA36:: @ 81ACA36 SevenIsland_SevaultCanyon_EventScript_1ACA4D:: @ 81ACA4D trainerbattle_single TRAINER_CRUSH_GIRL_CYNDY, Text_18C887, Text_18C8A6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACA74 msgbox Text_18C8C2, MSGBOX_AUTOCLOSE end @@ -2900,7 +2900,7 @@ EventScript_1ACA74:: @ 81ACA74 SevenIsland_SevaultCanyon_EventScript_1ACA8B:: @ 81ACA8B trainerbattle_single TRAINER_TAMER_EVAN, Text_18C8FD, Text_18C980 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACAB2 msgbox Text_18C999, MSGBOX_AUTOCLOSE end @@ -2913,7 +2913,7 @@ EventScript_1ACAB2:: @ 81ACAB2 SevenIsland_SevaultCanyon_EventScript_1ACAC9:: @ 81ACAC9 trainerbattle_single TRAINER_PKMN_RANGER_JACKSON, Text_18CA2F, Text_18CA6F specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACAF0 msgbox Text_18CA9C, MSGBOX_AUTOCLOSE end @@ -2926,7 +2926,7 @@ EventScript_1ACAF0:: @ 81ACAF0 SevenIsland_SevaultCanyon_EventScript_1ACB07:: @ 81ACB07 trainerbattle_single TRAINER_PKMN_RANGER_KATELYN, Text_18CB16, Text_18CB3E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACB2E msgbox Text_18CB6C, MSGBOX_AUTOCLOSE end @@ -2939,7 +2939,7 @@ EventScript_1ACB2E:: @ 81ACB2E SevenIsland_SevaultCanyon_EventScript_1ACB45:: @ 81ACB45 trainerbattle_single TRAINER_COOLTRAINER_LEROY, Text_18CBB4, Text_18CBE0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACB6C msgbox Text_18CC09, MSGBOX_AUTOCLOSE end @@ -2952,7 +2952,7 @@ EventScript_1ACB6C:: @ 81ACB6C SevenIsland_SevaultCanyon_EventScript_1ACB83:: @ 81ACB83 trainerbattle_single TRAINER_COOLTRAINER_MICHELLE, Text_18CC4F, Text_18CCAE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACBAA msgbox Text_18CCEA, MSGBOX_AUTOCLOSE end @@ -2965,7 +2965,7 @@ EventScript_1ACBAA:: @ 81ACBAA SevenIsland_SevaultCanyon_EventScript_1ACBC1:: @ 81ACBC1 trainerbattle_double TRAINER_COOL_COUPLE_LEX_NYA, Text_18CD49, Text_18CD75, Text_18CDE2 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACBEC msgbox Text_18CD9C, MSGBOX_AUTOCLOSE end @@ -2978,7 +2978,7 @@ EventScript_1ACBEC:: @ 81ACBEC SevenIsland_SevaultCanyon_EventScript_1ACC07:: @ 81ACC07 trainerbattle_double TRAINER_COOL_COUPLE_LEX_NYA, Text_18CE20, Text_18CE5A, Text_18CEF4 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACC32 msgbox Text_18CE78, MSGBOX_AUTOCLOSE end @@ -2988,54 +2988,54 @@ EventScript_1ACC32:: @ 81ACC32 msgbox Text_18CE78, MSGBOX_AUTOCLOSE end -SevenIsland_TanobyRuins_EventScript_1ACC4D:: @ 81ACC4D - trainerbattle_single TRAINER_RUIN_MANIAC_BRANDON, Text_18CFFB, Text_18D02A +SevenIsland_TanobyRuins_EventScript_Brandon:: @ 81ACC4D + trainerbattle_single TRAINER_RUIN_MANIAC_BRANDON, SevenIsland_TanobyRuins_Text_BrandonIntro, SevenIsland_TanobyRuins_Text_BrandonDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1ACC74 - msgbox Text_18D061, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq SevenIsland_TanobyRuins_EventScript_RematchBrandon + msgbox SevenIsland_TanobyRuins_Text_BrandonPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ACC74:: @ 81ACC74 - trainerbattle_rematch TRAINER_RUIN_MANIAC_BRANDON, Text_1C46D3, Text_18D02A - msgbox Text_18D061, MSGBOX_AUTOCLOSE +SevenIsland_TanobyRuins_EventScript_RematchBrandon:: @ 81ACC74 + trainerbattle_rematch TRAINER_RUIN_MANIAC_BRANDON, SevenIsland_TanobyRuins_Text_BrandonRematchIntro, SevenIsland_TanobyRuins_Text_BrandonDefeat + msgbox SevenIsland_TanobyRuins_Text_BrandonPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_TanobyRuins_EventScript_1ACC8B:: @ 81ACC8B - trainerbattle_single TRAINER_RUIN_MANIAC_BENJAMIN, Text_18D0D9, Text_18D108 +SevenIsland_TanobyRuins_EventScript_Benjamin:: @ 81ACC8B + trainerbattle_single TRAINER_RUIN_MANIAC_BENJAMIN, SevenIsland_TanobyRuins_Text_BenjaminIntro, SevenIsland_TanobyRuins_Text_BenjaminDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1ACCB2 - msgbox Text_18D125, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq SevenIsland_TanobyRuins_EventScript_RematchBenjamin + msgbox SevenIsland_TanobyRuins_Text_BenjaminPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ACCB2:: @ 81ACCB2 - trainerbattle_rematch TRAINER_RUIN_MANIAC_BENJAMIN, Text_1C470A, Text_18D108 - msgbox Text_18D125, MSGBOX_AUTOCLOSE +SevenIsland_TanobyRuins_EventScript_RematchBenjamin:: @ 81ACCB2 + trainerbattle_rematch TRAINER_RUIN_MANIAC_BENJAMIN, SevenIsland_TanobyRuins_Text_BenjaminRematchIntro, SevenIsland_TanobyRuins_Text_BenjaminDefeat + msgbox SevenIsland_TanobyRuins_Text_BenjaminPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_TanobyRuins_EventScript_1ACCC9:: @ 81ACCC9 - trainerbattle_single TRAINER_PAINTER_EDNA, Text_18D18F, Text_18D1B5 +SevenIsland_TanobyRuins_EventScript_Edna:: @ 81ACCC9 + trainerbattle_single TRAINER_PAINTER_EDNA, SevenIsland_TanobyRuins_Text_EdnaIntro, SevenIsland_TanobyRuins_Text_EdnaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1ACCF0 - msgbox Text_18D1E3, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq SevenIsland_TanobyRuins_EventScript_RematchEdna + msgbox SevenIsland_TanobyRuins_Text_EdnaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ACCF0:: @ 81ACCF0 - trainerbattle_rematch TRAINER_PAINTER_EDNA, Text_1C4739, Text_18D1B5 - msgbox Text_18D1E3, MSGBOX_AUTOCLOSE +SevenIsland_TanobyRuins_EventScript_RematchEdna:: @ 81ACCF0 + trainerbattle_rematch TRAINER_PAINTER_EDNA, SevenIsland_TanobyRuins_Text_EdnaRematchIntro, SevenIsland_TanobyRuins_Text_EdnaDefeat + msgbox SevenIsland_TanobyRuins_Text_EdnaPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_TanobyRuins_EventScript_1ACD07:: @ 81ACD07 - trainerbattle_single TRAINER_GENTLEMAN_CLIFFORD, Text_18D22F, Text_18D26D +SevenIsland_TanobyRuins_EventScript_Clifford:: @ 81ACD07 + trainerbattle_single TRAINER_GENTLEMAN_CLIFFORD, SevenIsland_TanobyRuins_Text_CliffordIntro, SevenIsland_TanobyRuins_Text_CliffordDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1ACD2E - msgbox Text_18D284, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq SevenIsland_TanobyRuins_EventScript_RematchClifford + msgbox SevenIsland_TanobyRuins_Text_CliffordPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ACD2E:: @ 81ACD2E - trainerbattle_rematch TRAINER_GENTLEMAN_CLIFFORD, Text_1C476A, Text_18D26D - msgbox Text_18D284, MSGBOX_AUTOCLOSE +SevenIsland_TanobyRuins_EventScript_RematchClifford:: @ 81ACD2E + trainerbattle_rematch TRAINER_GENTLEMAN_CLIFFORD, SevenIsland_TanobyRuins_Text_CliffordRematchIntro, SevenIsland_TanobyRuins_Text_CliffordDefeat + msgbox SevenIsland_TanobyRuins_Text_CliffordPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/text/trainers.inc b/data/text/trainers.inc index 21a96a964..471c54a4b 100644 --- a/data/text/trainers.inc +++ b/data/text/trainers.inc @@ -989,18 +989,18 @@ Text_1C4699:: @ 81C4699 .string "NYA: I won't drag down my mentor\n" .string "LEX! We're going to win!$" -Text_1C46D3:: @ 81C46D3 +SevenIsland_TanobyRuins_Text_BrandonRematchIntro:: @ 81C46D3 .string "Have you discovered anything about\n" .string "this stone chamber?$" -Text_1C470A:: @ 81C470A +SevenIsland_TanobyRuins_Text_BenjaminRematchIntro:: @ 81C470A .string "A mystic POKéMON is said to sleep\n" .string "inside here.$" -Text_1C4739:: @ 81C4739 +SevenIsland_TanobyRuins_Text_EdnaRematchIntro:: @ 81C4739 .string "My teacher is showing me how to\n" .string "paint some more.$" -Text_1C476A:: @ 81C476A +SevenIsland_TanobyRuins_Text_CliffordRematchIntro:: @ 81C476A .string "Today, in addition to our lesson,\n" .string "we came to see the chamber again.$" -- cgit v1.2.3 From f6af394f2a252a6f8941172ce08f4b38f7d8a643 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 28 Jan 2020 16:40:19 -0500 Subject: Label tilesets and remaining layouts --- data/event_scripts.s | 8 +- data/graphics.s | 128 +- .../layouts/CeladonCity_Hotel_Duplicate/border.bin | Bin 0 -> 8 bytes data/layouts/CeladonCity_Hotel_Duplicate/map.bin | 1 + .../CeladonCity_Restaurant_Duplicate/border.bin | Bin 0 -> 8 bytes .../CeladonCity_Restaurant_Duplicate/map.bin | 1 + data/layouts/EverGrandeCity_HallOfFame/border.bin | Bin 0 -> 8 bytes data/layouts/EverGrandeCity_HallOfFame/map.bin | 1 + data/layouts/FortreeCity_DecorationShop/border.bin | 1 + data/layouts/FortreeCity_DecorationShop/map.bin | 1 + data/layouts/FortreeCity_House1/border.bin | 1 + data/layouts/FortreeCity_House1/map.bin | 1 + data/layouts/FortreeCity_House2/border.bin | 1 + data/layouts/FortreeCity_House2/map.bin | 1 + data/layouts/LavaridgeTown_HerbShop/border.bin | Bin 0 -> 8 bytes data/layouts/LavaridgeTown_HerbShop/map.bin | 1 + .../layouts/LittlerootTown_MaysHouse_2F/border.bin | 1 + data/layouts/LittlerootTown_MaysHouse_2F/map.bin | 2 + .../MossdeepCity_EReaderTrainerHouse_1F/border.bin | Bin 0 -> 8 bytes .../MossdeepCity_EReaderTrainerHouse_1F/map.bin | 2 + .../MossdeepCity_EReaderTrainerHouse_2F/border.bin | Bin 0 -> 8 bytes .../MossdeepCity_EReaderTrainerHouse_2F/map.bin | 2 + data/layouts/PacifidlogTown_House1/border.bin | 1 + data/layouts/PacifidlogTown_House1/map.bin | 1 + data/layouts/PacifidlogTown_House2/border.bin | 1 + data/layouts/PacifidlogTown_House2/map.bin | 1 + data/layouts/Prototype_SeviiIsle_22/border.bin | 1 + data/layouts/Prototype_SeviiIsle_22/map.bin | 1 + .../layouts/Prototype_SeviiIsle_23_East/border.bin | 1 + data/layouts/Prototype_SeviiIsle_23_East/map.bin | 1 + .../layouts/Prototype_SeviiIsle_23_West/border.bin | 1 + data/layouts/Prototype_SeviiIsle_23_West/map.bin | 1 + data/layouts/Prototype_SeviiIsle_24/border.bin | 1 + data/layouts/Prototype_SeviiIsle_24/map.bin | 1 + data/layouts/Prototype_SeviiIsle_6/border.bin | 1 + data/layouts/Prototype_SeviiIsle_6/map.bin | 1 + data/layouts/Prototype_SeviiIsle_7/border.bin | 1 + data/layouts/Prototype_SeviiIsle_7/map.bin | 1 + data/layouts/Prototype_SeviiIsle_8/border.bin | 1 + data/layouts/Prototype_SeviiIsle_8/map.bin | Bin 0 -> 3360 bytes data/layouts/Prototype_SeviiIsle_9/border.bin | 1 + data/layouts/Prototype_SeviiIsle_9/map.bin | 1 + data/layouts/RS_BattleTower/border.bin | 1 + data/layouts/RS_BattleTower/map.bin | 1 + data/layouts/RS_PokemonCenter_1F/border.bin | 1 + data/layouts/RS_PokemonCenter_1F/map.bin | 1 + data/layouts/RS_SafariZone_Entrance/border.bin | Bin 0 -> 8 bytes data/layouts/RS_SafariZone_Entrance/map.bin | 1 + data/layouts/RS_SafariZone_Northeast/border.bin | 1 + data/layouts/RS_SafariZone_Northeast/map.bin | Bin 0 -> 3200 bytes data/layouts/RS_SafariZone_RestHouse/border.bin | Bin 0 -> 8 bytes data/layouts/RS_SafariZone_RestHouse/map.bin | 1 + data/layouts/RS_SafariZone_Southeast/border.bin | 1 + data/layouts/RS_SafariZone_Southeast/map.bin | Bin 0 -> 3200 bytes data/layouts/RS_SafariZone_Southwest/border.bin | 1 + data/layouts/RS_SafariZone_Southwest/map.bin | Bin 0 -> 3200 bytes data/layouts/RustboroCity_CuttersHouse/border.bin | 1 + data/layouts/RustboroCity_CuttersHouse/map.bin | 1 + data/layouts/RustboroCity_Flat1_1F/border.bin | 1 + data/layouts/RustboroCity_Flat1_1F/map.bin | 1 + data/layouts/RustboroCity_Flat1_2F/border.bin | 1 + data/layouts/RustboroCity_Flat1_2F/map.bin | 1 + data/layouts/RustboroCity_Flat2_1F/border.bin | 1 + data/layouts/RustboroCity_Flat2_1F/map.bin | Bin 0 -> 252 bytes data/layouts/RustboroCity_Flat2_2F/border.bin | 1 + data/layouts/RustboroCity_Flat2_2F/map.bin | Bin 0 -> 252 bytes data/layouts/RustboroCity_Flat2_3F/border.bin | 1 + data/layouts/RustboroCity_Flat2_3F/map.bin | Bin 0 -> 252 bytes data/layouts/SSTidal_Corridor/border.bin | 1 + data/layouts/SSTidal_Corridor/map.bin | 1 + data/layouts/SSTidal_LowerDeck/border.bin | 1 + data/layouts/SSTidal_LowerDeck/map.bin | 1 + data/layouts/SSTidal_Rooms/border.bin | 1 + data/layouts/SSTidal_Rooms/map.bin | 1 + .../SevenIsland_House_Room1_DoorOpen/border.bin | Bin 0 -> 8 bytes .../SevenIsland_House_Room1_DoorOpen/map.bin | 1 + data/layouts/SootopolisCity_House1/border.bin | 1 + data/layouts/SootopolisCity_House1/map.bin | 1 + data/layouts/SootopolisCity_House2/border.bin | 1 + data/layouts/SootopolisCity_House2/map.bin | 1 + data/layouts/SootopolisCity_House3/border.bin | 1 + data/layouts/SootopolisCity_House3/map.bin | 1 + data/layouts/UnknownMap_03_50/border.bin | 1 - data/layouts/UnknownMap_03_50/map.bin | 1 - data/layouts/UnknownMap_03_51/border.bin | 1 - data/layouts/UnknownMap_03_51/map.bin | 1 - data/layouts/UnknownMap_03_52/border.bin | 1 - data/layouts/UnknownMap_03_52/map.bin | Bin 3360 -> 0 bytes data/layouts/UnknownMap_03_53/border.bin | 1 - data/layouts/UnknownMap_03_53/map.bin | 1 - data/layouts/Unused1/border.bin | Bin 0 -> 8 bytes data/layouts/Unused1/map.bin | Bin 0 -> 288 bytes data/layouts/UnusedLayout_82D54D8/border.bin | 1 - data/layouts/UnusedLayout_82D54D8/map.bin | 2 - data/layouts/UnusedLayout_82D6144/border.bin | Bin 8 -> 0 bytes data/layouts/UnusedLayout_82D6144/map.bin | 1 - data/layouts/UnusedLayout_82D6490/border.bin | 1 - data/layouts/UnusedLayout_82D6490/map.bin | 1 - data/layouts/UnusedLayout_82D6654/border.bin | 1 - data/layouts/UnusedLayout_82D6654/map.bin | 1 - data/layouts/UnusedLayout_82D672C/border.bin | 1 - data/layouts/UnusedLayout_82D672C/map.bin | 1 - data/layouts/UnusedLayout_82D6C34/border.bin | Bin 8 -> 0 bytes data/layouts/UnusedLayout_82D6C34/map.bin | Bin 288 -> 0 bytes data/layouts/UnusedLayout_82D75F0/border.bin | 1 - data/layouts/UnusedLayout_82D75F0/map.bin | 1 - data/layouts/UnusedLayout_82D7674/border.bin | 1 - data/layouts/UnusedLayout_82D7674/map.bin | 1 - data/layouts/UnusedLayout_82D7CC8/border.bin | 1 - data/layouts/UnusedLayout_82D7CC8/map.bin | 1 - data/layouts/UnusedLayout_82D88C8/border.bin | Bin 8 -> 0 bytes data/layouts/UnusedLayout_82D88C8/map.bin | 1 - data/layouts/UnusedLayout_82D9B24/border.bin | 1 - data/layouts/UnusedLayout_82D9B24/map.bin | Bin 3200 -> 0 bytes data/layouts/UnusedLayout_82DA7C8/border.bin | 1 - data/layouts/UnusedLayout_82DA7C8/map.bin | Bin 3200 -> 0 bytes data/layouts/UnusedLayout_82DB46C/border.bin | 1 - data/layouts/UnusedLayout_82DB46C/map.bin | Bin 3200 -> 0 bytes data/layouts/UnusedLayout_82DB4F0/border.bin | 1 - data/layouts/UnusedLayout_82DB4F0/map.bin | 1 - data/layouts/UnusedLayout_82DBBE0/border.bin | 1 - data/layouts/UnusedLayout_82DBBE0/map.bin | 1 - data/layouts/UnusedLayout_82DBDD8/border.bin | 1 - data/layouts/UnusedLayout_82DBDD8/map.bin | 1 - data/layouts/UnusedLayout_82DBFB8/border.bin | 1 - data/layouts/UnusedLayout_82DBFB8/map.bin | 1 - data/layouts/UnusedLayout_82DC4EC/border.bin | 1 - data/layouts/UnusedLayout_82DC4EC/map.bin | 1 - data/layouts/UnusedLayout_82DC60C/border.bin | 1 - data/layouts/UnusedLayout_82DC60C/map.bin | Bin 252 -> 0 bytes data/layouts/UnusedLayout_82DC72C/border.bin | 1 - data/layouts/UnusedLayout_82DC72C/map.bin | Bin 252 -> 0 bytes data/layouts/UnusedLayout_82DC84C/border.bin | 1 - data/layouts/UnusedLayout_82DC84C/map.bin | Bin 252 -> 0 bytes data/layouts/UnusedLayout_82DCA70/border.bin | Bin 8 -> 0 bytes data/layouts/UnusedLayout_82DCA70/map.bin | 1 - data/layouts/UnusedLayout_82DCB44/border.bin | Bin 8 -> 0 bytes data/layouts/UnusedLayout_82DCB44/map.bin | 2 - data/layouts/UnusedLayout_82DCC40/border.bin | Bin 8 -> 0 bytes data/layouts/UnusedLayout_82DCC40/map.bin | 2 - data/layouts/UnusedLayout_82DCCD4/border.bin | 1 - data/layouts/UnusedLayout_82DCCD4/map.bin | 1 - data/layouts/UnusedLayout_82DCD68/border.bin | 1 - data/layouts/UnusedLayout_82DCD68/map.bin | 1 - data/layouts/UnusedLayout_82DCDFC/border.bin | 1 - data/layouts/UnusedLayout_82DCDFC/map.bin | 1 - data/layouts/UnusedLayout_82DCF00/border.bin | 1 - data/layouts/UnusedLayout_82DCF00/map.bin | 1 - data/layouts/UnusedLayout_82DD004/border.bin | 1 - data/layouts/UnusedLayout_82DD004/map.bin | 1 - data/layouts/UnusedLayout_82DD0DC/border.bin | Bin 8 -> 0 bytes data/layouts/UnusedLayout_82DD0DC/map.bin | 1 - data/layouts/UnusedLayout_833614C/border.bin | 1 - data/layouts/UnusedLayout_833614C/map.bin | 1 - data/layouts/UnusedLayout_83377F0/border.bin | 1 - data/layouts/UnusedLayout_83377F0/map.bin | 1 - data/layouts/UnusedLayout_8338354/border.bin | 1 - data/layouts/UnusedLayout_8338354/map.bin | 1 - data/layouts/UnusedLayout_8338738/border.bin | 1 - data/layouts/UnusedLayout_8338738/map.bin | 1 - data/layouts/UnusedLayout_8338B4C/border.bin | Bin 8 -> 0 bytes data/layouts/UnusedLayout_8338B4C/map.bin | 1 - data/layouts/UnusedLayout_8338E90/border.bin | Bin 8 -> 0 bytes data/layouts/UnusedLayout_8338E90/map.bin | 1 - data/layouts/UnusedLayout_833902C/border.bin | Bin 8 -> 0 bytes data/layouts/UnusedLayout_833902C/map.bin | 1 - data/layouts/layouts.json | 1786 ++++++------ data/maps/Prototype_SeviiIsle_6/map.json | 25 + data/maps/Prototype_SeviiIsle_6/scripts.inc | 2 + data/maps/Prototype_SeviiIsle_7/map.json | 25 + data/maps/Prototype_SeviiIsle_7/scripts.inc | 2 + data/maps/Prototype_SeviiIsle_8/map.json | 19 + data/maps/Prototype_SeviiIsle_8/scripts.inc | 2 + data/maps/Prototype_SeviiIsle_9/map.json | 19 + data/maps/Prototype_SeviiIsle_9/scripts.inc | 2 + data/maps/SevenIsland_House_Room1/scripts.inc | 2 +- data/maps/UnknownMap_03_50/map.json | 25 - data/maps/UnknownMap_03_50/scripts.inc | 2 - data/maps/UnknownMap_03_51/map.json | 25 - data/maps/UnknownMap_03_51/scripts.inc | 2 - data/maps/UnknownMap_03_52/map.json | 19 - data/maps/UnknownMap_03_52/scripts.inc | 2 - data/maps/UnknownMap_03_53/map.json | 19 - data/maps/UnknownMap_03_53/scripts.inc | 2 - data/maps/ViridianCity_Mart/scripts.inc | 4 +- data/maps/map_groups.json | 12 +- data/tilesets/graphics.inc | 2940 ++++++++++---------- data/tilesets/headers.inc | 692 ++--- data/tilesets/metatiles.inc | 544 ++-- .../primary/82D4A94/metatile_attributes.bin | Bin 2560 -> 0 bytes data/tilesets/primary/82D4A94/metatiles.bin | Bin 10240 -> 0 bytes data/tilesets/primary/82D4A94/palettes/0.pal | 19 - data/tilesets/primary/82D4A94/palettes/1.pal | 19 - data/tilesets/primary/82D4A94/palettes/10.pal | 19 - data/tilesets/primary/82D4A94/palettes/11.pal | 19 - data/tilesets/primary/82D4A94/palettes/12.pal | 19 - data/tilesets/primary/82D4A94/palettes/13.pal | 19 - data/tilesets/primary/82D4A94/palettes/14.pal | 19 - data/tilesets/primary/82D4A94/palettes/15.pal | 19 - data/tilesets/primary/82D4A94/palettes/2.pal | 19 - data/tilesets/primary/82D4A94/palettes/3.pal | 19 - data/tilesets/primary/82D4A94/palettes/4.pal | 19 - data/tilesets/primary/82D4A94/palettes/5.pal | 19 - data/tilesets/primary/82D4A94/palettes/6.pal | 19 - data/tilesets/primary/82D4A94/palettes/7.pal | 19 - data/tilesets/primary/82D4A94/palettes/8.pal | 19 - data/tilesets/primary/82D4A94/palettes/9.pal | 19 - data/tilesets/primary/82D4A94/tiles.png | Bin 8671 -> 0 bytes .../primary/82D4BB4/metatile_attributes.bin | Bin 2560 -> 0 bytes data/tilesets/primary/82D4BB4/metatiles.bin | Bin 10240 -> 0 bytes data/tilesets/primary/82D4BB4/palettes/0.pal | 19 - data/tilesets/primary/82D4BB4/palettes/1.pal | 19 - data/tilesets/primary/82D4BB4/palettes/10.pal | 19 - data/tilesets/primary/82D4BB4/palettes/11.pal | 19 - data/tilesets/primary/82D4BB4/palettes/12.pal | 19 - data/tilesets/primary/82D4BB4/palettes/13.pal | 19 - data/tilesets/primary/82D4BB4/palettes/14.pal | 19 - data/tilesets/primary/82D4BB4/palettes/15.pal | 19 - data/tilesets/primary/82D4BB4/palettes/2.pal | 19 - data/tilesets/primary/82D4BB4/palettes/3.pal | 19 - data/tilesets/primary/82D4BB4/palettes/4.pal | 19 - data/tilesets/primary/82D4BB4/palettes/5.pal | 19 - data/tilesets/primary/82D4BB4/palettes/6.pal | 19 - data/tilesets/primary/82D4BB4/palettes/7.pal | 19 - data/tilesets/primary/82D4BB4/palettes/8.pal | 19 - data/tilesets/primary/82D4BB4/palettes/9.pal | 19 - data/tilesets/primary/82D4BB4/tiles.png | Bin 7011 -> 0 bytes .../primary/building/metatile_attributes.bin | Bin 0 -> 2560 bytes data/tilesets/primary/building/metatiles.bin | Bin 0 -> 10240 bytes data/tilesets/primary/building/palettes/0.pal | 19 + data/tilesets/primary/building/palettes/1.pal | 19 + data/tilesets/primary/building/palettes/10.pal | 19 + data/tilesets/primary/building/palettes/11.pal | 19 + data/tilesets/primary/building/palettes/12.pal | 19 + data/tilesets/primary/building/palettes/13.pal | 19 + data/tilesets/primary/building/palettes/14.pal | 19 + data/tilesets/primary/building/palettes/15.pal | 19 + data/tilesets/primary/building/palettes/2.pal | 19 + data/tilesets/primary/building/palettes/3.pal | 19 + data/tilesets/primary/building/palettes/4.pal | 19 + data/tilesets/primary/building/palettes/5.pal | 19 + data/tilesets/primary/building/palettes/6.pal | 19 + data/tilesets/primary/building/palettes/7.pal | 19 + data/tilesets/primary/building/palettes/8.pal | 19 + data/tilesets/primary/building/palettes/9.pal | 19 + data/tilesets/primary/building/tiles.png | Bin 0 -> 7011 bytes .../primary/general/metatile_attributes.bin | Bin 0 -> 2560 bytes data/tilesets/primary/general/metatiles.bin | Bin 0 -> 10240 bytes data/tilesets/primary/general/palettes/0.pal | 19 + data/tilesets/primary/general/palettes/1.pal | 19 + data/tilesets/primary/general/palettes/10.pal | 19 + data/tilesets/primary/general/palettes/11.pal | 19 + data/tilesets/primary/general/palettes/12.pal | 19 + data/tilesets/primary/general/palettes/13.pal | 19 + data/tilesets/primary/general/palettes/14.pal | 19 + data/tilesets/primary/general/palettes/15.pal | 19 + data/tilesets/primary/general/palettes/2.pal | 19 + data/tilesets/primary/general/palettes/3.pal | 19 + data/tilesets/primary/general/palettes/4.pal | 19 + data/tilesets/primary/general/palettes/5.pal | 19 + data/tilesets/primary/general/palettes/6.pal | 19 + data/tilesets/primary/general/palettes/7.pal | 19 + data/tilesets/primary/general/palettes/8.pal | 19 + data/tilesets/primary/general/palettes/9.pal | 19 + data/tilesets/primary/general/tiles.png | Bin 0 -> 8671 bytes .../secondary/82D4AAC/metatile_attributes.bin | Bin 356 -> 0 bytes data/tilesets/secondary/82D4AAC/metatiles.bin | Bin 1424 -> 0 bytes data/tilesets/secondary/82D4AAC/palettes/0.pal | 19 - data/tilesets/secondary/82D4AAC/palettes/1.pal | 19 - data/tilesets/secondary/82D4AAC/palettes/10.pal | 19 - data/tilesets/secondary/82D4AAC/palettes/11.pal | 19 - data/tilesets/secondary/82D4AAC/palettes/12.pal | 19 - data/tilesets/secondary/82D4AAC/palettes/13.pal | 19 - data/tilesets/secondary/82D4AAC/palettes/14.pal | 19 - data/tilesets/secondary/82D4AAC/palettes/15.pal | 19 - data/tilesets/secondary/82D4AAC/palettes/2.pal | 19 - data/tilesets/secondary/82D4AAC/palettes/3.pal | 19 - data/tilesets/secondary/82D4AAC/palettes/4.pal | 19 - data/tilesets/secondary/82D4AAC/palettes/5.pal | 19 - data/tilesets/secondary/82D4AAC/palettes/6.pal | 19 - data/tilesets/secondary/82D4AAC/palettes/7.pal | 19 - data/tilesets/secondary/82D4AAC/palettes/8.pal | 19 - data/tilesets/secondary/82D4AAC/palettes/9.pal | 19 - data/tilesets/secondary/82D4AAC/tiles.png | Bin 929 -> 0 bytes .../secondary/82D4AC4/metatile_attributes.bin | Bin 380 -> 0 bytes data/tilesets/secondary/82D4AC4/metatiles.bin | Bin 1520 -> 0 bytes data/tilesets/secondary/82D4AC4/palettes/0.pal | 19 - data/tilesets/secondary/82D4AC4/palettes/1.pal | 19 - data/tilesets/secondary/82D4AC4/palettes/10.pal | 19 - data/tilesets/secondary/82D4AC4/palettes/11.pal | 19 - data/tilesets/secondary/82D4AC4/palettes/12.pal | 19 - data/tilesets/secondary/82D4AC4/palettes/13.pal | 19 - data/tilesets/secondary/82D4AC4/palettes/14.pal | 19 - data/tilesets/secondary/82D4AC4/palettes/15.pal | 19 - data/tilesets/secondary/82D4AC4/palettes/2.pal | 19 - data/tilesets/secondary/82D4AC4/palettes/3.pal | 19 - data/tilesets/secondary/82D4AC4/palettes/4.pal | 19 - data/tilesets/secondary/82D4AC4/palettes/5.pal | 19 - data/tilesets/secondary/82D4AC4/palettes/6.pal | 19 - data/tilesets/secondary/82D4AC4/palettes/7.pal | 19 - data/tilesets/secondary/82D4AC4/palettes/8.pal | 19 - data/tilesets/secondary/82D4AC4/palettes/9.pal | 19 - data/tilesets/secondary/82D4AC4/tiles.png | Bin 1268 -> 0 bytes .../secondary/82D4ADC/metatile_attributes.bin | Bin 316 -> 0 bytes data/tilesets/secondary/82D4ADC/metatiles.bin | Bin 1264 -> 0 bytes data/tilesets/secondary/82D4ADC/palettes/0.pal | 19 - data/tilesets/secondary/82D4ADC/palettes/1.pal | 19 - data/tilesets/secondary/82D4ADC/palettes/10.pal | 19 - data/tilesets/secondary/82D4ADC/palettes/11.pal | 19 - data/tilesets/secondary/82D4ADC/palettes/12.pal | 19 - data/tilesets/secondary/82D4ADC/palettes/13.pal | 19 - data/tilesets/secondary/82D4ADC/palettes/14.pal | 19 - data/tilesets/secondary/82D4ADC/palettes/15.pal | 19 - data/tilesets/secondary/82D4ADC/palettes/2.pal | 19 - data/tilesets/secondary/82D4ADC/palettes/3.pal | 19 - data/tilesets/secondary/82D4ADC/palettes/4.pal | 19 - data/tilesets/secondary/82D4ADC/palettes/5.pal | 19 - data/tilesets/secondary/82D4ADC/palettes/6.pal | 19 - data/tilesets/secondary/82D4ADC/palettes/7.pal | 19 - data/tilesets/secondary/82D4ADC/palettes/8.pal | 19 - data/tilesets/secondary/82D4ADC/palettes/9.pal | 19 - data/tilesets/secondary/82D4ADC/tiles.png | Bin 1348 -> 0 bytes .../secondary/82D4AF4/metatile_attributes.bin | Bin 536 -> 0 bytes data/tilesets/secondary/82D4AF4/metatiles.bin | Bin 2144 -> 0 bytes data/tilesets/secondary/82D4AF4/palettes/0.pal | 19 - data/tilesets/secondary/82D4AF4/palettes/1.pal | 19 - data/tilesets/secondary/82D4AF4/palettes/10.pal | 19 - data/tilesets/secondary/82D4AF4/palettes/11.pal | 19 - data/tilesets/secondary/82D4AF4/palettes/12.pal | 19 - data/tilesets/secondary/82D4AF4/palettes/13.pal | 19 - data/tilesets/secondary/82D4AF4/palettes/14.pal | 19 - data/tilesets/secondary/82D4AF4/palettes/15.pal | 19 - data/tilesets/secondary/82D4AF4/palettes/2.pal | 19 - data/tilesets/secondary/82D4AF4/palettes/3.pal | 19 - data/tilesets/secondary/82D4AF4/palettes/4.pal | 19 - data/tilesets/secondary/82D4AF4/palettes/5.pal | 19 - data/tilesets/secondary/82D4AF4/palettes/6.pal | 19 - data/tilesets/secondary/82D4AF4/palettes/7.pal | 19 - data/tilesets/secondary/82D4AF4/palettes/8.pal | 19 - data/tilesets/secondary/82D4AF4/palettes/9.pal | 19 - data/tilesets/secondary/82D4AF4/tiles.png | Bin 1604 -> 0 bytes .../secondary/82D4B0C/metatile_attributes.bin | Bin 872 -> 0 bytes data/tilesets/secondary/82D4B0C/metatiles.bin | Bin 3488 -> 0 bytes data/tilesets/secondary/82D4B0C/palettes/0.pal | 19 - data/tilesets/secondary/82D4B0C/palettes/1.pal | 19 - data/tilesets/secondary/82D4B0C/palettes/10.pal | 19 - data/tilesets/secondary/82D4B0C/palettes/11.pal | 19 - data/tilesets/secondary/82D4B0C/palettes/12.pal | 19 - data/tilesets/secondary/82D4B0C/palettes/13.pal | 19 - data/tilesets/secondary/82D4B0C/palettes/14.pal | 19 - data/tilesets/secondary/82D4B0C/palettes/15.pal | 19 - data/tilesets/secondary/82D4B0C/palettes/2.pal | 19 - data/tilesets/secondary/82D4B0C/palettes/3.pal | 19 - data/tilesets/secondary/82D4B0C/palettes/4.pal | 19 - data/tilesets/secondary/82D4B0C/palettes/5.pal | 19 - data/tilesets/secondary/82D4B0C/palettes/6.pal | 19 - data/tilesets/secondary/82D4B0C/palettes/7.pal | 19 - data/tilesets/secondary/82D4B0C/palettes/8.pal | 19 - data/tilesets/secondary/82D4B0C/palettes/9.pal | 19 - data/tilesets/secondary/82D4B0C/tiles.png | Bin 2688 -> 0 bytes .../secondary/82D4B24/metatile_attributes.bin | Bin 672 -> 0 bytes data/tilesets/secondary/82D4B24/metatiles.bin | Bin 2688 -> 0 bytes data/tilesets/secondary/82D4B24/palettes/0.pal | 19 - data/tilesets/secondary/82D4B24/palettes/1.pal | 19 - data/tilesets/secondary/82D4B24/palettes/10.pal | 19 - data/tilesets/secondary/82D4B24/palettes/11.pal | 19 - data/tilesets/secondary/82D4B24/palettes/12.pal | 19 - data/tilesets/secondary/82D4B24/palettes/13.pal | 19 - data/tilesets/secondary/82D4B24/palettes/14.pal | 19 - data/tilesets/secondary/82D4B24/palettes/15.pal | 19 - data/tilesets/secondary/82D4B24/palettes/2.pal | 19 - data/tilesets/secondary/82D4B24/palettes/3.pal | 19 - data/tilesets/secondary/82D4B24/palettes/4.pal | 19 - data/tilesets/secondary/82D4B24/palettes/5.pal | 19 - data/tilesets/secondary/82D4B24/palettes/6.pal | 19 - data/tilesets/secondary/82D4B24/palettes/7.pal | 19 - data/tilesets/secondary/82D4B24/palettes/8.pal | 19 - data/tilesets/secondary/82D4B24/palettes/9.pal | 19 - data/tilesets/secondary/82D4B24/tiles.png | Bin 1380 -> 0 bytes .../secondary/82D4B3C/metatile_attributes.bin | Bin 960 -> 0 bytes data/tilesets/secondary/82D4B3C/metatiles.bin | Bin 3840 -> 0 bytes data/tilesets/secondary/82D4B3C/palettes/0.pal | 19 - data/tilesets/secondary/82D4B3C/palettes/1.pal | 19 - data/tilesets/secondary/82D4B3C/palettes/10.pal | 19 - data/tilesets/secondary/82D4B3C/palettes/11.pal | 19 - data/tilesets/secondary/82D4B3C/palettes/12.pal | 19 - data/tilesets/secondary/82D4B3C/palettes/13.pal | 19 - data/tilesets/secondary/82D4B3C/palettes/14.pal | 19 - data/tilesets/secondary/82D4B3C/palettes/15.pal | 19 - data/tilesets/secondary/82D4B3C/palettes/2.pal | 19 - data/tilesets/secondary/82D4B3C/palettes/3.pal | 19 - data/tilesets/secondary/82D4B3C/palettes/4.pal | 19 - data/tilesets/secondary/82D4B3C/palettes/5.pal | 19 - data/tilesets/secondary/82D4B3C/palettes/6.pal | 19 - data/tilesets/secondary/82D4B3C/palettes/7.pal | 19 - data/tilesets/secondary/82D4B3C/palettes/8.pal | 19 - data/tilesets/secondary/82D4B3C/palettes/9.pal | 19 - data/tilesets/secondary/82D4B3C/tiles.png | Bin 2580 -> 0 bytes .../secondary/82D4B54/metatile_attributes.bin | Bin 768 -> 0 bytes data/tilesets/secondary/82D4B54/metatiles.bin | Bin 3072 -> 0 bytes data/tilesets/secondary/82D4B54/palettes/0.pal | 19 - data/tilesets/secondary/82D4B54/palettes/1.pal | 19 - data/tilesets/secondary/82D4B54/palettes/10.pal | 19 - data/tilesets/secondary/82D4B54/palettes/11.pal | 19 - data/tilesets/secondary/82D4B54/palettes/12.pal | 19 - data/tilesets/secondary/82D4B54/palettes/13.pal | 19 - data/tilesets/secondary/82D4B54/palettes/14.pal | 19 - data/tilesets/secondary/82D4B54/palettes/15.pal | 19 - data/tilesets/secondary/82D4B54/palettes/2.pal | 19 - data/tilesets/secondary/82D4B54/palettes/3.pal | 19 - data/tilesets/secondary/82D4B54/palettes/4.pal | 19 - data/tilesets/secondary/82D4B54/palettes/5.pal | 19 - data/tilesets/secondary/82D4B54/palettes/6.pal | 19 - data/tilesets/secondary/82D4B54/palettes/7.pal | 19 - data/tilesets/secondary/82D4B54/palettes/8.pal | 19 - data/tilesets/secondary/82D4B54/palettes/9.pal | 19 - data/tilesets/secondary/82D4B54/tiles.png | Bin 2453 -> 0 bytes .../secondary/82D4B6C/metatile_attributes.bin | Bin 256 -> 0 bytes data/tilesets/secondary/82D4B6C/metatiles.bin | Bin 1024 -> 0 bytes data/tilesets/secondary/82D4B6C/palettes/0.pal | 19 - data/tilesets/secondary/82D4B6C/palettes/1.pal | 19 - data/tilesets/secondary/82D4B6C/palettes/10.pal | 19 - data/tilesets/secondary/82D4B6C/palettes/11.pal | 19 - data/tilesets/secondary/82D4B6C/palettes/12.pal | 19 - data/tilesets/secondary/82D4B6C/palettes/13.pal | 19 - data/tilesets/secondary/82D4B6C/palettes/14.pal | 19 - data/tilesets/secondary/82D4B6C/palettes/15.pal | 19 - data/tilesets/secondary/82D4B6C/palettes/2.pal | 19 - data/tilesets/secondary/82D4B6C/palettes/3.pal | 19 - data/tilesets/secondary/82D4B6C/palettes/4.pal | 19 - data/tilesets/secondary/82D4B6C/palettes/5.pal | 19 - data/tilesets/secondary/82D4B6C/palettes/6.pal | 19 - data/tilesets/secondary/82D4B6C/palettes/7.pal | 19 - data/tilesets/secondary/82D4B6C/palettes/8.pal | 19 - data/tilesets/secondary/82D4B6C/palettes/9.pal | 19 - data/tilesets/secondary/82D4B6C/tiles.png | Bin 1374 -> 0 bytes .../secondary/82D4B84/metatile_attributes.bin | Bin 704 -> 0 bytes data/tilesets/secondary/82D4B84/metatiles.bin | Bin 2816 -> 0 bytes data/tilesets/secondary/82D4B84/palettes/0.pal | 19 - data/tilesets/secondary/82D4B84/palettes/1.pal | 19 - data/tilesets/secondary/82D4B84/palettes/10.pal | 19 - data/tilesets/secondary/82D4B84/palettes/11.pal | 19 - data/tilesets/secondary/82D4B84/palettes/12.pal | 19 - data/tilesets/secondary/82D4B84/palettes/13.pal | 19 - data/tilesets/secondary/82D4B84/palettes/14.pal | 19 - data/tilesets/secondary/82D4B84/palettes/15.pal | 19 - data/tilesets/secondary/82D4B84/palettes/2.pal | 19 - data/tilesets/secondary/82D4B84/palettes/3.pal | 19 - data/tilesets/secondary/82D4B84/palettes/4.pal | 19 - data/tilesets/secondary/82D4B84/palettes/5.pal | 19 - data/tilesets/secondary/82D4B84/palettes/6.pal | 19 - data/tilesets/secondary/82D4B84/palettes/7.pal | 19 - data/tilesets/secondary/82D4B84/palettes/8.pal | 19 - data/tilesets/secondary/82D4B84/palettes/9.pal | 19 - data/tilesets/secondary/82D4B84/tiles.png | Bin 2544 -> 0 bytes .../secondary/82D4B9C/metatile_attributes.bin | Bin 800 -> 0 bytes data/tilesets/secondary/82D4B9C/metatiles.bin | Bin 3200 -> 0 bytes data/tilesets/secondary/82D4B9C/palettes/0.pal | 19 - data/tilesets/secondary/82D4B9C/palettes/1.pal | 19 - data/tilesets/secondary/82D4B9C/palettes/10.pal | 19 - data/tilesets/secondary/82D4B9C/palettes/11.pal | 19 - data/tilesets/secondary/82D4B9C/palettes/12.pal | 19 - data/tilesets/secondary/82D4B9C/palettes/13.pal | 19 - data/tilesets/secondary/82D4B9C/palettes/14.pal | 19 - data/tilesets/secondary/82D4B9C/palettes/15.pal | 19 - data/tilesets/secondary/82D4B9C/palettes/2.pal | 19 - data/tilesets/secondary/82D4B9C/palettes/3.pal | 19 - data/tilesets/secondary/82D4B9C/palettes/4.pal | 19 - data/tilesets/secondary/82D4B9C/palettes/5.pal | 19 - data/tilesets/secondary/82D4B9C/palettes/6.pal | 19 - data/tilesets/secondary/82D4B9C/palettes/7.pal | 19 - data/tilesets/secondary/82D4B9C/palettes/8.pal | 19 - data/tilesets/secondary/82D4B9C/palettes/9.pal | 19 - data/tilesets/secondary/82D4B9C/tiles.png | Bin 2377 -> 0 bytes .../secondary/82D4BCC/metatile_attributes.bin | Bin 268 -> 0 bytes data/tilesets/secondary/82D4BCC/metatiles.bin | Bin 1072 -> 0 bytes data/tilesets/secondary/82D4BCC/palettes/0.pal | 19 - data/tilesets/secondary/82D4BCC/palettes/1.pal | 19 - data/tilesets/secondary/82D4BCC/palettes/10.pal | 19 - data/tilesets/secondary/82D4BCC/palettes/11.pal | 19 - data/tilesets/secondary/82D4BCC/palettes/12.pal | 19 - data/tilesets/secondary/82D4BCC/palettes/13.pal | 19 - data/tilesets/secondary/82D4BCC/palettes/14.pal | 19 - data/tilesets/secondary/82D4BCC/palettes/15.pal | 19 - data/tilesets/secondary/82D4BCC/palettes/2.pal | 19 - data/tilesets/secondary/82D4BCC/palettes/3.pal | 19 - data/tilesets/secondary/82D4BCC/palettes/4.pal | 19 - data/tilesets/secondary/82D4BCC/palettes/5.pal | 19 - data/tilesets/secondary/82D4BCC/palettes/6.pal | 19 - data/tilesets/secondary/82D4BCC/palettes/7.pal | 19 - data/tilesets/secondary/82D4BCC/palettes/8.pal | 19 - data/tilesets/secondary/82D4BCC/palettes/9.pal | 19 - data/tilesets/secondary/82D4BCC/tiles.png | Bin 438 -> 0 bytes .../secondary/82D4BE4/metatile_attributes.bin | Bin 1020 -> 0 bytes data/tilesets/secondary/82D4BE4/metatiles.bin | Bin 4080 -> 0 bytes data/tilesets/secondary/82D4BE4/palettes/0.pal | 19 - data/tilesets/secondary/82D4BE4/palettes/1.pal | 19 - data/tilesets/secondary/82D4BE4/palettes/10.pal | 19 - data/tilesets/secondary/82D4BE4/palettes/11.pal | 19 - data/tilesets/secondary/82D4BE4/palettes/12.pal | 19 - data/tilesets/secondary/82D4BE4/palettes/13.pal | 19 - data/tilesets/secondary/82D4BE4/palettes/14.pal | 19 - data/tilesets/secondary/82D4BE4/palettes/15.pal | 19 - data/tilesets/secondary/82D4BE4/palettes/2.pal | 19 - data/tilesets/secondary/82D4BE4/palettes/3.pal | 19 - data/tilesets/secondary/82D4BE4/palettes/4.pal | 19 - data/tilesets/secondary/82D4BE4/palettes/5.pal | 19 - data/tilesets/secondary/82D4BE4/palettes/6.pal | 19 - data/tilesets/secondary/82D4BE4/palettes/7.pal | 19 - data/tilesets/secondary/82D4BE4/palettes/8.pal | 19 - data/tilesets/secondary/82D4BE4/palettes/9.pal | 19 - data/tilesets/secondary/82D4BE4/tiles.png | Bin 3390 -> 0 bytes .../secondary/82D4BFC/metatile_attributes.bin | Bin 644 -> 0 bytes data/tilesets/secondary/82D4BFC/metatiles.bin | Bin 2576 -> 0 bytes data/tilesets/secondary/82D4BFC/palettes/0.pal | 19 - data/tilesets/secondary/82D4BFC/palettes/1.pal | 19 - data/tilesets/secondary/82D4BFC/palettes/10.pal | 19 - data/tilesets/secondary/82D4BFC/palettes/11.pal | 19 - data/tilesets/secondary/82D4BFC/palettes/12.pal | 19 - data/tilesets/secondary/82D4BFC/palettes/13.pal | 19 - data/tilesets/secondary/82D4BFC/palettes/14.pal | 19 - data/tilesets/secondary/82D4BFC/palettes/15.pal | 19 - data/tilesets/secondary/82D4BFC/palettes/2.pal | 19 - data/tilesets/secondary/82D4BFC/palettes/3.pal | 19 - data/tilesets/secondary/82D4BFC/palettes/4.pal | 19 - data/tilesets/secondary/82D4BFC/palettes/5.pal | 19 - data/tilesets/secondary/82D4BFC/palettes/6.pal | 19 - data/tilesets/secondary/82D4BFC/palettes/7.pal | 19 - data/tilesets/secondary/82D4BFC/palettes/8.pal | 19 - data/tilesets/secondary/82D4BFC/palettes/9.pal | 19 - data/tilesets/secondary/82D4BFC/tiles.png | Bin 4193 -> 0 bytes .../secondary/82D4C14/metatile_attributes.bin | Bin 8 -> 0 bytes data/tilesets/secondary/82D4C14/metatiles.bin | Bin 32 -> 0 bytes data/tilesets/secondary/82D4C14/palettes/0.pal | 19 - data/tilesets/secondary/82D4C14/palettes/1.pal | 19 - data/tilesets/secondary/82D4C14/palettes/10.pal | 19 - data/tilesets/secondary/82D4C14/palettes/11.pal | 19 - data/tilesets/secondary/82D4C14/palettes/12.pal | 19 - data/tilesets/secondary/82D4C14/palettes/13.pal | 19 - data/tilesets/secondary/82D4C14/palettes/14.pal | 19 - data/tilesets/secondary/82D4C14/palettes/15.pal | 19 - data/tilesets/secondary/82D4C14/palettes/2.pal | 19 - data/tilesets/secondary/82D4C14/palettes/3.pal | 19 - data/tilesets/secondary/82D4C14/palettes/4.pal | 19 - data/tilesets/secondary/82D4C14/palettes/5.pal | 19 - data/tilesets/secondary/82D4C14/palettes/6.pal | 19 - data/tilesets/secondary/82D4C14/palettes/7.pal | 19 - data/tilesets/secondary/82D4C14/palettes/8.pal | 19 - data/tilesets/secondary/82D4C14/palettes/9.pal | 19 - data/tilesets/secondary/82D4C14/tiles.png | Bin 135 -> 0 bytes .../secondary/82D4C2C/metatile_attributes.bin | Bin 540 -> 0 bytes data/tilesets/secondary/82D4C2C/metatiles.bin | Bin 2160 -> 0 bytes data/tilesets/secondary/82D4C2C/palettes/0.pal | 19 - data/tilesets/secondary/82D4C2C/palettes/1.pal | 19 - data/tilesets/secondary/82D4C2C/palettes/10.pal | 19 - data/tilesets/secondary/82D4C2C/palettes/11.pal | 19 - data/tilesets/secondary/82D4C2C/palettes/12.pal | 19 - data/tilesets/secondary/82D4C2C/palettes/13.pal | 19 - data/tilesets/secondary/82D4C2C/palettes/14.pal | 19 - data/tilesets/secondary/82D4C2C/palettes/15.pal | 19 - data/tilesets/secondary/82D4C2C/palettes/2.pal | 19 - data/tilesets/secondary/82D4C2C/palettes/3.pal | 19 - data/tilesets/secondary/82D4C2C/palettes/4.pal | 19 - data/tilesets/secondary/82D4C2C/palettes/5.pal | 19 - data/tilesets/secondary/82D4C2C/palettes/6.pal | 19 - data/tilesets/secondary/82D4C2C/palettes/7.pal | 19 - data/tilesets/secondary/82D4C2C/palettes/8.pal | 19 - data/tilesets/secondary/82D4C2C/palettes/9.pal | 19 - data/tilesets/secondary/82D4C2C/tiles.png | Bin 1808 -> 0 bytes .../secondary/82D4C44/metatile_attributes.bin | Bin 1024 -> 0 bytes data/tilesets/secondary/82D4C44/metatiles.bin | Bin 4096 -> 0 bytes data/tilesets/secondary/82D4C44/palettes/0.pal | 19 - data/tilesets/secondary/82D4C44/palettes/1.pal | 19 - data/tilesets/secondary/82D4C44/palettes/10.pal | 19 - data/tilesets/secondary/82D4C44/palettes/11.pal | 19 - data/tilesets/secondary/82D4C44/palettes/12.pal | 19 - data/tilesets/secondary/82D4C44/palettes/13.pal | 19 - data/tilesets/secondary/82D4C44/palettes/14.pal | 19 - data/tilesets/secondary/82D4C44/palettes/15.pal | 19 - data/tilesets/secondary/82D4C44/palettes/2.pal | 19 - data/tilesets/secondary/82D4C44/palettes/3.pal | 19 - data/tilesets/secondary/82D4C44/palettes/4.pal | 19 - data/tilesets/secondary/82D4C44/palettes/5.pal | 19 - data/tilesets/secondary/82D4C44/palettes/6.pal | 19 - data/tilesets/secondary/82D4C44/palettes/7.pal | 19 - data/tilesets/secondary/82D4C44/palettes/8.pal | 19 - data/tilesets/secondary/82D4C44/palettes/9.pal | 19 - data/tilesets/secondary/82D4C44/tiles.png | Bin 2667 -> 0 bytes .../secondary/82D4C5C/metatile_attributes.bin | Bin 168 -> 0 bytes data/tilesets/secondary/82D4C5C/metatiles.bin | Bin 672 -> 0 bytes data/tilesets/secondary/82D4C5C/palettes/0.pal | 19 - data/tilesets/secondary/82D4C5C/palettes/1.pal | 19 - data/tilesets/secondary/82D4C5C/palettes/10.pal | 19 - data/tilesets/secondary/82D4C5C/palettes/11.pal | 19 - data/tilesets/secondary/82D4C5C/palettes/12.pal | 19 - data/tilesets/secondary/82D4C5C/palettes/13.pal | 19 - data/tilesets/secondary/82D4C5C/palettes/14.pal | 19 - data/tilesets/secondary/82D4C5C/palettes/15.pal | 19 - data/tilesets/secondary/82D4C5C/palettes/2.pal | 19 - data/tilesets/secondary/82D4C5C/palettes/3.pal | 19 - data/tilesets/secondary/82D4C5C/palettes/4.pal | 19 - data/tilesets/secondary/82D4C5C/palettes/5.pal | 19 - data/tilesets/secondary/82D4C5C/palettes/6.pal | 19 - data/tilesets/secondary/82D4C5C/palettes/7.pal | 19 - data/tilesets/secondary/82D4C5C/palettes/8.pal | 19 - data/tilesets/secondary/82D4C5C/palettes/9.pal | 19 - data/tilesets/secondary/82D4C5C/tiles.png | Bin 855 -> 0 bytes .../secondary/82D4C74/metatile_attributes.bin | Bin 96 -> 0 bytes data/tilesets/secondary/82D4C74/metatiles.bin | Bin 384 -> 0 bytes data/tilesets/secondary/82D4C74/palettes/0.pal | 19 - data/tilesets/secondary/82D4C74/palettes/1.pal | 19 - data/tilesets/secondary/82D4C74/palettes/10.pal | 19 - data/tilesets/secondary/82D4C74/palettes/11.pal | 19 - data/tilesets/secondary/82D4C74/palettes/12.pal | 19 - data/tilesets/secondary/82D4C74/palettes/13.pal | 19 - data/tilesets/secondary/82D4C74/palettes/14.pal | 19 - data/tilesets/secondary/82D4C74/palettes/15.pal | 19 - data/tilesets/secondary/82D4C74/palettes/2.pal | 19 - data/tilesets/secondary/82D4C74/palettes/3.pal | 19 - data/tilesets/secondary/82D4C74/palettes/4.pal | 19 - data/tilesets/secondary/82D4C74/palettes/5.pal | 19 - data/tilesets/secondary/82D4C74/palettes/6.pal | 19 - data/tilesets/secondary/82D4C74/palettes/7.pal | 19 - data/tilesets/secondary/82D4C74/palettes/8.pal | 19 - data/tilesets/secondary/82D4C74/palettes/9.pal | 19 - data/tilesets/secondary/82D4C74/tiles.png | Bin 748 -> 0 bytes .../secondary/82D4C8C/metatile_attributes.bin | Bin 700 -> 0 bytes data/tilesets/secondary/82D4C8C/metatiles.bin | Bin 2800 -> 0 bytes data/tilesets/secondary/82D4C8C/palettes/0.pal | 19 - data/tilesets/secondary/82D4C8C/palettes/1.pal | 19 - data/tilesets/secondary/82D4C8C/palettes/10.pal | 19 - data/tilesets/secondary/82D4C8C/palettes/11.pal | 19 - data/tilesets/secondary/82D4C8C/palettes/12.pal | 19 - data/tilesets/secondary/82D4C8C/palettes/13.pal | 19 - data/tilesets/secondary/82D4C8C/palettes/14.pal | 19 - data/tilesets/secondary/82D4C8C/palettes/15.pal | 19 - data/tilesets/secondary/82D4C8C/palettes/2.pal | 19 - data/tilesets/secondary/82D4C8C/palettes/3.pal | 19 - data/tilesets/secondary/82D4C8C/palettes/4.pal | 19 - data/tilesets/secondary/82D4C8C/palettes/5.pal | 19 - data/tilesets/secondary/82D4C8C/palettes/6.pal | 19 - data/tilesets/secondary/82D4C8C/palettes/7.pal | 19 - data/tilesets/secondary/82D4C8C/palettes/8.pal | 19 - data/tilesets/secondary/82D4C8C/palettes/9.pal | 19 - data/tilesets/secondary/82D4C8C/tiles.png | Bin 1308 -> 0 bytes .../secondary/82D4CA4/metatile_attributes.bin | Bin 136 -> 0 bytes data/tilesets/secondary/82D4CA4/metatiles.bin | Bin 544 -> 0 bytes data/tilesets/secondary/82D4CA4/palettes/0.pal | 19 - data/tilesets/secondary/82D4CA4/palettes/1.pal | 19 - data/tilesets/secondary/82D4CA4/palettes/10.pal | 19 - data/tilesets/secondary/82D4CA4/palettes/11.pal | 19 - data/tilesets/secondary/82D4CA4/palettes/12.pal | 19 - data/tilesets/secondary/82D4CA4/palettes/13.pal | 19 - data/tilesets/secondary/82D4CA4/palettes/14.pal | 19 - data/tilesets/secondary/82D4CA4/palettes/15.pal | 19 - data/tilesets/secondary/82D4CA4/palettes/2.pal | 19 - data/tilesets/secondary/82D4CA4/palettes/3.pal | 19 - data/tilesets/secondary/82D4CA4/palettes/4.pal | 19 - data/tilesets/secondary/82D4CA4/palettes/5.pal | 19 - data/tilesets/secondary/82D4CA4/palettes/6.pal | 19 - data/tilesets/secondary/82D4CA4/palettes/7.pal | 19 - data/tilesets/secondary/82D4CA4/palettes/8.pal | 19 - data/tilesets/secondary/82D4CA4/palettes/9.pal | 19 - data/tilesets/secondary/82D4CA4/tiles.png | Bin 933 -> 0 bytes .../secondary/82D4CBC/metatile_attributes.bin | Bin 336 -> 0 bytes data/tilesets/secondary/82D4CBC/metatiles.bin | Bin 1344 -> 0 bytes data/tilesets/secondary/82D4CBC/palettes/0.pal | 19 - data/tilesets/secondary/82D4CBC/palettes/1.pal | 19 - data/tilesets/secondary/82D4CBC/palettes/10.pal | 19 - data/tilesets/secondary/82D4CBC/palettes/11.pal | 19 - data/tilesets/secondary/82D4CBC/palettes/12.pal | 19 - data/tilesets/secondary/82D4CBC/palettes/13.pal | 19 - data/tilesets/secondary/82D4CBC/palettes/14.pal | 19 - data/tilesets/secondary/82D4CBC/palettes/15.pal | 19 - data/tilesets/secondary/82D4CBC/palettes/2.pal | 19 - data/tilesets/secondary/82D4CBC/palettes/3.pal | 19 - data/tilesets/secondary/82D4CBC/palettes/4.pal | 19 - data/tilesets/secondary/82D4CBC/palettes/5.pal | 19 - data/tilesets/secondary/82D4CBC/palettes/6.pal | 19 - data/tilesets/secondary/82D4CBC/palettes/7.pal | 19 - data/tilesets/secondary/82D4CBC/palettes/8.pal | 19 - data/tilesets/secondary/82D4CBC/palettes/9.pal | 19 - data/tilesets/secondary/82D4CBC/tiles.png | Bin 860 -> 0 bytes .../secondary/82D4CD4/metatile_attributes.bin | Bin 2048 -> 0 bytes data/tilesets/secondary/82D4CD4/metatiles.bin | Bin 8192 -> 0 bytes data/tilesets/secondary/82D4CD4/palettes/0.pal | 19 - data/tilesets/secondary/82D4CD4/palettes/1.pal | 19 - data/tilesets/secondary/82D4CD4/palettes/10.pal | 19 - data/tilesets/secondary/82D4CD4/palettes/11.pal | 19 - data/tilesets/secondary/82D4CD4/palettes/12.pal | 19 - data/tilesets/secondary/82D4CD4/palettes/13.pal | 19 - data/tilesets/secondary/82D4CD4/palettes/14.pal | 19 - data/tilesets/secondary/82D4CD4/palettes/15.pal | 19 - data/tilesets/secondary/82D4CD4/palettes/2.pal | 19 - data/tilesets/secondary/82D4CD4/palettes/3.pal | 19 - data/tilesets/secondary/82D4CD4/palettes/4.pal | 19 - data/tilesets/secondary/82D4CD4/palettes/5.pal | 19 - data/tilesets/secondary/82D4CD4/palettes/6.pal | 19 - data/tilesets/secondary/82D4CD4/palettes/7.pal | 19 - data/tilesets/secondary/82D4CD4/palettes/8.pal | 19 - data/tilesets/secondary/82D4CD4/palettes/9.pal | 19 - data/tilesets/secondary/82D4CD4/tiles.png | Bin 4040 -> 0 bytes .../secondary/82D4CEC/metatile_attributes.bin | Bin 608 -> 0 bytes data/tilesets/secondary/82D4CEC/metatiles.bin | Bin 2432 -> 0 bytes data/tilesets/secondary/82D4CEC/palettes/0.pal | 19 - data/tilesets/secondary/82D4CEC/palettes/1.pal | 19 - data/tilesets/secondary/82D4CEC/palettes/10.pal | 19 - data/tilesets/secondary/82D4CEC/palettes/11.pal | 19 - data/tilesets/secondary/82D4CEC/palettes/12.pal | 19 - data/tilesets/secondary/82D4CEC/palettes/13.pal | 19 - data/tilesets/secondary/82D4CEC/palettes/14.pal | 19 - data/tilesets/secondary/82D4CEC/palettes/15.pal | 19 - data/tilesets/secondary/82D4CEC/palettes/2.pal | 19 - data/tilesets/secondary/82D4CEC/palettes/3.pal | 19 - data/tilesets/secondary/82D4CEC/palettes/4.pal | 19 - data/tilesets/secondary/82D4CEC/palettes/5.pal | 19 - data/tilesets/secondary/82D4CEC/palettes/6.pal | 19 - data/tilesets/secondary/82D4CEC/palettes/7.pal | 19 - data/tilesets/secondary/82D4CEC/palettes/8.pal | 19 - data/tilesets/secondary/82D4CEC/palettes/9.pal | 19 - data/tilesets/secondary/82D4CEC/tiles.png | Bin 2018 -> 0 bytes .../secondary/82D4D04/metatile_attributes.bin | Bin 404 -> 0 bytes data/tilesets/secondary/82D4D04/metatiles.bin | Bin 1616 -> 0 bytes data/tilesets/secondary/82D4D04/palettes/0.pal | 19 - data/tilesets/secondary/82D4D04/palettes/1.pal | 19 - data/tilesets/secondary/82D4D04/palettes/10.pal | 19 - data/tilesets/secondary/82D4D04/palettes/11.pal | 19 - data/tilesets/secondary/82D4D04/palettes/12.pal | 19 - data/tilesets/secondary/82D4D04/palettes/13.pal | 19 - data/tilesets/secondary/82D4D04/palettes/14.pal | 19 - data/tilesets/secondary/82D4D04/palettes/15.pal | 19 - data/tilesets/secondary/82D4D04/palettes/2.pal | 19 - data/tilesets/secondary/82D4D04/palettes/3.pal | 19 - data/tilesets/secondary/82D4D04/palettes/4.pal | 19 - data/tilesets/secondary/82D4D04/palettes/5.pal | 19 - data/tilesets/secondary/82D4D04/palettes/6.pal | 19 - data/tilesets/secondary/82D4D04/palettes/7.pal | 19 - data/tilesets/secondary/82D4D04/palettes/8.pal | 19 - data/tilesets/secondary/82D4D04/palettes/9.pal | 19 - data/tilesets/secondary/82D4D04/tiles.png | Bin 1589 -> 0 bytes .../secondary/82D4D1C/metatile_attributes.bin | Bin 336 -> 0 bytes data/tilesets/secondary/82D4D1C/metatiles.bin | Bin 1344 -> 0 bytes data/tilesets/secondary/82D4D1C/palettes/0.pal | 19 - data/tilesets/secondary/82D4D1C/palettes/1.pal | 19 - data/tilesets/secondary/82D4D1C/palettes/10.pal | 19 - data/tilesets/secondary/82D4D1C/palettes/11.pal | 19 - data/tilesets/secondary/82D4D1C/palettes/12.pal | 19 - data/tilesets/secondary/82D4D1C/palettes/13.pal | 19 - data/tilesets/secondary/82D4D1C/palettes/14.pal | 19 - data/tilesets/secondary/82D4D1C/palettes/15.pal | 19 - data/tilesets/secondary/82D4D1C/palettes/2.pal | 19 - data/tilesets/secondary/82D4D1C/palettes/3.pal | 19 - data/tilesets/secondary/82D4D1C/palettes/4.pal | 19 - data/tilesets/secondary/82D4D1C/palettes/5.pal | 19 - data/tilesets/secondary/82D4D1C/palettes/6.pal | 19 - data/tilesets/secondary/82D4D1C/palettes/7.pal | 19 - data/tilesets/secondary/82D4D1C/palettes/8.pal | 19 - data/tilesets/secondary/82D4D1C/palettes/9.pal | 19 - data/tilesets/secondary/82D4D1C/tiles.png | Bin 892 -> 0 bytes .../secondary/82D4D34/metatile_attributes.bin | Bin 300 -> 0 bytes data/tilesets/secondary/82D4D34/metatiles.bin | Bin 1200 -> 0 bytes data/tilesets/secondary/82D4D34/palettes/0.pal | 19 - data/tilesets/secondary/82D4D34/palettes/1.pal | 19 - data/tilesets/secondary/82D4D34/palettes/10.pal | 19 - data/tilesets/secondary/82D4D34/palettes/11.pal | 19 - data/tilesets/secondary/82D4D34/palettes/12.pal | 19 - data/tilesets/secondary/82D4D34/palettes/13.pal | 19 - data/tilesets/secondary/82D4D34/palettes/14.pal | 19 - data/tilesets/secondary/82D4D34/palettes/15.pal | 19 - data/tilesets/secondary/82D4D34/palettes/2.pal | 19 - data/tilesets/secondary/82D4D34/palettes/3.pal | 19 - data/tilesets/secondary/82D4D34/palettes/4.pal | 19 - data/tilesets/secondary/82D4D34/palettes/5.pal | 19 - data/tilesets/secondary/82D4D34/palettes/6.pal | 19 - data/tilesets/secondary/82D4D34/palettes/7.pal | 19 - data/tilesets/secondary/82D4D34/palettes/8.pal | 19 - data/tilesets/secondary/82D4D34/palettes/9.pal | 19 - data/tilesets/secondary/82D4D34/tiles.png | Bin 1207 -> 0 bytes .../secondary/82D4D4C/metatile_attributes.bin | Bin 256 -> 0 bytes data/tilesets/secondary/82D4D4C/metatiles.bin | Bin 1024 -> 0 bytes data/tilesets/secondary/82D4D4C/palettes/0.pal | 19 - data/tilesets/secondary/82D4D4C/palettes/1.pal | 19 - data/tilesets/secondary/82D4D4C/palettes/10.pal | 19 - data/tilesets/secondary/82D4D4C/palettes/11.pal | 19 - data/tilesets/secondary/82D4D4C/palettes/12.pal | 19 - data/tilesets/secondary/82D4D4C/palettes/13.pal | 19 - data/tilesets/secondary/82D4D4C/palettes/14.pal | 19 - data/tilesets/secondary/82D4D4C/palettes/15.pal | 19 - data/tilesets/secondary/82D4D4C/palettes/2.pal | 19 - data/tilesets/secondary/82D4D4C/palettes/3.pal | 19 - data/tilesets/secondary/82D4D4C/palettes/4.pal | 19 - data/tilesets/secondary/82D4D4C/palettes/5.pal | 19 - data/tilesets/secondary/82D4D4C/palettes/6.pal | 19 - data/tilesets/secondary/82D4D4C/palettes/7.pal | 19 - data/tilesets/secondary/82D4D4C/palettes/8.pal | 19 - data/tilesets/secondary/82D4D4C/palettes/9.pal | 19 - data/tilesets/secondary/82D4D4C/tiles.png | Bin 1253 -> 0 bytes .../secondary/82D4D64/metatile_attributes.bin | Bin 184 -> 0 bytes data/tilesets/secondary/82D4D64/metatiles.bin | Bin 736 -> 0 bytes data/tilesets/secondary/82D4D64/palettes/0.pal | 19 - data/tilesets/secondary/82D4D64/palettes/1.pal | 19 - data/tilesets/secondary/82D4D64/palettes/10.pal | 19 - data/tilesets/secondary/82D4D64/palettes/11.pal | 19 - data/tilesets/secondary/82D4D64/palettes/12.pal | 19 - data/tilesets/secondary/82D4D64/palettes/13.pal | 19 - data/tilesets/secondary/82D4D64/palettes/14.pal | 19 - data/tilesets/secondary/82D4D64/palettes/15.pal | 19 - data/tilesets/secondary/82D4D64/palettes/2.pal | 19 - data/tilesets/secondary/82D4D64/palettes/3.pal | 19 - data/tilesets/secondary/82D4D64/palettes/4.pal | 19 - data/tilesets/secondary/82D4D64/palettes/5.pal | 19 - data/tilesets/secondary/82D4D64/palettes/6.pal | 19 - data/tilesets/secondary/82D4D64/palettes/7.pal | 19 - data/tilesets/secondary/82D4D64/palettes/8.pal | 19 - data/tilesets/secondary/82D4D64/palettes/9.pal | 19 - data/tilesets/secondary/82D4D64/tiles.png | Bin 860 -> 0 bytes .../secondary/82D4D7C/metatile_attributes.bin | Bin 384 -> 0 bytes data/tilesets/secondary/82D4D7C/metatiles.bin | Bin 1536 -> 0 bytes data/tilesets/secondary/82D4D7C/palettes/0.pal | 19 - data/tilesets/secondary/82D4D7C/palettes/1.pal | 19 - data/tilesets/secondary/82D4D7C/palettes/10.pal | 19 - data/tilesets/secondary/82D4D7C/palettes/11.pal | 19 - data/tilesets/secondary/82D4D7C/palettes/12.pal | 19 - data/tilesets/secondary/82D4D7C/palettes/13.pal | 19 - data/tilesets/secondary/82D4D7C/palettes/14.pal | 19 - data/tilesets/secondary/82D4D7C/palettes/15.pal | 19 - data/tilesets/secondary/82D4D7C/palettes/2.pal | 19 - data/tilesets/secondary/82D4D7C/palettes/3.pal | 19 - data/tilesets/secondary/82D4D7C/palettes/4.pal | 19 - data/tilesets/secondary/82D4D7C/palettes/5.pal | 19 - data/tilesets/secondary/82D4D7C/palettes/6.pal | 19 - data/tilesets/secondary/82D4D7C/palettes/7.pal | 19 - data/tilesets/secondary/82D4D7C/palettes/8.pal | 19 - data/tilesets/secondary/82D4D7C/palettes/9.pal | 19 - data/tilesets/secondary/82D4D7C/tiles.png | Bin 1318 -> 0 bytes .../secondary/82D4D94/metatile_attributes.bin | Bin 1344 -> 0 bytes data/tilesets/secondary/82D4D94/metatiles.bin | Bin 5376 -> 0 bytes data/tilesets/secondary/82D4D94/palettes/0.pal | 19 - data/tilesets/secondary/82D4D94/palettes/1.pal | 19 - data/tilesets/secondary/82D4D94/palettes/10.pal | 19 - data/tilesets/secondary/82D4D94/palettes/11.pal | 19 - data/tilesets/secondary/82D4D94/palettes/12.pal | 19 - data/tilesets/secondary/82D4D94/palettes/13.pal | 19 - data/tilesets/secondary/82D4D94/palettes/14.pal | 19 - data/tilesets/secondary/82D4D94/palettes/15.pal | 19 - data/tilesets/secondary/82D4D94/palettes/2.pal | 19 - data/tilesets/secondary/82D4D94/palettes/3.pal | 19 - data/tilesets/secondary/82D4D94/palettes/4.pal | 19 - data/tilesets/secondary/82D4D94/palettes/5.pal | 19 - data/tilesets/secondary/82D4D94/palettes/6.pal | 19 - data/tilesets/secondary/82D4D94/palettes/7.pal | 19 - data/tilesets/secondary/82D4D94/palettes/8.pal | 19 - data/tilesets/secondary/82D4D94/palettes/9.pal | 19 - data/tilesets/secondary/82D4D94/tiles.png | Bin 2996 -> 0 bytes .../secondary/82D4DAC/metatile_attributes.bin | Bin 8 -> 0 bytes data/tilesets/secondary/82D4DAC/metatiles.bin | Bin 32 -> 0 bytes data/tilesets/secondary/82D4DAC/palettes/0.pal | 19 - data/tilesets/secondary/82D4DAC/palettes/1.pal | 19 - data/tilesets/secondary/82D4DAC/palettes/10.pal | 19 - data/tilesets/secondary/82D4DAC/palettes/11.pal | 19 - data/tilesets/secondary/82D4DAC/palettes/12.pal | 19 - data/tilesets/secondary/82D4DAC/palettes/13.pal | 19 - data/tilesets/secondary/82D4DAC/palettes/14.pal | 19 - data/tilesets/secondary/82D4DAC/palettes/15.pal | 19 - data/tilesets/secondary/82D4DAC/palettes/2.pal | 19 - data/tilesets/secondary/82D4DAC/palettes/3.pal | 19 - data/tilesets/secondary/82D4DAC/palettes/4.pal | 19 - data/tilesets/secondary/82D4DAC/palettes/5.pal | 19 - data/tilesets/secondary/82D4DAC/palettes/6.pal | 19 - data/tilesets/secondary/82D4DAC/palettes/7.pal | 19 - data/tilesets/secondary/82D4DAC/palettes/8.pal | 19 - data/tilesets/secondary/82D4DAC/palettes/9.pal | 19 - data/tilesets/secondary/82D4DAC/tiles.png | Bin 139 -> 0 bytes .../secondary/82D4DC4/metatile_attributes.bin | Bin 172 -> 0 bytes data/tilesets/secondary/82D4DC4/metatiles.bin | Bin 688 -> 0 bytes data/tilesets/secondary/82D4DC4/palettes/0.pal | 19 - data/tilesets/secondary/82D4DC4/palettes/1.pal | 19 - data/tilesets/secondary/82D4DC4/palettes/10.pal | 19 - data/tilesets/secondary/82D4DC4/palettes/11.pal | 19 - data/tilesets/secondary/82D4DC4/palettes/12.pal | 19 - data/tilesets/secondary/82D4DC4/palettes/13.pal | 19 - data/tilesets/secondary/82D4DC4/palettes/14.pal | 19 - data/tilesets/secondary/82D4DC4/palettes/15.pal | 19 - data/tilesets/secondary/82D4DC4/palettes/2.pal | 19 - data/tilesets/secondary/82D4DC4/palettes/3.pal | 19 - data/tilesets/secondary/82D4DC4/palettes/4.pal | 19 - data/tilesets/secondary/82D4DC4/palettes/5.pal | 19 - data/tilesets/secondary/82D4DC4/palettes/6.pal | 19 - data/tilesets/secondary/82D4DC4/palettes/7.pal | 19 - data/tilesets/secondary/82D4DC4/palettes/8.pal | 19 - data/tilesets/secondary/82D4DC4/palettes/9.pal | 19 - data/tilesets/secondary/82D4DC4/tiles.png | Bin 948 -> 0 bytes .../secondary/82D4DDC/metatile_attributes.bin | Bin 456 -> 0 bytes data/tilesets/secondary/82D4DDC/metatiles.bin | Bin 1824 -> 0 bytes data/tilesets/secondary/82D4DDC/palettes/0.pal | 19 - data/tilesets/secondary/82D4DDC/palettes/1.pal | 19 - data/tilesets/secondary/82D4DDC/palettes/10.pal | 19 - data/tilesets/secondary/82D4DDC/palettes/11.pal | 19 - data/tilesets/secondary/82D4DDC/palettes/12.pal | 19 - data/tilesets/secondary/82D4DDC/palettes/13.pal | 19 - data/tilesets/secondary/82D4DDC/palettes/14.pal | 19 - data/tilesets/secondary/82D4DDC/palettes/15.pal | 19 - data/tilesets/secondary/82D4DDC/palettes/2.pal | 19 - data/tilesets/secondary/82D4DDC/palettes/3.pal | 19 - data/tilesets/secondary/82D4DDC/palettes/4.pal | 19 - data/tilesets/secondary/82D4DDC/palettes/5.pal | 19 - data/tilesets/secondary/82D4DDC/palettes/6.pal | 19 - data/tilesets/secondary/82D4DDC/palettes/7.pal | 19 - data/tilesets/secondary/82D4DDC/palettes/8.pal | 19 - data/tilesets/secondary/82D4DDC/palettes/9.pal | 19 - data/tilesets/secondary/82D4DDC/tiles.png | Bin 1218 -> 0 bytes .../secondary/82D4DF4/metatile_attributes.bin | Bin 608 -> 0 bytes data/tilesets/secondary/82D4DF4/metatiles.bin | Bin 2432 -> 0 bytes data/tilesets/secondary/82D4DF4/palettes/0.pal | 19 - data/tilesets/secondary/82D4DF4/palettes/1.pal | 19 - data/tilesets/secondary/82D4DF4/palettes/10.pal | 19 - data/tilesets/secondary/82D4DF4/palettes/11.pal | 19 - data/tilesets/secondary/82D4DF4/palettes/12.pal | 19 - data/tilesets/secondary/82D4DF4/palettes/13.pal | 19 - data/tilesets/secondary/82D4DF4/palettes/14.pal | 19 - data/tilesets/secondary/82D4DF4/palettes/15.pal | 19 - data/tilesets/secondary/82D4DF4/palettes/2.pal | 19 - data/tilesets/secondary/82D4DF4/palettes/3.pal | 19 - data/tilesets/secondary/82D4DF4/palettes/4.pal | 19 - data/tilesets/secondary/82D4DF4/palettes/5.pal | 19 - data/tilesets/secondary/82D4DF4/palettes/6.pal | 19 - data/tilesets/secondary/82D4DF4/palettes/7.pal | 19 - data/tilesets/secondary/82D4DF4/palettes/8.pal | 19 - data/tilesets/secondary/82D4DF4/palettes/9.pal | 19 - data/tilesets/secondary/82D4DF4/tiles.png | Bin 3821 -> 0 bytes .../secondary/82D4E0C/metatile_attributes.bin | Bin 628 -> 0 bytes data/tilesets/secondary/82D4E0C/metatiles.bin | Bin 2512 -> 0 bytes data/tilesets/secondary/82D4E0C/palettes/0.pal | 19 - data/tilesets/secondary/82D4E0C/palettes/1.pal | 19 - data/tilesets/secondary/82D4E0C/palettes/10.pal | 19 - data/tilesets/secondary/82D4E0C/palettes/11.pal | 19 - data/tilesets/secondary/82D4E0C/palettes/12.pal | 19 - data/tilesets/secondary/82D4E0C/palettes/13.pal | 19 - data/tilesets/secondary/82D4E0C/palettes/14.pal | 19 - data/tilesets/secondary/82D4E0C/palettes/15.pal | 19 - data/tilesets/secondary/82D4E0C/palettes/2.pal | 19 - data/tilesets/secondary/82D4E0C/palettes/3.pal | 19 - data/tilesets/secondary/82D4E0C/palettes/4.pal | 19 - data/tilesets/secondary/82D4E0C/palettes/5.pal | 19 - data/tilesets/secondary/82D4E0C/palettes/6.pal | 19 - data/tilesets/secondary/82D4E0C/palettes/7.pal | 19 - data/tilesets/secondary/82D4E0C/palettes/8.pal | 19 - data/tilesets/secondary/82D4E0C/palettes/9.pal | 19 - data/tilesets/secondary/82D4E0C/tiles.png | Bin 3623 -> 0 bytes .../secondary/82D4E24/metatile_attributes.bin | Bin 992 -> 0 bytes data/tilesets/secondary/82D4E24/metatiles.bin | Bin 3968 -> 0 bytes data/tilesets/secondary/82D4E24/palettes/0.pal | 19 - data/tilesets/secondary/82D4E24/palettes/1.pal | 19 - data/tilesets/secondary/82D4E24/palettes/10.pal | 19 - data/tilesets/secondary/82D4E24/palettes/11.pal | 19 - data/tilesets/secondary/82D4E24/palettes/12.pal | 19 - data/tilesets/secondary/82D4E24/palettes/13.pal | 19 - data/tilesets/secondary/82D4E24/palettes/14.pal | 19 - data/tilesets/secondary/82D4E24/palettes/15.pal | 19 - data/tilesets/secondary/82D4E24/palettes/2.pal | 19 - data/tilesets/secondary/82D4E24/palettes/3.pal | 19 - data/tilesets/secondary/82D4E24/palettes/4.pal | 19 - data/tilesets/secondary/82D4E24/palettes/5.pal | 19 - data/tilesets/secondary/82D4E24/palettes/6.pal | 19 - data/tilesets/secondary/82D4E24/palettes/7.pal | 19 - data/tilesets/secondary/82D4E24/palettes/8.pal | 19 - data/tilesets/secondary/82D4E24/palettes/9.pal | 19 - data/tilesets/secondary/82D4E24/tiles.png | Bin 4982 -> 0 bytes .../secondary/82D4E3C/metatile_attributes.bin | Bin 456 -> 0 bytes data/tilesets/secondary/82D4E3C/metatiles.bin | Bin 1824 -> 0 bytes data/tilesets/secondary/82D4E3C/palettes/0.pal | 19 - data/tilesets/secondary/82D4E3C/palettes/1.pal | 19 - data/tilesets/secondary/82D4E3C/palettes/10.pal | 19 - data/tilesets/secondary/82D4E3C/palettes/11.pal | 19 - data/tilesets/secondary/82D4E3C/palettes/12.pal | 19 - data/tilesets/secondary/82D4E3C/palettes/13.pal | 19 - data/tilesets/secondary/82D4E3C/palettes/14.pal | 19 - data/tilesets/secondary/82D4E3C/palettes/15.pal | 19 - data/tilesets/secondary/82D4E3C/palettes/2.pal | 19 - data/tilesets/secondary/82D4E3C/palettes/3.pal | 19 - data/tilesets/secondary/82D4E3C/palettes/4.pal | 19 - data/tilesets/secondary/82D4E3C/palettes/5.pal | 19 - data/tilesets/secondary/82D4E3C/palettes/6.pal | 19 - data/tilesets/secondary/82D4E3C/palettes/7.pal | 19 - data/tilesets/secondary/82D4E3C/palettes/8.pal | 19 - data/tilesets/secondary/82D4E3C/palettes/9.pal | 19 - data/tilesets/secondary/82D4E3C/tiles.png | Bin 1218 -> 0 bytes .../secondary/82D4E54/metatile_attributes.bin | Bin 536 -> 0 bytes data/tilesets/secondary/82D4E54/metatiles.bin | Bin 2144 -> 0 bytes data/tilesets/secondary/82D4E54/palettes/0.pal | 19 - data/tilesets/secondary/82D4E54/palettes/1.pal | 19 - data/tilesets/secondary/82D4E54/palettes/10.pal | 19 - data/tilesets/secondary/82D4E54/palettes/11.pal | 19 - data/tilesets/secondary/82D4E54/palettes/12.pal | 19 - data/tilesets/secondary/82D4E54/palettes/13.pal | 19 - data/tilesets/secondary/82D4E54/palettes/14.pal | 19 - data/tilesets/secondary/82D4E54/palettes/15.pal | 19 - data/tilesets/secondary/82D4E54/palettes/2.pal | 19 - data/tilesets/secondary/82D4E54/palettes/3.pal | 19 - data/tilesets/secondary/82D4E54/palettes/4.pal | 19 - data/tilesets/secondary/82D4E54/palettes/5.pal | 19 - data/tilesets/secondary/82D4E54/palettes/6.pal | 19 - data/tilesets/secondary/82D4E54/palettes/7.pal | 19 - data/tilesets/secondary/82D4E54/palettes/8.pal | 19 - data/tilesets/secondary/82D4E54/palettes/9.pal | 19 - data/tilesets/secondary/82D4E54/tiles.png | Bin 3360 -> 0 bytes .../secondary/82D4E6C/metatile_attributes.bin | Bin 984 -> 0 bytes data/tilesets/secondary/82D4E6C/metatiles.bin | Bin 3936 -> 0 bytes data/tilesets/secondary/82D4E6C/palettes/0.pal | 19 - data/tilesets/secondary/82D4E6C/palettes/1.pal | 19 - data/tilesets/secondary/82D4E6C/palettes/10.pal | 19 - data/tilesets/secondary/82D4E6C/palettes/11.pal | 19 - data/tilesets/secondary/82D4E6C/palettes/12.pal | 19 - data/tilesets/secondary/82D4E6C/palettes/13.pal | 19 - data/tilesets/secondary/82D4E6C/palettes/14.pal | 19 - data/tilesets/secondary/82D4E6C/palettes/15.pal | 19 - data/tilesets/secondary/82D4E6C/palettes/2.pal | 19 - data/tilesets/secondary/82D4E6C/palettes/3.pal | 19 - data/tilesets/secondary/82D4E6C/palettes/4.pal | 19 - data/tilesets/secondary/82D4E6C/palettes/5.pal | 19 - data/tilesets/secondary/82D4E6C/palettes/6.pal | 19 - data/tilesets/secondary/82D4E6C/palettes/7.pal | 19 - data/tilesets/secondary/82D4E6C/palettes/8.pal | 19 - data/tilesets/secondary/82D4E6C/palettes/9.pal | 19 - data/tilesets/secondary/82D4E6C/tiles.png | Bin 2189 -> 0 bytes .../secondary/82D4E84/metatile_attributes.bin | Bin 736 -> 0 bytes data/tilesets/secondary/82D4E84/metatiles.bin | Bin 2944 -> 0 bytes data/tilesets/secondary/82D4E84/palettes/0.pal | 19 - data/tilesets/secondary/82D4E84/palettes/1.pal | 19 - data/tilesets/secondary/82D4E84/palettes/10.pal | 19 - data/tilesets/secondary/82D4E84/palettes/11.pal | 19 - data/tilesets/secondary/82D4E84/palettes/12.pal | 19 - data/tilesets/secondary/82D4E84/palettes/13.pal | 19 - data/tilesets/secondary/82D4E84/palettes/14.pal | 19 - data/tilesets/secondary/82D4E84/palettes/15.pal | 19 - data/tilesets/secondary/82D4E84/palettes/2.pal | 19 - data/tilesets/secondary/82D4E84/palettes/3.pal | 19 - data/tilesets/secondary/82D4E84/palettes/4.pal | 19 - data/tilesets/secondary/82D4E84/palettes/5.pal | 19 - data/tilesets/secondary/82D4E84/palettes/6.pal | 19 - data/tilesets/secondary/82D4E84/palettes/7.pal | 19 - data/tilesets/secondary/82D4E84/palettes/8.pal | 19 - data/tilesets/secondary/82D4E84/palettes/9.pal | 19 - data/tilesets/secondary/82D4E84/tiles.png | Bin 1407 -> 0 bytes .../secondary/82D4E9C/metatile_attributes.bin | Bin 612 -> 0 bytes data/tilesets/secondary/82D4E9C/metatiles.bin | Bin 2448 -> 0 bytes data/tilesets/secondary/82D4E9C/palettes/0.pal | 19 - data/tilesets/secondary/82D4E9C/palettes/1.pal | 19 - data/tilesets/secondary/82D4E9C/palettes/10.pal | 19 - data/tilesets/secondary/82D4E9C/palettes/11.pal | 19 - data/tilesets/secondary/82D4E9C/palettes/12.pal | 19 - data/tilesets/secondary/82D4E9C/palettes/13.pal | 19 - data/tilesets/secondary/82D4E9C/palettes/14.pal | 19 - data/tilesets/secondary/82D4E9C/palettes/15.pal | 19 - data/tilesets/secondary/82D4E9C/palettes/2.pal | 19 - data/tilesets/secondary/82D4E9C/palettes/3.pal | 19 - data/tilesets/secondary/82D4E9C/palettes/4.pal | 19 - data/tilesets/secondary/82D4E9C/palettes/5.pal | 19 - data/tilesets/secondary/82D4E9C/palettes/6.pal | 19 - data/tilesets/secondary/82D4E9C/palettes/7.pal | 19 - data/tilesets/secondary/82D4E9C/palettes/8.pal | 19 - data/tilesets/secondary/82D4E9C/palettes/9.pal | 19 - data/tilesets/secondary/82D4E9C/tiles.png | Bin 1037 -> 0 bytes .../secondary/82D4EB4/metatile_attributes.bin | Bin 236 -> 0 bytes data/tilesets/secondary/82D4EB4/metatiles.bin | Bin 944 -> 0 bytes data/tilesets/secondary/82D4EB4/palettes/0.pal | 19 - data/tilesets/secondary/82D4EB4/palettes/1.pal | 19 - data/tilesets/secondary/82D4EB4/palettes/10.pal | 19 - data/tilesets/secondary/82D4EB4/palettes/11.pal | 19 - data/tilesets/secondary/82D4EB4/palettes/12.pal | 19 - data/tilesets/secondary/82D4EB4/palettes/13.pal | 19 - data/tilesets/secondary/82D4EB4/palettes/14.pal | 19 - data/tilesets/secondary/82D4EB4/palettes/15.pal | 19 - data/tilesets/secondary/82D4EB4/palettes/2.pal | 19 - data/tilesets/secondary/82D4EB4/palettes/3.pal | 19 - data/tilesets/secondary/82D4EB4/palettes/4.pal | 19 - data/tilesets/secondary/82D4EB4/palettes/5.pal | 19 - data/tilesets/secondary/82D4EB4/palettes/6.pal | 19 - data/tilesets/secondary/82D4EB4/palettes/7.pal | 19 - data/tilesets/secondary/82D4EB4/palettes/8.pal | 19 - data/tilesets/secondary/82D4EB4/palettes/9.pal | 19 - data/tilesets/secondary/82D4EB4/tiles.png | Bin 1075 -> 0 bytes .../secondary/82D4ECC/metatile_attributes.bin | Bin 1512 -> 0 bytes data/tilesets/secondary/82D4ECC/metatiles.bin | Bin 6048 -> 0 bytes .../secondary/82D4EE4/metatile_attributes.bin | Bin 288 -> 0 bytes data/tilesets/secondary/82D4EE4/metatiles.bin | Bin 1152 -> 0 bytes data/tilesets/secondary/82D4EE4/palettes/0.pal | 19 - data/tilesets/secondary/82D4EE4/palettes/1.pal | 19 - data/tilesets/secondary/82D4EE4/palettes/10.pal | 19 - data/tilesets/secondary/82D4EE4/palettes/11.pal | 19 - data/tilesets/secondary/82D4EE4/palettes/12.pal | 19 - data/tilesets/secondary/82D4EE4/palettes/13.pal | 19 - data/tilesets/secondary/82D4EE4/palettes/14.pal | 19 - data/tilesets/secondary/82D4EE4/palettes/15.pal | 19 - data/tilesets/secondary/82D4EE4/palettes/2.pal | 19 - data/tilesets/secondary/82D4EE4/palettes/3.pal | 19 - data/tilesets/secondary/82D4EE4/palettes/4.pal | 19 - data/tilesets/secondary/82D4EE4/palettes/5.pal | 19 - data/tilesets/secondary/82D4EE4/palettes/6.pal | 19 - data/tilesets/secondary/82D4EE4/palettes/7.pal | 19 - data/tilesets/secondary/82D4EE4/palettes/8.pal | 19 - data/tilesets/secondary/82D4EE4/palettes/9.pal | 19 - data/tilesets/secondary/82D4EE4/tiles.png | Bin 708 -> 0 bytes .../secondary/82D4EFC/metatile_attributes.bin | Bin 404 -> 0 bytes data/tilesets/secondary/82D4EFC/metatiles.bin | Bin 1616 -> 0 bytes data/tilesets/secondary/82D4EFC/palettes/0.pal | 19 - data/tilesets/secondary/82D4EFC/palettes/1.pal | 19 - data/tilesets/secondary/82D4EFC/palettes/10.pal | 19 - data/tilesets/secondary/82D4EFC/palettes/11.pal | 19 - data/tilesets/secondary/82D4EFC/palettes/12.pal | 19 - data/tilesets/secondary/82D4EFC/palettes/13.pal | 19 - data/tilesets/secondary/82D4EFC/palettes/14.pal | 19 - data/tilesets/secondary/82D4EFC/palettes/15.pal | 19 - data/tilesets/secondary/82D4EFC/palettes/2.pal | 19 - data/tilesets/secondary/82D4EFC/palettes/3.pal | 19 - data/tilesets/secondary/82D4EFC/palettes/4.pal | 19 - data/tilesets/secondary/82D4EFC/palettes/5.pal | 19 - data/tilesets/secondary/82D4EFC/palettes/6.pal | 19 - data/tilesets/secondary/82D4EFC/palettes/7.pal | 19 - data/tilesets/secondary/82D4EFC/palettes/8.pal | 19 - data/tilesets/secondary/82D4EFC/palettes/9.pal | 19 - data/tilesets/secondary/82D4EFC/tiles.png | Bin 1458 -> 0 bytes .../secondary/82D4F14/metatile_attributes.bin | Bin 512 -> 0 bytes data/tilesets/secondary/82D4F14/metatiles.bin | Bin 2048 -> 0 bytes data/tilesets/secondary/82D4F14/palettes/0.pal | 19 - data/tilesets/secondary/82D4F14/palettes/1.pal | 19 - data/tilesets/secondary/82D4F14/palettes/10.pal | 19 - data/tilesets/secondary/82D4F14/palettes/11.pal | 19 - data/tilesets/secondary/82D4F14/palettes/12.pal | 19 - data/tilesets/secondary/82D4F14/palettes/13.pal | 19 - data/tilesets/secondary/82D4F14/palettes/14.pal | 19 - data/tilesets/secondary/82D4F14/palettes/15.pal | 19 - data/tilesets/secondary/82D4F14/palettes/2.pal | 19 - data/tilesets/secondary/82D4F14/palettes/3.pal | 19 - data/tilesets/secondary/82D4F14/palettes/4.pal | 19 - data/tilesets/secondary/82D4F14/palettes/5.pal | 19 - data/tilesets/secondary/82D4F14/palettes/6.pal | 19 - data/tilesets/secondary/82D4F14/palettes/7.pal | 19 - data/tilesets/secondary/82D4F14/palettes/8.pal | 19 - data/tilesets/secondary/82D4F14/palettes/9.pal | 19 - data/tilesets/secondary/82D4F14/tiles.png | Bin 899 -> 0 bytes .../secondary/82D4F2C/metatile_attributes.bin | Bin 1032 -> 0 bytes data/tilesets/secondary/82D4F2C/metatiles.bin | Bin 4128 -> 0 bytes data/tilesets/secondary/82D4F2C/palettes/0.pal | 19 - data/tilesets/secondary/82D4F2C/palettes/1.pal | 19 - data/tilesets/secondary/82D4F2C/palettes/10.pal | 19 - data/tilesets/secondary/82D4F2C/palettes/11.pal | 19 - data/tilesets/secondary/82D4F2C/palettes/12.pal | 19 - data/tilesets/secondary/82D4F2C/palettes/13.pal | 19 - data/tilesets/secondary/82D4F2C/palettes/14.pal | 19 - data/tilesets/secondary/82D4F2C/palettes/15.pal | 19 - data/tilesets/secondary/82D4F2C/palettes/2.pal | 19 - data/tilesets/secondary/82D4F2C/palettes/3.pal | 19 - data/tilesets/secondary/82D4F2C/palettes/4.pal | 19 - data/tilesets/secondary/82D4F2C/palettes/5.pal | 19 - data/tilesets/secondary/82D4F2C/palettes/6.pal | 19 - data/tilesets/secondary/82D4F2C/palettes/7.pal | 19 - data/tilesets/secondary/82D4F2C/palettes/8.pal | 19 - data/tilesets/secondary/82D4F2C/palettes/9.pal | 19 - data/tilesets/secondary/82D4F2C/tiles.png | Bin 2508 -> 0 bytes .../secondary/82D4F44/metatile_attributes.bin | Bin 416 -> 0 bytes data/tilesets/secondary/82D4F44/metatiles.bin | Bin 1664 -> 0 bytes data/tilesets/secondary/82D4F44/palettes/0.pal | 19 - data/tilesets/secondary/82D4F44/palettes/1.pal | 19 - data/tilesets/secondary/82D4F44/palettes/10.pal | 19 - data/tilesets/secondary/82D4F44/palettes/11.pal | 19 - data/tilesets/secondary/82D4F44/palettes/12.pal | 19 - data/tilesets/secondary/82D4F44/palettes/13.pal | 19 - data/tilesets/secondary/82D4F44/palettes/14.pal | 19 - data/tilesets/secondary/82D4F44/palettes/15.pal | 19 - data/tilesets/secondary/82D4F44/palettes/2.pal | 19 - data/tilesets/secondary/82D4F44/palettes/3.pal | 19 - data/tilesets/secondary/82D4F44/palettes/4.pal | 19 - data/tilesets/secondary/82D4F44/palettes/5.pal | 19 - data/tilesets/secondary/82D4F44/palettes/6.pal | 19 - data/tilesets/secondary/82D4F44/palettes/7.pal | 19 - data/tilesets/secondary/82D4F44/palettes/8.pal | 19 - data/tilesets/secondary/82D4F44/palettes/9.pal | 19 - data/tilesets/secondary/82D4F44/tiles.png | Bin 975 -> 0 bytes .../secondary/82D4F5C/metatile_attributes.bin | Bin 184 -> 0 bytes data/tilesets/secondary/82D4F5C/metatiles.bin | Bin 736 -> 0 bytes data/tilesets/secondary/82D4F5C/palettes/0.pal | 19 - data/tilesets/secondary/82D4F5C/palettes/1.pal | 19 - data/tilesets/secondary/82D4F5C/palettes/10.pal | 19 - data/tilesets/secondary/82D4F5C/palettes/11.pal | 19 - data/tilesets/secondary/82D4F5C/palettes/12.pal | 19 - data/tilesets/secondary/82D4F5C/palettes/13.pal | 19 - data/tilesets/secondary/82D4F5C/palettes/14.pal | 19 - data/tilesets/secondary/82D4F5C/palettes/15.pal | 19 - data/tilesets/secondary/82D4F5C/palettes/2.pal | 19 - data/tilesets/secondary/82D4F5C/palettes/3.pal | 19 - data/tilesets/secondary/82D4F5C/palettes/4.pal | 19 - data/tilesets/secondary/82D4F5C/palettes/5.pal | 19 - data/tilesets/secondary/82D4F5C/palettes/6.pal | 19 - data/tilesets/secondary/82D4F5C/palettes/7.pal | 19 - data/tilesets/secondary/82D4F5C/palettes/8.pal | 19 - data/tilesets/secondary/82D4F5C/palettes/9.pal | 19 - data/tilesets/secondary/82D4F5C/tiles.png | Bin 610 -> 0 bytes .../secondary/82D4F74/metatile_attributes.bin | Bin 680 -> 0 bytes data/tilesets/secondary/82D4F74/metatiles.bin | Bin 2720 -> 0 bytes data/tilesets/secondary/82D4F74/palettes/0.pal | 19 - data/tilesets/secondary/82D4F74/palettes/1.pal | 19 - data/tilesets/secondary/82D4F74/palettes/10.pal | 19 - data/tilesets/secondary/82D4F74/palettes/11.pal | 19 - data/tilesets/secondary/82D4F74/palettes/12.pal | 19 - data/tilesets/secondary/82D4F74/palettes/13.pal | 19 - data/tilesets/secondary/82D4F74/palettes/14.pal | 19 - data/tilesets/secondary/82D4F74/palettes/15.pal | 19 - data/tilesets/secondary/82D4F74/palettes/2.pal | 19 - data/tilesets/secondary/82D4F74/palettes/3.pal | 19 - data/tilesets/secondary/82D4F74/palettes/4.pal | 19 - data/tilesets/secondary/82D4F74/palettes/5.pal | 19 - data/tilesets/secondary/82D4F74/palettes/6.pal | 19 - data/tilesets/secondary/82D4F74/palettes/7.pal | 19 - data/tilesets/secondary/82D4F74/palettes/8.pal | 19 - data/tilesets/secondary/82D4F74/palettes/9.pal | 19 - data/tilesets/secondary/82D4F74/tiles.png | Bin 994 -> 0 bytes .../secondary/82D4F8C/metatile_attributes.bin | Bin 860 -> 0 bytes data/tilesets/secondary/82D4F8C/metatiles.bin | Bin 3440 -> 0 bytes data/tilesets/secondary/82D4F8C/palettes/0.pal | 19 - data/tilesets/secondary/82D4F8C/palettes/1.pal | 19 - data/tilesets/secondary/82D4F8C/palettes/10.pal | 19 - data/tilesets/secondary/82D4F8C/palettes/11.pal | 19 - data/tilesets/secondary/82D4F8C/palettes/12.pal | 19 - data/tilesets/secondary/82D4F8C/palettes/13.pal | 19 - data/tilesets/secondary/82D4F8C/palettes/14.pal | 19 - data/tilesets/secondary/82D4F8C/palettes/15.pal | 19 - data/tilesets/secondary/82D4F8C/palettes/2.pal | 19 - data/tilesets/secondary/82D4F8C/palettes/3.pal | 19 - data/tilesets/secondary/82D4F8C/palettes/4.pal | 19 - data/tilesets/secondary/82D4F8C/palettes/5.pal | 19 - data/tilesets/secondary/82D4F8C/palettes/6.pal | 19 - data/tilesets/secondary/82D4F8C/palettes/7.pal | 19 - data/tilesets/secondary/82D4F8C/palettes/8.pal | 19 - data/tilesets/secondary/82D4F8C/palettes/9.pal | 19 - data/tilesets/secondary/82D4F8C/tiles.png | Bin 3737 -> 0 bytes .../secondary/82D4FA4/metatile_attributes.bin | Bin 228 -> 0 bytes data/tilesets/secondary/82D4FA4/metatiles.bin | Bin 912 -> 0 bytes data/tilesets/secondary/82D4FA4/palettes/0.pal | 19 - data/tilesets/secondary/82D4FA4/palettes/1.pal | 19 - data/tilesets/secondary/82D4FA4/palettes/10.pal | 19 - data/tilesets/secondary/82D4FA4/palettes/11.pal | 19 - data/tilesets/secondary/82D4FA4/palettes/12.pal | 19 - data/tilesets/secondary/82D4FA4/palettes/13.pal | 19 - data/tilesets/secondary/82D4FA4/palettes/14.pal | 19 - data/tilesets/secondary/82D4FA4/palettes/15.pal | 19 - data/tilesets/secondary/82D4FA4/palettes/2.pal | 19 - data/tilesets/secondary/82D4FA4/palettes/3.pal | 19 - data/tilesets/secondary/82D4FA4/palettes/4.pal | 19 - data/tilesets/secondary/82D4FA4/palettes/5.pal | 19 - data/tilesets/secondary/82D4FA4/palettes/6.pal | 19 - data/tilesets/secondary/82D4FA4/palettes/7.pal | 19 - data/tilesets/secondary/82D4FA4/palettes/8.pal | 19 - data/tilesets/secondary/82D4FA4/palettes/9.pal | 19 - data/tilesets/secondary/82D4FA4/tiles.png | Bin 1994 -> 0 bytes .../secondary/82D4FBC/metatile_attributes.bin | Bin 8 -> 0 bytes data/tilesets/secondary/82D4FBC/metatiles.bin | Bin 32 -> 0 bytes data/tilesets/secondary/82D4FBC/palettes/0.pal | 19 - data/tilesets/secondary/82D4FBC/palettes/1.pal | 19 - data/tilesets/secondary/82D4FBC/palettes/10.pal | 19 - data/tilesets/secondary/82D4FBC/palettes/11.pal | 19 - data/tilesets/secondary/82D4FBC/palettes/12.pal | 19 - data/tilesets/secondary/82D4FBC/palettes/13.pal | 19 - data/tilesets/secondary/82D4FBC/palettes/14.pal | 19 - data/tilesets/secondary/82D4FBC/palettes/15.pal | 19 - data/tilesets/secondary/82D4FBC/palettes/2.pal | 19 - data/tilesets/secondary/82D4FBC/palettes/3.pal | 19 - data/tilesets/secondary/82D4FBC/palettes/4.pal | 19 - data/tilesets/secondary/82D4FBC/palettes/5.pal | 19 - data/tilesets/secondary/82D4FBC/palettes/6.pal | 19 - data/tilesets/secondary/82D4FBC/palettes/7.pal | 19 - data/tilesets/secondary/82D4FBC/palettes/8.pal | 19 - data/tilesets/secondary/82D4FBC/palettes/9.pal | 19 - data/tilesets/secondary/82D4FBC/tiles.png | Bin 136 -> 0 bytes .../secondary/82D4FD4/metatile_attributes.bin | Bin 8 -> 0 bytes data/tilesets/secondary/82D4FD4/metatiles.bin | Bin 32 -> 0 bytes data/tilesets/secondary/82D4FD4/palettes/0.pal | 19 - data/tilesets/secondary/82D4FD4/palettes/1.pal | 19 - data/tilesets/secondary/82D4FD4/palettes/10.pal | 19 - data/tilesets/secondary/82D4FD4/palettes/11.pal | 19 - data/tilesets/secondary/82D4FD4/palettes/12.pal | 19 - data/tilesets/secondary/82D4FD4/palettes/13.pal | 19 - data/tilesets/secondary/82D4FD4/palettes/14.pal | 19 - data/tilesets/secondary/82D4FD4/palettes/15.pal | 19 - data/tilesets/secondary/82D4FD4/palettes/2.pal | 19 - data/tilesets/secondary/82D4FD4/palettes/3.pal | 19 - data/tilesets/secondary/82D4FD4/palettes/4.pal | 19 - data/tilesets/secondary/82D4FD4/palettes/5.pal | 19 - data/tilesets/secondary/82D4FD4/palettes/6.pal | 19 - data/tilesets/secondary/82D4FD4/palettes/7.pal | 19 - data/tilesets/secondary/82D4FD4/palettes/8.pal | 19 - data/tilesets/secondary/82D4FD4/palettes/9.pal | 19 - data/tilesets/secondary/82D4FD4/tiles.png | Bin 138 -> 0 bytes .../secondary/82D4FEC/metatile_attributes.bin | Bin 904 -> 0 bytes data/tilesets/secondary/82D4FEC/metatiles.bin | Bin 3616 -> 0 bytes data/tilesets/secondary/82D4FEC/palettes/0.pal | 19 - data/tilesets/secondary/82D4FEC/palettes/1.pal | 19 - data/tilesets/secondary/82D4FEC/palettes/10.pal | 19 - data/tilesets/secondary/82D4FEC/palettes/11.pal | 19 - data/tilesets/secondary/82D4FEC/palettes/12.pal | 19 - data/tilesets/secondary/82D4FEC/palettes/13.pal | 19 - data/tilesets/secondary/82D4FEC/palettes/14.pal | 19 - data/tilesets/secondary/82D4FEC/palettes/15.pal | 19 - data/tilesets/secondary/82D4FEC/palettes/2.pal | 19 - data/tilesets/secondary/82D4FEC/palettes/3.pal | 19 - data/tilesets/secondary/82D4FEC/palettes/4.pal | 19 - data/tilesets/secondary/82D4FEC/palettes/5.pal | 19 - data/tilesets/secondary/82D4FEC/palettes/6.pal | 19 - data/tilesets/secondary/82D4FEC/palettes/7.pal | 19 - data/tilesets/secondary/82D4FEC/palettes/8.pal | 19 - data/tilesets/secondary/82D4FEC/palettes/9.pal | 19 - data/tilesets/secondary/82D4FEC/tiles.png | Bin 4541 -> 0 bytes .../secondary/82D5004/metatile_attributes.bin | Bin 168 -> 0 bytes data/tilesets/secondary/82D5004/metatiles.bin | Bin 672 -> 0 bytes data/tilesets/secondary/82D5004/palettes/0.pal | 19 - data/tilesets/secondary/82D5004/palettes/1.pal | 19 - data/tilesets/secondary/82D5004/palettes/10.pal | 19 - data/tilesets/secondary/82D5004/palettes/11.pal | 19 - data/tilesets/secondary/82D5004/palettes/12.pal | 19 - data/tilesets/secondary/82D5004/palettes/13.pal | 19 - data/tilesets/secondary/82D5004/palettes/14.pal | 19 - data/tilesets/secondary/82D5004/palettes/15.pal | 19 - data/tilesets/secondary/82D5004/palettes/2.pal | 19 - data/tilesets/secondary/82D5004/palettes/3.pal | 19 - data/tilesets/secondary/82D5004/palettes/4.pal | 19 - data/tilesets/secondary/82D5004/palettes/5.pal | 19 - data/tilesets/secondary/82D5004/palettes/6.pal | 19 - data/tilesets/secondary/82D5004/palettes/7.pal | 19 - data/tilesets/secondary/82D5004/palettes/8.pal | 19 - data/tilesets/secondary/82D5004/palettes/9.pal | 19 - data/tilesets/secondary/82D5004/tiles.png | Bin 986 -> 0 bytes .../secondary/82D501C/metatile_attributes.bin | Bin 880 -> 0 bytes data/tilesets/secondary/82D501C/metatiles.bin | Bin 3520 -> 0 bytes data/tilesets/secondary/82D501C/palettes/0.pal | 19 - data/tilesets/secondary/82D501C/palettes/1.pal | 19 - data/tilesets/secondary/82D501C/palettes/10.pal | 19 - data/tilesets/secondary/82D501C/palettes/11.pal | 19 - data/tilesets/secondary/82D501C/palettes/12.pal | 19 - data/tilesets/secondary/82D501C/palettes/13.pal | 19 - data/tilesets/secondary/82D501C/palettes/14.pal | 19 - data/tilesets/secondary/82D501C/palettes/15.pal | 19 - data/tilesets/secondary/82D501C/palettes/2.pal | 19 - data/tilesets/secondary/82D501C/palettes/3.pal | 19 - data/tilesets/secondary/82D501C/palettes/4.pal | 19 - data/tilesets/secondary/82D501C/palettes/5.pal | 19 - data/tilesets/secondary/82D501C/palettes/6.pal | 19 - data/tilesets/secondary/82D501C/palettes/7.pal | 19 - data/tilesets/secondary/82D501C/palettes/8.pal | 19 - data/tilesets/secondary/82D501C/palettes/9.pal | 19 - data/tilesets/secondary/82D501C/tiles.png | Bin 4217 -> 0 bytes .../secondary/82D5034/metatile_attributes.bin | Bin 376 -> 0 bytes data/tilesets/secondary/82D5034/metatiles.bin | Bin 1504 -> 0 bytes data/tilesets/secondary/82D5034/palettes/0.pal | 19 - data/tilesets/secondary/82D5034/palettes/1.pal | 19 - data/tilesets/secondary/82D5034/palettes/10.pal | 19 - data/tilesets/secondary/82D5034/palettes/11.pal | 19 - data/tilesets/secondary/82D5034/palettes/12.pal | 19 - data/tilesets/secondary/82D5034/palettes/13.pal | 19 - data/tilesets/secondary/82D5034/palettes/14.pal | 19 - data/tilesets/secondary/82D5034/palettes/15.pal | 19 - data/tilesets/secondary/82D5034/palettes/2.pal | 19 - data/tilesets/secondary/82D5034/palettes/3.pal | 19 - data/tilesets/secondary/82D5034/palettes/4.pal | 19 - data/tilesets/secondary/82D5034/palettes/5.pal | 19 - data/tilesets/secondary/82D5034/palettes/6.pal | 19 - data/tilesets/secondary/82D5034/palettes/7.pal | 19 - data/tilesets/secondary/82D5034/palettes/8.pal | 19 - data/tilesets/secondary/82D5034/palettes/9.pal | 19 - data/tilesets/secondary/82D5034/tiles.png | Bin 986 -> 0 bytes .../secondary/82D504C/metatile_attributes.bin | Bin 1140 -> 0 bytes data/tilesets/secondary/82D504C/metatiles.bin | Bin 4560 -> 0 bytes data/tilesets/secondary/82D504C/palettes/0.pal | 19 - data/tilesets/secondary/82D504C/palettes/1.pal | 19 - data/tilesets/secondary/82D504C/palettes/10.pal | 19 - data/tilesets/secondary/82D504C/palettes/11.pal | 19 - data/tilesets/secondary/82D504C/palettes/12.pal | 19 - data/tilesets/secondary/82D504C/palettes/13.pal | 19 - data/tilesets/secondary/82D504C/palettes/14.pal | 19 - data/tilesets/secondary/82D504C/palettes/15.pal | 19 - data/tilesets/secondary/82D504C/palettes/2.pal | 19 - data/tilesets/secondary/82D504C/palettes/3.pal | 19 - data/tilesets/secondary/82D504C/palettes/4.pal | 19 - data/tilesets/secondary/82D504C/palettes/5.pal | 19 - data/tilesets/secondary/82D504C/palettes/6.pal | 19 - data/tilesets/secondary/82D504C/palettes/7.pal | 19 - data/tilesets/secondary/82D504C/palettes/8.pal | 19 - data/tilesets/secondary/82D504C/palettes/9.pal | 19 - data/tilesets/secondary/82D504C/tiles.png | Bin 2574 -> 0 bytes .../secondary/82D5064/metatile_attributes.bin | Bin 608 -> 0 bytes data/tilesets/secondary/82D5064/metatiles.bin | Bin 2432 -> 0 bytes data/tilesets/secondary/82D5064/palettes/0.pal | 19 - data/tilesets/secondary/82D5064/palettes/1.pal | 19 - data/tilesets/secondary/82D5064/palettes/10.pal | 19 - data/tilesets/secondary/82D5064/palettes/11.pal | 19 - data/tilesets/secondary/82D5064/palettes/12.pal | 19 - data/tilesets/secondary/82D5064/palettes/13.pal | 19 - data/tilesets/secondary/82D5064/palettes/14.pal | 19 - data/tilesets/secondary/82D5064/palettes/15.pal | 19 - data/tilesets/secondary/82D5064/palettes/2.pal | 19 - data/tilesets/secondary/82D5064/palettes/3.pal | 19 - data/tilesets/secondary/82D5064/palettes/4.pal | 19 - data/tilesets/secondary/82D5064/palettes/5.pal | 19 - data/tilesets/secondary/82D5064/palettes/6.pal | 19 - data/tilesets/secondary/82D5064/palettes/7.pal | 19 - data/tilesets/secondary/82D5064/palettes/8.pal | 19 - data/tilesets/secondary/82D5064/palettes/9.pal | 19 - data/tilesets/secondary/82D5064/tiles.png | Bin 2286 -> 0 bytes .../secondary/82D507C/metatile_attributes.bin | Bin 960 -> 0 bytes data/tilesets/secondary/82D507C/metatiles.bin | Bin 3840 -> 0 bytes data/tilesets/secondary/82D507C/palettes/0.pal | 19 - data/tilesets/secondary/82D507C/palettes/1.pal | 19 - data/tilesets/secondary/82D507C/palettes/10.pal | 19 - data/tilesets/secondary/82D507C/palettes/11.pal | 19 - data/tilesets/secondary/82D507C/palettes/12.pal | 19 - data/tilesets/secondary/82D507C/palettes/13.pal | 19 - data/tilesets/secondary/82D507C/palettes/14.pal | 19 - data/tilesets/secondary/82D507C/palettes/15.pal | 19 - data/tilesets/secondary/82D507C/palettes/2.pal | 19 - data/tilesets/secondary/82D507C/palettes/3.pal | 19 - data/tilesets/secondary/82D507C/palettes/4.pal | 19 - data/tilesets/secondary/82D507C/palettes/5.pal | 19 - data/tilesets/secondary/82D507C/palettes/6.pal | 19 - data/tilesets/secondary/82D507C/palettes/7.pal | 19 - data/tilesets/secondary/82D507C/palettes/8.pal | 19 - data/tilesets/secondary/82D507C/palettes/9.pal | 19 - data/tilesets/secondary/82D507C/tiles.png | Bin 3132 -> 0 bytes .../secondary/82D5094/metatile_attributes.bin | Bin 1152 -> 0 bytes data/tilesets/secondary/82D5094/metatiles.bin | Bin 4608 -> 0 bytes data/tilesets/secondary/82D5094/palettes/0.pal | 19 - data/tilesets/secondary/82D5094/palettes/1.pal | 19 - data/tilesets/secondary/82D5094/palettes/10.pal | 19 - data/tilesets/secondary/82D5094/palettes/11.pal | 19 - data/tilesets/secondary/82D5094/palettes/12.pal | 19 - data/tilesets/secondary/82D5094/palettes/13.pal | 19 - data/tilesets/secondary/82D5094/palettes/14.pal | 19 - data/tilesets/secondary/82D5094/palettes/15.pal | 19 - data/tilesets/secondary/82D5094/palettes/2.pal | 19 - data/tilesets/secondary/82D5094/palettes/3.pal | 19 - data/tilesets/secondary/82D5094/palettes/4.pal | 19 - data/tilesets/secondary/82D5094/palettes/5.pal | 19 - data/tilesets/secondary/82D5094/palettes/6.pal | 19 - data/tilesets/secondary/82D5094/palettes/7.pal | 19 - data/tilesets/secondary/82D5094/palettes/8.pal | 19 - data/tilesets/secondary/82D5094/palettes/9.pal | 19 - data/tilesets/secondary/82D5094/tiles.png | Bin 3152 -> 0 bytes .../secondary/82D50AC/metatile_attributes.bin | Bin 316 -> 0 bytes data/tilesets/secondary/82D50AC/metatiles.bin | Bin 1264 -> 0 bytes data/tilesets/secondary/82D50AC/palettes/0.pal | 19 - data/tilesets/secondary/82D50AC/palettes/1.pal | 19 - data/tilesets/secondary/82D50AC/palettes/10.pal | 19 - data/tilesets/secondary/82D50AC/palettes/11.pal | 19 - data/tilesets/secondary/82D50AC/palettes/12.pal | 19 - data/tilesets/secondary/82D50AC/palettes/13.pal | 19 - data/tilesets/secondary/82D50AC/palettes/14.pal | 19 - data/tilesets/secondary/82D50AC/palettes/15.pal | 19 - data/tilesets/secondary/82D50AC/palettes/2.pal | 19 - data/tilesets/secondary/82D50AC/palettes/3.pal | 19 - data/tilesets/secondary/82D50AC/palettes/4.pal | 19 - data/tilesets/secondary/82D50AC/palettes/5.pal | 19 - data/tilesets/secondary/82D50AC/palettes/6.pal | 19 - data/tilesets/secondary/82D50AC/palettes/7.pal | 19 - data/tilesets/secondary/82D50AC/palettes/8.pal | 19 - data/tilesets/secondary/82D50AC/palettes/9.pal | 19 - data/tilesets/secondary/82D50AC/tiles.png | Bin 1423 -> 0 bytes .../secondary/82D50C4/metatile_attributes.bin | Bin 1536 -> 0 bytes data/tilesets/secondary/82D50C4/metatiles.bin | Bin 6144 -> 0 bytes data/tilesets/secondary/82D50C4/palettes/0.pal | 19 - data/tilesets/secondary/82D50C4/palettes/1.pal | 19 - data/tilesets/secondary/82D50C4/palettes/10.pal | 19 - data/tilesets/secondary/82D50C4/palettes/11.pal | 19 - data/tilesets/secondary/82D50C4/palettes/12.pal | 19 - data/tilesets/secondary/82D50C4/palettes/13.pal | 19 - data/tilesets/secondary/82D50C4/palettes/14.pal | 19 - data/tilesets/secondary/82D50C4/palettes/15.pal | 19 - data/tilesets/secondary/82D50C4/palettes/2.pal | 19 - data/tilesets/secondary/82D50C4/palettes/3.pal | 19 - data/tilesets/secondary/82D50C4/palettes/4.pal | 19 - data/tilesets/secondary/82D50C4/palettes/5.pal | 19 - data/tilesets/secondary/82D50C4/palettes/6.pal | 19 - data/tilesets/secondary/82D50C4/palettes/7.pal | 19 - data/tilesets/secondary/82D50C4/palettes/8.pal | 19 - data/tilesets/secondary/82D50C4/palettes/9.pal | 19 - data/tilesets/secondary/82D50C4/tiles.png | Bin 3165 -> 0 bytes .../secondary/82D50DC/metatile_attributes.bin | Bin 472 -> 0 bytes data/tilesets/secondary/82D50DC/metatiles.bin | Bin 1888 -> 0 bytes data/tilesets/secondary/82D50DC/palettes/0.pal | 19 - data/tilesets/secondary/82D50DC/palettes/1.pal | 19 - data/tilesets/secondary/82D50DC/palettes/10.pal | 19 - data/tilesets/secondary/82D50DC/palettes/11.pal | 19 - data/tilesets/secondary/82D50DC/palettes/12.pal | 19 - data/tilesets/secondary/82D50DC/palettes/13.pal | 19 - data/tilesets/secondary/82D50DC/palettes/14.pal | 19 - data/tilesets/secondary/82D50DC/palettes/15.pal | 19 - data/tilesets/secondary/82D50DC/palettes/2.pal | 19 - data/tilesets/secondary/82D50DC/palettes/3.pal | 19 - data/tilesets/secondary/82D50DC/palettes/4.pal | 19 - data/tilesets/secondary/82D50DC/palettes/5.pal | 19 - data/tilesets/secondary/82D50DC/palettes/6.pal | 19 - data/tilesets/secondary/82D50DC/palettes/7.pal | 19 - data/tilesets/secondary/82D50DC/palettes/8.pal | 19 - data/tilesets/secondary/82D50DC/palettes/9.pal | 19 - data/tilesets/secondary/82D50DC/tiles.png | Bin 1763 -> 0 bytes .../secondary/berry_forest/metatile_attributes.bin | Bin 0 -> 168 bytes data/tilesets/secondary/berry_forest/metatiles.bin | Bin 0 -> 672 bytes .../tilesets/secondary/berry_forest/palettes/0.pal | 19 + .../tilesets/secondary/berry_forest/palettes/1.pal | 19 + .../secondary/berry_forest/palettes/10.pal | 19 + .../secondary/berry_forest/palettes/11.pal | 19 + .../secondary/berry_forest/palettes/12.pal | 19 + .../secondary/berry_forest/palettes/13.pal | 19 + .../secondary/berry_forest/palettes/14.pal | 19 + .../secondary/berry_forest/palettes/15.pal | 19 + .../tilesets/secondary/berry_forest/palettes/2.pal | 19 + .../tilesets/secondary/berry_forest/palettes/3.pal | 19 + .../tilesets/secondary/berry_forest/palettes/4.pal | 19 + .../tilesets/secondary/berry_forest/palettes/5.pal | 19 + .../tilesets/secondary/berry_forest/palettes/6.pal | 19 + .../tilesets/secondary/berry_forest/palettes/7.pal | 19 + .../tilesets/secondary/berry_forest/palettes/8.pal | 19 + .../tilesets/secondary/berry_forest/palettes/9.pal | 19 + data/tilesets/secondary/berry_forest/tiles.png | Bin 0 -> 986 bytes .../secondary/bike_shop/metatile_attributes.bin | Bin 0 -> 168 bytes data/tilesets/secondary/bike_shop/metatiles.bin | Bin 0 -> 672 bytes data/tilesets/secondary/bike_shop/palettes/0.pal | 19 + data/tilesets/secondary/bike_shop/palettes/1.pal | 19 + data/tilesets/secondary/bike_shop/palettes/10.pal | 19 + data/tilesets/secondary/bike_shop/palettes/11.pal | 19 + data/tilesets/secondary/bike_shop/palettes/12.pal | 19 + data/tilesets/secondary/bike_shop/palettes/13.pal | 19 + data/tilesets/secondary/bike_shop/palettes/14.pal | 19 + data/tilesets/secondary/bike_shop/palettes/15.pal | 19 + data/tilesets/secondary/bike_shop/palettes/2.pal | 19 + data/tilesets/secondary/bike_shop/palettes/3.pal | 19 + data/tilesets/secondary/bike_shop/palettes/4.pal | 19 + data/tilesets/secondary/bike_shop/palettes/5.pal | 19 + data/tilesets/secondary/bike_shop/palettes/6.pal | 19 + data/tilesets/secondary/bike_shop/palettes/7.pal | 19 + data/tilesets/secondary/bike_shop/palettes/8.pal | 19 + data/tilesets/secondary/bike_shop/palettes/9.pal | 19 + data/tilesets/secondary/bike_shop/tiles.png | Bin 0 -> 855 bytes .../secondary/building1/metatile_attributes.bin | Bin 0 -> 96 bytes data/tilesets/secondary/building1/metatiles.bin | Bin 0 -> 384 bytes data/tilesets/secondary/building1/palettes/0.pal | 19 + data/tilesets/secondary/building1/palettes/1.pal | 19 + data/tilesets/secondary/building1/palettes/10.pal | 19 + data/tilesets/secondary/building1/palettes/11.pal | 19 + data/tilesets/secondary/building1/palettes/12.pal | 19 + data/tilesets/secondary/building1/palettes/13.pal | 19 + data/tilesets/secondary/building1/palettes/14.pal | 19 + data/tilesets/secondary/building1/palettes/15.pal | 19 + data/tilesets/secondary/building1/palettes/2.pal | 19 + data/tilesets/secondary/building1/palettes/3.pal | 19 + data/tilesets/secondary/building1/palettes/4.pal | 19 + data/tilesets/secondary/building1/palettes/5.pal | 19 + data/tilesets/secondary/building1/palettes/6.pal | 19 + data/tilesets/secondary/building1/palettes/7.pal | 19 + data/tilesets/secondary/building1/palettes/8.pal | 19 + data/tilesets/secondary/building1/palettes/9.pal | 19 + data/tilesets/secondary/building1/tiles.png | Bin 0 -> 748 bytes .../secondary/building2/metatile_attributes.bin | Bin 0 -> 736 bytes data/tilesets/secondary/building2/metatiles.bin | Bin 0 -> 2944 bytes data/tilesets/secondary/building2/palettes/0.pal | 19 + data/tilesets/secondary/building2/palettes/1.pal | 19 + data/tilesets/secondary/building2/palettes/10.pal | 19 + data/tilesets/secondary/building2/palettes/11.pal | 19 + data/tilesets/secondary/building2/palettes/12.pal | 19 + data/tilesets/secondary/building2/palettes/13.pal | 19 + data/tilesets/secondary/building2/palettes/14.pal | 19 + data/tilesets/secondary/building2/palettes/15.pal | 19 + data/tilesets/secondary/building2/palettes/2.pal | 19 + data/tilesets/secondary/building2/palettes/3.pal | 19 + data/tilesets/secondary/building2/palettes/4.pal | 19 + data/tilesets/secondary/building2/palettes/5.pal | 19 + data/tilesets/secondary/building2/palettes/6.pal | 19 + data/tilesets/secondary/building2/palettes/7.pal | 19 + data/tilesets/secondary/building2/palettes/8.pal | 19 + data/tilesets/secondary/building2/palettes/9.pal | 19 + data/tilesets/secondary/building2/tiles.png | Bin 0 -> 1407 bytes .../burgled_house/metatile_attributes.bin | Bin 0 -> 228 bytes .../tilesets/secondary/burgled_house/metatiles.bin | Bin 0 -> 912 bytes .../secondary/burgled_house/palettes/0.pal | 19 + .../secondary/burgled_house/palettes/1.pal | 19 + .../secondary/burgled_house/palettes/10.pal | 19 + .../secondary/burgled_house/palettes/11.pal | 19 + .../secondary/burgled_house/palettes/12.pal | 19 + .../secondary/burgled_house/palettes/13.pal | 19 + .../secondary/burgled_house/palettes/14.pal | 19 + .../secondary/burgled_house/palettes/15.pal | 19 + .../secondary/burgled_house/palettes/2.pal | 19 + .../secondary/burgled_house/palettes/3.pal | 19 + .../secondary/burgled_house/palettes/4.pal | 19 + .../secondary/burgled_house/palettes/5.pal | 19 + .../secondary/burgled_house/palettes/6.pal | 19 + .../secondary/burgled_house/palettes/7.pal | 19 + .../secondary/burgled_house/palettes/8.pal | 19 + .../secondary/burgled_house/palettes/9.pal | 19 + data/tilesets/secondary/burgled_house/tiles.png | Bin 0 -> 1994 bytes .../secondary/cable_club/metatile_attributes.bin | Bin 0 -> 1024 bytes data/tilesets/secondary/cable_club/metatiles.bin | Bin 0 -> 4096 bytes data/tilesets/secondary/cable_club/palettes/0.pal | 19 + data/tilesets/secondary/cable_club/palettes/1.pal | 19 + data/tilesets/secondary/cable_club/palettes/10.pal | 19 + data/tilesets/secondary/cable_club/palettes/11.pal | 19 + data/tilesets/secondary/cable_club/palettes/12.pal | 19 + data/tilesets/secondary/cable_club/palettes/13.pal | 19 + data/tilesets/secondary/cable_club/palettes/14.pal | 19 + data/tilesets/secondary/cable_club/palettes/15.pal | 19 + data/tilesets/secondary/cable_club/palettes/2.pal | 19 + data/tilesets/secondary/cable_club/palettes/3.pal | 19 + data/tilesets/secondary/cable_club/palettes/4.pal | 19 + data/tilesets/secondary/cable_club/palettes/5.pal | 19 + data/tilesets/secondary/cable_club/palettes/6.pal | 19 + data/tilesets/secondary/cable_club/palettes/7.pal | 19 + data/tilesets/secondary/cable_club/palettes/8.pal | 19 + data/tilesets/secondary/cable_club/palettes/9.pal | 19 + data/tilesets/secondary/cable_club/tiles.png | Bin 0 -> 2667 bytes .../secondary/cave/metatile_attributes.bin | Bin 0 -> 644 bytes data/tilesets/secondary/cave/metatiles.bin | Bin 0 -> 2576 bytes data/tilesets/secondary/cave/palettes/0.pal | 19 + data/tilesets/secondary/cave/palettes/1.pal | 19 + data/tilesets/secondary/cave/palettes/10.pal | 19 + data/tilesets/secondary/cave/palettes/11.pal | 19 + data/tilesets/secondary/cave/palettes/12.pal | 19 + data/tilesets/secondary/cave/palettes/13.pal | 19 + data/tilesets/secondary/cave/palettes/14.pal | 19 + data/tilesets/secondary/cave/palettes/15.pal | 19 + data/tilesets/secondary/cave/palettes/2.pal | 19 + data/tilesets/secondary/cave/palettes/3.pal | 19 + data/tilesets/secondary/cave/palettes/4.pal | 19 + data/tilesets/secondary/cave/palettes/5.pal | 19 + data/tilesets/secondary/cave/palettes/6.pal | 19 + data/tilesets/secondary/cave/palettes/7.pal | 19 + data/tilesets/secondary/cave/palettes/8.pal | 19 + data/tilesets/secondary/cave/palettes/9.pal | 19 + data/tilesets/secondary/cave/tiles.png | Bin 0 -> 4193 bytes .../secondary/celadon_city/metatile_attributes.bin | Bin 0 -> 960 bytes data/tilesets/secondary/celadon_city/metatiles.bin | Bin 0 -> 3840 bytes .../tilesets/secondary/celadon_city/palettes/0.pal | 19 + .../tilesets/secondary/celadon_city/palettes/1.pal | 19 + .../secondary/celadon_city/palettes/10.pal | 19 + .../secondary/celadon_city/palettes/11.pal | 19 + .../secondary/celadon_city/palettes/12.pal | 19 + .../secondary/celadon_city/palettes/13.pal | 19 + .../secondary/celadon_city/palettes/14.pal | 19 + .../secondary/celadon_city/palettes/15.pal | 19 + .../tilesets/secondary/celadon_city/palettes/2.pal | 19 + .../tilesets/secondary/celadon_city/palettes/3.pal | 19 + .../tilesets/secondary/celadon_city/palettes/4.pal | 19 + .../tilesets/secondary/celadon_city/palettes/5.pal | 19 + .../tilesets/secondary/celadon_city/palettes/6.pal | 19 + .../tilesets/secondary/celadon_city/palettes/7.pal | 19 + .../tilesets/secondary/celadon_city/palettes/8.pal | 19 + .../tilesets/secondary/celadon_city/palettes/9.pal | 19 + data/tilesets/secondary/celadon_city/tiles.png | Bin 0 -> 2580 bytes .../secondary/celadon_gym/metatile_attributes.bin | Bin 0 -> 256 bytes data/tilesets/secondary/celadon_gym/metatiles.bin | Bin 0 -> 1024 bytes data/tilesets/secondary/celadon_gym/palettes/0.pal | 19 + data/tilesets/secondary/celadon_gym/palettes/1.pal | 19 + .../tilesets/secondary/celadon_gym/palettes/10.pal | 19 + .../tilesets/secondary/celadon_gym/palettes/11.pal | 19 + .../tilesets/secondary/celadon_gym/palettes/12.pal | 19 + .../tilesets/secondary/celadon_gym/palettes/13.pal | 19 + .../tilesets/secondary/celadon_gym/palettes/14.pal | 19 + .../tilesets/secondary/celadon_gym/palettes/15.pal | 19 + data/tilesets/secondary/celadon_gym/palettes/2.pal | 19 + data/tilesets/secondary/celadon_gym/palettes/3.pal | 19 + data/tilesets/secondary/celadon_gym/palettes/4.pal | 19 + data/tilesets/secondary/celadon_gym/palettes/5.pal | 19 + data/tilesets/secondary/celadon_gym/palettes/6.pal | 19 + data/tilesets/secondary/celadon_gym/palettes/7.pal | 19 + data/tilesets/secondary/celadon_gym/palettes/8.pal | 19 + data/tilesets/secondary/celadon_gym/palettes/9.pal | 19 + data/tilesets/secondary/celadon_gym/tiles.png | Bin 0 -> 1253 bytes .../cerulean_cave/metatile_attributes.bin | Bin 0 -> 536 bytes .../tilesets/secondary/cerulean_cave/metatiles.bin | Bin 0 -> 2144 bytes .../secondary/cerulean_cave/palettes/0.pal | 19 + .../secondary/cerulean_cave/palettes/1.pal | 19 + .../secondary/cerulean_cave/palettes/10.pal | 19 + .../secondary/cerulean_cave/palettes/11.pal | 19 + .../secondary/cerulean_cave/palettes/12.pal | 19 + .../secondary/cerulean_cave/palettes/13.pal | 19 + .../secondary/cerulean_cave/palettes/14.pal | 19 + .../secondary/cerulean_cave/palettes/15.pal | 19 + .../secondary/cerulean_cave/palettes/2.pal | 19 + .../secondary/cerulean_cave/palettes/3.pal | 19 + .../secondary/cerulean_cave/palettes/4.pal | 19 + .../secondary/cerulean_cave/palettes/5.pal | 19 + .../secondary/cerulean_cave/palettes/6.pal | 19 + .../secondary/cerulean_cave/palettes/7.pal | 19 + .../secondary/cerulean_cave/palettes/8.pal | 19 + .../secondary/cerulean_cave/palettes/9.pal | 19 + data/tilesets/secondary/cerulean_cave/tiles.png | Bin 0 -> 3360 bytes .../cerulean_city/metatile_attributes.bin | Bin 0 -> 536 bytes .../tilesets/secondary/cerulean_city/metatiles.bin | Bin 0 -> 2144 bytes .../secondary/cerulean_city/palettes/0.pal | 19 + .../secondary/cerulean_city/palettes/1.pal | 19 + .../secondary/cerulean_city/palettes/10.pal | 19 + .../secondary/cerulean_city/palettes/11.pal | 19 + .../secondary/cerulean_city/palettes/12.pal | 19 + .../secondary/cerulean_city/palettes/13.pal | 19 + .../secondary/cerulean_city/palettes/14.pal | 19 + .../secondary/cerulean_city/palettes/15.pal | 19 + .../secondary/cerulean_city/palettes/2.pal | 19 + .../secondary/cerulean_city/palettes/3.pal | 19 + .../secondary/cerulean_city/palettes/4.pal | 19 + .../secondary/cerulean_city/palettes/5.pal | 19 + .../secondary/cerulean_city/palettes/6.pal | 19 + .../secondary/cerulean_city/palettes/7.pal | 19 + .../secondary/cerulean_city/palettes/8.pal | 19 + .../secondary/cerulean_city/palettes/9.pal | 19 + data/tilesets/secondary/cerulean_city/tiles.png | Bin 0 -> 1604 bytes .../secondary/cerulean_gym/metatile_attributes.bin | Bin 0 -> 336 bytes data/tilesets/secondary/cerulean_gym/metatiles.bin | Bin 0 -> 1344 bytes .../tilesets/secondary/cerulean_gym/palettes/0.pal | 19 + .../tilesets/secondary/cerulean_gym/palettes/1.pal | 19 + .../secondary/cerulean_gym/palettes/10.pal | 19 + .../secondary/cerulean_gym/palettes/11.pal | 19 + .../secondary/cerulean_gym/palettes/12.pal | 19 + .../secondary/cerulean_gym/palettes/13.pal | 19 + .../secondary/cerulean_gym/palettes/14.pal | 19 + .../secondary/cerulean_gym/palettes/15.pal | 19 + .../tilesets/secondary/cerulean_gym/palettes/2.pal | 19 + .../tilesets/secondary/cerulean_gym/palettes/3.pal | 19 + .../tilesets/secondary/cerulean_gym/palettes/4.pal | 19 + .../tilesets/secondary/cerulean_gym/palettes/5.pal | 19 + .../tilesets/secondary/cerulean_gym/palettes/6.pal | 19 + .../tilesets/secondary/cerulean_gym/palettes/7.pal | 19 + .../tilesets/secondary/cerulean_gym/palettes/8.pal | 19 + .../tilesets/secondary/cerulean_gym/palettes/9.pal | 19 + data/tilesets/secondary/cerulean_gym/tiles.png | Bin 0 -> 892 bytes .../secondary/cinnabar_gym/metatile_attributes.bin | Bin 0 -> 384 bytes data/tilesets/secondary/cinnabar_gym/metatiles.bin | Bin 0 -> 1536 bytes .../tilesets/secondary/cinnabar_gym/palettes/0.pal | 19 + .../tilesets/secondary/cinnabar_gym/palettes/1.pal | 19 + .../secondary/cinnabar_gym/palettes/10.pal | 19 + .../secondary/cinnabar_gym/palettes/11.pal | 19 + .../secondary/cinnabar_gym/palettes/12.pal | 19 + .../secondary/cinnabar_gym/palettes/13.pal | 19 + .../secondary/cinnabar_gym/palettes/14.pal | 19 + .../secondary/cinnabar_gym/palettes/15.pal | 19 + .../tilesets/secondary/cinnabar_gym/palettes/2.pal | 19 + .../tilesets/secondary/cinnabar_gym/palettes/3.pal | 19 + .../tilesets/secondary/cinnabar_gym/palettes/4.pal | 19 + .../tilesets/secondary/cinnabar_gym/palettes/5.pal | 19 + .../tilesets/secondary/cinnabar_gym/palettes/6.pal | 19 + .../tilesets/secondary/cinnabar_gym/palettes/7.pal | 19 + .../tilesets/secondary/cinnabar_gym/palettes/8.pal | 19 + .../tilesets/secondary/cinnabar_gym/palettes/9.pal | 19 + data/tilesets/secondary/cinnabar_gym/tiles.png | Bin 0 -> 1318 bytes .../cinnabar_island/metatile_attributes.bin | Bin 0 -> 256 bytes .../secondary/cinnabar_island/metatiles.bin | Bin 0 -> 1024 bytes .../secondary/cinnabar_island/palettes/0.pal | 19 + .../secondary/cinnabar_island/palettes/1.pal | 19 + .../secondary/cinnabar_island/palettes/10.pal | 19 + .../secondary/cinnabar_island/palettes/11.pal | 19 + .../secondary/cinnabar_island/palettes/12.pal | 19 + .../secondary/cinnabar_island/palettes/13.pal | 19 + .../secondary/cinnabar_island/palettes/14.pal | 19 + .../secondary/cinnabar_island/palettes/15.pal | 19 + .../secondary/cinnabar_island/palettes/2.pal | 19 + .../secondary/cinnabar_island/palettes/3.pal | 19 + .../secondary/cinnabar_island/palettes/4.pal | 19 + .../secondary/cinnabar_island/palettes/5.pal | 19 + .../secondary/cinnabar_island/palettes/6.pal | 19 + .../secondary/cinnabar_island/palettes/7.pal | 19 + .../secondary/cinnabar_island/palettes/8.pal | 19 + .../secondary/cinnabar_island/palettes/9.pal | 19 + data/tilesets/secondary/cinnabar_island/tiles.png | Bin 0 -> 1374 bytes .../secondary/condominiums/metatile_attributes.bin | Bin 0 -> 860 bytes data/tilesets/secondary/condominiums/metatiles.bin | Bin 0 -> 3440 bytes .../tilesets/secondary/condominiums/palettes/0.pal | 19 + .../tilesets/secondary/condominiums/palettes/1.pal | 19 + .../secondary/condominiums/palettes/10.pal | 19 + .../secondary/condominiums/palettes/11.pal | 19 + .../secondary/condominiums/palettes/12.pal | 19 + .../secondary/condominiums/palettes/13.pal | 19 + .../secondary/condominiums/palettes/14.pal | 19 + .../secondary/condominiums/palettes/15.pal | 19 + .../tilesets/secondary/condominiums/palettes/2.pal | 19 + .../tilesets/secondary/condominiums/palettes/3.pal | 19 + .../tilesets/secondary/condominiums/palettes/4.pal | 19 + .../tilesets/secondary/condominiums/palettes/5.pal | 19 + .../tilesets/secondary/condominiums/palettes/6.pal | 19 + .../tilesets/secondary/condominiums/palettes/7.pal | 19 + .../tilesets/secondary/condominiums/palettes/8.pal | 19 + .../tilesets/secondary/condominiums/palettes/9.pal | 19 + data/tilesets/secondary/condominiums/tiles.png | Bin 0 -> 3737 bytes .../department_store/metatile_attributes.bin | Bin 0 -> 984 bytes .../secondary/department_store/metatiles.bin | Bin 0 -> 3936 bytes .../secondary/department_store/palettes/0.pal | 19 + .../secondary/department_store/palettes/1.pal | 19 + .../secondary/department_store/palettes/10.pal | 19 + .../secondary/department_store/palettes/11.pal | 19 + .../secondary/department_store/palettes/12.pal | 19 + .../secondary/department_store/palettes/13.pal | 19 + .../secondary/department_store/palettes/14.pal | 19 + .../secondary/department_store/palettes/15.pal | 19 + .../secondary/department_store/palettes/2.pal | 19 + .../secondary/department_store/palettes/3.pal | 19 + .../secondary/department_store/palettes/4.pal | 19 + .../secondary/department_store/palettes/5.pal | 19 + .../secondary/department_store/palettes/6.pal | 19 + .../secondary/department_store/palettes/7.pal | 19 + .../secondary/department_store/palettes/8.pal | 19 + .../secondary/department_store/palettes/9.pal | 19 + data/tilesets/secondary/department_store/tiles.png | Bin 0 -> 2189 bytes .../digletts_cave/metatile_attributes.bin | Bin 0 -> 628 bytes .../tilesets/secondary/digletts_cave/metatiles.bin | Bin 0 -> 2512 bytes .../secondary/digletts_cave/palettes/0.pal | 19 + .../secondary/digletts_cave/palettes/1.pal | 19 + .../secondary/digletts_cave/palettes/10.pal | 19 + .../secondary/digletts_cave/palettes/11.pal | 19 + .../secondary/digletts_cave/palettes/12.pal | 19 + .../secondary/digletts_cave/palettes/13.pal | 19 + .../secondary/digletts_cave/palettes/14.pal | 19 + .../secondary/digletts_cave/palettes/15.pal | 19 + .../secondary/digletts_cave/palettes/2.pal | 19 + .../secondary/digletts_cave/palettes/3.pal | 19 + .../secondary/digletts_cave/palettes/4.pal | 19 + .../secondary/digletts_cave/palettes/5.pal | 19 + .../secondary/digletts_cave/palettes/6.pal | 19 + .../secondary/digletts_cave/palettes/7.pal | 19 + .../secondary/digletts_cave/palettes/8.pal | 19 + .../secondary/digletts_cave/palettes/9.pal | 19 + data/tilesets/secondary/digletts_cave/tiles.png | Bin 0 -> 3623 bytes .../secondary/dummy1/metatile_attributes.bin | Bin 0 -> 8 bytes data/tilesets/secondary/dummy1/metatiles.bin | Bin 0 -> 32 bytes data/tilesets/secondary/dummy1/palettes/0.pal | 19 + data/tilesets/secondary/dummy1/palettes/1.pal | 19 + data/tilesets/secondary/dummy1/palettes/10.pal | 19 + data/tilesets/secondary/dummy1/palettes/11.pal | 19 + data/tilesets/secondary/dummy1/palettes/12.pal | 19 + data/tilesets/secondary/dummy1/palettes/13.pal | 19 + data/tilesets/secondary/dummy1/palettes/14.pal | 19 + data/tilesets/secondary/dummy1/palettes/15.pal | 19 + data/tilesets/secondary/dummy1/palettes/2.pal | 19 + data/tilesets/secondary/dummy1/palettes/3.pal | 19 + data/tilesets/secondary/dummy1/palettes/4.pal | 19 + data/tilesets/secondary/dummy1/palettes/5.pal | 19 + data/tilesets/secondary/dummy1/palettes/6.pal | 19 + data/tilesets/secondary/dummy1/palettes/7.pal | 19 + data/tilesets/secondary/dummy1/palettes/8.pal | 19 + data/tilesets/secondary/dummy1/palettes/9.pal | 19 + data/tilesets/secondary/dummy1/tiles.png | Bin 0 -> 135 bytes .../secondary/dummy2/metatile_attributes.bin | Bin 0 -> 8 bytes data/tilesets/secondary/dummy2/metatiles.bin | Bin 0 -> 32 bytes data/tilesets/secondary/dummy2/palettes/0.pal | 19 + data/tilesets/secondary/dummy2/palettes/1.pal | 19 + data/tilesets/secondary/dummy2/palettes/10.pal | 19 + data/tilesets/secondary/dummy2/palettes/11.pal | 19 + data/tilesets/secondary/dummy2/palettes/12.pal | 19 + data/tilesets/secondary/dummy2/palettes/13.pal | 19 + data/tilesets/secondary/dummy2/palettes/14.pal | 19 + data/tilesets/secondary/dummy2/palettes/15.pal | 19 + data/tilesets/secondary/dummy2/palettes/2.pal | 19 + data/tilesets/secondary/dummy2/palettes/3.pal | 19 + data/tilesets/secondary/dummy2/palettes/4.pal | 19 + data/tilesets/secondary/dummy2/palettes/5.pal | 19 + data/tilesets/secondary/dummy2/palettes/6.pal | 19 + data/tilesets/secondary/dummy2/palettes/7.pal | 19 + data/tilesets/secondary/dummy2/palettes/8.pal | 19 + data/tilesets/secondary/dummy2/palettes/9.pal | 19 + data/tilesets/secondary/dummy2/tiles.png | Bin 0 -> 139 bytes .../secondary/dummy3/metatile_attributes.bin | Bin 0 -> 8 bytes data/tilesets/secondary/dummy3/metatiles.bin | Bin 0 -> 32 bytes data/tilesets/secondary/dummy3/palettes/0.pal | 19 + data/tilesets/secondary/dummy3/palettes/1.pal | 19 + data/tilesets/secondary/dummy3/palettes/10.pal | 19 + data/tilesets/secondary/dummy3/palettes/11.pal | 19 + data/tilesets/secondary/dummy3/palettes/12.pal | 19 + data/tilesets/secondary/dummy3/palettes/13.pal | 19 + data/tilesets/secondary/dummy3/palettes/14.pal | 19 + data/tilesets/secondary/dummy3/palettes/15.pal | 19 + data/tilesets/secondary/dummy3/palettes/2.pal | 19 + data/tilesets/secondary/dummy3/palettes/3.pal | 19 + data/tilesets/secondary/dummy3/palettes/4.pal | 19 + data/tilesets/secondary/dummy3/palettes/5.pal | 19 + data/tilesets/secondary/dummy3/palettes/6.pal | 19 + data/tilesets/secondary/dummy3/palettes/7.pal | 19 + data/tilesets/secondary/dummy3/palettes/8.pal | 19 + data/tilesets/secondary/dummy3/palettes/9.pal | 19 + data/tilesets/secondary/dummy3/tiles.png | Bin 0 -> 136 bytes .../secondary/dummy4/metatile_attributes.bin | Bin 0 -> 8 bytes data/tilesets/secondary/dummy4/metatiles.bin | Bin 0 -> 32 bytes data/tilesets/secondary/dummy4/palettes/0.pal | 19 + data/tilesets/secondary/dummy4/palettes/1.pal | 19 + data/tilesets/secondary/dummy4/palettes/10.pal | 19 + data/tilesets/secondary/dummy4/palettes/11.pal | 19 + data/tilesets/secondary/dummy4/palettes/12.pal | 19 + data/tilesets/secondary/dummy4/palettes/13.pal | 19 + data/tilesets/secondary/dummy4/palettes/14.pal | 19 + data/tilesets/secondary/dummy4/palettes/15.pal | 19 + data/tilesets/secondary/dummy4/palettes/2.pal | 19 + data/tilesets/secondary/dummy4/palettes/3.pal | 19 + data/tilesets/secondary/dummy4/palettes/4.pal | 19 + data/tilesets/secondary/dummy4/palettes/5.pal | 19 + data/tilesets/secondary/dummy4/palettes/6.pal | 19 + data/tilesets/secondary/dummy4/palettes/7.pal | 19 + data/tilesets/secondary/dummy4/palettes/8.pal | 19 + data/tilesets/secondary/dummy4/palettes/9.pal | 19 + data/tilesets/secondary/dummy4/tiles.png | Bin 0 -> 138 bytes .../fan_club_daycare/metatile_attributes.bin | Bin 0 -> 680 bytes .../secondary/fan_club_daycare/metatiles.bin | Bin 0 -> 2720 bytes .../secondary/fan_club_daycare/palettes/0.pal | 19 + .../secondary/fan_club_daycare/palettes/1.pal | 19 + .../secondary/fan_club_daycare/palettes/10.pal | 19 + .../secondary/fan_club_daycare/palettes/11.pal | 19 + .../secondary/fan_club_daycare/palettes/12.pal | 19 + .../secondary/fan_club_daycare/palettes/13.pal | 19 + .../secondary/fan_club_daycare/palettes/14.pal | 19 + .../secondary/fan_club_daycare/palettes/15.pal | 19 + .../secondary/fan_club_daycare/palettes/2.pal | 19 + .../secondary/fan_club_daycare/palettes/3.pal | 19 + .../secondary/fan_club_daycare/palettes/4.pal | 19 + .../secondary/fan_club_daycare/palettes/5.pal | 19 + .../secondary/fan_club_daycare/palettes/6.pal | 19 + .../secondary/fan_club_daycare/palettes/7.pal | 19 + .../secondary/fan_club_daycare/palettes/8.pal | 19 + .../secondary/fan_club_daycare/palettes/9.pal | 19 + data/tilesets/secondary/fan_club_daycare/tiles.png | Bin 0 -> 994 bytes .../secondary/fuchsia_city/metatile_attributes.bin | Bin 0 -> 768 bytes data/tilesets/secondary/fuchsia_city/metatiles.bin | Bin 0 -> 3072 bytes .../tilesets/secondary/fuchsia_city/palettes/0.pal | 19 + .../tilesets/secondary/fuchsia_city/palettes/1.pal | 19 + .../secondary/fuchsia_city/palettes/10.pal | 19 + .../secondary/fuchsia_city/palettes/11.pal | 19 + .../secondary/fuchsia_city/palettes/12.pal | 19 + .../secondary/fuchsia_city/palettes/13.pal | 19 + .../secondary/fuchsia_city/palettes/14.pal | 19 + .../secondary/fuchsia_city/palettes/15.pal | 19 + .../tilesets/secondary/fuchsia_city/palettes/2.pal | 19 + .../tilesets/secondary/fuchsia_city/palettes/3.pal | 19 + .../tilesets/secondary/fuchsia_city/palettes/4.pal | 19 + .../tilesets/secondary/fuchsia_city/palettes/5.pal | 19 + .../tilesets/secondary/fuchsia_city/palettes/6.pal | 19 + .../tilesets/secondary/fuchsia_city/palettes/7.pal | 19 + .../tilesets/secondary/fuchsia_city/palettes/8.pal | 19 + .../tilesets/secondary/fuchsia_city/palettes/9.pal | 19 + data/tilesets/secondary/fuchsia_city/tiles.png | Bin 0 -> 2453 bytes .../secondary/fuchsia_gym/metatile_attributes.bin | Bin 0 -> 136 bytes data/tilesets/secondary/fuchsia_gym/metatiles.bin | Bin 0 -> 544 bytes data/tilesets/secondary/fuchsia_gym/palettes/0.pal | 19 + data/tilesets/secondary/fuchsia_gym/palettes/1.pal | 19 + .../tilesets/secondary/fuchsia_gym/palettes/10.pal | 19 + .../tilesets/secondary/fuchsia_gym/palettes/11.pal | 19 + .../tilesets/secondary/fuchsia_gym/palettes/12.pal | 19 + .../tilesets/secondary/fuchsia_gym/palettes/13.pal | 19 + .../tilesets/secondary/fuchsia_gym/palettes/14.pal | 19 + .../tilesets/secondary/fuchsia_gym/palettes/15.pal | 19 + data/tilesets/secondary/fuchsia_gym/palettes/2.pal | 19 + data/tilesets/secondary/fuchsia_gym/palettes/3.pal | 19 + data/tilesets/secondary/fuchsia_gym/palettes/4.pal | 19 + data/tilesets/secondary/fuchsia_gym/palettes/5.pal | 19 + data/tilesets/secondary/fuchsia_gym/palettes/6.pal | 19 + data/tilesets/secondary/fuchsia_gym/palettes/7.pal | 19 + data/tilesets/secondary/fuchsia_gym/palettes/8.pal | 19 + data/tilesets/secondary/fuchsia_gym/palettes/9.pal | 19 + data/tilesets/secondary/fuchsia_gym/tiles.png | Bin 0 -> 933 bytes .../secondary/game_corner/metatile_attributes.bin | Bin 0 -> 608 bytes data/tilesets/secondary/game_corner/metatiles.bin | Bin 0 -> 2432 bytes data/tilesets/secondary/game_corner/palettes/0.pal | 19 + data/tilesets/secondary/game_corner/palettes/1.pal | 19 + .../tilesets/secondary/game_corner/palettes/10.pal | 19 + .../tilesets/secondary/game_corner/palettes/11.pal | 19 + .../tilesets/secondary/game_corner/palettes/12.pal | 19 + .../tilesets/secondary/game_corner/palettes/13.pal | 19 + .../tilesets/secondary/game_corner/palettes/14.pal | 19 + .../tilesets/secondary/game_corner/palettes/15.pal | 19 + data/tilesets/secondary/game_corner/palettes/2.pal | 19 + data/tilesets/secondary/game_corner/palettes/3.pal | 19 + data/tilesets/secondary/game_corner/palettes/4.pal | 19 + data/tilesets/secondary/game_corner/palettes/5.pal | 19 + data/tilesets/secondary/game_corner/palettes/6.pal | 19 + data/tilesets/secondary/game_corner/palettes/7.pal | 19 + data/tilesets/secondary/game_corner/palettes/8.pal | 19 + data/tilesets/secondary/game_corner/palettes/9.pal | 19 + data/tilesets/secondary/game_corner/tiles.png | Bin 0 -> 2018 bytes .../secondary/hall_of_fame/metatile_attributes.bin | Bin 0 -> 472 bytes data/tilesets/secondary/hall_of_fame/metatiles.bin | Bin 0 -> 1888 bytes .../tilesets/secondary/hall_of_fame/palettes/0.pal | 19 + .../tilesets/secondary/hall_of_fame/palettes/1.pal | 19 + .../secondary/hall_of_fame/palettes/10.pal | 19 + .../secondary/hall_of_fame/palettes/11.pal | 19 + .../secondary/hall_of_fame/palettes/12.pal | 19 + .../secondary/hall_of_fame/palettes/13.pal | 19 + .../secondary/hall_of_fame/palettes/14.pal | 19 + .../secondary/hall_of_fame/palettes/15.pal | 19 + .../tilesets/secondary/hall_of_fame/palettes/2.pal | 19 + .../tilesets/secondary/hall_of_fame/palettes/3.pal | 19 + .../tilesets/secondary/hall_of_fame/palettes/4.pal | 19 + .../tilesets/secondary/hall_of_fame/palettes/5.pal | 19 + .../tilesets/secondary/hall_of_fame/palettes/6.pal | 19 + .../tilesets/secondary/hall_of_fame/palettes/7.pal | 19 + .../tilesets/secondary/hall_of_fame/palettes/8.pal | 19 + .../tilesets/secondary/hall_of_fame/palettes/9.pal | 19 + data/tilesets/secondary/hall_of_fame/tiles.png | Bin 0 -> 1763 bytes .../hoenn_building/metatile_attributes.bin | Bin 0 -> 2048 bytes .../secondary/hoenn_building/metatiles.bin | Bin 0 -> 8192 bytes .../secondary/hoenn_building/palettes/0.pal | 19 + .../secondary/hoenn_building/palettes/1.pal | 19 + .../secondary/hoenn_building/palettes/10.pal | 19 + .../secondary/hoenn_building/palettes/11.pal | 19 + .../secondary/hoenn_building/palettes/12.pal | 19 + .../secondary/hoenn_building/palettes/13.pal | 19 + .../secondary/hoenn_building/palettes/14.pal | 19 + .../secondary/hoenn_building/palettes/15.pal | 19 + .../secondary/hoenn_building/palettes/2.pal | 19 + .../secondary/hoenn_building/palettes/3.pal | 19 + .../secondary/hoenn_building/palettes/4.pal | 19 + .../secondary/hoenn_building/palettes/5.pal | 19 + .../secondary/hoenn_building/palettes/6.pal | 19 + .../secondary/hoenn_building/palettes/7.pal | 19 + .../secondary/hoenn_building/palettes/8.pal | 19 + .../secondary/hoenn_building/palettes/9.pal | 19 + data/tilesets/secondary/hoenn_building/tiles.png | Bin 0 -> 4040 bytes .../indigo_plateau/metatile_attributes.bin | Bin 0 -> 704 bytes .../secondary/indigo_plateau/metatiles.bin | Bin 0 -> 2816 bytes .../secondary/indigo_plateau/palettes/0.pal | 19 + .../secondary/indigo_plateau/palettes/1.pal | 19 + .../secondary/indigo_plateau/palettes/10.pal | 19 + .../secondary/indigo_plateau/palettes/11.pal | 19 + .../secondary/indigo_plateau/palettes/12.pal | 19 + .../secondary/indigo_plateau/palettes/13.pal | 19 + .../secondary/indigo_plateau/palettes/14.pal | 19 + .../secondary/indigo_plateau/palettes/15.pal | 19 + .../secondary/indigo_plateau/palettes/2.pal | 19 + .../secondary/indigo_plateau/palettes/3.pal | 19 + .../secondary/indigo_plateau/palettes/4.pal | 19 + .../secondary/indigo_plateau/palettes/5.pal | 19 + .../secondary/indigo_plateau/palettes/6.pal | 19 + .../secondary/indigo_plateau/palettes/7.pal | 19 + .../secondary/indigo_plateau/palettes/8.pal | 19 + .../secondary/indigo_plateau/palettes/9.pal | 19 + data/tilesets/secondary/indigo_plateau/tiles.png | Bin 0 -> 2544 bytes .../island_harbor/metatile_attributes.bin | Bin 0 -> 316 bytes .../tilesets/secondary/island_harbor/metatiles.bin | Bin 0 -> 1264 bytes .../secondary/island_harbor/palettes/0.pal | 19 + .../secondary/island_harbor/palettes/1.pal | 19 + .../secondary/island_harbor/palettes/10.pal | 19 + .../secondary/island_harbor/palettes/11.pal | 19 + .../secondary/island_harbor/palettes/12.pal | 19 + .../secondary/island_harbor/palettes/13.pal | 19 + .../secondary/island_harbor/palettes/14.pal | 19 + .../secondary/island_harbor/palettes/15.pal | 19 + .../secondary/island_harbor/palettes/2.pal | 19 + .../secondary/island_harbor/palettes/3.pal | 19 + .../secondary/island_harbor/palettes/4.pal | 19 + .../secondary/island_harbor/palettes/5.pal | 19 + .../secondary/island_harbor/palettes/6.pal | 19 + .../secondary/island_harbor/palettes/7.pal | 19 + .../secondary/island_harbor/palettes/8.pal | 19 + .../secondary/island_harbor/palettes/9.pal | 19 + data/tilesets/secondary/island_harbor/tiles.png | Bin 0 -> 1423 bytes .../tilesets/secondary/lab/metatile_attributes.bin | Bin 0 -> 700 bytes data/tilesets/secondary/lab/metatiles.bin | Bin 0 -> 2800 bytes data/tilesets/secondary/lab/palettes/0.pal | 19 + data/tilesets/secondary/lab/palettes/1.pal | 19 + data/tilesets/secondary/lab/palettes/10.pal | 19 + data/tilesets/secondary/lab/palettes/11.pal | 19 + data/tilesets/secondary/lab/palettes/12.pal | 19 + data/tilesets/secondary/lab/palettes/13.pal | 19 + data/tilesets/secondary/lab/palettes/14.pal | 19 + data/tilesets/secondary/lab/palettes/15.pal | 19 + data/tilesets/secondary/lab/palettes/2.pal | 19 + data/tilesets/secondary/lab/palettes/3.pal | 19 + data/tilesets/secondary/lab/palettes/4.pal | 19 + data/tilesets/secondary/lab/palettes/5.pal | 19 + data/tilesets/secondary/lab/palettes/6.pal | 19 + data/tilesets/secondary/lab/palettes/7.pal | 19 + data/tilesets/secondary/lab/palettes/8.pal | 19 + data/tilesets/secondary/lab/palettes/9.pal | 19 + data/tilesets/secondary/lab/tiles.png | Bin 0 -> 1308 bytes .../lavender_town/metatile_attributes.bin | Bin 0 -> 872 bytes .../tilesets/secondary/lavender_town/metatiles.bin | Bin 0 -> 3488 bytes .../secondary/lavender_town/palettes/0.pal | 19 + .../secondary/lavender_town/palettes/1.pal | 19 + .../secondary/lavender_town/palettes/10.pal | 19 + .../secondary/lavender_town/palettes/11.pal | 19 + .../secondary/lavender_town/palettes/12.pal | 19 + .../secondary/lavender_town/palettes/13.pal | 19 + .../secondary/lavender_town/palettes/14.pal | 19 + .../secondary/lavender_town/palettes/15.pal | 19 + .../secondary/lavender_town/palettes/2.pal | 19 + .../secondary/lavender_town/palettes/3.pal | 19 + .../secondary/lavender_town/palettes/4.pal | 19 + .../secondary/lavender_town/palettes/5.pal | 19 + .../secondary/lavender_town/palettes/6.pal | 19 + .../secondary/lavender_town/palettes/7.pal | 19 + .../secondary/lavender_town/palettes/8.pal | 19 + .../secondary/lavender_town/palettes/9.pal | 19 + data/tilesets/secondary/lavender_town/tiles.png | Bin 0 -> 2688 bytes .../secondary/mart/metatile_attributes.bin | Bin 0 -> 268 bytes data/tilesets/secondary/mart/metatiles.bin | Bin 0 -> 1072 bytes data/tilesets/secondary/mart/palettes/0.pal | 19 + data/tilesets/secondary/mart/palettes/1.pal | 19 + data/tilesets/secondary/mart/palettes/10.pal | 19 + data/tilesets/secondary/mart/palettes/11.pal | 19 + data/tilesets/secondary/mart/palettes/12.pal | 19 + data/tilesets/secondary/mart/palettes/13.pal | 19 + data/tilesets/secondary/mart/palettes/14.pal | 19 + data/tilesets/secondary/mart/palettes/15.pal | 19 + data/tilesets/secondary/mart/palettes/2.pal | 19 + data/tilesets/secondary/mart/palettes/3.pal | 19 + data/tilesets/secondary/mart/palettes/4.pal | 19 + data/tilesets/secondary/mart/palettes/5.pal | 19 + data/tilesets/secondary/mart/palettes/6.pal | 19 + data/tilesets/secondary/mart/palettes/7.pal | 19 + data/tilesets/secondary/mart/palettes/8.pal | 19 + data/tilesets/secondary/mart/palettes/9.pal | 19 + data/tilesets/secondary/mart/tiles.png | Bin 0 -> 438 bytes .../secondary/mt_ember/metatile_attributes.bin | Bin 0 -> 904 bytes data/tilesets/secondary/mt_ember/metatiles.bin | Bin 0 -> 3616 bytes data/tilesets/secondary/mt_ember/palettes/0.pal | 19 + data/tilesets/secondary/mt_ember/palettes/1.pal | 19 + data/tilesets/secondary/mt_ember/palettes/10.pal | 19 + data/tilesets/secondary/mt_ember/palettes/11.pal | 19 + data/tilesets/secondary/mt_ember/palettes/12.pal | 19 + data/tilesets/secondary/mt_ember/palettes/13.pal | 19 + data/tilesets/secondary/mt_ember/palettes/14.pal | 19 + data/tilesets/secondary/mt_ember/palettes/15.pal | 19 + data/tilesets/secondary/mt_ember/palettes/2.pal | 19 + data/tilesets/secondary/mt_ember/palettes/3.pal | 19 + data/tilesets/secondary/mt_ember/palettes/4.pal | 19 + data/tilesets/secondary/mt_ember/palettes/5.pal | 19 + data/tilesets/secondary/mt_ember/palettes/6.pal | 19 + data/tilesets/secondary/mt_ember/palettes/7.pal | 19 + data/tilesets/secondary/mt_ember/palettes/8.pal | 19 + data/tilesets/secondary/mt_ember/palettes/9.pal | 19 + data/tilesets/secondary/mt_ember/tiles.png | Bin 0 -> 4541 bytes .../secondary/museum/metatile_attributes.bin | Bin 0 -> 540 bytes data/tilesets/secondary/museum/metatiles.bin | Bin 0 -> 2160 bytes data/tilesets/secondary/museum/palettes/0.pal | 19 + data/tilesets/secondary/museum/palettes/1.pal | 19 + data/tilesets/secondary/museum/palettes/10.pal | 19 + data/tilesets/secondary/museum/palettes/11.pal | 19 + data/tilesets/secondary/museum/palettes/12.pal | 19 + data/tilesets/secondary/museum/palettes/13.pal | 19 + data/tilesets/secondary/museum/palettes/14.pal | 19 + data/tilesets/secondary/museum/palettes/15.pal | 19 + data/tilesets/secondary/museum/palettes/2.pal | 19 + data/tilesets/secondary/museum/palettes/3.pal | 19 + data/tilesets/secondary/museum/palettes/4.pal | 19 + data/tilesets/secondary/museum/palettes/5.pal | 19 + data/tilesets/secondary/museum/palettes/6.pal | 19 + data/tilesets/secondary/museum/palettes/7.pal | 19 + data/tilesets/secondary/museum/palettes/8.pal | 19 + data/tilesets/secondary/museum/palettes/9.pal | 19 + data/tilesets/secondary/museum/tiles.png | Bin 0 -> 1808 bytes .../secondary/navel_rock/metatile_attributes.bin | Bin 0 -> 880 bytes data/tilesets/secondary/navel_rock/metatiles.bin | Bin 0 -> 3520 bytes data/tilesets/secondary/navel_rock/palettes/0.pal | 19 + data/tilesets/secondary/navel_rock/palettes/1.pal | 19 + data/tilesets/secondary/navel_rock/palettes/10.pal | 19 + data/tilesets/secondary/navel_rock/palettes/11.pal | 19 + data/tilesets/secondary/navel_rock/palettes/12.pal | 19 + data/tilesets/secondary/navel_rock/palettes/13.pal | 19 + data/tilesets/secondary/navel_rock/palettes/14.pal | 19 + data/tilesets/secondary/navel_rock/palettes/15.pal | 19 + data/tilesets/secondary/navel_rock/palettes/2.pal | 19 + data/tilesets/secondary/navel_rock/palettes/3.pal | 19 + data/tilesets/secondary/navel_rock/palettes/4.pal | 19 + data/tilesets/secondary/navel_rock/palettes/5.pal | 19 + data/tilesets/secondary/navel_rock/palettes/6.pal | 19 + data/tilesets/secondary/navel_rock/palettes/7.pal | 19 + data/tilesets/secondary/navel_rock/palettes/8.pal | 19 + data/tilesets/secondary/navel_rock/palettes/9.pal | 19 + data/tilesets/secondary/navel_rock/tiles.png | Bin 0 -> 4217 bytes .../secondary/pallet_town/metatile_attributes.bin | Bin 0 -> 356 bytes data/tilesets/secondary/pallet_town/metatiles.bin | Bin 0 -> 1424 bytes data/tilesets/secondary/pallet_town/palettes/0.pal | 19 + data/tilesets/secondary/pallet_town/palettes/1.pal | 19 + .../tilesets/secondary/pallet_town/palettes/10.pal | 19 + .../tilesets/secondary/pallet_town/palettes/11.pal | 19 + .../tilesets/secondary/pallet_town/palettes/12.pal | 19 + .../tilesets/secondary/pallet_town/palettes/13.pal | 19 + .../tilesets/secondary/pallet_town/palettes/14.pal | 19 + .../tilesets/secondary/pallet_town/palettes/15.pal | 19 + data/tilesets/secondary/pallet_town/palettes/2.pal | 19 + data/tilesets/secondary/pallet_town/palettes/3.pal | 19 + data/tilesets/secondary/pallet_town/palettes/4.pal | 19 + data/tilesets/secondary/pallet_town/palettes/5.pal | 19 + data/tilesets/secondary/pallet_town/palettes/6.pal | 19 + data/tilesets/secondary/pallet_town/palettes/7.pal | 19 + data/tilesets/secondary/pallet_town/palettes/8.pal | 19 + data/tilesets/secondary/pallet_town/palettes/9.pal | 19 + data/tilesets/secondary/pallet_town/tiles.png | Bin 0 -> 929 bytes .../secondary/pewter_city/metatile_attributes.bin | Bin 0 -> 316 bytes data/tilesets/secondary/pewter_city/metatiles.bin | Bin 0 -> 1264 bytes data/tilesets/secondary/pewter_city/palettes/0.pal | 19 + data/tilesets/secondary/pewter_city/palettes/1.pal | 19 + .../tilesets/secondary/pewter_city/palettes/10.pal | 19 + .../tilesets/secondary/pewter_city/palettes/11.pal | 19 + .../tilesets/secondary/pewter_city/palettes/12.pal | 19 + .../tilesets/secondary/pewter_city/palettes/13.pal | 19 + .../tilesets/secondary/pewter_city/palettes/14.pal | 19 + .../tilesets/secondary/pewter_city/palettes/15.pal | 19 + data/tilesets/secondary/pewter_city/palettes/2.pal | 19 + data/tilesets/secondary/pewter_city/palettes/3.pal | 19 + data/tilesets/secondary/pewter_city/palettes/4.pal | 19 + data/tilesets/secondary/pewter_city/palettes/5.pal | 19 + data/tilesets/secondary/pewter_city/palettes/6.pal | 19 + data/tilesets/secondary/pewter_city/palettes/7.pal | 19 + data/tilesets/secondary/pewter_city/palettes/8.pal | 19 + data/tilesets/secondary/pewter_city/palettes/9.pal | 19 + data/tilesets/secondary/pewter_city/tiles.png | Bin 0 -> 1348 bytes .../secondary/pewter_gym/metatile_attributes.bin | Bin 0 -> 404 bytes data/tilesets/secondary/pewter_gym/metatiles.bin | Bin 0 -> 1616 bytes data/tilesets/secondary/pewter_gym/palettes/0.pal | 19 + data/tilesets/secondary/pewter_gym/palettes/1.pal | 19 + data/tilesets/secondary/pewter_gym/palettes/10.pal | 19 + data/tilesets/secondary/pewter_gym/palettes/11.pal | 19 + data/tilesets/secondary/pewter_gym/palettes/12.pal | 19 + data/tilesets/secondary/pewter_gym/palettes/13.pal | 19 + data/tilesets/secondary/pewter_gym/palettes/14.pal | 19 + data/tilesets/secondary/pewter_gym/palettes/15.pal | 19 + data/tilesets/secondary/pewter_gym/palettes/2.pal | 19 + data/tilesets/secondary/pewter_gym/palettes/3.pal | 19 + data/tilesets/secondary/pewter_gym/palettes/4.pal | 19 + data/tilesets/secondary/pewter_gym/palettes/5.pal | 19 + data/tilesets/secondary/pewter_gym/palettes/6.pal | 19 + data/tilesets/secondary/pewter_gym/palettes/7.pal | 19 + data/tilesets/secondary/pewter_gym/palettes/8.pal | 19 + data/tilesets/secondary/pewter_gym/palettes/9.pal | 19 + data/tilesets/secondary/pewter_gym/tiles.png | Bin 0 -> 1589 bytes .../pokemon_center/metatile_attributes.bin | Bin 0 -> 1020 bytes .../secondary/pokemon_center/metatiles.bin | Bin 0 -> 4080 bytes .../secondary/pokemon_center/palettes/0.pal | 19 + .../secondary/pokemon_center/palettes/1.pal | 19 + .../secondary/pokemon_center/palettes/10.pal | 19 + .../secondary/pokemon_center/palettes/11.pal | 19 + .../secondary/pokemon_center/palettes/12.pal | 19 + .../secondary/pokemon_center/palettes/13.pal | 19 + .../secondary/pokemon_center/palettes/14.pal | 19 + .../secondary/pokemon_center/palettes/15.pal | 19 + .../secondary/pokemon_center/palettes/2.pal | 19 + .../secondary/pokemon_center/palettes/3.pal | 19 + .../secondary/pokemon_center/palettes/4.pal | 19 + .../secondary/pokemon_center/palettes/5.pal | 19 + .../secondary/pokemon_center/palettes/6.pal | 19 + .../secondary/pokemon_center/palettes/7.pal | 19 + .../secondary/pokemon_center/palettes/8.pal | 19 + .../secondary/pokemon_center/palettes/9.pal | 19 + data/tilesets/secondary/pokemon_center/tiles.png | Bin 0 -> 3390 bytes .../pokemon_league/metatile_attributes.bin | Bin 0 -> 1536 bytes .../secondary/pokemon_league/metatiles.bin | Bin 0 -> 6144 bytes .../secondary/pokemon_league/palettes/0.pal | 19 + .../secondary/pokemon_league/palettes/1.pal | 19 + .../secondary/pokemon_league/palettes/10.pal | 19 + .../secondary/pokemon_league/palettes/11.pal | 19 + .../secondary/pokemon_league/palettes/12.pal | 19 + .../secondary/pokemon_league/palettes/13.pal | 19 + .../secondary/pokemon_league/palettes/14.pal | 19 + .../secondary/pokemon_league/palettes/15.pal | 19 + .../secondary/pokemon_league/palettes/2.pal | 19 + .../secondary/pokemon_league/palettes/3.pal | 19 + .../secondary/pokemon_league/palettes/4.pal | 19 + .../secondary/pokemon_league/palettes/5.pal | 19 + .../secondary/pokemon_league/palettes/6.pal | 19 + .../secondary/pokemon_league/palettes/7.pal | 19 + .../secondary/pokemon_league/palettes/8.pal | 19 + .../secondary/pokemon_league/palettes/9.pal | 19 + data/tilesets/secondary/pokemon_league/tiles.png | Bin 0 -> 3165 bytes .../pokemon_mansion/metatile_attributes.bin | Bin 0 -> 1032 bytes .../secondary/pokemon_mansion/metatiles.bin | Bin 0 -> 4128 bytes .../secondary/pokemon_mansion/palettes/0.pal | 19 + .../secondary/pokemon_mansion/palettes/1.pal | 19 + .../secondary/pokemon_mansion/palettes/10.pal | 19 + .../secondary/pokemon_mansion/palettes/11.pal | 19 + .../secondary/pokemon_mansion/palettes/12.pal | 19 + .../secondary/pokemon_mansion/palettes/13.pal | 19 + .../secondary/pokemon_mansion/palettes/14.pal | 19 + .../secondary/pokemon_mansion/palettes/15.pal | 19 + .../secondary/pokemon_mansion/palettes/2.pal | 19 + .../secondary/pokemon_mansion/palettes/3.pal | 19 + .../secondary/pokemon_mansion/palettes/4.pal | 19 + .../secondary/pokemon_mansion/palettes/5.pal | 19 + .../secondary/pokemon_mansion/palettes/6.pal | 19 + .../secondary/pokemon_mansion/palettes/7.pal | 19 + .../secondary/pokemon_mansion/palettes/8.pal | 19 + .../secondary/pokemon_mansion/palettes/9.pal | 19 + data/tilesets/secondary/pokemon_mansion/tiles.png | Bin 0 -> 2508 bytes .../pokemon_tower/metatile_attributes.bin | Bin 0 -> 404 bytes .../tilesets/secondary/pokemon_tower/metatiles.bin | Bin 0 -> 1616 bytes .../secondary/pokemon_tower/palettes/0.pal | 19 + .../secondary/pokemon_tower/palettes/1.pal | 19 + .../secondary/pokemon_tower/palettes/10.pal | 19 + .../secondary/pokemon_tower/palettes/11.pal | 19 + .../secondary/pokemon_tower/palettes/12.pal | 19 + .../secondary/pokemon_tower/palettes/13.pal | 19 + .../secondary/pokemon_tower/palettes/14.pal | 19 + .../secondary/pokemon_tower/palettes/15.pal | 19 + .../secondary/pokemon_tower/palettes/2.pal | 19 + .../secondary/pokemon_tower/palettes/3.pal | 19 + .../secondary/pokemon_tower/palettes/4.pal | 19 + .../secondary/pokemon_tower/palettes/5.pal | 19 + .../secondary/pokemon_tower/palettes/6.pal | 19 + .../secondary/pokemon_tower/palettes/7.pal | 19 + .../secondary/pokemon_tower/palettes/8.pal | 19 + .../secondary/pokemon_tower/palettes/9.pal | 19 + data/tilesets/secondary/pokemon_tower/tiles.png | Bin 0 -> 1458 bytes .../secondary/power_plant/metatile_attributes.bin | Bin 0 -> 612 bytes data/tilesets/secondary/power_plant/metatiles.bin | Bin 0 -> 2448 bytes data/tilesets/secondary/power_plant/palettes/0.pal | 19 + data/tilesets/secondary/power_plant/palettes/1.pal | 19 + .../tilesets/secondary/power_plant/palettes/10.pal | 19 + .../tilesets/secondary/power_plant/palettes/11.pal | 19 + .../tilesets/secondary/power_plant/palettes/12.pal | 19 + .../tilesets/secondary/power_plant/palettes/13.pal | 19 + .../tilesets/secondary/power_plant/palettes/14.pal | 19 + .../tilesets/secondary/power_plant/palettes/15.pal | 19 + data/tilesets/secondary/power_plant/palettes/2.pal | 19 + data/tilesets/secondary/power_plant/palettes/3.pal | 19 + data/tilesets/secondary/power_plant/palettes/4.pal | 19 + data/tilesets/secondary/power_plant/palettes/5.pal | 19 + data/tilesets/secondary/power_plant/palettes/6.pal | 19 + data/tilesets/secondary/power_plant/palettes/7.pal | 19 + data/tilesets/secondary/power_plant/palettes/8.pal | 19 + data/tilesets/secondary/power_plant/palettes/9.pal | 19 + data/tilesets/secondary/power_plant/tiles.png | Bin 0 -> 1037 bytes .../restaurant_hotel/metatile_attributes.bin | Bin 0 -> 416 bytes .../secondary/restaurant_hotel/metatiles.bin | Bin 0 -> 1664 bytes .../secondary/restaurant_hotel/palettes/0.pal | 19 + .../secondary/restaurant_hotel/palettes/1.pal | 19 + .../secondary/restaurant_hotel/palettes/10.pal | 19 + .../secondary/restaurant_hotel/palettes/11.pal | 19 + .../secondary/restaurant_hotel/palettes/12.pal | 19 + .../secondary/restaurant_hotel/palettes/13.pal | 19 + .../secondary/restaurant_hotel/palettes/14.pal | 19 + .../secondary/restaurant_hotel/palettes/15.pal | 19 + .../secondary/restaurant_hotel/palettes/2.pal | 19 + .../secondary/restaurant_hotel/palettes/3.pal | 19 + .../secondary/restaurant_hotel/palettes/4.pal | 19 + .../secondary/restaurant_hotel/palettes/5.pal | 19 + .../secondary/restaurant_hotel/palettes/6.pal | 19 + .../secondary/restaurant_hotel/palettes/7.pal | 19 + .../secondary/restaurant_hotel/palettes/8.pal | 19 + .../secondary/restaurant_hotel/palettes/9.pal | 19 + data/tilesets/secondary/restaurant_hotel/tiles.png | Bin 0 -> 975 bytes .../secondary/rock_tunnel/metatile_attributes.bin | Bin 0 -> 608 bytes data/tilesets/secondary/rock_tunnel/metatiles.bin | Bin 0 -> 2432 bytes data/tilesets/secondary/rock_tunnel/palettes/0.pal | 19 + data/tilesets/secondary/rock_tunnel/palettes/1.pal | 19 + .../tilesets/secondary/rock_tunnel/palettes/10.pal | 19 + .../tilesets/secondary/rock_tunnel/palettes/11.pal | 19 + .../tilesets/secondary/rock_tunnel/palettes/12.pal | 19 + .../tilesets/secondary/rock_tunnel/palettes/13.pal | 19 + .../tilesets/secondary/rock_tunnel/palettes/14.pal | 19 + .../tilesets/secondary/rock_tunnel/palettes/15.pal | 19 + data/tilesets/secondary/rock_tunnel/palettes/2.pal | 19 + data/tilesets/secondary/rock_tunnel/palettes/3.pal | 19 + data/tilesets/secondary/rock_tunnel/palettes/4.pal | 19 + data/tilesets/secondary/rock_tunnel/palettes/5.pal | 19 + data/tilesets/secondary/rock_tunnel/palettes/6.pal | 19 + data/tilesets/secondary/rock_tunnel/palettes/7.pal | 19 + data/tilesets/secondary/rock_tunnel/palettes/8.pal | 19 + data/tilesets/secondary/rock_tunnel/palettes/9.pal | 19 + data/tilesets/secondary/rock_tunnel/tiles.png | Bin 0 -> 3821 bytes .../safari_zone_building/metatile_attributes.bin | Bin 0 -> 512 bytes .../secondary/safari_zone_building/metatiles.bin | Bin 0 -> 2048 bytes .../secondary/safari_zone_building/palettes/0.pal | 19 + .../secondary/safari_zone_building/palettes/1.pal | 19 + .../secondary/safari_zone_building/palettes/10.pal | 19 + .../secondary/safari_zone_building/palettes/11.pal | 19 + .../secondary/safari_zone_building/palettes/12.pal | 19 + .../secondary/safari_zone_building/palettes/13.pal | 19 + .../secondary/safari_zone_building/palettes/14.pal | 19 + .../secondary/safari_zone_building/palettes/15.pal | 19 + .../secondary/safari_zone_building/palettes/2.pal | 19 + .../secondary/safari_zone_building/palettes/3.pal | 19 + .../secondary/safari_zone_building/palettes/4.pal | 19 + .../secondary/safari_zone_building/palettes/5.pal | 19 + .../secondary/safari_zone_building/palettes/6.pal | 19 + .../secondary/safari_zone_building/palettes/7.pal | 19 + .../secondary/safari_zone_building/palettes/8.pal | 19 + .../secondary/safari_zone_building/palettes/9.pal | 19 + .../secondary/safari_zone_building/tiles.png | Bin 0 -> 899 bytes .../secondary/saffron_city/metatile_attributes.bin | Bin 0 -> 800 bytes data/tilesets/secondary/saffron_city/metatiles.bin | Bin 0 -> 3200 bytes .../tilesets/secondary/saffron_city/palettes/0.pal | 19 + .../tilesets/secondary/saffron_city/palettes/1.pal | 19 + .../secondary/saffron_city/palettes/10.pal | 19 + .../secondary/saffron_city/palettes/11.pal | 19 + .../secondary/saffron_city/palettes/12.pal | 19 + .../secondary/saffron_city/palettes/13.pal | 19 + .../secondary/saffron_city/palettes/14.pal | 19 + .../secondary/saffron_city/palettes/15.pal | 19 + .../tilesets/secondary/saffron_city/palettes/2.pal | 19 + .../tilesets/secondary/saffron_city/palettes/3.pal | 19 + .../tilesets/secondary/saffron_city/palettes/4.pal | 19 + .../tilesets/secondary/saffron_city/palettes/5.pal | 19 + .../tilesets/secondary/saffron_city/palettes/6.pal | 19 + .../tilesets/secondary/saffron_city/palettes/7.pal | 19 + .../tilesets/secondary/saffron_city/palettes/8.pal | 19 + .../tilesets/secondary/saffron_city/palettes/9.pal | 19 + data/tilesets/secondary/saffron_city/tiles.png | Bin 0 -> 2377 bytes .../secondary/saffron_gym/metatile_attributes.bin | Bin 0 -> 184 bytes data/tilesets/secondary/saffron_gym/metatiles.bin | Bin 0 -> 736 bytes data/tilesets/secondary/saffron_gym/palettes/0.pal | 19 + data/tilesets/secondary/saffron_gym/palettes/1.pal | 19 + .../tilesets/secondary/saffron_gym/palettes/10.pal | 19 + .../tilesets/secondary/saffron_gym/palettes/11.pal | 19 + .../tilesets/secondary/saffron_gym/palettes/12.pal | 19 + .../tilesets/secondary/saffron_gym/palettes/13.pal | 19 + .../tilesets/secondary/saffron_gym/palettes/14.pal | 19 + .../tilesets/secondary/saffron_gym/palettes/15.pal | 19 + data/tilesets/secondary/saffron_gym/palettes/2.pal | 19 + data/tilesets/secondary/saffron_gym/palettes/3.pal | 19 + data/tilesets/secondary/saffron_gym/palettes/4.pal | 19 + data/tilesets/secondary/saffron_gym/palettes/5.pal | 19 + data/tilesets/secondary/saffron_gym/palettes/6.pal | 19 + data/tilesets/secondary/saffron_gym/palettes/7.pal | 19 + data/tilesets/secondary/saffron_gym/palettes/8.pal | 19 + data/tilesets/secondary/saffron_gym/palettes/9.pal | 19 + data/tilesets/secondary/saffron_gym/tiles.png | Bin 0 -> 860 bytes .../secondary/school/metatile_attributes.bin | Bin 0 -> 184 bytes data/tilesets/secondary/school/metatiles.bin | Bin 0 -> 736 bytes data/tilesets/secondary/school/palettes/0.pal | 19 + data/tilesets/secondary/school/palettes/1.pal | 19 + data/tilesets/secondary/school/palettes/10.pal | 19 + data/tilesets/secondary/school/palettes/11.pal | 19 + data/tilesets/secondary/school/palettes/12.pal | 19 + data/tilesets/secondary/school/palettes/13.pal | 19 + data/tilesets/secondary/school/palettes/14.pal | 19 + data/tilesets/secondary/school/palettes/15.pal | 19 + data/tilesets/secondary/school/palettes/2.pal | 19 + data/tilesets/secondary/school/palettes/3.pal | 19 + data/tilesets/secondary/school/palettes/4.pal | 19 + data/tilesets/secondary/school/palettes/5.pal | 19 + data/tilesets/secondary/school/palettes/6.pal | 19 + data/tilesets/secondary/school/palettes/7.pal | 19 + data/tilesets/secondary/school/palettes/8.pal | 19 + data/tilesets/secondary/school/palettes/9.pal | 19 + data/tilesets/secondary/school/tiles.png | Bin 0 -> 610 bytes .../secondary/sea_cottage/metatile_attributes.bin | Bin 0 -> 236 bytes data/tilesets/secondary/sea_cottage/metatiles.bin | Bin 0 -> 944 bytes data/tilesets/secondary/sea_cottage/palettes/0.pal | 19 + data/tilesets/secondary/sea_cottage/palettes/1.pal | 19 + .../tilesets/secondary/sea_cottage/palettes/10.pal | 19 + .../tilesets/secondary/sea_cottage/palettes/11.pal | 19 + .../tilesets/secondary/sea_cottage/palettes/12.pal | 19 + .../tilesets/secondary/sea_cottage/palettes/13.pal | 19 + .../tilesets/secondary/sea_cottage/palettes/14.pal | 19 + .../tilesets/secondary/sea_cottage/palettes/15.pal | 19 + data/tilesets/secondary/sea_cottage/palettes/2.pal | 19 + data/tilesets/secondary/sea_cottage/palettes/3.pal | 19 + data/tilesets/secondary/sea_cottage/palettes/4.pal | 19 + data/tilesets/secondary/sea_cottage/palettes/5.pal | 19 + data/tilesets/secondary/sea_cottage/palettes/6.pal | 19 + data/tilesets/secondary/sea_cottage/palettes/7.pal | 19 + data/tilesets/secondary/sea_cottage/palettes/8.pal | 19 + data/tilesets/secondary/sea_cottage/palettes/9.pal | 19 + data/tilesets/secondary/sea_cottage/tiles.png | Bin 0 -> 1075 bytes .../seafoam_islands/metatile_attributes.bin | Bin 0 -> 992 bytes .../secondary/seafoam_islands/metatiles.bin | Bin 0 -> 3968 bytes .../secondary/seafoam_islands/palettes/0.pal | 19 + .../secondary/seafoam_islands/palettes/1.pal | 19 + .../secondary/seafoam_islands/palettes/10.pal | 19 + .../secondary/seafoam_islands/palettes/11.pal | 19 + .../secondary/seafoam_islands/palettes/12.pal | 19 + .../secondary/seafoam_islands/palettes/13.pal | 19 + .../secondary/seafoam_islands/palettes/14.pal | 19 + .../secondary/seafoam_islands/palettes/15.pal | 19 + .../secondary/seafoam_islands/palettes/2.pal | 19 + .../secondary/seafoam_islands/palettes/3.pal | 19 + .../secondary/seafoam_islands/palettes/4.pal | 19 + .../secondary/seafoam_islands/palettes/5.pal | 19 + .../secondary/seafoam_islands/palettes/6.pal | 19 + .../secondary/seafoam_islands/palettes/7.pal | 19 + .../secondary/seafoam_islands/palettes/8.pal | 19 + .../secondary/seafoam_islands/palettes/9.pal | 19 + data/tilesets/secondary/seafoam_islands/tiles.png | Bin 0 -> 4982 bytes .../sevii_islands_123/metatile_attributes.bin | Bin 0 -> 1140 bytes .../secondary/sevii_islands_123/metatiles.bin | Bin 0 -> 4560 bytes .../secondary/sevii_islands_123/palettes/0.pal | 19 + .../secondary/sevii_islands_123/palettes/1.pal | 19 + .../secondary/sevii_islands_123/palettes/10.pal | 19 + .../secondary/sevii_islands_123/palettes/11.pal | 19 + .../secondary/sevii_islands_123/palettes/12.pal | 19 + .../secondary/sevii_islands_123/palettes/13.pal | 19 + .../secondary/sevii_islands_123/palettes/14.pal | 19 + .../secondary/sevii_islands_123/palettes/15.pal | 19 + .../secondary/sevii_islands_123/palettes/2.pal | 19 + .../secondary/sevii_islands_123/palettes/3.pal | 19 + .../secondary/sevii_islands_123/palettes/4.pal | 19 + .../secondary/sevii_islands_123/palettes/5.pal | 19 + .../secondary/sevii_islands_123/palettes/6.pal | 19 + .../secondary/sevii_islands_123/palettes/7.pal | 19 + .../secondary/sevii_islands_123/palettes/8.pal | 19 + .../secondary/sevii_islands_123/palettes/9.pal | 19 + .../tilesets/secondary/sevii_islands_123/tiles.png | Bin 0 -> 2574 bytes .../sevii_islands_45/metatile_attributes.bin | Bin 0 -> 608 bytes .../secondary/sevii_islands_45/metatiles.bin | Bin 0 -> 2432 bytes .../secondary/sevii_islands_45/palettes/0.pal | 19 + .../secondary/sevii_islands_45/palettes/1.pal | 19 + .../secondary/sevii_islands_45/palettes/10.pal | 19 + .../secondary/sevii_islands_45/palettes/11.pal | 19 + .../secondary/sevii_islands_45/palettes/12.pal | 19 + .../secondary/sevii_islands_45/palettes/13.pal | 19 + .../secondary/sevii_islands_45/palettes/14.pal | 19 + .../secondary/sevii_islands_45/palettes/15.pal | 19 + .../secondary/sevii_islands_45/palettes/2.pal | 19 + .../secondary/sevii_islands_45/palettes/3.pal | 19 + .../secondary/sevii_islands_45/palettes/4.pal | 19 + .../secondary/sevii_islands_45/palettes/5.pal | 19 + .../secondary/sevii_islands_45/palettes/6.pal | 19 + .../secondary/sevii_islands_45/palettes/7.pal | 19 + .../secondary/sevii_islands_45/palettes/8.pal | 19 + .../secondary/sevii_islands_45/palettes/9.pal | 19 + data/tilesets/secondary/sevii_islands_45/tiles.png | Bin 0 -> 2286 bytes .../sevii_islands_67/metatile_attributes.bin | Bin 0 -> 960 bytes .../secondary/sevii_islands_67/metatiles.bin | Bin 0 -> 3840 bytes .../secondary/sevii_islands_67/palettes/0.pal | 19 + .../secondary/sevii_islands_67/palettes/1.pal | 19 + .../secondary/sevii_islands_67/palettes/10.pal | 19 + .../secondary/sevii_islands_67/palettes/11.pal | 19 + .../secondary/sevii_islands_67/palettes/12.pal | 19 + .../secondary/sevii_islands_67/palettes/13.pal | 19 + .../secondary/sevii_islands_67/palettes/14.pal | 19 + .../secondary/sevii_islands_67/palettes/15.pal | 19 + .../secondary/sevii_islands_67/palettes/2.pal | 19 + .../secondary/sevii_islands_67/palettes/3.pal | 19 + .../secondary/sevii_islands_67/palettes/4.pal | 19 + .../secondary/sevii_islands_67/palettes/5.pal | 19 + .../secondary/sevii_islands_67/palettes/6.pal | 19 + .../secondary/sevii_islands_67/palettes/7.pal | 19 + .../secondary/sevii_islands_67/palettes/8.pal | 19 + .../secondary/sevii_islands_67/palettes/9.pal | 19 + data/tilesets/secondary/sevii_islands_67/tiles.png | Bin 0 -> 3132 bytes .../secondary/silph_co/metatile_attributes.bin | Bin 0 -> 1512 bytes data/tilesets/secondary/silph_co/metatiles.bin | Bin 0 -> 6048 bytes .../secondary/ss_anne/metatile_attributes.bin | Bin 0 -> 1344 bytes data/tilesets/secondary/ss_anne/metatiles.bin | Bin 0 -> 5376 bytes data/tilesets/secondary/ss_anne/palettes/0.pal | 19 + data/tilesets/secondary/ss_anne/palettes/1.pal | 19 + data/tilesets/secondary/ss_anne/palettes/10.pal | 19 + data/tilesets/secondary/ss_anne/palettes/11.pal | 19 + data/tilesets/secondary/ss_anne/palettes/12.pal | 19 + data/tilesets/secondary/ss_anne/palettes/13.pal | 19 + data/tilesets/secondary/ss_anne/palettes/14.pal | 19 + data/tilesets/secondary/ss_anne/palettes/15.pal | 19 + data/tilesets/secondary/ss_anne/palettes/2.pal | 19 + data/tilesets/secondary/ss_anne/palettes/3.pal | 19 + data/tilesets/secondary/ss_anne/palettes/4.pal | 19 + data/tilesets/secondary/ss_anne/palettes/5.pal | 19 + data/tilesets/secondary/ss_anne/palettes/6.pal | 19 + data/tilesets/secondary/ss_anne/palettes/7.pal | 19 + data/tilesets/secondary/ss_anne/palettes/8.pal | 19 + data/tilesets/secondary/ss_anne/palettes/9.pal | 19 + data/tilesets/secondary/ss_anne/tiles.png | Bin 0 -> 2996 bytes .../secondary/tanoby_ruins/metatile_attributes.bin | Bin 0 -> 376 bytes data/tilesets/secondary/tanoby_ruins/metatiles.bin | Bin 0 -> 1504 bytes .../tilesets/secondary/tanoby_ruins/palettes/0.pal | 19 + .../tilesets/secondary/tanoby_ruins/palettes/1.pal | 19 + .../secondary/tanoby_ruins/palettes/10.pal | 19 + .../secondary/tanoby_ruins/palettes/11.pal | 19 + .../secondary/tanoby_ruins/palettes/12.pal | 19 + .../secondary/tanoby_ruins/palettes/13.pal | 19 + .../secondary/tanoby_ruins/palettes/14.pal | 19 + .../secondary/tanoby_ruins/palettes/15.pal | 19 + .../tilesets/secondary/tanoby_ruins/palettes/2.pal | 19 + .../tilesets/secondary/tanoby_ruins/palettes/3.pal | 19 + .../tilesets/secondary/tanoby_ruins/palettes/4.pal | 19 + .../tilesets/secondary/tanoby_ruins/palettes/5.pal | 19 + .../tilesets/secondary/tanoby_ruins/palettes/6.pal | 19 + .../tilesets/secondary/tanoby_ruins/palettes/7.pal | 19 + .../tilesets/secondary/tanoby_ruins/palettes/8.pal | 19 + .../tilesets/secondary/tanoby_ruins/palettes/9.pal | 19 + data/tilesets/secondary/tanoby_ruins/tiles.png | Bin 0 -> 986 bytes .../trainer_tower/metatile_attributes.bin | Bin 0 -> 1152 bytes .../tilesets/secondary/trainer_tower/metatiles.bin | Bin 0 -> 4608 bytes .../secondary/trainer_tower/palettes/0.pal | 19 + .../secondary/trainer_tower/palettes/1.pal | 19 + .../secondary/trainer_tower/palettes/10.pal | 19 + .../secondary/trainer_tower/palettes/11.pal | 19 + .../secondary/trainer_tower/palettes/12.pal | 19 + .../secondary/trainer_tower/palettes/13.pal | 19 + .../secondary/trainer_tower/palettes/14.pal | 19 + .../secondary/trainer_tower/palettes/15.pal | 19 + .../secondary/trainer_tower/palettes/2.pal | 19 + .../secondary/trainer_tower/palettes/3.pal | 19 + .../secondary/trainer_tower/palettes/4.pal | 19 + .../secondary/trainer_tower/palettes/5.pal | 19 + .../secondary/trainer_tower/palettes/6.pal | 19 + .../secondary/trainer_tower/palettes/7.pal | 19 + .../secondary/trainer_tower/palettes/8.pal | 19 + .../secondary/trainer_tower/palettes/9.pal | 19 + data/tilesets/secondary/trainer_tower/tiles.png | Bin 0 -> 3152 bytes .../underground_path/metatile_attributes.bin | Bin 0 -> 288 bytes .../secondary/underground_path/metatiles.bin | Bin 0 -> 1152 bytes .../secondary/underground_path/palettes/0.pal | 19 + .../secondary/underground_path/palettes/1.pal | 19 + .../secondary/underground_path/palettes/10.pal | 19 + .../secondary/underground_path/palettes/11.pal | 19 + .../secondary/underground_path/palettes/12.pal | 19 + .../secondary/underground_path/palettes/13.pal | 19 + .../secondary/underground_path/palettes/14.pal | 19 + .../secondary/underground_path/palettes/15.pal | 19 + .../secondary/underground_path/palettes/2.pal | 19 + .../secondary/underground_path/palettes/3.pal | 19 + .../secondary/underground_path/palettes/4.pal | 19 + .../secondary/underground_path/palettes/5.pal | 19 + .../secondary/underground_path/palettes/6.pal | 19 + .../secondary/underground_path/palettes/7.pal | 19 + .../secondary/underground_path/palettes/8.pal | 19 + .../secondary/underground_path/palettes/9.pal | 19 + data/tilesets/secondary/underground_path/tiles.png | Bin 0 -> 708 bytes .../unused_gatehouse1/metatile_attributes.bin | Bin 0 -> 456 bytes .../secondary/unused_gatehouse1/metatiles.bin | Bin 0 -> 1824 bytes .../secondary/unused_gatehouse1/palettes/0.pal | 19 + .../secondary/unused_gatehouse1/palettes/1.pal | 19 + .../secondary/unused_gatehouse1/palettes/10.pal | 19 + .../secondary/unused_gatehouse1/palettes/11.pal | 19 + .../secondary/unused_gatehouse1/palettes/12.pal | 19 + .../secondary/unused_gatehouse1/palettes/13.pal | 19 + .../secondary/unused_gatehouse1/palettes/14.pal | 19 + .../secondary/unused_gatehouse1/palettes/15.pal | 19 + .../secondary/unused_gatehouse1/palettes/2.pal | 19 + .../secondary/unused_gatehouse1/palettes/3.pal | 19 + .../secondary/unused_gatehouse1/palettes/4.pal | 19 + .../secondary/unused_gatehouse1/palettes/5.pal | 19 + .../secondary/unused_gatehouse1/palettes/6.pal | 19 + .../secondary/unused_gatehouse1/palettes/7.pal | 19 + .../secondary/unused_gatehouse1/palettes/8.pal | 19 + .../secondary/unused_gatehouse1/palettes/9.pal | 19 + .../tilesets/secondary/unused_gatehouse1/tiles.png | Bin 0 -> 1218 bytes .../unused_gatehouse2/metatile_attributes.bin | Bin 0 -> 456 bytes .../secondary/unused_gatehouse2/metatiles.bin | Bin 0 -> 1824 bytes .../secondary/unused_gatehouse2/palettes/0.pal | 19 + .../secondary/unused_gatehouse2/palettes/1.pal | 19 + .../secondary/unused_gatehouse2/palettes/10.pal | 19 + .../secondary/unused_gatehouse2/palettes/11.pal | 19 + .../secondary/unused_gatehouse2/palettes/12.pal | 19 + .../secondary/unused_gatehouse2/palettes/13.pal | 19 + .../secondary/unused_gatehouse2/palettes/14.pal | 19 + .../secondary/unused_gatehouse2/palettes/15.pal | 19 + .../secondary/unused_gatehouse2/palettes/2.pal | 19 + .../secondary/unused_gatehouse2/palettes/3.pal | 19 + .../secondary/unused_gatehouse2/palettes/4.pal | 19 + .../secondary/unused_gatehouse2/palettes/5.pal | 19 + .../secondary/unused_gatehouse2/palettes/6.pal | 19 + .../secondary/unused_gatehouse2/palettes/7.pal | 19 + .../secondary/unused_gatehouse2/palettes/8.pal | 19 + .../secondary/unused_gatehouse2/palettes/9.pal | 19 + .../tilesets/secondary/unused_gatehouse2/tiles.png | Bin 0 -> 1218 bytes .../vermilion_city/metatile_attributes.bin | Bin 0 -> 672 bytes .../secondary/vermilion_city/metatiles.bin | Bin 0 -> 2688 bytes .../secondary/vermilion_city/palettes/0.pal | 19 + .../secondary/vermilion_city/palettes/1.pal | 19 + .../secondary/vermilion_city/palettes/10.pal | 19 + .../secondary/vermilion_city/palettes/11.pal | 19 + .../secondary/vermilion_city/palettes/12.pal | 19 + .../secondary/vermilion_city/palettes/13.pal | 19 + .../secondary/vermilion_city/palettes/14.pal | 19 + .../secondary/vermilion_city/palettes/15.pal | 19 + .../secondary/vermilion_city/palettes/2.pal | 19 + .../secondary/vermilion_city/palettes/3.pal | 19 + .../secondary/vermilion_city/palettes/4.pal | 19 + .../secondary/vermilion_city/palettes/5.pal | 19 + .../secondary/vermilion_city/palettes/6.pal | 19 + .../secondary/vermilion_city/palettes/7.pal | 19 + .../secondary/vermilion_city/palettes/8.pal | 19 + .../secondary/vermilion_city/palettes/9.pal | 19 + data/tilesets/secondary/vermilion_city/tiles.png | Bin 0 -> 1380 bytes .../vermilion_gym/metatile_attributes.bin | Bin 0 -> 300 bytes .../tilesets/secondary/vermilion_gym/metatiles.bin | Bin 0 -> 1200 bytes .../secondary/vermilion_gym/palettes/0.pal | 19 + .../secondary/vermilion_gym/palettes/1.pal | 19 + .../secondary/vermilion_gym/palettes/10.pal | 19 + .../secondary/vermilion_gym/palettes/11.pal | 19 + .../secondary/vermilion_gym/palettes/12.pal | 19 + .../secondary/vermilion_gym/palettes/13.pal | 19 + .../secondary/vermilion_gym/palettes/14.pal | 19 + .../secondary/vermilion_gym/palettes/15.pal | 19 + .../secondary/vermilion_gym/palettes/2.pal | 19 + .../secondary/vermilion_gym/palettes/3.pal | 19 + .../secondary/vermilion_gym/palettes/4.pal | 19 + .../secondary/vermilion_gym/palettes/5.pal | 19 + .../secondary/vermilion_gym/palettes/6.pal | 19 + .../secondary/vermilion_gym/palettes/7.pal | 19 + .../secondary/vermilion_gym/palettes/8.pal | 19 + .../secondary/vermilion_gym/palettes/9.pal | 19 + data/tilesets/secondary/vermilion_gym/tiles.png | Bin 0 -> 1207 bytes .../viridian_city/metatile_attributes.bin | Bin 0 -> 380 bytes .../tilesets/secondary/viridian_city/metatiles.bin | Bin 0 -> 1520 bytes .../secondary/viridian_city/palettes/0.pal | 19 + .../secondary/viridian_city/palettes/1.pal | 19 + .../secondary/viridian_city/palettes/10.pal | 19 + .../secondary/viridian_city/palettes/11.pal | 19 + .../secondary/viridian_city/palettes/12.pal | 19 + .../secondary/viridian_city/palettes/13.pal | 19 + .../secondary/viridian_city/palettes/14.pal | 19 + .../secondary/viridian_city/palettes/15.pal | 19 + .../secondary/viridian_city/palettes/2.pal | 19 + .../secondary/viridian_city/palettes/3.pal | 19 + .../secondary/viridian_city/palettes/4.pal | 19 + .../secondary/viridian_city/palettes/5.pal | 19 + .../secondary/viridian_city/palettes/6.pal | 19 + .../secondary/viridian_city/palettes/7.pal | 19 + .../secondary/viridian_city/palettes/8.pal | 19 + .../secondary/viridian_city/palettes/9.pal | 19 + data/tilesets/secondary/viridian_city/tiles.png | Bin 0 -> 1268 bytes .../viridian_forest/metatile_attributes.bin | Bin 0 -> 172 bytes .../secondary/viridian_forest/metatiles.bin | Bin 0 -> 688 bytes .../secondary/viridian_forest/palettes/0.pal | 19 + .../secondary/viridian_forest/palettes/1.pal | 19 + .../secondary/viridian_forest/palettes/10.pal | 19 + .../secondary/viridian_forest/palettes/11.pal | 19 + .../secondary/viridian_forest/palettes/12.pal | 19 + .../secondary/viridian_forest/palettes/13.pal | 19 + .../secondary/viridian_forest/palettes/14.pal | 19 + .../secondary/viridian_forest/palettes/15.pal | 19 + .../secondary/viridian_forest/palettes/2.pal | 19 + .../secondary/viridian_forest/palettes/3.pal | 19 + .../secondary/viridian_forest/palettes/4.pal | 19 + .../secondary/viridian_forest/palettes/5.pal | 19 + .../secondary/viridian_forest/palettes/6.pal | 19 + .../secondary/viridian_forest/palettes/7.pal | 19 + .../secondary/viridian_forest/palettes/8.pal | 19 + .../secondary/viridian_forest/palettes/9.pal | 19 + data/tilesets/secondary/viridian_forest/tiles.png | Bin 0 -> 948 bytes .../secondary/viridian_gym/metatile_attributes.bin | Bin 0 -> 336 bytes data/tilesets/secondary/viridian_gym/metatiles.bin | Bin 0 -> 1344 bytes .../tilesets/secondary/viridian_gym/palettes/0.pal | 19 + .../tilesets/secondary/viridian_gym/palettes/1.pal | 19 + .../secondary/viridian_gym/palettes/10.pal | 19 + .../secondary/viridian_gym/palettes/11.pal | 19 + .../secondary/viridian_gym/palettes/12.pal | 19 + .../secondary/viridian_gym/palettes/13.pal | 19 + .../secondary/viridian_gym/palettes/14.pal | 19 + .../secondary/viridian_gym/palettes/15.pal | 19 + .../tilesets/secondary/viridian_gym/palettes/2.pal | 19 + .../tilesets/secondary/viridian_gym/palettes/3.pal | 19 + .../tilesets/secondary/viridian_gym/palettes/4.pal | 19 + .../tilesets/secondary/viridian_gym/palettes/5.pal | 19 + .../tilesets/secondary/viridian_gym/palettes/6.pal | 19 + .../tilesets/secondary/viridian_gym/palettes/7.pal | 19 + .../tilesets/secondary/viridian_gym/palettes/8.pal | 19 + .../tilesets/secondary/viridian_gym/palettes/9.pal | 19 + data/tilesets/secondary/viridian_gym/tiles.png | Bin 0 -> 860 bytes 2739 files changed, 23589 insertions(+), 23589 deletions(-) create mode 100644 data/layouts/CeladonCity_Hotel_Duplicate/border.bin create mode 100644 data/layouts/CeladonCity_Hotel_Duplicate/map.bin create mode 100644 data/layouts/CeladonCity_Restaurant_Duplicate/border.bin create mode 100644 data/layouts/CeladonCity_Restaurant_Duplicate/map.bin create mode 100644 data/layouts/EverGrandeCity_HallOfFame/border.bin create mode 100644 data/layouts/EverGrandeCity_HallOfFame/map.bin create mode 100644 data/layouts/FortreeCity_DecorationShop/border.bin create mode 100644 data/layouts/FortreeCity_DecorationShop/map.bin create mode 100644 data/layouts/FortreeCity_House1/border.bin create mode 100644 data/layouts/FortreeCity_House1/map.bin create mode 100644 data/layouts/FortreeCity_House2/border.bin create mode 100644 data/layouts/FortreeCity_House2/map.bin create mode 100644 data/layouts/LavaridgeTown_HerbShop/border.bin create mode 100644 data/layouts/LavaridgeTown_HerbShop/map.bin create mode 100644 data/layouts/LittlerootTown_MaysHouse_2F/border.bin create mode 100644 data/layouts/LittlerootTown_MaysHouse_2F/map.bin create mode 100644 data/layouts/MossdeepCity_EReaderTrainerHouse_1F/border.bin create mode 100644 data/layouts/MossdeepCity_EReaderTrainerHouse_1F/map.bin create mode 100644 data/layouts/MossdeepCity_EReaderTrainerHouse_2F/border.bin create mode 100644 data/layouts/MossdeepCity_EReaderTrainerHouse_2F/map.bin create mode 100644 data/layouts/PacifidlogTown_House1/border.bin create mode 100644 data/layouts/PacifidlogTown_House1/map.bin create mode 100644 data/layouts/PacifidlogTown_House2/border.bin create mode 100644 data/layouts/PacifidlogTown_House2/map.bin create mode 100644 data/layouts/Prototype_SeviiIsle_22/border.bin create mode 100644 data/layouts/Prototype_SeviiIsle_22/map.bin create mode 100644 data/layouts/Prototype_SeviiIsle_23_East/border.bin create mode 100644 data/layouts/Prototype_SeviiIsle_23_East/map.bin create mode 100644 data/layouts/Prototype_SeviiIsle_23_West/border.bin create mode 100644 data/layouts/Prototype_SeviiIsle_23_West/map.bin create mode 100644 data/layouts/Prototype_SeviiIsle_24/border.bin create mode 100644 data/layouts/Prototype_SeviiIsle_24/map.bin create mode 100644 data/layouts/Prototype_SeviiIsle_6/border.bin create mode 100644 data/layouts/Prototype_SeviiIsle_6/map.bin create mode 100644 data/layouts/Prototype_SeviiIsle_7/border.bin create mode 100644 data/layouts/Prototype_SeviiIsle_7/map.bin create mode 100644 data/layouts/Prototype_SeviiIsle_8/border.bin create mode 100644 data/layouts/Prototype_SeviiIsle_8/map.bin create mode 100644 data/layouts/Prototype_SeviiIsle_9/border.bin create mode 100644 data/layouts/Prototype_SeviiIsle_9/map.bin create mode 100644 data/layouts/RS_BattleTower/border.bin create mode 100644 data/layouts/RS_BattleTower/map.bin create mode 100644 data/layouts/RS_PokemonCenter_1F/border.bin create mode 100644 data/layouts/RS_PokemonCenter_1F/map.bin create mode 100644 data/layouts/RS_SafariZone_Entrance/border.bin create mode 100644 data/layouts/RS_SafariZone_Entrance/map.bin create mode 100644 data/layouts/RS_SafariZone_Northeast/border.bin create mode 100644 data/layouts/RS_SafariZone_Northeast/map.bin create mode 100644 data/layouts/RS_SafariZone_RestHouse/border.bin create mode 100644 data/layouts/RS_SafariZone_RestHouse/map.bin create mode 100644 data/layouts/RS_SafariZone_Southeast/border.bin create mode 100644 data/layouts/RS_SafariZone_Southeast/map.bin create mode 100644 data/layouts/RS_SafariZone_Southwest/border.bin create mode 100644 data/layouts/RS_SafariZone_Southwest/map.bin create mode 100644 data/layouts/RustboroCity_CuttersHouse/border.bin create mode 100644 data/layouts/RustboroCity_CuttersHouse/map.bin create mode 100644 data/layouts/RustboroCity_Flat1_1F/border.bin create mode 100644 data/layouts/RustboroCity_Flat1_1F/map.bin create mode 100644 data/layouts/RustboroCity_Flat1_2F/border.bin create mode 100644 data/layouts/RustboroCity_Flat1_2F/map.bin create mode 100644 data/layouts/RustboroCity_Flat2_1F/border.bin create mode 100644 data/layouts/RustboroCity_Flat2_1F/map.bin create mode 100644 data/layouts/RustboroCity_Flat2_2F/border.bin create mode 100644 data/layouts/RustboroCity_Flat2_2F/map.bin create mode 100644 data/layouts/RustboroCity_Flat2_3F/border.bin create mode 100644 data/layouts/RustboroCity_Flat2_3F/map.bin create mode 100644 data/layouts/SSTidal_Corridor/border.bin create mode 100644 data/layouts/SSTidal_Corridor/map.bin create mode 100644 data/layouts/SSTidal_LowerDeck/border.bin create mode 100644 data/layouts/SSTidal_LowerDeck/map.bin create mode 100644 data/layouts/SSTidal_Rooms/border.bin create mode 100644 data/layouts/SSTidal_Rooms/map.bin create mode 100644 data/layouts/SevenIsland_House_Room1_DoorOpen/border.bin create mode 100644 data/layouts/SevenIsland_House_Room1_DoorOpen/map.bin create mode 100644 data/layouts/SootopolisCity_House1/border.bin create mode 100644 data/layouts/SootopolisCity_House1/map.bin create mode 100644 data/layouts/SootopolisCity_House2/border.bin create mode 100644 data/layouts/SootopolisCity_House2/map.bin create mode 100644 data/layouts/SootopolisCity_House3/border.bin create mode 100644 data/layouts/SootopolisCity_House3/map.bin delete mode 100644 data/layouts/UnknownMap_03_50/border.bin delete mode 100644 data/layouts/UnknownMap_03_50/map.bin delete mode 100644 data/layouts/UnknownMap_03_51/border.bin delete mode 100644 data/layouts/UnknownMap_03_51/map.bin delete mode 100644 data/layouts/UnknownMap_03_52/border.bin delete mode 100644 data/layouts/UnknownMap_03_52/map.bin delete mode 100644 data/layouts/UnknownMap_03_53/border.bin delete mode 100644 data/layouts/UnknownMap_03_53/map.bin create mode 100644 data/layouts/Unused1/border.bin create mode 100644 data/layouts/Unused1/map.bin delete mode 100644 data/layouts/UnusedLayout_82D54D8/border.bin delete mode 100644 data/layouts/UnusedLayout_82D54D8/map.bin delete mode 100644 data/layouts/UnusedLayout_82D6144/border.bin delete mode 100644 data/layouts/UnusedLayout_82D6144/map.bin delete mode 100644 data/layouts/UnusedLayout_82D6490/border.bin delete mode 100644 data/layouts/UnusedLayout_82D6490/map.bin delete mode 100644 data/layouts/UnusedLayout_82D6654/border.bin delete mode 100644 data/layouts/UnusedLayout_82D6654/map.bin delete mode 100644 data/layouts/UnusedLayout_82D672C/border.bin delete mode 100644 data/layouts/UnusedLayout_82D672C/map.bin delete mode 100644 data/layouts/UnusedLayout_82D6C34/border.bin delete mode 100644 data/layouts/UnusedLayout_82D6C34/map.bin delete mode 100644 data/layouts/UnusedLayout_82D75F0/border.bin delete mode 100644 data/layouts/UnusedLayout_82D75F0/map.bin delete mode 100644 data/layouts/UnusedLayout_82D7674/border.bin delete mode 100644 data/layouts/UnusedLayout_82D7674/map.bin delete mode 100644 data/layouts/UnusedLayout_82D7CC8/border.bin delete mode 100644 data/layouts/UnusedLayout_82D7CC8/map.bin delete mode 100644 data/layouts/UnusedLayout_82D88C8/border.bin delete mode 100644 data/layouts/UnusedLayout_82D88C8/map.bin delete mode 100644 data/layouts/UnusedLayout_82D9B24/border.bin delete mode 100644 data/layouts/UnusedLayout_82D9B24/map.bin delete mode 100644 data/layouts/UnusedLayout_82DA7C8/border.bin delete mode 100644 data/layouts/UnusedLayout_82DA7C8/map.bin delete mode 100644 data/layouts/UnusedLayout_82DB46C/border.bin delete mode 100644 data/layouts/UnusedLayout_82DB46C/map.bin delete mode 100644 data/layouts/UnusedLayout_82DB4F0/border.bin delete mode 100644 data/layouts/UnusedLayout_82DB4F0/map.bin delete mode 100644 data/layouts/UnusedLayout_82DBBE0/border.bin delete mode 100644 data/layouts/UnusedLayout_82DBBE0/map.bin delete mode 100644 data/layouts/UnusedLayout_82DBDD8/border.bin delete mode 100644 data/layouts/UnusedLayout_82DBDD8/map.bin delete mode 100644 data/layouts/UnusedLayout_82DBFB8/border.bin delete mode 100644 data/layouts/UnusedLayout_82DBFB8/map.bin delete mode 100644 data/layouts/UnusedLayout_82DC4EC/border.bin delete mode 100644 data/layouts/UnusedLayout_82DC4EC/map.bin delete mode 100644 data/layouts/UnusedLayout_82DC60C/border.bin delete mode 100644 data/layouts/UnusedLayout_82DC60C/map.bin delete mode 100644 data/layouts/UnusedLayout_82DC72C/border.bin delete mode 100644 data/layouts/UnusedLayout_82DC72C/map.bin delete mode 100644 data/layouts/UnusedLayout_82DC84C/border.bin delete mode 100644 data/layouts/UnusedLayout_82DC84C/map.bin delete mode 100644 data/layouts/UnusedLayout_82DCA70/border.bin delete mode 100644 data/layouts/UnusedLayout_82DCA70/map.bin delete mode 100644 data/layouts/UnusedLayout_82DCB44/border.bin delete mode 100644 data/layouts/UnusedLayout_82DCB44/map.bin delete mode 100644 data/layouts/UnusedLayout_82DCC40/border.bin delete mode 100644 data/layouts/UnusedLayout_82DCC40/map.bin delete mode 100644 data/layouts/UnusedLayout_82DCCD4/border.bin delete mode 100644 data/layouts/UnusedLayout_82DCCD4/map.bin delete mode 100644 data/layouts/UnusedLayout_82DCD68/border.bin delete mode 100644 data/layouts/UnusedLayout_82DCD68/map.bin delete mode 100644 data/layouts/UnusedLayout_82DCDFC/border.bin delete mode 100644 data/layouts/UnusedLayout_82DCDFC/map.bin delete mode 100644 data/layouts/UnusedLayout_82DCF00/border.bin delete mode 100644 data/layouts/UnusedLayout_82DCF00/map.bin delete mode 100644 data/layouts/UnusedLayout_82DD004/border.bin delete mode 100644 data/layouts/UnusedLayout_82DD004/map.bin delete mode 100644 data/layouts/UnusedLayout_82DD0DC/border.bin delete mode 100644 data/layouts/UnusedLayout_82DD0DC/map.bin delete mode 100644 data/layouts/UnusedLayout_833614C/border.bin delete mode 100644 data/layouts/UnusedLayout_833614C/map.bin delete mode 100644 data/layouts/UnusedLayout_83377F0/border.bin delete mode 100644 data/layouts/UnusedLayout_83377F0/map.bin delete mode 100644 data/layouts/UnusedLayout_8338354/border.bin delete mode 100644 data/layouts/UnusedLayout_8338354/map.bin delete mode 100644 data/layouts/UnusedLayout_8338738/border.bin delete mode 100644 data/layouts/UnusedLayout_8338738/map.bin delete mode 100644 data/layouts/UnusedLayout_8338B4C/border.bin delete mode 100644 data/layouts/UnusedLayout_8338B4C/map.bin delete mode 100644 data/layouts/UnusedLayout_8338E90/border.bin delete mode 100644 data/layouts/UnusedLayout_8338E90/map.bin delete mode 100644 data/layouts/UnusedLayout_833902C/border.bin delete mode 100644 data/layouts/UnusedLayout_833902C/map.bin create mode 100644 data/maps/Prototype_SeviiIsle_6/map.json create mode 100644 data/maps/Prototype_SeviiIsle_6/scripts.inc create mode 100644 data/maps/Prototype_SeviiIsle_7/map.json create mode 100644 data/maps/Prototype_SeviiIsle_7/scripts.inc create mode 100644 data/maps/Prototype_SeviiIsle_8/map.json create mode 100644 data/maps/Prototype_SeviiIsle_8/scripts.inc create mode 100644 data/maps/Prototype_SeviiIsle_9/map.json create mode 100644 data/maps/Prototype_SeviiIsle_9/scripts.inc delete mode 100644 data/maps/UnknownMap_03_50/map.json delete mode 100644 data/maps/UnknownMap_03_50/scripts.inc delete mode 100644 data/maps/UnknownMap_03_51/map.json delete mode 100644 data/maps/UnknownMap_03_51/scripts.inc delete mode 100644 data/maps/UnknownMap_03_52/map.json delete mode 100644 data/maps/UnknownMap_03_52/scripts.inc delete mode 100644 data/maps/UnknownMap_03_53/map.json delete mode 100644 data/maps/UnknownMap_03_53/scripts.inc delete mode 100644 data/tilesets/primary/82D4A94/metatile_attributes.bin delete mode 100644 data/tilesets/primary/82D4A94/metatiles.bin delete mode 100644 data/tilesets/primary/82D4A94/palettes/0.pal delete mode 100644 data/tilesets/primary/82D4A94/palettes/1.pal delete mode 100644 data/tilesets/primary/82D4A94/palettes/10.pal delete mode 100644 data/tilesets/primary/82D4A94/palettes/11.pal delete mode 100644 data/tilesets/primary/82D4A94/palettes/12.pal delete mode 100644 data/tilesets/primary/82D4A94/palettes/13.pal delete mode 100644 data/tilesets/primary/82D4A94/palettes/14.pal delete mode 100644 data/tilesets/primary/82D4A94/palettes/15.pal delete mode 100644 data/tilesets/primary/82D4A94/palettes/2.pal delete mode 100644 data/tilesets/primary/82D4A94/palettes/3.pal delete mode 100644 data/tilesets/primary/82D4A94/palettes/4.pal delete mode 100644 data/tilesets/primary/82D4A94/palettes/5.pal delete mode 100644 data/tilesets/primary/82D4A94/palettes/6.pal delete mode 100644 data/tilesets/primary/82D4A94/palettes/7.pal delete mode 100644 data/tilesets/primary/82D4A94/palettes/8.pal delete mode 100644 data/tilesets/primary/82D4A94/palettes/9.pal delete mode 100644 data/tilesets/primary/82D4A94/tiles.png delete mode 100644 data/tilesets/primary/82D4BB4/metatile_attributes.bin delete mode 100644 data/tilesets/primary/82D4BB4/metatiles.bin delete mode 100644 data/tilesets/primary/82D4BB4/palettes/0.pal delete mode 100644 data/tilesets/primary/82D4BB4/palettes/1.pal delete mode 100644 data/tilesets/primary/82D4BB4/palettes/10.pal delete mode 100644 data/tilesets/primary/82D4BB4/palettes/11.pal delete mode 100644 data/tilesets/primary/82D4BB4/palettes/12.pal delete mode 100644 data/tilesets/primary/82D4BB4/palettes/13.pal delete mode 100644 data/tilesets/primary/82D4BB4/palettes/14.pal delete mode 100644 data/tilesets/primary/82D4BB4/palettes/15.pal delete mode 100644 data/tilesets/primary/82D4BB4/palettes/2.pal delete mode 100644 data/tilesets/primary/82D4BB4/palettes/3.pal delete mode 100644 data/tilesets/primary/82D4BB4/palettes/4.pal delete mode 100644 data/tilesets/primary/82D4BB4/palettes/5.pal delete mode 100644 data/tilesets/primary/82D4BB4/palettes/6.pal delete mode 100644 data/tilesets/primary/82D4BB4/palettes/7.pal delete mode 100644 data/tilesets/primary/82D4BB4/palettes/8.pal delete mode 100644 data/tilesets/primary/82D4BB4/palettes/9.pal delete mode 100644 data/tilesets/primary/82D4BB4/tiles.png create mode 100644 data/tilesets/primary/building/metatile_attributes.bin create mode 100644 data/tilesets/primary/building/metatiles.bin create mode 100644 data/tilesets/primary/building/palettes/0.pal create mode 100644 data/tilesets/primary/building/palettes/1.pal create mode 100644 data/tilesets/primary/building/palettes/10.pal create mode 100644 data/tilesets/primary/building/palettes/11.pal create mode 100644 data/tilesets/primary/building/palettes/12.pal create mode 100644 data/tilesets/primary/building/palettes/13.pal create mode 100644 data/tilesets/primary/building/palettes/14.pal create mode 100644 data/tilesets/primary/building/palettes/15.pal create mode 100644 data/tilesets/primary/building/palettes/2.pal create mode 100644 data/tilesets/primary/building/palettes/3.pal create mode 100644 data/tilesets/primary/building/palettes/4.pal create mode 100644 data/tilesets/primary/building/palettes/5.pal create mode 100644 data/tilesets/primary/building/palettes/6.pal create mode 100644 data/tilesets/primary/building/palettes/7.pal create mode 100644 data/tilesets/primary/building/palettes/8.pal create mode 100644 data/tilesets/primary/building/palettes/9.pal create mode 100644 data/tilesets/primary/building/tiles.png create mode 100644 data/tilesets/primary/general/metatile_attributes.bin create mode 100644 data/tilesets/primary/general/metatiles.bin create mode 100644 data/tilesets/primary/general/palettes/0.pal create mode 100644 data/tilesets/primary/general/palettes/1.pal create mode 100644 data/tilesets/primary/general/palettes/10.pal create mode 100644 data/tilesets/primary/general/palettes/11.pal create mode 100644 data/tilesets/primary/general/palettes/12.pal create mode 100644 data/tilesets/primary/general/palettes/13.pal create mode 100644 data/tilesets/primary/general/palettes/14.pal create mode 100644 data/tilesets/primary/general/palettes/15.pal create mode 100644 data/tilesets/primary/general/palettes/2.pal create mode 100644 data/tilesets/primary/general/palettes/3.pal create mode 100644 data/tilesets/primary/general/palettes/4.pal create mode 100644 data/tilesets/primary/general/palettes/5.pal create mode 100644 data/tilesets/primary/general/palettes/6.pal create mode 100644 data/tilesets/primary/general/palettes/7.pal create mode 100644 data/tilesets/primary/general/palettes/8.pal create mode 100644 data/tilesets/primary/general/palettes/9.pal create mode 100644 data/tilesets/primary/general/tiles.png delete mode 100644 data/tilesets/secondary/82D4AAC/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4AAC/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4AAC/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4AAC/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4AAC/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4AAC/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4AAC/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4AAC/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4AAC/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4AAC/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4AAC/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4AAC/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4AAC/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4AAC/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4AAC/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4AAC/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4AAC/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4AAC/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4AAC/tiles.png delete mode 100644 data/tilesets/secondary/82D4AC4/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4AC4/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4AC4/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4AC4/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4AC4/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4AC4/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4AC4/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4AC4/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4AC4/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4AC4/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4AC4/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4AC4/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4AC4/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4AC4/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4AC4/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4AC4/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4AC4/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4AC4/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4AC4/tiles.png delete mode 100644 data/tilesets/secondary/82D4ADC/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4ADC/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4ADC/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4ADC/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4ADC/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4ADC/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4ADC/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4ADC/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4ADC/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4ADC/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4ADC/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4ADC/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4ADC/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4ADC/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4ADC/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4ADC/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4ADC/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4ADC/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4ADC/tiles.png delete mode 100644 data/tilesets/secondary/82D4AF4/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4AF4/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4AF4/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4AF4/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4AF4/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4AF4/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4AF4/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4AF4/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4AF4/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4AF4/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4AF4/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4AF4/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4AF4/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4AF4/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4AF4/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4AF4/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4AF4/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4AF4/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4AF4/tiles.png delete mode 100644 data/tilesets/secondary/82D4B0C/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4B0C/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4B0C/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4B0C/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4B0C/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4B0C/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4B0C/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4B0C/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4B0C/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4B0C/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4B0C/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4B0C/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4B0C/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4B0C/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4B0C/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4B0C/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4B0C/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4B0C/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4B0C/tiles.png delete mode 100644 data/tilesets/secondary/82D4B24/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4B24/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4B24/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4B24/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4B24/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4B24/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4B24/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4B24/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4B24/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4B24/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4B24/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4B24/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4B24/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4B24/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4B24/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4B24/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4B24/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4B24/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4B24/tiles.png delete mode 100644 data/tilesets/secondary/82D4B3C/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4B3C/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4B3C/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4B3C/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4B3C/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4B3C/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4B3C/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4B3C/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4B3C/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4B3C/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4B3C/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4B3C/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4B3C/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4B3C/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4B3C/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4B3C/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4B3C/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4B3C/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4B3C/tiles.png delete mode 100644 data/tilesets/secondary/82D4B54/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4B54/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4B54/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4B54/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4B54/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4B54/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4B54/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4B54/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4B54/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4B54/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4B54/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4B54/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4B54/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4B54/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4B54/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4B54/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4B54/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4B54/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4B54/tiles.png delete mode 100644 data/tilesets/secondary/82D4B6C/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4B6C/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4B6C/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4B6C/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4B6C/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4B6C/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4B6C/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4B6C/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4B6C/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4B6C/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4B6C/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4B6C/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4B6C/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4B6C/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4B6C/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4B6C/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4B6C/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4B6C/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4B6C/tiles.png delete mode 100644 data/tilesets/secondary/82D4B84/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4B84/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4B84/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4B84/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4B84/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4B84/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4B84/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4B84/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4B84/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4B84/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4B84/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4B84/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4B84/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4B84/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4B84/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4B84/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4B84/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4B84/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4B84/tiles.png delete mode 100644 data/tilesets/secondary/82D4B9C/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4B9C/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4B9C/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4B9C/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4B9C/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4B9C/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4B9C/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4B9C/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4B9C/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4B9C/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4B9C/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4B9C/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4B9C/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4B9C/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4B9C/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4B9C/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4B9C/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4B9C/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4B9C/tiles.png delete mode 100644 data/tilesets/secondary/82D4BCC/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4BCC/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4BCC/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4BCC/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4BCC/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4BCC/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4BCC/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4BCC/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4BCC/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4BCC/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4BCC/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4BCC/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4BCC/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4BCC/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4BCC/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4BCC/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4BCC/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4BCC/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4BCC/tiles.png delete mode 100644 data/tilesets/secondary/82D4BE4/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4BE4/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4BE4/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4BE4/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4BE4/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4BE4/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4BE4/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4BE4/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4BE4/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4BE4/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4BE4/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4BE4/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4BE4/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4BE4/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4BE4/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4BE4/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4BE4/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4BE4/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4BE4/tiles.png delete mode 100644 data/tilesets/secondary/82D4BFC/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4BFC/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4BFC/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4BFC/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4BFC/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4BFC/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4BFC/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4BFC/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4BFC/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4BFC/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4BFC/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4BFC/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4BFC/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4BFC/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4BFC/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4BFC/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4BFC/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4BFC/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4BFC/tiles.png delete mode 100644 data/tilesets/secondary/82D4C14/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4C14/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4C14/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4C14/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4C14/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4C14/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4C14/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4C14/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4C14/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4C14/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4C14/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4C14/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4C14/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4C14/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4C14/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4C14/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4C14/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4C14/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4C14/tiles.png delete mode 100644 data/tilesets/secondary/82D4C2C/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4C2C/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4C2C/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4C2C/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4C2C/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4C2C/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4C2C/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4C2C/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4C2C/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4C2C/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4C2C/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4C2C/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4C2C/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4C2C/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4C2C/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4C2C/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4C2C/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4C2C/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4C2C/tiles.png delete mode 100644 data/tilesets/secondary/82D4C44/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4C44/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4C44/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4C44/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4C44/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4C44/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4C44/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4C44/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4C44/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4C44/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4C44/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4C44/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4C44/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4C44/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4C44/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4C44/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4C44/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4C44/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4C44/tiles.png delete mode 100644 data/tilesets/secondary/82D4C5C/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4C5C/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4C5C/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4C5C/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4C5C/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4C5C/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4C5C/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4C5C/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4C5C/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4C5C/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4C5C/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4C5C/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4C5C/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4C5C/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4C5C/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4C5C/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4C5C/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4C5C/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4C5C/tiles.png delete mode 100644 data/tilesets/secondary/82D4C74/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4C74/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4C74/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4C74/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4C74/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4C74/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4C74/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4C74/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4C74/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4C74/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4C74/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4C74/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4C74/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4C74/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4C74/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4C74/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4C74/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4C74/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4C74/tiles.png delete mode 100644 data/tilesets/secondary/82D4C8C/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4C8C/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4C8C/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4C8C/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4C8C/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4C8C/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4C8C/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4C8C/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4C8C/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4C8C/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4C8C/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4C8C/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4C8C/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4C8C/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4C8C/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4C8C/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4C8C/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4C8C/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4C8C/tiles.png delete mode 100644 data/tilesets/secondary/82D4CA4/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4CA4/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4CA4/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4CA4/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4CA4/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4CA4/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4CA4/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4CA4/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4CA4/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4CA4/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4CA4/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4CA4/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4CA4/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4CA4/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4CA4/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4CA4/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4CA4/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4CA4/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4CA4/tiles.png delete mode 100644 data/tilesets/secondary/82D4CBC/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4CBC/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4CBC/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4CBC/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4CBC/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4CBC/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4CBC/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4CBC/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4CBC/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4CBC/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4CBC/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4CBC/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4CBC/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4CBC/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4CBC/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4CBC/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4CBC/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4CBC/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4CBC/tiles.png delete mode 100644 data/tilesets/secondary/82D4CD4/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4CD4/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4CD4/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4CD4/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4CD4/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4CD4/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4CD4/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4CD4/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4CD4/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4CD4/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4CD4/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4CD4/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4CD4/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4CD4/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4CD4/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4CD4/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4CD4/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4CD4/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4CD4/tiles.png delete mode 100644 data/tilesets/secondary/82D4CEC/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4CEC/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4CEC/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4CEC/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4CEC/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4CEC/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4CEC/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4CEC/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4CEC/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4CEC/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4CEC/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4CEC/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4CEC/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4CEC/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4CEC/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4CEC/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4CEC/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4CEC/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4CEC/tiles.png delete mode 100644 data/tilesets/secondary/82D4D04/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4D04/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4D04/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4D04/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4D04/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4D04/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4D04/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4D04/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4D04/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4D04/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4D04/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4D04/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4D04/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4D04/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4D04/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4D04/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4D04/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4D04/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4D04/tiles.png delete mode 100644 data/tilesets/secondary/82D4D1C/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4D1C/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4D1C/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4D1C/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4D1C/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4D1C/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4D1C/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4D1C/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4D1C/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4D1C/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4D1C/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4D1C/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4D1C/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4D1C/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4D1C/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4D1C/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4D1C/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4D1C/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4D1C/tiles.png delete mode 100644 data/tilesets/secondary/82D4D34/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4D34/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4D34/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4D34/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4D34/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4D34/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4D34/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4D34/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4D34/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4D34/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4D34/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4D34/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4D34/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4D34/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4D34/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4D34/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4D34/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4D34/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4D34/tiles.png delete mode 100644 data/tilesets/secondary/82D4D4C/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4D4C/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4D4C/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4D4C/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4D4C/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4D4C/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4D4C/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4D4C/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4D4C/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4D4C/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4D4C/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4D4C/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4D4C/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4D4C/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4D4C/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4D4C/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4D4C/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4D4C/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4D4C/tiles.png delete mode 100644 data/tilesets/secondary/82D4D64/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4D64/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4D64/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4D64/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4D64/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4D64/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4D64/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4D64/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4D64/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4D64/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4D64/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4D64/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4D64/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4D64/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4D64/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4D64/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4D64/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4D64/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4D64/tiles.png delete mode 100644 data/tilesets/secondary/82D4D7C/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4D7C/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4D7C/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4D7C/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4D7C/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4D7C/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4D7C/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4D7C/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4D7C/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4D7C/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4D7C/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4D7C/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4D7C/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4D7C/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4D7C/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4D7C/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4D7C/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4D7C/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4D7C/tiles.png delete mode 100644 data/tilesets/secondary/82D4D94/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4D94/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4D94/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4D94/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4D94/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4D94/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4D94/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4D94/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4D94/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4D94/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4D94/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4D94/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4D94/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4D94/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4D94/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4D94/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4D94/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4D94/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4D94/tiles.png delete mode 100644 data/tilesets/secondary/82D4DAC/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4DAC/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4DAC/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4DAC/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4DAC/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4DAC/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4DAC/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4DAC/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4DAC/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4DAC/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4DAC/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4DAC/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4DAC/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4DAC/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4DAC/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4DAC/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4DAC/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4DAC/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4DAC/tiles.png delete mode 100644 data/tilesets/secondary/82D4DC4/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4DC4/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4DC4/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4DC4/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4DC4/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4DC4/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4DC4/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4DC4/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4DC4/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4DC4/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4DC4/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4DC4/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4DC4/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4DC4/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4DC4/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4DC4/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4DC4/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4DC4/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4DC4/tiles.png delete mode 100644 data/tilesets/secondary/82D4DDC/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4DDC/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4DDC/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4DDC/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4DDC/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4DDC/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4DDC/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4DDC/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4DDC/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4DDC/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4DDC/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4DDC/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4DDC/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4DDC/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4DDC/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4DDC/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4DDC/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4DDC/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4DDC/tiles.png delete mode 100644 data/tilesets/secondary/82D4DF4/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4DF4/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4DF4/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4DF4/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4DF4/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4DF4/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4DF4/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4DF4/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4DF4/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4DF4/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4DF4/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4DF4/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4DF4/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4DF4/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4DF4/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4DF4/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4DF4/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4DF4/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4DF4/tiles.png delete mode 100644 data/tilesets/secondary/82D4E0C/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4E0C/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4E0C/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4E0C/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4E0C/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4E0C/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4E0C/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4E0C/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4E0C/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4E0C/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4E0C/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4E0C/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4E0C/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4E0C/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4E0C/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4E0C/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4E0C/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4E0C/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4E0C/tiles.png delete mode 100644 data/tilesets/secondary/82D4E24/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4E24/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4E24/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4E24/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4E24/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4E24/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4E24/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4E24/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4E24/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4E24/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4E24/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4E24/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4E24/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4E24/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4E24/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4E24/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4E24/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4E24/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4E24/tiles.png delete mode 100644 data/tilesets/secondary/82D4E3C/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4E3C/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4E3C/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4E3C/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4E3C/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4E3C/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4E3C/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4E3C/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4E3C/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4E3C/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4E3C/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4E3C/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4E3C/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4E3C/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4E3C/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4E3C/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4E3C/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4E3C/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4E3C/tiles.png delete mode 100644 data/tilesets/secondary/82D4E54/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4E54/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4E54/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4E54/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4E54/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4E54/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4E54/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4E54/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4E54/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4E54/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4E54/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4E54/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4E54/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4E54/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4E54/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4E54/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4E54/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4E54/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4E54/tiles.png delete mode 100644 data/tilesets/secondary/82D4E6C/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4E6C/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4E6C/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4E6C/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4E6C/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4E6C/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4E6C/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4E6C/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4E6C/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4E6C/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4E6C/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4E6C/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4E6C/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4E6C/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4E6C/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4E6C/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4E6C/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4E6C/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4E6C/tiles.png delete mode 100644 data/tilesets/secondary/82D4E84/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4E84/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4E84/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4E84/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4E84/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4E84/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4E84/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4E84/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4E84/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4E84/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4E84/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4E84/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4E84/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4E84/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4E84/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4E84/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4E84/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4E84/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4E84/tiles.png delete mode 100644 data/tilesets/secondary/82D4E9C/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4E9C/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4E9C/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4E9C/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4E9C/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4E9C/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4E9C/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4E9C/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4E9C/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4E9C/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4E9C/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4E9C/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4E9C/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4E9C/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4E9C/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4E9C/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4E9C/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4E9C/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4E9C/tiles.png delete mode 100644 data/tilesets/secondary/82D4EB4/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4EB4/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4EB4/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4EB4/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4EB4/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4EB4/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4EB4/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4EB4/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4EB4/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4EB4/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4EB4/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4EB4/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4EB4/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4EB4/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4EB4/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4EB4/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4EB4/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4EB4/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4EB4/tiles.png delete mode 100644 data/tilesets/secondary/82D4ECC/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4ECC/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4EE4/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4EE4/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4EE4/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4EE4/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4EE4/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4EE4/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4EE4/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4EE4/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4EE4/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4EE4/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4EE4/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4EE4/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4EE4/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4EE4/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4EE4/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4EE4/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4EE4/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4EE4/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4EE4/tiles.png delete mode 100644 data/tilesets/secondary/82D4EFC/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4EFC/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4EFC/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4EFC/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4EFC/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4EFC/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4EFC/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4EFC/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4EFC/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4EFC/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4EFC/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4EFC/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4EFC/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4EFC/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4EFC/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4EFC/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4EFC/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4EFC/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4EFC/tiles.png delete mode 100644 data/tilesets/secondary/82D4F14/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4F14/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4F14/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4F14/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4F14/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4F14/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4F14/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4F14/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4F14/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4F14/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4F14/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4F14/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4F14/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4F14/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4F14/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4F14/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4F14/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4F14/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4F14/tiles.png delete mode 100644 data/tilesets/secondary/82D4F2C/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4F2C/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4F2C/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4F2C/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4F2C/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4F2C/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4F2C/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4F2C/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4F2C/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4F2C/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4F2C/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4F2C/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4F2C/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4F2C/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4F2C/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4F2C/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4F2C/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4F2C/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4F2C/tiles.png delete mode 100644 data/tilesets/secondary/82D4F44/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4F44/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4F44/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4F44/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4F44/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4F44/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4F44/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4F44/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4F44/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4F44/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4F44/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4F44/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4F44/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4F44/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4F44/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4F44/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4F44/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4F44/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4F44/tiles.png delete mode 100644 data/tilesets/secondary/82D4F5C/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4F5C/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4F5C/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4F5C/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4F5C/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4F5C/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4F5C/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4F5C/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4F5C/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4F5C/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4F5C/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4F5C/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4F5C/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4F5C/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4F5C/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4F5C/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4F5C/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4F5C/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4F5C/tiles.png delete mode 100644 data/tilesets/secondary/82D4F74/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4F74/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4F74/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4F74/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4F74/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4F74/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4F74/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4F74/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4F74/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4F74/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4F74/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4F74/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4F74/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4F74/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4F74/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4F74/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4F74/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4F74/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4F74/tiles.png delete mode 100644 data/tilesets/secondary/82D4F8C/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4F8C/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4F8C/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4F8C/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4F8C/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4F8C/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4F8C/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4F8C/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4F8C/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4F8C/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4F8C/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4F8C/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4F8C/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4F8C/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4F8C/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4F8C/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4F8C/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4F8C/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4F8C/tiles.png delete mode 100644 data/tilesets/secondary/82D4FA4/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4FA4/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4FA4/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4FA4/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4FA4/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4FA4/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4FA4/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4FA4/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4FA4/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4FA4/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4FA4/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4FA4/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4FA4/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4FA4/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4FA4/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4FA4/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4FA4/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4FA4/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4FA4/tiles.png delete mode 100644 data/tilesets/secondary/82D4FBC/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4FBC/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4FBC/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4FBC/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4FBC/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4FBC/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4FBC/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4FBC/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4FBC/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4FBC/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4FBC/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4FBC/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4FBC/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4FBC/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4FBC/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4FBC/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4FBC/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4FBC/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4FBC/tiles.png delete mode 100644 data/tilesets/secondary/82D4FD4/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4FD4/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4FD4/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4FD4/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4FD4/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4FD4/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4FD4/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4FD4/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4FD4/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4FD4/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4FD4/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4FD4/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4FD4/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4FD4/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4FD4/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4FD4/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4FD4/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4FD4/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4FD4/tiles.png delete mode 100644 data/tilesets/secondary/82D4FEC/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D4FEC/metatiles.bin delete mode 100644 data/tilesets/secondary/82D4FEC/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D4FEC/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D4FEC/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D4FEC/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D4FEC/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D4FEC/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D4FEC/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D4FEC/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D4FEC/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D4FEC/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D4FEC/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D4FEC/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D4FEC/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D4FEC/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D4FEC/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D4FEC/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D4FEC/tiles.png delete mode 100644 data/tilesets/secondary/82D5004/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D5004/metatiles.bin delete mode 100644 data/tilesets/secondary/82D5004/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D5004/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D5004/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D5004/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D5004/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D5004/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D5004/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D5004/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D5004/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D5004/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D5004/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D5004/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D5004/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D5004/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D5004/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D5004/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D5004/tiles.png delete mode 100644 data/tilesets/secondary/82D501C/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D501C/metatiles.bin delete mode 100644 data/tilesets/secondary/82D501C/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D501C/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D501C/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D501C/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D501C/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D501C/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D501C/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D501C/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D501C/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D501C/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D501C/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D501C/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D501C/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D501C/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D501C/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D501C/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D501C/tiles.png delete mode 100644 data/tilesets/secondary/82D5034/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D5034/metatiles.bin delete mode 100644 data/tilesets/secondary/82D5034/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D5034/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D5034/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D5034/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D5034/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D5034/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D5034/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D5034/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D5034/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D5034/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D5034/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D5034/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D5034/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D5034/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D5034/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D5034/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D5034/tiles.png delete mode 100644 data/tilesets/secondary/82D504C/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D504C/metatiles.bin delete mode 100644 data/tilesets/secondary/82D504C/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D504C/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D504C/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D504C/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D504C/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D504C/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D504C/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D504C/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D504C/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D504C/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D504C/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D504C/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D504C/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D504C/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D504C/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D504C/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D504C/tiles.png delete mode 100644 data/tilesets/secondary/82D5064/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D5064/metatiles.bin delete mode 100644 data/tilesets/secondary/82D5064/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D5064/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D5064/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D5064/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D5064/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D5064/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D5064/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D5064/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D5064/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D5064/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D5064/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D5064/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D5064/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D5064/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D5064/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D5064/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D5064/tiles.png delete mode 100644 data/tilesets/secondary/82D507C/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D507C/metatiles.bin delete mode 100644 data/tilesets/secondary/82D507C/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D507C/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D507C/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D507C/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D507C/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D507C/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D507C/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D507C/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D507C/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D507C/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D507C/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D507C/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D507C/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D507C/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D507C/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D507C/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D507C/tiles.png delete mode 100644 data/tilesets/secondary/82D5094/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D5094/metatiles.bin delete mode 100644 data/tilesets/secondary/82D5094/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D5094/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D5094/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D5094/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D5094/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D5094/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D5094/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D5094/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D5094/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D5094/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D5094/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D5094/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D5094/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D5094/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D5094/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D5094/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D5094/tiles.png delete mode 100644 data/tilesets/secondary/82D50AC/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D50AC/metatiles.bin delete mode 100644 data/tilesets/secondary/82D50AC/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D50AC/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D50AC/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D50AC/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D50AC/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D50AC/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D50AC/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D50AC/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D50AC/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D50AC/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D50AC/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D50AC/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D50AC/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D50AC/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D50AC/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D50AC/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D50AC/tiles.png delete mode 100644 data/tilesets/secondary/82D50C4/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D50C4/metatiles.bin delete mode 100644 data/tilesets/secondary/82D50C4/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D50C4/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D50C4/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D50C4/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D50C4/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D50C4/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D50C4/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D50C4/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D50C4/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D50C4/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D50C4/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D50C4/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D50C4/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D50C4/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D50C4/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D50C4/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D50C4/tiles.png delete mode 100644 data/tilesets/secondary/82D50DC/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/82D50DC/metatiles.bin delete mode 100644 data/tilesets/secondary/82D50DC/palettes/0.pal delete mode 100644 data/tilesets/secondary/82D50DC/palettes/1.pal delete mode 100644 data/tilesets/secondary/82D50DC/palettes/10.pal delete mode 100644 data/tilesets/secondary/82D50DC/palettes/11.pal delete mode 100644 data/tilesets/secondary/82D50DC/palettes/12.pal delete mode 100644 data/tilesets/secondary/82D50DC/palettes/13.pal delete mode 100644 data/tilesets/secondary/82D50DC/palettes/14.pal delete mode 100644 data/tilesets/secondary/82D50DC/palettes/15.pal delete mode 100644 data/tilesets/secondary/82D50DC/palettes/2.pal delete mode 100644 data/tilesets/secondary/82D50DC/palettes/3.pal delete mode 100644 data/tilesets/secondary/82D50DC/palettes/4.pal delete mode 100644 data/tilesets/secondary/82D50DC/palettes/5.pal delete mode 100644 data/tilesets/secondary/82D50DC/palettes/6.pal delete mode 100644 data/tilesets/secondary/82D50DC/palettes/7.pal delete mode 100644 data/tilesets/secondary/82D50DC/palettes/8.pal delete mode 100644 data/tilesets/secondary/82D50DC/palettes/9.pal delete mode 100644 data/tilesets/secondary/82D50DC/tiles.png create mode 100644 data/tilesets/secondary/berry_forest/metatile_attributes.bin create mode 100644 data/tilesets/secondary/berry_forest/metatiles.bin create mode 100644 data/tilesets/secondary/berry_forest/palettes/0.pal create mode 100644 data/tilesets/secondary/berry_forest/palettes/1.pal create mode 100644 data/tilesets/secondary/berry_forest/palettes/10.pal create mode 100644 data/tilesets/secondary/berry_forest/palettes/11.pal create mode 100644 data/tilesets/secondary/berry_forest/palettes/12.pal create mode 100644 data/tilesets/secondary/berry_forest/palettes/13.pal create mode 100644 data/tilesets/secondary/berry_forest/palettes/14.pal create mode 100644 data/tilesets/secondary/berry_forest/palettes/15.pal create mode 100644 data/tilesets/secondary/berry_forest/palettes/2.pal create mode 100644 data/tilesets/secondary/berry_forest/palettes/3.pal create mode 100644 data/tilesets/secondary/berry_forest/palettes/4.pal create mode 100644 data/tilesets/secondary/berry_forest/palettes/5.pal create mode 100644 data/tilesets/secondary/berry_forest/palettes/6.pal create mode 100644 data/tilesets/secondary/berry_forest/palettes/7.pal create mode 100644 data/tilesets/secondary/berry_forest/palettes/8.pal create mode 100644 data/tilesets/secondary/berry_forest/palettes/9.pal create mode 100644 data/tilesets/secondary/berry_forest/tiles.png create mode 100644 data/tilesets/secondary/bike_shop/metatile_attributes.bin create mode 100644 data/tilesets/secondary/bike_shop/metatiles.bin create mode 100644 data/tilesets/secondary/bike_shop/palettes/0.pal create mode 100644 data/tilesets/secondary/bike_shop/palettes/1.pal create mode 100644 data/tilesets/secondary/bike_shop/palettes/10.pal create mode 100644 data/tilesets/secondary/bike_shop/palettes/11.pal create mode 100644 data/tilesets/secondary/bike_shop/palettes/12.pal create mode 100644 data/tilesets/secondary/bike_shop/palettes/13.pal create mode 100644 data/tilesets/secondary/bike_shop/palettes/14.pal create mode 100644 data/tilesets/secondary/bike_shop/palettes/15.pal create mode 100644 data/tilesets/secondary/bike_shop/palettes/2.pal create mode 100644 data/tilesets/secondary/bike_shop/palettes/3.pal create mode 100644 data/tilesets/secondary/bike_shop/palettes/4.pal create mode 100644 data/tilesets/secondary/bike_shop/palettes/5.pal create mode 100644 data/tilesets/secondary/bike_shop/palettes/6.pal create mode 100644 data/tilesets/secondary/bike_shop/palettes/7.pal create mode 100644 data/tilesets/secondary/bike_shop/palettes/8.pal create mode 100644 data/tilesets/secondary/bike_shop/palettes/9.pal create mode 100644 data/tilesets/secondary/bike_shop/tiles.png create mode 100644 data/tilesets/secondary/building1/metatile_attributes.bin create mode 100644 data/tilesets/secondary/building1/metatiles.bin create mode 100644 data/tilesets/secondary/building1/palettes/0.pal create mode 100644 data/tilesets/secondary/building1/palettes/1.pal create mode 100644 data/tilesets/secondary/building1/palettes/10.pal create mode 100644 data/tilesets/secondary/building1/palettes/11.pal create mode 100644 data/tilesets/secondary/building1/palettes/12.pal create mode 100644 data/tilesets/secondary/building1/palettes/13.pal create mode 100644 data/tilesets/secondary/building1/palettes/14.pal create mode 100644 data/tilesets/secondary/building1/palettes/15.pal create mode 100644 data/tilesets/secondary/building1/palettes/2.pal create mode 100644 data/tilesets/secondary/building1/palettes/3.pal create mode 100644 data/tilesets/secondary/building1/palettes/4.pal create mode 100644 data/tilesets/secondary/building1/palettes/5.pal create mode 100644 data/tilesets/secondary/building1/palettes/6.pal create mode 100644 data/tilesets/secondary/building1/palettes/7.pal create mode 100644 data/tilesets/secondary/building1/palettes/8.pal create mode 100644 data/tilesets/secondary/building1/palettes/9.pal create mode 100644 data/tilesets/secondary/building1/tiles.png create mode 100644 data/tilesets/secondary/building2/metatile_attributes.bin create mode 100644 data/tilesets/secondary/building2/metatiles.bin create mode 100644 data/tilesets/secondary/building2/palettes/0.pal create mode 100644 data/tilesets/secondary/building2/palettes/1.pal create mode 100644 data/tilesets/secondary/building2/palettes/10.pal create mode 100644 data/tilesets/secondary/building2/palettes/11.pal create mode 100644 data/tilesets/secondary/building2/palettes/12.pal create mode 100644 data/tilesets/secondary/building2/palettes/13.pal create mode 100644 data/tilesets/secondary/building2/palettes/14.pal create mode 100644 data/tilesets/secondary/building2/palettes/15.pal create mode 100644 data/tilesets/secondary/building2/palettes/2.pal create mode 100644 data/tilesets/secondary/building2/palettes/3.pal create mode 100644 data/tilesets/secondary/building2/palettes/4.pal create mode 100644 data/tilesets/secondary/building2/palettes/5.pal create mode 100644 data/tilesets/secondary/building2/palettes/6.pal create mode 100644 data/tilesets/secondary/building2/palettes/7.pal create mode 100644 data/tilesets/secondary/building2/palettes/8.pal create mode 100644 data/tilesets/secondary/building2/palettes/9.pal create mode 100644 data/tilesets/secondary/building2/tiles.png create mode 100644 data/tilesets/secondary/burgled_house/metatile_attributes.bin create mode 100644 data/tilesets/secondary/burgled_house/metatiles.bin create mode 100644 data/tilesets/secondary/burgled_house/palettes/0.pal create mode 100644 data/tilesets/secondary/burgled_house/palettes/1.pal create mode 100644 data/tilesets/secondary/burgled_house/palettes/10.pal create mode 100644 data/tilesets/secondary/burgled_house/palettes/11.pal create mode 100644 data/tilesets/secondary/burgled_house/palettes/12.pal create mode 100644 data/tilesets/secondary/burgled_house/palettes/13.pal create mode 100644 data/tilesets/secondary/burgled_house/palettes/14.pal create mode 100644 data/tilesets/secondary/burgled_house/palettes/15.pal create mode 100644 data/tilesets/secondary/burgled_house/palettes/2.pal create mode 100644 data/tilesets/secondary/burgled_house/palettes/3.pal create mode 100644 data/tilesets/secondary/burgled_house/palettes/4.pal create mode 100644 data/tilesets/secondary/burgled_house/palettes/5.pal create mode 100644 data/tilesets/secondary/burgled_house/palettes/6.pal create mode 100644 data/tilesets/secondary/burgled_house/palettes/7.pal create mode 100644 data/tilesets/secondary/burgled_house/palettes/8.pal create mode 100644 data/tilesets/secondary/burgled_house/palettes/9.pal create mode 100644 data/tilesets/secondary/burgled_house/tiles.png create mode 100644 data/tilesets/secondary/cable_club/metatile_attributes.bin create mode 100644 data/tilesets/secondary/cable_club/metatiles.bin create mode 100644 data/tilesets/secondary/cable_club/palettes/0.pal create mode 100644 data/tilesets/secondary/cable_club/palettes/1.pal create mode 100644 data/tilesets/secondary/cable_club/palettes/10.pal create mode 100644 data/tilesets/secondary/cable_club/palettes/11.pal create mode 100644 data/tilesets/secondary/cable_club/palettes/12.pal create mode 100644 data/tilesets/secondary/cable_club/palettes/13.pal create mode 100644 data/tilesets/secondary/cable_club/palettes/14.pal create mode 100644 data/tilesets/secondary/cable_club/palettes/15.pal create mode 100644 data/tilesets/secondary/cable_club/palettes/2.pal create mode 100644 data/tilesets/secondary/cable_club/palettes/3.pal create mode 100644 data/tilesets/secondary/cable_club/palettes/4.pal create mode 100644 data/tilesets/secondary/cable_club/palettes/5.pal create mode 100644 data/tilesets/secondary/cable_club/palettes/6.pal create mode 100644 data/tilesets/secondary/cable_club/palettes/7.pal create mode 100644 data/tilesets/secondary/cable_club/palettes/8.pal create mode 100644 data/tilesets/secondary/cable_club/palettes/9.pal create mode 100644 data/tilesets/secondary/cable_club/tiles.png create mode 100644 data/tilesets/secondary/cave/metatile_attributes.bin create mode 100644 data/tilesets/secondary/cave/metatiles.bin create mode 100644 data/tilesets/secondary/cave/palettes/0.pal create mode 100644 data/tilesets/secondary/cave/palettes/1.pal create mode 100644 data/tilesets/secondary/cave/palettes/10.pal create mode 100644 data/tilesets/secondary/cave/palettes/11.pal create mode 100644 data/tilesets/secondary/cave/palettes/12.pal create mode 100644 data/tilesets/secondary/cave/palettes/13.pal create mode 100644 data/tilesets/secondary/cave/palettes/14.pal create mode 100644 data/tilesets/secondary/cave/palettes/15.pal create mode 100644 data/tilesets/secondary/cave/palettes/2.pal create mode 100644 data/tilesets/secondary/cave/palettes/3.pal create mode 100644 data/tilesets/secondary/cave/palettes/4.pal create mode 100644 data/tilesets/secondary/cave/palettes/5.pal create mode 100644 data/tilesets/secondary/cave/palettes/6.pal create mode 100644 data/tilesets/secondary/cave/palettes/7.pal create mode 100644 data/tilesets/secondary/cave/palettes/8.pal create mode 100644 data/tilesets/secondary/cave/palettes/9.pal create mode 100644 data/tilesets/secondary/cave/tiles.png create mode 100644 data/tilesets/secondary/celadon_city/metatile_attributes.bin create mode 100644 data/tilesets/secondary/celadon_city/metatiles.bin create mode 100644 data/tilesets/secondary/celadon_city/palettes/0.pal create mode 100644 data/tilesets/secondary/celadon_city/palettes/1.pal create mode 100644 data/tilesets/secondary/celadon_city/palettes/10.pal create mode 100644 data/tilesets/secondary/celadon_city/palettes/11.pal create mode 100644 data/tilesets/secondary/celadon_city/palettes/12.pal create mode 100644 data/tilesets/secondary/celadon_city/palettes/13.pal create mode 100644 data/tilesets/secondary/celadon_city/palettes/14.pal create mode 100644 data/tilesets/secondary/celadon_city/palettes/15.pal create mode 100644 data/tilesets/secondary/celadon_city/palettes/2.pal create mode 100644 data/tilesets/secondary/celadon_city/palettes/3.pal create mode 100644 data/tilesets/secondary/celadon_city/palettes/4.pal create mode 100644 data/tilesets/secondary/celadon_city/palettes/5.pal create mode 100644 data/tilesets/secondary/celadon_city/palettes/6.pal create mode 100644 data/tilesets/secondary/celadon_city/palettes/7.pal create mode 100644 data/tilesets/secondary/celadon_city/palettes/8.pal create mode 100644 data/tilesets/secondary/celadon_city/palettes/9.pal create mode 100644 data/tilesets/secondary/celadon_city/tiles.png create mode 100644 data/tilesets/secondary/celadon_gym/metatile_attributes.bin create mode 100644 data/tilesets/secondary/celadon_gym/metatiles.bin create mode 100644 data/tilesets/secondary/celadon_gym/palettes/0.pal create mode 100644 data/tilesets/secondary/celadon_gym/palettes/1.pal create mode 100644 data/tilesets/secondary/celadon_gym/palettes/10.pal create mode 100644 data/tilesets/secondary/celadon_gym/palettes/11.pal create mode 100644 data/tilesets/secondary/celadon_gym/palettes/12.pal create mode 100644 data/tilesets/secondary/celadon_gym/palettes/13.pal create mode 100644 data/tilesets/secondary/celadon_gym/palettes/14.pal create mode 100644 data/tilesets/secondary/celadon_gym/palettes/15.pal create mode 100644 data/tilesets/secondary/celadon_gym/palettes/2.pal create mode 100644 data/tilesets/secondary/celadon_gym/palettes/3.pal create mode 100644 data/tilesets/secondary/celadon_gym/palettes/4.pal create mode 100644 data/tilesets/secondary/celadon_gym/palettes/5.pal create mode 100644 data/tilesets/secondary/celadon_gym/palettes/6.pal create mode 100644 data/tilesets/secondary/celadon_gym/palettes/7.pal create mode 100644 data/tilesets/secondary/celadon_gym/palettes/8.pal create mode 100644 data/tilesets/secondary/celadon_gym/palettes/9.pal create mode 100644 data/tilesets/secondary/celadon_gym/tiles.png create mode 100644 data/tilesets/secondary/cerulean_cave/metatile_attributes.bin create mode 100644 data/tilesets/secondary/cerulean_cave/metatiles.bin create mode 100644 data/tilesets/secondary/cerulean_cave/palettes/0.pal create mode 100644 data/tilesets/secondary/cerulean_cave/palettes/1.pal create mode 100644 data/tilesets/secondary/cerulean_cave/palettes/10.pal create mode 100644 data/tilesets/secondary/cerulean_cave/palettes/11.pal create mode 100644 data/tilesets/secondary/cerulean_cave/palettes/12.pal create mode 100644 data/tilesets/secondary/cerulean_cave/palettes/13.pal create mode 100644 data/tilesets/secondary/cerulean_cave/palettes/14.pal create mode 100644 data/tilesets/secondary/cerulean_cave/palettes/15.pal create mode 100644 data/tilesets/secondary/cerulean_cave/palettes/2.pal create mode 100644 data/tilesets/secondary/cerulean_cave/palettes/3.pal create mode 100644 data/tilesets/secondary/cerulean_cave/palettes/4.pal create mode 100644 data/tilesets/secondary/cerulean_cave/palettes/5.pal create mode 100644 data/tilesets/secondary/cerulean_cave/palettes/6.pal create mode 100644 data/tilesets/secondary/cerulean_cave/palettes/7.pal create mode 100644 data/tilesets/secondary/cerulean_cave/palettes/8.pal create mode 100644 data/tilesets/secondary/cerulean_cave/palettes/9.pal create mode 100644 data/tilesets/secondary/cerulean_cave/tiles.png create mode 100644 data/tilesets/secondary/cerulean_city/metatile_attributes.bin create mode 100644 data/tilesets/secondary/cerulean_city/metatiles.bin create mode 100644 data/tilesets/secondary/cerulean_city/palettes/0.pal create mode 100644 data/tilesets/secondary/cerulean_city/palettes/1.pal create mode 100644 data/tilesets/secondary/cerulean_city/palettes/10.pal create mode 100644 data/tilesets/secondary/cerulean_city/palettes/11.pal create mode 100644 data/tilesets/secondary/cerulean_city/palettes/12.pal create mode 100644 data/tilesets/secondary/cerulean_city/palettes/13.pal create mode 100644 data/tilesets/secondary/cerulean_city/palettes/14.pal create mode 100644 data/tilesets/secondary/cerulean_city/palettes/15.pal create mode 100644 data/tilesets/secondary/cerulean_city/palettes/2.pal create mode 100644 data/tilesets/secondary/cerulean_city/palettes/3.pal create mode 100644 data/tilesets/secondary/cerulean_city/palettes/4.pal create mode 100644 data/tilesets/secondary/cerulean_city/palettes/5.pal create mode 100644 data/tilesets/secondary/cerulean_city/palettes/6.pal create mode 100644 data/tilesets/secondary/cerulean_city/palettes/7.pal create mode 100644 data/tilesets/secondary/cerulean_city/palettes/8.pal create mode 100644 data/tilesets/secondary/cerulean_city/palettes/9.pal create mode 100644 data/tilesets/secondary/cerulean_city/tiles.png create mode 100644 data/tilesets/secondary/cerulean_gym/metatile_attributes.bin create mode 100644 data/tilesets/secondary/cerulean_gym/metatiles.bin create mode 100644 data/tilesets/secondary/cerulean_gym/palettes/0.pal create mode 100644 data/tilesets/secondary/cerulean_gym/palettes/1.pal create mode 100644 data/tilesets/secondary/cerulean_gym/palettes/10.pal create mode 100644 data/tilesets/secondary/cerulean_gym/palettes/11.pal create mode 100644 data/tilesets/secondary/cerulean_gym/palettes/12.pal create mode 100644 data/tilesets/secondary/cerulean_gym/palettes/13.pal create mode 100644 data/tilesets/secondary/cerulean_gym/palettes/14.pal create mode 100644 data/tilesets/secondary/cerulean_gym/palettes/15.pal create mode 100644 data/tilesets/secondary/cerulean_gym/palettes/2.pal create mode 100644 data/tilesets/secondary/cerulean_gym/palettes/3.pal create mode 100644 data/tilesets/secondary/cerulean_gym/palettes/4.pal create mode 100644 data/tilesets/secondary/cerulean_gym/palettes/5.pal create mode 100644 data/tilesets/secondary/cerulean_gym/palettes/6.pal create mode 100644 data/tilesets/secondary/cerulean_gym/palettes/7.pal create mode 100644 data/tilesets/secondary/cerulean_gym/palettes/8.pal create mode 100644 data/tilesets/secondary/cerulean_gym/palettes/9.pal create mode 100644 data/tilesets/secondary/cerulean_gym/tiles.png create mode 100644 data/tilesets/secondary/cinnabar_gym/metatile_attributes.bin create mode 100644 data/tilesets/secondary/cinnabar_gym/metatiles.bin create mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/0.pal create mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/1.pal create mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/10.pal create mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/11.pal create mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/12.pal create mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/13.pal create mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/14.pal create mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/15.pal create mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/2.pal create mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/3.pal create mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/4.pal create mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/5.pal create mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/6.pal create mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/7.pal create mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/8.pal create mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/9.pal create mode 100644 data/tilesets/secondary/cinnabar_gym/tiles.png create mode 100644 data/tilesets/secondary/cinnabar_island/metatile_attributes.bin create mode 100644 data/tilesets/secondary/cinnabar_island/metatiles.bin create mode 100644 data/tilesets/secondary/cinnabar_island/palettes/0.pal create mode 100644 data/tilesets/secondary/cinnabar_island/palettes/1.pal create mode 100644 data/tilesets/secondary/cinnabar_island/palettes/10.pal create mode 100644 data/tilesets/secondary/cinnabar_island/palettes/11.pal create mode 100644 data/tilesets/secondary/cinnabar_island/palettes/12.pal create mode 100644 data/tilesets/secondary/cinnabar_island/palettes/13.pal create mode 100644 data/tilesets/secondary/cinnabar_island/palettes/14.pal create mode 100644 data/tilesets/secondary/cinnabar_island/palettes/15.pal create mode 100644 data/tilesets/secondary/cinnabar_island/palettes/2.pal create mode 100644 data/tilesets/secondary/cinnabar_island/palettes/3.pal create mode 100644 data/tilesets/secondary/cinnabar_island/palettes/4.pal create mode 100644 data/tilesets/secondary/cinnabar_island/palettes/5.pal create mode 100644 data/tilesets/secondary/cinnabar_island/palettes/6.pal create mode 100644 data/tilesets/secondary/cinnabar_island/palettes/7.pal create mode 100644 data/tilesets/secondary/cinnabar_island/palettes/8.pal create mode 100644 data/tilesets/secondary/cinnabar_island/palettes/9.pal create mode 100644 data/tilesets/secondary/cinnabar_island/tiles.png create mode 100644 data/tilesets/secondary/condominiums/metatile_attributes.bin create mode 100644 data/tilesets/secondary/condominiums/metatiles.bin create mode 100644 data/tilesets/secondary/condominiums/palettes/0.pal create mode 100644 data/tilesets/secondary/condominiums/palettes/1.pal create mode 100644 data/tilesets/secondary/condominiums/palettes/10.pal create mode 100644 data/tilesets/secondary/condominiums/palettes/11.pal create mode 100644 data/tilesets/secondary/condominiums/palettes/12.pal create mode 100644 data/tilesets/secondary/condominiums/palettes/13.pal create mode 100644 data/tilesets/secondary/condominiums/palettes/14.pal create mode 100644 data/tilesets/secondary/condominiums/palettes/15.pal create mode 100644 data/tilesets/secondary/condominiums/palettes/2.pal create mode 100644 data/tilesets/secondary/condominiums/palettes/3.pal create mode 100644 data/tilesets/secondary/condominiums/palettes/4.pal create mode 100644 data/tilesets/secondary/condominiums/palettes/5.pal create mode 100644 data/tilesets/secondary/condominiums/palettes/6.pal create mode 100644 data/tilesets/secondary/condominiums/palettes/7.pal create mode 100644 data/tilesets/secondary/condominiums/palettes/8.pal create mode 100644 data/tilesets/secondary/condominiums/palettes/9.pal create mode 100644 data/tilesets/secondary/condominiums/tiles.png create mode 100644 data/tilesets/secondary/department_store/metatile_attributes.bin create mode 100644 data/tilesets/secondary/department_store/metatiles.bin create mode 100644 data/tilesets/secondary/department_store/palettes/0.pal create mode 100644 data/tilesets/secondary/department_store/palettes/1.pal create mode 100644 data/tilesets/secondary/department_store/palettes/10.pal create mode 100644 data/tilesets/secondary/department_store/palettes/11.pal create mode 100644 data/tilesets/secondary/department_store/palettes/12.pal create mode 100644 data/tilesets/secondary/department_store/palettes/13.pal create mode 100644 data/tilesets/secondary/department_store/palettes/14.pal create mode 100644 data/tilesets/secondary/department_store/palettes/15.pal create mode 100644 data/tilesets/secondary/department_store/palettes/2.pal create mode 100644 data/tilesets/secondary/department_store/palettes/3.pal create mode 100644 data/tilesets/secondary/department_store/palettes/4.pal create mode 100644 data/tilesets/secondary/department_store/palettes/5.pal create mode 100644 data/tilesets/secondary/department_store/palettes/6.pal create mode 100644 data/tilesets/secondary/department_store/palettes/7.pal create mode 100644 data/tilesets/secondary/department_store/palettes/8.pal create mode 100644 data/tilesets/secondary/department_store/palettes/9.pal create mode 100644 data/tilesets/secondary/department_store/tiles.png create mode 100644 data/tilesets/secondary/digletts_cave/metatile_attributes.bin create mode 100644 data/tilesets/secondary/digletts_cave/metatiles.bin create mode 100644 data/tilesets/secondary/digletts_cave/palettes/0.pal create mode 100644 data/tilesets/secondary/digletts_cave/palettes/1.pal create mode 100644 data/tilesets/secondary/digletts_cave/palettes/10.pal create mode 100644 data/tilesets/secondary/digletts_cave/palettes/11.pal create mode 100644 data/tilesets/secondary/digletts_cave/palettes/12.pal create mode 100644 data/tilesets/secondary/digletts_cave/palettes/13.pal create mode 100644 data/tilesets/secondary/digletts_cave/palettes/14.pal create mode 100644 data/tilesets/secondary/digletts_cave/palettes/15.pal create mode 100644 data/tilesets/secondary/digletts_cave/palettes/2.pal create mode 100644 data/tilesets/secondary/digletts_cave/palettes/3.pal create mode 100644 data/tilesets/secondary/digletts_cave/palettes/4.pal create mode 100644 data/tilesets/secondary/digletts_cave/palettes/5.pal create mode 100644 data/tilesets/secondary/digletts_cave/palettes/6.pal create mode 100644 data/tilesets/secondary/digletts_cave/palettes/7.pal create mode 100644 data/tilesets/secondary/digletts_cave/palettes/8.pal create mode 100644 data/tilesets/secondary/digletts_cave/palettes/9.pal create mode 100644 data/tilesets/secondary/digletts_cave/tiles.png create mode 100644 data/tilesets/secondary/dummy1/metatile_attributes.bin create mode 100644 data/tilesets/secondary/dummy1/metatiles.bin create mode 100644 data/tilesets/secondary/dummy1/palettes/0.pal create mode 100644 data/tilesets/secondary/dummy1/palettes/1.pal create mode 100644 data/tilesets/secondary/dummy1/palettes/10.pal create mode 100644 data/tilesets/secondary/dummy1/palettes/11.pal create mode 100644 data/tilesets/secondary/dummy1/palettes/12.pal create mode 100644 data/tilesets/secondary/dummy1/palettes/13.pal create mode 100644 data/tilesets/secondary/dummy1/palettes/14.pal create mode 100644 data/tilesets/secondary/dummy1/palettes/15.pal create mode 100644 data/tilesets/secondary/dummy1/palettes/2.pal create mode 100644 data/tilesets/secondary/dummy1/palettes/3.pal create mode 100644 data/tilesets/secondary/dummy1/palettes/4.pal create mode 100644 data/tilesets/secondary/dummy1/palettes/5.pal create mode 100644 data/tilesets/secondary/dummy1/palettes/6.pal create mode 100644 data/tilesets/secondary/dummy1/palettes/7.pal create mode 100644 data/tilesets/secondary/dummy1/palettes/8.pal create mode 100644 data/tilesets/secondary/dummy1/palettes/9.pal create mode 100644 data/tilesets/secondary/dummy1/tiles.png create mode 100644 data/tilesets/secondary/dummy2/metatile_attributes.bin create mode 100644 data/tilesets/secondary/dummy2/metatiles.bin create mode 100644 data/tilesets/secondary/dummy2/palettes/0.pal create mode 100644 data/tilesets/secondary/dummy2/palettes/1.pal create mode 100644 data/tilesets/secondary/dummy2/palettes/10.pal create mode 100644 data/tilesets/secondary/dummy2/palettes/11.pal create mode 100644 data/tilesets/secondary/dummy2/palettes/12.pal create mode 100644 data/tilesets/secondary/dummy2/palettes/13.pal create mode 100644 data/tilesets/secondary/dummy2/palettes/14.pal create mode 100644 data/tilesets/secondary/dummy2/palettes/15.pal create mode 100644 data/tilesets/secondary/dummy2/palettes/2.pal create mode 100644 data/tilesets/secondary/dummy2/palettes/3.pal create mode 100644 data/tilesets/secondary/dummy2/palettes/4.pal create mode 100644 data/tilesets/secondary/dummy2/palettes/5.pal create mode 100644 data/tilesets/secondary/dummy2/palettes/6.pal create mode 100644 data/tilesets/secondary/dummy2/palettes/7.pal create mode 100644 data/tilesets/secondary/dummy2/palettes/8.pal create mode 100644 data/tilesets/secondary/dummy2/palettes/9.pal create mode 100644 data/tilesets/secondary/dummy2/tiles.png create mode 100644 data/tilesets/secondary/dummy3/metatile_attributes.bin create mode 100644 data/tilesets/secondary/dummy3/metatiles.bin create mode 100644 data/tilesets/secondary/dummy3/palettes/0.pal create mode 100644 data/tilesets/secondary/dummy3/palettes/1.pal create mode 100644 data/tilesets/secondary/dummy3/palettes/10.pal create mode 100644 data/tilesets/secondary/dummy3/palettes/11.pal create mode 100644 data/tilesets/secondary/dummy3/palettes/12.pal create mode 100644 data/tilesets/secondary/dummy3/palettes/13.pal create mode 100644 data/tilesets/secondary/dummy3/palettes/14.pal create mode 100644 data/tilesets/secondary/dummy3/palettes/15.pal create mode 100644 data/tilesets/secondary/dummy3/palettes/2.pal create mode 100644 data/tilesets/secondary/dummy3/palettes/3.pal create mode 100644 data/tilesets/secondary/dummy3/palettes/4.pal create mode 100644 data/tilesets/secondary/dummy3/palettes/5.pal create mode 100644 data/tilesets/secondary/dummy3/palettes/6.pal create mode 100644 data/tilesets/secondary/dummy3/palettes/7.pal create mode 100644 data/tilesets/secondary/dummy3/palettes/8.pal create mode 100644 data/tilesets/secondary/dummy3/palettes/9.pal create mode 100644 data/tilesets/secondary/dummy3/tiles.png create mode 100644 data/tilesets/secondary/dummy4/metatile_attributes.bin create mode 100644 data/tilesets/secondary/dummy4/metatiles.bin create mode 100644 data/tilesets/secondary/dummy4/palettes/0.pal create mode 100644 data/tilesets/secondary/dummy4/palettes/1.pal create mode 100644 data/tilesets/secondary/dummy4/palettes/10.pal create mode 100644 data/tilesets/secondary/dummy4/palettes/11.pal create mode 100644 data/tilesets/secondary/dummy4/palettes/12.pal create mode 100644 data/tilesets/secondary/dummy4/palettes/13.pal create mode 100644 data/tilesets/secondary/dummy4/palettes/14.pal create mode 100644 data/tilesets/secondary/dummy4/palettes/15.pal create mode 100644 data/tilesets/secondary/dummy4/palettes/2.pal create mode 100644 data/tilesets/secondary/dummy4/palettes/3.pal create mode 100644 data/tilesets/secondary/dummy4/palettes/4.pal create mode 100644 data/tilesets/secondary/dummy4/palettes/5.pal create mode 100644 data/tilesets/secondary/dummy4/palettes/6.pal create mode 100644 data/tilesets/secondary/dummy4/palettes/7.pal create mode 100644 data/tilesets/secondary/dummy4/palettes/8.pal create mode 100644 data/tilesets/secondary/dummy4/palettes/9.pal create mode 100644 data/tilesets/secondary/dummy4/tiles.png create mode 100644 data/tilesets/secondary/fan_club_daycare/metatile_attributes.bin create mode 100644 data/tilesets/secondary/fan_club_daycare/metatiles.bin create mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/0.pal create mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/1.pal create mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/10.pal create mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/11.pal create mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/12.pal create mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/13.pal create mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/14.pal create mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/15.pal create mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/2.pal create mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/3.pal create mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/4.pal create mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/5.pal create mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/6.pal create mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/7.pal create mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/8.pal create mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/9.pal create mode 100644 data/tilesets/secondary/fan_club_daycare/tiles.png create mode 100644 data/tilesets/secondary/fuchsia_city/metatile_attributes.bin create mode 100644 data/tilesets/secondary/fuchsia_city/metatiles.bin create mode 100644 data/tilesets/secondary/fuchsia_city/palettes/0.pal create mode 100644 data/tilesets/secondary/fuchsia_city/palettes/1.pal create mode 100644 data/tilesets/secondary/fuchsia_city/palettes/10.pal create mode 100644 data/tilesets/secondary/fuchsia_city/palettes/11.pal create mode 100644 data/tilesets/secondary/fuchsia_city/palettes/12.pal create mode 100644 data/tilesets/secondary/fuchsia_city/palettes/13.pal create mode 100644 data/tilesets/secondary/fuchsia_city/palettes/14.pal create mode 100644 data/tilesets/secondary/fuchsia_city/palettes/15.pal create mode 100644 data/tilesets/secondary/fuchsia_city/palettes/2.pal create mode 100644 data/tilesets/secondary/fuchsia_city/palettes/3.pal create mode 100644 data/tilesets/secondary/fuchsia_city/palettes/4.pal create mode 100644 data/tilesets/secondary/fuchsia_city/palettes/5.pal create mode 100644 data/tilesets/secondary/fuchsia_city/palettes/6.pal create mode 100644 data/tilesets/secondary/fuchsia_city/palettes/7.pal create mode 100644 data/tilesets/secondary/fuchsia_city/palettes/8.pal create mode 100644 data/tilesets/secondary/fuchsia_city/palettes/9.pal create mode 100644 data/tilesets/secondary/fuchsia_city/tiles.png create mode 100644 data/tilesets/secondary/fuchsia_gym/metatile_attributes.bin create mode 100644 data/tilesets/secondary/fuchsia_gym/metatiles.bin create mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/0.pal create mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/1.pal create mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/10.pal create mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/11.pal create mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/12.pal create mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/13.pal create mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/14.pal create mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/15.pal create mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/2.pal create mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/3.pal create mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/4.pal create mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/5.pal create mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/6.pal create mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/7.pal create mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/8.pal create mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/9.pal create mode 100644 data/tilesets/secondary/fuchsia_gym/tiles.png create mode 100644 data/tilesets/secondary/game_corner/metatile_attributes.bin create mode 100644 data/tilesets/secondary/game_corner/metatiles.bin create mode 100644 data/tilesets/secondary/game_corner/palettes/0.pal create mode 100644 data/tilesets/secondary/game_corner/palettes/1.pal create mode 100644 data/tilesets/secondary/game_corner/palettes/10.pal create mode 100644 data/tilesets/secondary/game_corner/palettes/11.pal create mode 100644 data/tilesets/secondary/game_corner/palettes/12.pal create mode 100644 data/tilesets/secondary/game_corner/palettes/13.pal create mode 100644 data/tilesets/secondary/game_corner/palettes/14.pal create mode 100644 data/tilesets/secondary/game_corner/palettes/15.pal create mode 100644 data/tilesets/secondary/game_corner/palettes/2.pal create mode 100644 data/tilesets/secondary/game_corner/palettes/3.pal create mode 100644 data/tilesets/secondary/game_corner/palettes/4.pal create mode 100644 data/tilesets/secondary/game_corner/palettes/5.pal create mode 100644 data/tilesets/secondary/game_corner/palettes/6.pal create mode 100644 data/tilesets/secondary/game_corner/palettes/7.pal create mode 100644 data/tilesets/secondary/game_corner/palettes/8.pal create mode 100644 data/tilesets/secondary/game_corner/palettes/9.pal create mode 100644 data/tilesets/secondary/game_corner/tiles.png create mode 100644 data/tilesets/secondary/hall_of_fame/metatile_attributes.bin create mode 100644 data/tilesets/secondary/hall_of_fame/metatiles.bin create mode 100644 data/tilesets/secondary/hall_of_fame/palettes/0.pal create mode 100644 data/tilesets/secondary/hall_of_fame/palettes/1.pal create mode 100644 data/tilesets/secondary/hall_of_fame/palettes/10.pal create mode 100644 data/tilesets/secondary/hall_of_fame/palettes/11.pal create mode 100644 data/tilesets/secondary/hall_of_fame/palettes/12.pal create mode 100644 data/tilesets/secondary/hall_of_fame/palettes/13.pal create mode 100644 data/tilesets/secondary/hall_of_fame/palettes/14.pal create mode 100644 data/tilesets/secondary/hall_of_fame/palettes/15.pal create mode 100644 data/tilesets/secondary/hall_of_fame/palettes/2.pal create mode 100644 data/tilesets/secondary/hall_of_fame/palettes/3.pal create mode 100644 data/tilesets/secondary/hall_of_fame/palettes/4.pal create mode 100644 data/tilesets/secondary/hall_of_fame/palettes/5.pal create mode 100644 data/tilesets/secondary/hall_of_fame/palettes/6.pal create mode 100644 data/tilesets/secondary/hall_of_fame/palettes/7.pal create mode 100644 data/tilesets/secondary/hall_of_fame/palettes/8.pal create mode 100644 data/tilesets/secondary/hall_of_fame/palettes/9.pal create mode 100644 data/tilesets/secondary/hall_of_fame/tiles.png create mode 100644 data/tilesets/secondary/hoenn_building/metatile_attributes.bin create mode 100644 data/tilesets/secondary/hoenn_building/metatiles.bin create mode 100644 data/tilesets/secondary/hoenn_building/palettes/0.pal create mode 100644 data/tilesets/secondary/hoenn_building/palettes/1.pal create mode 100644 data/tilesets/secondary/hoenn_building/palettes/10.pal create mode 100644 data/tilesets/secondary/hoenn_building/palettes/11.pal create mode 100644 data/tilesets/secondary/hoenn_building/palettes/12.pal create mode 100644 data/tilesets/secondary/hoenn_building/palettes/13.pal create mode 100644 data/tilesets/secondary/hoenn_building/palettes/14.pal create mode 100644 data/tilesets/secondary/hoenn_building/palettes/15.pal create mode 100644 data/tilesets/secondary/hoenn_building/palettes/2.pal create mode 100644 data/tilesets/secondary/hoenn_building/palettes/3.pal create mode 100644 data/tilesets/secondary/hoenn_building/palettes/4.pal create mode 100644 data/tilesets/secondary/hoenn_building/palettes/5.pal create mode 100644 data/tilesets/secondary/hoenn_building/palettes/6.pal create mode 100644 data/tilesets/secondary/hoenn_building/palettes/7.pal create mode 100644 data/tilesets/secondary/hoenn_building/palettes/8.pal create mode 100644 data/tilesets/secondary/hoenn_building/palettes/9.pal create mode 100644 data/tilesets/secondary/hoenn_building/tiles.png create mode 100644 data/tilesets/secondary/indigo_plateau/metatile_attributes.bin create mode 100644 data/tilesets/secondary/indigo_plateau/metatiles.bin create mode 100644 data/tilesets/secondary/indigo_plateau/palettes/0.pal create mode 100644 data/tilesets/secondary/indigo_plateau/palettes/1.pal create mode 100644 data/tilesets/secondary/indigo_plateau/palettes/10.pal create mode 100644 data/tilesets/secondary/indigo_plateau/palettes/11.pal create mode 100644 data/tilesets/secondary/indigo_plateau/palettes/12.pal create mode 100644 data/tilesets/secondary/indigo_plateau/palettes/13.pal create mode 100644 data/tilesets/secondary/indigo_plateau/palettes/14.pal create mode 100644 data/tilesets/secondary/indigo_plateau/palettes/15.pal create mode 100644 data/tilesets/secondary/indigo_plateau/palettes/2.pal create mode 100644 data/tilesets/secondary/indigo_plateau/palettes/3.pal create mode 100644 data/tilesets/secondary/indigo_plateau/palettes/4.pal create mode 100644 data/tilesets/secondary/indigo_plateau/palettes/5.pal create mode 100644 data/tilesets/secondary/indigo_plateau/palettes/6.pal create mode 100644 data/tilesets/secondary/indigo_plateau/palettes/7.pal create mode 100644 data/tilesets/secondary/indigo_plateau/palettes/8.pal create mode 100644 data/tilesets/secondary/indigo_plateau/palettes/9.pal create mode 100644 data/tilesets/secondary/indigo_plateau/tiles.png create mode 100644 data/tilesets/secondary/island_harbor/metatile_attributes.bin create mode 100644 data/tilesets/secondary/island_harbor/metatiles.bin create mode 100644 data/tilesets/secondary/island_harbor/palettes/0.pal create mode 100644 data/tilesets/secondary/island_harbor/palettes/1.pal create mode 100644 data/tilesets/secondary/island_harbor/palettes/10.pal create mode 100644 data/tilesets/secondary/island_harbor/palettes/11.pal create mode 100644 data/tilesets/secondary/island_harbor/palettes/12.pal create mode 100644 data/tilesets/secondary/island_harbor/palettes/13.pal create mode 100644 data/tilesets/secondary/island_harbor/palettes/14.pal create mode 100644 data/tilesets/secondary/island_harbor/palettes/15.pal create mode 100644 data/tilesets/secondary/island_harbor/palettes/2.pal create mode 100644 data/tilesets/secondary/island_harbor/palettes/3.pal create mode 100644 data/tilesets/secondary/island_harbor/palettes/4.pal create mode 100644 data/tilesets/secondary/island_harbor/palettes/5.pal create mode 100644 data/tilesets/secondary/island_harbor/palettes/6.pal create mode 100644 data/tilesets/secondary/island_harbor/palettes/7.pal create mode 100644 data/tilesets/secondary/island_harbor/palettes/8.pal create mode 100644 data/tilesets/secondary/island_harbor/palettes/9.pal create mode 100644 data/tilesets/secondary/island_harbor/tiles.png create mode 100644 data/tilesets/secondary/lab/metatile_attributes.bin create mode 100644 data/tilesets/secondary/lab/metatiles.bin create mode 100644 data/tilesets/secondary/lab/palettes/0.pal create mode 100644 data/tilesets/secondary/lab/palettes/1.pal create mode 100644 data/tilesets/secondary/lab/palettes/10.pal create mode 100644 data/tilesets/secondary/lab/palettes/11.pal create mode 100644 data/tilesets/secondary/lab/palettes/12.pal create mode 100644 data/tilesets/secondary/lab/palettes/13.pal create mode 100644 data/tilesets/secondary/lab/palettes/14.pal create mode 100644 data/tilesets/secondary/lab/palettes/15.pal create mode 100644 data/tilesets/secondary/lab/palettes/2.pal create mode 100644 data/tilesets/secondary/lab/palettes/3.pal create mode 100644 data/tilesets/secondary/lab/palettes/4.pal create mode 100644 data/tilesets/secondary/lab/palettes/5.pal create mode 100644 data/tilesets/secondary/lab/palettes/6.pal create mode 100644 data/tilesets/secondary/lab/palettes/7.pal create mode 100644 data/tilesets/secondary/lab/palettes/8.pal create mode 100644 data/tilesets/secondary/lab/palettes/9.pal create mode 100644 data/tilesets/secondary/lab/tiles.png create mode 100644 data/tilesets/secondary/lavender_town/metatile_attributes.bin create mode 100644 data/tilesets/secondary/lavender_town/metatiles.bin create mode 100644 data/tilesets/secondary/lavender_town/palettes/0.pal create mode 100644 data/tilesets/secondary/lavender_town/palettes/1.pal create mode 100644 data/tilesets/secondary/lavender_town/palettes/10.pal create mode 100644 data/tilesets/secondary/lavender_town/palettes/11.pal create mode 100644 data/tilesets/secondary/lavender_town/palettes/12.pal create mode 100644 data/tilesets/secondary/lavender_town/palettes/13.pal create mode 100644 data/tilesets/secondary/lavender_town/palettes/14.pal create mode 100644 data/tilesets/secondary/lavender_town/palettes/15.pal create mode 100644 data/tilesets/secondary/lavender_town/palettes/2.pal create mode 100644 data/tilesets/secondary/lavender_town/palettes/3.pal create mode 100644 data/tilesets/secondary/lavender_town/palettes/4.pal create mode 100644 data/tilesets/secondary/lavender_town/palettes/5.pal create mode 100644 data/tilesets/secondary/lavender_town/palettes/6.pal create mode 100644 data/tilesets/secondary/lavender_town/palettes/7.pal create mode 100644 data/tilesets/secondary/lavender_town/palettes/8.pal create mode 100644 data/tilesets/secondary/lavender_town/palettes/9.pal create mode 100644 data/tilesets/secondary/lavender_town/tiles.png create mode 100644 data/tilesets/secondary/mart/metatile_attributes.bin create mode 100644 data/tilesets/secondary/mart/metatiles.bin create mode 100644 data/tilesets/secondary/mart/palettes/0.pal create mode 100644 data/tilesets/secondary/mart/palettes/1.pal create mode 100644 data/tilesets/secondary/mart/palettes/10.pal create mode 100644 data/tilesets/secondary/mart/palettes/11.pal create mode 100644 data/tilesets/secondary/mart/palettes/12.pal create mode 100644 data/tilesets/secondary/mart/palettes/13.pal create mode 100644 data/tilesets/secondary/mart/palettes/14.pal create mode 100644 data/tilesets/secondary/mart/palettes/15.pal create mode 100644 data/tilesets/secondary/mart/palettes/2.pal create mode 100644 data/tilesets/secondary/mart/palettes/3.pal create mode 100644 data/tilesets/secondary/mart/palettes/4.pal create mode 100644 data/tilesets/secondary/mart/palettes/5.pal create mode 100644 data/tilesets/secondary/mart/palettes/6.pal create mode 100644 data/tilesets/secondary/mart/palettes/7.pal create mode 100644 data/tilesets/secondary/mart/palettes/8.pal create mode 100644 data/tilesets/secondary/mart/palettes/9.pal create mode 100644 data/tilesets/secondary/mart/tiles.png create mode 100644 data/tilesets/secondary/mt_ember/metatile_attributes.bin create mode 100644 data/tilesets/secondary/mt_ember/metatiles.bin create mode 100644 data/tilesets/secondary/mt_ember/palettes/0.pal create mode 100644 data/tilesets/secondary/mt_ember/palettes/1.pal create mode 100644 data/tilesets/secondary/mt_ember/palettes/10.pal create mode 100644 data/tilesets/secondary/mt_ember/palettes/11.pal create mode 100644 data/tilesets/secondary/mt_ember/palettes/12.pal create mode 100644 data/tilesets/secondary/mt_ember/palettes/13.pal create mode 100644 data/tilesets/secondary/mt_ember/palettes/14.pal create mode 100644 data/tilesets/secondary/mt_ember/palettes/15.pal create mode 100644 data/tilesets/secondary/mt_ember/palettes/2.pal create mode 100644 data/tilesets/secondary/mt_ember/palettes/3.pal create mode 100644 data/tilesets/secondary/mt_ember/palettes/4.pal create mode 100644 data/tilesets/secondary/mt_ember/palettes/5.pal create mode 100644 data/tilesets/secondary/mt_ember/palettes/6.pal create mode 100644 data/tilesets/secondary/mt_ember/palettes/7.pal create mode 100644 data/tilesets/secondary/mt_ember/palettes/8.pal create mode 100644 data/tilesets/secondary/mt_ember/palettes/9.pal create mode 100644 data/tilesets/secondary/mt_ember/tiles.png create mode 100644 data/tilesets/secondary/museum/metatile_attributes.bin create mode 100644 data/tilesets/secondary/museum/metatiles.bin create mode 100644 data/tilesets/secondary/museum/palettes/0.pal create mode 100644 data/tilesets/secondary/museum/palettes/1.pal create mode 100644 data/tilesets/secondary/museum/palettes/10.pal create mode 100644 data/tilesets/secondary/museum/palettes/11.pal create mode 100644 data/tilesets/secondary/museum/palettes/12.pal create mode 100644 data/tilesets/secondary/museum/palettes/13.pal create mode 100644 data/tilesets/secondary/museum/palettes/14.pal create mode 100644 data/tilesets/secondary/museum/palettes/15.pal create mode 100644 data/tilesets/secondary/museum/palettes/2.pal create mode 100644 data/tilesets/secondary/museum/palettes/3.pal create mode 100644 data/tilesets/secondary/museum/palettes/4.pal create mode 100644 data/tilesets/secondary/museum/palettes/5.pal create mode 100644 data/tilesets/secondary/museum/palettes/6.pal create mode 100644 data/tilesets/secondary/museum/palettes/7.pal create mode 100644 data/tilesets/secondary/museum/palettes/8.pal create mode 100644 data/tilesets/secondary/museum/palettes/9.pal create mode 100644 data/tilesets/secondary/museum/tiles.png create mode 100644 data/tilesets/secondary/navel_rock/metatile_attributes.bin create mode 100644 data/tilesets/secondary/navel_rock/metatiles.bin create mode 100644 data/tilesets/secondary/navel_rock/palettes/0.pal create mode 100644 data/tilesets/secondary/navel_rock/palettes/1.pal create mode 100644 data/tilesets/secondary/navel_rock/palettes/10.pal create mode 100644 data/tilesets/secondary/navel_rock/palettes/11.pal create mode 100644 data/tilesets/secondary/navel_rock/palettes/12.pal create mode 100644 data/tilesets/secondary/navel_rock/palettes/13.pal create mode 100644 data/tilesets/secondary/navel_rock/palettes/14.pal create mode 100644 data/tilesets/secondary/navel_rock/palettes/15.pal create mode 100644 data/tilesets/secondary/navel_rock/palettes/2.pal create mode 100644 data/tilesets/secondary/navel_rock/palettes/3.pal create mode 100644 data/tilesets/secondary/navel_rock/palettes/4.pal create mode 100644 data/tilesets/secondary/navel_rock/palettes/5.pal create mode 100644 data/tilesets/secondary/navel_rock/palettes/6.pal create mode 100644 data/tilesets/secondary/navel_rock/palettes/7.pal create mode 100644 data/tilesets/secondary/navel_rock/palettes/8.pal create mode 100644 data/tilesets/secondary/navel_rock/palettes/9.pal create mode 100644 data/tilesets/secondary/navel_rock/tiles.png create mode 100644 data/tilesets/secondary/pallet_town/metatile_attributes.bin create mode 100644 data/tilesets/secondary/pallet_town/metatiles.bin create mode 100644 data/tilesets/secondary/pallet_town/palettes/0.pal create mode 100644 data/tilesets/secondary/pallet_town/palettes/1.pal create mode 100644 data/tilesets/secondary/pallet_town/palettes/10.pal create mode 100644 data/tilesets/secondary/pallet_town/palettes/11.pal create mode 100644 data/tilesets/secondary/pallet_town/palettes/12.pal create mode 100644 data/tilesets/secondary/pallet_town/palettes/13.pal create mode 100644 data/tilesets/secondary/pallet_town/palettes/14.pal create mode 100644 data/tilesets/secondary/pallet_town/palettes/15.pal create mode 100644 data/tilesets/secondary/pallet_town/palettes/2.pal create mode 100644 data/tilesets/secondary/pallet_town/palettes/3.pal create mode 100644 data/tilesets/secondary/pallet_town/palettes/4.pal create mode 100644 data/tilesets/secondary/pallet_town/palettes/5.pal create mode 100644 data/tilesets/secondary/pallet_town/palettes/6.pal create mode 100644 data/tilesets/secondary/pallet_town/palettes/7.pal create mode 100644 data/tilesets/secondary/pallet_town/palettes/8.pal create mode 100644 data/tilesets/secondary/pallet_town/palettes/9.pal create mode 100644 data/tilesets/secondary/pallet_town/tiles.png create mode 100644 data/tilesets/secondary/pewter_city/metatile_attributes.bin create mode 100644 data/tilesets/secondary/pewter_city/metatiles.bin create mode 100644 data/tilesets/secondary/pewter_city/palettes/0.pal create mode 100644 data/tilesets/secondary/pewter_city/palettes/1.pal create mode 100644 data/tilesets/secondary/pewter_city/palettes/10.pal create mode 100644 data/tilesets/secondary/pewter_city/palettes/11.pal create mode 100644 data/tilesets/secondary/pewter_city/palettes/12.pal create mode 100644 data/tilesets/secondary/pewter_city/palettes/13.pal create mode 100644 data/tilesets/secondary/pewter_city/palettes/14.pal create mode 100644 data/tilesets/secondary/pewter_city/palettes/15.pal create mode 100644 data/tilesets/secondary/pewter_city/palettes/2.pal create mode 100644 data/tilesets/secondary/pewter_city/palettes/3.pal create mode 100644 data/tilesets/secondary/pewter_city/palettes/4.pal create mode 100644 data/tilesets/secondary/pewter_city/palettes/5.pal create mode 100644 data/tilesets/secondary/pewter_city/palettes/6.pal create mode 100644 data/tilesets/secondary/pewter_city/palettes/7.pal create mode 100644 data/tilesets/secondary/pewter_city/palettes/8.pal create mode 100644 data/tilesets/secondary/pewter_city/palettes/9.pal create mode 100644 data/tilesets/secondary/pewter_city/tiles.png create mode 100644 data/tilesets/secondary/pewter_gym/metatile_attributes.bin create mode 100644 data/tilesets/secondary/pewter_gym/metatiles.bin create mode 100644 data/tilesets/secondary/pewter_gym/palettes/0.pal create mode 100644 data/tilesets/secondary/pewter_gym/palettes/1.pal create mode 100644 data/tilesets/secondary/pewter_gym/palettes/10.pal create mode 100644 data/tilesets/secondary/pewter_gym/palettes/11.pal create mode 100644 data/tilesets/secondary/pewter_gym/palettes/12.pal create mode 100644 data/tilesets/secondary/pewter_gym/palettes/13.pal create mode 100644 data/tilesets/secondary/pewter_gym/palettes/14.pal create mode 100644 data/tilesets/secondary/pewter_gym/palettes/15.pal create mode 100644 data/tilesets/secondary/pewter_gym/palettes/2.pal create mode 100644 data/tilesets/secondary/pewter_gym/palettes/3.pal create mode 100644 data/tilesets/secondary/pewter_gym/palettes/4.pal create mode 100644 data/tilesets/secondary/pewter_gym/palettes/5.pal create mode 100644 data/tilesets/secondary/pewter_gym/palettes/6.pal create mode 100644 data/tilesets/secondary/pewter_gym/palettes/7.pal create mode 100644 data/tilesets/secondary/pewter_gym/palettes/8.pal create mode 100644 data/tilesets/secondary/pewter_gym/palettes/9.pal create mode 100644 data/tilesets/secondary/pewter_gym/tiles.png create mode 100644 data/tilesets/secondary/pokemon_center/metatile_attributes.bin create mode 100644 data/tilesets/secondary/pokemon_center/metatiles.bin create mode 100644 data/tilesets/secondary/pokemon_center/palettes/0.pal create mode 100644 data/tilesets/secondary/pokemon_center/palettes/1.pal create mode 100644 data/tilesets/secondary/pokemon_center/palettes/10.pal create mode 100644 data/tilesets/secondary/pokemon_center/palettes/11.pal create mode 100644 data/tilesets/secondary/pokemon_center/palettes/12.pal create mode 100644 data/tilesets/secondary/pokemon_center/palettes/13.pal create mode 100644 data/tilesets/secondary/pokemon_center/palettes/14.pal create mode 100644 data/tilesets/secondary/pokemon_center/palettes/15.pal create mode 100644 data/tilesets/secondary/pokemon_center/palettes/2.pal create mode 100644 data/tilesets/secondary/pokemon_center/palettes/3.pal create mode 100644 data/tilesets/secondary/pokemon_center/palettes/4.pal create mode 100644 data/tilesets/secondary/pokemon_center/palettes/5.pal create mode 100644 data/tilesets/secondary/pokemon_center/palettes/6.pal create mode 100644 data/tilesets/secondary/pokemon_center/palettes/7.pal create mode 100644 data/tilesets/secondary/pokemon_center/palettes/8.pal create mode 100644 data/tilesets/secondary/pokemon_center/palettes/9.pal create mode 100644 data/tilesets/secondary/pokemon_center/tiles.png create mode 100644 data/tilesets/secondary/pokemon_league/metatile_attributes.bin create mode 100644 data/tilesets/secondary/pokemon_league/metatiles.bin create mode 100644 data/tilesets/secondary/pokemon_league/palettes/0.pal create mode 100644 data/tilesets/secondary/pokemon_league/palettes/1.pal create mode 100644 data/tilesets/secondary/pokemon_league/palettes/10.pal create mode 100644 data/tilesets/secondary/pokemon_league/palettes/11.pal create mode 100644 data/tilesets/secondary/pokemon_league/palettes/12.pal create mode 100644 data/tilesets/secondary/pokemon_league/palettes/13.pal create mode 100644 data/tilesets/secondary/pokemon_league/palettes/14.pal create mode 100644 data/tilesets/secondary/pokemon_league/palettes/15.pal create mode 100644 data/tilesets/secondary/pokemon_league/palettes/2.pal create mode 100644 data/tilesets/secondary/pokemon_league/palettes/3.pal create mode 100644 data/tilesets/secondary/pokemon_league/palettes/4.pal create mode 100644 data/tilesets/secondary/pokemon_league/palettes/5.pal create mode 100644 data/tilesets/secondary/pokemon_league/palettes/6.pal create mode 100644 data/tilesets/secondary/pokemon_league/palettes/7.pal create mode 100644 data/tilesets/secondary/pokemon_league/palettes/8.pal create mode 100644 data/tilesets/secondary/pokemon_league/palettes/9.pal create mode 100644 data/tilesets/secondary/pokemon_league/tiles.png create mode 100644 data/tilesets/secondary/pokemon_mansion/metatile_attributes.bin create mode 100644 data/tilesets/secondary/pokemon_mansion/metatiles.bin create mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/0.pal create mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/1.pal create mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/10.pal create mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/11.pal create mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/12.pal create mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/13.pal create mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/14.pal create mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/15.pal create mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/2.pal create mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/3.pal create mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/4.pal create mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/5.pal create mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/6.pal create mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/7.pal create mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/8.pal create mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/9.pal create mode 100644 data/tilesets/secondary/pokemon_mansion/tiles.png create mode 100644 data/tilesets/secondary/pokemon_tower/metatile_attributes.bin create mode 100644 data/tilesets/secondary/pokemon_tower/metatiles.bin create mode 100644 data/tilesets/secondary/pokemon_tower/palettes/0.pal create mode 100644 data/tilesets/secondary/pokemon_tower/palettes/1.pal create mode 100644 data/tilesets/secondary/pokemon_tower/palettes/10.pal create mode 100644 data/tilesets/secondary/pokemon_tower/palettes/11.pal create mode 100644 data/tilesets/secondary/pokemon_tower/palettes/12.pal create mode 100644 data/tilesets/secondary/pokemon_tower/palettes/13.pal create mode 100644 data/tilesets/secondary/pokemon_tower/palettes/14.pal create mode 100644 data/tilesets/secondary/pokemon_tower/palettes/15.pal create mode 100644 data/tilesets/secondary/pokemon_tower/palettes/2.pal create mode 100644 data/tilesets/secondary/pokemon_tower/palettes/3.pal create mode 100644 data/tilesets/secondary/pokemon_tower/palettes/4.pal create mode 100644 data/tilesets/secondary/pokemon_tower/palettes/5.pal create mode 100644 data/tilesets/secondary/pokemon_tower/palettes/6.pal create mode 100644 data/tilesets/secondary/pokemon_tower/palettes/7.pal create mode 100644 data/tilesets/secondary/pokemon_tower/palettes/8.pal create mode 100644 data/tilesets/secondary/pokemon_tower/palettes/9.pal create mode 100644 data/tilesets/secondary/pokemon_tower/tiles.png create mode 100644 data/tilesets/secondary/power_plant/metatile_attributes.bin create mode 100644 data/tilesets/secondary/power_plant/metatiles.bin create mode 100644 data/tilesets/secondary/power_plant/palettes/0.pal create mode 100644 data/tilesets/secondary/power_plant/palettes/1.pal create mode 100644 data/tilesets/secondary/power_plant/palettes/10.pal create mode 100644 data/tilesets/secondary/power_plant/palettes/11.pal create mode 100644 data/tilesets/secondary/power_plant/palettes/12.pal create mode 100644 data/tilesets/secondary/power_plant/palettes/13.pal create mode 100644 data/tilesets/secondary/power_plant/palettes/14.pal create mode 100644 data/tilesets/secondary/power_plant/palettes/15.pal create mode 100644 data/tilesets/secondary/power_plant/palettes/2.pal create mode 100644 data/tilesets/secondary/power_plant/palettes/3.pal create mode 100644 data/tilesets/secondary/power_plant/palettes/4.pal create mode 100644 data/tilesets/secondary/power_plant/palettes/5.pal create mode 100644 data/tilesets/secondary/power_plant/palettes/6.pal create mode 100644 data/tilesets/secondary/power_plant/palettes/7.pal create mode 100644 data/tilesets/secondary/power_plant/palettes/8.pal create mode 100644 data/tilesets/secondary/power_plant/palettes/9.pal create mode 100644 data/tilesets/secondary/power_plant/tiles.png create mode 100644 data/tilesets/secondary/restaurant_hotel/metatile_attributes.bin create mode 100644 data/tilesets/secondary/restaurant_hotel/metatiles.bin create mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/0.pal create mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/1.pal create mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/10.pal create mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/11.pal create mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/12.pal create mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/13.pal create mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/14.pal create mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/15.pal create mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/2.pal create mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/3.pal create mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/4.pal create mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/5.pal create mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/6.pal create mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/7.pal create mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/8.pal create mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/9.pal create mode 100644 data/tilesets/secondary/restaurant_hotel/tiles.png create mode 100644 data/tilesets/secondary/rock_tunnel/metatile_attributes.bin create mode 100644 data/tilesets/secondary/rock_tunnel/metatiles.bin create mode 100644 data/tilesets/secondary/rock_tunnel/palettes/0.pal create mode 100644 data/tilesets/secondary/rock_tunnel/palettes/1.pal create mode 100644 data/tilesets/secondary/rock_tunnel/palettes/10.pal create mode 100644 data/tilesets/secondary/rock_tunnel/palettes/11.pal create mode 100644 data/tilesets/secondary/rock_tunnel/palettes/12.pal create mode 100644 data/tilesets/secondary/rock_tunnel/palettes/13.pal create mode 100644 data/tilesets/secondary/rock_tunnel/palettes/14.pal create mode 100644 data/tilesets/secondary/rock_tunnel/palettes/15.pal create mode 100644 data/tilesets/secondary/rock_tunnel/palettes/2.pal create mode 100644 data/tilesets/secondary/rock_tunnel/palettes/3.pal create mode 100644 data/tilesets/secondary/rock_tunnel/palettes/4.pal create mode 100644 data/tilesets/secondary/rock_tunnel/palettes/5.pal create mode 100644 data/tilesets/secondary/rock_tunnel/palettes/6.pal create mode 100644 data/tilesets/secondary/rock_tunnel/palettes/7.pal create mode 100644 data/tilesets/secondary/rock_tunnel/palettes/8.pal create mode 100644 data/tilesets/secondary/rock_tunnel/palettes/9.pal create mode 100644 data/tilesets/secondary/rock_tunnel/tiles.png create mode 100644 data/tilesets/secondary/safari_zone_building/metatile_attributes.bin create mode 100644 data/tilesets/secondary/safari_zone_building/metatiles.bin create mode 100644 data/tilesets/secondary/safari_zone_building/palettes/0.pal create mode 100644 data/tilesets/secondary/safari_zone_building/palettes/1.pal create mode 100644 data/tilesets/secondary/safari_zone_building/palettes/10.pal create mode 100644 data/tilesets/secondary/safari_zone_building/palettes/11.pal create mode 100644 data/tilesets/secondary/safari_zone_building/palettes/12.pal create mode 100644 data/tilesets/secondary/safari_zone_building/palettes/13.pal create mode 100644 data/tilesets/secondary/safari_zone_building/palettes/14.pal create mode 100644 data/tilesets/secondary/safari_zone_building/palettes/15.pal create mode 100644 data/tilesets/secondary/safari_zone_building/palettes/2.pal create mode 100644 data/tilesets/secondary/safari_zone_building/palettes/3.pal create mode 100644 data/tilesets/secondary/safari_zone_building/palettes/4.pal create mode 100644 data/tilesets/secondary/safari_zone_building/palettes/5.pal create mode 100644 data/tilesets/secondary/safari_zone_building/palettes/6.pal create mode 100644 data/tilesets/secondary/safari_zone_building/palettes/7.pal create mode 100644 data/tilesets/secondary/safari_zone_building/palettes/8.pal create mode 100644 data/tilesets/secondary/safari_zone_building/palettes/9.pal create mode 100644 data/tilesets/secondary/safari_zone_building/tiles.png create mode 100644 data/tilesets/secondary/saffron_city/metatile_attributes.bin create mode 100644 data/tilesets/secondary/saffron_city/metatiles.bin create mode 100644 data/tilesets/secondary/saffron_city/palettes/0.pal create mode 100644 data/tilesets/secondary/saffron_city/palettes/1.pal create mode 100644 data/tilesets/secondary/saffron_city/palettes/10.pal create mode 100644 data/tilesets/secondary/saffron_city/palettes/11.pal create mode 100644 data/tilesets/secondary/saffron_city/palettes/12.pal create mode 100644 data/tilesets/secondary/saffron_city/palettes/13.pal create mode 100644 data/tilesets/secondary/saffron_city/palettes/14.pal create mode 100644 data/tilesets/secondary/saffron_city/palettes/15.pal create mode 100644 data/tilesets/secondary/saffron_city/palettes/2.pal create mode 100644 data/tilesets/secondary/saffron_city/palettes/3.pal create mode 100644 data/tilesets/secondary/saffron_city/palettes/4.pal create mode 100644 data/tilesets/secondary/saffron_city/palettes/5.pal create mode 100644 data/tilesets/secondary/saffron_city/palettes/6.pal create mode 100644 data/tilesets/secondary/saffron_city/palettes/7.pal create mode 100644 data/tilesets/secondary/saffron_city/palettes/8.pal create mode 100644 data/tilesets/secondary/saffron_city/palettes/9.pal create mode 100644 data/tilesets/secondary/saffron_city/tiles.png create mode 100644 data/tilesets/secondary/saffron_gym/metatile_attributes.bin create mode 100644 data/tilesets/secondary/saffron_gym/metatiles.bin create mode 100644 data/tilesets/secondary/saffron_gym/palettes/0.pal create mode 100644 data/tilesets/secondary/saffron_gym/palettes/1.pal create mode 100644 data/tilesets/secondary/saffron_gym/palettes/10.pal create mode 100644 data/tilesets/secondary/saffron_gym/palettes/11.pal create mode 100644 data/tilesets/secondary/saffron_gym/palettes/12.pal create mode 100644 data/tilesets/secondary/saffron_gym/palettes/13.pal create mode 100644 data/tilesets/secondary/saffron_gym/palettes/14.pal create mode 100644 data/tilesets/secondary/saffron_gym/palettes/15.pal create mode 100644 data/tilesets/secondary/saffron_gym/palettes/2.pal create mode 100644 data/tilesets/secondary/saffron_gym/palettes/3.pal create mode 100644 data/tilesets/secondary/saffron_gym/palettes/4.pal create mode 100644 data/tilesets/secondary/saffron_gym/palettes/5.pal create mode 100644 data/tilesets/secondary/saffron_gym/palettes/6.pal create mode 100644 data/tilesets/secondary/saffron_gym/palettes/7.pal create mode 100644 data/tilesets/secondary/saffron_gym/palettes/8.pal create mode 100644 data/tilesets/secondary/saffron_gym/palettes/9.pal create mode 100644 data/tilesets/secondary/saffron_gym/tiles.png create mode 100644 data/tilesets/secondary/school/metatile_attributes.bin create mode 100644 data/tilesets/secondary/school/metatiles.bin create mode 100644 data/tilesets/secondary/school/palettes/0.pal create mode 100644 data/tilesets/secondary/school/palettes/1.pal create mode 100644 data/tilesets/secondary/school/palettes/10.pal create mode 100644 data/tilesets/secondary/school/palettes/11.pal create mode 100644 data/tilesets/secondary/school/palettes/12.pal create mode 100644 data/tilesets/secondary/school/palettes/13.pal create mode 100644 data/tilesets/secondary/school/palettes/14.pal create mode 100644 data/tilesets/secondary/school/palettes/15.pal create mode 100644 data/tilesets/secondary/school/palettes/2.pal create mode 100644 data/tilesets/secondary/school/palettes/3.pal create mode 100644 data/tilesets/secondary/school/palettes/4.pal create mode 100644 data/tilesets/secondary/school/palettes/5.pal create mode 100644 data/tilesets/secondary/school/palettes/6.pal create mode 100644 data/tilesets/secondary/school/palettes/7.pal create mode 100644 data/tilesets/secondary/school/palettes/8.pal create mode 100644 data/tilesets/secondary/school/palettes/9.pal create mode 100644 data/tilesets/secondary/school/tiles.png create mode 100644 data/tilesets/secondary/sea_cottage/metatile_attributes.bin create mode 100644 data/tilesets/secondary/sea_cottage/metatiles.bin create mode 100644 data/tilesets/secondary/sea_cottage/palettes/0.pal create mode 100644 data/tilesets/secondary/sea_cottage/palettes/1.pal create mode 100644 data/tilesets/secondary/sea_cottage/palettes/10.pal create mode 100644 data/tilesets/secondary/sea_cottage/palettes/11.pal create mode 100644 data/tilesets/secondary/sea_cottage/palettes/12.pal create mode 100644 data/tilesets/secondary/sea_cottage/palettes/13.pal create mode 100644 data/tilesets/secondary/sea_cottage/palettes/14.pal create mode 100644 data/tilesets/secondary/sea_cottage/palettes/15.pal create mode 100644 data/tilesets/secondary/sea_cottage/palettes/2.pal create mode 100644 data/tilesets/secondary/sea_cottage/palettes/3.pal create mode 100644 data/tilesets/secondary/sea_cottage/palettes/4.pal create mode 100644 data/tilesets/secondary/sea_cottage/palettes/5.pal create mode 100644 data/tilesets/secondary/sea_cottage/palettes/6.pal create mode 100644 data/tilesets/secondary/sea_cottage/palettes/7.pal create mode 100644 data/tilesets/secondary/sea_cottage/palettes/8.pal create mode 100644 data/tilesets/secondary/sea_cottage/palettes/9.pal create mode 100644 data/tilesets/secondary/sea_cottage/tiles.png create mode 100644 data/tilesets/secondary/seafoam_islands/metatile_attributes.bin create mode 100644 data/tilesets/secondary/seafoam_islands/metatiles.bin create mode 100644 data/tilesets/secondary/seafoam_islands/palettes/0.pal create mode 100644 data/tilesets/secondary/seafoam_islands/palettes/1.pal create mode 100644 data/tilesets/secondary/seafoam_islands/palettes/10.pal create mode 100644 data/tilesets/secondary/seafoam_islands/palettes/11.pal create mode 100644 data/tilesets/secondary/seafoam_islands/palettes/12.pal create mode 100644 data/tilesets/secondary/seafoam_islands/palettes/13.pal create mode 100644 data/tilesets/secondary/seafoam_islands/palettes/14.pal create mode 100644 data/tilesets/secondary/seafoam_islands/palettes/15.pal create mode 100644 data/tilesets/secondary/seafoam_islands/palettes/2.pal create mode 100644 data/tilesets/secondary/seafoam_islands/palettes/3.pal create mode 100644 data/tilesets/secondary/seafoam_islands/palettes/4.pal create mode 100644 data/tilesets/secondary/seafoam_islands/palettes/5.pal create mode 100644 data/tilesets/secondary/seafoam_islands/palettes/6.pal create mode 100644 data/tilesets/secondary/seafoam_islands/palettes/7.pal create mode 100644 data/tilesets/secondary/seafoam_islands/palettes/8.pal create mode 100644 data/tilesets/secondary/seafoam_islands/palettes/9.pal create mode 100644 data/tilesets/secondary/seafoam_islands/tiles.png create mode 100644 data/tilesets/secondary/sevii_islands_123/metatile_attributes.bin create mode 100644 data/tilesets/secondary/sevii_islands_123/metatiles.bin create mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/0.pal create mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/1.pal create mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/10.pal create mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/11.pal create mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/12.pal create mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/13.pal create mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/14.pal create mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/15.pal create mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/2.pal create mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/3.pal create mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/4.pal create mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/5.pal create mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/6.pal create mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/7.pal create mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/8.pal create mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/9.pal create mode 100644 data/tilesets/secondary/sevii_islands_123/tiles.png create mode 100644 data/tilesets/secondary/sevii_islands_45/metatile_attributes.bin create mode 100644 data/tilesets/secondary/sevii_islands_45/metatiles.bin create mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/0.pal create mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/1.pal create mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/10.pal create mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/11.pal create mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/12.pal create mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/13.pal create mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/14.pal create mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/15.pal create mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/2.pal create mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/3.pal create mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/4.pal create mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/5.pal create mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/6.pal create mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/7.pal create mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/8.pal create mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/9.pal create mode 100644 data/tilesets/secondary/sevii_islands_45/tiles.png create mode 100644 data/tilesets/secondary/sevii_islands_67/metatile_attributes.bin create mode 100644 data/tilesets/secondary/sevii_islands_67/metatiles.bin create mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/0.pal create mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/1.pal create mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/10.pal create mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/11.pal create mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/12.pal create mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/13.pal create mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/14.pal create mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/15.pal create mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/2.pal create mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/3.pal create mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/4.pal create mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/5.pal create mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/6.pal create mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/7.pal create mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/8.pal create mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/9.pal create mode 100644 data/tilesets/secondary/sevii_islands_67/tiles.png create mode 100644 data/tilesets/secondary/silph_co/metatile_attributes.bin create mode 100644 data/tilesets/secondary/silph_co/metatiles.bin create mode 100644 data/tilesets/secondary/ss_anne/metatile_attributes.bin create mode 100644 data/tilesets/secondary/ss_anne/metatiles.bin create mode 100644 data/tilesets/secondary/ss_anne/palettes/0.pal create mode 100644 data/tilesets/secondary/ss_anne/palettes/1.pal create mode 100644 data/tilesets/secondary/ss_anne/palettes/10.pal create mode 100644 data/tilesets/secondary/ss_anne/palettes/11.pal create mode 100644 data/tilesets/secondary/ss_anne/palettes/12.pal create mode 100644 data/tilesets/secondary/ss_anne/palettes/13.pal create mode 100644 data/tilesets/secondary/ss_anne/palettes/14.pal create mode 100644 data/tilesets/secondary/ss_anne/palettes/15.pal create mode 100644 data/tilesets/secondary/ss_anne/palettes/2.pal create mode 100644 data/tilesets/secondary/ss_anne/palettes/3.pal create mode 100644 data/tilesets/secondary/ss_anne/palettes/4.pal create mode 100644 data/tilesets/secondary/ss_anne/palettes/5.pal create mode 100644 data/tilesets/secondary/ss_anne/palettes/6.pal create mode 100644 data/tilesets/secondary/ss_anne/palettes/7.pal create mode 100644 data/tilesets/secondary/ss_anne/palettes/8.pal create mode 100644 data/tilesets/secondary/ss_anne/palettes/9.pal create mode 100644 data/tilesets/secondary/ss_anne/tiles.png create mode 100644 data/tilesets/secondary/tanoby_ruins/metatile_attributes.bin create mode 100644 data/tilesets/secondary/tanoby_ruins/metatiles.bin create mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/0.pal create mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/1.pal create mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/10.pal create mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/11.pal create mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/12.pal create mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/13.pal create mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/14.pal create mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/15.pal create mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/2.pal create mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/3.pal create mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/4.pal create mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/5.pal create mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/6.pal create mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/7.pal create mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/8.pal create mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/9.pal create mode 100644 data/tilesets/secondary/tanoby_ruins/tiles.png create mode 100644 data/tilesets/secondary/trainer_tower/metatile_attributes.bin create mode 100644 data/tilesets/secondary/trainer_tower/metatiles.bin create mode 100644 data/tilesets/secondary/trainer_tower/palettes/0.pal create mode 100644 data/tilesets/secondary/trainer_tower/palettes/1.pal create mode 100644 data/tilesets/secondary/trainer_tower/palettes/10.pal create mode 100644 data/tilesets/secondary/trainer_tower/palettes/11.pal create mode 100644 data/tilesets/secondary/trainer_tower/palettes/12.pal create mode 100644 data/tilesets/secondary/trainer_tower/palettes/13.pal create mode 100644 data/tilesets/secondary/trainer_tower/palettes/14.pal create mode 100644 data/tilesets/secondary/trainer_tower/palettes/15.pal create mode 100644 data/tilesets/secondary/trainer_tower/palettes/2.pal create mode 100644 data/tilesets/secondary/trainer_tower/palettes/3.pal create mode 100644 data/tilesets/secondary/trainer_tower/palettes/4.pal create mode 100644 data/tilesets/secondary/trainer_tower/palettes/5.pal create mode 100644 data/tilesets/secondary/trainer_tower/palettes/6.pal create mode 100644 data/tilesets/secondary/trainer_tower/palettes/7.pal create mode 100644 data/tilesets/secondary/trainer_tower/palettes/8.pal create mode 100644 data/tilesets/secondary/trainer_tower/palettes/9.pal create mode 100644 data/tilesets/secondary/trainer_tower/tiles.png create mode 100644 data/tilesets/secondary/underground_path/metatile_attributes.bin create mode 100644 data/tilesets/secondary/underground_path/metatiles.bin create mode 100644 data/tilesets/secondary/underground_path/palettes/0.pal create mode 100644 data/tilesets/secondary/underground_path/palettes/1.pal create mode 100644 data/tilesets/secondary/underground_path/palettes/10.pal create mode 100644 data/tilesets/secondary/underground_path/palettes/11.pal create mode 100644 data/tilesets/secondary/underground_path/palettes/12.pal create mode 100644 data/tilesets/secondary/underground_path/palettes/13.pal create mode 100644 data/tilesets/secondary/underground_path/palettes/14.pal create mode 100644 data/tilesets/secondary/underground_path/palettes/15.pal create mode 100644 data/tilesets/secondary/underground_path/palettes/2.pal create mode 100644 data/tilesets/secondary/underground_path/palettes/3.pal create mode 100644 data/tilesets/secondary/underground_path/palettes/4.pal create mode 100644 data/tilesets/secondary/underground_path/palettes/5.pal create mode 100644 data/tilesets/secondary/underground_path/palettes/6.pal create mode 100644 data/tilesets/secondary/underground_path/palettes/7.pal create mode 100644 data/tilesets/secondary/underground_path/palettes/8.pal create mode 100644 data/tilesets/secondary/underground_path/palettes/9.pal create mode 100644 data/tilesets/secondary/underground_path/tiles.png create mode 100644 data/tilesets/secondary/unused_gatehouse1/metatile_attributes.bin create mode 100644 data/tilesets/secondary/unused_gatehouse1/metatiles.bin create mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/0.pal create mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/1.pal create mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/10.pal create mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/11.pal create mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/12.pal create mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/13.pal create mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/14.pal create mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/15.pal create mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/2.pal create mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/3.pal create mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/4.pal create mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/5.pal create mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/6.pal create mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/7.pal create mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/8.pal create mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/9.pal create mode 100644 data/tilesets/secondary/unused_gatehouse1/tiles.png create mode 100644 data/tilesets/secondary/unused_gatehouse2/metatile_attributes.bin create mode 100644 data/tilesets/secondary/unused_gatehouse2/metatiles.bin create mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/0.pal create mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/1.pal create mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/10.pal create mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/11.pal create mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/12.pal create mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/13.pal create mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/14.pal create mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/15.pal create mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/2.pal create mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/3.pal create mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/4.pal create mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/5.pal create mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/6.pal create mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/7.pal create mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/8.pal create mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/9.pal create mode 100644 data/tilesets/secondary/unused_gatehouse2/tiles.png create mode 100644 data/tilesets/secondary/vermilion_city/metatile_attributes.bin create mode 100644 data/tilesets/secondary/vermilion_city/metatiles.bin create mode 100644 data/tilesets/secondary/vermilion_city/palettes/0.pal create mode 100644 data/tilesets/secondary/vermilion_city/palettes/1.pal create mode 100644 data/tilesets/secondary/vermilion_city/palettes/10.pal create mode 100644 data/tilesets/secondary/vermilion_city/palettes/11.pal create mode 100644 data/tilesets/secondary/vermilion_city/palettes/12.pal create mode 100644 data/tilesets/secondary/vermilion_city/palettes/13.pal create mode 100644 data/tilesets/secondary/vermilion_city/palettes/14.pal create mode 100644 data/tilesets/secondary/vermilion_city/palettes/15.pal create mode 100644 data/tilesets/secondary/vermilion_city/palettes/2.pal create mode 100644 data/tilesets/secondary/vermilion_city/palettes/3.pal create mode 100644 data/tilesets/secondary/vermilion_city/palettes/4.pal create mode 100644 data/tilesets/secondary/vermilion_city/palettes/5.pal create mode 100644 data/tilesets/secondary/vermilion_city/palettes/6.pal create mode 100644 data/tilesets/secondary/vermilion_city/palettes/7.pal create mode 100644 data/tilesets/secondary/vermilion_city/palettes/8.pal create mode 100644 data/tilesets/secondary/vermilion_city/palettes/9.pal create mode 100644 data/tilesets/secondary/vermilion_city/tiles.png create mode 100644 data/tilesets/secondary/vermilion_gym/metatile_attributes.bin create mode 100644 data/tilesets/secondary/vermilion_gym/metatiles.bin create mode 100644 data/tilesets/secondary/vermilion_gym/palettes/0.pal create mode 100644 data/tilesets/secondary/vermilion_gym/palettes/1.pal create mode 100644 data/tilesets/secondary/vermilion_gym/palettes/10.pal create mode 100644 data/tilesets/secondary/vermilion_gym/palettes/11.pal create mode 100644 data/tilesets/secondary/vermilion_gym/palettes/12.pal create mode 100644 data/tilesets/secondary/vermilion_gym/palettes/13.pal create mode 100644 data/tilesets/secondary/vermilion_gym/palettes/14.pal create mode 100644 data/tilesets/secondary/vermilion_gym/palettes/15.pal create mode 100644 data/tilesets/secondary/vermilion_gym/palettes/2.pal create mode 100644 data/tilesets/secondary/vermilion_gym/palettes/3.pal create mode 100644 data/tilesets/secondary/vermilion_gym/palettes/4.pal create mode 100644 data/tilesets/secondary/vermilion_gym/palettes/5.pal create mode 100644 data/tilesets/secondary/vermilion_gym/palettes/6.pal create mode 100644 data/tilesets/secondary/vermilion_gym/palettes/7.pal create mode 100644 data/tilesets/secondary/vermilion_gym/palettes/8.pal create mode 100644 data/tilesets/secondary/vermilion_gym/palettes/9.pal create mode 100644 data/tilesets/secondary/vermilion_gym/tiles.png create mode 100644 data/tilesets/secondary/viridian_city/metatile_attributes.bin create mode 100644 data/tilesets/secondary/viridian_city/metatiles.bin create mode 100644 data/tilesets/secondary/viridian_city/palettes/0.pal create mode 100644 data/tilesets/secondary/viridian_city/palettes/1.pal create mode 100644 data/tilesets/secondary/viridian_city/palettes/10.pal create mode 100644 data/tilesets/secondary/viridian_city/palettes/11.pal create mode 100644 data/tilesets/secondary/viridian_city/palettes/12.pal create mode 100644 data/tilesets/secondary/viridian_city/palettes/13.pal create mode 100644 data/tilesets/secondary/viridian_city/palettes/14.pal create mode 100644 data/tilesets/secondary/viridian_city/palettes/15.pal create mode 100644 data/tilesets/secondary/viridian_city/palettes/2.pal create mode 100644 data/tilesets/secondary/viridian_city/palettes/3.pal create mode 100644 data/tilesets/secondary/viridian_city/palettes/4.pal create mode 100644 data/tilesets/secondary/viridian_city/palettes/5.pal create mode 100644 data/tilesets/secondary/viridian_city/palettes/6.pal create mode 100644 data/tilesets/secondary/viridian_city/palettes/7.pal create mode 100644 data/tilesets/secondary/viridian_city/palettes/8.pal create mode 100644 data/tilesets/secondary/viridian_city/palettes/9.pal create mode 100644 data/tilesets/secondary/viridian_city/tiles.png create mode 100644 data/tilesets/secondary/viridian_forest/metatile_attributes.bin create mode 100644 data/tilesets/secondary/viridian_forest/metatiles.bin create mode 100644 data/tilesets/secondary/viridian_forest/palettes/0.pal create mode 100644 data/tilesets/secondary/viridian_forest/palettes/1.pal create mode 100644 data/tilesets/secondary/viridian_forest/palettes/10.pal create mode 100644 data/tilesets/secondary/viridian_forest/palettes/11.pal create mode 100644 data/tilesets/secondary/viridian_forest/palettes/12.pal create mode 100644 data/tilesets/secondary/viridian_forest/palettes/13.pal create mode 100644 data/tilesets/secondary/viridian_forest/palettes/14.pal create mode 100644 data/tilesets/secondary/viridian_forest/palettes/15.pal create mode 100644 data/tilesets/secondary/viridian_forest/palettes/2.pal create mode 100644 data/tilesets/secondary/viridian_forest/palettes/3.pal create mode 100644 data/tilesets/secondary/viridian_forest/palettes/4.pal create mode 100644 data/tilesets/secondary/viridian_forest/palettes/5.pal create mode 100644 data/tilesets/secondary/viridian_forest/palettes/6.pal create mode 100644 data/tilesets/secondary/viridian_forest/palettes/7.pal create mode 100644 data/tilesets/secondary/viridian_forest/palettes/8.pal create mode 100644 data/tilesets/secondary/viridian_forest/palettes/9.pal create mode 100644 data/tilesets/secondary/viridian_forest/tiles.png create mode 100644 data/tilesets/secondary/viridian_gym/metatile_attributes.bin create mode 100644 data/tilesets/secondary/viridian_gym/metatiles.bin create mode 100644 data/tilesets/secondary/viridian_gym/palettes/0.pal create mode 100644 data/tilesets/secondary/viridian_gym/palettes/1.pal create mode 100644 data/tilesets/secondary/viridian_gym/palettes/10.pal create mode 100644 data/tilesets/secondary/viridian_gym/palettes/11.pal create mode 100644 data/tilesets/secondary/viridian_gym/palettes/12.pal create mode 100644 data/tilesets/secondary/viridian_gym/palettes/13.pal create mode 100644 data/tilesets/secondary/viridian_gym/palettes/14.pal create mode 100644 data/tilesets/secondary/viridian_gym/palettes/15.pal create mode 100644 data/tilesets/secondary/viridian_gym/palettes/2.pal create mode 100644 data/tilesets/secondary/viridian_gym/palettes/3.pal create mode 100644 data/tilesets/secondary/viridian_gym/palettes/4.pal create mode 100644 data/tilesets/secondary/viridian_gym/palettes/5.pal create mode 100644 data/tilesets/secondary/viridian_gym/palettes/6.pal create mode 100644 data/tilesets/secondary/viridian_gym/palettes/7.pal create mode 100644 data/tilesets/secondary/viridian_gym/palettes/8.pal create mode 100644 data/tilesets/secondary/viridian_gym/palettes/9.pal create mode 100644 data/tilesets/secondary/viridian_gym/tiles.png (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index e28093686..294685a35 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -317,10 +317,10 @@ gStdScriptsEnd:: .include "data/maps/TwoIsland_CapeBrink/scripts.inc" .include "data/maps/ThreeIsland_BondBridge/scripts.inc" .include "data/maps/ThreeIsland_Port/scripts.inc" - .include "data/maps/UnknownMap_03_50/scripts.inc" - .include "data/maps/UnknownMap_03_51/scripts.inc" - .include "data/maps/UnknownMap_03_52/scripts.inc" - .include "data/maps/UnknownMap_03_53/scripts.inc" + .include "data/maps/Prototype_SeviiIsle_6/scripts.inc" + .include "data/maps/Prototype_SeviiIsle_7/scripts.inc" + .include "data/maps/Prototype_SeviiIsle_8/scripts.inc" + .include "data/maps/Prototype_SeviiIsle_9/scripts.inc" .include "data/maps/FiveIsland_ResortGorgeous/scripts.inc" .include "data/maps/FiveIsland_WaterLabyrinth/scripts.inc" .include "data/maps/FiveIsland_Meadow/scripts.inc" diff --git a/data/graphics.s b/data/graphics.s index 247a5d230..d10266442 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -16387,26 +16387,26 @@ gUnionRoomChatIcons:: @ 8EA1A50 .incbin "graphics/interface/union_room_chat_icons.4bpp.lz" .align 2 -gTilesetPalettes_8EA1B68:: @ 8EA1B68 - .incbin "data/tilesets/primary/82D4A94/palettes/0.gbapal" - .incbin "data/tilesets/primary/82D4A94/palettes/1.gbapal" - .incbin "data/tilesets/primary/82D4A94/palettes/2.gbapal" - .incbin "data/tilesets/primary/82D4A94/palettes/3.gbapal" - .incbin "data/tilesets/primary/82D4A94/palettes/4.gbapal" - .incbin "data/tilesets/primary/82D4A94/palettes/5.gbapal" - .incbin "data/tilesets/primary/82D4A94/palettes/6.gbapal" - .incbin "data/tilesets/primary/82D4A94/palettes/7.gbapal" - .incbin "data/tilesets/primary/82D4A94/palettes/8.gbapal" - .incbin "data/tilesets/primary/82D4A94/palettes/9.gbapal" - .incbin "data/tilesets/primary/82D4A94/palettes/10.gbapal" - .incbin "data/tilesets/primary/82D4A94/palettes/11.gbapal" - .incbin "data/tilesets/primary/82D4A94/palettes/12.gbapal" - .incbin "data/tilesets/primary/82D4A94/palettes/13.gbapal" - .incbin "data/tilesets/primary/82D4A94/palettes/14.gbapal" - .incbin "data/tilesets/primary/82D4A94/palettes/15.gbapal" - -gTilesetTiles_8EA1D68:: @ 8EA1D68 - .incbin "data/tilesets/primary/82D4A94/tiles.4bpp.lz" +gTilesetPalettes_General:: @ 8EA1B68 + .incbin "data/tilesets/primary/general/palettes/0.gbapal" + .incbin "data/tilesets/primary/general/palettes/1.gbapal" + .incbin "data/tilesets/primary/general/palettes/2.gbapal" + .incbin "data/tilesets/primary/general/palettes/3.gbapal" + .incbin "data/tilesets/primary/general/palettes/4.gbapal" + .incbin "data/tilesets/primary/general/palettes/5.gbapal" + .incbin "data/tilesets/primary/general/palettes/6.gbapal" + .incbin "data/tilesets/primary/general/palettes/7.gbapal" + .incbin "data/tilesets/primary/general/palettes/8.gbapal" + .incbin "data/tilesets/primary/general/palettes/9.gbapal" + .incbin "data/tilesets/primary/general/palettes/10.gbapal" + .incbin "data/tilesets/primary/general/palettes/11.gbapal" + .incbin "data/tilesets/primary/general/palettes/12.gbapal" + .incbin "data/tilesets/primary/general/palettes/13.gbapal" + .incbin "data/tilesets/primary/general/palettes/14.gbapal" + .incbin "data/tilesets/primary/general/palettes/15.gbapal" + +gTilesetTiles_General:: @ 8EA1D68 + .incbin "data/tilesets/primary/general/tiles.4bpp.lz" gBerryFixGameboy_Pal:: @ 8EA463C .incbin "graphics/berry_fix/gba_small.gbapal" @@ -16463,50 +16463,50 @@ gBerryFixWindow_Tilemap:: @ 8EA9588 .incbin "graphics/berry_fix/window.bin.lz" .align 2 -gTilesetPalettes_8EA97F4:: @ 8EA97F4 - .incbin "data/tilesets/secondary/82D4C74/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4C74/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4C74/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4C74/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4C74/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4C74/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4C74/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4C74/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4C74/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4C74/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4C74/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4C74/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4C74/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4C74/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4C74/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4C74/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8EA99F4:: @ 8EA99F4 - .incbin "data/tilesets/secondary/82D4C74/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8EA9D88:: @ 8EA9D88 - .incbin "data/tilesets/secondary/82D4E6C/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4E6C/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4E6C/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4E6C/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4E6C/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4E6C/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4E6C/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4E6C/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4E6C/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4E6C/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4E6C/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4E6C/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4E6C/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4E6C/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4E6C/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4E6C/palettes/15.gbapal" - - -gTilesetTiles_8EA9F88:: @ 8EA9F88 - .incbin "data/tilesets/secondary/82D4E6C/tiles.4bpp.lz" +gTilesetPalettes_Building1:: @ 8EA97F4 + .incbin "data/tilesets/secondary/building1/palettes/0.gbapal" + .incbin "data/tilesets/secondary/building1/palettes/1.gbapal" + .incbin "data/tilesets/secondary/building1/palettes/2.gbapal" + .incbin "data/tilesets/secondary/building1/palettes/3.gbapal" + .incbin "data/tilesets/secondary/building1/palettes/4.gbapal" + .incbin "data/tilesets/secondary/building1/palettes/5.gbapal" + .incbin "data/tilesets/secondary/building1/palettes/6.gbapal" + .incbin "data/tilesets/secondary/building1/palettes/7.gbapal" + .incbin "data/tilesets/secondary/building1/palettes/8.gbapal" + .incbin "data/tilesets/secondary/building1/palettes/9.gbapal" + .incbin "data/tilesets/secondary/building1/palettes/10.gbapal" + .incbin "data/tilesets/secondary/building1/palettes/11.gbapal" + .incbin "data/tilesets/secondary/building1/palettes/12.gbapal" + .incbin "data/tilesets/secondary/building1/palettes/13.gbapal" + .incbin "data/tilesets/secondary/building1/palettes/14.gbapal" + .incbin "data/tilesets/secondary/building1/palettes/15.gbapal" + + .align 2 +gTilesetTiles_Building1:: @ 8EA99F4 + .incbin "data/tilesets/secondary/building1/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_DepartmentStore:: @ 8EA9D88 + .incbin "data/tilesets/secondary/department_store/palettes/0.gbapal" + .incbin "data/tilesets/secondary/department_store/palettes/1.gbapal" + .incbin "data/tilesets/secondary/department_store/palettes/2.gbapal" + .incbin "data/tilesets/secondary/department_store/palettes/3.gbapal" + .incbin "data/tilesets/secondary/department_store/palettes/4.gbapal" + .incbin "data/tilesets/secondary/department_store/palettes/5.gbapal" + .incbin "data/tilesets/secondary/department_store/palettes/6.gbapal" + .incbin "data/tilesets/secondary/department_store/palettes/7.gbapal" + .incbin "data/tilesets/secondary/department_store/palettes/8.gbapal" + .incbin "data/tilesets/secondary/department_store/palettes/9.gbapal" + .incbin "data/tilesets/secondary/department_store/palettes/10.gbapal" + .incbin "data/tilesets/secondary/department_store/palettes/11.gbapal" + .incbin "data/tilesets/secondary/department_store/palettes/12.gbapal" + .incbin "data/tilesets/secondary/department_store/palettes/13.gbapal" + .incbin "data/tilesets/secondary/department_store/palettes/14.gbapal" + .incbin "data/tilesets/secondary/department_store/palettes/15.gbapal" + + +gTilesetTiles_DepartmentStore:: @ 8EA9F88 + .incbin "data/tilesets/secondary/department_store/tiles.4bpp.lz" gUnionRoomChatPanelBgPal_7:: @ 8EAA9F0 .incbin "graphics/interface/union_room_chat_panel.gbapal" diff --git a/data/layouts/CeladonCity_Hotel_Duplicate/border.bin b/data/layouts/CeladonCity_Hotel_Duplicate/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/CeladonCity_Hotel_Duplicate/border.bin differ diff --git a/data/layouts/CeladonCity_Hotel_Duplicate/map.bin b/data/layouts/CeladonCity_Hotel_Duplicate/map.bin new file mode 100644 index 000000000..4573c1444 --- /dev/null +++ b/data/layouts/CeladonCity_Hotel_Duplicate/map.bin @@ -0,0 +1 @@ +2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222 \ No newline at end of file diff --git a/data/layouts/CeladonCity_Restaurant_Duplicate/border.bin b/data/layouts/CeladonCity_Restaurant_Duplicate/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/CeladonCity_Restaurant_Duplicate/border.bin differ diff --git a/data/layouts/CeladonCity_Restaurant_Duplicate/map.bin b/data/layouts/CeladonCity_Restaurant_Duplicate/map.bin new file mode 100644 index 000000000..a5391187c --- /dev/null +++ b/data/layouts/CeladonCity_Restaurant_Duplicate/map.bin @@ -0,0 +1 @@ +2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222 \ No newline at end of file diff --git a/data/layouts/EverGrandeCity_HallOfFame/border.bin b/data/layouts/EverGrandeCity_HallOfFame/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/EverGrandeCity_HallOfFame/border.bin differ diff --git a/data/layouts/EverGrandeCity_HallOfFame/map.bin b/data/layouts/EverGrandeCity_HallOfFame/map.bin new file mode 100644 index 000000000..1df9e4804 --- /dev/null +++ b/data/layouts/EverGrandeCity_HallOfFame/map.bin @@ -0,0 +1 @@ +2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222262226 \ No newline at end of file diff --git a/data/layouts/FortreeCity_DecorationShop/border.bin b/data/layouts/FortreeCity_DecorationShop/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/FortreeCity_DecorationShop/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/FortreeCity_DecorationShop/map.bin b/data/layouts/FortreeCity_DecorationShop/map.bin new file mode 100644 index 000000000..6ca8b4e61 --- /dev/null +++ b/data/layouts/FortreeCity_DecorationShop/map.bin @@ -0,0 +1 @@ +333333333333733337 \ No newline at end of file diff --git a/data/layouts/FortreeCity_House1/border.bin b/data/layouts/FortreeCity_House1/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/FortreeCity_House1/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/FortreeCity_House1/map.bin b/data/layouts/FortreeCity_House1/map.bin new file mode 100644 index 000000000..5a3ac8cb6 --- /dev/null +++ b/data/layouts/FortreeCity_House1/map.bin @@ -0,0 +1 @@ +33333333333333333333733337 \ No newline at end of file diff --git a/data/layouts/FortreeCity_House2/border.bin b/data/layouts/FortreeCity_House2/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/FortreeCity_House2/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/FortreeCity_House2/map.bin b/data/layouts/FortreeCity_House2/map.bin new file mode 100644 index 000000000..3fbcd6043 --- /dev/null +++ b/data/layouts/FortreeCity_House2/map.bin @@ -0,0 +1 @@ +37733333333333333333733337 \ No newline at end of file diff --git a/data/layouts/LavaridgeTown_HerbShop/border.bin b/data/layouts/LavaridgeTown_HerbShop/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/LavaridgeTown_HerbShop/border.bin differ diff --git a/data/layouts/LavaridgeTown_HerbShop/map.bin b/data/layouts/LavaridgeTown_HerbShop/map.bin new file mode 100644 index 000000000..cc0294a80 --- /dev/null +++ b/data/layouts/LavaridgeTown_HerbShop/map.bin @@ -0,0 +1 @@ +32222x2p2p2p2p22h2h2h2x2p2p2p2p2p2y2h2h2h232h2h2h2h2h2h2h2h2h22g2h2h2h2h2h2h2h2f2Z2abh2h2h2h2h2ab \ No newline at end of file diff --git a/data/layouts/LittlerootTown_MaysHouse_2F/border.bin b/data/layouts/LittlerootTown_MaysHouse_2F/border.bin new file mode 100644 index 000000000..c1b82435c --- /dev/null +++ b/data/layouts/LittlerootTown_MaysHouse_2F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/LittlerootTown_MaysHouse_2F/map.bin b/data/layouts/LittlerootTown_MaysHouse_2F/map.bin new file mode 100644 index 000000000..b51210332 --- /dev/null +++ b/data/layouts/LittlerootTown_MaysHouse_2F/map.bin @@ -0,0 +1,2 @@ +  +'VTPTQ/eUXYE2222]2g22`2a2222222222222222222222BB2222222222222222 \ No newline at end of file diff --git a/data/layouts/MossdeepCity_EReaderTrainerHouse_1F/border.bin b/data/layouts/MossdeepCity_EReaderTrainerHouse_1F/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/MossdeepCity_EReaderTrainerHouse_1F/border.bin differ diff --git a/data/layouts/MossdeepCity_EReaderTrainerHouse_1F/map.bin b/data/layouts/MossdeepCity_EReaderTrainerHouse_1F/map.bin new file mode 100644 index 000000000..bad63f412 --- /dev/null +++ b/data/layouts/MossdeepCity_EReaderTrainerHouse_1F/map.bin @@ -0,0 +1,2 @@ +0no +2  hvw22$2$2$2$2$282p2~2292#2#2#2#2#2#2#2#2#2#292#2#2#2+2JK,2#2#2#292#2#2#2+2RS,2#2#2#292#2#2#2#2#2#2#2#2"2"292#2#2 #2#2#2#2** \ No newline at end of file diff --git a/data/layouts/MossdeepCity_EReaderTrainerHouse_2F/border.bin b/data/layouts/MossdeepCity_EReaderTrainerHouse_2F/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/MossdeepCity_EReaderTrainerHouse_2F/border.bin differ diff --git a/data/layouts/MossdeepCity_EReaderTrainerHouse_2F/map.bin b/data/layouts/MossdeepCity_EReaderTrainerHouse_2F/map.bin new file mode 100644 index 000000000..399d05705 --- /dev/null +++ b/data/layouts/MossdeepCity_EReaderTrainerHouse_2F/map.bin @@ -0,0 +1,2 @@ +  +        6$2$2$2$2$2$2$2$2$2$2692#2#2#2#2#2#2#2#2#2#2#292#2#2#252626272#2#2#2#292#2#2#2=2>2>2?2#2#2#2#292#2#2#2E2F2F2G2#2#2#2#22#2#2#2#2#2#2#2#2#2#2"2#2#2#2#2#2#2#2#2#2#2* \ No newline at end of file diff --git a/data/layouts/PacifidlogTown_House1/border.bin b/data/layouts/PacifidlogTown_House1/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/PacifidlogTown_House1/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/PacifidlogTown_House1/map.bin b/data/layouts/PacifidlogTown_House1/map.bin new file mode 100644 index 000000000..7865fdc7c --- /dev/null +++ b/data/layouts/PacifidlogTown_House1/map.bin @@ -0,0 +1 @@ +3333373333333333333333333333733333333333333333733333333373333337 \ No newline at end of file diff --git a/data/layouts/PacifidlogTown_House2/border.bin b/data/layouts/PacifidlogTown_House2/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/PacifidlogTown_House2/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/PacifidlogTown_House2/map.bin b/data/layouts/PacifidlogTown_House2/map.bin new file mode 100644 index 000000000..617346322 --- /dev/null +++ b/data/layouts/PacifidlogTown_House2/map.bin @@ -0,0 +1 @@ +3333333333733333333373333333333333333333333333333333333373333337 \ No newline at end of file diff --git a/data/layouts/Prototype_SeviiIsle_22/border.bin b/data/layouts/Prototype_SeviiIsle_22/border.bin new file mode 100644 index 000000000..d9994d6cd --- /dev/null +++ b/data/layouts/Prototype_SeviiIsle_22/border.bin @@ -0,0 +1 @@ +++++ \ No newline at end of file diff --git a/data/layouts/Prototype_SeviiIsle_22/map.bin b/data/layouts/Prototype_SeviiIsle_22/map.bin new file mode 100644 index 000000000..a4b5b8b85 --- /dev/null +++ b/data/layouts/Prototype_SeviiIsle_22/map.bin @@ -0,0 +1 @@ ++++++  +++++++++++++++    .1-  ++++++++++++11111111++++++++++++11111111-   +++++++ .111111111111+++++++11111111111111-   +++111111111111111111+++111111111111111111+++111111111111111111- +&1111111111111111111+&1111111111111++++   .1111111111111+   .111111111111111%+11111111111111%++11111111111%++++++&111111111+++++++++11111111%+++++++++111111%++++++++++&1111++++++++++++++1111++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file diff --git a/data/layouts/Prototype_SeviiIsle_23_East/border.bin b/data/layouts/Prototype_SeviiIsle_23_East/border.bin new file mode 100644 index 000000000..d9994d6cd --- /dev/null +++ b/data/layouts/Prototype_SeviiIsle_23_East/border.bin @@ -0,0 +1 @@ +++++ \ No newline at end of file diff --git a/data/layouts/Prototype_SeviiIsle_23_East/map.bin b/data/layouts/Prototype_SeviiIsle_23_East/map.bin new file mode 100644 index 000000000..5bc807eea --- /dev/null +++ b/data/layouts/Prototype_SeviiIsle_23_East/map.bin @@ -0,0 +1 @@ ++++++++++++++++++++++++++++           +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++              ++++++++++++++++++++++++++++++++++++1111111111+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++1111111111111+++++++++++++++++++++++++++++++++   .1111111111++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++   .1111111111111+++++++++++++++++++++++++++++++++1111111111111- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++1111111111111111- +++++++++++++++++++++++++++++++111111111111111++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++111111111111111111++++++++++++++++++++++++++++++ .1111111111+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ .1111111111111++++++++++++++++++++++++++++++11qqq1111+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++11qqq1111++++++++++++++++++++++++++++++qqqqqqqq111+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++qqqqqqqqqqq111++++++++++++++++++++++++++++++qqqqqqqqqqq111+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++qqqqqqqqqqqqqq111++++++++++++++++++++++++++++++qqqqqqqqqq11%+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++qqqqqqqqqqqqq11%++++++++++++++++++++++++++++++qqqqqqqy111++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++qqqqqqqqqqy111+++++++++++++++++++++++++++++++&qqqqqy1111%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++&qqqqqyyyy1111%++++++++++++++++++++++++++++++++yyq1111%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++yyq1111111%+++++++++++++++++++++++++++++++++&y111%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++&y111111%++++++++++++++++++++++++++++++++++++++1111%+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++1111%+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file diff --git a/data/layouts/Prototype_SeviiIsle_23_West/border.bin b/data/layouts/Prototype_SeviiIsle_23_West/border.bin new file mode 100644 index 000000000..d9994d6cd --- /dev/null +++ b/data/layouts/Prototype_SeviiIsle_23_West/border.bin @@ -0,0 +1 @@ +++++ \ No newline at end of file diff --git a/data/layouts/Prototype_SeviiIsle_23_West/map.bin b/data/layouts/Prototype_SeviiIsle_23_West/map.bin new file mode 100644 index 000000000..667f4a779 --- /dev/null +++ b/data/layouts/Prototype_SeviiIsle_23_West/map.bin @@ -0,0 +1 @@ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++     ++++++++++++    .1111++++++++++++11111111- ++++++++++1111111111+++++++   .1111111111+++++++1111111111111- +++++111111111111111++++ .1111111111++++11qqq1111++++qqqqqqqq111++++qqqqqqqqqqq111++++qqqqqqqqqqq111++++qqqqqqqqqqq111++++qqqqqqqqqq1%++++qqqqqqqy11++++&qqqqqy1111+++++yyq1111%+++++&y111%++++++++++1111%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file diff --git a/data/layouts/Prototype_SeviiIsle_24/border.bin b/data/layouts/Prototype_SeviiIsle_24/border.bin new file mode 100644 index 000000000..d9994d6cd --- /dev/null +++ b/data/layouts/Prototype_SeviiIsle_24/border.bin @@ -0,0 +1 @@ +++++ \ No newline at end of file diff --git a/data/layouts/Prototype_SeviiIsle_24/map.bin b/data/layouts/Prototype_SeviiIsle_24/map.bin new file mode 100644 index 000000000..ce93426c5 --- /dev/null +++ b/data/layouts/Prototype_SeviiIsle_24/map.bin @@ -0,0 +1 @@ ++++++++++++++++++++++++++,21313131313141)++++++++,213131hiiiiij313141)+++++,hiiqqqqqqqiij)++++,21pqqqyyyqqqr3131)++,hqqyz 000xyqij 0*++,pqz 0 0 00000pqqr 0*++,pqr00 0hij00xqqj*++,pqr000pqr000pqqr*++,pqr00 0xyz0 00pqqr*++,pqqj0 0 00 00 00pqz*++,xqr0 0 00 0 00hqqr"1++0$xqij0 0000pqz*++++0$xyr00 0 0hqz"1+++++0#$xz 0 000xyz"1++++++++0#########1++++ \ No newline at end of file diff --git a/data/layouts/Prototype_SeviiIsle_6/border.bin b/data/layouts/Prototype_SeviiIsle_6/border.bin new file mode 100644 index 000000000..d9994d6cd --- /dev/null +++ b/data/layouts/Prototype_SeviiIsle_6/border.bin @@ -0,0 +1 @@ +++++ \ No newline at end of file diff --git a/data/layouts/Prototype_SeviiIsle_6/map.bin b/data/layouts/Prototype_SeviiIsle_6/map.bin new file mode 100644 index 000000000..cbd97e361 --- /dev/null +++ b/data/layouts/Prototype_SeviiIsle_6/map.bin @@ -0,0 +1 @@ ++ \ No newline at end of file diff --git a/data/layouts/Prototype_SeviiIsle_7/border.bin b/data/layouts/Prototype_SeviiIsle_7/border.bin new file mode 100644 index 000000000..d9994d6cd --- /dev/null +++ b/data/layouts/Prototype_SeviiIsle_7/border.bin @@ -0,0 +1 @@ +++++ \ No newline at end of file diff --git a/data/layouts/Prototype_SeviiIsle_7/map.bin b/data/layouts/Prototype_SeviiIsle_7/map.bin new file mode 100644 index 000000000..e6859e745 --- /dev/null +++ b/data/layouts/Prototype_SeviiIsle_7/map.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Prototype_SeviiIsle_8/border.bin b/data/layouts/Prototype_SeviiIsle_8/border.bin new file mode 100644 index 000000000..d9994d6cd --- /dev/null +++ b/data/layouts/Prototype_SeviiIsle_8/border.bin @@ -0,0 +1 @@ +++++ \ No newline at end of file diff --git a/data/layouts/Prototype_SeviiIsle_8/map.bin b/data/layouts/Prototype_SeviiIsle_8/map.bin new file mode 100644 index 000000000..7f730c596 Binary files /dev/null and b/data/layouts/Prototype_SeviiIsle_8/map.bin differ diff --git a/data/layouts/Prototype_SeviiIsle_9/border.bin b/data/layouts/Prototype_SeviiIsle_9/border.bin new file mode 100644 index 000000000..d9994d6cd --- /dev/null +++ b/data/layouts/Prototype_SeviiIsle_9/border.bin @@ -0,0 +1 @@ +++++ \ No newline at end of file diff --git a/data/layouts/Prototype_SeviiIsle_9/map.bin b/data/layouts/Prototype_SeviiIsle_9/map.bin new file mode 100644 index 000000000..616f50967 --- /dev/null +++ b/data/layouts/Prototype_SeviiIsle_9/map.bin @@ -0,0 +1 @@ +qqqqqqu+++++++++++++++qqqqqqu+++++++++++++++qqqqqqu+++++++++++++++qqqqqqu+++++++++++++++qqqqqqu+++++++++++++++||||||+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file diff --git a/data/layouts/RS_BattleTower/border.bin b/data/layouts/RS_BattleTower/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/layouts/RS_BattleTower/border.bin @@ -0,0 +1 @@ +pppp \ No newline at end of file diff --git a/data/layouts/RS_BattleTower/map.bin b/data/layouts/RS_BattleTower/map.bin new file mode 100644 index 000000000..6e9f6adb6 --- /dev/null +++ b/data/layouts/RS_BattleTower/map.bin @@ -0,0 +1 @@ +ppppppprIJJxyz{bJJ`tp1ppppppppppprIJJxyz{bJJ`tpppppppprk0rIJJxyz{bJJ`s0mtppppprks0jIJJxyz{bJJ`k00mtpppxsqsk00HIJJxyz{bJJ`a22umtppskssHIJJxyz{bJJ`auuqutpssqss0HIJJKLMNOJJ`a2uuquuyssqss00PQRRSTUVWRRhi22uuquuyssks0X2Y2Z2Z2[\]^_Z2Z2p2q22uuquusssqs000w2o22c2d2e2f2g2222222uuquusssqs00w2o2l2m2n22222uut}usssqs0000000t2u2v2000000t}uuqusssq{00000|2}2~200000ut}ut}ss{qs0000000000000t}uquus{sq{000000000ut}t}up{s{|{00000t}uququps{qsq{||||000||||}t}ququpp{{{||000}qququppsqsqqqqt000qqqt|}t}pppsq{||||}q]^0^0^0_q{|||}qquppp{||]^0^0^0_|||}pppp]^0^0^0_pppppppppppppp]^0^0^0^0V0V0V0V0V0V0Wppppppppppppppppp]^0^0^0^0^0^0^0^0^0^0_pppppppppppppppp22pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp \ No newline at end of file diff --git a/data/layouts/RS_PokemonCenter_1F/border.bin b/data/layouts/RS_PokemonCenter_1F/border.bin new file mode 100644 index 000000000..efef023e6 --- /dev/null +++ b/data/layouts/RS_PokemonCenter_1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/RS_PokemonCenter_1F/map.bin b/data/layouts/RS_PokemonCenter_1F/map.bin new file mode 100644 index 000000000..f84061f08 --- /dev/null +++ b/data/layouts/RS_PokemonCenter_1F/map.bin @@ -0,0 +1 @@ +222222222222222222222222222222222222222222222 3 3222222222222222222222222222222222222 \ No newline at end of file diff --git a/data/layouts/RS_SafariZone_Entrance/border.bin b/data/layouts/RS_SafariZone_Entrance/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/RS_SafariZone_Entrance/border.bin differ diff --git a/data/layouts/RS_SafariZone_Entrance/map.bin b/data/layouts/RS_SafariZone_Entrance/map.bin new file mode 100644 index 000000000..35c1badac --- /dev/null +++ b/data/layouts/RS_SafariZone_Entrance/map.bin @@ -0,0 +1 @@ +]x2p2p2p2p2p22222e2x2p2p2p2p22h2h2h2h2h22h22h2h22\2h2h2h2h2h2q2Y2Z2Y2Z2p2y2h2h2h2h22d6h2h2h2h2ababh2h2h2h2h2h2h22h2h2h222\2h2h2h2dh2h2h2x22h2h2h222h2h2h222h2h2h2\2h2h2h2q22d6h2h2t6 \ No newline at end of file diff --git a/data/layouts/RS_SafariZone_Northeast/border.bin b/data/layouts/RS_SafariZone_Northeast/border.bin new file mode 100644 index 000000000..03bcafef1 --- /dev/null +++ b/data/layouts/RS_SafariZone_Northeast/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/RS_SafariZone_Northeast/map.bin b/data/layouts/RS_SafariZone_Northeast/map.bin new file mode 100644 index 000000000..d5e7fd825 Binary files /dev/null and b/data/layouts/RS_SafariZone_Northeast/map.bin differ diff --git a/data/layouts/RS_SafariZone_RestHouse/border.bin b/data/layouts/RS_SafariZone_RestHouse/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/RS_SafariZone_RestHouse/border.bin differ diff --git a/data/layouts/RS_SafariZone_RestHouse/map.bin b/data/layouts/RS_SafariZone_RestHouse/map.bin new file mode 100644 index 000000000..c57c99c7b --- /dev/null +++ b/data/layouts/RS_SafariZone_RestHouse/map.bin @@ -0,0 +1 @@ +        $2$2$2$2$2$2$2$2$2$292#24266<2#2#2#2#292#24266<2#2#2#2#292#2#2#2#2#2#2#2#2#292#2#2 #2#2#2#2#2 \ No newline at end of file diff --git a/data/layouts/RS_SafariZone_Southeast/border.bin b/data/layouts/RS_SafariZone_Southeast/border.bin new file mode 100644 index 000000000..03bcafef1 --- /dev/null +++ b/data/layouts/RS_SafariZone_Southeast/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/RS_SafariZone_Southeast/map.bin b/data/layouts/RS_SafariZone_Southeast/map.bin new file mode 100644 index 000000000..540798144 Binary files /dev/null and b/data/layouts/RS_SafariZone_Southeast/map.bin differ diff --git a/data/layouts/RS_SafariZone_Southwest/border.bin b/data/layouts/RS_SafariZone_Southwest/border.bin new file mode 100644 index 000000000..03bcafef1 --- /dev/null +++ b/data/layouts/RS_SafariZone_Southwest/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/RS_SafariZone_Southwest/map.bin b/data/layouts/RS_SafariZone_Southwest/map.bin new file mode 100644 index 000000000..0074b6e55 Binary files /dev/null and b/data/layouts/RS_SafariZone_Southwest/map.bin differ diff --git a/data/layouts/RustboroCity_CuttersHouse/border.bin b/data/layouts/RustboroCity_CuttersHouse/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/RustboroCity_CuttersHouse/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/RustboroCity_CuttersHouse/map.bin b/data/layouts/RustboroCity_CuttersHouse/map.bin new file mode 100644 index 000000000..5515d00cf --- /dev/null +++ b/data/layouts/RustboroCity_CuttersHouse/map.bin @@ -0,0 +1 @@ +yzfg8898x88no@@A@VW33v3w3+3+3+3+33^3_3+3{3|3|3}3,3,3,3,3,3,3+33>2>23,3,3,3j7k7E3+33>2>23,3,3D3r7s7E3+33333,3,3,3,3,3,3F3G3,3,3,3,3,3,3,3,3,3N7O7,3,3,3LM,3,3,3,3 \ No newline at end of file diff --git a/data/layouts/RustboroCity_Flat1_1F/border.bin b/data/layouts/RustboroCity_Flat1_1F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/RustboroCity_Flat1_1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/RustboroCity_Flat1_1F/map.bin b/data/layouts/RustboroCity_Flat1_1F/map.bin new file mode 100644 index 000000000..017298e71 --- /dev/null +++ b/data/layouts/RustboroCity_Flat1_1F/map.bin @@ -0,0 +1 @@ +8()*:888:8x88:H0 2B@@@B@VWBP3+3+3+3+3+3+3+3+3+33^3_3+3+3D3,3,3,3,3,3,3{3|3|3|3|3}3+3h7i7,3,3,3,3,332H6I623+3p7q7E3,3,3,3,33>2P6Q623F3G3,3,3,3,3,3,3333333N7O7,3,3,3,3LM,3,3,3,3,3,3 \ No newline at end of file diff --git a/data/layouts/RustboroCity_Flat1_2F/border.bin b/data/layouts/RustboroCity_Flat1_2F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/RustboroCity_Flat1_2F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/RustboroCity_Flat1_2F/map.bin b/data/layouts/RustboroCity_Flat1_2F/map.bin new file mode 100644 index 000000000..17a611343 --- /dev/null +++ b/data/layouts/RustboroCity_Flat1_2F/map.bin @@ -0,0 +1 @@ +8()*:888:8888:@02B@@@BT7UIB+3+3+3+3+3+3+3+3+3\3?3]3Q3+3+3,3,3,3,3,3,3,3{3|3|3|3}3,3+3D3~777E3,3,33>2>2>23,3+3,3777E3,3,33>2>2>23,3+3G3G3,3,3,3,3,333333,3+3O7O7,3,3,3,3,3,3,3,3,3,3,3 \ No newline at end of file diff --git a/data/layouts/RustboroCity_Flat2_1F/border.bin b/data/layouts/RustboroCity_Flat2_1F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/RustboroCity_Flat2_1F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/RustboroCity_Flat2_1F/map.bin b/data/layouts/RustboroCity_Flat2_1F/map.bin new file mode 100644 index 000000000..0f6829f9c Binary files /dev/null and b/data/layouts/RustboroCity_Flat2_1F/map.bin differ diff --git a/data/layouts/RustboroCity_Flat2_2F/border.bin b/data/layouts/RustboroCity_Flat2_2F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/RustboroCity_Flat2_2F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/RustboroCity_Flat2_2F/map.bin b/data/layouts/RustboroCity_Flat2_2F/map.bin new file mode 100644 index 000000000..9f3750fb4 Binary files /dev/null and b/data/layouts/RustboroCity_Flat2_2F/map.bin differ diff --git a/data/layouts/RustboroCity_Flat2_3F/border.bin b/data/layouts/RustboroCity_Flat2_3F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/RustboroCity_Flat2_3F/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/RustboroCity_Flat2_3F/map.bin b/data/layouts/RustboroCity_Flat2_3F/map.bin new file mode 100644 index 000000000..2112fe799 Binary files /dev/null and b/data/layouts/RustboroCity_Flat2_3F/map.bin differ diff --git a/data/layouts/SSTidal_Corridor/border.bin b/data/layouts/SSTidal_Corridor/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/SSTidal_Corridor/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SSTidal_Corridor/map.bin b/data/layouts/SSTidal_Corridor/map.bin new file mode 100644 index 000000000..f8cf1725d --- /dev/null +++ b/data/layouts/SSTidal_Corridor/map.bin @@ -0,0 +1 @@ +2222222222222222 6222222222222222222201111111111222222011111111112222220111111111122222201111111111222222%#$"#$"#$"#&22222-+6{*+6{*+6{*+622222222222222222222 22222222222222222 \ No newline at end of file diff --git a/data/layouts/SSTidal_LowerDeck/border.bin b/data/layouts/SSTidal_LowerDeck/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/SSTidal_LowerDeck/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SSTidal_LowerDeck/map.bin b/data/layouts/SSTidal_LowerDeck/map.bin new file mode 100644 index 000000000..059ce30fe --- /dev/null +++ b/data/layouts/SSTidal_LowerDeck/map.bin @@ -0,0 +1 @@ +22222222 22 22 22 2 2 22 2222 2222 22222 2 2 22222222 222 2222 2 2 22222 2 22222 2 2222222222222222 2 22 2 2 2 2 2 2 2 2 2 2 2 2 2 2222222222 222 222 2 22222 2662222222 2 \ No newline at end of file diff --git a/data/layouts/SSTidal_Rooms/border.bin b/data/layouts/SSTidal_Rooms/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/SSTidal_Rooms/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SSTidal_Rooms/map.bin b/data/layouts/SSTidal_Rooms/map.bin new file mode 100644 index 000000000..6103ad0c2 --- /dev/null +++ b/data/layouts/SSTidal_Rooms/map.bin @@ -0,0 +1 @@ +6@kcmE@kcmE@kc''@kcmE7>HsuMHsuMHs////uM?>PQ:2;2;2TUPQ:2;2;2TUPQ:2;2;2;2;2;2;2;2TU?>XY=28282\]XY=28282\]XY=282828282828282\]?>:;2<28282;2;2:;2<28282;2;2:2;2<282828282w682828282;2;2?>=2828282828282w68282VW8282=282`2VWa282=28282828282a2?>=2828282VW82=282`2^_a282=282`2^_a282=282828282VW?>=28282`2^_b=2828282828282=2828282b8282=2828282`2^_?6@klvlmElvllCDE@lvlvmE@kv'vmE7>Hst~tuMt~ttKij/t~t~uMHs~/~//?>PQ:2;2;2TU:2;2;2;2;2qr66;2;2;2TUPQ:2;2;2;2|2?>XY=28282\]=2VW8282yz828282\]XY=2VppW?>:;2<28282;2|2=2^_a282;256=282828282;2;2h;2<2^xx_?>=2828282828282=2828282828282=2828282828282=28282`2828282?>=2828282828282=2828282828282=2828282828282=2828282828282?>=28282de8282=28282de8282=28282de8282=28282de8282? \ No newline at end of file diff --git a/data/layouts/SevenIsland_House_Room1_DoorOpen/border.bin b/data/layouts/SevenIsland_House_Room1_DoorOpen/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/SevenIsland_House_Room1_DoorOpen/border.bin differ diff --git a/data/layouts/SevenIsland_House_Room1_DoorOpen/map.bin b/data/layouts/SevenIsland_House_Room1_DoorOpen/map.bin new file mode 100644 index 000000000..b9381326f --- /dev/null +++ b/data/layouts/SevenIsland_House_Room1_DoorOpen/map.bin @@ -0,0 +1 @@ +=>9{|}PQ9=>EF~1wXEFM1N11111111M1N1V1 1 1 1 1 1 1 1 1 1 1^ 1 1 1o1efg1 1 1 11 1 1 1o1mng1 1 1 1V1 1 1 1 1 1 1 1 1 1 1^ 1 1?1G1O1 1 1 1 1 1 \ No newline at end of file diff --git a/data/layouts/SootopolisCity_House1/border.bin b/data/layouts/SootopolisCity_House1/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/SootopolisCity_House1/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SootopolisCity_House1/map.bin b/data/layouts/SootopolisCity_House1/map.bin new file mode 100644 index 000000000..43f11b194 --- /dev/null +++ b/data/layouts/SootopolisCity_House1/map.bin @@ -0,0 +1 @@ +023333332332772333327723333333333333 333 \ No newline at end of file diff --git a/data/layouts/SootopolisCity_House2/border.bin b/data/layouts/SootopolisCity_House2/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/SootopolisCity_House2/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SootopolisCity_House2/map.bin b/data/layouts/SootopolisCity_House2/map.bin new file mode 100644 index 000000000..632e1e36a --- /dev/null +++ b/data/layouts/SootopolisCity_House2/map.bin @@ -0,0 +1 @@ +vw62223336333277233333772333333333333 333 \ No newline at end of file diff --git a/data/layouts/SootopolisCity_House3/border.bin b/data/layouts/SootopolisCity_House3/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/SootopolisCity_House3/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/SootopolisCity_House3/map.bin b/data/layouts/SootopolisCity_House3/map.bin new file mode 100644 index 000000000..8bbd6c517 --- /dev/null +++ b/data/layouts/SootopolisCity_House3/map.bin @@ -0,0 +1 @@ +62233322333333337723333377333333333 333 \ No newline at end of file diff --git a/data/layouts/UnknownMap_03_50/border.bin b/data/layouts/UnknownMap_03_50/border.bin deleted file mode 100644 index d9994d6cd..000000000 --- a/data/layouts/UnknownMap_03_50/border.bin +++ /dev/null @@ -1 +0,0 @@ -++++ \ No newline at end of file diff --git a/data/layouts/UnknownMap_03_50/map.bin b/data/layouts/UnknownMap_03_50/map.bin deleted file mode 100644 index cbd97e361..000000000 --- a/data/layouts/UnknownMap_03_50/map.bin +++ /dev/null @@ -1 +0,0 @@ -+ \ No newline at end of file diff --git a/data/layouts/UnknownMap_03_51/border.bin b/data/layouts/UnknownMap_03_51/border.bin deleted file mode 100644 index d9994d6cd..000000000 --- a/data/layouts/UnknownMap_03_51/border.bin +++ /dev/null @@ -1 +0,0 @@ -++++ \ No newline at end of file diff --git a/data/layouts/UnknownMap_03_51/map.bin b/data/layouts/UnknownMap_03_51/map.bin deleted file mode 100644 index e6859e745..000000000 --- a/data/layouts/UnknownMap_03_51/map.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/UnknownMap_03_52/border.bin b/data/layouts/UnknownMap_03_52/border.bin deleted file mode 100644 index d9994d6cd..000000000 --- a/data/layouts/UnknownMap_03_52/border.bin +++ /dev/null @@ -1 +0,0 @@ -++++ \ No newline at end of file diff --git a/data/layouts/UnknownMap_03_52/map.bin b/data/layouts/UnknownMap_03_52/map.bin deleted file mode 100644 index 7f730c596..000000000 Binary files a/data/layouts/UnknownMap_03_52/map.bin and /dev/null differ diff --git a/data/layouts/UnknownMap_03_53/border.bin b/data/layouts/UnknownMap_03_53/border.bin deleted file mode 100644 index d9994d6cd..000000000 --- a/data/layouts/UnknownMap_03_53/border.bin +++ /dev/null @@ -1 +0,0 @@ -++++ \ No newline at end of file diff --git a/data/layouts/UnknownMap_03_53/map.bin b/data/layouts/UnknownMap_03_53/map.bin deleted file mode 100644 index 616f50967..000000000 --- a/data/layouts/UnknownMap_03_53/map.bin +++ /dev/null @@ -1 +0,0 @@ -qqqqqqu+++++++++++++++qqqqqqu+++++++++++++++qqqqqqu+++++++++++++++qqqqqqu+++++++++++++++qqqqqqu+++++++++++++++||||||+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file diff --git a/data/layouts/Unused1/border.bin b/data/layouts/Unused1/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/Unused1/border.bin differ diff --git a/data/layouts/Unused1/map.bin b/data/layouts/Unused1/map.bin new file mode 100644 index 000000000..35968a7fd Binary files /dev/null and b/data/layouts/Unused1/map.bin differ diff --git a/data/layouts/UnusedLayout_82D54D8/border.bin b/data/layouts/UnusedLayout_82D54D8/border.bin deleted file mode 100644 index c1b82435c..000000000 --- a/data/layouts/UnusedLayout_82D54D8/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82D54D8/map.bin b/data/layouts/UnusedLayout_82D54D8/map.bin deleted file mode 100644 index b51210332..000000000 --- a/data/layouts/UnusedLayout_82D54D8/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -  -'VTPTQ/eUXYE2222]2g22`2a2222222222222222222222BB2222222222222222 \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82D6144/border.bin b/data/layouts/UnusedLayout_82D6144/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/layouts/UnusedLayout_82D6144/border.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_82D6144/map.bin b/data/layouts/UnusedLayout_82D6144/map.bin deleted file mode 100644 index cc0294a80..000000000 --- a/data/layouts/UnusedLayout_82D6144/map.bin +++ /dev/null @@ -1 +0,0 @@ -32222x2p2p2p2p22h2h2h2x2p2p2p2p2p2y2h2h2h232h2h2h2h2h2h2h2h2h22g2h2h2h2h2h2h2h2f2Z2abh2h2h2h2h2ab \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82D6490/border.bin b/data/layouts/UnusedLayout_82D6490/border.bin deleted file mode 100644 index efef023e6..000000000 --- a/data/layouts/UnusedLayout_82D6490/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82D6490/map.bin b/data/layouts/UnusedLayout_82D6490/map.bin deleted file mode 100644 index f84061f08..000000000 --- a/data/layouts/UnusedLayout_82D6490/map.bin +++ /dev/null @@ -1 +0,0 @@ -222222222222222222222222222222222222222222222 3 3222222222222222222222222222222222222 \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82D6654/border.bin b/data/layouts/UnusedLayout_82D6654/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/layouts/UnusedLayout_82D6654/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82D6654/map.bin b/data/layouts/UnusedLayout_82D6654/map.bin deleted file mode 100644 index 7865fdc7c..000000000 --- a/data/layouts/UnusedLayout_82D6654/map.bin +++ /dev/null @@ -1 +0,0 @@ -3333373333333333333333333333733333333333333333733333333373333337 \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82D672C/border.bin b/data/layouts/UnusedLayout_82D672C/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/layouts/UnusedLayout_82D672C/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82D672C/map.bin b/data/layouts/UnusedLayout_82D672C/map.bin deleted file mode 100644 index 617346322..000000000 --- a/data/layouts/UnusedLayout_82D672C/map.bin +++ /dev/null @@ -1 +0,0 @@ -3333333333733333333373333333333333333333333333333333333373333337 \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82D6C34/border.bin b/data/layouts/UnusedLayout_82D6C34/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/UnusedLayout_82D6C34/border.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_82D6C34/map.bin b/data/layouts/UnusedLayout_82D6C34/map.bin deleted file mode 100644 index 35968a7fd..000000000 Binary files a/data/layouts/UnusedLayout_82D6C34/map.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_82D75F0/border.bin b/data/layouts/UnusedLayout_82D75F0/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/layouts/UnusedLayout_82D75F0/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82D75F0/map.bin b/data/layouts/UnusedLayout_82D75F0/map.bin deleted file mode 100644 index 5515d00cf..000000000 --- a/data/layouts/UnusedLayout_82D75F0/map.bin +++ /dev/null @@ -1 +0,0 @@ -yzfg8898x88no@@A@VW33v3w3+3+3+3+33^3_3+3{3|3|3}3,3,3,3,3,3,3+33>2>23,3,3,3j7k7E3+33>2>23,3,3D3r7s7E3+33333,3,3,3,3,3,3F3G3,3,3,3,3,3,3,3,3,3N7O7,3,3,3LM,3,3,3,3 \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82D7674/border.bin b/data/layouts/UnusedLayout_82D7674/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/layouts/UnusedLayout_82D7674/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82D7674/map.bin b/data/layouts/UnusedLayout_82D7674/map.bin deleted file mode 100644 index 5a3ac8cb6..000000000 --- a/data/layouts/UnusedLayout_82D7674/map.bin +++ /dev/null @@ -1 +0,0 @@ -33333333333333333333733337 \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82D7CC8/border.bin b/data/layouts/UnusedLayout_82D7CC8/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/layouts/UnusedLayout_82D7CC8/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82D7CC8/map.bin b/data/layouts/UnusedLayout_82D7CC8/map.bin deleted file mode 100644 index 3fbcd6043..000000000 --- a/data/layouts/UnusedLayout_82D7CC8/map.bin +++ /dev/null @@ -1 +0,0 @@ -37733333333333333333733337 \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82D88C8/border.bin b/data/layouts/UnusedLayout_82D88C8/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/layouts/UnusedLayout_82D88C8/border.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_82D88C8/map.bin b/data/layouts/UnusedLayout_82D88C8/map.bin deleted file mode 100644 index 35c1badac..000000000 --- a/data/layouts/UnusedLayout_82D88C8/map.bin +++ /dev/null @@ -1 +0,0 @@ -]x2p2p2p2p2p22222e2x2p2p2p2p22h2h2h2h2h22h22h2h22\2h2h2h2h2h2q2Y2Z2Y2Z2p2y2h2h2h2h22d6h2h2h2h2ababh2h2h2h2h2h2h22h2h2h222\2h2h2h2dh2h2h2x22h2h2h222h2h2h222h2h2h2\2h2h2h2q22d6h2h2t6 \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82D9B24/border.bin b/data/layouts/UnusedLayout_82D9B24/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/layouts/UnusedLayout_82D9B24/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82D9B24/map.bin b/data/layouts/UnusedLayout_82D9B24/map.bin deleted file mode 100644 index d5e7fd825..000000000 Binary files a/data/layouts/UnusedLayout_82D9B24/map.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_82DA7C8/border.bin b/data/layouts/UnusedLayout_82DA7C8/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/layouts/UnusedLayout_82DA7C8/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82DA7C8/map.bin b/data/layouts/UnusedLayout_82DA7C8/map.bin deleted file mode 100644 index 0074b6e55..000000000 Binary files a/data/layouts/UnusedLayout_82DA7C8/map.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_82DB46C/border.bin b/data/layouts/UnusedLayout_82DB46C/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/layouts/UnusedLayout_82DB46C/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82DB46C/map.bin b/data/layouts/UnusedLayout_82DB46C/map.bin deleted file mode 100644 index 540798144..000000000 Binary files a/data/layouts/UnusedLayout_82DB46C/map.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_82DB4F0/border.bin b/data/layouts/UnusedLayout_82DB4F0/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/layouts/UnusedLayout_82DB4F0/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82DB4F0/map.bin b/data/layouts/UnusedLayout_82DB4F0/map.bin deleted file mode 100644 index 6ca8b4e61..000000000 --- a/data/layouts/UnusedLayout_82DB4F0/map.bin +++ /dev/null @@ -1 +0,0 @@ -333333333333733337 \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82DBBE0/border.bin b/data/layouts/UnusedLayout_82DBBE0/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/layouts/UnusedLayout_82DBBE0/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82DBBE0/map.bin b/data/layouts/UnusedLayout_82DBBE0/map.bin deleted file mode 100644 index 6e9f6adb6..000000000 --- a/data/layouts/UnusedLayout_82DBBE0/map.bin +++ /dev/null @@ -1 +0,0 @@ -ppppppprIJJxyz{bJJ`tp1ppppppppppprIJJxyz{bJJ`tpppppppprk0rIJJxyz{bJJ`s0mtppppprks0jIJJxyz{bJJ`k00mtpppxsqsk00HIJJxyz{bJJ`a22umtppskssHIJJxyz{bJJ`auuqutpssqss0HIJJKLMNOJJ`a2uuquuyssqss00PQRRSTUVWRRhi22uuquuyssks0X2Y2Z2Z2[\]^_Z2Z2p2q22uuquusssqs000w2o22c2d2e2f2g2222222uuquusssqs00w2o2l2m2n22222uut}usssqs0000000t2u2v2000000t}uuqusssq{00000|2}2~200000ut}ut}ss{qs0000000000000t}uquus{sq{000000000ut}t}up{s{|{00000t}uququps{qsq{||||000||||}t}ququpp{{{||000}qququppsqsqqqqt000qqqt|}t}pppsq{||||}q]^0^0^0_q{|||}qquppp{||]^0^0^0_|||}pppp]^0^0^0_pppppppppppppp]^0^0^0^0V0V0V0V0V0V0Wppppppppppppppppp]^0^0^0^0^0^0^0^0^0^0_pppppppppppppppp22pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82DBDD8/border.bin b/data/layouts/UnusedLayout_82DBDD8/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/layouts/UnusedLayout_82DBDD8/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82DBDD8/map.bin b/data/layouts/UnusedLayout_82DBDD8/map.bin deleted file mode 100644 index f8cf1725d..000000000 --- a/data/layouts/UnusedLayout_82DBDD8/map.bin +++ /dev/null @@ -1 +0,0 @@ -2222222222222222 6222222222222222222201111111111222222011111111112222220111111111122222201111111111222222%#$"#$"#$"#&22222-+6{*+6{*+6{*+622222222222222222222 22222222222222222 \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82DBFB8/border.bin b/data/layouts/UnusedLayout_82DBFB8/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/layouts/UnusedLayout_82DBFB8/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82DBFB8/map.bin b/data/layouts/UnusedLayout_82DBFB8/map.bin deleted file mode 100644 index 059ce30fe..000000000 --- a/data/layouts/UnusedLayout_82DBFB8/map.bin +++ /dev/null @@ -1 +0,0 @@ -22222222 22 22 22 2 2 22 2222 2222 22222 2 2 22222222 222 2222 2 2 22222 2 22222 2 2222222222222222 2 22 2 2 2 2 2 2 2 2 2 2 2 2 2 2222222222 222 222 2 22222 2662222222 2 \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82DC4EC/border.bin b/data/layouts/UnusedLayout_82DC4EC/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/layouts/UnusedLayout_82DC4EC/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82DC4EC/map.bin b/data/layouts/UnusedLayout_82DC4EC/map.bin deleted file mode 100644 index 6103ad0c2..000000000 --- a/data/layouts/UnusedLayout_82DC4EC/map.bin +++ /dev/null @@ -1 +0,0 @@ -6@kcmE@kcmE@kc''@kcmE7>HsuMHsuMHs////uM?>PQ:2;2;2TUPQ:2;2;2TUPQ:2;2;2;2;2;2;2;2TU?>XY=28282\]XY=28282\]XY=282828282828282\]?>:;2<28282;2;2:;2<28282;2;2:2;2<282828282w682828282;2;2?>=2828282828282w68282VW8282=282`2VWa282=28282828282a2?>=2828282VW82=282`2^_a282=282`2^_a282=282828282VW?>=28282`2^_b=2828282828282=2828282b8282=2828282`2^_?6@klvlmElvllCDE@lvlvmE@kv'vmE7>Hst~tuMt~ttKij/t~t~uMHs~/~//?>PQ:2;2;2TU:2;2;2;2;2qr66;2;2;2TUPQ:2;2;2;2|2?>XY=28282\]=2VW8282yz828282\]XY=2VppW?>:;2<28282;2|2=2^_a282;256=282828282;2;2h;2<2^xx_?>=2828282828282=2828282828282=2828282828282=28282`2828282?>=2828282828282=2828282828282=2828282828282=2828282828282?>=28282de8282=28282de8282=28282de8282=28282de8282? \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82DC60C/border.bin b/data/layouts/UnusedLayout_82DC60C/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/layouts/UnusedLayout_82DC60C/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82DC60C/map.bin b/data/layouts/UnusedLayout_82DC60C/map.bin deleted file mode 100644 index 0f6829f9c..000000000 Binary files a/data/layouts/UnusedLayout_82DC60C/map.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_82DC72C/border.bin b/data/layouts/UnusedLayout_82DC72C/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/layouts/UnusedLayout_82DC72C/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82DC72C/map.bin b/data/layouts/UnusedLayout_82DC72C/map.bin deleted file mode 100644 index 9f3750fb4..000000000 Binary files a/data/layouts/UnusedLayout_82DC72C/map.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_82DC84C/border.bin b/data/layouts/UnusedLayout_82DC84C/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/layouts/UnusedLayout_82DC84C/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82DC84C/map.bin b/data/layouts/UnusedLayout_82DC84C/map.bin deleted file mode 100644 index 2112fe799..000000000 Binary files a/data/layouts/UnusedLayout_82DC84C/map.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_82DCA70/border.bin b/data/layouts/UnusedLayout_82DCA70/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/layouts/UnusedLayout_82DCA70/border.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_82DCA70/map.bin b/data/layouts/UnusedLayout_82DCA70/map.bin deleted file mode 100644 index 1df9e4804..000000000 --- a/data/layouts/UnusedLayout_82DCA70/map.bin +++ /dev/null @@ -1 +0,0 @@ -2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222262226 \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82DCB44/border.bin b/data/layouts/UnusedLayout_82DCB44/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/layouts/UnusedLayout_82DCB44/border.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_82DCB44/map.bin b/data/layouts/UnusedLayout_82DCB44/map.bin deleted file mode 100644 index bad63f412..000000000 --- a/data/layouts/UnusedLayout_82DCB44/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -0no -2  hvw22$2$2$2$2$282p2~2292#2#2#2#2#2#2#2#2#2#292#2#2#2+2JK,2#2#2#292#2#2#2+2RS,2#2#2#292#2#2#2#2#2#2#2#2"2"292#2#2 #2#2#2#2** \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82DCC40/border.bin b/data/layouts/UnusedLayout_82DCC40/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/layouts/UnusedLayout_82DCC40/border.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_82DCC40/map.bin b/data/layouts/UnusedLayout_82DCC40/map.bin deleted file mode 100644 index 399d05705..000000000 --- a/data/layouts/UnusedLayout_82DCC40/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -  -        6$2$2$2$2$2$2$2$2$2$2692#2#2#2#2#2#2#2#2#2#2#292#2#2#252626272#2#2#2#292#2#2#2=2>2>2?2#2#2#2#292#2#2#2E2F2F2G2#2#2#2#22#2#2#2#2#2#2#2#2#2#2"2#2#2#2#2#2#2#2#2#2#2* \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82DCCD4/border.bin b/data/layouts/UnusedLayout_82DCCD4/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/layouts/UnusedLayout_82DCCD4/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82DCCD4/map.bin b/data/layouts/UnusedLayout_82DCCD4/map.bin deleted file mode 100644 index 43f11b194..000000000 --- a/data/layouts/UnusedLayout_82DCCD4/map.bin +++ /dev/null @@ -1 +0,0 @@ -023333332332772333327723333333333333 333 \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82DCD68/border.bin b/data/layouts/UnusedLayout_82DCD68/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/layouts/UnusedLayout_82DCD68/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82DCD68/map.bin b/data/layouts/UnusedLayout_82DCD68/map.bin deleted file mode 100644 index 632e1e36a..000000000 --- a/data/layouts/UnusedLayout_82DCD68/map.bin +++ /dev/null @@ -1 +0,0 @@ -vw62223336333277233333772333333333333 333 \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82DCDFC/border.bin b/data/layouts/UnusedLayout_82DCDFC/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/layouts/UnusedLayout_82DCDFC/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82DCDFC/map.bin b/data/layouts/UnusedLayout_82DCDFC/map.bin deleted file mode 100644 index 8bbd6c517..000000000 --- a/data/layouts/UnusedLayout_82DCDFC/map.bin +++ /dev/null @@ -1 +0,0 @@ -62233322333333337723333377333333333 333 \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82DCF00/border.bin b/data/layouts/UnusedLayout_82DCF00/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/layouts/UnusedLayout_82DCF00/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82DCF00/map.bin b/data/layouts/UnusedLayout_82DCF00/map.bin deleted file mode 100644 index 017298e71..000000000 --- a/data/layouts/UnusedLayout_82DCF00/map.bin +++ /dev/null @@ -1 +0,0 @@ -8()*:888:8x88:H0 2B@@@B@VWBP3+3+3+3+3+3+3+3+3+33^3_3+3+3D3,3,3,3,3,3,3{3|3|3|3|3}3+3h7i7,3,3,3,3,332H6I623+3p7q7E3,3,3,3,33>2P6Q623F3G3,3,3,3,3,3,3333333N7O7,3,3,3,3LM,3,3,3,3,3,3 \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82DD004/border.bin b/data/layouts/UnusedLayout_82DD004/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/layouts/UnusedLayout_82DD004/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82DD004/map.bin b/data/layouts/UnusedLayout_82DD004/map.bin deleted file mode 100644 index 17a611343..000000000 --- a/data/layouts/UnusedLayout_82DD004/map.bin +++ /dev/null @@ -1 +0,0 @@ -8()*:888:8888:@02B@@@BT7UIB+3+3+3+3+3+3+3+3+3\3?3]3Q3+3+3,3,3,3,3,3,3,3{3|3|3|3}3,3+3D3~777E3,3,33>2>2>23,3+3,3777E3,3,33>2>2>23,3+3G3G3,3,3,3,3,333333,3+3O7O7,3,3,3,3,3,3,3,3,3,3,3 \ No newline at end of file diff --git a/data/layouts/UnusedLayout_82DD0DC/border.bin b/data/layouts/UnusedLayout_82DD0DC/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/layouts/UnusedLayout_82DD0DC/border.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_82DD0DC/map.bin b/data/layouts/UnusedLayout_82DD0DC/map.bin deleted file mode 100644 index c57c99c7b..000000000 --- a/data/layouts/UnusedLayout_82DD0DC/map.bin +++ /dev/null @@ -1 +0,0 @@ -        $2$2$2$2$2$2$2$2$2$292#24266<2#2#2#2#292#24266<2#2#2#2#292#2#2#2#2#2#2#2#2#292#2#2 #2#2#2#2#2 \ No newline at end of file diff --git a/data/layouts/UnusedLayout_833614C/border.bin b/data/layouts/UnusedLayout_833614C/border.bin deleted file mode 100644 index d9994d6cd..000000000 --- a/data/layouts/UnusedLayout_833614C/border.bin +++ /dev/null @@ -1 +0,0 @@ -++++ \ No newline at end of file diff --git a/data/layouts/UnusedLayout_833614C/map.bin b/data/layouts/UnusedLayout_833614C/map.bin deleted file mode 100644 index a4b5b8b85..000000000 --- a/data/layouts/UnusedLayout_833614C/map.bin +++ /dev/null @@ -1 +0,0 @@ -+++++  +++++++++++++++    .1-  ++++++++++++11111111++++++++++++11111111-   +++++++ .111111111111+++++++11111111111111-   +++111111111111111111+++111111111111111111+++111111111111111111- +&1111111111111111111+&1111111111111++++   .1111111111111+   .111111111111111%+11111111111111%++11111111111%++++++&111111111+++++++++11111111%+++++++++111111%++++++++++&1111++++++++++++++1111++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file diff --git a/data/layouts/UnusedLayout_83377F0/border.bin b/data/layouts/UnusedLayout_83377F0/border.bin deleted file mode 100644 index d9994d6cd..000000000 --- a/data/layouts/UnusedLayout_83377F0/border.bin +++ /dev/null @@ -1 +0,0 @@ -++++ \ No newline at end of file diff --git a/data/layouts/UnusedLayout_83377F0/map.bin b/data/layouts/UnusedLayout_83377F0/map.bin deleted file mode 100644 index 5bc807eea..000000000 --- a/data/layouts/UnusedLayout_83377F0/map.bin +++ /dev/null @@ -1 +0,0 @@ -+++++++++++++++++++++++++++           +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++              ++++++++++++++++++++++++++++++++++++1111111111+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++1111111111111+++++++++++++++++++++++++++++++++   .1111111111++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++   .1111111111111+++++++++++++++++++++++++++++++++1111111111111- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++1111111111111111- +++++++++++++++++++++++++++++++111111111111111++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++111111111111111111++++++++++++++++++++++++++++++ .1111111111+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ .1111111111111++++++++++++++++++++++++++++++11qqq1111+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++11qqq1111++++++++++++++++++++++++++++++qqqqqqqq111+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++qqqqqqqqqqq111++++++++++++++++++++++++++++++qqqqqqqqqqq111+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++qqqqqqqqqqqqqq111++++++++++++++++++++++++++++++qqqqqqqqqq11%+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++qqqqqqqqqqqqq11%++++++++++++++++++++++++++++++qqqqqqqy111++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++qqqqqqqqqqy111+++++++++++++++++++++++++++++++&qqqqqy1111%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++&qqqqqyyyy1111%++++++++++++++++++++++++++++++++yyq1111%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++yyq1111111%+++++++++++++++++++++++++++++++++&y111%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++&y111111%++++++++++++++++++++++++++++++++++++++1111%+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++1111%+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file diff --git a/data/layouts/UnusedLayout_8338354/border.bin b/data/layouts/UnusedLayout_8338354/border.bin deleted file mode 100644 index d9994d6cd..000000000 --- a/data/layouts/UnusedLayout_8338354/border.bin +++ /dev/null @@ -1 +0,0 @@ -++++ \ No newline at end of file diff --git a/data/layouts/UnusedLayout_8338354/map.bin b/data/layouts/UnusedLayout_8338354/map.bin deleted file mode 100644 index 667f4a779..000000000 --- a/data/layouts/UnusedLayout_8338354/map.bin +++ /dev/null @@ -1 +0,0 @@ -++++++++++++++++++++++++++++++++++++++++++++++++++++++++     ++++++++++++    .1111++++++++++++11111111- ++++++++++1111111111+++++++   .1111111111+++++++1111111111111- +++++111111111111111++++ .1111111111++++11qqq1111++++qqqqqqqq111++++qqqqqqqqqqq111++++qqqqqqqqqqq111++++qqqqqqqqqqq111++++qqqqqqqqqq1%++++qqqqqqqy11++++&qqqqqy1111+++++yyq1111%+++++&y111%++++++++++1111%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file diff --git a/data/layouts/UnusedLayout_8338738/border.bin b/data/layouts/UnusedLayout_8338738/border.bin deleted file mode 100644 index d9994d6cd..000000000 --- a/data/layouts/UnusedLayout_8338738/border.bin +++ /dev/null @@ -1 +0,0 @@ -++++ \ No newline at end of file diff --git a/data/layouts/UnusedLayout_8338738/map.bin b/data/layouts/UnusedLayout_8338738/map.bin deleted file mode 100644 index ce93426c5..000000000 --- a/data/layouts/UnusedLayout_8338738/map.bin +++ /dev/null @@ -1 +0,0 @@ -+++++++++++++++++++++++++,21313131313141)++++++++,213131hiiiiij313141)+++++,hiiqqqqqqqiij)++++,21pqqqyyyqqqr3131)++,hqqyz 000xyqij 0*++,pqz 0 0 00000pqqr 0*++,pqr00 0hij00xqqj*++,pqr000pqr000pqqr*++,pqr00 0xyz0 00pqqr*++,pqqj0 0 00 00 00pqz*++,xqr0 0 00 0 00hqqr"1++0$xqij0 0000pqz*++++0$xyr00 0 0hqz"1+++++0#$xz 0 000xyz"1++++++++0#########1++++ \ No newline at end of file diff --git a/data/layouts/UnusedLayout_8338B4C/border.bin b/data/layouts/UnusedLayout_8338B4C/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/UnusedLayout_8338B4C/border.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_8338B4C/map.bin b/data/layouts/UnusedLayout_8338B4C/map.bin deleted file mode 100644 index b9381326f..000000000 --- a/data/layouts/UnusedLayout_8338B4C/map.bin +++ /dev/null @@ -1 +0,0 @@ -=>9{|}PQ9=>EF~1wXEFM1N11111111M1N1V1 1 1 1 1 1 1 1 1 1 1^ 1 1 1o1efg1 1 1 11 1 1 1o1mng1 1 1 1V1 1 1 1 1 1 1 1 1 1 1^ 1 1?1G1O1 1 1 1 1 1 \ No newline at end of file diff --git a/data/layouts/UnusedLayout_8338E90/border.bin b/data/layouts/UnusedLayout_8338E90/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/UnusedLayout_8338E90/border.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_8338E90/map.bin b/data/layouts/UnusedLayout_8338E90/map.bin deleted file mode 100644 index a5391187c..000000000 --- a/data/layouts/UnusedLayout_8338E90/map.bin +++ /dev/null @@ -1 +0,0 @@ -2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222 \ No newline at end of file diff --git a/data/layouts/UnusedLayout_833902C/border.bin b/data/layouts/UnusedLayout_833902C/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/UnusedLayout_833902C/border.bin and /dev/null differ diff --git a/data/layouts/UnusedLayout_833902C/map.bin b/data/layouts/UnusedLayout_833902C/map.bin deleted file mode 100644 index 4573c1444..000000000 --- a/data/layouts/UnusedLayout_833902C/map.bin +++ /dev/null @@ -1 +0,0 @@ -2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222 \ No newline at end of file diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index 63fc06562..32bed0f52 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -8,8 +8,8 @@ "height": 10, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4C74", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Building1", "border_filepath": "data/layouts/PalletTown_PlayersHouse_1F/border.bin", "blockdata_filepath": "data/layouts/PalletTown_PlayersHouse_1F/map.bin" }, @@ -20,8 +20,8 @@ "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4C74", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Building1", "border_filepath": "data/layouts/PalletTown_PlayersHouse_2F/border.bin", "blockdata_filepath": "data/layouts/PalletTown_PlayersHouse_2F/map.bin" }, @@ -32,22 +32,22 @@ "height": 10, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4E84", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Building2", "border_filepath": "data/layouts/PalletTown_GarysHouse/border.bin", "blockdata_filepath": "data/layouts/PalletTown_GarysHouse/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_82D54D8", - "name": "UnusedLayout_82D54D8_Layout", + "id": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F", + "name": "LittlerootTown_MaysHouse_2F_Layout", "width": 9, "height": 8, "border_width": 0, "border_height": 0, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4C74", - "border_filepath": "data/layouts/UnusedLayout_82D54D8/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82D54D8/map.bin" + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Building1", + "border_filepath": "data/layouts/LittlerootTown_MaysHouse_2F/border.bin", + "blockdata_filepath": "data/layouts/LittlerootTown_MaysHouse_2F/map.bin" }, { "id": "LAYOUT_PALLET_TOWN_PROFESSOR_OAKS_LAB", @@ -56,8 +56,8 @@ "height": 14, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4C8C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Lab", "border_filepath": "data/layouts/PalletTown_ProfessorOaksLab/border.bin", "blockdata_filepath": "data/layouts/PalletTown_ProfessorOaksLab/map.bin" }, @@ -68,8 +68,8 @@ "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4C74", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Building1", "border_filepath": "data/layouts/House1/border.bin", "blockdata_filepath": "data/layouts/House1/map.bin" }, @@ -80,8 +80,8 @@ "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4E84", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Building2", "border_filepath": "data/layouts/House2/border.bin", "blockdata_filepath": "data/layouts/House2/map.bin" }, @@ -92,8 +92,8 @@ "height": 10, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4BE4", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonCenter", "border_filepath": "data/layouts/PokemonCenter_1F/border.bin", "blockdata_filepath": "data/layouts/PokemonCenter_1F/map.bin" }, @@ -104,8 +104,8 @@ "height": 10, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4BE4", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonCenter", "border_filepath": "data/layouts/PokemonCenter_2F/border.bin", "blockdata_filepath": "data/layouts/PokemonCenter_2F/map.bin" }, @@ -116,8 +116,8 @@ "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4BCC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Mart", "border_filepath": "data/layouts/Mart/border.bin", "blockdata_filepath": "data/layouts/Mart/map.bin" }, @@ -128,8 +128,8 @@ "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4E84", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Building2", "border_filepath": "data/layouts/House3/border.bin", "blockdata_filepath": "data/layouts/House3/map.bin" }, @@ -140,8 +140,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4D1C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_CeruleanGym", "border_filepath": "data/layouts/CeruleanCity_Gym/border.bin", "blockdata_filepath": "data/layouts/CeruleanCity_Gym/map.bin" }, @@ -152,22 +152,22 @@ "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4E84", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Building2", "border_filepath": "data/layouts/House4/border.bin", "blockdata_filepath": "data/layouts/House4/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_82D6144", - "name": "UnusedLayout_82D6144_Layout", + "id": "LAYOUT_LAVARIDGE_TOWN_HERB_SHOP", + "name": "LavaridgeTown_HerbShop_Layout", "width": 11, "height": 8, "border_width": 0, "border_height": 0, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4BCC", - "border_filepath": "data/layouts/UnusedLayout_82D6144/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82D6144/map.bin" + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Mart", + "border_filepath": "data/layouts/LavaridgeTown_HerbShop/border.bin", + "blockdata_filepath": "data/layouts/LavaridgeTown_HerbShop/map.bin" }, { "id": "LAYOUT_CELADON_CITY_GYM", @@ -176,22 +176,22 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4D4C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_CeladonGym", "border_filepath": "data/layouts/CeladonCity_Gym/border.bin", "blockdata_filepath": "data/layouts/CeladonCity_Gym/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_82D6490", - "name": "UnusedLayout_82D6490_Layout", + "id": "LAYOUT_RS_POKEMON_CENTER_1F", + "name": "RS_PokemonCenter_1F_Layout", "width": 14, "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4BE4", - "border_filepath": "data/layouts/UnusedLayout_82D6490/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82D6490/map.bin" + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonCenter", + "border_filepath": "data/layouts/RS_PokemonCenter_1F/border.bin", + "blockdata_filepath": "data/layouts/RS_PokemonCenter_1F/map.bin" }, { "id": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE", @@ -200,34 +200,34 @@ "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4C2C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Museum", "border_filepath": "data/layouts/FiveIsland_ResortGorgeous_House/border.bin", "blockdata_filepath": "data/layouts/FiveIsland_ResortGorgeous_House/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_82D6654", - "name": "UnusedLayout_82D6654_Layout", + "id": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1", + "name": "PacifidlogTown_House1_Layout", "width": 10, "height": 9, "border_width": 0, "border_height": 0, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4CD4", - "border_filepath": "data/layouts/UnusedLayout_82D6654/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82D6654/map.bin" + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_HoennBuilding", + "border_filepath": "data/layouts/PacifidlogTown_House1/border.bin", + "blockdata_filepath": "data/layouts/PacifidlogTown_House1/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_82D672C", - "name": "UnusedLayout_82D672C_Layout", + "id": "LAYOUT_PACIFIDLOG_TOWN_HOUSE2", + "name": "PacifidlogTown_House2_Layout", "width": 10, "height": 9, "border_width": 0, "border_height": 0, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4CD4", - "border_filepath": "data/layouts/UnusedLayout_82D672C/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82D672C/map.bin" + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_HoennBuilding", + "border_filepath": "data/layouts/PacifidlogTown_House2/border.bin", + "blockdata_filepath": "data/layouts/PacifidlogTown_House2/map.bin" }, { "id": "LAYOUT_FUCHSIA_CITY_GYM", @@ -236,8 +236,8 @@ "height": 23, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4CA4", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_FuchsiaGym", "border_filepath": "data/layouts/FuchsiaCity_Gym/border.bin", "blockdata_filepath": "data/layouts/FuchsiaCity_Gym/map.bin" }, @@ -248,24 +248,24 @@ "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4C74", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Building1", "border_filepath": "data/layouts/House5/border.bin", "blockdata_filepath": "data/layouts/House5/map.bin" }, {}, {}, { - "id": "LAYOUT_UNUSED_LAYOUT_82D6C34", - "name": "UnusedLayout_82D6C34_Layout", + "id": "LAYOUT_UNUSED1", + "name": "Unused1_Layout", "width": 12, "height": 12, "border_width": 2, "border_height": 2, "primary_tileset": "NULL", - "secondary_tileset": "gTileset_82D4C14", - "border_filepath": "data/layouts/UnusedLayout_82D6C34/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82D6C34/map.bin" + "secondary_tileset": "gTileset_Dummy1", + "border_filepath": "data/layouts/Unused1/border.bin", + "blockdata_filepath": "data/layouts/Unused1/map.bin" }, { "id": "LAYOUT_VERMILION_CITY_GYM", @@ -274,8 +274,8 @@ "height": 21, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4D34", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_VermilionGym", "border_filepath": "data/layouts/VermilionCity_Gym/border.bin", "blockdata_filepath": "data/layouts/VermilionCity_Gym/map.bin" }, @@ -286,8 +286,8 @@ "height": 10, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4C5C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BikeShop", "border_filepath": "data/layouts/CeruleanCity_BikeShop/border.bin", "blockdata_filepath": "data/layouts/CeruleanCity_BikeShop/map.bin" }, @@ -298,8 +298,8 @@ "height": 15, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4CEC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GameCorner", "border_filepath": "data/layouts/CeladonCity_GameCorner/border.bin", "blockdata_filepath": "data/layouts/CeladonCity_GameCorner/map.bin" }, @@ -310,8 +310,8 @@ "height": 16, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4D04", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PewterGym", "border_filepath": "data/layouts/PewterCity_Gym/border.bin", "blockdata_filepath": "data/layouts/PewterCity_Gym/map.bin" }, @@ -323,8 +323,8 @@ "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4F14", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SafariZoneBuilding", "border_filepath": "data/layouts/FourIsland_LoreleisHouse/border.bin", "blockdata_filepath": "data/layouts/FourIsland_LoreleisHouse/map.bin" }, @@ -335,34 +335,34 @@ "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4C8C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Lab", "border_filepath": "data/layouts/ThreeIsland_House1/border.bin", "blockdata_filepath": "data/layouts/ThreeIsland_House1/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_82D75F0", - "name": "UnusedLayout_82D75F0_Layout", + "id": "LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE", + "name": "RustboroCity_CuttersHouse_Layout", "width": 11, "height": 9, "border_width": 0, "border_height": 0, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4CD4", - "border_filepath": "data/layouts/UnusedLayout_82D75F0/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82D75F0/map.bin" + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_HoennBuilding", + "border_filepath": "data/layouts/RustboroCity_CuttersHouse/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_CuttersHouse/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_82D7674", - "name": "UnusedLayout_82D7674_Layout", + "id": "LAYOUT_FORTREE_CITY_HOUSE1", + "name": "FortreeCity_House1_Layout", "width": 8, "height": 6, "border_width": 0, "border_height": 0, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4CD4", - "border_filepath": "data/layouts/UnusedLayout_82D7674/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82D7674/map.bin" + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_HoennBuilding", + "border_filepath": "data/layouts/FortreeCity_House1/border.bin", + "blockdata_filepath": "data/layouts/FortreeCity_House1/map.bin" }, { "id": "LAYOUT_SAFFRON_CITY_GYM", @@ -371,22 +371,22 @@ "height": 25, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4D64", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SaffronGym", "border_filepath": "data/layouts/SaffronCity_Gym/border.bin", "blockdata_filepath": "data/layouts/SaffronCity_Gym/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_82D7CC8", - "name": "UnusedLayout_82D7CC8_Layout", + "id": "LAYOUT_FORTREE_CITY_HOUSE2", + "name": "FortreeCity_House2_Layout", "width": 8, "height": 6, "border_width": 0, "border_height": 0, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4CD4", - "border_filepath": "data/layouts/UnusedLayout_82D7CC8/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82D7CC8/map.bin" + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_HoennBuilding", + "border_filepath": "data/layouts/FortreeCity_House2/border.bin", + "blockdata_filepath": "data/layouts/FortreeCity_House2/map.bin" }, { "id": "LAYOUT_CINNABAR_ISLAND_GYM", @@ -395,8 +395,8 @@ "height": 25, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4D7C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_CinnabarGym", "border_filepath": "data/layouts/CinnabarIsland_Gym/border.bin", "blockdata_filepath": "data/layouts/CinnabarIsland_Gym/map.bin" }, @@ -407,8 +407,8 @@ "height": 24, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4CBC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_ViridianGym", "border_filepath": "data/layouts/ViridianCity_Gym/border.bin", "blockdata_filepath": "data/layouts/ViridianCity_Gym/map.bin" }, @@ -421,16 +421,16 @@ {}, {}, { - "id": "LAYOUT_UNUSED_LAYOUT_82D88C8", - "name": "UnusedLayout_82D88C8_Layout", + "id": "LAYOUT_RS_SAFARI_ZONE_ENTRANCE", + "name": "RS_SafariZone_Entrance_Layout", "width": 18, "height": 14, "border_width": 0, "border_height": 0, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4BCC", - "border_filepath": "data/layouts/UnusedLayout_82D88C8/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82D88C8/map.bin" + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Mart", + "border_filepath": "data/layouts/RS_SafariZone_Entrance/border.bin", + "blockdata_filepath": "data/layouts/RS_SafariZone_Entrance/map.bin" }, { "id": "LAYOUT_BATTLE_COLOSSEUM_2P", @@ -439,8 +439,8 @@ "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4C44", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_CableClub", "border_filepath": "data/layouts/BattleColosseum_2P/border.bin", "blockdata_filepath": "data/layouts/BattleColosseum_2P/map.bin" }, @@ -451,8 +451,8 @@ "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4C44", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_CableClub", "border_filepath": "data/layouts/TradeCenter/border.bin", "blockdata_filepath": "data/layouts/TradeCenter/map.bin" }, @@ -463,8 +463,8 @@ "height": 10, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4C44", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_CableClub", "border_filepath": "data/layouts/RecordCenter/border.bin", "blockdata_filepath": "data/layouts/RecordCenter/map.bin" }, @@ -475,8 +475,8 @@ "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4C44", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_CableClub", "border_filepath": "data/layouts/BattleColosseum_4P/border.bin", "blockdata_filepath": "data/layouts/BattleColosseum_4P/map.bin" }, @@ -487,256 +487,256 @@ "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4F14", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SafariZoneBuilding", "border_filepath": "data/layouts/FuchsiaCity_SafariZone_Entrance/border.bin", "blockdata_filepath": "data/layouts/FuchsiaCity_SafariZone_Entrance/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_82D9B24", - "name": "UnusedLayout_82D9B24_Layout", + "id": "LAYOUT_RS_SAFARI_ZONE_NORTHEAST", + "name": "RS_SafariZone_Northeast_Layout", "width": 40, "height": 40, "border_width": 0, "border_height": 0, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B6C", - "border_filepath": "data/layouts/UnusedLayout_82D9B24/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82D9B24/map.bin" + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_CinnabarIsland", + "border_filepath": "data/layouts/RS_SafariZone_Northeast/border.bin", + "blockdata_filepath": "data/layouts/RS_SafariZone_Northeast/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_82DA7C8", - "name": "UnusedLayout_82DA7C8_Layout", + "id": "LAYOUT_RS_SAFARI_ZONE_SOUTHWEST", + "name": "RS_SafariZone_Southwest_Layout", "width": 40, "height": 40, "border_width": 0, "border_height": 0, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B6C", - "border_filepath": "data/layouts/UnusedLayout_82DA7C8/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82DA7C8/map.bin" + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_CinnabarIsland", + "border_filepath": "data/layouts/RS_SafariZone_Southwest/border.bin", + "blockdata_filepath": "data/layouts/RS_SafariZone_Southwest/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_82DB46C", - "name": "UnusedLayout_82DB46C_Layout", + "id": "LAYOUT_RS_SAFARI_ZONE_SOUTHEAST", + "name": "RS_SafariZone_Southeast_Layout", "width": 40, "height": 40, "border_width": 0, "border_height": 0, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B6C", - "border_filepath": "data/layouts/UnusedLayout_82DB46C/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82DB46C/map.bin" + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_CinnabarIsland", + "border_filepath": "data/layouts/RS_SafariZone_Southeast/border.bin", + "blockdata_filepath": "data/layouts/RS_SafariZone_Southeast/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_82DB4F0", - "name": "UnusedLayout_82DB4F0_Layout", + "id": "LAYOUT_FORTREE_CITY_DECORATION_SHOP", + "name": "FortreeCity_DecorationShop_Layout", "width": 8, "height": 6, "border_width": 0, "border_height": 0, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4CD4", - "border_filepath": "data/layouts/UnusedLayout_82DB4F0/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82DB4F0/map.bin" + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_HoennBuilding", + "border_filepath": "data/layouts/FortreeCity_DecorationShop/border.bin", + "blockdata_filepath": "data/layouts/FortreeCity_DecorationShop/map.bin" }, {}, { - "id": "LAYOUT_UNUSED_LAYOUT_82DBBE0", - "name": "UnusedLayout_82DBBE0_Layout", + "id": "LAYOUT_RS_BATTLE_TOWER", + "name": "RS_BattleTower_Layout", "width": 29, "height": 30, "border_width": 0, "border_height": 0, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4ADC", - "border_filepath": "data/layouts/UnusedLayout_82DBBE0/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82DBBE0/map.bin" + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_PewterCity", + "border_filepath": "data/layouts/RS_BattleTower/border.bin", + "blockdata_filepath": "data/layouts/RS_BattleTower/map.bin" }, {}, {}, {}, {}, { - "id": "LAYOUT_UNUSED_LAYOUT_82DBDD8", - "name": "UnusedLayout_82DBDD8_Layout", + "id": "LAYOUT_SS_TIDAL_CORRIDOR", + "name": "SSTidal_Corridor_Layout", "width": 18, "height": 13, "border_width": 0, "border_height": 0, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4D94", - "border_filepath": "data/layouts/UnusedLayout_82DBDD8/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82DBDD8/map.bin" + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SSAnne", + "border_filepath": "data/layouts/SSTidal_Corridor/border.bin", + "blockdata_filepath": "data/layouts/SSTidal_Corridor/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_82DBFB8", - "name": "UnusedLayout_82DBFB8_Layout", + "id": "LAYOUT_SS_TIDAL_LOWER_DECK", + "name": "SSTidal_LowerDeck_Layout", "width": 17, "height": 13, "border_width": 0, "border_height": 0, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4D94", - "border_filepath": "data/layouts/UnusedLayout_82DBFB8/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82DBFB8/map.bin" + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SSAnne", + "border_filepath": "data/layouts/SSTidal_LowerDeck/border.bin", + "blockdata_filepath": "data/layouts/SSTidal_LowerDeck/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_82DC4EC", - "name": "UnusedLayout_82DC4EC_Layout", + "id": "LAYOUT_SS_TIDAL_ROOMS", + "name": "SSTidal_Rooms_Layout", "width": 36, "height": 18, "border_width": 0, "border_height": 0, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4D94", - "border_filepath": "data/layouts/UnusedLayout_82DC4EC/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82DC4EC/map.bin" + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SSAnne", + "border_filepath": "data/layouts/SSTidal_Rooms/border.bin", + "blockdata_filepath": "data/layouts/SSTidal_Rooms/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_82DC60C", - "name": "UnusedLayout_82DC60C_Layout", + "id": "LAYOUT_RUSTBORO_CITY_FLAT2_1F", + "name": "RustboroCity_Flat2_1F_Layout", "width": 14, "height": 9, "border_width": 0, "border_height": 0, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4CD4", - "border_filepath": "data/layouts/UnusedLayout_82DC60C/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82DC60C/map.bin" + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_HoennBuilding", + "border_filepath": "data/layouts/RustboroCity_Flat2_1F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_Flat2_1F/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_82DC72C", - "name": "UnusedLayout_82DC72C_Layout", + "id": "LAYOUT_RUSTBORO_CITY_FLAT2_2F", + "name": "RustboroCity_Flat2_2F_Layout", "width": 14, "height": 9, "border_width": 0, "border_height": 0, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4CD4", - "border_filepath": "data/layouts/UnusedLayout_82DC72C/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82DC72C/map.bin" + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_HoennBuilding", + "border_filepath": "data/layouts/RustboroCity_Flat2_2F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_Flat2_2F/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_82DC84C", - "name": "UnusedLayout_82DC84C_Layout", + "id": "LAYOUT_RUSTBORO_CITY_FLAT2_3F", + "name": "RustboroCity_Flat2_3F_Layout", "width": 14, "height": 9, "border_width": 0, "border_height": 0, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4CD4", - "border_filepath": "data/layouts/UnusedLayout_82DC84C/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82DC84C/map.bin" + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_HoennBuilding", + "border_filepath": "data/layouts/RustboroCity_Flat2_3F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_Flat2_3F/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_82DCA70", - "name": "UnusedLayout_82DCA70_Layout", + "id": "LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME", + "name": "EverGrandeCity_HallOfFame_Layout", "width": 15, "height": 17, "border_width": 0, "border_height": 0, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4C44", - "border_filepath": "data/layouts/UnusedLayout_82DCA70/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82DCA70/map.bin" + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_CableClub", + "border_filepath": "data/layouts/EverGrandeCity_HallOfFame/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity_HallOfFame/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_82DCB44", - "name": "UnusedLayout_82DCB44_Layout", + "id": "LAYOUT_MOSSDEEP_CITY_EREADER_TRAINER_HOUSE_1F", + "name": "MossdeepCity_EReaderTrainerHouse_1F_Layout", "width": 11, "height": 8, "border_width": 0, "border_height": 0, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4CD4", - "border_filepath": "data/layouts/UnusedLayout_82DCB44/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82DCB44/map.bin" + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_HoennBuilding", + "border_filepath": "data/layouts/MossdeepCity_EReaderTrainerHouse_1F/border.bin", + "blockdata_filepath": "data/layouts/MossdeepCity_EReaderTrainerHouse_1F/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_82DCC40", - "name": "UnusedLayout_82DCC40_Layout", + "id": "LAYOUT_MOSSDEEP_CITY_EREADER_TRAINER_HOUSE_2F", + "name": "MossdeepCity_EReaderTrainerHouse_2F_Layout", "width": 12, "height": 9, "border_width": 0, "border_height": 0, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4CD4", - "border_filepath": "data/layouts/UnusedLayout_82DCC40/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82DCC40/map.bin" + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_HoennBuilding", + "border_filepath": "data/layouts/MossdeepCity_EReaderTrainerHouse_2F/border.bin", + "blockdata_filepath": "data/layouts/MossdeepCity_EReaderTrainerHouse_2F/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_82DCCD4", - "name": "UnusedLayout_82DCCD4_Layout", + "id": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1", + "name": "SootopolisCity_House1_Layout", "width": 8, "height": 7, "border_width": 0, "border_height": 0, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4CD4", - "border_filepath": "data/layouts/UnusedLayout_82DCCD4/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82DCCD4/map.bin" + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_HoennBuilding", + "border_filepath": "data/layouts/SootopolisCity_House1/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_House1/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_82DCD68", - "name": "UnusedLayout_82DCD68_Layout", + "id": "LAYOUT_SOOTOPOLIS_CITY_HOUSE2", + "name": "SootopolisCity_House2_Layout", "width": 8, "height": 7, "border_width": 0, "border_height": 0, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4CD4", - "border_filepath": "data/layouts/UnusedLayout_82DCD68/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82DCD68/map.bin" + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_HoennBuilding", + "border_filepath": "data/layouts/SootopolisCity_House2/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_House2/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_82DCDFC", - "name": "UnusedLayout_82DCDFC_Layout", + "id": "LAYOUT_SOOTOPOLIS_CITY_HOUSE3", + "name": "SootopolisCity_House3_Layout", "width": 8, "height": 7, "border_width": 0, "border_height": 0, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4CD4", - "border_filepath": "data/layouts/UnusedLayout_82DCDFC/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82DCDFC/map.bin" + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_HoennBuilding", + "border_filepath": "data/layouts/SootopolisCity_House3/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_House3/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_82DCF00", - "name": "UnusedLayout_82DCF00_Layout", + "id": "LAYOUT_RUSTBORO_CITY_FLAT1_1F", + "name": "RustboroCity_Flat1_1F_Layout", "width": 14, "height": 8, "border_width": 0, "border_height": 0, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4CD4", - "border_filepath": "data/layouts/UnusedLayout_82DCF00/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82DCF00/map.bin" + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_HoennBuilding", + "border_filepath": "data/layouts/RustboroCity_Flat1_1F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_Flat1_1F/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_82DD004", - "name": "UnusedLayout_82DD004_Layout", + "id": "LAYOUT_RUSTBORO_CITY_FLAT1_2F", + "name": "RustboroCity_Flat1_2F_Layout", "width": 14, "height": 8, "border_width": 0, "border_height": 0, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4CD4", - "border_filepath": "data/layouts/UnusedLayout_82DD004/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82DD004/map.bin" + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_HoennBuilding", + "border_filepath": "data/layouts/RustboroCity_Flat1_2F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_Flat1_2F/map.bin" }, {}, { - "id": "LAYOUT_UNUSED_LAYOUT_82DD0DC", - "name": "UnusedLayout_82DD0DC_Layout", + "id": "LAYOUT_RS_SAFARI_ZONE_REST_HOUSE", + "name": "RS_SafariZone_RestHouse_Layout", "width": 10, "height": 9, "border_width": 0, "border_height": 0, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4CD4", - "border_filepath": "data/layouts/UnusedLayout_82DD0DC/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_82DD0DC/map.bin" + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_HoennBuilding", + "border_filepath": "data/layouts/RS_SafariZone_RestHouse/border.bin", + "blockdata_filepath": "data/layouts/RS_SafariZone_RestHouse/map.bin" }, { "id": "LAYOUT_PALLET_TOWN", @@ -745,8 +745,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4AAC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_PalletTown", "border_filepath": "data/layouts/PalletTown/border.bin", "blockdata_filepath": "data/layouts/PalletTown/map.bin" }, @@ -757,8 +757,8 @@ "height": 40, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4AC4", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_ViridianCity", "border_filepath": "data/layouts/ViridianCity/border.bin", "blockdata_filepath": "data/layouts/ViridianCity/map.bin" }, @@ -769,8 +769,8 @@ "height": 40, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4ADC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_PewterCity", "border_filepath": "data/layouts/PewterCity/border.bin", "blockdata_filepath": "data/layouts/PewterCity/map.bin" }, @@ -781,8 +781,8 @@ "height": 40, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4AF4", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_CeruleanCity", "border_filepath": "data/layouts/CeruleanCity/border.bin", "blockdata_filepath": "data/layouts/CeruleanCity/map.bin" }, @@ -793,8 +793,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B0C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_LavenderTown", "border_filepath": "data/layouts/LavenderTown/border.bin", "blockdata_filepath": "data/layouts/LavenderTown/map.bin" }, @@ -805,8 +805,8 @@ "height": 40, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B24", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_VermilionCity", "border_filepath": "data/layouts/VermilionCity/border.bin", "blockdata_filepath": "data/layouts/VermilionCity/map.bin" }, @@ -817,8 +817,8 @@ "height": 40, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B3C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_CeladonCity", "border_filepath": "data/layouts/CeladonCity/border.bin", "blockdata_filepath": "data/layouts/CeladonCity/map.bin" }, @@ -829,8 +829,8 @@ "height": 40, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B54", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_FuchsiaCity", "border_filepath": "data/layouts/FuchsiaCity/border.bin", "blockdata_filepath": "data/layouts/FuchsiaCity/map.bin" }, @@ -841,8 +841,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B6C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_CinnabarIsland", "border_filepath": "data/layouts/CinnabarIsland/border.bin", "blockdata_filepath": "data/layouts/CinnabarIsland/map.bin" }, @@ -853,8 +853,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B84", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_IndigoPlateau", "border_filepath": "data/layouts/IndigoPlateau_Exterior/border.bin", "blockdata_filepath": "data/layouts/IndigoPlateau_Exterior/map.bin" }, @@ -865,8 +865,8 @@ "height": 40, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B9C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SaffronCity", "border_filepath": "data/layouts/SaffronCity_Classic/border.bin", "blockdata_filepath": "data/layouts/SaffronCity_Classic/map.bin" }, @@ -877,8 +877,8 @@ "height": 40, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4AAC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_PalletTown", "border_filepath": "data/layouts/Route1/border.bin", "blockdata_filepath": "data/layouts/Route1/map.bin" }, @@ -889,8 +889,8 @@ "height": 80, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4AC4", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_ViridianCity", "border_filepath": "data/layouts/Route2/border.bin", "blockdata_filepath": "data/layouts/Route2/map.bin" }, @@ -901,8 +901,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4ADC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_PewterCity", "border_filepath": "data/layouts/Route3/border.bin", "blockdata_filepath": "data/layouts/Route3/map.bin" }, @@ -913,8 +913,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4AF4", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_CeruleanCity", "border_filepath": "data/layouts/Route4/border.bin", "blockdata_filepath": "data/layouts/Route4/map.bin" }, @@ -925,8 +925,8 @@ "height": 40, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4AF4", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_CeruleanCity", "border_filepath": "data/layouts/Route5/border.bin", "blockdata_filepath": "data/layouts/Route5/map.bin" }, @@ -937,8 +937,8 @@ "height": 40, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B24", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_VermilionCity", "border_filepath": "data/layouts/Route6/border.bin", "blockdata_filepath": "data/layouts/Route6/map.bin" }, @@ -949,8 +949,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B3C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_CeladonCity", "border_filepath": "data/layouts/Route7/border.bin", "blockdata_filepath": "data/layouts/Route7/map.bin" }, @@ -961,8 +961,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B0C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_LavenderTown", "border_filepath": "data/layouts/Route8/border.bin", "blockdata_filepath": "data/layouts/Route8/map.bin" }, @@ -973,8 +973,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4AF4", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_CeruleanCity", "border_filepath": "data/layouts/Route9/border.bin", "blockdata_filepath": "data/layouts/Route9/map.bin" }, @@ -985,8 +985,8 @@ "height": 80, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B0C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_LavenderTown", "border_filepath": "data/layouts/Route10/border.bin", "blockdata_filepath": "data/layouts/Route10/map.bin" }, @@ -997,8 +997,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B24", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_VermilionCity", "border_filepath": "data/layouts/Route11/border.bin", "blockdata_filepath": "data/layouts/Route11/map.bin" }, @@ -1009,8 +1009,8 @@ "height": 120, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B0C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_LavenderTown", "border_filepath": "data/layouts/Route12/border.bin", "blockdata_filepath": "data/layouts/Route12/map.bin" }, @@ -1021,8 +1021,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B0C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_LavenderTown", "border_filepath": "data/layouts/Route13/border.bin", "blockdata_filepath": "data/layouts/Route13/map.bin" }, @@ -1033,8 +1033,8 @@ "height": 60, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B0C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_LavenderTown", "border_filepath": "data/layouts/Route14/border.bin", "blockdata_filepath": "data/layouts/Route14/map.bin" }, @@ -1045,8 +1045,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B54", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_FuchsiaCity", "border_filepath": "data/layouts/Route15/border.bin", "blockdata_filepath": "data/layouts/Route15/map.bin" }, @@ -1057,8 +1057,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B3C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_CeladonCity", "border_filepath": "data/layouts/Route16/border.bin", "blockdata_filepath": "data/layouts/Route16/map.bin" }, @@ -1069,8 +1069,8 @@ "height": 160, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B3C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_CeladonCity", "border_filepath": "data/layouts/Route17/border.bin", "blockdata_filepath": "data/layouts/Route17/map.bin" }, @@ -1081,8 +1081,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B3C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_CeladonCity", "border_filepath": "data/layouts/Route18/border.bin", "blockdata_filepath": "data/layouts/Route18/map.bin" }, @@ -1093,8 +1093,8 @@ "height": 60, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B54", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_FuchsiaCity", "border_filepath": "data/layouts/Route19/border.bin", "blockdata_filepath": "data/layouts/Route19/map.bin" }, @@ -1105,8 +1105,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B6C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_CinnabarIsland", "border_filepath": "data/layouts/Route20/border.bin", "blockdata_filepath": "data/layouts/Route20/map.bin" }, @@ -1117,8 +1117,8 @@ "height": 50, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4AAC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_PalletTown", "border_filepath": "data/layouts/Route21_North/border.bin", "blockdata_filepath": "data/layouts/Route21_North/map.bin" }, @@ -1129,8 +1129,8 @@ "height": 24, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4AC4", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_ViridianCity", "border_filepath": "data/layouts/Route22/border.bin", "blockdata_filepath": "data/layouts/Route22/map.bin" }, @@ -1141,8 +1141,8 @@ "height": 160, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B84", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_IndigoPlateau", "border_filepath": "data/layouts/Route23/border.bin", "blockdata_filepath": "data/layouts/Route23/map.bin" }, @@ -1153,8 +1153,8 @@ "height": 40, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4AF4", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_CeruleanCity", "border_filepath": "data/layouts/Route24/border.bin", "blockdata_filepath": "data/layouts/Route24/map.bin" }, @@ -1165,8 +1165,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4AF4", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_CeruleanCity", "border_filepath": "data/layouts/Route25/border.bin", "blockdata_filepath": "data/layouts/Route25/map.bin" }, @@ -1177,8 +1177,8 @@ "height": 40, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4BFC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", "border_filepath": "data/layouts/MtMoon_1F/border.bin", "blockdata_filepath": "data/layouts/MtMoon_1F/map.bin" }, @@ -1189,8 +1189,8 @@ "height": 40, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4BFC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", "border_filepath": "data/layouts/MtMoon_B1F/border.bin", "blockdata_filepath": "data/layouts/MtMoon_B1F/map.bin" }, @@ -1201,8 +1201,8 @@ "height": 40, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4BFC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", "border_filepath": "data/layouts/MtMoon_B2F/border.bin", "blockdata_filepath": "data/layouts/MtMoon_B2F/map.bin" }, @@ -1213,8 +1213,8 @@ "height": 69, "border_width": 3, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4DC4", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_ViridianForest", "border_filepath": "data/layouts/ViridianForest/border.bin", "blockdata_filepath": "data/layouts/ViridianForest/map.bin" }, @@ -1225,8 +1225,8 @@ "height": 32, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B24", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_VermilionCity", "border_filepath": "data/layouts/SSAnne_Exterior/border.bin", "blockdata_filepath": "data/layouts/SSAnne_Exterior/map.bin" }, @@ -1237,8 +1237,8 @@ "height": 21, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4D94", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SSAnne", "border_filepath": "data/layouts/SSAnne_1F_Corridor/border.bin", "blockdata_filepath": "data/layouts/SSAnne_1F_Corridor/map.bin" }, @@ -1249,8 +1249,8 @@ "height": 16, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4D94", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SSAnne", "border_filepath": "data/layouts/SSAnne_2F_Corridor/border.bin", "blockdata_filepath": "data/layouts/SSAnne_2F_Corridor/map.bin" }, @@ -1261,8 +1261,8 @@ "height": 7, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4D94", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SSAnne", "border_filepath": "data/layouts/SSAnne_3F_Corridor/border.bin", "blockdata_filepath": "data/layouts/SSAnne_3F_Corridor/map.bin" }, @@ -1273,8 +1273,8 @@ "height": 7, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4D94", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SSAnne", "border_filepath": "data/layouts/SSAnne_B1F_Corridor/border.bin", "blockdata_filepath": "data/layouts/SSAnne_B1F_Corridor/map.bin" }, @@ -1285,8 +1285,8 @@ "height": 19, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4D94", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SSAnne", "border_filepath": "data/layouts/SSAnne_Deck/border.bin", "blockdata_filepath": "data/layouts/SSAnne_Deck/map.bin" }, @@ -1297,8 +1297,8 @@ "height": 80, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4E0C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_DiglettsCave", "border_filepath": "data/layouts/DiglettsCave_B1F/border.bin", "blockdata_filepath": "data/layouts/DiglettsCave_B1F/map.bin" }, @@ -1309,8 +1309,8 @@ "height": 22, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4BFC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", "border_filepath": "data/layouts/VictoryRoad_1F/border.bin", "blockdata_filepath": "data/layouts/VictoryRoad_1F/map.bin" }, @@ -1321,8 +1321,8 @@ "height": 22, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4BFC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", "border_filepath": "data/layouts/VictoryRoad_2F/border.bin", "blockdata_filepath": "data/layouts/VictoryRoad_2F/map.bin" }, @@ -1333,8 +1333,8 @@ "height": 22, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4BFC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", "border_filepath": "data/layouts/VictoryRoad_3F/border.bin", "blockdata_filepath": "data/layouts/VictoryRoad_3F/map.bin" }, @@ -1345,8 +1345,8 @@ "height": 34, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4ECC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SilphCo", "border_filepath": "data/layouts/RocketHideout_B1F/border.bin", "blockdata_filepath": "data/layouts/RocketHideout_B1F/map.bin" }, @@ -1357,8 +1357,8 @@ "height": 22, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4ECC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SilphCo", "border_filepath": "data/layouts/RocketHideout_B2F/border.bin", "blockdata_filepath": "data/layouts/RocketHideout_B2F/map.bin" }, @@ -1369,8 +1369,8 @@ "height": 27, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4ECC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SilphCo", "border_filepath": "data/layouts/RocketHideout_B3F/border.bin", "blockdata_filepath": "data/layouts/RocketHideout_B3F/map.bin" }, @@ -1381,8 +1381,8 @@ "height": 26, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4ECC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SilphCo", "border_filepath": "data/layouts/RocketHideout_B4F/border.bin", "blockdata_filepath": "data/layouts/RocketHideout_B4F/map.bin" }, @@ -1393,8 +1393,8 @@ "height": 22, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4ECC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SilphCo", "border_filepath": "data/layouts/SilphCo_1F/border.bin", "blockdata_filepath": "data/layouts/SilphCo_1F/map.bin" }, @@ -1405,8 +1405,8 @@ "height": 22, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4ECC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SilphCo", "border_filepath": "data/layouts/SilphCo_2F/border.bin", "blockdata_filepath": "data/layouts/SilphCo_2F/map.bin" }, @@ -1417,8 +1417,8 @@ "height": 22, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4ECC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SilphCo", "border_filepath": "data/layouts/SilphCo_3F/border.bin", "blockdata_filepath": "data/layouts/SilphCo_3F/map.bin" }, @@ -1429,8 +1429,8 @@ "height": 22, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4ECC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SilphCo", "border_filepath": "data/layouts/SilphCo_4F/border.bin", "blockdata_filepath": "data/layouts/SilphCo_4F/map.bin" }, @@ -1441,8 +1441,8 @@ "height": 22, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4ECC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SilphCo", "border_filepath": "data/layouts/SilphCo_5F/border.bin", "blockdata_filepath": "data/layouts/SilphCo_5F/map.bin" }, @@ -1453,8 +1453,8 @@ "height": 19, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4ECC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SilphCo", "border_filepath": "data/layouts/SilphCo_6F/border.bin", "blockdata_filepath": "data/layouts/SilphCo_6F/map.bin" }, @@ -1465,8 +1465,8 @@ "height": 19, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4ECC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SilphCo", "border_filepath": "data/layouts/SilphCo_7F/border.bin", "blockdata_filepath": "data/layouts/SilphCo_7F/map.bin" }, @@ -1477,8 +1477,8 @@ "height": 19, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4ECC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SilphCo", "border_filepath": "data/layouts/SilphCo_8F/border.bin", "blockdata_filepath": "data/layouts/SilphCo_8F/map.bin" }, @@ -1489,8 +1489,8 @@ "height": 19, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4ECC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SilphCo", "border_filepath": "data/layouts/SilphCo_9F/border.bin", "blockdata_filepath": "data/layouts/SilphCo_9F/map.bin" }, @@ -1501,8 +1501,8 @@ "height": 19, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4ECC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SilphCo", "border_filepath": "data/layouts/SilphCo_10F/border.bin", "blockdata_filepath": "data/layouts/SilphCo_10F/map.bin" }, @@ -1513,8 +1513,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4ECC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SilphCo", "border_filepath": "data/layouts/SilphCo_11F/border.bin", "blockdata_filepath": "data/layouts/SilphCo_11F/map.bin" }, @@ -1525,8 +1525,8 @@ "height": 35, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4F2C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonMansion", "border_filepath": "data/layouts/PokemonMansion_1F/border.bin", "blockdata_filepath": "data/layouts/PokemonMansion_1F/map.bin" }, @@ -1537,8 +1537,8 @@ "height": 38, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4F2C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonMansion", "border_filepath": "data/layouts/PokemonMansion_2F/border.bin", "blockdata_filepath": "data/layouts/PokemonMansion_2F/map.bin" }, @@ -1549,8 +1549,8 @@ "height": 35, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4F2C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonMansion", "border_filepath": "data/layouts/PokemonMansion_3F/border.bin", "blockdata_filepath": "data/layouts/PokemonMansion_3F/map.bin" }, @@ -1561,8 +1561,8 @@ "height": 35, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4F2C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonMansion", "border_filepath": "data/layouts/PokemonMansion_B1F/border.bin", "blockdata_filepath": "data/layouts/PokemonMansion_B1F/map.bin" }, @@ -1573,8 +1573,8 @@ "height": 36, "border_width": 3, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B54", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_FuchsiaCity", "border_filepath": "data/layouts/SafariZone_Center/border.bin", "blockdata_filepath": "data/layouts/SafariZone_Center/map.bin" }, @@ -1585,8 +1585,8 @@ "height": 35, "border_width": 3, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B54", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_FuchsiaCity", "border_filepath": "data/layouts/SafariZone_East/border.bin", "blockdata_filepath": "data/layouts/SafariZone_East/map.bin" }, @@ -1597,8 +1597,8 @@ "height": 40, "border_width": 3, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B54", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_FuchsiaCity", "border_filepath": "data/layouts/SafariZone_North/border.bin", "blockdata_filepath": "data/layouts/SafariZone_North/map.bin" }, @@ -1609,8 +1609,8 @@ "height": 36, "border_width": 3, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B54", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_FuchsiaCity", "border_filepath": "data/layouts/SafariZone_West/border.bin", "blockdata_filepath": "data/layouts/SafariZone_West/map.bin" }, @@ -1621,8 +1621,8 @@ "height": 23, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4E54", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_CeruleanCave", "border_filepath": "data/layouts/CeruleanCave_1F/border.bin", "blockdata_filepath": "data/layouts/CeruleanCave_1F/map.bin" }, @@ -1633,8 +1633,8 @@ "height": 23, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4E54", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_CeruleanCave", "border_filepath": "data/layouts/CeruleanCave_2F/border.bin", "blockdata_filepath": "data/layouts/CeruleanCave_2F/map.bin" }, @@ -1645,8 +1645,8 @@ "height": 23, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4E54", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_CeruleanCave", "border_filepath": "data/layouts/CeruleanCave_B1F/border.bin", "blockdata_filepath": "data/layouts/CeruleanCave_B1F/map.bin" }, @@ -1657,8 +1657,8 @@ "height": 40, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4DF4", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_RockTunnel", "border_filepath": "data/layouts/RockTunnel_1F/border.bin", "blockdata_filepath": "data/layouts/RockTunnel_1F/map.bin" }, @@ -1669,8 +1669,8 @@ "height": 40, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4DF4", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_RockTunnel", "border_filepath": "data/layouts/RockTunnel_B1F/border.bin", "blockdata_filepath": "data/layouts/RockTunnel_B1F/map.bin" }, @@ -1681,8 +1681,8 @@ "height": 24, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4E24", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeafoamIslands", "border_filepath": "data/layouts/SeafoamIslands_1F/border.bin", "blockdata_filepath": "data/layouts/SeafoamIslands_1F/map.bin" }, @@ -1693,8 +1693,8 @@ "height": 23, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4E24", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeafoamIslands", "border_filepath": "data/layouts/SeafoamIslands_B1F/border.bin", "blockdata_filepath": "data/layouts/SeafoamIslands_B1F/map.bin" }, @@ -1705,8 +1705,8 @@ "height": 24, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4E24", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeafoamIslands", "border_filepath": "data/layouts/SeafoamIslands_B2F/border.bin", "blockdata_filepath": "data/layouts/SeafoamIslands_B2F/map.bin" }, @@ -1717,8 +1717,8 @@ "height": 24, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4E24", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeafoamIslands", "border_filepath": "data/layouts/SeafoamIslands_B3F/border.bin", "blockdata_filepath": "data/layouts/SeafoamIslands_B3F/map.bin" }, @@ -1729,8 +1729,8 @@ "height": 24, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4E24", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeafoamIslands", "border_filepath": "data/layouts/SeafoamIslands_B4F/border.bin", "blockdata_filepath": "data/layouts/SeafoamIslands_B4F/map.bin" }, @@ -1741,8 +1741,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4EFC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonTower", "border_filepath": "data/layouts/PokemonTower_1F/border.bin", "blockdata_filepath": "data/layouts/PokemonTower_1F/map.bin" }, @@ -1753,8 +1753,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4EFC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonTower", "border_filepath": "data/layouts/PokemonTower_2F/border.bin", "blockdata_filepath": "data/layouts/PokemonTower_2F/map.bin" }, @@ -1765,8 +1765,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4EFC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonTower", "border_filepath": "data/layouts/PokemonTower_3F/border.bin", "blockdata_filepath": "data/layouts/PokemonTower_3F/map.bin" }, @@ -1777,8 +1777,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4EFC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonTower", "border_filepath": "data/layouts/PokemonTower_4F/border.bin", "blockdata_filepath": "data/layouts/PokemonTower_4F/map.bin" }, @@ -1789,8 +1789,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4EFC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonTower", "border_filepath": "data/layouts/PokemonTower_5F/border.bin", "blockdata_filepath": "data/layouts/PokemonTower_5F/map.bin" }, @@ -1801,8 +1801,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4EFC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonTower", "border_filepath": "data/layouts/PokemonTower_6F/border.bin", "blockdata_filepath": "data/layouts/PokemonTower_6F/map.bin" }, @@ -1813,8 +1813,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4EFC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonTower", "border_filepath": "data/layouts/PokemonTower_7F/border.bin", "blockdata_filepath": "data/layouts/PokemonTower_7F/map.bin" }, @@ -1825,8 +1825,8 @@ "height": 40, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4E9C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PowerPlant", "border_filepath": "data/layouts/PowerPlant/border.bin", "blockdata_filepath": "data/layouts/PowerPlant/map.bin" }, @@ -1837,8 +1837,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4EB4", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SeaCottage", "border_filepath": "data/layouts/Route25_SeaCottage/border.bin", "blockdata_filepath": "data/layouts/Route25_SeaCottage/map.bin" }, @@ -1849,8 +1849,8 @@ "height": 14, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4D94", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SSAnne", "border_filepath": "data/layouts/SSAnne_Kitchen/border.bin", "blockdata_filepath": "data/layouts/SSAnne_Kitchen/map.bin" }, @@ -1861,8 +1861,8 @@ "height": 10, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4D94", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SSAnne", "border_filepath": "data/layouts/SSAnne_CaptainsOffice/border.bin", "blockdata_filepath": "data/layouts/SSAnne_CaptainsOffice/map.bin" }, @@ -1873,8 +1873,8 @@ "height": 10, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4E84", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Building2", "border_filepath": "data/layouts/UndergroundPath_Entrance/border.bin", "blockdata_filepath": "data/layouts/UndergroundPath_Entrance/map.bin" }, @@ -1885,8 +1885,8 @@ "height": 7, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4EE4", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_UndergroundPath", "border_filepath": "data/layouts/UndergroundPath_EastWestTunnel/border.bin", "blockdata_filepath": "data/layouts/UndergroundPath_EastWestTunnel/map.bin" }, @@ -1897,8 +1897,8 @@ "height": 63, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4EE4", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_UndergroundPath", "border_filepath": "data/layouts/UndergroundPath_NorthSouthTunnel/border.bin", "blockdata_filepath": "data/layouts/UndergroundPath_NorthSouthTunnel/map.bin" }, @@ -1910,8 +1910,8 @@ "height": 13, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4E84", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Building2", "border_filepath": "data/layouts/Route12_NorthEntrance_1F/border.bin", "blockdata_filepath": "data/layouts/Route12_NorthEntrance_1F/map.bin" }, @@ -1922,8 +1922,8 @@ "height": 8, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4D94", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SSAnne", "border_filepath": "data/layouts/SSAnne_Room1/border.bin", "blockdata_filepath": "data/layouts/SSAnne_Room1/map.bin" }, @@ -1934,8 +1934,8 @@ "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4D94", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SSAnne", "border_filepath": "data/layouts/SSAnne_Room2/border.bin", "blockdata_filepath": "data/layouts/SSAnne_Room2/map.bin" }, @@ -1946,8 +1946,8 @@ "height": 7, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4ECC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SilphCo", "border_filepath": "data/layouts/CeladonCity_DepartmentStore_Elevator/border.bin", "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_Elevator/map.bin" }, @@ -1958,8 +1958,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4C2C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Museum", "border_filepath": "data/layouts/PewterCity_Museum_1F/border.bin", "blockdata_filepath": "data/layouts/PewterCity_Museum_1F/map.bin" }, @@ -1970,8 +1970,8 @@ "height": 10, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4C2C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Museum", "border_filepath": "data/layouts/PewterCity_Museum_2F/border.bin", "blockdata_filepath": "data/layouts/PewterCity_Museum_2F/map.bin" }, @@ -1982,8 +1982,8 @@ "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4FA4", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BurgledHouse", "border_filepath": "data/layouts/CeruleanCity_House2/border.bin", "blockdata_filepath": "data/layouts/CeruleanCity_House2/map.bin" }, @@ -1994,8 +1994,8 @@ "height": 10, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4E84", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Building2", "border_filepath": "data/layouts/CeruleanCity_House1/border.bin", "blockdata_filepath": "data/layouts/CeruleanCity_House1/map.bin" }, @@ -2006,8 +2006,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4F8C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Condominiums", "border_filepath": "data/layouts/CeladonCity_Condominiums_1F/border.bin", "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_1F/map.bin" }, @@ -2018,8 +2018,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4F8C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Condominiums", "border_filepath": "data/layouts/CeladonCity_Condominiums_2F/border.bin", "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_2F/map.bin" }, @@ -2030,8 +2030,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4F8C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Condominiums", "border_filepath": "data/layouts/CeladonCity_Condominiums_3F/border.bin", "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_3F/map.bin" }, @@ -2042,8 +2042,8 @@ "height": 23, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4F8C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Condominiums", "border_filepath": "data/layouts/CeladonCity_Condominiums_Roof/border.bin", "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_Roof/map.bin" }, @@ -2054,8 +2054,8 @@ "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4F5C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_School", "border_filepath": "data/layouts/CeladonCity_Condominiums_RoofRoom/border.bin", "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_RoofRoom/map.bin" }, @@ -2066,8 +2066,8 @@ "height": 10, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4CEC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GameCorner", "border_filepath": "data/layouts/CeladonCity_GameCorner_PrizeRoom/border.bin", "blockdata_filepath": "data/layouts/CeladonCity_GameCorner_PrizeRoom/map.bin" }, @@ -2078,8 +2078,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4F44", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_RestaurantHotel", "border_filepath": "data/layouts/CeladonCity_Restaurant/border.bin", "blockdata_filepath": "data/layouts/CeladonCity_Restaurant/map.bin" }, @@ -2090,8 +2090,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4F44", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_RestaurantHotel", "border_filepath": "data/layouts/CeladonCity_Hotel/border.bin", "blockdata_filepath": "data/layouts/CeladonCity_Hotel/map.bin" }, @@ -2102,8 +2102,8 @@ "height": 16, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4E6C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_DepartmentStore", "border_filepath": "data/layouts/CeladonCity_DepartmentStore_1F/border.bin", "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_1F/map.bin" }, @@ -2114,8 +2114,8 @@ "height": 15, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4E6C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_DepartmentStore", "border_filepath": "data/layouts/CeladonCity_DepartmentStore_2F/border.bin", "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_2F/map.bin" }, @@ -2126,8 +2126,8 @@ "height": 15, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4E6C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_DepartmentStore", "border_filepath": "data/layouts/CeladonCity_DepartmentStore_3F/border.bin", "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_3F/map.bin" }, @@ -2138,8 +2138,8 @@ "height": 15, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4E6C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_DepartmentStore", "border_filepath": "data/layouts/CeladonCity_DepartmentStore_4F/border.bin", "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_4F/map.bin" }, @@ -2150,8 +2150,8 @@ "height": 15, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4E6C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_DepartmentStore", "border_filepath": "data/layouts/CeladonCity_DepartmentStore_5F/border.bin", "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_5F/map.bin" }, @@ -2162,8 +2162,8 @@ "height": 14, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4E6C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_DepartmentStore", "border_filepath": "data/layouts/CeladonCity_DepartmentStore_Roof/border.bin", "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_Roof/map.bin" }, @@ -2174,8 +2174,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4F14", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SafariZoneBuilding", "border_filepath": "data/layouts/SafariZone_RestHouse/border.bin", "blockdata_filepath": "data/layouts/SafariZone_RestHouse/map.bin" }, @@ -2186,8 +2186,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4F14", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SafariZoneBuilding", "border_filepath": "data/layouts/SafariZone_SecretHouse/border.bin", "blockdata_filepath": "data/layouts/SafariZone_SecretHouse/map.bin" }, @@ -2198,8 +2198,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4F14", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SafariZoneBuilding", "border_filepath": "data/layouts/FuchsiaCity_SafariZone_Office/border.bin", "blockdata_filepath": "data/layouts/FuchsiaCity_SafariZone_Office/map.bin" }, @@ -2210,8 +2210,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4C2C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Museum", "border_filepath": "data/layouts/FuchsiaCity_WardensHouse/border.bin", "blockdata_filepath": "data/layouts/FuchsiaCity_WardensHouse/map.bin" }, @@ -2222,8 +2222,8 @@ "height": 10, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4C2C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Museum", "border_filepath": "data/layouts/FuchsiaCity_House2/border.bin", "blockdata_filepath": "data/layouts/FuchsiaCity_House2/map.bin" }, @@ -2234,8 +2234,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4C8C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Lab", "border_filepath": "data/layouts/CinnabarIsland_PokemonLab_Entrance/border.bin", "blockdata_filepath": "data/layouts/CinnabarIsland_PokemonLab_Entrance/map.bin" }, @@ -2246,8 +2246,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4C8C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Lab", "border_filepath": "data/layouts/CinnabarIsland_PokemonLab_Lounge/border.bin", "blockdata_filepath": "data/layouts/CinnabarIsland_PokemonLab_Lounge/map.bin" }, @@ -2258,8 +2258,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4C8C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Lab", "border_filepath": "data/layouts/CinnabarIsland_PokemonLab_ResearchRoom/border.bin", "blockdata_filepath": "data/layouts/CinnabarIsland_PokemonLab_ResearchRoom/map.bin" }, @@ -2270,8 +2270,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4C8C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Lab", "border_filepath": "data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom/border.bin", "blockdata_filepath": "data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom/map.bin" }, @@ -2282,8 +2282,8 @@ "height": 55, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B9C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SaffronCity", "border_filepath": "data/layouts/SaffronCity/border.bin", "blockdata_filepath": "data/layouts/SaffronCity/map.bin" }, @@ -2294,8 +2294,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4E84", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Building2", "border_filepath": "data/layouts/SaffronCity_NorthSouthEntrance/border.bin", "blockdata_filepath": "data/layouts/SaffronCity_NorthSouthEntrance/map.bin" }, @@ -2306,8 +2306,8 @@ "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4E84", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Building2", "border_filepath": "data/layouts/SaffronCity_EastWestEntrance/border.bin", "blockdata_filepath": "data/layouts/SaffronCity_EastWestEntrance/map.bin" }, @@ -2318,8 +2318,8 @@ "height": 8, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4E0C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_DiglettsCave", "border_filepath": "data/layouts/DiglettsCave_NorthEntrance/border.bin", "blockdata_filepath": "data/layouts/DiglettsCave_NorthEntrance/map.bin" }, @@ -2330,8 +2330,8 @@ "height": 8, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4E0C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_DiglettsCave", "border_filepath": "data/layouts/DiglettsCave_SouthEntrance/border.bin", "blockdata_filepath": "data/layouts/DiglettsCave_SouthEntrance/map.bin" }, @@ -2342,8 +2342,8 @@ "height": 18, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4BE4", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonCenter", "border_filepath": "data/layouts/IndigoPlateau_PokemonCenter_1F/border.bin", "blockdata_filepath": "data/layouts/IndigoPlateau_PokemonCenter_1F/map.bin" }, @@ -2354,8 +2354,8 @@ "height": 13, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D50C4", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonLeague", "border_filepath": "data/layouts/PokemonLeague_LoreleisRoom/border.bin", "blockdata_filepath": "data/layouts/PokemonLeague_LoreleisRoom/map.bin" }, @@ -2366,8 +2366,8 @@ "height": 13, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D50C4", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonLeague", "border_filepath": "data/layouts/PokemonLeague_BrunosRoom/border.bin", "blockdata_filepath": "data/layouts/PokemonLeague_BrunosRoom/map.bin" }, @@ -2378,8 +2378,8 @@ "height": 13, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D50C4", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonLeague", "border_filepath": "data/layouts/PokemonLeague_AgathasRoom/border.bin", "blockdata_filepath": "data/layouts/PokemonLeague_AgathasRoom/map.bin" }, @@ -2390,8 +2390,8 @@ "height": 24, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D50C4", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonLeague", "border_filepath": "data/layouts/PokemonLeague_LancesRoom/border.bin", "blockdata_filepath": "data/layouts/PokemonLeague_LancesRoom/map.bin" }, @@ -2402,8 +2402,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D50C4", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonLeague", "border_filepath": "data/layouts/PokemonLeague_ChampionsRoom/border.bin", "blockdata_filepath": "data/layouts/PokemonLeague_ChampionsRoom/map.bin" }, @@ -2414,8 +2414,8 @@ "height": 13, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D50DC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_HallOfFame", "border_filepath": "data/layouts/PokemonLeague_HallOfFame/border.bin", "blockdata_filepath": "data/layouts/PokemonLeague_HallOfFame/map.bin" }, @@ -2426,8 +2426,8 @@ "height": 50, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B6C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_CinnabarIsland", "border_filepath": "data/layouts/Route21_South/border.bin", "blockdata_filepath": "data/layouts/Route21_South/map.bin" }, @@ -2438,8 +2438,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4E84", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Building2", "border_filepath": "data/layouts/Entrance_2F/border.bin", "blockdata_filepath": "data/layouts/Entrance_2F/map.bin" }, @@ -2450,8 +2450,8 @@ "height": 12, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4E84", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Building2", "border_filepath": "data/layouts/Route2_Entrance/border.bin", "blockdata_filepath": "data/layouts/Route2_Entrance/map.bin" }, @@ -2462,8 +2462,8 @@ "height": 12, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4E84", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Building2", "border_filepath": "data/layouts/Route22_NorthEntrance/border.bin", "blockdata_filepath": "data/layouts/Route22_NorthEntrance/map.bin" }, @@ -2474,8 +2474,8 @@ "height": 18, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4E84", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Building2", "border_filepath": "data/layouts/Route16_NorthEntrance_1F/border.bin", "blockdata_filepath": "data/layouts/Route16_NorthEntrance_1F/map.bin" }, @@ -2486,8 +2486,8 @@ "height": 12, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4E84", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Building2", "border_filepath": "data/layouts/Entrance_1F/border.bin", "blockdata_filepath": "data/layouts/Entrance_1F/map.bin" }, @@ -2498,8 +2498,8 @@ "height": 7, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4ECC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SilphCo", "border_filepath": "data/layouts/RocketHideout_Elevator/border.bin", "blockdata_filepath": "data/layouts/RocketHideout_Elevator/map.bin" }, @@ -2510,8 +2510,8 @@ "height": 10, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4C74", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Building1", "border_filepath": "data/layouts/SaffronCity_House1_1F/border.bin", "blockdata_filepath": "data/layouts/SaffronCity_House1_1F/map.bin" }, @@ -2522,8 +2522,8 @@ "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4C74", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Building1", "border_filepath": "data/layouts/SaffronCity_House1_2F/border.bin", "blockdata_filepath": "data/layouts/SaffronCity_House1_2F/map.bin" }, @@ -2534,8 +2534,8 @@ "height": 16, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4D04", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PewterGym", "border_filepath": "data/layouts/SaffronCity_Dojo/border.bin", "blockdata_filepath": "data/layouts/SaffronCity_Dojo/map.bin" }, @@ -2546,8 +2546,8 @@ "height": 7, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4ECC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SilphCo", "border_filepath": "data/layouts/SilphCo_Elevator/border.bin", "blockdata_filepath": "data/layouts/SilphCo_Elevator/map.bin" }, @@ -2558,8 +2558,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D504C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeviiIslands123", "border_filepath": "data/layouts/OneIsland/border.bin", "blockdata_filepath": "data/layouts/OneIsland/map.bin" }, @@ -2570,8 +2570,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D504C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeviiIslands123", "border_filepath": "data/layouts/TwoIsland/border.bin", "blockdata_filepath": "data/layouts/TwoIsland/map.bin" }, @@ -2582,8 +2582,8 @@ "height": 40, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D504C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeviiIslands123", "border_filepath": "data/layouts/ThreeIsland/border.bin", "blockdata_filepath": "data/layouts/ThreeIsland/map.bin" }, @@ -2594,8 +2594,8 @@ "height": 40, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D5064", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeviiIslands45", "border_filepath": "data/layouts/FourIsland/border.bin", "blockdata_filepath": "data/layouts/FourIsland/map.bin" }, @@ -2606,8 +2606,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D5064", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeviiIslands45", "border_filepath": "data/layouts/FiveIsland/border.bin", "blockdata_filepath": "data/layouts/FiveIsland/map.bin" }, @@ -2618,8 +2618,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D507C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeviiIslands67", "border_filepath": "data/layouts/SevenIsland/border.bin", "blockdata_filepath": "data/layouts/SevenIsland/map.bin" }, @@ -2630,8 +2630,8 @@ "height": 30, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D507C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeviiIslands67", "border_filepath": "data/layouts/SixIsland/border.bin", "blockdata_filepath": "data/layouts/SixIsland/map.bin" }, @@ -2642,8 +2642,8 @@ "height": 140, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D504C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeviiIslands123", "border_filepath": "data/layouts/OneIsland_KindleRoad/border.bin", "blockdata_filepath": "data/layouts/OneIsland_KindleRoad/map.bin" }, @@ -2654,8 +2654,8 @@ "height": 40, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D504C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeviiIslands123", "border_filepath": "data/layouts/OneIsland_TreasureBeach/border.bin", "blockdata_filepath": "data/layouts/OneIsland_TreasureBeach/map.bin" }, @@ -2666,8 +2666,8 @@ "height": 40, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D504C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeviiIslands123", "border_filepath": "data/layouts/TwoIsland_CapeBrink/border.bin", "blockdata_filepath": "data/layouts/TwoIsland_CapeBrink/map.bin" }, @@ -2678,8 +2678,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D504C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeviiIslands123", "border_filepath": "data/layouts/ThreeIsland_BondBridge/border.bin", "blockdata_filepath": "data/layouts/ThreeIsland_BondBridge/map.bin" }, @@ -2690,58 +2690,58 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D504C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeviiIslands123", "border_filepath": "data/layouts/ThreeIsland_Port/border.bin", "blockdata_filepath": "data/layouts/ThreeIsland_Port/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_03_50", - "name": "UnknownMap_03_50_Layout", + "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_6", + "name": "Prototype_SeviiIsle_6_Layout", "width": 1, "height": 1, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B3C", - "border_filepath": "data/layouts/UnknownMap_03_50/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_03_50/map.bin" + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_CeladonCity", + "border_filepath": "data/layouts/Prototype_SeviiIsle_6/border.bin", + "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_6/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_03_51", - "name": "UnknownMap_03_51_Layout", + "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_7", + "name": "Prototype_SeviiIsle_7_Layout", "width": 1, "height": 1, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B3C", - "border_filepath": "data/layouts/UnknownMap_03_51/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_03_51/map.bin" + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_CeladonCity", + "border_filepath": "data/layouts/Prototype_SeviiIsle_7/border.bin", + "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_7/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_03_52", - "name": "UnknownMap_03_52_Layout", + "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_8", + "name": "Prototype_SeviiIsle_8_Layout", "width": 84, "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B3C", - "border_filepath": "data/layouts/UnknownMap_03_52/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_03_52/map.bin" + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_CeladonCity", + "border_filepath": "data/layouts/Prototype_SeviiIsle_8/border.bin", + "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_8/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_03_53", - "name": "UnknownMap_03_53_Layout", + "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_9", + "name": "Prototype_SeviiIsle_9_Layout", "width": 24, "height": 60, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4B3C", - "border_filepath": "data/layouts/UnknownMap_03_53/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_03_53/map.bin" + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_CeladonCity", + "border_filepath": "data/layouts/Prototype_SeviiIsle_9/border.bin", + "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_9/map.bin" }, { "id": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS", @@ -2750,8 +2750,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D5064", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeviiIslands45", "border_filepath": "data/layouts/FiveIsland_ResortGorgeous/border.bin", "blockdata_filepath": "data/layouts/FiveIsland_ResortGorgeous/map.bin" }, @@ -2762,8 +2762,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D5064", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeviiIslands45", "border_filepath": "data/layouts/FiveIsland_WaterLabyrinth/border.bin", "blockdata_filepath": "data/layouts/FiveIsland_WaterLabyrinth/map.bin" }, @@ -2774,8 +2774,8 @@ "height": 40, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D5064", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeviiIslands45", "border_filepath": "data/layouts/FiveIsland_Meadow/border.bin", "blockdata_filepath": "data/layouts/FiveIsland_Meadow/map.bin" }, @@ -2786,8 +2786,8 @@ "height": 60, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D5064", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeviiIslands45", "border_filepath": "data/layouts/FiveIsland_MemorialPillar/border.bin", "blockdata_filepath": "data/layouts/FiveIsland_MemorialPillar/map.bin" }, @@ -2798,8 +2798,8 @@ "height": 80, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D507C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeviiIslands67", "border_filepath": "data/layouts/SixIsland_OutcastIsland/border.bin", "blockdata_filepath": "data/layouts/SixIsland_OutcastIsland/map.bin" }, @@ -2810,8 +2810,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D507C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeviiIslands67", "border_filepath": "data/layouts/SixIsland_GreenPath/border.bin", "blockdata_filepath": "data/layouts/SixIsland_GreenPath/map.bin" }, @@ -2822,8 +2822,8 @@ "height": 100, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D507C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeviiIslands67", "border_filepath": "data/layouts/SixIsland_WaterPath/border.bin", "blockdata_filepath": "data/layouts/SixIsland_WaterPath/map.bin" }, @@ -2834,8 +2834,8 @@ "height": 40, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D507C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeviiIslands67", "border_filepath": "data/layouts/SixIsland_RuinValley/border.bin", "blockdata_filepath": "data/layouts/SixIsland_RuinValley/map.bin" }, @@ -2846,8 +2846,8 @@ "height": 40, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D507C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeviiIslands67", "border_filepath": "data/layouts/SevenIsland_TrainerTower/border.bin", "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower/map.bin" }, @@ -2858,8 +2858,8 @@ "height": 40, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D507C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeviiIslands67", "border_filepath": "data/layouts/SevenIsland_SevaultCanyon_Entrance/border.bin", "blockdata_filepath": "data/layouts/SevenIsland_SevaultCanyon_Entrance/map.bin" }, @@ -2870,8 +2870,8 @@ "height": 80, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D507C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeviiIslands67", "border_filepath": "data/layouts/SevenIsland_SevaultCanyon/border.bin", "blockdata_filepath": "data/layouts/SevenIsland_SevaultCanyon/map.bin" }, @@ -2882,58 +2882,58 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D507C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeviiIslands67", "border_filepath": "data/layouts/SevenIsland_TanobyRuins/border.bin", "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_833614C", - "name": "UnusedLayout_833614C_Layout", + "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_22", + "name": "Prototype_SeviiIsle_22_Layout", "width": 24, "height": 60, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4AAC", - "border_filepath": "data/layouts/UnusedLayout_833614C/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_833614C/map.bin" + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_PalletTown", + "border_filepath": "data/layouts/Prototype_SeviiIsle_22/border.bin", + "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_22/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_83377F0", - "name": "UnusedLayout_83377F0_Layout", + "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_23_EAST", + "name": "Prototype_SeviiIsle_23_East_Layout", "width": 144, "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4AAC", - "border_filepath": "data/layouts/UnusedLayout_83377F0/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_83377F0/map.bin" + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_PalletTown", + "border_filepath": "data/layouts/Prototype_SeviiIsle_23_East/border.bin", + "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_23_East/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_8338354", - "name": "UnusedLayout_8338354_Layout", + "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_23_WEST", + "name": "Prototype_SeviiIsle_23_West_Layout", "width": 24, "height": 60, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4AAC", - "border_filepath": "data/layouts/UnusedLayout_8338354/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_8338354/map.bin" + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_PalletTown", + "border_filepath": "data/layouts/Prototype_SeviiIsle_23_West/border.bin", + "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_23_West/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_8338738", - "name": "UnusedLayout_8338738_Layout", + "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_24", + "name": "Prototype_SeviiIsle_24_Layout", "width": 24, "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4AAC", - "border_filepath": "data/layouts/UnusedLayout_8338738/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_8338738/map.bin" + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_PalletTown", + "border_filepath": "data/layouts/Prototype_SeviiIsle_24/border.bin", + "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_24/map.bin" }, { "id": "LAYOUT_UNION_ROOM", @@ -2942,8 +2942,8 @@ "height": 12, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D50DC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_HallOfFame", "border_filepath": "data/layouts/UnionRoom/border.bin", "blockdata_filepath": "data/layouts/UnionRoom/map.bin" }, @@ -2954,22 +2954,22 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4F74", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_FanClubDaycare", "border_filepath": "data/layouts/SaffronCity_PokemonTrainerFanClub/border.bin", "blockdata_filepath": "data/layouts/SaffronCity_PokemonTrainerFanClub/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_8338B4C", - "name": "UnusedLayout_8338B4C_Layout", + "id": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1_DOOR_OPEN", + "name": "SevenIsland_House_Room1_DoorOpen_Layout", "width": 11, "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4E84", - "border_filepath": "data/layouts/UnusedLayout_8338B4C/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_8338B4C/map.bin" + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Building2", + "border_filepath": "data/layouts/SevenIsland_House_Room1_DoorOpen/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland_House_Room1_DoorOpen/map.bin" }, { "id": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM2", @@ -2978,8 +2978,8 @@ "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4E84", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Building2", "border_filepath": "data/layouts/SevenIsland_House_Room2/border.bin", "blockdata_filepath": "data/layouts/SevenIsland_House_Room2/map.bin" }, @@ -2990,34 +2990,34 @@ "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4F5C", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_School", "border_filepath": "data/layouts/ViridianCity_House2/border.bin", "blockdata_filepath": "data/layouts/ViridianCity_House2/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_8338E90", - "name": "UnusedLayout_8338E90_Layout", + "id": "LAYOUT_CELADON_CITY_RESTAURANT_DUPLICATE", + "name": "CeladonCity_Restaurant_Duplicate_Layout", "width": 15, "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4F44", - "border_filepath": "data/layouts/UnusedLayout_8338E90/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_8338E90/map.bin" + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_RestaurantHotel", + "border_filepath": "data/layouts/CeladonCity_Restaurant_Duplicate/border.bin", + "blockdata_filepath": "data/layouts/CeladonCity_Restaurant_Duplicate/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_833902C", - "name": "UnusedLayout_833902C_Layout", + "id": "LAYOUT_CELADON_CITY_HOTEL_DUPLICATE", + "name": "CeladonCity_Hotel_Duplicate_Layout", "width": 17, "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4F44", - "border_filepath": "data/layouts/UnusedLayout_833902C/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_833902C/map.bin" + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_RestaurantHotel", + "border_filepath": "data/layouts/CeladonCity_Hotel_Duplicate/border.bin", + "blockdata_filepath": "data/layouts/CeladonCity_Hotel_Duplicate/map.bin" }, { "id": "LAYOUT_MT_EMBER_RUBY_PATH_B4F", @@ -3026,8 +3026,8 @@ "height": 16, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4FEC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MtEmber", "border_filepath": "data/layouts/MtEmber_RubyPath_B4F/border.bin", "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B4F/map.bin" }, @@ -3038,8 +3038,8 @@ "height": 47, "border_width": 3, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D5004", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_BerryForest", "border_filepath": "data/layouts/ThreeIsland_BerryForest/border.bin", "blockdata_filepath": "data/layouts/ThreeIsland_BerryForest/map.bin" }, @@ -3050,8 +3050,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4BE4", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonCenter", "border_filepath": "data/layouts/OneIsland_PokemonCenter_1F/border.bin", "blockdata_filepath": "data/layouts/OneIsland_PokemonCenter_1F/map.bin" }, @@ -3062,8 +3062,8 @@ "height": 10, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4CEC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GameCorner", "border_filepath": "data/layouts/TwoIsland_JoyfulGameCorner/border.bin", "blockdata_filepath": "data/layouts/TwoIsland_JoyfulGameCorner/map.bin" }, @@ -3074,8 +3074,8 @@ "height": 12, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4F74", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_FanClubDaycare", "border_filepath": "data/layouts/VermilionCity_PokemonFanClub/border.bin", "blockdata_filepath": "data/layouts/VermilionCity_PokemonFanClub/map.bin" }, @@ -3086,8 +3086,8 @@ "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4F74", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_FanClubDaycare", "border_filepath": "data/layouts/LavenderTown_VolunteerPokemonHouse/border.bin", "blockdata_filepath": "data/layouts/LavenderTown_VolunteerPokemonHouse/map.bin" }, @@ -3098,8 +3098,8 @@ "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4F74", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_FanClubDaycare", "border_filepath": "data/layouts/Route5_PokemonDayCare/border.bin", "blockdata_filepath": "data/layouts/Route5_PokemonDayCare/map.bin" }, @@ -3110,8 +3110,8 @@ "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4E84", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Building2", "border_filepath": "data/layouts/ViridianCity_House1/border.bin", "blockdata_filepath": "data/layouts/ViridianCity_House1/map.bin" }, @@ -3122,8 +3122,8 @@ "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4F74", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_FanClubDaycare", "border_filepath": "data/layouts/FourIsland_PokemonDayCare/border.bin", "blockdata_filepath": "data/layouts/FourIsland_PokemonDayCare/map.bin" }, @@ -3134,8 +3134,8 @@ "height": 24, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4E24", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeafoamIslands", "border_filepath": "data/layouts/SeafoamIslands_B3F_CurrentStopped/border.bin", "blockdata_filepath": "data/layouts/SeafoamIslands_B3F_CurrentStopped/map.bin" }, @@ -3146,8 +3146,8 @@ "height": 24, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4E24", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeafoamIslands", "border_filepath": "data/layouts/SeafoamIslands_B4F_CurrentStopped/border.bin", "blockdata_filepath": "data/layouts/SeafoamIslands_B4F_CurrentStopped/map.bin" }, @@ -3158,8 +3158,8 @@ "height": 54, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D504C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeviiIslands123", "border_filepath": "data/layouts/MtEmber_Exterior/border.bin", "blockdata_filepath": "data/layouts/MtEmber_Exterior/map.bin" }, @@ -3170,8 +3170,8 @@ "height": 22, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D504C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeviiIslands123", "border_filepath": "data/layouts/MtEmber_Summit/border.bin", "blockdata_filepath": "data/layouts/MtEmber_Summit/map.bin" }, @@ -3182,8 +3182,8 @@ "height": 18, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4FEC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MtEmber", "border_filepath": "data/layouts/MtEmber_SummitPath_1F/border.bin", "blockdata_filepath": "data/layouts/MtEmber_SummitPath_1F/map.bin" }, @@ -3194,8 +3194,8 @@ "height": 46, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4FEC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MtEmber", "border_filepath": "data/layouts/MtEmber_SummitPath_2F/border.bin", "blockdata_filepath": "data/layouts/MtEmber_SummitPath_2F/map.bin" }, @@ -3206,8 +3206,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4FEC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MtEmber", "border_filepath": "data/layouts/MtEmber_SummitPath_3F/border.bin", "blockdata_filepath": "data/layouts/MtEmber_SummitPath_3F/map.bin" }, @@ -3218,8 +3218,8 @@ "height": 19, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4FEC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MtEmber", "border_filepath": "data/layouts/MtEmber_RubyPath_1F/border.bin", "blockdata_filepath": "data/layouts/MtEmber_RubyPath_1F/map.bin" }, @@ -3230,8 +3230,8 @@ "height": 23, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4FEC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MtEmber", "border_filepath": "data/layouts/MtEmber_RubyPath_B1F/border.bin", "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B1F/map.bin" }, @@ -3242,8 +3242,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4FEC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MtEmber", "border_filepath": "data/layouts/MtEmber_RubyPath_B2F/border.bin", "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B2F/map.bin" }, @@ -3254,8 +3254,8 @@ "height": 23, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4FEC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MtEmber", "border_filepath": "data/layouts/MtEmber_RubyPath_B3F/border.bin", "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B3F/map.bin" }, @@ -3266,8 +3266,8 @@ "height": 7, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4FEC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MtEmber", "border_filepath": "data/layouts/MtEmber_RubyPath_B1F_Stairs/border.bin", "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B1F_Stairs/map.bin" }, @@ -3278,8 +3278,8 @@ "height": 6, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4FEC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MtEmber", "border_filepath": "data/layouts/MtEmber_RubyPath_B2F_Stairs/border.bin", "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B2F_Stairs/map.bin" }, @@ -3290,8 +3290,8 @@ "height": 15, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4FEC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MtEmber", "border_filepath": "data/layouts/MtEmber_RubyPath_B5F/border.bin", "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B5F/map.bin" }, @@ -3302,8 +3302,8 @@ "height": 27, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4ECC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SilphCo", "border_filepath": "data/layouts/FiveIsland_RocketWarehouse/border.bin", "blockdata_filepath": "data/layouts/FiveIsland_RocketWarehouse/map.bin" }, @@ -3314,8 +3314,8 @@ "height": 36, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4E24", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeafoamIslands", "border_filepath": "data/layouts/FourIsland_IcefallCave_Entrance/border.bin", "blockdata_filepath": "data/layouts/FourIsland_IcefallCave_Entrance/map.bin" }, @@ -3326,8 +3326,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4E24", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeafoamIslands", "border_filepath": "data/layouts/FourIsland_IcefallCave_1F/border.bin", "blockdata_filepath": "data/layouts/FourIsland_IcefallCave_1F/map.bin" }, @@ -3338,8 +3338,8 @@ "height": 20, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4E24", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeafoamIslands", "border_filepath": "data/layouts/FourIsland_IcefallCave_B1F/border.bin", "blockdata_filepath": "data/layouts/FourIsland_IcefallCave_B1F/map.bin" }, @@ -3350,8 +3350,8 @@ "height": 26, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4E24", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeafoamIslands", "border_filepath": "data/layouts/FourIsland_IcefallCave_Back/border.bin", "blockdata_filepath": "data/layouts/FourIsland_IcefallCave_Back/map.bin" }, @@ -3362,8 +3362,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5094", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerTower", "border_filepath": "data/layouts/SevenIsland_TrainerTower_Lobby/border.bin", "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_Lobby/map.bin" }, @@ -3374,8 +3374,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5094", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerTower", "border_filepath": "data/layouts/SevenIsland_TrainerTower_1F/border.bin", "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_1F/map.bin" }, @@ -3386,8 +3386,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5094", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerTower", "border_filepath": "data/layouts/SevenIsland_TrainerTower_2F/border.bin", "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_2F/map.bin" }, @@ -3398,8 +3398,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5094", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerTower", "border_filepath": "data/layouts/SevenIsland_TrainerTower_3F/border.bin", "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_3F/map.bin" }, @@ -3410,8 +3410,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5094", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerTower", "border_filepath": "data/layouts/SevenIsland_TrainerTower_4F/border.bin", "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_4F/map.bin" }, @@ -3422,8 +3422,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5094", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerTower", "border_filepath": "data/layouts/SevenIsland_TrainerTower_5F/border.bin", "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_5F/map.bin" }, @@ -3434,8 +3434,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5094", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerTower", "border_filepath": "data/layouts/SevenIsland_TrainerTower_6F/border.bin", "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_6F/map.bin" }, @@ -3446,8 +3446,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5094", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerTower", "border_filepath": "data/layouts/SevenIsland_TrainerTower_7F/border.bin", "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_7F/map.bin" }, @@ -3458,8 +3458,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5094", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerTower", "border_filepath": "data/layouts/SevenIsland_TrainerTower_8F/border.bin", "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_8F/map.bin" }, @@ -3470,8 +3470,8 @@ "height": 16, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5094", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerTower", "border_filepath": "data/layouts/SevenIsland_TrainerTower_Roof/border.bin", "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_Roof/map.bin" }, @@ -3482,8 +3482,8 @@ "height": 7, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4ECC", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SilphCo", "border_filepath": "data/layouts/SevenIsland_TrainerTower_Elevator/border.bin", "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_Elevator/map.bin" }, @@ -3494,8 +3494,8 @@ "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4E84", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Building2", "border_filepath": "data/layouts/CeruleanCity_House5/border.bin", "blockdata_filepath": "data/layouts/CeruleanCity_House5/map.bin" }, @@ -3506,8 +3506,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D501C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", "border_filepath": "data/layouts/SixIsland_DottedHole_1F/border.bin", "blockdata_filepath": "data/layouts/SixIsland_DottedHole_1F/map.bin" }, @@ -3518,8 +3518,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D501C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", "border_filepath": "data/layouts/SixIsland_DottedHole_B1F/border.bin", "blockdata_filepath": "data/layouts/SixIsland_DottedHole_B1F/map.bin" }, @@ -3530,8 +3530,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D501C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", "border_filepath": "data/layouts/SixIsland_DottedHole_B2F/border.bin", "blockdata_filepath": "data/layouts/SixIsland_DottedHole_B2F/map.bin" }, @@ -3542,8 +3542,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D501C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", "border_filepath": "data/layouts/SixIsland_DottedHole_B3F/border.bin", "blockdata_filepath": "data/layouts/SixIsland_DottedHole_B3F/map.bin" }, @@ -3554,8 +3554,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D501C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", "border_filepath": "data/layouts/SixIsland_DottedHole_B4F/border.bin", "blockdata_filepath": "data/layouts/SixIsland_DottedHole_B4F/map.bin" }, @@ -3566,8 +3566,8 @@ "height": 15, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D501C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", "border_filepath": "data/layouts/SixIsland_DottedHole_SapphireRoom/border.bin", "blockdata_filepath": "data/layouts/SixIsland_DottedHole_SapphireRoom/map.bin" }, @@ -3578,8 +3578,8 @@ "height": 13, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D50AC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_IslandHarbor", "border_filepath": "data/layouts/Island_Harbor/border.bin", "blockdata_filepath": "data/layouts/Island_Harbor/map.bin" }, @@ -3590,8 +3590,8 @@ "height": 10, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4BE4", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonCenter", "border_filepath": "data/layouts/OneIsland_PokemonCenter_2F/border.bin", "blockdata_filepath": "data/layouts/OneIsland_PokemonCenter_2F/map.bin" }, @@ -3602,8 +3602,8 @@ "height": 32, "border_width": 3, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4DC4", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_ViridianForest", "border_filepath": "data/layouts/SixIsland_PatternBush/border.bin", "blockdata_filepath": "data/layouts/SixIsland_PatternBush/map.bin" }, @@ -3614,8 +3614,8 @@ "height": 7, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4BFC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", "border_filepath": "data/layouts/ThreeIsland_DunsparceTunnel/border.bin", "blockdata_filepath": "data/layouts/ThreeIsland_DunsparceTunnel/map.bin" }, @@ -3626,8 +3626,8 @@ "height": 7, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4BFC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", "border_filepath": "data/layouts/UnusedLayout_83453C0/border.bin", "blockdata_filepath": "data/layouts/UnusedLayout_83453C0/map.bin" }, @@ -3638,8 +3638,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4BFC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", "border_filepath": "data/layouts/FiveIsland_LostCave_Entrance/border.bin", "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Entrance/map.bin" }, @@ -3650,8 +3650,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4BFC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", "border_filepath": "data/layouts/FiveIsland_LostCave_Room1/border.bin", "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room1/map.bin" }, @@ -3662,8 +3662,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4BFC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", "border_filepath": "data/layouts/FiveIsland_LostCave_Room2/border.bin", "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room2/map.bin" }, @@ -3674,8 +3674,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4BFC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", "border_filepath": "data/layouts/FiveIsland_LostCave_Room3/border.bin", "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room3/map.bin" }, @@ -3686,8 +3686,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4BFC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", "border_filepath": "data/layouts/FiveIsland_LostCave_Room4/border.bin", "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room4/map.bin" }, @@ -3698,8 +3698,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4BFC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", "border_filepath": "data/layouts/FiveIsland_LostCave_Room5/border.bin", "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room5/map.bin" }, @@ -3710,8 +3710,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4BFC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", "border_filepath": "data/layouts/FiveIsland_LostCave_Room6/border.bin", "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room6/map.bin" }, @@ -3722,8 +3722,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4BFC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", "border_filepath": "data/layouts/FiveIsland_LostCave_Room7/border.bin", "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room7/map.bin" }, @@ -3734,8 +3734,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4BFC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", "border_filepath": "data/layouts/FiveIsland_LostCave_Room8/border.bin", "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room8/map.bin" }, @@ -3746,8 +3746,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4BFC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", "border_filepath": "data/layouts/FiveIsland_LostCave_Room9/border.bin", "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room9/map.bin" }, @@ -3758,8 +3758,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4BFC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", "border_filepath": "data/layouts/FiveIsland_LostCave_Room10/border.bin", "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room10/map.bin" }, @@ -3770,8 +3770,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4BFC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", "border_filepath": "data/layouts/FiveIsland_LostCave_Room11/border.bin", "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room11/map.bin" }, @@ -3782,8 +3782,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4BFC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", "border_filepath": "data/layouts/FiveIsland_LostCave_Room12/border.bin", "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room12/map.bin" }, @@ -3794,8 +3794,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4BFC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", "border_filepath": "data/layouts/FiveIsland_LostCave_Room13/border.bin", "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room13/map.bin" }, @@ -3806,8 +3806,8 @@ "height": 11, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4BFC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", "border_filepath": "data/layouts/FiveIsland_LostCave_Room14/border.bin", "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room14/map.bin" }, @@ -3818,8 +3818,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5034", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TanobyRuins", "border_filepath": "data/layouts/SevenIsland_TanobyRuins_MoneanChamber/border.bin", "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_MoneanChamber/map.bin" }, @@ -3830,8 +3830,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5034", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TanobyRuins", "border_filepath": "data/layouts/SevenIsland_TanobyRuins_LiptooChamber/border.bin", "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_LiptooChamber/map.bin" }, @@ -3842,8 +3842,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5034", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TanobyRuins", "border_filepath": "data/layouts/SevenIsland_TanobyRuins_WeepthChamber/border.bin", "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_WeepthChamber/map.bin" }, @@ -3854,8 +3854,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5034", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TanobyRuins", "border_filepath": "data/layouts/SevenIsland_TanobyRuins_DilfordChamber/border.bin", "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_DilfordChamber/map.bin" }, @@ -3866,8 +3866,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5034", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TanobyRuins", "border_filepath": "data/layouts/SevenIsland_TanobyRuins_ScufibChamber/border.bin", "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_ScufibChamber/map.bin" }, @@ -3878,8 +3878,8 @@ "height": 24, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4DF4", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_RockTunnel", "border_filepath": "data/layouts/SixIsland_AlteringCave/border.bin", "blockdata_filepath": "data/layouts/SixIsland_AlteringCave/map.bin" }, @@ -3890,8 +3890,8 @@ "height": 16, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4E0C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_DiglettsCave", "border_filepath": "data/layouts/SevenIsland_SevaultCanyon_TanobyKey/border.bin", "blockdata_filepath": "data/layouts/SevenIsland_SevaultCanyon_TanobyKey/map.bin" }, @@ -3902,8 +3902,8 @@ "height": 30, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D507C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeviiIslands67", "border_filepath": "data/layouts/BirthIsland_Exterior/border.bin", "blockdata_filepath": "data/layouts/BirthIsland_Exterior/map.bin" }, @@ -3914,8 +3914,8 @@ "height": 23, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D504C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_SeviiIslands123", "border_filepath": "data/layouts/NavelRock_Exterior/border.bin", "blockdata_filepath": "data/layouts/NavelRock_Exterior/map.bin" }, @@ -3926,8 +3926,8 @@ "height": 26, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D501C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", "border_filepath": "data/layouts/NavelRock_1F/border.bin", "blockdata_filepath": "data/layouts/NavelRock_1F/map.bin" }, @@ -3938,8 +3938,8 @@ "height": 25, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D501C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", "border_filepath": "data/layouts/NavelRock_Summit/border.bin", "blockdata_filepath": "data/layouts/NavelRock_Summit/map.bin" }, @@ -3950,8 +3950,8 @@ "height": 23, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D501C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", "border_filepath": "data/layouts/NavelRock_Base/border.bin", "blockdata_filepath": "data/layouts/NavelRock_Base/map.bin" }, @@ -3962,8 +3962,8 @@ "height": 7, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D501C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", "border_filepath": "data/layouts/NavelRock_SummitPath_2F/border.bin", "blockdata_filepath": "data/layouts/NavelRock_SummitPath_2F/map.bin" }, @@ -3974,8 +3974,8 @@ "height": 7, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D501C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", "border_filepath": "data/layouts/NavelRock_SummitPath_3F/border.bin", "blockdata_filepath": "data/layouts/NavelRock_SummitPath_3F/map.bin" }, @@ -3986,8 +3986,8 @@ "height": 7, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D501C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", "border_filepath": "data/layouts/NavelRock_SummitPath_4F/border.bin", "blockdata_filepath": "data/layouts/NavelRock_SummitPath_4F/map.bin" }, @@ -3998,8 +3998,8 @@ "height": 7, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D501C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", "border_filepath": "data/layouts/NavelRock_SummitPath_5F/border.bin", "blockdata_filepath": "data/layouts/NavelRock_SummitPath_5F/map.bin" }, @@ -4010,8 +4010,8 @@ "height": 7, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D501C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", "border_filepath": "data/layouts/NavelRock_BasePath_B1F/border.bin", "blockdata_filepath": "data/layouts/NavelRock_BasePath_B1F/map.bin" }, @@ -4022,8 +4022,8 @@ "height": 7, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D501C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", "border_filepath": "data/layouts/NavelRock_BasePath_B2F/border.bin", "blockdata_filepath": "data/layouts/NavelRock_BasePath_B2F/map.bin" }, @@ -4034,8 +4034,8 @@ "height": 7, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D501C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", "border_filepath": "data/layouts/NavelRock_BasePath_B3F/border.bin", "blockdata_filepath": "data/layouts/NavelRock_BasePath_B3F/map.bin" }, @@ -4046,8 +4046,8 @@ "height": 7, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D501C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", "border_filepath": "data/layouts/NavelRock_BasePath_B4F/border.bin", "blockdata_filepath": "data/layouts/NavelRock_BasePath_B4F/map.bin" }, @@ -4058,8 +4058,8 @@ "height": 7, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D501C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", "border_filepath": "data/layouts/NavelRock_BasePath_B5F/border.bin", "blockdata_filepath": "data/layouts/NavelRock_BasePath_B5F/map.bin" }, @@ -4070,8 +4070,8 @@ "height": 7, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D501C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", "border_filepath": "data/layouts/NavelRock_BasePath_B6F/border.bin", "blockdata_filepath": "data/layouts/NavelRock_BasePath_B6F/map.bin" }, @@ -4082,8 +4082,8 @@ "height": 7, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D501C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", "border_filepath": "data/layouts/NavelRock_BasePath_B7F/border.bin", "blockdata_filepath": "data/layouts/NavelRock_BasePath_B7F/map.bin" }, @@ -4094,8 +4094,8 @@ "height": 7, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D501C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", "border_filepath": "data/layouts/NavelRock_BasePath_B8F/border.bin", "blockdata_filepath": "data/layouts/NavelRock_BasePath_B8F/map.bin" }, @@ -4106,8 +4106,8 @@ "height": 7, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D501C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", "border_filepath": "data/layouts/NavelRock_BasePath_B9F/border.bin", "blockdata_filepath": "data/layouts/NavelRock_BasePath_B9F/map.bin" }, @@ -4118,8 +4118,8 @@ "height": 7, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D501C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", "border_filepath": "data/layouts/NavelRock_BasePath_B10F/border.bin", "blockdata_filepath": "data/layouts/NavelRock_BasePath_B10F/map.bin" }, @@ -4130,8 +4130,8 @@ "height": 7, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D501C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", "border_filepath": "data/layouts/NavelRock_BasePath_B11F/border.bin", "blockdata_filepath": "data/layouts/NavelRock_BasePath_B11F/map.bin" }, @@ -4142,8 +4142,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5034", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TanobyRuins", "border_filepath": "data/layouts/SevenIsland_TanobyRuins_RixyChamber/border.bin", "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_RixyChamber/map.bin" }, @@ -4154,8 +4154,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5034", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TanobyRuins", "border_filepath": "data/layouts/SevenIsland_TanobyRuins_ViapoisChamber/border.bin", "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_ViapoisChamber/map.bin" }, @@ -4166,8 +4166,8 @@ "height": 7, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D501C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", "border_filepath": "data/layouts/NavelRock_B1F/border.bin", "blockdata_filepath": "data/layouts/NavelRock_B1F/map.bin" }, @@ -4178,8 +4178,8 @@ "height": 100, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D501C", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", "border_filepath": "data/layouts/NavelRock_Fork/border.bin", "blockdata_filepath": "data/layouts/NavelRock_Fork/map.bin" }, @@ -4190,8 +4190,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5094", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerTower", "border_filepath": "data/layouts/UnusedLayout_834BC2C/border.bin", "blockdata_filepath": "data/layouts/UnusedLayout_834BC2C/map.bin" }, @@ -4202,8 +4202,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5094", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerTower", "border_filepath": "data/layouts/UnusedLayout_834BEB4/border.bin", "blockdata_filepath": "data/layouts/UnusedLayout_834BEB4/map.bin" }, @@ -4214,8 +4214,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5094", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerTower", "border_filepath": "data/layouts/UnusedLayout_834C13C/border.bin", "blockdata_filepath": "data/layouts/UnusedLayout_834C13C/map.bin" }, @@ -4226,8 +4226,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5094", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerTower", "border_filepath": "data/layouts/UnusedLayout_834C3C4/border.bin", "blockdata_filepath": "data/layouts/UnusedLayout_834C3C4/map.bin" }, @@ -4238,8 +4238,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5094", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerTower", "border_filepath": "data/layouts/UnusedLayout_834C64C/border.bin", "blockdata_filepath": "data/layouts/UnusedLayout_834C64C/map.bin" }, @@ -4250,8 +4250,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5094", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerTower", "border_filepath": "data/layouts/UnusedLayout_834C8D4/border.bin", "blockdata_filepath": "data/layouts/UnusedLayout_834C8D4/map.bin" }, @@ -4262,8 +4262,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5094", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerTower", "border_filepath": "data/layouts/UnusedLayout_834CB5C/border.bin", "blockdata_filepath": "data/layouts/UnusedLayout_834CB5C/map.bin" }, @@ -4274,8 +4274,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5094", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerTower", "border_filepath": "data/layouts/UnusedLayout_834CDE4/border.bin", "blockdata_filepath": "data/layouts/UnusedLayout_834CDE4/map.bin" }, @@ -4286,8 +4286,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5094", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerTower", "border_filepath": "data/layouts/UnusedLayout_834D06C/border.bin", "blockdata_filepath": "data/layouts/UnusedLayout_834D06C/map.bin" }, @@ -4298,8 +4298,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5094", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerTower", "border_filepath": "data/layouts/UnusedLayout_834D2F4/border.bin", "blockdata_filepath": "data/layouts/UnusedLayout_834D2F4/map.bin" }, @@ -4310,8 +4310,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5094", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerTower", "border_filepath": "data/layouts/UnusedLayout_834D57C/border.bin", "blockdata_filepath": "data/layouts/UnusedLayout_834D57C/map.bin" }, @@ -4322,8 +4322,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5094", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerTower", "border_filepath": "data/layouts/UnusedLayout_834D804/border.bin", "blockdata_filepath": "data/layouts/UnusedLayout_834D804/map.bin" }, @@ -4334,8 +4334,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5094", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerTower", "border_filepath": "data/layouts/UnusedLayout_834DA8C/border.bin", "blockdata_filepath": "data/layouts/UnusedLayout_834DA8C/map.bin" }, @@ -4346,8 +4346,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5094", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerTower", "border_filepath": "data/layouts/UnusedLayout_834DD14/border.bin", "blockdata_filepath": "data/layouts/UnusedLayout_834DD14/map.bin" }, @@ -4358,8 +4358,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5094", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerTower", "border_filepath": "data/layouts/UnusedLayout_834DF9C/border.bin", "blockdata_filepath": "data/layouts/UnusedLayout_834DF9C/map.bin" }, @@ -4370,8 +4370,8 @@ "height": 17, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D5094", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerTower", "border_filepath": "data/layouts/UnusedLayout_834E224/border.bin", "blockdata_filepath": "data/layouts/UnusedLayout_834E224/map.bin" }, @@ -4382,8 +4382,8 @@ "height": 9, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4BB4", - "secondary_tileset": "gTileset_82D4E24", + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SeafoamIslands", "border_filepath": "data/layouts/SevenIsland_House_Room1/border.bin", "blockdata_filepath": "data/layouts/SevenIsland_House_Room1/map.bin" }, @@ -4394,8 +4394,8 @@ "height": 39, "border_width": 2, "border_height": 2, - "primary_tileset": "gTileset_82D4A94", - "secondary_tileset": "gTileset_82D4FEC", + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MtEmber", "border_filepath": "data/layouts/OneIsland_KindleRoad_EmberSpa/border.bin", "blockdata_filepath": "data/layouts/OneIsland_KindleRoad_EmberSpa/map.bin" } diff --git a/data/maps/Prototype_SeviiIsle_6/map.json b/data/maps/Prototype_SeviiIsle_6/map.json new file mode 100644 index 000000000..3cc89f9f0 --- /dev/null +++ b/data/maps/Prototype_SeviiIsle_6/map.json @@ -0,0 +1,25 @@ +{ + "id": "MAP_PROTOTYPE_SEVII_ISLE_6", + "name": "Prototype_SeviiIsle_6", + "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_6", + "music": "MUS_NANASHIMA", + "region_map_section": "MAPSEC_SEVII_ISLE_6", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_THREE_ISLAND", + "offset": 0, + "direction": "up" + } + ], + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} diff --git a/data/maps/Prototype_SeviiIsle_6/scripts.inc b/data/maps/Prototype_SeviiIsle_6/scripts.inc new file mode 100644 index 000000000..459729f14 --- /dev/null +++ b/data/maps/Prototype_SeviiIsle_6/scripts.inc @@ -0,0 +1,2 @@ +Prototype_SeviiIsle_6_MapScripts:: @ 81687E0 + .byte 0 diff --git a/data/maps/Prototype_SeviiIsle_7/map.json b/data/maps/Prototype_SeviiIsle_7/map.json new file mode 100644 index 000000000..67a37d7e7 --- /dev/null +++ b/data/maps/Prototype_SeviiIsle_7/map.json @@ -0,0 +1,25 @@ +{ + "id": "MAP_PROTOTYPE_SEVII_ISLE_7", + "name": "Prototype_SeviiIsle_7", + "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_7", + "music": "MUS_NANASHIMA", + "region_map_section": "MAPSEC_SEVII_ISLE_7", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_THREE_ISLAND", + "offset": 0, + "direction": "up" + } + ], + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} diff --git a/data/maps/Prototype_SeviiIsle_7/scripts.inc b/data/maps/Prototype_SeviiIsle_7/scripts.inc new file mode 100644 index 000000000..b7eaa6bd5 --- /dev/null +++ b/data/maps/Prototype_SeviiIsle_7/scripts.inc @@ -0,0 +1,2 @@ +Prototype_SeviiIsle_7_MapScripts:: @ 81687E1 + .byte 0 diff --git a/data/maps/Prototype_SeviiIsle_8/map.json b/data/maps/Prototype_SeviiIsle_8/map.json new file mode 100644 index 000000000..0ed21e3f2 --- /dev/null +++ b/data/maps/Prototype_SeviiIsle_8/map.json @@ -0,0 +1,19 @@ +{ + "id": "MAP_PROTOTYPE_SEVII_ISLE_8", + "name": "Prototype_SeviiIsle_8", + "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_8", + "music": "MUS_NANASHIMA", + "region_map_section": "MAPSEC_SEVII_ISLE_8", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} diff --git a/data/maps/Prototype_SeviiIsle_8/scripts.inc b/data/maps/Prototype_SeviiIsle_8/scripts.inc new file mode 100644 index 000000000..411a66513 --- /dev/null +++ b/data/maps/Prototype_SeviiIsle_8/scripts.inc @@ -0,0 +1,2 @@ +Prototype_SeviiIsle_8_MapScripts:: @ 81687E2 + .byte 0 diff --git a/data/maps/Prototype_SeviiIsle_9/map.json b/data/maps/Prototype_SeviiIsle_9/map.json new file mode 100644 index 000000000..1fa4c73c4 --- /dev/null +++ b/data/maps/Prototype_SeviiIsle_9/map.json @@ -0,0 +1,19 @@ +{ + "id": "MAP_PROTOTYPE_SEVII_ISLE_9", + "name": "Prototype_SeviiIsle_9", + "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_9", + "music": "MUS_NANASHIMA", + "region_map_section": "MAPSEC_SEVII_ISLE_9", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} diff --git a/data/maps/Prototype_SeviiIsle_9/scripts.inc b/data/maps/Prototype_SeviiIsle_9/scripts.inc new file mode 100644 index 000000000..00b06c7f0 --- /dev/null +++ b/data/maps/Prototype_SeviiIsle_9/scripts.inc @@ -0,0 +1,2 @@ +Prototype_SeviiIsle_9_MapScripts:: @ 81687E3 + .byte 0 diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index 60183ed13..8875211f8 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -15,7 +15,7 @@ EventScript_1708AF:: @ 81708AF setvar VAR_TEMP_1, 1 setobjectxyperm 1, 4, 2 setobjectmovementtype 1, 8 - setmaplayoutindex LAYOUT_UNUSED_LAYOUT_8338B4C + setmaplayoutindex LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1_DOOR_OPEN return EventScript_1708C3:: @ 81708C3 diff --git a/data/maps/UnknownMap_03_50/map.json b/data/maps/UnknownMap_03_50/map.json deleted file mode 100644 index 25d12e137..000000000 --- a/data/maps/UnknownMap_03_50/map.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "id": "MAP_UNKNOWN_MAP_03_50", - "name": "UnknownMap_03_50", - "layout": "LAYOUT_UNKNOWN_MAP_03_50", - "music": "MUS_NANASHIMA", - "region_map_section": "MAPSEC_SEVII_ISLE_6", - "requires_flash": false, - "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": [ - { - "map": "MAP_THREE_ISLAND", - "offset": 0, - "direction": "up" - } - ], - "object_events": [], - "warp_events": [], - "coord_events": [], - "bg_events": [] -} diff --git a/data/maps/UnknownMap_03_50/scripts.inc b/data/maps/UnknownMap_03_50/scripts.inc deleted file mode 100644 index 4e136faae..000000000 --- a/data/maps/UnknownMap_03_50/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_03_50_MapScripts:: @ 81687E0 - .byte 0 diff --git a/data/maps/UnknownMap_03_51/map.json b/data/maps/UnknownMap_03_51/map.json deleted file mode 100644 index 25c135de4..000000000 --- a/data/maps/UnknownMap_03_51/map.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "id": "MAP_UNKNOWN_MAP_03_51", - "name": "UnknownMap_03_51", - "layout": "LAYOUT_UNKNOWN_MAP_03_51", - "music": "MUS_NANASHIMA", - "region_map_section": "MAPSEC_SEVII_ISLE_7", - "requires_flash": false, - "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": [ - { - "map": "MAP_THREE_ISLAND", - "offset": 0, - "direction": "up" - } - ], - "object_events": [], - "warp_events": [], - "coord_events": [], - "bg_events": [] -} diff --git a/data/maps/UnknownMap_03_51/scripts.inc b/data/maps/UnknownMap_03_51/scripts.inc deleted file mode 100644 index 7398062d8..000000000 --- a/data/maps/UnknownMap_03_51/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_03_51_MapScripts:: @ 81687E1 - .byte 0 diff --git a/data/maps/UnknownMap_03_52/map.json b/data/maps/UnknownMap_03_52/map.json deleted file mode 100644 index e38359999..000000000 --- a/data/maps/UnknownMap_03_52/map.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "id": "MAP_UNKNOWN_MAP_03_52", - "name": "UnknownMap_03_52", - "layout": "LAYOUT_UNKNOWN_MAP_03_52", - "music": "MUS_NANASHIMA", - "region_map_section": "MAPSEC_SEVII_ISLE_8", - "requires_flash": false, - "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [], - "warp_events": [], - "coord_events": [], - "bg_events": [] -} diff --git a/data/maps/UnknownMap_03_52/scripts.inc b/data/maps/UnknownMap_03_52/scripts.inc deleted file mode 100644 index 2e48ca113..000000000 --- a/data/maps/UnknownMap_03_52/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_03_52_MapScripts:: @ 81687E2 - .byte 0 diff --git a/data/maps/UnknownMap_03_53/map.json b/data/maps/UnknownMap_03_53/map.json deleted file mode 100644 index e3001e6be..000000000 --- a/data/maps/UnknownMap_03_53/map.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "id": "MAP_UNKNOWN_MAP_03_53", - "name": "UnknownMap_03_53", - "layout": "LAYOUT_UNKNOWN_MAP_03_53", - "music": "MUS_NANASHIMA", - "region_map_section": "MAPSEC_SEVII_ISLE_9", - "requires_flash": false, - "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [], - "warp_events": [], - "coord_events": [], - "bg_events": [] -} diff --git a/data/maps/UnknownMap_03_53/scripts.inc b/data/maps/UnknownMap_03_53/scripts.inc deleted file mode 100644 index 2dec9650e..000000000 --- a/data/maps/UnknownMap_03_53/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_03_53_MapScripts:: @ 81687E3 - .byte 0 diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 5ad0d9a2f..cb458b682 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -8,8 +8,8 @@ ViridianCity_Mart_OnLoad:: @ 816A1DE end ViridianCity_Mart_EventScript_HideQuestionnaire:: @ 816A1E8 - setmetatile 1, 3, METATILE_Shop_CounterMid_Top, 1 - setmetatile 1, 4, METATILE_Shop_CounterMid_Bottom, 1 + setmetatile 1, 3, METATILE_Mart_CounterMid_Top, 1 + setmetatile 1, 4, METATILE_Mart_CounterMid_Bottom, 1 end ViridianCity_Mart_OnFrame:: @ 816A1FB diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 05f1cd544..27213f55e 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -289,10 +289,10 @@ "TwoIsland_CapeBrink", "ThreeIsland_BondBridge", "ThreeIsland_Port", - "UnknownMap_03_50", - "UnknownMap_03_51", - "UnknownMap_03_52", - "UnknownMap_03_53", + "Prototype_SeviiIsle_6", + "Prototype_SeviiIsle_7", + "Prototype_SeviiIsle_8", + "Prototype_SeviiIsle_9", "FiveIsland_ResortGorgeous", "FiveIsland_WaterLabyrinth", "FiveIsland_Meadow", @@ -605,8 +605,8 @@ "TwoIsland_CapeBrink", "ThreeIsland_BondBridge", "ThreeIsland_Port", - "UnknownMap_03_50", - "UnknownMap_03_51", + "Prototype_SeviiIsle_6", + "Prototype_SeviiIsle_7", "FiveIsland_ResortGorgeous", "FiveIsland_WaterLabyrinth", "FiveIsland_Meadow", diff --git a/data/tilesets/graphics.inc b/data/tilesets/graphics.inc index a23f73322..f9f06f42e 100644 --- a/data/tilesets/graphics.inc +++ b/data/tilesets/graphics.inc @@ -1,1471 +1,1471 @@ .align 2 -gTilesetTiles_826D37C:: @ 826D37C - .incbin "data/tilesets/secondary/82D4AAC/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_826D7C0:: @ 826D7C0 - .incbin "data/tilesets/secondary/82D4AAC/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4AAC/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4AAC/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4AAC/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4AAC/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4AAC/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4AAC/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4AAC/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4AAC/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4AAC/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4AAC/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4AAC/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4AAC/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4AAC/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4AAC/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4AAC/palettes/15.gbapal" - - .align 2 -gTilesetTiles_826D9C0:: @ 826D9C0 - .incbin "data/tilesets/secondary/82D4AC4/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_826DFC0:: @ 826DFC0 - .incbin "data/tilesets/secondary/82D4AC4/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4AC4/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4AC4/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4AC4/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4AC4/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4AC4/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4AC4/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4AC4/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4AC4/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4AC4/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4AC4/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4AC4/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4AC4/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4AC4/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4AC4/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4AC4/palettes/15.gbapal" - - .align 2 -gTilesetTiles_826E1C0:: @ 826E1C0 - .incbin "data/tilesets/secondary/82D4ADC/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_826EAB8:: @ 826EAB8 - .incbin "data/tilesets/secondary/82D4ADC/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4ADC/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4ADC/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4ADC/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4ADC/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4ADC/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4ADC/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4ADC/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4ADC/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4ADC/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4ADC/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4ADC/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4ADC/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4ADC/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4ADC/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4ADC/palettes/15.gbapal" - - .align 2 -gTilesetTiles_826ECB8:: @ 826ECB8 - .incbin "data/tilesets/secondary/82D4AF4/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_826F4B8:: @ 826F4B8 - .incbin "data/tilesets/secondary/82D4AF4/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4AF4/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4AF4/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4AF4/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4AF4/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4AF4/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4AF4/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4AF4/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4AF4/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4AF4/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4AF4/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4AF4/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4AF4/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4AF4/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4AF4/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4AF4/palettes/15.gbapal" - - .align 2 -gTilesetTiles_826F6B8:: @ 826F6B8 - .incbin "data/tilesets/secondary/82D4B0C/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8270438:: @ 8270438 - .incbin "data/tilesets/secondary/82D4B0C/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4B0C/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4B0C/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4B0C/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4B0C/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4B0C/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4B0C/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4B0C/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4B0C/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4B0C/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4B0C/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4B0C/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4B0C/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4B0C/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4B0C/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4B0C/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8270638:: @ 8270638 - .incbin "data/tilesets/secondary/82D4B24/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8270DA0:: @ 8270DA0 - .incbin "data/tilesets/secondary/82D4B24/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4B24/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4B24/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4B24/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4B24/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4B24/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4B24/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4B24/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4B24/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4B24/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4B24/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4B24/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4B24/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4B24/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4B24/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4B24/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8270FA0:: @ 8270FA0 - .incbin "data/tilesets/secondary/82D4B3C/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8271C74:: @ 8271C74 - .incbin "data/tilesets/secondary/82D4B3C/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4B3C/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4B3C/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4B3C/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4B3C/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4B3C/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4B3C/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4B3C/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4B3C/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4B3C/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4B3C/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4B3C/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4B3C/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4B3C/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4B3C/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4B3C/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8271E74:: @ 8271E74 - .incbin "data/tilesets/secondary/82D4B54/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8272A5C:: @ 8272A5C - .incbin "data/tilesets/secondary/82D4B54/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4B54/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4B54/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4B54/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4B54/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4B54/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4B54/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4B54/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4B54/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4B54/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4B54/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4B54/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4B54/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4B54/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4B54/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4B54/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8272C5C:: @ 8272C5C - .incbin "data/tilesets/secondary/82D4B6C/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8273358:: @ 8273358 - .incbin "data/tilesets/secondary/82D4B6C/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4B6C/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4B6C/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4B6C/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4B6C/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4B6C/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4B6C/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4B6C/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4B6C/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4B6C/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4B6C/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4B6C/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4B6C/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4B6C/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4B6C/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4B6C/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8273558:: @ 8273558 - .incbin "data/tilesets/secondary/82D4B84/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_82742D0:: @ 82742D0 - .incbin "data/tilesets/secondary/82D4B84/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4B84/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4B84/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4B84/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4B84/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4B84/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4B84/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4B84/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4B84/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4B84/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4B84/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4B84/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4B84/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4B84/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4B84/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4B84/palettes/15.gbapal" - - .align 2 -gTilesetTiles_82744D0:: @ 82744D0 - .incbin "data/tilesets/secondary/82D4B9C/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8275094:: @ 8275094 - .incbin "data/tilesets/secondary/82D4B9C/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4B9C/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4B9C/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4B9C/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4B9C/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4B9C/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4B9C/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4B9C/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4B9C/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4B9C/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4B9C/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4B9C/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4B9C/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4B9C/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4B9C/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4B9C/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8275294:: @ 8275294 - .incbin "data/tilesets/primary/82D4BB4/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8277694:: @ 8277694 - .incbin "data/tilesets/primary/82D4BB4/palettes/0.gbapal" - .incbin "data/tilesets/primary/82D4BB4/palettes/1.gbapal" - .incbin "data/tilesets/primary/82D4BB4/palettes/2.gbapal" - .incbin "data/tilesets/primary/82D4BB4/palettes/3.gbapal" - .incbin "data/tilesets/primary/82D4BB4/palettes/4.gbapal" - .incbin "data/tilesets/primary/82D4BB4/palettes/5.gbapal" - .incbin "data/tilesets/primary/82D4BB4/palettes/6.gbapal" - .incbin "data/tilesets/primary/82D4BB4/palettes/7.gbapal" - .incbin "data/tilesets/primary/82D4BB4/palettes/8.gbapal" - .incbin "data/tilesets/primary/82D4BB4/palettes/9.gbapal" - .incbin "data/tilesets/primary/82D4BB4/palettes/10.gbapal" - .incbin "data/tilesets/primary/82D4BB4/palettes/11.gbapal" - .incbin "data/tilesets/primary/82D4BB4/palettes/12.gbapal" - .incbin "data/tilesets/primary/82D4BB4/palettes/13.gbapal" - .incbin "data/tilesets/primary/82D4BB4/palettes/14.gbapal" - .incbin "data/tilesets/primary/82D4BB4/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8277894:: @ 8277894 - .incbin "data/tilesets/secondary/82D4BCC/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8277A5C:: @ 8277A5C - .incbin "data/tilesets/secondary/82D4BCC/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4BCC/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4BCC/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4BCC/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4BCC/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4BCC/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4BCC/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4BCC/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4BCC/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4BCC/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4BCC/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4BCC/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4BCC/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4BCC/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4BCC/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4BCC/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8277C5C:: @ 8277C5C - .incbin "data/tilesets/secondary/82D4BE4/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8278CC4:: @ 8278CC4 - .incbin "data/tilesets/secondary/82D4BE4/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4BE4/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4BE4/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4BE4/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4BE4/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4BE4/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4BE4/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4BE4/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4BE4/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4BE4/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4BE4/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4BE4/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4BE4/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4BE4/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4BE4/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4BE4/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8278EC4:: @ 8278EC4 - .incbin "data/tilesets/secondary/82D4BFC/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_827A1A8:: @ 827A1A8 - .incbin "data/tilesets/secondary/82D4BFC/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4BFC/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4BFC/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4BFC/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4BFC/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4BFC/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4BFC/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4BFC/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4BFC/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4BFC/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4BFC/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4BFC/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4BFC/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4BFC/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4BFC/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4BFC/palettes/15.gbapal" - - .align 2 -gTilesetTiles_827A3A8:: @ 827A3A8 - .incbin "data/tilesets/secondary/82D4C14/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_827A3B8:: @ 827A3B8 - .incbin "data/tilesets/secondary/82D4C14/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4C14/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4C14/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4C14/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4C14/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4C14/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4C14/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4C14/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4C14/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4C14/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4C14/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4C14/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4C14/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4C14/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4C14/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4C14/palettes/15.gbapal" - - .align 2 -gTilesetTiles_827A5B8:: @ 827A5B8 - .incbin "data/tilesets/secondary/82D4C2C/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_827AE14:: @ 827AE14 - .incbin "data/tilesets/secondary/82D4C2C/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4C2C/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4C2C/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4C2C/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4C2C/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4C2C/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4C2C/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4C2C/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4C2C/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4C2C/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4C2C/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4C2C/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4C2C/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4C2C/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4C2C/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4C2C/palettes/15.gbapal" - - .align 2 -gTilesetTiles_827B014:: @ 827B014 - .incbin "data/tilesets/secondary/82D4C44/tiles.4bpp" - - .align 2 -gTilesetPalettes_827FF14:: @ 827FF14 - .incbin "data/tilesets/secondary/82D4C44/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4C44/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4C44/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4C44/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4C44/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4C44/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4C44/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4C44/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4C44/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4C44/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4C44/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4C44/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4C44/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4C44/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4C44/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4C44/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8280114:: @ 8280114 - .incbin "data/tilesets/secondary/82D4C5C/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_82804EC:: @ 82804EC - .incbin "data/tilesets/secondary/82D4C5C/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4C5C/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4C5C/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4C5C/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4C5C/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4C5C/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4C5C/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4C5C/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4C5C/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4C5C/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4C5C/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4C5C/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4C5C/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4C5C/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4C5C/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4C5C/palettes/15.gbapal" - - .align 2 -gTilesetTiles_82806EC:: @ 82806EC - .incbin "data/tilesets/secondary/82D4C8C/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8280D00:: @ 8280D00 - .incbin "data/tilesets/secondary/82D4C8C/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4C8C/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4C8C/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4C8C/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4C8C/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4C8C/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4C8C/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4C8C/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4C8C/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4C8C/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4C8C/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4C8C/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4C8C/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4C8C/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4C8C/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4C8C/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8280F00:: @ 8280F00 - .incbin "data/tilesets/secondary/82D4CD4/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_82823A4:: @ 82823A4 - .incbin "data/tilesets/secondary/82D4CD4/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4CD4/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4CD4/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4CD4/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4CD4/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4CD4/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4CD4/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4CD4/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4CD4/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4CD4/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4CD4/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4CD4/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4CD4/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4CD4/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4CD4/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4CD4/palettes/15.gbapal" - - .align 2 -gTilesetTiles_82825A4:: @ 82825A4 - .incbin "data/tilesets/secondary/82D4CEC/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8282FBC:: @ 8282FBC - .incbin "data/tilesets/secondary/82D4CEC/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4CEC/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4CEC/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4CEC/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4CEC/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4CEC/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4CEC/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4CEC/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4CEC/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4CEC/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4CEC/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4CEC/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4CEC/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4CEC/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4CEC/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4CEC/palettes/15.gbapal" - - .align 2 -gTilesetTiles_82831BC:: @ 82831BC - .incbin "data/tilesets/secondary/82D4D04/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_82839B0:: @ 82839B0 - .incbin "data/tilesets/secondary/82D4D04/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4D04/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4D04/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4D04/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4D04/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4D04/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4D04/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4D04/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4D04/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4D04/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4D04/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4D04/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4D04/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4D04/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4D04/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4D04/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8283BB0:: @ 8283BB0 - .incbin "data/tilesets/secondary/82D4D1C/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8283FF8:: @ 8283FF8 - .incbin "data/tilesets/secondary/82D4D1C/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4D1C/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4D1C/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4D1C/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4D1C/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4D1C/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4D1C/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4D1C/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4D1C/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4D1C/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4D1C/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4D1C/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4D1C/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4D1C/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4D1C/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4D1C/palettes/15.gbapal" - - .align 2 -gTilesetTiles_82841F8:: @ 82841F8 - .incbin "data/tilesets/secondary/82D4D34/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_82849B8:: @ 82849B8 - .incbin "data/tilesets/secondary/82D4D34/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4D34/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4D34/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4D34/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4D34/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4D34/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4D34/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4D34/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4D34/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4D34/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4D34/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4D34/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4D34/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4D34/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4D34/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4D34/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8284BB8:: @ 8284BB8 - .incbin "data/tilesets/secondary/82D4D4C/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8285150:: @ 8285150 - .incbin "data/tilesets/secondary/82D4D4C/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4D4C/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4D4C/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4D4C/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4D4C/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4D4C/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4D4C/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4D4C/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4D4C/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4D4C/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4D4C/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4D4C/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4D4C/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4D4C/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4D4C/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4D4C/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8285350:: @ 8285350 - .incbin "data/tilesets/secondary/82D4CA4/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_82857A4:: @ 82857A4 - .incbin "data/tilesets/secondary/82D4CA4/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4CA4/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4CA4/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4CA4/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4CA4/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4CA4/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4CA4/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4CA4/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4CA4/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4CA4/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4CA4/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4CA4/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4CA4/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4CA4/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4CA4/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4CA4/palettes/15.gbapal" - - .align 2 -gTilesetTiles_82859A4:: @ 82859A4 - .incbin "data/tilesets/secondary/82D4D64/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8285D90:: @ 8285D90 - .incbin "data/tilesets/secondary/82D4D64/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4D64/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4D64/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4D64/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4D64/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4D64/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4D64/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4D64/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4D64/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4D64/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4D64/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4D64/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4D64/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4D64/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4D64/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4D64/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8285F90:: @ 8285F90 - .incbin "data/tilesets/secondary/82D4D7C/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_82865D4:: @ 82865D4 - .incbin "data/tilesets/secondary/82D4D7C/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4D7C/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4D7C/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4D7C/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4D7C/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4D7C/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4D7C/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4D7C/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4D7C/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4D7C/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4D7C/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4D7C/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4D7C/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4D7C/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4D7C/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4D7C/palettes/15.gbapal" - - .align 2 -gTilesetTiles_82867D4:: @ 82867D4 - .incbin "data/tilesets/secondary/82D4CBC/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8286BC8:: @ 8286BC8 - .incbin "data/tilesets/secondary/82D4CBC/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4CBC/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4CBC/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4CBC/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4CBC/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4CBC/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4CBC/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4CBC/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4CBC/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4CBC/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4CBC/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4CBC/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4CBC/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4CBC/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4CBC/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4CBC/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8286DC8:: @ 8286DC8 - .incbin "data/tilesets/secondary/82D4D94/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8287B80:: @ 8287B80 - .incbin "data/tilesets/secondary/82D4D94/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4D94/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4D94/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4D94/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4D94/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4D94/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4D94/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4D94/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4D94/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4D94/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4D94/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4D94/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4D94/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4D94/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4D94/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4D94/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8287D80:: @ 8287D80 - .incbin "data/tilesets/secondary/82D4DAC/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8287D94:: @ 8287D94 - .incbin "data/tilesets/secondary/82D4DAC/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4DAC/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4DAC/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4DAC/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4DAC/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4DAC/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4DAC/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4DAC/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4DAC/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4DAC/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4DAC/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4DAC/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4DAC/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4DAC/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4DAC/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4DAC/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8287F94:: @ 8287F94 - .incbin "data/tilesets/secondary/82D4DC4/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8288444:: @ 8288444 - .incbin "data/tilesets/secondary/82D4DC4/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4DC4/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4DC4/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4DC4/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4DC4/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4DC4/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4DC4/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4DC4/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4DC4/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4DC4/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4DC4/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4DC4/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4DC4/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4DC4/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4DC4/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4DC4/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8288644:: @ 8288644 - .incbin "data/tilesets/secondary/82D4DDC/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8288C60:: @ 8288C60 - .incbin "data/tilesets/secondary/82D4DDC/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4DDC/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4DDC/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4DDC/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4DDC/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4DDC/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4DDC/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4DDC/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4DDC/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4DDC/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4DDC/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4DDC/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4DDC/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4DDC/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4DDC/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4DDC/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8288E60:: @ 8288E60 - .incbin "data/tilesets/secondary/82D4DF4/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8289FC8:: @ 8289FC8 - .incbin "data/tilesets/secondary/82D4DF4/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4DF4/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4DF4/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4DF4/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4DF4/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4DF4/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4DF4/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4DF4/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4DF4/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4DF4/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4DF4/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4DF4/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4DF4/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4DF4/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4DF4/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4DF4/palettes/15.gbapal" - - .align 2 -gTilesetTiles_828A1C8:: @ 828A1C8 - .incbin "data/tilesets/secondary/82D4E0C/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_828B250:: @ 828B250 - .incbin "data/tilesets/secondary/82D4E0C/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4E0C/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4E0C/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4E0C/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4E0C/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4E0C/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4E0C/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4E0C/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4E0C/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4E0C/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4E0C/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4E0C/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4E0C/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4E0C/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4E0C/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4E0C/palettes/15.gbapal" - - .align 2 -gTilesetTiles_828B450:: @ 828B450 - .incbin "data/tilesets/secondary/82D4E24/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_828CAA0:: @ 828CAA0 - .incbin "data/tilesets/secondary/82D4E24/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4E24/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4E24/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4E24/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4E24/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4E24/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4E24/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4E24/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4E24/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4E24/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4E24/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4E24/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4E24/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4E24/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4E24/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4E24/palettes/15.gbapal" - - .align 2 -gTilesetTiles_828CCA0:: @ 828CCA0 - .incbin "data/tilesets/secondary/82D4E3C/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_828D2BC:: @ 828D2BC - .incbin "data/tilesets/secondary/82D4E3C/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4E3C/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4E3C/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4E3C/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4E3C/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4E3C/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4E3C/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4E3C/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4E3C/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4E3C/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4E3C/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4E3C/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4E3C/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4E3C/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4E3C/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4E3C/palettes/15.gbapal" - - .align 2 -gTilesetTiles_828D4BC:: @ 828D4BC - .incbin "data/tilesets/secondary/82D4E54/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_828E3A4:: @ 828E3A4 - .incbin "data/tilesets/secondary/82D4E54/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4E54/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4E54/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4E54/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4E54/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4E54/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4E54/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4E54/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4E54/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4E54/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4E54/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4E54/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4E54/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4E54/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4E54/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4E54/palettes/15.gbapal" - - .align 2 -gTilesetTiles_828E5A4:: @ 828E5A4 - .incbin "data/tilesets/secondary/82D4E84/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_828EC70:: @ 828EC70 - .incbin "data/tilesets/secondary/82D4E84/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4E84/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4E84/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4E84/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4E84/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4E84/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4E84/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4E84/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4E84/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4E84/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4E84/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4E84/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4E84/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4E84/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4E84/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4E84/palettes/15.gbapal" - - .align 2 -gTilesetTiles_828EE70:: @ 828EE70 - .incbin "data/tilesets/secondary/82D4E9C/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_828F378:: @ 828F378 - .incbin "data/tilesets/secondary/82D4E9C/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4E9C/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4E9C/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4E9C/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4E9C/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4E9C/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4E9C/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4E9C/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4E9C/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4E9C/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4E9C/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4E9C/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4E9C/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4E9C/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4E9C/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4E9C/palettes/15.gbapal" - - .align 2 -gTilesetTiles_828F578:: @ 828F578 - .incbin "data/tilesets/secondary/82D4EB4/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_828F9D8:: @ 828F9D8 - .incbin "data/tilesets/secondary/82D4EB4/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4EB4/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4EB4/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4EB4/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4EB4/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4EB4/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4EB4/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4EB4/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4EB4/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4EB4/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4EB4/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4EB4/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4EB4/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4EB4/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4EB4/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4EB4/palettes/15.gbapal" - - .align 2 -gTilesetTiles_828FBD8:: @ 828FBD8 - .incbin "data/tilesets/secondary/82D4F8C/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8290DD0:: @ 8290DD0 - .incbin "data/tilesets/secondary/82D4F8C/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4F8C/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4F8C/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4F8C/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4F8C/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4F8C/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4F8C/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4F8C/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4F8C/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4F8C/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4F8C/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4F8C/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4F8C/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4F8C/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4F8C/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4F8C/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8290FD0:: @ 8290FD0 - .incbin "data/tilesets/secondary/82D4EE4/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8291274:: @ 8291274 - .incbin "data/tilesets/secondary/82D4EE4/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4EE4/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4EE4/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4EE4/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4EE4/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4EE4/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4EE4/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4EE4/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4EE4/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4EE4/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4EE4/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4EE4/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4EE4/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4EE4/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4EE4/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4EE4/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8291474:: @ 8291474 - .incbin "data/tilesets/secondary/82D4EFC/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8291AFC:: @ 8291AFC - .incbin "data/tilesets/secondary/82D4EFC/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4EFC/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4EFC/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4EFC/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4EFC/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4EFC/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4EFC/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4EFC/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4EFC/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4EFC/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4EFC/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4EFC/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4EFC/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4EFC/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4EFC/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4EFC/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8291CFC:: @ 8291CFC - .incbin "data/tilesets/secondary/82D4F14/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_82920F0:: @ 82920F0 - .incbin "data/tilesets/secondary/82D4F14/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4F14/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4F14/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4F14/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4F14/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4F14/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4F14/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4F14/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4F14/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4F14/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4F14/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4F14/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4F14/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4F14/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4F14/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4F14/palettes/15.gbapal" - - .align 2 -gTilesetTiles_82922F0:: @ 82922F0 - .incbin "data/tilesets/secondary/82D4F2C/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8292FF0:: @ 8292FF0 - .incbin "data/tilesets/secondary/82D4F2C/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4F2C/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4F2C/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4F2C/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4F2C/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4F2C/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4F2C/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4F2C/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4F2C/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4F2C/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4F2C/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4F2C/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4F2C/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4F2C/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4F2C/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4F2C/palettes/15.gbapal" - - .align 2 -gTilesetTiles_82931F0:: @ 82931F0 - .incbin "data/tilesets/secondary/82D4F44/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8293660:: @ 8293660 - .incbin "data/tilesets/secondary/82D4F44/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4F44/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4F44/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4F44/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4F44/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4F44/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4F44/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4F44/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4F44/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4F44/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4F44/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4F44/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4F44/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4F44/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4F44/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4F44/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8293860:: @ 8293860 - .incbin "data/tilesets/secondary/82D4F5C/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8293B0C:: @ 8293B0C - .incbin "data/tilesets/secondary/82D4F5C/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4F5C/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4F5C/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4F5C/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4F5C/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4F5C/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4F5C/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4F5C/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4F5C/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4F5C/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4F5C/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4F5C/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4F5C/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4F5C/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4F5C/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4F5C/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8293D0C:: @ 8293D0C - .incbin "data/tilesets/secondary/82D4F74/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8294144:: @ 8294144 - .incbin "data/tilesets/secondary/82D4F74/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4F74/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4F74/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4F74/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4F74/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4F74/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4F74/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4F74/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4F74/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4F74/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4F74/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4F74/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4F74/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4F74/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4F74/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4F74/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8294344:: @ 8294344 - .incbin "data/tilesets/secondary/82D4FA4/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8294D08:: @ 8294D08 - .incbin "data/tilesets/secondary/82D4FA4/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4FA4/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4FA4/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4FA4/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4FA4/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4FA4/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4FA4/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4FA4/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4FA4/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4FA4/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4FA4/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4FA4/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4FA4/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4FA4/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4FA4/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4FA4/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8294F08:: @ 8294F08 - .incbin "data/tilesets/secondary/82D4FBC/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8294F18:: @ 8294F18 - .incbin "data/tilesets/secondary/82D4FBC/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4FBC/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4FBC/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4FBC/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4FBC/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4FBC/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4FBC/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4FBC/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4FBC/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4FBC/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4FBC/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4FBC/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4FBC/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4FBC/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4FBC/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4FBC/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8295118:: @ 8295118 - .incbin "data/tilesets/secondary/82D4FD4/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_829512C:: @ 829512C - .incbin "data/tilesets/secondary/82D4FD4/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4FD4/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4FD4/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4FD4/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4FD4/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4FD4/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4FD4/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4FD4/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4FD4/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4FD4/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4FD4/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4FD4/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4FD4/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4FD4/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4FD4/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4FD4/palettes/15.gbapal" - - .align 2 -gTilesetTiles_829532C:: @ 829532C - .incbin "data/tilesets/secondary/82D4FEC/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_82967D4:: @ 82967D4 - .incbin "data/tilesets/secondary/82D4FEC/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D4FEC/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D4FEC/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D4FEC/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D4FEC/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D4FEC/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D4FEC/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D4FEC/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D4FEC/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D4FEC/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D4FEC/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D4FEC/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D4FEC/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D4FEC/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D4FEC/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D4FEC/palettes/15.gbapal" - - .align 2 -gTilesetTiles_82969D4:: @ 82969D4 - .incbin "data/tilesets/secondary/82D5004/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8296E90:: @ 8296E90 - .incbin "data/tilesets/secondary/82D5004/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D5004/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D5004/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D5004/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D5004/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D5004/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D5004/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D5004/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D5004/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D5004/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D5004/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D5004/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D5004/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D5004/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D5004/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D5004/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8297090:: @ 8297090 - .incbin "data/tilesets/secondary/82D501C/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_82983BC:: @ 82983BC - .incbin "data/tilesets/secondary/82D501C/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D501C/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D501C/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D501C/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D501C/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D501C/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D501C/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D501C/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D501C/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D501C/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D501C/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D501C/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D501C/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D501C/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D501C/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D501C/palettes/15.gbapal" - - .align 2 -gTilesetTiles_82985BC:: @ 82985BC - .incbin "data/tilesets/secondary/82D5034/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8298970:: @ 8298970 - .incbin "data/tilesets/secondary/82D5034/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D5034/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D5034/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D5034/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D5034/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D5034/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D5034/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D5034/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D5034/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D5034/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D5034/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D5034/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D5034/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D5034/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D5034/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D5034/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8298B70:: @ 8298B70 - .incbin "data/tilesets/secondary/82D504C/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_8299AA4:: @ 8299AA4 - .incbin "data/tilesets/secondary/82D504C/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D504C/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D504C/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D504C/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D504C/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D504C/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D504C/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D504C/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D504C/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D504C/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D504C/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D504C/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D504C/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D504C/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D504C/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D504C/palettes/15.gbapal" - - .align 2 -gTilesetTiles_8299CA4:: @ 8299CA4 - .incbin "data/tilesets/secondary/82D5064/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_829AB04:: @ 829AB04 - .incbin "data/tilesets/secondary/82D5064/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D5064/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D5064/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D5064/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D5064/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D5064/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D5064/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D5064/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D5064/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D5064/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D5064/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D5064/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D5064/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D5064/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D5064/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D5064/palettes/15.gbapal" - - .align 2 -gTilesetTiles_829AD04:: @ 829AD04 - .incbin "data/tilesets/secondary/82D507C/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_829BD64:: @ 829BD64 - .incbin "data/tilesets/secondary/82D507C/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D507C/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D507C/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D507C/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D507C/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D507C/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D507C/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D507C/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D507C/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D507C/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D507C/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D507C/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D507C/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D507C/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D507C/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D507C/palettes/15.gbapal" - - .align 2 -gTilesetTiles_829BF64:: @ 829BF64 - .incbin "data/tilesets/secondary/82D5094/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_829CEE4:: @ 829CEE4 - .incbin "data/tilesets/secondary/82D5094/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D5094/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D5094/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D5094/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D5094/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D5094/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D5094/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D5094/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D5094/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D5094/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D5094/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D5094/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D5094/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D5094/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D5094/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D5094/palettes/15.gbapal" - - .align 2 -gTilesetTiles_829D0E4:: @ 829D0E4 - .incbin "data/tilesets/secondary/82D50AC/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_829D894:: @ 829D894 - .incbin "data/tilesets/secondary/82D50AC/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D50AC/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D50AC/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D50AC/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D50AC/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D50AC/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D50AC/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D50AC/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D50AC/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D50AC/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D50AC/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D50AC/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D50AC/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D50AC/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D50AC/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D50AC/palettes/15.gbapal" - - .align 2 -gTilesetTiles_829DA94:: @ 829DA94 - .incbin "data/tilesets/secondary/82D50C4/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_829EA50:: @ 829EA50 - .incbin "data/tilesets/secondary/82D50C4/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D50C4/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D50C4/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D50C4/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D50C4/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D50C4/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D50C4/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D50C4/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D50C4/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D50C4/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D50C4/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D50C4/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D50C4/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D50C4/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D50C4/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D50C4/palettes/15.gbapal" - - .align 2 -gTilesetTiles_829EC50:: @ 829EC50 - .incbin "data/tilesets/secondary/82D50DC/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_829F4C8:: @ 829F4C8 - .incbin "data/tilesets/secondary/82D50DC/palettes/0.gbapal" - .incbin "data/tilesets/secondary/82D50DC/palettes/1.gbapal" - .incbin "data/tilesets/secondary/82D50DC/palettes/2.gbapal" - .incbin "data/tilesets/secondary/82D50DC/palettes/3.gbapal" - .incbin "data/tilesets/secondary/82D50DC/palettes/4.gbapal" - .incbin "data/tilesets/secondary/82D50DC/palettes/5.gbapal" - .incbin "data/tilesets/secondary/82D50DC/palettes/6.gbapal" - .incbin "data/tilesets/secondary/82D50DC/palettes/7.gbapal" - .incbin "data/tilesets/secondary/82D50DC/palettes/8.gbapal" - .incbin "data/tilesets/secondary/82D50DC/palettes/9.gbapal" - .incbin "data/tilesets/secondary/82D50DC/palettes/10.gbapal" - .incbin "data/tilesets/secondary/82D50DC/palettes/11.gbapal" - .incbin "data/tilesets/secondary/82D50DC/palettes/12.gbapal" - .incbin "data/tilesets/secondary/82D50DC/palettes/13.gbapal" - .incbin "data/tilesets/secondary/82D50DC/palettes/14.gbapal" - .incbin "data/tilesets/secondary/82D50DC/palettes/15.gbapal" +gTilesetTiles_PalletTown:: @ 826D37C + .incbin "data/tilesets/secondary/pallet_town/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_PalletTown:: @ 826D7C0 + .incbin "data/tilesets/secondary/pallet_town/palettes/0.gbapal" + .incbin "data/tilesets/secondary/pallet_town/palettes/1.gbapal" + .incbin "data/tilesets/secondary/pallet_town/palettes/2.gbapal" + .incbin "data/tilesets/secondary/pallet_town/palettes/3.gbapal" + .incbin "data/tilesets/secondary/pallet_town/palettes/4.gbapal" + .incbin "data/tilesets/secondary/pallet_town/palettes/5.gbapal" + .incbin "data/tilesets/secondary/pallet_town/palettes/6.gbapal" + .incbin "data/tilesets/secondary/pallet_town/palettes/7.gbapal" + .incbin "data/tilesets/secondary/pallet_town/palettes/8.gbapal" + .incbin "data/tilesets/secondary/pallet_town/palettes/9.gbapal" + .incbin "data/tilesets/secondary/pallet_town/palettes/10.gbapal" + .incbin "data/tilesets/secondary/pallet_town/palettes/11.gbapal" + .incbin "data/tilesets/secondary/pallet_town/palettes/12.gbapal" + .incbin "data/tilesets/secondary/pallet_town/palettes/13.gbapal" + .incbin "data/tilesets/secondary/pallet_town/palettes/14.gbapal" + .incbin "data/tilesets/secondary/pallet_town/palettes/15.gbapal" + + .align 2 +gTilesetTiles_ViridianCity:: @ 826D9C0 + .incbin "data/tilesets/secondary/viridian_city/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_ViridianCity:: @ 826DFC0 + .incbin "data/tilesets/secondary/viridian_city/palettes/0.gbapal" + .incbin "data/tilesets/secondary/viridian_city/palettes/1.gbapal" + .incbin "data/tilesets/secondary/viridian_city/palettes/2.gbapal" + .incbin "data/tilesets/secondary/viridian_city/palettes/3.gbapal" + .incbin "data/tilesets/secondary/viridian_city/palettes/4.gbapal" + .incbin "data/tilesets/secondary/viridian_city/palettes/5.gbapal" + .incbin "data/tilesets/secondary/viridian_city/palettes/6.gbapal" + .incbin "data/tilesets/secondary/viridian_city/palettes/7.gbapal" + .incbin "data/tilesets/secondary/viridian_city/palettes/8.gbapal" + .incbin "data/tilesets/secondary/viridian_city/palettes/9.gbapal" + .incbin "data/tilesets/secondary/viridian_city/palettes/10.gbapal" + .incbin "data/tilesets/secondary/viridian_city/palettes/11.gbapal" + .incbin "data/tilesets/secondary/viridian_city/palettes/12.gbapal" + .incbin "data/tilesets/secondary/viridian_city/palettes/13.gbapal" + .incbin "data/tilesets/secondary/viridian_city/palettes/14.gbapal" + .incbin "data/tilesets/secondary/viridian_city/palettes/15.gbapal" + + .align 2 +gTilesetTiles_PewterCity:: @ 826E1C0 + .incbin "data/tilesets/secondary/pewter_city/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_PewterCity:: @ 826EAB8 + .incbin "data/tilesets/secondary/pewter_city/palettes/0.gbapal" + .incbin "data/tilesets/secondary/pewter_city/palettes/1.gbapal" + .incbin "data/tilesets/secondary/pewter_city/palettes/2.gbapal" + .incbin "data/tilesets/secondary/pewter_city/palettes/3.gbapal" + .incbin "data/tilesets/secondary/pewter_city/palettes/4.gbapal" + .incbin "data/tilesets/secondary/pewter_city/palettes/5.gbapal" + .incbin "data/tilesets/secondary/pewter_city/palettes/6.gbapal" + .incbin "data/tilesets/secondary/pewter_city/palettes/7.gbapal" + .incbin "data/tilesets/secondary/pewter_city/palettes/8.gbapal" + .incbin "data/tilesets/secondary/pewter_city/palettes/9.gbapal" + .incbin "data/tilesets/secondary/pewter_city/palettes/10.gbapal" + .incbin "data/tilesets/secondary/pewter_city/palettes/11.gbapal" + .incbin "data/tilesets/secondary/pewter_city/palettes/12.gbapal" + .incbin "data/tilesets/secondary/pewter_city/palettes/13.gbapal" + .incbin "data/tilesets/secondary/pewter_city/palettes/14.gbapal" + .incbin "data/tilesets/secondary/pewter_city/palettes/15.gbapal" + + .align 2 +gTilesetTiles_CeruleanCity:: @ 826ECB8 + .incbin "data/tilesets/secondary/cerulean_city/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_CeruleanCity:: @ 826F4B8 + .incbin "data/tilesets/secondary/cerulean_city/palettes/0.gbapal" + .incbin "data/tilesets/secondary/cerulean_city/palettes/1.gbapal" + .incbin "data/tilesets/secondary/cerulean_city/palettes/2.gbapal" + .incbin "data/tilesets/secondary/cerulean_city/palettes/3.gbapal" + .incbin "data/tilesets/secondary/cerulean_city/palettes/4.gbapal" + .incbin "data/tilesets/secondary/cerulean_city/palettes/5.gbapal" + .incbin "data/tilesets/secondary/cerulean_city/palettes/6.gbapal" + .incbin "data/tilesets/secondary/cerulean_city/palettes/7.gbapal" + .incbin "data/tilesets/secondary/cerulean_city/palettes/8.gbapal" + .incbin "data/tilesets/secondary/cerulean_city/palettes/9.gbapal" + .incbin "data/tilesets/secondary/cerulean_city/palettes/10.gbapal" + .incbin "data/tilesets/secondary/cerulean_city/palettes/11.gbapal" + .incbin "data/tilesets/secondary/cerulean_city/palettes/12.gbapal" + .incbin "data/tilesets/secondary/cerulean_city/palettes/13.gbapal" + .incbin "data/tilesets/secondary/cerulean_city/palettes/14.gbapal" + .incbin "data/tilesets/secondary/cerulean_city/palettes/15.gbapal" + + .align 2 +gTilesetTiles_LavenderTown:: @ 826F6B8 + .incbin "data/tilesets/secondary/lavender_town/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_LavenderTown:: @ 8270438 + .incbin "data/tilesets/secondary/lavender_town/palettes/0.gbapal" + .incbin "data/tilesets/secondary/lavender_town/palettes/1.gbapal" + .incbin "data/tilesets/secondary/lavender_town/palettes/2.gbapal" + .incbin "data/tilesets/secondary/lavender_town/palettes/3.gbapal" + .incbin "data/tilesets/secondary/lavender_town/palettes/4.gbapal" + .incbin "data/tilesets/secondary/lavender_town/palettes/5.gbapal" + .incbin "data/tilesets/secondary/lavender_town/palettes/6.gbapal" + .incbin "data/tilesets/secondary/lavender_town/palettes/7.gbapal" + .incbin "data/tilesets/secondary/lavender_town/palettes/8.gbapal" + .incbin "data/tilesets/secondary/lavender_town/palettes/9.gbapal" + .incbin "data/tilesets/secondary/lavender_town/palettes/10.gbapal" + .incbin "data/tilesets/secondary/lavender_town/palettes/11.gbapal" + .incbin "data/tilesets/secondary/lavender_town/palettes/12.gbapal" + .incbin "data/tilesets/secondary/lavender_town/palettes/13.gbapal" + .incbin "data/tilesets/secondary/lavender_town/palettes/14.gbapal" + .incbin "data/tilesets/secondary/lavender_town/palettes/15.gbapal" + + .align 2 +gTilesetTiles_VermilionCity:: @ 8270638 + .incbin "data/tilesets/secondary/vermilion_city/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_VermilionCity:: @ 8270DA0 + .incbin "data/tilesets/secondary/vermilion_city/palettes/0.gbapal" + .incbin "data/tilesets/secondary/vermilion_city/palettes/1.gbapal" + .incbin "data/tilesets/secondary/vermilion_city/palettes/2.gbapal" + .incbin "data/tilesets/secondary/vermilion_city/palettes/3.gbapal" + .incbin "data/tilesets/secondary/vermilion_city/palettes/4.gbapal" + .incbin "data/tilesets/secondary/vermilion_city/palettes/5.gbapal" + .incbin "data/tilesets/secondary/vermilion_city/palettes/6.gbapal" + .incbin "data/tilesets/secondary/vermilion_city/palettes/7.gbapal" + .incbin "data/tilesets/secondary/vermilion_city/palettes/8.gbapal" + .incbin "data/tilesets/secondary/vermilion_city/palettes/9.gbapal" + .incbin "data/tilesets/secondary/vermilion_city/palettes/10.gbapal" + .incbin "data/tilesets/secondary/vermilion_city/palettes/11.gbapal" + .incbin "data/tilesets/secondary/vermilion_city/palettes/12.gbapal" + .incbin "data/tilesets/secondary/vermilion_city/palettes/13.gbapal" + .incbin "data/tilesets/secondary/vermilion_city/palettes/14.gbapal" + .incbin "data/tilesets/secondary/vermilion_city/palettes/15.gbapal" + + .align 2 +gTilesetTiles_CeladonCity:: @ 8270FA0 + .incbin "data/tilesets/secondary/celadon_city/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_CeladonCity:: @ 8271C74 + .incbin "data/tilesets/secondary/celadon_city/palettes/0.gbapal" + .incbin "data/tilesets/secondary/celadon_city/palettes/1.gbapal" + .incbin "data/tilesets/secondary/celadon_city/palettes/2.gbapal" + .incbin "data/tilesets/secondary/celadon_city/palettes/3.gbapal" + .incbin "data/tilesets/secondary/celadon_city/palettes/4.gbapal" + .incbin "data/tilesets/secondary/celadon_city/palettes/5.gbapal" + .incbin "data/tilesets/secondary/celadon_city/palettes/6.gbapal" + .incbin "data/tilesets/secondary/celadon_city/palettes/7.gbapal" + .incbin "data/tilesets/secondary/celadon_city/palettes/8.gbapal" + .incbin "data/tilesets/secondary/celadon_city/palettes/9.gbapal" + .incbin "data/tilesets/secondary/celadon_city/palettes/10.gbapal" + .incbin "data/tilesets/secondary/celadon_city/palettes/11.gbapal" + .incbin "data/tilesets/secondary/celadon_city/palettes/12.gbapal" + .incbin "data/tilesets/secondary/celadon_city/palettes/13.gbapal" + .incbin "data/tilesets/secondary/celadon_city/palettes/14.gbapal" + .incbin "data/tilesets/secondary/celadon_city/palettes/15.gbapal" + + .align 2 +gTilesetTiles_FuchsiaCity:: @ 8271E74 + .incbin "data/tilesets/secondary/fuchsia_city/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_FuchsiaCity:: @ 8272A5C + .incbin "data/tilesets/secondary/fuchsia_city/palettes/0.gbapal" + .incbin "data/tilesets/secondary/fuchsia_city/palettes/1.gbapal" + .incbin "data/tilesets/secondary/fuchsia_city/palettes/2.gbapal" + .incbin "data/tilesets/secondary/fuchsia_city/palettes/3.gbapal" + .incbin "data/tilesets/secondary/fuchsia_city/palettes/4.gbapal" + .incbin "data/tilesets/secondary/fuchsia_city/palettes/5.gbapal" + .incbin "data/tilesets/secondary/fuchsia_city/palettes/6.gbapal" + .incbin "data/tilesets/secondary/fuchsia_city/palettes/7.gbapal" + .incbin "data/tilesets/secondary/fuchsia_city/palettes/8.gbapal" + .incbin "data/tilesets/secondary/fuchsia_city/palettes/9.gbapal" + .incbin "data/tilesets/secondary/fuchsia_city/palettes/10.gbapal" + .incbin "data/tilesets/secondary/fuchsia_city/palettes/11.gbapal" + .incbin "data/tilesets/secondary/fuchsia_city/palettes/12.gbapal" + .incbin "data/tilesets/secondary/fuchsia_city/palettes/13.gbapal" + .incbin "data/tilesets/secondary/fuchsia_city/palettes/14.gbapal" + .incbin "data/tilesets/secondary/fuchsia_city/palettes/15.gbapal" + + .align 2 +gTilesetTiles_CinnabarIsland:: @ 8272C5C + .incbin "data/tilesets/secondary/cinnabar_island/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_CinnabarIsland:: @ 8273358 + .incbin "data/tilesets/secondary/cinnabar_island/palettes/0.gbapal" + .incbin "data/tilesets/secondary/cinnabar_island/palettes/1.gbapal" + .incbin "data/tilesets/secondary/cinnabar_island/palettes/2.gbapal" + .incbin "data/tilesets/secondary/cinnabar_island/palettes/3.gbapal" + .incbin "data/tilesets/secondary/cinnabar_island/palettes/4.gbapal" + .incbin "data/tilesets/secondary/cinnabar_island/palettes/5.gbapal" + .incbin "data/tilesets/secondary/cinnabar_island/palettes/6.gbapal" + .incbin "data/tilesets/secondary/cinnabar_island/palettes/7.gbapal" + .incbin "data/tilesets/secondary/cinnabar_island/palettes/8.gbapal" + .incbin "data/tilesets/secondary/cinnabar_island/palettes/9.gbapal" + .incbin "data/tilesets/secondary/cinnabar_island/palettes/10.gbapal" + .incbin "data/tilesets/secondary/cinnabar_island/palettes/11.gbapal" + .incbin "data/tilesets/secondary/cinnabar_island/palettes/12.gbapal" + .incbin "data/tilesets/secondary/cinnabar_island/palettes/13.gbapal" + .incbin "data/tilesets/secondary/cinnabar_island/palettes/14.gbapal" + .incbin "data/tilesets/secondary/cinnabar_island/palettes/15.gbapal" + + .align 2 +gTilesetTiles_IndigoPlateau:: @ 8273558 + .incbin "data/tilesets/secondary/indigo_plateau/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_IndigoPlateau:: @ 82742D0 + .incbin "data/tilesets/secondary/indigo_plateau/palettes/0.gbapal" + .incbin "data/tilesets/secondary/indigo_plateau/palettes/1.gbapal" + .incbin "data/tilesets/secondary/indigo_plateau/palettes/2.gbapal" + .incbin "data/tilesets/secondary/indigo_plateau/palettes/3.gbapal" + .incbin "data/tilesets/secondary/indigo_plateau/palettes/4.gbapal" + .incbin "data/tilesets/secondary/indigo_plateau/palettes/5.gbapal" + .incbin "data/tilesets/secondary/indigo_plateau/palettes/6.gbapal" + .incbin "data/tilesets/secondary/indigo_plateau/palettes/7.gbapal" + .incbin "data/tilesets/secondary/indigo_plateau/palettes/8.gbapal" + .incbin "data/tilesets/secondary/indigo_plateau/palettes/9.gbapal" + .incbin "data/tilesets/secondary/indigo_plateau/palettes/10.gbapal" + .incbin "data/tilesets/secondary/indigo_plateau/palettes/11.gbapal" + .incbin "data/tilesets/secondary/indigo_plateau/palettes/12.gbapal" + .incbin "data/tilesets/secondary/indigo_plateau/palettes/13.gbapal" + .incbin "data/tilesets/secondary/indigo_plateau/palettes/14.gbapal" + .incbin "data/tilesets/secondary/indigo_plateau/palettes/15.gbapal" + + .align 2 +gTilesetTiles_SaffronCity:: @ 82744D0 + .incbin "data/tilesets/secondary/saffron_city/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_SaffronCity:: @ 8275094 + .incbin "data/tilesets/secondary/saffron_city/palettes/0.gbapal" + .incbin "data/tilesets/secondary/saffron_city/palettes/1.gbapal" + .incbin "data/tilesets/secondary/saffron_city/palettes/2.gbapal" + .incbin "data/tilesets/secondary/saffron_city/palettes/3.gbapal" + .incbin "data/tilesets/secondary/saffron_city/palettes/4.gbapal" + .incbin "data/tilesets/secondary/saffron_city/palettes/5.gbapal" + .incbin "data/tilesets/secondary/saffron_city/palettes/6.gbapal" + .incbin "data/tilesets/secondary/saffron_city/palettes/7.gbapal" + .incbin "data/tilesets/secondary/saffron_city/palettes/8.gbapal" + .incbin "data/tilesets/secondary/saffron_city/palettes/9.gbapal" + .incbin "data/tilesets/secondary/saffron_city/palettes/10.gbapal" + .incbin "data/tilesets/secondary/saffron_city/palettes/11.gbapal" + .incbin "data/tilesets/secondary/saffron_city/palettes/12.gbapal" + .incbin "data/tilesets/secondary/saffron_city/palettes/13.gbapal" + .incbin "data/tilesets/secondary/saffron_city/palettes/14.gbapal" + .incbin "data/tilesets/secondary/saffron_city/palettes/15.gbapal" + + .align 2 +gTilesetTiles_Building:: @ Building + .incbin "data/tilesets/primary/building/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_Building:: @ Building + .incbin "data/tilesets/primary/building/palettes/0.gbapal" + .incbin "data/tilesets/primary/building/palettes/1.gbapal" + .incbin "data/tilesets/primary/building/palettes/2.gbapal" + .incbin "data/tilesets/primary/building/palettes/3.gbapal" + .incbin "data/tilesets/primary/building/palettes/4.gbapal" + .incbin "data/tilesets/primary/building/palettes/5.gbapal" + .incbin "data/tilesets/primary/building/palettes/6.gbapal" + .incbin "data/tilesets/primary/building/palettes/7.gbapal" + .incbin "data/tilesets/primary/building/palettes/8.gbapal" + .incbin "data/tilesets/primary/building/palettes/9.gbapal" + .incbin "data/tilesets/primary/building/palettes/10.gbapal" + .incbin "data/tilesets/primary/building/palettes/11.gbapal" + .incbin "data/tilesets/primary/building/palettes/12.gbapal" + .incbin "data/tilesets/primary/building/palettes/13.gbapal" + .incbin "data/tilesets/primary/building/palettes/14.gbapal" + .incbin "data/tilesets/primary/building/palettes/15.gbapal" + + .align 2 +gTilesetTiles_Mart:: @ 8277894 + .incbin "data/tilesets/secondary/mart/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_Mart:: @ 8277A5C + .incbin "data/tilesets/secondary/mart/palettes/0.gbapal" + .incbin "data/tilesets/secondary/mart/palettes/1.gbapal" + .incbin "data/tilesets/secondary/mart/palettes/2.gbapal" + .incbin "data/tilesets/secondary/mart/palettes/3.gbapal" + .incbin "data/tilesets/secondary/mart/palettes/4.gbapal" + .incbin "data/tilesets/secondary/mart/palettes/5.gbapal" + .incbin "data/tilesets/secondary/mart/palettes/6.gbapal" + .incbin "data/tilesets/secondary/mart/palettes/7.gbapal" + .incbin "data/tilesets/secondary/mart/palettes/8.gbapal" + .incbin "data/tilesets/secondary/mart/palettes/9.gbapal" + .incbin "data/tilesets/secondary/mart/palettes/10.gbapal" + .incbin "data/tilesets/secondary/mart/palettes/11.gbapal" + .incbin "data/tilesets/secondary/mart/palettes/12.gbapal" + .incbin "data/tilesets/secondary/mart/palettes/13.gbapal" + .incbin "data/tilesets/secondary/mart/palettes/14.gbapal" + .incbin "data/tilesets/secondary/mart/palettes/15.gbapal" + + .align 2 +gTilesetTiles_PokemonCenter:: @ 8277C5C + .incbin "data/tilesets/secondary/pokemon_center/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_PokemonCenter:: @ 8278CC4 + .incbin "data/tilesets/secondary/pokemon_center/palettes/0.gbapal" + .incbin "data/tilesets/secondary/pokemon_center/palettes/1.gbapal" + .incbin "data/tilesets/secondary/pokemon_center/palettes/2.gbapal" + .incbin "data/tilesets/secondary/pokemon_center/palettes/3.gbapal" + .incbin "data/tilesets/secondary/pokemon_center/palettes/4.gbapal" + .incbin "data/tilesets/secondary/pokemon_center/palettes/5.gbapal" + .incbin "data/tilesets/secondary/pokemon_center/palettes/6.gbapal" + .incbin "data/tilesets/secondary/pokemon_center/palettes/7.gbapal" + .incbin "data/tilesets/secondary/pokemon_center/palettes/8.gbapal" + .incbin "data/tilesets/secondary/pokemon_center/palettes/9.gbapal" + .incbin "data/tilesets/secondary/pokemon_center/palettes/10.gbapal" + .incbin "data/tilesets/secondary/pokemon_center/palettes/11.gbapal" + .incbin "data/tilesets/secondary/pokemon_center/palettes/12.gbapal" + .incbin "data/tilesets/secondary/pokemon_center/palettes/13.gbapal" + .incbin "data/tilesets/secondary/pokemon_center/palettes/14.gbapal" + .incbin "data/tilesets/secondary/pokemon_center/palettes/15.gbapal" + + .align 2 +gTilesetTiles_Cave:: @ 8278EC4 + .incbin "data/tilesets/secondary/cave/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_Cave:: @ 827A1A8 + .incbin "data/tilesets/secondary/cave/palettes/0.gbapal" + .incbin "data/tilesets/secondary/cave/palettes/1.gbapal" + .incbin "data/tilesets/secondary/cave/palettes/2.gbapal" + .incbin "data/tilesets/secondary/cave/palettes/3.gbapal" + .incbin "data/tilesets/secondary/cave/palettes/4.gbapal" + .incbin "data/tilesets/secondary/cave/palettes/5.gbapal" + .incbin "data/tilesets/secondary/cave/palettes/6.gbapal" + .incbin "data/tilesets/secondary/cave/palettes/7.gbapal" + .incbin "data/tilesets/secondary/cave/palettes/8.gbapal" + .incbin "data/tilesets/secondary/cave/palettes/9.gbapal" + .incbin "data/tilesets/secondary/cave/palettes/10.gbapal" + .incbin "data/tilesets/secondary/cave/palettes/11.gbapal" + .incbin "data/tilesets/secondary/cave/palettes/12.gbapal" + .incbin "data/tilesets/secondary/cave/palettes/13.gbapal" + .incbin "data/tilesets/secondary/cave/palettes/14.gbapal" + .incbin "data/tilesets/secondary/cave/palettes/15.gbapal" + + .align 2 +gTilesetTiles_Dummy1:: @ 827A3A8 + .incbin "data/tilesets/secondary/dummy1/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_Dummy1:: @ 827A3B8 + .incbin "data/tilesets/secondary/dummy1/palettes/0.gbapal" + .incbin "data/tilesets/secondary/dummy1/palettes/1.gbapal" + .incbin "data/tilesets/secondary/dummy1/palettes/2.gbapal" + .incbin "data/tilesets/secondary/dummy1/palettes/3.gbapal" + .incbin "data/tilesets/secondary/dummy1/palettes/4.gbapal" + .incbin "data/tilesets/secondary/dummy1/palettes/5.gbapal" + .incbin "data/tilesets/secondary/dummy1/palettes/6.gbapal" + .incbin "data/tilesets/secondary/dummy1/palettes/7.gbapal" + .incbin "data/tilesets/secondary/dummy1/palettes/8.gbapal" + .incbin "data/tilesets/secondary/dummy1/palettes/9.gbapal" + .incbin "data/tilesets/secondary/dummy1/palettes/10.gbapal" + .incbin "data/tilesets/secondary/dummy1/palettes/11.gbapal" + .incbin "data/tilesets/secondary/dummy1/palettes/12.gbapal" + .incbin "data/tilesets/secondary/dummy1/palettes/13.gbapal" + .incbin "data/tilesets/secondary/dummy1/palettes/14.gbapal" + .incbin "data/tilesets/secondary/dummy1/palettes/15.gbapal" + + .align 2 +gTilesetTiles_Museum:: @ 827A5B8 + .incbin "data/tilesets/secondary/museum/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_Museum:: @ 827AE14 + .incbin "data/tilesets/secondary/museum/palettes/0.gbapal" + .incbin "data/tilesets/secondary/museum/palettes/1.gbapal" + .incbin "data/tilesets/secondary/museum/palettes/2.gbapal" + .incbin "data/tilesets/secondary/museum/palettes/3.gbapal" + .incbin "data/tilesets/secondary/museum/palettes/4.gbapal" + .incbin "data/tilesets/secondary/museum/palettes/5.gbapal" + .incbin "data/tilesets/secondary/museum/palettes/6.gbapal" + .incbin "data/tilesets/secondary/museum/palettes/7.gbapal" + .incbin "data/tilesets/secondary/museum/palettes/8.gbapal" + .incbin "data/tilesets/secondary/museum/palettes/9.gbapal" + .incbin "data/tilesets/secondary/museum/palettes/10.gbapal" + .incbin "data/tilesets/secondary/museum/palettes/11.gbapal" + .incbin "data/tilesets/secondary/museum/palettes/12.gbapal" + .incbin "data/tilesets/secondary/museum/palettes/13.gbapal" + .incbin "data/tilesets/secondary/museum/palettes/14.gbapal" + .incbin "data/tilesets/secondary/museum/palettes/15.gbapal" + + .align 2 +gTilesetTiles_CableClub:: @ 827B014 + .incbin "data/tilesets/secondary/cable_club/tiles.4bpp" + + .align 2 +gTilesetPalettes_CableClub:: @ 827FF14 + .incbin "data/tilesets/secondary/cable_club/palettes/0.gbapal" + .incbin "data/tilesets/secondary/cable_club/palettes/1.gbapal" + .incbin "data/tilesets/secondary/cable_club/palettes/2.gbapal" + .incbin "data/tilesets/secondary/cable_club/palettes/3.gbapal" + .incbin "data/tilesets/secondary/cable_club/palettes/4.gbapal" + .incbin "data/tilesets/secondary/cable_club/palettes/5.gbapal" + .incbin "data/tilesets/secondary/cable_club/palettes/6.gbapal" + .incbin "data/tilesets/secondary/cable_club/palettes/7.gbapal" + .incbin "data/tilesets/secondary/cable_club/palettes/8.gbapal" + .incbin "data/tilesets/secondary/cable_club/palettes/9.gbapal" + .incbin "data/tilesets/secondary/cable_club/palettes/10.gbapal" + .incbin "data/tilesets/secondary/cable_club/palettes/11.gbapal" + .incbin "data/tilesets/secondary/cable_club/palettes/12.gbapal" + .incbin "data/tilesets/secondary/cable_club/palettes/13.gbapal" + .incbin "data/tilesets/secondary/cable_club/palettes/14.gbapal" + .incbin "data/tilesets/secondary/cable_club/palettes/15.gbapal" + + .align 2 +gTilesetTiles_BikeShop:: @ 8280114 + .incbin "data/tilesets/secondary/bike_shop/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_BikeShop:: @ 82804EC + .incbin "data/tilesets/secondary/bike_shop/palettes/0.gbapal" + .incbin "data/tilesets/secondary/bike_shop/palettes/1.gbapal" + .incbin "data/tilesets/secondary/bike_shop/palettes/2.gbapal" + .incbin "data/tilesets/secondary/bike_shop/palettes/3.gbapal" + .incbin "data/tilesets/secondary/bike_shop/palettes/4.gbapal" + .incbin "data/tilesets/secondary/bike_shop/palettes/5.gbapal" + .incbin "data/tilesets/secondary/bike_shop/palettes/6.gbapal" + .incbin "data/tilesets/secondary/bike_shop/palettes/7.gbapal" + .incbin "data/tilesets/secondary/bike_shop/palettes/8.gbapal" + .incbin "data/tilesets/secondary/bike_shop/palettes/9.gbapal" + .incbin "data/tilesets/secondary/bike_shop/palettes/10.gbapal" + .incbin "data/tilesets/secondary/bike_shop/palettes/11.gbapal" + .incbin "data/tilesets/secondary/bike_shop/palettes/12.gbapal" + .incbin "data/tilesets/secondary/bike_shop/palettes/13.gbapal" + .incbin "data/tilesets/secondary/bike_shop/palettes/14.gbapal" + .incbin "data/tilesets/secondary/bike_shop/palettes/15.gbapal" + + .align 2 +gTilesetTiles_Lab:: @ 82806EC + .incbin "data/tilesets/secondary/lab/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_Lab:: @ 8280D00 + .incbin "data/tilesets/secondary/lab/palettes/0.gbapal" + .incbin "data/tilesets/secondary/lab/palettes/1.gbapal" + .incbin "data/tilesets/secondary/lab/palettes/2.gbapal" + .incbin "data/tilesets/secondary/lab/palettes/3.gbapal" + .incbin "data/tilesets/secondary/lab/palettes/4.gbapal" + .incbin "data/tilesets/secondary/lab/palettes/5.gbapal" + .incbin "data/tilesets/secondary/lab/palettes/6.gbapal" + .incbin "data/tilesets/secondary/lab/palettes/7.gbapal" + .incbin "data/tilesets/secondary/lab/palettes/8.gbapal" + .incbin "data/tilesets/secondary/lab/palettes/9.gbapal" + .incbin "data/tilesets/secondary/lab/palettes/10.gbapal" + .incbin "data/tilesets/secondary/lab/palettes/11.gbapal" + .incbin "data/tilesets/secondary/lab/palettes/12.gbapal" + .incbin "data/tilesets/secondary/lab/palettes/13.gbapal" + .incbin "data/tilesets/secondary/lab/palettes/14.gbapal" + .incbin "data/tilesets/secondary/lab/palettes/15.gbapal" + + .align 2 +gTilesetTiles_HoennBuilding:: @ 8280F00 + .incbin "data/tilesets/secondary/hoenn_building/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_HoennBuilding:: @ 82823A4 + .incbin "data/tilesets/secondary/hoenn_building/palettes/0.gbapal" + .incbin "data/tilesets/secondary/hoenn_building/palettes/1.gbapal" + .incbin "data/tilesets/secondary/hoenn_building/palettes/2.gbapal" + .incbin "data/tilesets/secondary/hoenn_building/palettes/3.gbapal" + .incbin "data/tilesets/secondary/hoenn_building/palettes/4.gbapal" + .incbin "data/tilesets/secondary/hoenn_building/palettes/5.gbapal" + .incbin "data/tilesets/secondary/hoenn_building/palettes/6.gbapal" + .incbin "data/tilesets/secondary/hoenn_building/palettes/7.gbapal" + .incbin "data/tilesets/secondary/hoenn_building/palettes/8.gbapal" + .incbin "data/tilesets/secondary/hoenn_building/palettes/9.gbapal" + .incbin "data/tilesets/secondary/hoenn_building/palettes/10.gbapal" + .incbin "data/tilesets/secondary/hoenn_building/palettes/11.gbapal" + .incbin "data/tilesets/secondary/hoenn_building/palettes/12.gbapal" + .incbin "data/tilesets/secondary/hoenn_building/palettes/13.gbapal" + .incbin "data/tilesets/secondary/hoenn_building/palettes/14.gbapal" + .incbin "data/tilesets/secondary/hoenn_building/palettes/15.gbapal" + + .align 2 +gTilesetTiles_GameCorner:: @ 82825A4 + .incbin "data/tilesets/secondary/game_corner/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_GameCorner:: @ 8282FBC + .incbin "data/tilesets/secondary/game_corner/palettes/0.gbapal" + .incbin "data/tilesets/secondary/game_corner/palettes/1.gbapal" + .incbin "data/tilesets/secondary/game_corner/palettes/2.gbapal" + .incbin "data/tilesets/secondary/game_corner/palettes/3.gbapal" + .incbin "data/tilesets/secondary/game_corner/palettes/4.gbapal" + .incbin "data/tilesets/secondary/game_corner/palettes/5.gbapal" + .incbin "data/tilesets/secondary/game_corner/palettes/6.gbapal" + .incbin "data/tilesets/secondary/game_corner/palettes/7.gbapal" + .incbin "data/tilesets/secondary/game_corner/palettes/8.gbapal" + .incbin "data/tilesets/secondary/game_corner/palettes/9.gbapal" + .incbin "data/tilesets/secondary/game_corner/palettes/10.gbapal" + .incbin "data/tilesets/secondary/game_corner/palettes/11.gbapal" + .incbin "data/tilesets/secondary/game_corner/palettes/12.gbapal" + .incbin "data/tilesets/secondary/game_corner/palettes/13.gbapal" + .incbin "data/tilesets/secondary/game_corner/palettes/14.gbapal" + .incbin "data/tilesets/secondary/game_corner/palettes/15.gbapal" + + .align 2 +gTilesetTiles_PewterGym:: @ 82831BC + .incbin "data/tilesets/secondary/pewter_gym/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_PewterGym:: @ 82839B0 + .incbin "data/tilesets/secondary/pewter_gym/palettes/0.gbapal" + .incbin "data/tilesets/secondary/pewter_gym/palettes/1.gbapal" + .incbin "data/tilesets/secondary/pewter_gym/palettes/2.gbapal" + .incbin "data/tilesets/secondary/pewter_gym/palettes/3.gbapal" + .incbin "data/tilesets/secondary/pewter_gym/palettes/4.gbapal" + .incbin "data/tilesets/secondary/pewter_gym/palettes/5.gbapal" + .incbin "data/tilesets/secondary/pewter_gym/palettes/6.gbapal" + .incbin "data/tilesets/secondary/pewter_gym/palettes/7.gbapal" + .incbin "data/tilesets/secondary/pewter_gym/palettes/8.gbapal" + .incbin "data/tilesets/secondary/pewter_gym/palettes/9.gbapal" + .incbin "data/tilesets/secondary/pewter_gym/palettes/10.gbapal" + .incbin "data/tilesets/secondary/pewter_gym/palettes/11.gbapal" + .incbin "data/tilesets/secondary/pewter_gym/palettes/12.gbapal" + .incbin "data/tilesets/secondary/pewter_gym/palettes/13.gbapal" + .incbin "data/tilesets/secondary/pewter_gym/palettes/14.gbapal" + .incbin "data/tilesets/secondary/pewter_gym/palettes/15.gbapal" + + .align 2 +gTilesetTiles_CeruleanGym:: @ 8283BB0 + .incbin "data/tilesets/secondary/cerulean_gym/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_CeruleanGym:: @ 8283FF8 + .incbin "data/tilesets/secondary/cerulean_gym/palettes/0.gbapal" + .incbin "data/tilesets/secondary/cerulean_gym/palettes/1.gbapal" + .incbin "data/tilesets/secondary/cerulean_gym/palettes/2.gbapal" + .incbin "data/tilesets/secondary/cerulean_gym/palettes/3.gbapal" + .incbin "data/tilesets/secondary/cerulean_gym/palettes/4.gbapal" + .incbin "data/tilesets/secondary/cerulean_gym/palettes/5.gbapal" + .incbin "data/tilesets/secondary/cerulean_gym/palettes/6.gbapal" + .incbin "data/tilesets/secondary/cerulean_gym/palettes/7.gbapal" + .incbin "data/tilesets/secondary/cerulean_gym/palettes/8.gbapal" + .incbin "data/tilesets/secondary/cerulean_gym/palettes/9.gbapal" + .incbin "data/tilesets/secondary/cerulean_gym/palettes/10.gbapal" + .incbin "data/tilesets/secondary/cerulean_gym/palettes/11.gbapal" + .incbin "data/tilesets/secondary/cerulean_gym/palettes/12.gbapal" + .incbin "data/tilesets/secondary/cerulean_gym/palettes/13.gbapal" + .incbin "data/tilesets/secondary/cerulean_gym/palettes/14.gbapal" + .incbin "data/tilesets/secondary/cerulean_gym/palettes/15.gbapal" + + .align 2 +gTilesetTiles_VermilionGym:: @ 82841F8 + .incbin "data/tilesets/secondary/vermilion_gym/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_VermilionGym:: @ 82849B8 + .incbin "data/tilesets/secondary/vermilion_gym/palettes/0.gbapal" + .incbin "data/tilesets/secondary/vermilion_gym/palettes/1.gbapal" + .incbin "data/tilesets/secondary/vermilion_gym/palettes/2.gbapal" + .incbin "data/tilesets/secondary/vermilion_gym/palettes/3.gbapal" + .incbin "data/tilesets/secondary/vermilion_gym/palettes/4.gbapal" + .incbin "data/tilesets/secondary/vermilion_gym/palettes/5.gbapal" + .incbin "data/tilesets/secondary/vermilion_gym/palettes/6.gbapal" + .incbin "data/tilesets/secondary/vermilion_gym/palettes/7.gbapal" + .incbin "data/tilesets/secondary/vermilion_gym/palettes/8.gbapal" + .incbin "data/tilesets/secondary/vermilion_gym/palettes/9.gbapal" + .incbin "data/tilesets/secondary/vermilion_gym/palettes/10.gbapal" + .incbin "data/tilesets/secondary/vermilion_gym/palettes/11.gbapal" + .incbin "data/tilesets/secondary/vermilion_gym/palettes/12.gbapal" + .incbin "data/tilesets/secondary/vermilion_gym/palettes/13.gbapal" + .incbin "data/tilesets/secondary/vermilion_gym/palettes/14.gbapal" + .incbin "data/tilesets/secondary/vermilion_gym/palettes/15.gbapal" + + .align 2 +gTilesetTiles_CeladonGym:: @ 8284BB8 + .incbin "data/tilesets/secondary/celadon_gym/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_CeladonGym:: @ 8285150 + .incbin "data/tilesets/secondary/celadon_gym/palettes/0.gbapal" + .incbin "data/tilesets/secondary/celadon_gym/palettes/1.gbapal" + .incbin "data/tilesets/secondary/celadon_gym/palettes/2.gbapal" + .incbin "data/tilesets/secondary/celadon_gym/palettes/3.gbapal" + .incbin "data/tilesets/secondary/celadon_gym/palettes/4.gbapal" + .incbin "data/tilesets/secondary/celadon_gym/palettes/5.gbapal" + .incbin "data/tilesets/secondary/celadon_gym/palettes/6.gbapal" + .incbin "data/tilesets/secondary/celadon_gym/palettes/7.gbapal" + .incbin "data/tilesets/secondary/celadon_gym/palettes/8.gbapal" + .incbin "data/tilesets/secondary/celadon_gym/palettes/9.gbapal" + .incbin "data/tilesets/secondary/celadon_gym/palettes/10.gbapal" + .incbin "data/tilesets/secondary/celadon_gym/palettes/11.gbapal" + .incbin "data/tilesets/secondary/celadon_gym/palettes/12.gbapal" + .incbin "data/tilesets/secondary/celadon_gym/palettes/13.gbapal" + .incbin "data/tilesets/secondary/celadon_gym/palettes/14.gbapal" + .incbin "data/tilesets/secondary/celadon_gym/palettes/15.gbapal" + + .align 2 +gTilesetTiles_FuchsiaGym:: @ 8285350 + .incbin "data/tilesets/secondary/fuchsia_gym/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_FuchsiaGym:: @ 82857A4 + .incbin "data/tilesets/secondary/fuchsia_gym/palettes/0.gbapal" + .incbin "data/tilesets/secondary/fuchsia_gym/palettes/1.gbapal" + .incbin "data/tilesets/secondary/fuchsia_gym/palettes/2.gbapal" + .incbin "data/tilesets/secondary/fuchsia_gym/palettes/3.gbapal" + .incbin "data/tilesets/secondary/fuchsia_gym/palettes/4.gbapal" + .incbin "data/tilesets/secondary/fuchsia_gym/palettes/5.gbapal" + .incbin "data/tilesets/secondary/fuchsia_gym/palettes/6.gbapal" + .incbin "data/tilesets/secondary/fuchsia_gym/palettes/7.gbapal" + .incbin "data/tilesets/secondary/fuchsia_gym/palettes/8.gbapal" + .incbin "data/tilesets/secondary/fuchsia_gym/palettes/9.gbapal" + .incbin "data/tilesets/secondary/fuchsia_gym/palettes/10.gbapal" + .incbin "data/tilesets/secondary/fuchsia_gym/palettes/11.gbapal" + .incbin "data/tilesets/secondary/fuchsia_gym/palettes/12.gbapal" + .incbin "data/tilesets/secondary/fuchsia_gym/palettes/13.gbapal" + .incbin "data/tilesets/secondary/fuchsia_gym/palettes/14.gbapal" + .incbin "data/tilesets/secondary/fuchsia_gym/palettes/15.gbapal" + + .align 2 +gTilesetTiles_SaffronGym:: @ 82859A4 + .incbin "data/tilesets/secondary/saffron_gym/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_SaffronGym:: @ 8285D90 + .incbin "data/tilesets/secondary/saffron_gym/palettes/0.gbapal" + .incbin "data/tilesets/secondary/saffron_gym/palettes/1.gbapal" + .incbin "data/tilesets/secondary/saffron_gym/palettes/2.gbapal" + .incbin "data/tilesets/secondary/saffron_gym/palettes/3.gbapal" + .incbin "data/tilesets/secondary/saffron_gym/palettes/4.gbapal" + .incbin "data/tilesets/secondary/saffron_gym/palettes/5.gbapal" + .incbin "data/tilesets/secondary/saffron_gym/palettes/6.gbapal" + .incbin "data/tilesets/secondary/saffron_gym/palettes/7.gbapal" + .incbin "data/tilesets/secondary/saffron_gym/palettes/8.gbapal" + .incbin "data/tilesets/secondary/saffron_gym/palettes/9.gbapal" + .incbin "data/tilesets/secondary/saffron_gym/palettes/10.gbapal" + .incbin "data/tilesets/secondary/saffron_gym/palettes/11.gbapal" + .incbin "data/tilesets/secondary/saffron_gym/palettes/12.gbapal" + .incbin "data/tilesets/secondary/saffron_gym/palettes/13.gbapal" + .incbin "data/tilesets/secondary/saffron_gym/palettes/14.gbapal" + .incbin "data/tilesets/secondary/saffron_gym/palettes/15.gbapal" + + .align 2 +gTilesetTiles_CinnabarGym:: @ 8285F90 + .incbin "data/tilesets/secondary/cinnabar_gym/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_CinnabarGym:: @ 82865D4 + .incbin "data/tilesets/secondary/cinnabar_gym/palettes/0.gbapal" + .incbin "data/tilesets/secondary/cinnabar_gym/palettes/1.gbapal" + .incbin "data/tilesets/secondary/cinnabar_gym/palettes/2.gbapal" + .incbin "data/tilesets/secondary/cinnabar_gym/palettes/3.gbapal" + .incbin "data/tilesets/secondary/cinnabar_gym/palettes/4.gbapal" + .incbin "data/tilesets/secondary/cinnabar_gym/palettes/5.gbapal" + .incbin "data/tilesets/secondary/cinnabar_gym/palettes/6.gbapal" + .incbin "data/tilesets/secondary/cinnabar_gym/palettes/7.gbapal" + .incbin "data/tilesets/secondary/cinnabar_gym/palettes/8.gbapal" + .incbin "data/tilesets/secondary/cinnabar_gym/palettes/9.gbapal" + .incbin "data/tilesets/secondary/cinnabar_gym/palettes/10.gbapal" + .incbin "data/tilesets/secondary/cinnabar_gym/palettes/11.gbapal" + .incbin "data/tilesets/secondary/cinnabar_gym/palettes/12.gbapal" + .incbin "data/tilesets/secondary/cinnabar_gym/palettes/13.gbapal" + .incbin "data/tilesets/secondary/cinnabar_gym/palettes/14.gbapal" + .incbin "data/tilesets/secondary/cinnabar_gym/palettes/15.gbapal" + + .align 2 +gTilesetTiles_ViridianGym:: @ 82867D4 + .incbin "data/tilesets/secondary/viridian_gym/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_ViridianGym:: @ 8286BC8 + .incbin "data/tilesets/secondary/viridian_gym/palettes/0.gbapal" + .incbin "data/tilesets/secondary/viridian_gym/palettes/1.gbapal" + .incbin "data/tilesets/secondary/viridian_gym/palettes/2.gbapal" + .incbin "data/tilesets/secondary/viridian_gym/palettes/3.gbapal" + .incbin "data/tilesets/secondary/viridian_gym/palettes/4.gbapal" + .incbin "data/tilesets/secondary/viridian_gym/palettes/5.gbapal" + .incbin "data/tilesets/secondary/viridian_gym/palettes/6.gbapal" + .incbin "data/tilesets/secondary/viridian_gym/palettes/7.gbapal" + .incbin "data/tilesets/secondary/viridian_gym/palettes/8.gbapal" + .incbin "data/tilesets/secondary/viridian_gym/palettes/9.gbapal" + .incbin "data/tilesets/secondary/viridian_gym/palettes/10.gbapal" + .incbin "data/tilesets/secondary/viridian_gym/palettes/11.gbapal" + .incbin "data/tilesets/secondary/viridian_gym/palettes/12.gbapal" + .incbin "data/tilesets/secondary/viridian_gym/palettes/13.gbapal" + .incbin "data/tilesets/secondary/viridian_gym/palettes/14.gbapal" + .incbin "data/tilesets/secondary/viridian_gym/palettes/15.gbapal" + + .align 2 +gTilesetTiles_SSAnne:: @ 8286DC8 + .incbin "data/tilesets/secondary/ss_anne/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_SSAnne:: @ 8287B80 + .incbin "data/tilesets/secondary/ss_anne/palettes/0.gbapal" + .incbin "data/tilesets/secondary/ss_anne/palettes/1.gbapal" + .incbin "data/tilesets/secondary/ss_anne/palettes/2.gbapal" + .incbin "data/tilesets/secondary/ss_anne/palettes/3.gbapal" + .incbin "data/tilesets/secondary/ss_anne/palettes/4.gbapal" + .incbin "data/tilesets/secondary/ss_anne/palettes/5.gbapal" + .incbin "data/tilesets/secondary/ss_anne/palettes/6.gbapal" + .incbin "data/tilesets/secondary/ss_anne/palettes/7.gbapal" + .incbin "data/tilesets/secondary/ss_anne/palettes/8.gbapal" + .incbin "data/tilesets/secondary/ss_anne/palettes/9.gbapal" + .incbin "data/tilesets/secondary/ss_anne/palettes/10.gbapal" + .incbin "data/tilesets/secondary/ss_anne/palettes/11.gbapal" + .incbin "data/tilesets/secondary/ss_anne/palettes/12.gbapal" + .incbin "data/tilesets/secondary/ss_anne/palettes/13.gbapal" + .incbin "data/tilesets/secondary/ss_anne/palettes/14.gbapal" + .incbin "data/tilesets/secondary/ss_anne/palettes/15.gbapal" + + .align 2 +gTilesetTiles_Dummy2:: @ 8287D80 + .incbin "data/tilesets/secondary/dummy2/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_Dummy2:: @ 8287D94 + .incbin "data/tilesets/secondary/dummy2/palettes/0.gbapal" + .incbin "data/tilesets/secondary/dummy2/palettes/1.gbapal" + .incbin "data/tilesets/secondary/dummy2/palettes/2.gbapal" + .incbin "data/tilesets/secondary/dummy2/palettes/3.gbapal" + .incbin "data/tilesets/secondary/dummy2/palettes/4.gbapal" + .incbin "data/tilesets/secondary/dummy2/palettes/5.gbapal" + .incbin "data/tilesets/secondary/dummy2/palettes/6.gbapal" + .incbin "data/tilesets/secondary/dummy2/palettes/7.gbapal" + .incbin "data/tilesets/secondary/dummy2/palettes/8.gbapal" + .incbin "data/tilesets/secondary/dummy2/palettes/9.gbapal" + .incbin "data/tilesets/secondary/dummy2/palettes/10.gbapal" + .incbin "data/tilesets/secondary/dummy2/palettes/11.gbapal" + .incbin "data/tilesets/secondary/dummy2/palettes/12.gbapal" + .incbin "data/tilesets/secondary/dummy2/palettes/13.gbapal" + .incbin "data/tilesets/secondary/dummy2/palettes/14.gbapal" + .incbin "data/tilesets/secondary/dummy2/palettes/15.gbapal" + + .align 2 +gTilesetTiles_ViridianForest:: @ 8287F94 + .incbin "data/tilesets/secondary/viridian_forest/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_ViridianForest:: @ 8288444 + .incbin "data/tilesets/secondary/viridian_forest/palettes/0.gbapal" + .incbin "data/tilesets/secondary/viridian_forest/palettes/1.gbapal" + .incbin "data/tilesets/secondary/viridian_forest/palettes/2.gbapal" + .incbin "data/tilesets/secondary/viridian_forest/palettes/3.gbapal" + .incbin "data/tilesets/secondary/viridian_forest/palettes/4.gbapal" + .incbin "data/tilesets/secondary/viridian_forest/palettes/5.gbapal" + .incbin "data/tilesets/secondary/viridian_forest/palettes/6.gbapal" + .incbin "data/tilesets/secondary/viridian_forest/palettes/7.gbapal" + .incbin "data/tilesets/secondary/viridian_forest/palettes/8.gbapal" + .incbin "data/tilesets/secondary/viridian_forest/palettes/9.gbapal" + .incbin "data/tilesets/secondary/viridian_forest/palettes/10.gbapal" + .incbin "data/tilesets/secondary/viridian_forest/palettes/11.gbapal" + .incbin "data/tilesets/secondary/viridian_forest/palettes/12.gbapal" + .incbin "data/tilesets/secondary/viridian_forest/palettes/13.gbapal" + .incbin "data/tilesets/secondary/viridian_forest/palettes/14.gbapal" + .incbin "data/tilesets/secondary/viridian_forest/palettes/15.gbapal" + + .align 2 +gTilesetTiles_UnusedGatehouse1:: @ 8288644 + .incbin "data/tilesets/secondary/unused_gatehouse1/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_UnusedGatehouse1:: @ 8288C60 + .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/0.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/1.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/2.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/3.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/4.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/5.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/6.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/7.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/8.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/9.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/10.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/11.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/12.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/13.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/14.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/15.gbapal" + + .align 2 +gTilesetTiles_RockTunnel:: @ 8288E60 + .incbin "data/tilesets/secondary/rock_tunnel/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_RockTunnel:: @ 8289FC8 + .incbin "data/tilesets/secondary/rock_tunnel/palettes/0.gbapal" + .incbin "data/tilesets/secondary/rock_tunnel/palettes/1.gbapal" + .incbin "data/tilesets/secondary/rock_tunnel/palettes/2.gbapal" + .incbin "data/tilesets/secondary/rock_tunnel/palettes/3.gbapal" + .incbin "data/tilesets/secondary/rock_tunnel/palettes/4.gbapal" + .incbin "data/tilesets/secondary/rock_tunnel/palettes/5.gbapal" + .incbin "data/tilesets/secondary/rock_tunnel/palettes/6.gbapal" + .incbin "data/tilesets/secondary/rock_tunnel/palettes/7.gbapal" + .incbin "data/tilesets/secondary/rock_tunnel/palettes/8.gbapal" + .incbin "data/tilesets/secondary/rock_tunnel/palettes/9.gbapal" + .incbin "data/tilesets/secondary/rock_tunnel/palettes/10.gbapal" + .incbin "data/tilesets/secondary/rock_tunnel/palettes/11.gbapal" + .incbin "data/tilesets/secondary/rock_tunnel/palettes/12.gbapal" + .incbin "data/tilesets/secondary/rock_tunnel/palettes/13.gbapal" + .incbin "data/tilesets/secondary/rock_tunnel/palettes/14.gbapal" + .incbin "data/tilesets/secondary/rock_tunnel/palettes/15.gbapal" + + .align 2 +gTilesetTiles_DiglettsCave:: @ 828A1C8 + .incbin "data/tilesets/secondary/digletts_cave/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_DiglettsCave:: @ 828B250 + .incbin "data/tilesets/secondary/digletts_cave/palettes/0.gbapal" + .incbin "data/tilesets/secondary/digletts_cave/palettes/1.gbapal" + .incbin "data/tilesets/secondary/digletts_cave/palettes/2.gbapal" + .incbin "data/tilesets/secondary/digletts_cave/palettes/3.gbapal" + .incbin "data/tilesets/secondary/digletts_cave/palettes/4.gbapal" + .incbin "data/tilesets/secondary/digletts_cave/palettes/5.gbapal" + .incbin "data/tilesets/secondary/digletts_cave/palettes/6.gbapal" + .incbin "data/tilesets/secondary/digletts_cave/palettes/7.gbapal" + .incbin "data/tilesets/secondary/digletts_cave/palettes/8.gbapal" + .incbin "data/tilesets/secondary/digletts_cave/palettes/9.gbapal" + .incbin "data/tilesets/secondary/digletts_cave/palettes/10.gbapal" + .incbin "data/tilesets/secondary/digletts_cave/palettes/11.gbapal" + .incbin "data/tilesets/secondary/digletts_cave/palettes/12.gbapal" + .incbin "data/tilesets/secondary/digletts_cave/palettes/13.gbapal" + .incbin "data/tilesets/secondary/digletts_cave/palettes/14.gbapal" + .incbin "data/tilesets/secondary/digletts_cave/palettes/15.gbapal" + + .align 2 +gTilesetTiles_SeafoamIslands:: @ 828B450 + .incbin "data/tilesets/secondary/seafoam_islands/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_SeafoamIslands:: @ 828CAA0 + .incbin "data/tilesets/secondary/seafoam_islands/palettes/0.gbapal" + .incbin "data/tilesets/secondary/seafoam_islands/palettes/1.gbapal" + .incbin "data/tilesets/secondary/seafoam_islands/palettes/2.gbapal" + .incbin "data/tilesets/secondary/seafoam_islands/palettes/3.gbapal" + .incbin "data/tilesets/secondary/seafoam_islands/palettes/4.gbapal" + .incbin "data/tilesets/secondary/seafoam_islands/palettes/5.gbapal" + .incbin "data/tilesets/secondary/seafoam_islands/palettes/6.gbapal" + .incbin "data/tilesets/secondary/seafoam_islands/palettes/7.gbapal" + .incbin "data/tilesets/secondary/seafoam_islands/palettes/8.gbapal" + .incbin "data/tilesets/secondary/seafoam_islands/palettes/9.gbapal" + .incbin "data/tilesets/secondary/seafoam_islands/palettes/10.gbapal" + .incbin "data/tilesets/secondary/seafoam_islands/palettes/11.gbapal" + .incbin "data/tilesets/secondary/seafoam_islands/palettes/12.gbapal" + .incbin "data/tilesets/secondary/seafoam_islands/palettes/13.gbapal" + .incbin "data/tilesets/secondary/seafoam_islands/palettes/14.gbapal" + .incbin "data/tilesets/secondary/seafoam_islands/palettes/15.gbapal" + + .align 2 +gTilesetTiles_UnusedGatehouse2:: @ 828CCA0 + .incbin "data/tilesets/secondary/unused_gatehouse2/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_UnusedGatehouse2:: @ 828D2BC + .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/0.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/1.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/2.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/3.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/4.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/5.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/6.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/7.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/8.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/9.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/10.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/11.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/12.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/13.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/14.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/15.gbapal" + + .align 2 +gTilesetTiles_CeruleanCave:: @ 828D4BC + .incbin "data/tilesets/secondary/cerulean_cave/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_CeruleanCave:: @ 828E3A4 + .incbin "data/tilesets/secondary/cerulean_cave/palettes/0.gbapal" + .incbin "data/tilesets/secondary/cerulean_cave/palettes/1.gbapal" + .incbin "data/tilesets/secondary/cerulean_cave/palettes/2.gbapal" + .incbin "data/tilesets/secondary/cerulean_cave/palettes/3.gbapal" + .incbin "data/tilesets/secondary/cerulean_cave/palettes/4.gbapal" + .incbin "data/tilesets/secondary/cerulean_cave/palettes/5.gbapal" + .incbin "data/tilesets/secondary/cerulean_cave/palettes/6.gbapal" + .incbin "data/tilesets/secondary/cerulean_cave/palettes/7.gbapal" + .incbin "data/tilesets/secondary/cerulean_cave/palettes/8.gbapal" + .incbin "data/tilesets/secondary/cerulean_cave/palettes/9.gbapal" + .incbin "data/tilesets/secondary/cerulean_cave/palettes/10.gbapal" + .incbin "data/tilesets/secondary/cerulean_cave/palettes/11.gbapal" + .incbin "data/tilesets/secondary/cerulean_cave/palettes/12.gbapal" + .incbin "data/tilesets/secondary/cerulean_cave/palettes/13.gbapal" + .incbin "data/tilesets/secondary/cerulean_cave/palettes/14.gbapal" + .incbin "data/tilesets/secondary/cerulean_cave/palettes/15.gbapal" + + .align 2 +gTilesetTiles_Building2:: @ 828E5A4 + .incbin "data/tilesets/secondary/building2/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_Building2:: @ 828EC70 + .incbin "data/tilesets/secondary/building2/palettes/0.gbapal" + .incbin "data/tilesets/secondary/building2/palettes/1.gbapal" + .incbin "data/tilesets/secondary/building2/palettes/2.gbapal" + .incbin "data/tilesets/secondary/building2/palettes/3.gbapal" + .incbin "data/tilesets/secondary/building2/palettes/4.gbapal" + .incbin "data/tilesets/secondary/building2/palettes/5.gbapal" + .incbin "data/tilesets/secondary/building2/palettes/6.gbapal" + .incbin "data/tilesets/secondary/building2/palettes/7.gbapal" + .incbin "data/tilesets/secondary/building2/palettes/8.gbapal" + .incbin "data/tilesets/secondary/building2/palettes/9.gbapal" + .incbin "data/tilesets/secondary/building2/palettes/10.gbapal" + .incbin "data/tilesets/secondary/building2/palettes/11.gbapal" + .incbin "data/tilesets/secondary/building2/palettes/12.gbapal" + .incbin "data/tilesets/secondary/building2/palettes/13.gbapal" + .incbin "data/tilesets/secondary/building2/palettes/14.gbapal" + .incbin "data/tilesets/secondary/building2/palettes/15.gbapal" + + .align 2 +gTilesetTiles_PowerPlant:: @ 828EE70 + .incbin "data/tilesets/secondary/power_plant/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_PowerPlant:: @ 828F378 + .incbin "data/tilesets/secondary/power_plant/palettes/0.gbapal" + .incbin "data/tilesets/secondary/power_plant/palettes/1.gbapal" + .incbin "data/tilesets/secondary/power_plant/palettes/2.gbapal" + .incbin "data/tilesets/secondary/power_plant/palettes/3.gbapal" + .incbin "data/tilesets/secondary/power_plant/palettes/4.gbapal" + .incbin "data/tilesets/secondary/power_plant/palettes/5.gbapal" + .incbin "data/tilesets/secondary/power_plant/palettes/6.gbapal" + .incbin "data/tilesets/secondary/power_plant/palettes/7.gbapal" + .incbin "data/tilesets/secondary/power_plant/palettes/8.gbapal" + .incbin "data/tilesets/secondary/power_plant/palettes/9.gbapal" + .incbin "data/tilesets/secondary/power_plant/palettes/10.gbapal" + .incbin "data/tilesets/secondary/power_plant/palettes/11.gbapal" + .incbin "data/tilesets/secondary/power_plant/palettes/12.gbapal" + .incbin "data/tilesets/secondary/power_plant/palettes/13.gbapal" + .incbin "data/tilesets/secondary/power_plant/palettes/14.gbapal" + .incbin "data/tilesets/secondary/power_plant/palettes/15.gbapal" + + .align 2 +gTilesetTiles_SeaCottage:: @ 828F578 + .incbin "data/tilesets/secondary/sea_cottage/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_SeaCottage:: @ 828F9D8 + .incbin "data/tilesets/secondary/sea_cottage/palettes/0.gbapal" + .incbin "data/tilesets/secondary/sea_cottage/palettes/1.gbapal" + .incbin "data/tilesets/secondary/sea_cottage/palettes/2.gbapal" + .incbin "data/tilesets/secondary/sea_cottage/palettes/3.gbapal" + .incbin "data/tilesets/secondary/sea_cottage/palettes/4.gbapal" + .incbin "data/tilesets/secondary/sea_cottage/palettes/5.gbapal" + .incbin "data/tilesets/secondary/sea_cottage/palettes/6.gbapal" + .incbin "data/tilesets/secondary/sea_cottage/palettes/7.gbapal" + .incbin "data/tilesets/secondary/sea_cottage/palettes/8.gbapal" + .incbin "data/tilesets/secondary/sea_cottage/palettes/9.gbapal" + .incbin "data/tilesets/secondary/sea_cottage/palettes/10.gbapal" + .incbin "data/tilesets/secondary/sea_cottage/palettes/11.gbapal" + .incbin "data/tilesets/secondary/sea_cottage/palettes/12.gbapal" + .incbin "data/tilesets/secondary/sea_cottage/palettes/13.gbapal" + .incbin "data/tilesets/secondary/sea_cottage/palettes/14.gbapal" + .incbin "data/tilesets/secondary/sea_cottage/palettes/15.gbapal" + + .align 2 +gTilesetTiles_SilphCo:: @ 828FBD8 + .incbin "data/tilesets/secondary/condominiums/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_SilphCo:: @ 8290DD0 + .incbin "data/tilesets/secondary/condominiums/palettes/0.gbapal" + .incbin "data/tilesets/secondary/condominiums/palettes/1.gbapal" + .incbin "data/tilesets/secondary/condominiums/palettes/2.gbapal" + .incbin "data/tilesets/secondary/condominiums/palettes/3.gbapal" + .incbin "data/tilesets/secondary/condominiums/palettes/4.gbapal" + .incbin "data/tilesets/secondary/condominiums/palettes/5.gbapal" + .incbin "data/tilesets/secondary/condominiums/palettes/6.gbapal" + .incbin "data/tilesets/secondary/condominiums/palettes/7.gbapal" + .incbin "data/tilesets/secondary/condominiums/palettes/8.gbapal" + .incbin "data/tilesets/secondary/condominiums/palettes/9.gbapal" + .incbin "data/tilesets/secondary/condominiums/palettes/10.gbapal" + .incbin "data/tilesets/secondary/condominiums/palettes/11.gbapal" + .incbin "data/tilesets/secondary/condominiums/palettes/12.gbapal" + .incbin "data/tilesets/secondary/condominiums/palettes/13.gbapal" + .incbin "data/tilesets/secondary/condominiums/palettes/14.gbapal" + .incbin "data/tilesets/secondary/condominiums/palettes/15.gbapal" + + .align 2 +gTilesetTiles_UndergroundPath:: @ 8290FD0 + .incbin "data/tilesets/secondary/underground_path/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_UndergroundPath:: @ 8291274 + .incbin "data/tilesets/secondary/underground_path/palettes/0.gbapal" + .incbin "data/tilesets/secondary/underground_path/palettes/1.gbapal" + .incbin "data/tilesets/secondary/underground_path/palettes/2.gbapal" + .incbin "data/tilesets/secondary/underground_path/palettes/3.gbapal" + .incbin "data/tilesets/secondary/underground_path/palettes/4.gbapal" + .incbin "data/tilesets/secondary/underground_path/palettes/5.gbapal" + .incbin "data/tilesets/secondary/underground_path/palettes/6.gbapal" + .incbin "data/tilesets/secondary/underground_path/palettes/7.gbapal" + .incbin "data/tilesets/secondary/underground_path/palettes/8.gbapal" + .incbin "data/tilesets/secondary/underground_path/palettes/9.gbapal" + .incbin "data/tilesets/secondary/underground_path/palettes/10.gbapal" + .incbin "data/tilesets/secondary/underground_path/palettes/11.gbapal" + .incbin "data/tilesets/secondary/underground_path/palettes/12.gbapal" + .incbin "data/tilesets/secondary/underground_path/palettes/13.gbapal" + .incbin "data/tilesets/secondary/underground_path/palettes/14.gbapal" + .incbin "data/tilesets/secondary/underground_path/palettes/15.gbapal" + + .align 2 +gTilesetTiles_PokemonTower:: @ 8291474 + .incbin "data/tilesets/secondary/pokemon_tower/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_PokemonTower:: @ 8291AFC + .incbin "data/tilesets/secondary/pokemon_tower/palettes/0.gbapal" + .incbin "data/tilesets/secondary/pokemon_tower/palettes/1.gbapal" + .incbin "data/tilesets/secondary/pokemon_tower/palettes/2.gbapal" + .incbin "data/tilesets/secondary/pokemon_tower/palettes/3.gbapal" + .incbin "data/tilesets/secondary/pokemon_tower/palettes/4.gbapal" + .incbin "data/tilesets/secondary/pokemon_tower/palettes/5.gbapal" + .incbin "data/tilesets/secondary/pokemon_tower/palettes/6.gbapal" + .incbin "data/tilesets/secondary/pokemon_tower/palettes/7.gbapal" + .incbin "data/tilesets/secondary/pokemon_tower/palettes/8.gbapal" + .incbin "data/tilesets/secondary/pokemon_tower/palettes/9.gbapal" + .incbin "data/tilesets/secondary/pokemon_tower/palettes/10.gbapal" + .incbin "data/tilesets/secondary/pokemon_tower/palettes/11.gbapal" + .incbin "data/tilesets/secondary/pokemon_tower/palettes/12.gbapal" + .incbin "data/tilesets/secondary/pokemon_tower/palettes/13.gbapal" + .incbin "data/tilesets/secondary/pokemon_tower/palettes/14.gbapal" + .incbin "data/tilesets/secondary/pokemon_tower/palettes/15.gbapal" + + .align 2 +gTilesetTiles_SafariZoneBuilding:: @ 8291CFC + .incbin "data/tilesets/secondary/safari_zone_building/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_SafariZoneBuilding:: @ 82920F0 + .incbin "data/tilesets/secondary/safari_zone_building/palettes/0.gbapal" + .incbin "data/tilesets/secondary/safari_zone_building/palettes/1.gbapal" + .incbin "data/tilesets/secondary/safari_zone_building/palettes/2.gbapal" + .incbin "data/tilesets/secondary/safari_zone_building/palettes/3.gbapal" + .incbin "data/tilesets/secondary/safari_zone_building/palettes/4.gbapal" + .incbin "data/tilesets/secondary/safari_zone_building/palettes/5.gbapal" + .incbin "data/tilesets/secondary/safari_zone_building/palettes/6.gbapal" + .incbin "data/tilesets/secondary/safari_zone_building/palettes/7.gbapal" + .incbin "data/tilesets/secondary/safari_zone_building/palettes/8.gbapal" + .incbin "data/tilesets/secondary/safari_zone_building/palettes/9.gbapal" + .incbin "data/tilesets/secondary/safari_zone_building/palettes/10.gbapal" + .incbin "data/tilesets/secondary/safari_zone_building/palettes/11.gbapal" + .incbin "data/tilesets/secondary/safari_zone_building/palettes/12.gbapal" + .incbin "data/tilesets/secondary/safari_zone_building/palettes/13.gbapal" + .incbin "data/tilesets/secondary/safari_zone_building/palettes/14.gbapal" + .incbin "data/tilesets/secondary/safari_zone_building/palettes/15.gbapal" + + .align 2 +gTilesetTiles_PokemonMansion:: @ 82922F0 + .incbin "data/tilesets/secondary/pokemon_mansion/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_PokemonMansion:: @ 8292FF0 + .incbin "data/tilesets/secondary/pokemon_mansion/palettes/0.gbapal" + .incbin "data/tilesets/secondary/pokemon_mansion/palettes/1.gbapal" + .incbin "data/tilesets/secondary/pokemon_mansion/palettes/2.gbapal" + .incbin "data/tilesets/secondary/pokemon_mansion/palettes/3.gbapal" + .incbin "data/tilesets/secondary/pokemon_mansion/palettes/4.gbapal" + .incbin "data/tilesets/secondary/pokemon_mansion/palettes/5.gbapal" + .incbin "data/tilesets/secondary/pokemon_mansion/palettes/6.gbapal" + .incbin "data/tilesets/secondary/pokemon_mansion/palettes/7.gbapal" + .incbin "data/tilesets/secondary/pokemon_mansion/palettes/8.gbapal" + .incbin "data/tilesets/secondary/pokemon_mansion/palettes/9.gbapal" + .incbin "data/tilesets/secondary/pokemon_mansion/palettes/10.gbapal" + .incbin "data/tilesets/secondary/pokemon_mansion/palettes/11.gbapal" + .incbin "data/tilesets/secondary/pokemon_mansion/palettes/12.gbapal" + .incbin "data/tilesets/secondary/pokemon_mansion/palettes/13.gbapal" + .incbin "data/tilesets/secondary/pokemon_mansion/palettes/14.gbapal" + .incbin "data/tilesets/secondary/pokemon_mansion/palettes/15.gbapal" + + .align 2 +gTilesetTiles_RestaurantHotel:: @ 82931F0 + .incbin "data/tilesets/secondary/restaurant_hotel/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_RestaurantHotel:: @ 8293660 + .incbin "data/tilesets/secondary/restaurant_hotel/palettes/0.gbapal" + .incbin "data/tilesets/secondary/restaurant_hotel/palettes/1.gbapal" + .incbin "data/tilesets/secondary/restaurant_hotel/palettes/2.gbapal" + .incbin "data/tilesets/secondary/restaurant_hotel/palettes/3.gbapal" + .incbin "data/tilesets/secondary/restaurant_hotel/palettes/4.gbapal" + .incbin "data/tilesets/secondary/restaurant_hotel/palettes/5.gbapal" + .incbin "data/tilesets/secondary/restaurant_hotel/palettes/6.gbapal" + .incbin "data/tilesets/secondary/restaurant_hotel/palettes/7.gbapal" + .incbin "data/tilesets/secondary/restaurant_hotel/palettes/8.gbapal" + .incbin "data/tilesets/secondary/restaurant_hotel/palettes/9.gbapal" + .incbin "data/tilesets/secondary/restaurant_hotel/palettes/10.gbapal" + .incbin "data/tilesets/secondary/restaurant_hotel/palettes/11.gbapal" + .incbin "data/tilesets/secondary/restaurant_hotel/palettes/12.gbapal" + .incbin "data/tilesets/secondary/restaurant_hotel/palettes/13.gbapal" + .incbin "data/tilesets/secondary/restaurant_hotel/palettes/14.gbapal" + .incbin "data/tilesets/secondary/restaurant_hotel/palettes/15.gbapal" + + .align 2 +gTilesetTiles_School:: @ 8293860 + .incbin "data/tilesets/secondary/school/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_School:: @ 8293B0C + .incbin "data/tilesets/secondary/school/palettes/0.gbapal" + .incbin "data/tilesets/secondary/school/palettes/1.gbapal" + .incbin "data/tilesets/secondary/school/palettes/2.gbapal" + .incbin "data/tilesets/secondary/school/palettes/3.gbapal" + .incbin "data/tilesets/secondary/school/palettes/4.gbapal" + .incbin "data/tilesets/secondary/school/palettes/5.gbapal" + .incbin "data/tilesets/secondary/school/palettes/6.gbapal" + .incbin "data/tilesets/secondary/school/palettes/7.gbapal" + .incbin "data/tilesets/secondary/school/palettes/8.gbapal" + .incbin "data/tilesets/secondary/school/palettes/9.gbapal" + .incbin "data/tilesets/secondary/school/palettes/10.gbapal" + .incbin "data/tilesets/secondary/school/palettes/11.gbapal" + .incbin "data/tilesets/secondary/school/palettes/12.gbapal" + .incbin "data/tilesets/secondary/school/palettes/13.gbapal" + .incbin "data/tilesets/secondary/school/palettes/14.gbapal" + .incbin "data/tilesets/secondary/school/palettes/15.gbapal" + + .align 2 +gTilesetTiles_FanClubDaycare:: @ 8293D0C + .incbin "data/tilesets/secondary/fan_club_daycare/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_FanClubDaycare:: @ 8294144 + .incbin "data/tilesets/secondary/fan_club_daycare/palettes/0.gbapal" + .incbin "data/tilesets/secondary/fan_club_daycare/palettes/1.gbapal" + .incbin "data/tilesets/secondary/fan_club_daycare/palettes/2.gbapal" + .incbin "data/tilesets/secondary/fan_club_daycare/palettes/3.gbapal" + .incbin "data/tilesets/secondary/fan_club_daycare/palettes/4.gbapal" + .incbin "data/tilesets/secondary/fan_club_daycare/palettes/5.gbapal" + .incbin "data/tilesets/secondary/fan_club_daycare/palettes/6.gbapal" + .incbin "data/tilesets/secondary/fan_club_daycare/palettes/7.gbapal" + .incbin "data/tilesets/secondary/fan_club_daycare/palettes/8.gbapal" + .incbin "data/tilesets/secondary/fan_club_daycare/palettes/9.gbapal" + .incbin "data/tilesets/secondary/fan_club_daycare/palettes/10.gbapal" + .incbin "data/tilesets/secondary/fan_club_daycare/palettes/11.gbapal" + .incbin "data/tilesets/secondary/fan_club_daycare/palettes/12.gbapal" + .incbin "data/tilesets/secondary/fan_club_daycare/palettes/13.gbapal" + .incbin "data/tilesets/secondary/fan_club_daycare/palettes/14.gbapal" + .incbin "data/tilesets/secondary/fan_club_daycare/palettes/15.gbapal" + + .align 2 +gTilesetTiles_BurgledHouse:: @ 8294344 + .incbin "data/tilesets/secondary/burgled_house/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_BurgledHouse:: @ 8294D08 + .incbin "data/tilesets/secondary/burgled_house/palettes/0.gbapal" + .incbin "data/tilesets/secondary/burgled_house/palettes/1.gbapal" + .incbin "data/tilesets/secondary/burgled_house/palettes/2.gbapal" + .incbin "data/tilesets/secondary/burgled_house/palettes/3.gbapal" + .incbin "data/tilesets/secondary/burgled_house/palettes/4.gbapal" + .incbin "data/tilesets/secondary/burgled_house/palettes/5.gbapal" + .incbin "data/tilesets/secondary/burgled_house/palettes/6.gbapal" + .incbin "data/tilesets/secondary/burgled_house/palettes/7.gbapal" + .incbin "data/tilesets/secondary/burgled_house/palettes/8.gbapal" + .incbin "data/tilesets/secondary/burgled_house/palettes/9.gbapal" + .incbin "data/tilesets/secondary/burgled_house/palettes/10.gbapal" + .incbin "data/tilesets/secondary/burgled_house/palettes/11.gbapal" + .incbin "data/tilesets/secondary/burgled_house/palettes/12.gbapal" + .incbin "data/tilesets/secondary/burgled_house/palettes/13.gbapal" + .incbin "data/tilesets/secondary/burgled_house/palettes/14.gbapal" + .incbin "data/tilesets/secondary/burgled_house/palettes/15.gbapal" + + .align 2 +gTilesetTiles_Dummy3:: @ 8294F08 + .incbin "data/tilesets/secondary/dummy3/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_Dummy3:: @ 8294F18 + .incbin "data/tilesets/secondary/dummy3/palettes/0.gbapal" + .incbin "data/tilesets/secondary/dummy3/palettes/1.gbapal" + .incbin "data/tilesets/secondary/dummy3/palettes/2.gbapal" + .incbin "data/tilesets/secondary/dummy3/palettes/3.gbapal" + .incbin "data/tilesets/secondary/dummy3/palettes/4.gbapal" + .incbin "data/tilesets/secondary/dummy3/palettes/5.gbapal" + .incbin "data/tilesets/secondary/dummy3/palettes/6.gbapal" + .incbin "data/tilesets/secondary/dummy3/palettes/7.gbapal" + .incbin "data/tilesets/secondary/dummy3/palettes/8.gbapal" + .incbin "data/tilesets/secondary/dummy3/palettes/9.gbapal" + .incbin "data/tilesets/secondary/dummy3/palettes/10.gbapal" + .incbin "data/tilesets/secondary/dummy3/palettes/11.gbapal" + .incbin "data/tilesets/secondary/dummy3/palettes/12.gbapal" + .incbin "data/tilesets/secondary/dummy3/palettes/13.gbapal" + .incbin "data/tilesets/secondary/dummy3/palettes/14.gbapal" + .incbin "data/tilesets/secondary/dummy3/palettes/15.gbapal" + + .align 2 +gTilesetTiles_Dummy4:: @ 8295118 + .incbin "data/tilesets/secondary/dummy4/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_Dummy4:: @ 829512C + .incbin "data/tilesets/secondary/dummy4/palettes/0.gbapal" + .incbin "data/tilesets/secondary/dummy4/palettes/1.gbapal" + .incbin "data/tilesets/secondary/dummy4/palettes/2.gbapal" + .incbin "data/tilesets/secondary/dummy4/palettes/3.gbapal" + .incbin "data/tilesets/secondary/dummy4/palettes/4.gbapal" + .incbin "data/tilesets/secondary/dummy4/palettes/5.gbapal" + .incbin "data/tilesets/secondary/dummy4/palettes/6.gbapal" + .incbin "data/tilesets/secondary/dummy4/palettes/7.gbapal" + .incbin "data/tilesets/secondary/dummy4/palettes/8.gbapal" + .incbin "data/tilesets/secondary/dummy4/palettes/9.gbapal" + .incbin "data/tilesets/secondary/dummy4/palettes/10.gbapal" + .incbin "data/tilesets/secondary/dummy4/palettes/11.gbapal" + .incbin "data/tilesets/secondary/dummy4/palettes/12.gbapal" + .incbin "data/tilesets/secondary/dummy4/palettes/13.gbapal" + .incbin "data/tilesets/secondary/dummy4/palettes/14.gbapal" + .incbin "data/tilesets/secondary/dummy4/palettes/15.gbapal" + + .align 2 +gTilesetTiles_MtEmber:: @ 829532C + .incbin "data/tilesets/secondary/mt_ember/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_MtEmber:: @ 82967D4 + .incbin "data/tilesets/secondary/mt_ember/palettes/0.gbapal" + .incbin "data/tilesets/secondary/mt_ember/palettes/1.gbapal" + .incbin "data/tilesets/secondary/mt_ember/palettes/2.gbapal" + .incbin "data/tilesets/secondary/mt_ember/palettes/3.gbapal" + .incbin "data/tilesets/secondary/mt_ember/palettes/4.gbapal" + .incbin "data/tilesets/secondary/mt_ember/palettes/5.gbapal" + .incbin "data/tilesets/secondary/mt_ember/palettes/6.gbapal" + .incbin "data/tilesets/secondary/mt_ember/palettes/7.gbapal" + .incbin "data/tilesets/secondary/mt_ember/palettes/8.gbapal" + .incbin "data/tilesets/secondary/mt_ember/palettes/9.gbapal" + .incbin "data/tilesets/secondary/mt_ember/palettes/10.gbapal" + .incbin "data/tilesets/secondary/mt_ember/palettes/11.gbapal" + .incbin "data/tilesets/secondary/mt_ember/palettes/12.gbapal" + .incbin "data/tilesets/secondary/mt_ember/palettes/13.gbapal" + .incbin "data/tilesets/secondary/mt_ember/palettes/14.gbapal" + .incbin "data/tilesets/secondary/mt_ember/palettes/15.gbapal" + + .align 2 +gTilesetTiles_BerryForest:: @ 82969D4 + .incbin "data/tilesets/secondary/berry_forest/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_BerryForest:: @ 8296E90 + .incbin "data/tilesets/secondary/berry_forest/palettes/0.gbapal" + .incbin "data/tilesets/secondary/berry_forest/palettes/1.gbapal" + .incbin "data/tilesets/secondary/berry_forest/palettes/2.gbapal" + .incbin "data/tilesets/secondary/berry_forest/palettes/3.gbapal" + .incbin "data/tilesets/secondary/berry_forest/palettes/4.gbapal" + .incbin "data/tilesets/secondary/berry_forest/palettes/5.gbapal" + .incbin "data/tilesets/secondary/berry_forest/palettes/6.gbapal" + .incbin "data/tilesets/secondary/berry_forest/palettes/7.gbapal" + .incbin "data/tilesets/secondary/berry_forest/palettes/8.gbapal" + .incbin "data/tilesets/secondary/berry_forest/palettes/9.gbapal" + .incbin "data/tilesets/secondary/berry_forest/palettes/10.gbapal" + .incbin "data/tilesets/secondary/berry_forest/palettes/11.gbapal" + .incbin "data/tilesets/secondary/berry_forest/palettes/12.gbapal" + .incbin "data/tilesets/secondary/berry_forest/palettes/13.gbapal" + .incbin "data/tilesets/secondary/berry_forest/palettes/14.gbapal" + .incbin "data/tilesets/secondary/berry_forest/palettes/15.gbapal" + + .align 2 +gTilesetTiles_NavelRock:: @ 8297090 + .incbin "data/tilesets/secondary/navel_rock/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_NavelRock:: @ 82983BC + .incbin "data/tilesets/secondary/navel_rock/palettes/0.gbapal" + .incbin "data/tilesets/secondary/navel_rock/palettes/1.gbapal" + .incbin "data/tilesets/secondary/navel_rock/palettes/2.gbapal" + .incbin "data/tilesets/secondary/navel_rock/palettes/3.gbapal" + .incbin "data/tilesets/secondary/navel_rock/palettes/4.gbapal" + .incbin "data/tilesets/secondary/navel_rock/palettes/5.gbapal" + .incbin "data/tilesets/secondary/navel_rock/palettes/6.gbapal" + .incbin "data/tilesets/secondary/navel_rock/palettes/7.gbapal" + .incbin "data/tilesets/secondary/navel_rock/palettes/8.gbapal" + .incbin "data/tilesets/secondary/navel_rock/palettes/9.gbapal" + .incbin "data/tilesets/secondary/navel_rock/palettes/10.gbapal" + .incbin "data/tilesets/secondary/navel_rock/palettes/11.gbapal" + .incbin "data/tilesets/secondary/navel_rock/palettes/12.gbapal" + .incbin "data/tilesets/secondary/navel_rock/palettes/13.gbapal" + .incbin "data/tilesets/secondary/navel_rock/palettes/14.gbapal" + .incbin "data/tilesets/secondary/navel_rock/palettes/15.gbapal" + + .align 2 +gTilesetTiles_TanobyRuins:: @ 82985BC + .incbin "data/tilesets/secondary/tanoby_ruins/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_TanobyRuins:: @ 8298970 + .incbin "data/tilesets/secondary/tanoby_ruins/palettes/0.gbapal" + .incbin "data/tilesets/secondary/tanoby_ruins/palettes/1.gbapal" + .incbin "data/tilesets/secondary/tanoby_ruins/palettes/2.gbapal" + .incbin "data/tilesets/secondary/tanoby_ruins/palettes/3.gbapal" + .incbin "data/tilesets/secondary/tanoby_ruins/palettes/4.gbapal" + .incbin "data/tilesets/secondary/tanoby_ruins/palettes/5.gbapal" + .incbin "data/tilesets/secondary/tanoby_ruins/palettes/6.gbapal" + .incbin "data/tilesets/secondary/tanoby_ruins/palettes/7.gbapal" + .incbin "data/tilesets/secondary/tanoby_ruins/palettes/8.gbapal" + .incbin "data/tilesets/secondary/tanoby_ruins/palettes/9.gbapal" + .incbin "data/tilesets/secondary/tanoby_ruins/palettes/10.gbapal" + .incbin "data/tilesets/secondary/tanoby_ruins/palettes/11.gbapal" + .incbin "data/tilesets/secondary/tanoby_ruins/palettes/12.gbapal" + .incbin "data/tilesets/secondary/tanoby_ruins/palettes/13.gbapal" + .incbin "data/tilesets/secondary/tanoby_ruins/palettes/14.gbapal" + .incbin "data/tilesets/secondary/tanoby_ruins/palettes/15.gbapal" + + .align 2 +gTilesetTiles_SeviiIslands123:: @ 8298B70 + .incbin "data/tilesets/secondary/sevii_islands_123/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_SeviiIslands123:: @ 8299AA4 + .incbin "data/tilesets/secondary/sevii_islands_123/palettes/0.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_123/palettes/1.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_123/palettes/2.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_123/palettes/3.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_123/palettes/4.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_123/palettes/5.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_123/palettes/6.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_123/palettes/7.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_123/palettes/8.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_123/palettes/9.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_123/palettes/10.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_123/palettes/11.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_123/palettes/12.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_123/palettes/13.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_123/palettes/14.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_123/palettes/15.gbapal" + + .align 2 +gTilesetTiles_SeviiIslands45:: @ 8299CA4 + .incbin "data/tilesets/secondary/sevii_islands_45/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_SeviiIslands45:: @ 829AB04 + .incbin "data/tilesets/secondary/sevii_islands_45/palettes/0.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_45/palettes/1.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_45/palettes/2.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_45/palettes/3.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_45/palettes/4.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_45/palettes/5.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_45/palettes/6.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_45/palettes/7.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_45/palettes/8.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_45/palettes/9.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_45/palettes/10.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_45/palettes/11.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_45/palettes/12.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_45/palettes/13.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_45/palettes/14.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_45/palettes/15.gbapal" + + .align 2 +gTilesetTiles_SeviiIslands67:: @ 829AD04 + .incbin "data/tilesets/secondary/sevii_islands_67/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_SeviiIslands67:: @ 829BD64 + .incbin "data/tilesets/secondary/sevii_islands_67/palettes/0.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_67/palettes/1.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_67/palettes/2.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_67/palettes/3.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_67/palettes/4.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_67/palettes/5.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_67/palettes/6.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_67/palettes/7.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_67/palettes/8.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_67/palettes/9.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_67/palettes/10.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_67/palettes/11.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_67/palettes/12.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_67/palettes/13.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_67/palettes/14.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_67/palettes/15.gbapal" + + .align 2 +gTilesetTiles_TrainerTower:: @ 829BF64 + .incbin "data/tilesets/secondary/trainer_tower/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_TrainerTower:: @ 829CEE4 + .incbin "data/tilesets/secondary/trainer_tower/palettes/0.gbapal" + .incbin "data/tilesets/secondary/trainer_tower/palettes/1.gbapal" + .incbin "data/tilesets/secondary/trainer_tower/palettes/2.gbapal" + .incbin "data/tilesets/secondary/trainer_tower/palettes/3.gbapal" + .incbin "data/tilesets/secondary/trainer_tower/palettes/4.gbapal" + .incbin "data/tilesets/secondary/trainer_tower/palettes/5.gbapal" + .incbin "data/tilesets/secondary/trainer_tower/palettes/6.gbapal" + .incbin "data/tilesets/secondary/trainer_tower/palettes/7.gbapal" + .incbin "data/tilesets/secondary/trainer_tower/palettes/8.gbapal" + .incbin "data/tilesets/secondary/trainer_tower/palettes/9.gbapal" + .incbin "data/tilesets/secondary/trainer_tower/palettes/10.gbapal" + .incbin "data/tilesets/secondary/trainer_tower/palettes/11.gbapal" + .incbin "data/tilesets/secondary/trainer_tower/palettes/12.gbapal" + .incbin "data/tilesets/secondary/trainer_tower/palettes/13.gbapal" + .incbin "data/tilesets/secondary/trainer_tower/palettes/14.gbapal" + .incbin "data/tilesets/secondary/trainer_tower/palettes/15.gbapal" + + .align 2 +gTilesetTiles_IslandHarbor:: @ 829D0E4 + .incbin "data/tilesets/secondary/island_harbor/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_IslandHarbor:: @ 829D894 + .incbin "data/tilesets/secondary/island_harbor/palettes/0.gbapal" + .incbin "data/tilesets/secondary/island_harbor/palettes/1.gbapal" + .incbin "data/tilesets/secondary/island_harbor/palettes/2.gbapal" + .incbin "data/tilesets/secondary/island_harbor/palettes/3.gbapal" + .incbin "data/tilesets/secondary/island_harbor/palettes/4.gbapal" + .incbin "data/tilesets/secondary/island_harbor/palettes/5.gbapal" + .incbin "data/tilesets/secondary/island_harbor/palettes/6.gbapal" + .incbin "data/tilesets/secondary/island_harbor/palettes/7.gbapal" + .incbin "data/tilesets/secondary/island_harbor/palettes/8.gbapal" + .incbin "data/tilesets/secondary/island_harbor/palettes/9.gbapal" + .incbin "data/tilesets/secondary/island_harbor/palettes/10.gbapal" + .incbin "data/tilesets/secondary/island_harbor/palettes/11.gbapal" + .incbin "data/tilesets/secondary/island_harbor/palettes/12.gbapal" + .incbin "data/tilesets/secondary/island_harbor/palettes/13.gbapal" + .incbin "data/tilesets/secondary/island_harbor/palettes/14.gbapal" + .incbin "data/tilesets/secondary/island_harbor/palettes/15.gbapal" + + .align 2 +gTilesetTiles_PokemonLeague:: @ 829DA94 + .incbin "data/tilesets/secondary/pokemon_league/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_PokemonLeague:: @ 829EA50 + .incbin "data/tilesets/secondary/pokemon_league/palettes/0.gbapal" + .incbin "data/tilesets/secondary/pokemon_league/palettes/1.gbapal" + .incbin "data/tilesets/secondary/pokemon_league/palettes/2.gbapal" + .incbin "data/tilesets/secondary/pokemon_league/palettes/3.gbapal" + .incbin "data/tilesets/secondary/pokemon_league/palettes/4.gbapal" + .incbin "data/tilesets/secondary/pokemon_league/palettes/5.gbapal" + .incbin "data/tilesets/secondary/pokemon_league/palettes/6.gbapal" + .incbin "data/tilesets/secondary/pokemon_league/palettes/7.gbapal" + .incbin "data/tilesets/secondary/pokemon_league/palettes/8.gbapal" + .incbin "data/tilesets/secondary/pokemon_league/palettes/9.gbapal" + .incbin "data/tilesets/secondary/pokemon_league/palettes/10.gbapal" + .incbin "data/tilesets/secondary/pokemon_league/palettes/11.gbapal" + .incbin "data/tilesets/secondary/pokemon_league/palettes/12.gbapal" + .incbin "data/tilesets/secondary/pokemon_league/palettes/13.gbapal" + .incbin "data/tilesets/secondary/pokemon_league/palettes/14.gbapal" + .incbin "data/tilesets/secondary/pokemon_league/palettes/15.gbapal" + + .align 2 +gTilesetTiles_HallOfFame:: @ 829EC50 + .incbin "data/tilesets/secondary/hall_of_fame/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_HallOfFame:: @ 829F4C8 + .incbin "data/tilesets/secondary/hall_of_fame/palettes/0.gbapal" + .incbin "data/tilesets/secondary/hall_of_fame/palettes/1.gbapal" + .incbin "data/tilesets/secondary/hall_of_fame/palettes/2.gbapal" + .incbin "data/tilesets/secondary/hall_of_fame/palettes/3.gbapal" + .incbin "data/tilesets/secondary/hall_of_fame/palettes/4.gbapal" + .incbin "data/tilesets/secondary/hall_of_fame/palettes/5.gbapal" + .incbin "data/tilesets/secondary/hall_of_fame/palettes/6.gbapal" + .incbin "data/tilesets/secondary/hall_of_fame/palettes/7.gbapal" + .incbin "data/tilesets/secondary/hall_of_fame/palettes/8.gbapal" + .incbin "data/tilesets/secondary/hall_of_fame/palettes/9.gbapal" + .incbin "data/tilesets/secondary/hall_of_fame/palettes/10.gbapal" + .incbin "data/tilesets/secondary/hall_of_fame/palettes/11.gbapal" + .incbin "data/tilesets/secondary/hall_of_fame/palettes/12.gbapal" + .incbin "data/tilesets/secondary/hall_of_fame/palettes/13.gbapal" + .incbin "data/tilesets/secondary/hall_of_fame/palettes/14.gbapal" + .incbin "data/tilesets/secondary/hall_of_fame/palettes/15.gbapal" diff --git a/data/tilesets/headers.inc b/data/tilesets/headers.inc index d40b3a5e6..d108ed3a3 100644 --- a/data/tilesets/headers.inc +++ b/data/tilesets/headers.inc @@ -1,749 +1,749 @@ .align 2 -gTileset_82D4A94:: +gTileset_General:: .byte TRUE @ is compressed .byte FALSE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8EA1D68 - .4byte gTilesetPalettes_8EA1B68 - .4byte gMetatiles_829F6C8 - .4byte sub_8070154 - .4byte gMetatileAttributes_82A1EC8 + .4byte gTilesetTiles_General + .4byte gTilesetPalettes_General + .4byte gMetatiles_General + .4byte InitTilesetAnim_General + .4byte gMetatileAttributes_General .align 2 -gTileset_82D4AAC:: +gTileset_PalletTown:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_826D37C - .4byte gTilesetPalettes_826D7C0 - .4byte gMetatiles_82A28C8 + .4byte gTilesetTiles_PalletTown + .4byte gTilesetPalettes_PalletTown + .4byte gMetatiles_PalletTown .4byte 0x0 - .4byte gMetatileAttributes_82A2E58 + .4byte gMetatileAttributes_PalletTown .align 2 -gTileset_82D4AC4:: +gTileset_ViridianCity:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_826D9C0 - .4byte gTilesetPalettes_826DFC0 - .4byte gMetatiles_82A2FBC + .4byte gTilesetTiles_ViridianCity + .4byte gTilesetPalettes_ViridianCity + .4byte gMetatiles_ViridianCity .4byte 0x0 - .4byte gMetatileAttributes_82A35AC + .4byte gMetatileAttributes_ViridianCity .align 2 -gTileset_82D4ADC:: +gTileset_PewterCity:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_826E1C0 - .4byte gTilesetPalettes_826EAB8 - .4byte gMetatiles_82A3728 + .4byte gTilesetTiles_PewterCity + .4byte gTilesetPalettes_PewterCity + .4byte gMetatiles_PewterCity .4byte 0x0 - .4byte gMetatileAttributes_82A3C18 + .4byte gMetatileAttributes_PewterCity .align 2 -gTileset_82D4AF4:: +gTileset_CeruleanCity:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_826ECB8 - .4byte gTilesetPalettes_826F4B8 - .4byte gMetatiles_82A3D54 + .4byte gTilesetTiles_CeruleanCity + .4byte gTilesetPalettes_CeruleanCity + .4byte gMetatiles_CeruleanCity .4byte 0x0 - .4byte gMetatileAttributes_82A45B4 + .4byte gMetatileAttributes_CeruleanCity .align 2 -gTileset_82D4B0C:: +gTileset_LavenderTown:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_826F6B8 - .4byte gTilesetPalettes_8270438 - .4byte gMetatiles_82A47CC + .4byte gTilesetTiles_LavenderTown + .4byte gTilesetPalettes_LavenderTown + .4byte gMetatiles_LavenderTown .4byte 0x0 - .4byte gMetatileAttributes_82A556C + .4byte gMetatileAttributes_LavenderTown .align 2 -gTileset_82D4B24:: +gTileset_VermilionCity:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8270638 - .4byte gTilesetPalettes_8270DA0 - .4byte gMetatiles_82A58D4 + .4byte gTilesetTiles_VermilionCity + .4byte gTilesetPalettes_VermilionCity + .4byte gMetatiles_VermilionCity .4byte 0x0 - .4byte gMetatileAttributes_82A6354 + .4byte gMetatileAttributes_VermilionCity .align 2 -gTileset_82D4B3C:: +gTileset_CeladonCity:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8270FA0 - .4byte gTilesetPalettes_8271C74 - .4byte gMetatiles_82A65F4 - .4byte sub_80701D8 - .4byte gMetatileAttributes_82A74F4 + .4byte gTilesetTiles_CeladonCity + .4byte gTilesetPalettes_CeladonCity + .4byte gMetatiles_CeladonCity + .4byte InitTilesetAnim_CeladonCity + .4byte gMetatileAttributes_CeladonCity .align 2 -gTileset_82D4B54:: +gTileset_FuchsiaCity:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8271E74 - .4byte gTilesetPalettes_8272A5C - .4byte gMetatiles_82A78B4 + .4byte gTilesetTiles_FuchsiaCity + .4byte gTilesetPalettes_FuchsiaCity + .4byte gMetatiles_FuchsiaCity .4byte 0x0 - .4byte gMetatileAttributes_82A84B4 + .4byte gMetatileAttributes_FuchsiaCity .align 2 -gTileset_82D4B6C:: +gTileset_CinnabarIsland:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8272C5C - .4byte gTilesetPalettes_8273358 - .4byte gMetatiles_82A87B4 + .4byte gTilesetTiles_CinnabarIsland + .4byte gTilesetPalettes_CinnabarIsland + .4byte gMetatiles_CinnabarIsland .4byte 0x0 - .4byte gMetatileAttributes_82A8BB4 + .4byte gMetatileAttributes_CinnabarIsland .align 2 -gTileset_82D4B84:: +gTileset_IndigoPlateau:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8273558 - .4byte gTilesetPalettes_82742D0 - .4byte gMetatiles_82A8CB4 + .4byte gTilesetTiles_IndigoPlateau + .4byte gTilesetPalettes_IndigoPlateau + .4byte gMetatiles_IndigoPlateau .4byte 0x0 - .4byte gMetatileAttributes_82A97B4 + .4byte gMetatileAttributes_IndigoPlateau .align 2 -gTileset_82D4B9C:: +gTileset_SaffronCity:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_82744D0 - .4byte gTilesetPalettes_8275094 - .4byte gMetatiles_82A9A74 + .4byte gTilesetTiles_SaffronCity + .4byte gTilesetPalettes_SaffronCity + .4byte gMetatiles_SaffronCity .4byte 0x0 - .4byte gMetatileAttributes_82AA6F4 + .4byte gMetatileAttributes_SaffronCity .align 2 -gTileset_82D4BB4:: +gTileset_Building:: .byte TRUE @ is compressed .byte FALSE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8275294 - .4byte gTilesetPalettes_8277694 - .4byte gMetatiles_82AD7B4 + .4byte gTilesetTiles_Building + .4byte gTilesetPalettes_Building + .4byte gMetatiles_Building .4byte 0x0 - .4byte gMetatileAttributes_82AFFB4 + .4byte gMetatileAttributes_Building .align 2 -gTileset_82D4BCC:: +gTileset_Mart:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8277894 - .4byte gTilesetPalettes_8277A5C - .4byte gMetatiles_82B3524 + .4byte gTilesetTiles_Mart + .4byte gTilesetPalettes_Mart + .4byte gMetatiles_Mart .4byte 0x0 - .4byte gMetatileAttributes_82B3954 + .4byte gMetatileAttributes_Mart .align 2 -gTileset_82D4BE4:: +gTileset_PokemonCenter:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8277C5C - .4byte gTilesetPalettes_8278CC4 - .4byte gMetatiles_82B3A60 + .4byte gTilesetTiles_PokemonCenter + .4byte gTilesetPalettes_PokemonCenter + .4byte gMetatiles_PokemonCenter .4byte 0x0 - .4byte gMetatileAttributes_82B4A50 + .4byte gMetatileAttributes_PokemonCenter .align 2 -gTileset_82D4BFC:: +gTileset_Cave:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8278EC4 - .4byte gTilesetPalettes_827A1A8 - .4byte gMetatiles_82B502C + .4byte gTilesetTiles_Cave + .4byte gTilesetPalettes_Cave + .4byte gMetatiles_Cave .4byte 0x0 - .4byte gMetatileAttributes_82B5A3C + .4byte gMetatileAttributes_Cave .align 2 -gTileset_82D4C14:: +gTileset_Dummy1:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_827A3A8 - .4byte gTilesetPalettes_827A3B8 - .4byte gMetatiles_82B09B4 + .4byte gTilesetTiles_Dummy1 + .4byte gTilesetPalettes_Dummy1 + .4byte gMetatiles_Dummy1 .4byte 0x0 - .4byte gMetatileAttributes_82B09D4 + .4byte gMetatileAttributes_Dummy1 .align 2 -gTileset_82D4C2C:: +gTileset_Museum:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_827A5B8 - .4byte gTilesetPalettes_827AE14 - .4byte gMetatiles_82C5738 + .4byte gTilesetTiles_Museum + .4byte gTilesetPalettes_Museum + .4byte gMetatiles_Museum .4byte 0x0 - .4byte gMetatileAttributes_82C5FA8 + .4byte gMetatileAttributes_Museum .align 2 -gTileset_82D4C44:: +gTileset_CableClub:: .byte FALSE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_827B014 - .4byte gTilesetPalettes_827FF14 - .4byte gMetatiles_82C61C4 + .4byte gTilesetTiles_CableClub + .4byte gTilesetPalettes_CableClub + .4byte gMetatiles_CableClub .4byte 0x0 - .4byte gMetatileAttributes_82C71C4 + .4byte gMetatileAttributes_CableClub .align 2 -gTileset_82D4C5C:: +gTileset_BikeShop:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8280114 - .4byte gTilesetPalettes_82804EC - .4byte gMetatiles_82B31DC + .4byte gTilesetTiles_BikeShop + .4byte gTilesetPalettes_BikeShop + .4byte gMetatiles_BikeShop .4byte 0x0 - .4byte gMetatileAttributes_82B347C + .4byte gMetatileAttributes_BikeShop .align 2 -gTileset_82D4C74:: +gTileset_Building1:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8EA99F4 - .4byte gTilesetPalettes_8EA97F4 - .4byte gMetatiles_82B4E4C + .4byte gTilesetTiles_Building1 + .4byte gTilesetPalettes_Building1 + .4byte gMetatiles_Building1 .4byte 0x0 - .4byte gMetatileAttributes_82B4FCC + .4byte gMetatileAttributes_Building1 .align 2 -gTileset_82D4C8C:: +gTileset_Lab:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_82806EC - .4byte gTilesetPalettes_8280D00 - .4byte gMetatiles_82B68A0 + .4byte gTilesetTiles_Lab + .4byte gTilesetPalettes_Lab + .4byte gMetatiles_Lab .4byte 0x0 - .4byte gMetatileAttributes_82B7390 + .4byte gMetatileAttributes_Lab .align 2 -gTileset_82D4CA4:: +gTileset_FuchsiaGym:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8285350 - .4byte gTilesetPalettes_82857A4 - .4byte gMetatiles_82AC364 + .4byte gTilesetTiles_FuchsiaGym + .4byte gTilesetPalettes_FuchsiaGym + .4byte gMetatiles_FuchsiaGym .4byte 0x0 - .4byte gMetatileAttributes_82AC584 + .4byte gMetatileAttributes_FuchsiaGym .align 2 -gTileset_82D4CBC:: +gTileset_ViridianGym:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_82867D4 - .4byte gTilesetPalettes_8286BC8 - .4byte gMetatiles_82AD124 + .4byte gTilesetTiles_ViridianGym + .4byte gTilesetPalettes_ViridianGym + .4byte gMetatiles_ViridianGym .4byte 0x0 - .4byte gMetatileAttributes_82AD664 + .4byte gMetatileAttributes_ViridianGym .align 2 -gTileset_82D4CD4:: +gTileset_HoennBuilding:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8280F00 - .4byte gTilesetPalettes_82823A4 - .4byte gMetatiles_82B09DC + .4byte gTilesetTiles_HoennBuilding + .4byte gTilesetPalettes_HoennBuilding + .4byte gMetatiles_HoennBuilding .4byte 0x0 - .4byte gMetatileAttributes_82B29DC + .4byte gMetatileAttributes_HoennBuilding .align 2 -gTileset_82D4CEC:: +gTileset_GameCorner:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_82825A4 - .4byte gTilesetPalettes_8282FBC - .4byte gMetatiles_82B5CC0 + .4byte gTilesetTiles_GameCorner + .4byte gTilesetPalettes_GameCorner + .4byte gMetatiles_GameCorner .4byte 0x0 - .4byte gMetatileAttributes_82B6640 + .4byte gMetatileAttributes_GameCorner .align 2 -gTileset_82D4D04:: +gTileset_PewterGym:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_82831BC - .4byte gTilesetPalettes_82839B0 - .4byte gMetatiles_82AAA14 + .4byte gTilesetTiles_PewterGym + .4byte gTilesetPalettes_PewterGym + .4byte gMetatiles_PewterGym .4byte 0x0 - .4byte gMetatileAttributes_82AB064 + .4byte gMetatileAttributes_PewterGym .align 2 -gTileset_82D4D1C:: +gTileset_CeruleanGym:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8283BB0 - .4byte gTilesetPalettes_8283FF8 - .4byte gMetatiles_82AB1F8 + .4byte gTilesetTiles_CeruleanGym + .4byte gTilesetPalettes_CeruleanGym + .4byte gMetatiles_CeruleanGym .4byte 0x0 - .4byte gMetatileAttributes_82AB738 + .4byte gMetatileAttributes_CeruleanGym .align 2 -gTileset_82D4D34:: +gTileset_VermilionGym:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_82841F8 - .4byte gTilesetPalettes_82849B8 - .4byte gMetatiles_82AB888 - .4byte sub_807031C - .4byte gMetatileAttributes_82ABD38 + .4byte gTilesetTiles_VermilionGym + .4byte gTilesetPalettes_VermilionGym + .4byte gMetatiles_VermilionGym + .4byte InitTilesetAnim_VermilionGym + .4byte gMetatileAttributes_VermilionGym .align 2 -gTileset_82D4D4C:: +gTileset_CeladonGym:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8284BB8 - .4byte gTilesetPalettes_8285150 - .4byte gMetatiles_82ABE64 - .4byte sub_8070380 - .4byte gMetatileAttributes_82AC264 + .4byte gTilesetTiles_CeladonGym + .4byte gTilesetPalettes_CeladonGym + .4byte gMetatiles_CeladonGym + .4byte InitTilesetAnim_CeladonGym + .4byte gMetatileAttributes_CeladonGym .align 2 -gTileset_82D4D64:: +gTileset_SaffronGym:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_82859A4 - .4byte gTilesetPalettes_8285D90 - .4byte gMetatiles_82AC60C + .4byte gTilesetTiles_SaffronGym + .4byte gTilesetPalettes_SaffronGym + .4byte gMetatiles_SaffronGym .4byte 0x0 - .4byte gMetatileAttributes_82AC8EC + .4byte gMetatileAttributes_SaffronGym .align 2 -gTileset_82D4D7C:: +gTileset_CinnabarGym:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8285F90 - .4byte gTilesetPalettes_82865D4 - .4byte gMetatiles_82AC9A4 + .4byte gTilesetTiles_CinnabarGym + .4byte gTilesetPalettes_CinnabarGym + .4byte gMetatiles_CinnabarGym .4byte 0x0 - .4byte gMetatileAttributes_82ACFA4 + .4byte gMetatileAttributes_CinnabarGym .align 2 -gTileset_82D4D94:: +gTileset_SSAnne:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8286DC8 - .4byte gTilesetPalettes_8287B80 - .4byte gMetatiles_82B764C + .4byte gTilesetTiles_SSAnne + .4byte gTilesetPalettes_SSAnne + .4byte gMetatiles_SSAnne .4byte 0x0 - .4byte gMetatileAttributes_82B8B4C + .4byte gMetatileAttributes_SSAnne .align 2 -gTileset_82D4DAC:: +gTileset_Dummy2:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8287D80 - .4byte gTilesetPalettes_8287D94 - .4byte gMetatiles_82B908C + .4byte gTilesetTiles_Dummy2 + .4byte gTilesetPalettes_Dummy2 + .4byte gMetatiles_Dummy2 .4byte 0x0 - .4byte gMetatileAttributes_82B90AC + .4byte gMetatileAttributes_Dummy2 .align 2 -gTileset_82D4DC4:: +gTileset_ViridianForest:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8287F94 - .4byte gTilesetPalettes_8288444 - .4byte gMetatiles_82B90B4 + .4byte gTilesetTiles_ViridianForest + .4byte gTilesetPalettes_ViridianForest + .4byte gMetatiles_ViridianForest .4byte 0x0 - .4byte gMetatileAttributes_82B9364 + .4byte gMetatileAttributes_ViridianForest .align 2 -gTileset_82D4DDC:: +gTileset_UnusedGatehouse1:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8288644 - .4byte gTilesetPalettes_8288C60 - .4byte gMetatiles_82B9410 + .4byte gTilesetTiles_UnusedGatehouse1 + .4byte gTilesetPalettes_UnusedGatehouse1 + .4byte gMetatiles_UnusedGatehouse1 .4byte 0x0 - .4byte gMetatileAttributes_82B9B30 + .4byte gMetatileAttributes_UnusedGatehouse1 .align 2 -gTileset_82D4DF4:: +gTileset_RockTunnel:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8288E60 - .4byte gTilesetPalettes_8289FC8 - .4byte gMetatiles_82B9CF8 + .4byte gTilesetTiles_RockTunnel + .4byte gTilesetPalettes_RockTunnel + .4byte gMetatiles_RockTunnel .4byte 0x0 - .4byte gMetatileAttributes_82BA678 + .4byte gMetatileAttributes_RockTunnel .align 2 -gTileset_82D4E0C:: +gTileset_DiglettsCave:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_828A1C8 - .4byte gTilesetPalettes_828B250 - .4byte gMetatiles_82BA8D8 + .4byte gTilesetTiles_DiglettsCave + .4byte gTilesetPalettes_DiglettsCave + .4byte gMetatiles_DiglettsCave .4byte 0x0 - .4byte gMetatileAttributes_82BB2A8 + .4byte gMetatileAttributes_DiglettsCave .align 2 -gTileset_82D4E24:: +gTileset_SeafoamIslands:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_828B450 - .4byte gTilesetPalettes_828CAA0 - .4byte gMetatiles_82BB51C + .4byte gTilesetTiles_SeafoamIslands + .4byte gTilesetPalettes_SeafoamIslands + .4byte gMetatiles_SeafoamIslands .4byte 0x0 - .4byte gMetatileAttributes_82BC49C + .4byte gMetatileAttributes_SeafoamIslands .align 2 -gTileset_82D4E3C:: +gTileset_UnusedGatehouse2:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_828CCA0 - .4byte gTilesetPalettes_828D2BC - .4byte gMetatiles_82BC87C + .4byte gTilesetTiles_UnusedGatehouse2 + .4byte gTilesetPalettes_UnusedGatehouse2 + .4byte gMetatiles_UnusedGatehouse2 .4byte 0x0 - .4byte gMetatileAttributes_82BCF9C + .4byte gMetatileAttributes_UnusedGatehouse2 .align 2 -gTileset_82D4E54:: +gTileset_CeruleanCave:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_828D4BC - .4byte gTilesetPalettes_828E3A4 - .4byte gMetatiles_82BD164 + .4byte gTilesetTiles_CeruleanCave + .4byte gTilesetPalettes_CeruleanCave + .4byte gMetatiles_CeruleanCave .4byte 0x0 - .4byte gMetatileAttributes_82BD9C4 + .4byte gMetatileAttributes_CeruleanCave .align 2 -gTileset_82D4E6C:: +gTileset_DepartmentStore:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8EA9F88 - .4byte gTilesetPalettes_8EA9D88 - .4byte gMetatiles_82BDBDC + .4byte gTilesetTiles_DepartmentStore + .4byte gTilesetPalettes_DepartmentStore + .4byte gMetatiles_DepartmentStore .4byte 0x0 - .4byte gMetatileAttributes_82BEB3C + .4byte gMetatileAttributes_DepartmentStore .align 2 -gTileset_82D4E84:: +gTileset_Building2:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_828E5A4 - .4byte gTilesetPalettes_828EC70 - .4byte gMetatiles_82BEF14 + .4byte gTilesetTiles_Building2 + .4byte gTilesetPalettes_Building2 + .4byte gMetatiles_Building2 .4byte 0x0 - .4byte gMetatileAttributes_82BFA94 + .4byte gMetatileAttributes_Building2 .align 2 -gTileset_82D4E9C:: +gTileset_PowerPlant:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_828EE70 - .4byte gTilesetPalettes_828F378 - .4byte gMetatiles_82BFD74 + .4byte gTilesetTiles_PowerPlant + .4byte gTilesetPalettes_PowerPlant + .4byte gMetatiles_PowerPlant .4byte 0x0 - .4byte gMetatileAttributes_82C0704 + .4byte gMetatileAttributes_PowerPlant .align 2 -gTileset_82D4EB4:: +gTileset_SeaCottage:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_828F578 - .4byte gTilesetPalettes_828F9D8 - .4byte gMetatiles_82C0968 + .4byte gTilesetTiles_SeaCottage + .4byte gTilesetPalettes_SeaCottage + .4byte gMetatiles_SeaCottage .4byte 0x0 - .4byte gMetatileAttributes_82C0D18 + .4byte gMetatileAttributes_SeaCottage .align 2 -gTileset_82D4ECC:: +gTileset_SilphCo:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_828FBD8 - .4byte gTilesetPalettes_8290DD0 - .4byte gMetatiles_82C0E04 - .4byte sub_8070250 - .4byte gMetatileAttributes_82C25A4 + .4byte gTilesetTiles_SilphCo + .4byte gTilesetPalettes_SilphCo + .4byte gMetatiles_SilphCo + .4byte InitTilesetAnim_SilphCo + .4byte gMetatileAttributes_SilphCo .align 2 -gTileset_82D4EE4:: +gTileset_UndergroundPath:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8290FD0 - .4byte gTilesetPalettes_8291274 - .4byte gMetatiles_82C2B8C + .4byte gTilesetTiles_UndergroundPath + .4byte gTilesetPalettes_UndergroundPath + .4byte gMetatiles_UndergroundPath .4byte 0x0 - .4byte gMetatileAttributes_82C300C + .4byte gMetatileAttributes_UndergroundPath .align 2 -gTileset_82D4EFC:: +gTileset_PokemonTower:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8291474 - .4byte gTilesetPalettes_8291AFC - .4byte gMetatiles_82C312C + .4byte gTilesetTiles_PokemonTower + .4byte gTilesetPalettes_PokemonTower + .4byte gMetatiles_PokemonTower .4byte 0x0 - .4byte gMetatileAttributes_82C377C + .4byte gMetatileAttributes_PokemonTower .align 2 -gTileset_82D4F14:: +gTileset_SafariZoneBuilding:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8291CFC - .4byte gTilesetPalettes_82920F0 - .4byte gMetatiles_82C3910 + .4byte gTilesetTiles_SafariZoneBuilding + .4byte gTilesetPalettes_SafariZoneBuilding + .4byte gMetatiles_SafariZoneBuilding .4byte 0x0 - .4byte gMetatileAttributes_82C4110 + .4byte gMetatileAttributes_SafariZoneBuilding .align 2 -gTileset_82D4F2C:: +gTileset_PokemonMansion:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_82922F0 - .4byte gTilesetPalettes_8292FF0 - .4byte gMetatiles_82C4310 + .4byte gTilesetTiles_PokemonMansion + .4byte gTilesetPalettes_PokemonMansion + .4byte gMetatiles_PokemonMansion .4byte 0x0 - .4byte gMetatileAttributes_82C5330 + .4byte gMetatileAttributes_PokemonMansion .align 2 -gTileset_82D4F44:: +gTileset_RestaurantHotel:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_82931F0 - .4byte gTilesetPalettes_8293660 - .4byte gMetatiles_82C75C4 + .4byte gTilesetTiles_RestaurantHotel + .4byte gTilesetPalettes_RestaurantHotel + .4byte gMetatiles_RestaurantHotel .4byte 0x0 - .4byte gMetatileAttributes_82C7C44 + .4byte gMetatileAttributes_RestaurantHotel .align 2 -gTileset_82D4F5C:: +gTileset_School:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8293860 - .4byte gTilesetPalettes_8293B0C - .4byte gMetatiles_82C7DE4 + .4byte gTilesetTiles_School + .4byte gTilesetPalettes_School + .4byte gMetatiles_School .4byte 0x0 - .4byte gMetatileAttributes_82C80C4 + .4byte gMetatileAttributes_School .align 2 -gTileset_82D4F74:: +gTileset_FanClubDaycare:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8293D0C - .4byte gTilesetPalettes_8294144 - .4byte gMetatiles_82C817C + .4byte gTilesetTiles_FanClubDaycare + .4byte gTilesetPalettes_FanClubDaycare + .4byte gMetatiles_FanClubDaycare .4byte 0x0 - .4byte gMetatileAttributes_82C8C1C + .4byte gMetatileAttributes_FanClubDaycare .align 2 -gTileset_82D4F8C:: +gTileset_Condominiums:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_828FBD8 - .4byte gTilesetPalettes_8290DD0 - .4byte gMetatiles_82C8EC4 + .4byte gTilesetTiles_SilphCo + .4byte gTilesetPalettes_SilphCo + .4byte gMetatiles_Condominiums .4byte 0x0 - .4byte gMetatileAttributes_82C9C34 + .4byte gMetatileAttributes_Condominiums .align 2 -gTileset_82D4FA4:: +gTileset_BurgledHouse:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8294344 - .4byte gTilesetPalettes_8294D08 - .4byte gMetatiles_82C9F90 + .4byte gTilesetTiles_BurgledHouse + .4byte gTilesetPalettes_BurgledHouse + .4byte gMetatiles_BurgledHouse .4byte 0x0 - .4byte gMetatileAttributes_82CA320 + .4byte gMetatileAttributes_BurgledHouse .align 2 -gTileset_82D4FBC:: +gTileset_Dummy3:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8294F08 - .4byte gTilesetPalettes_8294F18 - .4byte gMetatiles_82CA404 + .4byte gTilesetTiles_Dummy3 + .4byte gTilesetPalettes_Dummy3 + .4byte gMetatiles_Dummy3 .4byte 0x0 - .4byte gMetatileAttributes_82CA424 + .4byte gMetatileAttributes_Dummy3 .align 2 -gTileset_82D4FD4:: +gTileset_Dummy4:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8295118 - .4byte gTilesetPalettes_829512C - .4byte gMetatiles_82CA42C + .4byte gTilesetTiles_Dummy4 + .4byte gTilesetPalettes_Dummy4 + .4byte gMetatiles_Dummy4 .4byte 0x0 - .4byte gMetatileAttributes_82CA44C + .4byte gMetatileAttributes_Dummy4 .align 2 -gTileset_82D4FEC:: +gTileset_MtEmber:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_829532C - .4byte gTilesetPalettes_82967D4 - .4byte gMetatiles_82CA454 - .4byte sub_80702B4 - .4byte gMetatileAttributes_82CB274 + .4byte gTilesetTiles_MtEmber + .4byte gTilesetPalettes_MtEmber + .4byte gMetatiles_MtEmber + .4byte InitTilesetAnim_MtEmber + .4byte gMetatileAttributes_MtEmber .align 2 -gTileset_82D5004:: +gTileset_BerryForest:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_82969D4 - .4byte gTilesetPalettes_8296E90 - .4byte gMetatiles_82CB5FC + .4byte gTilesetTiles_BerryForest + .4byte gTilesetPalettes_BerryForest + .4byte gMetatiles_BerryForest .4byte 0x0 - .4byte gMetatileAttributes_82CB89C + .4byte gMetatileAttributes_BerryForest .align 2 -gTileset_82D501C:: +gTileset_NavelRock:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8297090 - .4byte gTilesetPalettes_82983BC - .4byte gMetatiles_82CB944 + .4byte gTilesetTiles_NavelRock + .4byte gTilesetPalettes_NavelRock + .4byte gMetatiles_NavelRock .4byte 0x0 - .4byte gMetatileAttributes_82CC704 + .4byte gMetatileAttributes_NavelRock .align 2 -gTileset_82D5034:: +gTileset_TanobyRuins:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_82985BC - .4byte gTilesetPalettes_8298970 - .4byte gMetatiles_82CCA74 + .4byte gTilesetTiles_TanobyRuins + .4byte gTilesetPalettes_TanobyRuins + .4byte gMetatiles_TanobyRuins .4byte 0x0 - .4byte gMetatileAttributes_82CD054 + .4byte gMetatileAttributes_TanobyRuins .align 2 -gTileset_82D504C:: +gTileset_SeviiIslands123:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8298B70 - .4byte gTilesetPalettes_8299AA4 - .4byte gMetatiles_82CD1CC + .4byte gTilesetTiles_SeviiIslands123 + .4byte gTilesetPalettes_SeviiIslands123 + .4byte gMetatiles_SeviiIslands123 .4byte 0x0 - .4byte gMetatileAttributes_82CE39C + .4byte gMetatileAttributes_SeviiIslands123 .align 2 -gTileset_82D5064:: +gTileset_SeviiIslands45:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_8299CA4 - .4byte gTilesetPalettes_829AB04 - .4byte gMetatiles_82CE810 + .4byte gTilesetTiles_SeviiIslands45 + .4byte gTilesetPalettes_SeviiIslands45 + .4byte gMetatiles_SeviiIslands45 .4byte 0x0 - .4byte gMetatileAttributes_82CF190 + .4byte gMetatileAttributes_SeviiIslands45 .align 2 -gTileset_82D507C:: +gTileset_SeviiIslands67:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_829AD04 - .4byte gTilesetPalettes_829BD64 - .4byte gMetatiles_82CF3F0 + .4byte gTilesetTiles_SeviiIslands67 + .4byte gTilesetPalettes_SeviiIslands67 + .4byte gMetatiles_SeviiIslands67 .4byte 0x0 - .4byte gMetatileAttributes_82D02F0 + .4byte gMetatileAttributes_SeviiIslands67 .align 2 -gTileset_82D5094:: +gTileset_TrainerTower:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_829BF64 - .4byte gTilesetPalettes_829CEE4 - .4byte gMetatiles_82D06B0 + .4byte gTilesetTiles_TrainerTower + .4byte gTilesetPalettes_TrainerTower + .4byte gMetatiles_TrainerTower .4byte 0x0 - .4byte gMetatileAttributes_82D18B0 + .4byte gMetatileAttributes_TrainerTower .align 2 -gTileset_82D50AC:: +gTileset_IslandHarbor:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_829D0E4 - .4byte gTilesetPalettes_829D894 - .4byte gMetatiles_82D1D30 + .4byte gTilesetTiles_IslandHarbor + .4byte gTilesetPalettes_IslandHarbor + .4byte gMetatiles_IslandHarbor .4byte 0x0 - .4byte gMetatileAttributes_82D2220 + .4byte gMetatileAttributes_IslandHarbor .align 2 -gTileset_82D50C4:: +gTileset_PokemonLeague:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_829DA94 - .4byte gTilesetPalettes_829EA50 - .4byte gMetatiles_82D235C + .4byte gTilesetTiles_PokemonLeague + .4byte gTilesetPalettes_PokemonLeague + .4byte gMetatiles_PokemonLeague .4byte 0x0 - .4byte gMetatileAttributes_82D3B5C + .4byte gMetatileAttributes_PokemonLeague .align 2 -gTileset_82D50DC:: +gTileset_HallOfFame:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_829EC50 - .4byte gTilesetPalettes_829F4C8 - .4byte gMetatiles_82D415C + .4byte gTilesetTiles_HallOfFame + .4byte gTilesetPalettes_HallOfFame + .4byte gMetatiles_HallOfFame .4byte 0x0 - .4byte gMetatileAttributes_82D48BC + .4byte gMetatileAttributes_HallOfFame diff --git a/data/tilesets/metatiles.inc b/data/tilesets/metatiles.inc index 50c849648..d98bc1583 100644 --- a/data/tilesets/metatiles.inc +++ b/data/tilesets/metatiles.inc @@ -1,543 +1,543 @@ .align 1 -gMetatiles_829F6C8:: @ 829F6C8 - .incbin "data/tilesets/primary/82D4A94/metatiles.bin" +gMetatiles_General:: @ 829F6C8 + .incbin "data/tilesets/primary/general/metatiles.bin" .align 1 -gMetatileAttributes_82A1EC8:: @ 82A1EC8 - .incbin "data/tilesets/primary/82D4A94/metatile_attributes.bin" +gMetatileAttributes_General:: @ 82A1EC8 + .incbin "data/tilesets/primary/general/metatile_attributes.bin" .align 1 -gMetatiles_82A28C8:: @ 82A28C8 - .incbin "data/tilesets/secondary/82D4AAC/metatiles.bin" +gMetatiles_PalletTown:: @ 82A28C8 + .incbin "data/tilesets/secondary/pallet_town/metatiles.bin" .align 1 -gMetatileAttributes_82A2E58:: @ 82A2E58 - .incbin "data/tilesets/secondary/82D4AAC/metatile_attributes.bin" +gMetatileAttributes_PalletTown:: @ 82A2E58 + .incbin "data/tilesets/secondary/pallet_town/metatile_attributes.bin" .align 1 -gMetatiles_82A2FBC:: @ 82A2FBC - .incbin "data/tilesets/secondary/82D4AC4/metatiles.bin" +gMetatiles_ViridianCity:: @ 82A2FBC + .incbin "data/tilesets/secondary/viridian_city/metatiles.bin" .align 1 -gMetatileAttributes_82A35AC:: @ 82A35AC - .incbin "data/tilesets/secondary/82D4AC4/metatile_attributes.bin" +gMetatileAttributes_ViridianCity:: @ 82A35AC + .incbin "data/tilesets/secondary/viridian_city/metatile_attributes.bin" .align 1 -gMetatiles_82A3728:: @ 82A3728 - .incbin "data/tilesets/secondary/82D4ADC/metatiles.bin" +gMetatiles_PewterCity:: @ 82A3728 + .incbin "data/tilesets/secondary/pewter_city/metatiles.bin" .align 1 -gMetatileAttributes_82A3C18:: @ 82A3C18 - .incbin "data/tilesets/secondary/82D4ADC/metatile_attributes.bin" +gMetatileAttributes_PewterCity:: @ 82A3C18 + .incbin "data/tilesets/secondary/pewter_city/metatile_attributes.bin" .align 1 -gMetatiles_82A3D54:: @ 82A3D54 - .incbin "data/tilesets/secondary/82D4AF4/metatiles.bin" +gMetatiles_CeruleanCity:: @ 82A3D54 + .incbin "data/tilesets/secondary/cerulean_city/metatiles.bin" .align 1 -gMetatileAttributes_82A45B4:: @ 82A45B4 - .incbin "data/tilesets/secondary/82D4AF4/metatile_attributes.bin" +gMetatileAttributes_CeruleanCity:: @ 82A45B4 + .incbin "data/tilesets/secondary/cerulean_city/metatile_attributes.bin" .align 1 -gMetatiles_82A47CC:: @ 82A47CC - .incbin "data/tilesets/secondary/82D4B0C/metatiles.bin" +gMetatiles_LavenderTown:: @ 82A47CC + .incbin "data/tilesets/secondary/lavender_town/metatiles.bin" .align 1 -gMetatileAttributes_82A556C:: @ 82A556C - .incbin "data/tilesets/secondary/82D4B0C/metatile_attributes.bin" +gMetatileAttributes_LavenderTown:: @ 82A556C + .incbin "data/tilesets/secondary/lavender_town/metatile_attributes.bin" .align 1 -gMetatiles_82A58D4:: @ 82A58D4 - .incbin "data/tilesets/secondary/82D4B24/metatiles.bin" +gMetatiles_VermilionCity:: @ 82A58D4 + .incbin "data/tilesets/secondary/vermilion_city/metatiles.bin" .align 1 -gMetatileAttributes_82A6354:: @ 82A6354 - .incbin "data/tilesets/secondary/82D4B24/metatile_attributes.bin" +gMetatileAttributes_VermilionCity:: @ 82A6354 + .incbin "data/tilesets/secondary/vermilion_city/metatile_attributes.bin" .align 1 -gMetatiles_82A65F4:: @ 82A65F4 - .incbin "data/tilesets/secondary/82D4B3C/metatiles.bin" +gMetatiles_CeladonCity:: @ 82A65F4 + .incbin "data/tilesets/secondary/celadon_city/metatiles.bin" .align 1 -gMetatileAttributes_82A74F4:: @ 82A74F4 - .incbin "data/tilesets/secondary/82D4B3C/metatile_attributes.bin" +gMetatileAttributes_CeladonCity:: @ 82A74F4 + .incbin "data/tilesets/secondary/celadon_city/metatile_attributes.bin" .align 1 -gMetatiles_82A78B4:: @ 82A78B4 - .incbin "data/tilesets/secondary/82D4B54/metatiles.bin" +gMetatiles_FuchsiaCity:: @ 82A78B4 + .incbin "data/tilesets/secondary/fuchsia_city/metatiles.bin" .align 1 -gMetatileAttributes_82A84B4:: @ 82A84B4 - .incbin "data/tilesets/secondary/82D4B54/metatile_attributes.bin" +gMetatileAttributes_FuchsiaCity:: @ 82A84B4 + .incbin "data/tilesets/secondary/fuchsia_city/metatile_attributes.bin" .align 1 -gMetatiles_82A87B4:: @ 82A87B4 - .incbin "data/tilesets/secondary/82D4B6C/metatiles.bin" +gMetatiles_CinnabarIsland:: @ 82A87B4 + .incbin "data/tilesets/secondary/cinnabar_island/metatiles.bin" .align 1 -gMetatileAttributes_82A8BB4:: @ 82A8BB4 - .incbin "data/tilesets/secondary/82D4B6C/metatile_attributes.bin" +gMetatileAttributes_CinnabarIsland:: @ 82A8BB4 + .incbin "data/tilesets/secondary/cinnabar_island/metatile_attributes.bin" .align 1 -gMetatiles_82A8CB4:: @ 82A8CB4 - .incbin "data/tilesets/secondary/82D4B84/metatiles.bin" +gMetatiles_IndigoPlateau:: @ 82A8CB4 + .incbin "data/tilesets/secondary/indigo_plateau/metatiles.bin" .align 1 -gMetatileAttributes_82A97B4:: @ 82A97B4 - .incbin "data/tilesets/secondary/82D4B84/metatile_attributes.bin" +gMetatileAttributes_IndigoPlateau:: @ 82A97B4 + .incbin "data/tilesets/secondary/indigo_plateau/metatile_attributes.bin" .align 1 -gMetatiles_82A9A74:: @ 82A9A74 - .incbin "data/tilesets/secondary/82D4B9C/metatiles.bin" +gMetatiles_SaffronCity:: @ 82A9A74 + .incbin "data/tilesets/secondary/saffron_city/metatiles.bin" .align 1 -gMetatileAttributes_82AA6F4:: @ 82AA6F4 - .incbin "data/tilesets/secondary/82D4B9C/metatile_attributes.bin" +gMetatileAttributes_SaffronCity:: @ 82AA6F4 + .incbin "data/tilesets/secondary/saffron_city/metatile_attributes.bin" .align 1 -gMetatiles_82AAA14:: @ 82AAA14 - .incbin "data/tilesets/secondary/82D4D04/metatiles.bin" +gMetatiles_PewterGym:: @ 82AAA14 + .incbin "data/tilesets/secondary/pewter_gym/metatiles.bin" .align 1 -gMetatileAttributes_82AB064:: @ 82AB064 - .incbin "data/tilesets/secondary/82D4D04/metatile_attributes.bin" +gMetatileAttributes_PewterGym:: @ 82AB064 + .incbin "data/tilesets/secondary/pewter_gym/metatile_attributes.bin" .align 1 -gMetatiles_82AB1F8:: @ 82AB1F8 - .incbin "data/tilesets/secondary/82D4D1C/metatiles.bin" +gMetatiles_CeruleanGym:: @ 82AB1F8 + .incbin "data/tilesets/secondary/cerulean_gym/metatiles.bin" .align 1 -gMetatileAttributes_82AB738:: @ 82AB738 - .incbin "data/tilesets/secondary/82D4D1C/metatile_attributes.bin" +gMetatileAttributes_CeruleanGym:: @ 82AB738 + .incbin "data/tilesets/secondary/cerulean_gym/metatile_attributes.bin" .align 1 -gMetatiles_82AB888:: @ 82AB888 - .incbin "data/tilesets/secondary/82D4D34/metatiles.bin" +gMetatiles_VermilionGym:: @ 82AB888 + .incbin "data/tilesets/secondary/vermilion_gym/metatiles.bin" .align 1 -gMetatileAttributes_82ABD38:: @ 82ABD38 - .incbin "data/tilesets/secondary/82D4D34/metatile_attributes.bin" +gMetatileAttributes_VermilionGym:: @ 82ABD38 + .incbin "data/tilesets/secondary/vermilion_gym/metatile_attributes.bin" .align 1 -gMetatiles_82ABE64:: @ 82ABE64 - .incbin "data/tilesets/secondary/82D4D4C/metatiles.bin" +gMetatiles_CeladonGym:: @ 82ABE64 + .incbin "data/tilesets/secondary/celadon_gym/metatiles.bin" .align 1 -gMetatileAttributes_82AC264:: @ 82AC264 - .incbin "data/tilesets/secondary/82D4D4C/metatile_attributes.bin" +gMetatileAttributes_CeladonGym:: @ 82AC264 + .incbin "data/tilesets/secondary/celadon_gym/metatile_attributes.bin" .align 1 -gMetatiles_82AC364:: @ 82AC364 - .incbin "data/tilesets/secondary/82D4CA4/metatiles.bin" +gMetatiles_FuchsiaGym:: @ 82AC364 + .incbin "data/tilesets/secondary/fuchsia_gym/metatiles.bin" .align 1 -gMetatileAttributes_82AC584:: @ 82AC584 - .incbin "data/tilesets/secondary/82D4CA4/metatile_attributes.bin" +gMetatileAttributes_FuchsiaGym:: @ 82AC584 + .incbin "data/tilesets/secondary/fuchsia_gym/metatile_attributes.bin" .align 1 -gMetatiles_82AC60C:: @ 82AC60C - .incbin "data/tilesets/secondary/82D4D64/metatiles.bin" +gMetatiles_SaffronGym:: @ 82AC60C + .incbin "data/tilesets/secondary/saffron_gym/metatiles.bin" .align 1 -gMetatileAttributes_82AC8EC:: @ 82AC8EC - .incbin "data/tilesets/secondary/82D4D64/metatile_attributes.bin" +gMetatileAttributes_SaffronGym:: @ 82AC8EC + .incbin "data/tilesets/secondary/saffron_gym/metatile_attributes.bin" .align 1 -gMetatiles_82AC9A4:: @ 82AC9A4 - .incbin "data/tilesets/secondary/82D4D7C/metatiles.bin" +gMetatiles_CinnabarGym:: @ 82AC9A4 + .incbin "data/tilesets/secondary/cinnabar_gym/metatiles.bin" .align 1 -gMetatileAttributes_82ACFA4:: @ 82ACFA4 - .incbin "data/tilesets/secondary/82D4D7C/metatile_attributes.bin" +gMetatileAttributes_CinnabarGym:: @ 82ACFA4 + .incbin "data/tilesets/secondary/cinnabar_gym/metatile_attributes.bin" .align 1 -gMetatiles_82AD124:: @ 82AD124 - .incbin "data/tilesets/secondary/82D4CBC/metatiles.bin" +gMetatiles_ViridianGym:: @ 82AD124 + .incbin "data/tilesets/secondary/viridian_gym/metatiles.bin" .align 1 -gMetatileAttributes_82AD664:: @ 82AD664 - .incbin "data/tilesets/secondary/82D4CBC/metatile_attributes.bin" +gMetatileAttributes_ViridianGym:: @ 82AD664 + .incbin "data/tilesets/secondary/viridian_gym/metatile_attributes.bin" .align 1 -gMetatiles_82AD7B4:: @ 82AD7B4 - .incbin "data/tilesets/primary/82D4BB4/metatiles.bin" +gMetatiles_Building:: @ Building + .incbin "data/tilesets/primary/building/metatiles.bin" .align 1 -gMetatileAttributes_82AFFB4:: @ 82AFFB4 - .incbin "data/tilesets/primary/82D4BB4/metatile_attributes.bin" +gMetatileAttributes_Building:: @ Building + .incbin "data/tilesets/primary/building/metatile_attributes.bin" .align 1 -gMetatiles_82B09B4:: @ 82B09B4 - .incbin "data/tilesets/secondary/82D4C14/metatiles.bin" +gMetatiles_Dummy1:: @ 82B09B4 + .incbin "data/tilesets/secondary/dummy1/metatiles.bin" .align 1 -gMetatileAttributes_82B09D4:: @ 82B09D4 - .incbin "data/tilesets/secondary/82D4C14/metatile_attributes.bin" +gMetatileAttributes_Dummy1:: @ 82B09D4 + .incbin "data/tilesets/secondary/dummy1/metatile_attributes.bin" .align 1 -gMetatiles_82B09DC:: @ 82B09DC - .incbin "data/tilesets/secondary/82D4CD4/metatiles.bin" +gMetatiles_HoennBuilding:: @ 82B09DC + .incbin "data/tilesets/secondary/hoenn_building/metatiles.bin" .align 1 -gMetatileAttributes_82B29DC:: @ 82B29DC - .incbin "data/tilesets/secondary/82D4CD4/metatile_attributes.bin" +gMetatileAttributes_HoennBuilding:: @ 82B29DC + .incbin "data/tilesets/secondary/hoenn_building/metatile_attributes.bin" .align 1 -gMetatiles_82B31DC:: @ 82B31DC - .incbin "data/tilesets/secondary/82D4C5C/metatiles.bin" +gMetatiles_BikeShop:: @ 82B31DC + .incbin "data/tilesets/secondary/bike_shop/metatiles.bin" .align 1 -gMetatileAttributes_82B347C:: @ 82B347C - .incbin "data/tilesets/secondary/82D4C5C/metatile_attributes.bin" +gMetatileAttributes_BikeShop:: @ 82B347C + .incbin "data/tilesets/secondary/bike_shop/metatile_attributes.bin" .align 1 -gMetatiles_82B3524:: @ 82B3524 - .incbin "data/tilesets/secondary/82D4BCC/metatiles.bin" +gMetatiles_Mart:: @ 82B3524 + .incbin "data/tilesets/secondary/mart/metatiles.bin" .align 1 -gMetatileAttributes_82B3954:: @ 82B3954 - .incbin "data/tilesets/secondary/82D4BCC/metatile_attributes.bin" +gMetatileAttributes_Mart:: @ 82B3954 + .incbin "data/tilesets/secondary/mart/metatile_attributes.bin" .align 1 -gMetatiles_82B3A60:: @ 82B3A60 - .incbin "data/tilesets/secondary/82D4BE4/metatiles.bin" +gMetatiles_PokemonCenter:: @ 82B3A60 + .incbin "data/tilesets/secondary/pokemon_center/metatiles.bin" .align 1 -gMetatileAttributes_82B4A50:: @ 82B4A50 - .incbin "data/tilesets/secondary/82D4BE4/metatile_attributes.bin" +gMetatileAttributes_PokemonCenter:: @ 82B4A50 + .incbin "data/tilesets/secondary/pokemon_center/metatile_attributes.bin" .align 1 -gMetatiles_82B4E4C:: @ 82B4E4C - .incbin "data/tilesets/secondary/82D4C74/metatiles.bin" +gMetatiles_Building1:: @ 82B4E4C + .incbin "data/tilesets/secondary/building1/metatiles.bin" .align 1 -gMetatileAttributes_82B4FCC:: @ 82B4FCC - .incbin "data/tilesets/secondary/82D4C74/metatile_attributes.bin" +gMetatileAttributes_Building1:: @ 82B4FCC + .incbin "data/tilesets/secondary/building1/metatile_attributes.bin" .align 1 -gMetatiles_82B502C:: @ 82B502C - .incbin "data/tilesets/secondary/82D4BFC/metatiles.bin" +gMetatiles_Cave:: @ 82B502C + .incbin "data/tilesets/secondary/cave/metatiles.bin" .align 1 -gMetatileAttributes_82B5A3C:: @ 82B5A3C - .incbin "data/tilesets/secondary/82D4BFC/metatile_attributes.bin" +gMetatileAttributes_Cave:: @ 82B5A3C + .incbin "data/tilesets/secondary/cave/metatile_attributes.bin" .align 1 -gMetatiles_82B5CC0:: @ 82B5CC0 - .incbin "data/tilesets/secondary/82D4CEC/metatiles.bin" +gMetatiles_GameCorner:: @ 82B5CC0 + .incbin "data/tilesets/secondary/game_corner/metatiles.bin" .align 1 -gMetatileAttributes_82B6640:: @ 82B6640 - .incbin "data/tilesets/secondary/82D4CEC/metatile_attributes.bin" +gMetatileAttributes_GameCorner:: @ 82B6640 + .incbin "data/tilesets/secondary/game_corner/metatile_attributes.bin" .align 1 -gMetatiles_82B68A0:: @ 82B68A0 - .incbin "data/tilesets/secondary/82D4C8C/metatiles.bin" +gMetatiles_Lab:: @ 82B68A0 + .incbin "data/tilesets/secondary/lab/metatiles.bin" .align 1 -gMetatileAttributes_82B7390:: @ 82B7390 - .incbin "data/tilesets/secondary/82D4C8C/metatile_attributes.bin" +gMetatileAttributes_Lab:: @ 82B7390 + .incbin "data/tilesets/secondary/lab/metatile_attributes.bin" .align 1 -gMetatiles_82B764C:: @ 82B764C - .incbin "data/tilesets/secondary/82D4D94/metatiles.bin" +gMetatiles_SSAnne:: @ 82B764C + .incbin "data/tilesets/secondary/ss_anne/metatiles.bin" .align 1 -gMetatileAttributes_82B8B4C:: @ 82B8B4C - .incbin "data/tilesets/secondary/82D4D94/metatile_attributes.bin" +gMetatileAttributes_SSAnne:: @ 82B8B4C + .incbin "data/tilesets/secondary/ss_anne/metatile_attributes.bin" .align 1 -gMetatiles_82B908C:: @ 82B908C - .incbin "data/tilesets/secondary/82D4DAC/metatiles.bin" +gMetatiles_Dummy2:: @ 82B908C + .incbin "data/tilesets/secondary/dummy2/metatiles.bin" .align 1 -gMetatileAttributes_82B90AC:: @ 82B90AC - .incbin "data/tilesets/secondary/82D4DAC/metatile_attributes.bin" +gMetatileAttributes_Dummy2:: @ 82B90AC + .incbin "data/tilesets/secondary/dummy2/metatile_attributes.bin" .align 1 -gMetatiles_82B90B4:: @ 82B90B4 - .incbin "data/tilesets/secondary/82D4DC4/metatiles.bin" +gMetatiles_ViridianForest:: @ 82B90B4 + .incbin "data/tilesets/secondary/viridian_forest/metatiles.bin" .align 1 -gMetatileAttributes_82B9364:: @ 82B9364 - .incbin "data/tilesets/secondary/82D4DC4/metatile_attributes.bin" +gMetatileAttributes_ViridianForest:: @ 82B9364 + .incbin "data/tilesets/secondary/viridian_forest/metatile_attributes.bin" .align 1 -gMetatiles_82B9410:: @ 82B9410 - .incbin "data/tilesets/secondary/82D4DDC/metatiles.bin" +gMetatiles_UnusedGatehouse1:: @ 82B9410 + .incbin "data/tilesets/secondary/unused_gatehouse1/metatiles.bin" .align 1 -gMetatileAttributes_82B9B30:: @ 82B9B30 - .incbin "data/tilesets/secondary/82D4DDC/metatile_attributes.bin" +gMetatileAttributes_UnusedGatehouse1:: @ 82B9B30 + .incbin "data/tilesets/secondary/unused_gatehouse1/metatile_attributes.bin" .align 1 -gMetatiles_82B9CF8:: @ 82B9CF8 - .incbin "data/tilesets/secondary/82D4DF4/metatiles.bin" +gMetatiles_RockTunnel:: @ 82B9CF8 + .incbin "data/tilesets/secondary/rock_tunnel/metatiles.bin" .align 1 -gMetatileAttributes_82BA678:: @ 82BA678 - .incbin "data/tilesets/secondary/82D4DF4/metatile_attributes.bin" +gMetatileAttributes_RockTunnel:: @ 82BA678 + .incbin "data/tilesets/secondary/rock_tunnel/metatile_attributes.bin" .align 1 -gMetatiles_82BA8D8:: @ 82BA8D8 - .incbin "data/tilesets/secondary/82D4E0C/metatiles.bin" +gMetatiles_DiglettsCave:: @ 82BA8D8 + .incbin "data/tilesets/secondary/digletts_cave/metatiles.bin" .align 1 -gMetatileAttributes_82BB2A8:: @ 82BB2A8 - .incbin "data/tilesets/secondary/82D4E0C/metatile_attributes.bin" +gMetatileAttributes_DiglettsCave:: @ 82BB2A8 + .incbin "data/tilesets/secondary/digletts_cave/metatile_attributes.bin" .align 1 -gMetatiles_82BB51C:: @ 82BB51C - .incbin "data/tilesets/secondary/82D4E24/metatiles.bin" +gMetatiles_SeafoamIslands:: @ 82BB51C + .incbin "data/tilesets/secondary/seafoam_islands/metatiles.bin" .align 1 -gMetatileAttributes_82BC49C:: @ 82BC49C - .incbin "data/tilesets/secondary/82D4E24/metatile_attributes.bin" +gMetatileAttributes_SeafoamIslands:: @ 82BC49C + .incbin "data/tilesets/secondary/seafoam_islands/metatile_attributes.bin" .align 1 -gMetatiles_82BC87C:: @ 82BC87C - .incbin "data/tilesets/secondary/82D4E3C/metatiles.bin" +gMetatiles_UnusedGatehouse2:: @ 82BC87C + .incbin "data/tilesets/secondary/unused_gatehouse2/metatiles.bin" .align 1 -gMetatileAttributes_82BCF9C:: @ 82BCF9C - .incbin "data/tilesets/secondary/82D4E3C/metatile_attributes.bin" +gMetatileAttributes_UnusedGatehouse2:: @ 82BCF9C + .incbin "data/tilesets/secondary/unused_gatehouse2/metatile_attributes.bin" .align 1 -gMetatiles_82BD164:: @ 82BD164 - .incbin "data/tilesets/secondary/82D4E54/metatiles.bin" +gMetatiles_CeruleanCave:: @ 82BD164 + .incbin "data/tilesets/secondary/cerulean_cave/metatiles.bin" .align 1 -gMetatileAttributes_82BD9C4:: @ 82BD9C4 - .incbin "data/tilesets/secondary/82D4E54/metatile_attributes.bin" +gMetatileAttributes_CeruleanCave:: @ 82BD9C4 + .incbin "data/tilesets/secondary/cerulean_cave/metatile_attributes.bin" .align 1 -gMetatiles_82BDBDC:: @ 82BDBDC - .incbin "data/tilesets/secondary/82D4E6C/metatiles.bin" +gMetatiles_DepartmentStore:: @ 82BDBDC + .incbin "data/tilesets/secondary/department_store/metatiles.bin" .align 1 -gMetatileAttributes_82BEB3C:: @ 82BEB3C - .incbin "data/tilesets/secondary/82D4E6C/metatile_attributes.bin" +gMetatileAttributes_DepartmentStore:: @ 82BEB3C + .incbin "data/tilesets/secondary/department_store/metatile_attributes.bin" .align 1 -gMetatiles_82BEF14:: @ 82BEF14 - .incbin "data/tilesets/secondary/82D4E84/metatiles.bin" +gMetatiles_Building2:: @ 82BEF14 + .incbin "data/tilesets/secondary/building2/metatiles.bin" .align 1 -gMetatileAttributes_82BFA94:: @ 82BFA94 - .incbin "data/tilesets/secondary/82D4E84/metatile_attributes.bin" +gMetatileAttributes_Building2:: @ 82BFA94 + .incbin "data/tilesets/secondary/building2/metatile_attributes.bin" .align 1 -gMetatiles_82BFD74:: @ 82BFD74 - .incbin "data/tilesets/secondary/82D4E9C/metatiles.bin" +gMetatiles_PowerPlant:: @ 82BFD74 + .incbin "data/tilesets/secondary/power_plant/metatiles.bin" .align 1 -gMetatileAttributes_82C0704:: @ 82C0704 - .incbin "data/tilesets/secondary/82D4E9C/metatile_attributes.bin" +gMetatileAttributes_PowerPlant:: @ 82C0704 + .incbin "data/tilesets/secondary/power_plant/metatile_attributes.bin" .align 1 -gMetatiles_82C0968:: @ 82C0968 - .incbin "data/tilesets/secondary/82D4EB4/metatiles.bin" +gMetatiles_SeaCottage:: @ 82C0968 + .incbin "data/tilesets/secondary/sea_cottage/metatiles.bin" .align 1 -gMetatileAttributes_82C0D18:: @ 82C0D18 - .incbin "data/tilesets/secondary/82D4EB4/metatile_attributes.bin" +gMetatileAttributes_SeaCottage:: @ 82C0D18 + .incbin "data/tilesets/secondary/sea_cottage/metatile_attributes.bin" .align 1 -gMetatiles_82C0E04:: @ 82C0E04 - .incbin "data/tilesets/secondary/82D4ECC/metatiles.bin" +gMetatiles_SilphCo:: @ 82C0E04 + .incbin "data/tilesets/secondary/silph_co/metatiles.bin" .align 1 -gMetatileAttributes_82C25A4:: @ 82C25A4 - .incbin "data/tilesets/secondary/82D4ECC/metatile_attributes.bin" +gMetatileAttributes_SilphCo:: @ 82C25A4 + .incbin "data/tilesets/secondary/silph_co/metatile_attributes.bin" .align 1 -gMetatiles_82C2B8C:: @ 82C2B8C - .incbin "data/tilesets/secondary/82D4EE4/metatiles.bin" +gMetatiles_UndergroundPath:: @ 82C2B8C + .incbin "data/tilesets/secondary/underground_path/metatiles.bin" .align 1 -gMetatileAttributes_82C300C:: @ 82C300C - .incbin "data/tilesets/secondary/82D4EE4/metatile_attributes.bin" +gMetatileAttributes_UndergroundPath:: @ 82C300C + .incbin "data/tilesets/secondary/underground_path/metatile_attributes.bin" .align 1 -gMetatiles_82C312C:: @ 82C312C - .incbin "data/tilesets/secondary/82D4EFC/metatiles.bin" +gMetatiles_PokemonTower:: @ 82C312C + .incbin "data/tilesets/secondary/pokemon_tower/metatiles.bin" .align 1 -gMetatileAttributes_82C377C:: @ 82C377C - .incbin "data/tilesets/secondary/82D4EFC/metatile_attributes.bin" +gMetatileAttributes_PokemonTower:: @ 82C377C + .incbin "data/tilesets/secondary/pokemon_tower/metatile_attributes.bin" .align 1 -gMetatiles_82C3910:: @ 82C3910 - .incbin "data/tilesets/secondary/82D4F14/metatiles.bin" +gMetatiles_SafariZoneBuilding:: @ 82C3910 + .incbin "data/tilesets/secondary/safari_zone_building/metatiles.bin" .align 1 -gMetatileAttributes_82C4110:: @ 82C4110 - .incbin "data/tilesets/secondary/82D4F14/metatile_attributes.bin" +gMetatileAttributes_SafariZoneBuilding:: @ 82C4110 + .incbin "data/tilesets/secondary/safari_zone_building/metatile_attributes.bin" .align 1 -gMetatiles_82C4310:: @ 82C4310 - .incbin "data/tilesets/secondary/82D4F2C/metatiles.bin" +gMetatiles_PokemonMansion:: @ 82C4310 + .incbin "data/tilesets/secondary/pokemon_mansion/metatiles.bin" .align 1 -gMetatileAttributes_82C5330:: @ 82C5330 - .incbin "data/tilesets/secondary/82D4F2C/metatile_attributes.bin" +gMetatileAttributes_PokemonMansion:: @ 82C5330 + .incbin "data/tilesets/secondary/pokemon_mansion/metatile_attributes.bin" .align 1 -gMetatiles_82C5738:: @ 82C5738 - .incbin "data/tilesets/secondary/82D4C2C/metatiles.bin" +gMetatiles_Museum:: @ 82C5738 + .incbin "data/tilesets/secondary/museum/metatiles.bin" .align 1 -gMetatileAttributes_82C5FA8:: @ 82C5FA8 - .incbin "data/tilesets/secondary/82D4C2C/metatile_attributes.bin" +gMetatileAttributes_Museum:: @ 82C5FA8 + .incbin "data/tilesets/secondary/museum/metatile_attributes.bin" .align 1 -gMetatiles_82C61C4:: @ 82C61C4 - .incbin "data/tilesets/secondary/82D4C44/metatiles.bin" +gMetatiles_CableClub:: @ 82C61C4 + .incbin "data/tilesets/secondary/cable_club/metatiles.bin" .align 1 -gMetatileAttributes_82C71C4:: @ 82C71C4 - .incbin "data/tilesets/secondary/82D4C44/metatile_attributes.bin" +gMetatileAttributes_CableClub:: @ 82C71C4 + .incbin "data/tilesets/secondary/cable_club/metatile_attributes.bin" .align 1 -gMetatiles_82C75C4:: @ 82C75C4 - .incbin "data/tilesets/secondary/82D4F44/metatiles.bin" +gMetatiles_RestaurantHotel:: @ 82C75C4 + .incbin "data/tilesets/secondary/restaurant_hotel/metatiles.bin" .align 1 -gMetatileAttributes_82C7C44:: @ 82C7C44 - .incbin "data/tilesets/secondary/82D4F44/metatile_attributes.bin" +gMetatileAttributes_RestaurantHotel:: @ 82C7C44 + .incbin "data/tilesets/secondary/restaurant_hotel/metatile_attributes.bin" .align 1 -gMetatiles_82C7DE4:: @ 82C7DE4 - .incbin "data/tilesets/secondary/82D4F5C/metatiles.bin" +gMetatiles_School:: @ 82C7DE4 + .incbin "data/tilesets/secondary/school/metatiles.bin" .align 1 -gMetatileAttributes_82C80C4:: @ 82C80C4 - .incbin "data/tilesets/secondary/82D4F5C/metatile_attributes.bin" +gMetatileAttributes_School:: @ 82C80C4 + .incbin "data/tilesets/secondary/school/metatile_attributes.bin" .align 1 -gMetatiles_82C817C:: @ 82C817C - .incbin "data/tilesets/secondary/82D4F74/metatiles.bin" +gMetatiles_FanClubDaycare:: @ 82C817C + .incbin "data/tilesets/secondary/fan_club_daycare/metatiles.bin" .align 1 -gMetatileAttributes_82C8C1C:: @ 82C8C1C - .incbin "data/tilesets/secondary/82D4F74/metatile_attributes.bin" +gMetatileAttributes_FanClubDaycare:: @ 82C8C1C + .incbin "data/tilesets/secondary/fan_club_daycare/metatile_attributes.bin" .align 1 -gMetatiles_82C8EC4:: @ 82C8EC4 - .incbin "data/tilesets/secondary/82D4F8C/metatiles.bin" +gMetatiles_Condominiums:: @ 82C8EC4 + .incbin "data/tilesets/secondary/condominiums/metatiles.bin" .align 1 -gMetatileAttributes_82C9C34:: @ 82C9C34 - .incbin "data/tilesets/secondary/82D4F8C/metatile_attributes.bin" +gMetatileAttributes_Condominiums:: @ 82C9C34 + .incbin "data/tilesets/secondary/condominiums/metatile_attributes.bin" .align 1 -gMetatiles_82C9F90:: @ 82C9F90 - .incbin "data/tilesets/secondary/82D4FA4/metatiles.bin" +gMetatiles_BurgledHouse:: @ 82C9F90 + .incbin "data/tilesets/secondary/burgled_house/metatiles.bin" .align 1 -gMetatileAttributes_82CA320:: @ 82CA320 - .incbin "data/tilesets/secondary/82D4FA4/metatile_attributes.bin" +gMetatileAttributes_BurgledHouse:: @ 82CA320 + .incbin "data/tilesets/secondary/burgled_house/metatile_attributes.bin" .align 1 -gMetatiles_82CA404:: @ 82CA404 - .incbin "data/tilesets/secondary/82D4FBC/metatiles.bin" +gMetatiles_Dummy3:: @ 82CA404 + .incbin "data/tilesets/secondary/dummy3/metatiles.bin" .align 1 -gMetatileAttributes_82CA424:: @ 82CA424 - .incbin "data/tilesets/secondary/82D4FBC/metatile_attributes.bin" +gMetatileAttributes_Dummy3:: @ 82CA424 + .incbin "data/tilesets/secondary/dummy3/metatile_attributes.bin" .align 1 -gMetatiles_82CA42C:: @ 82CA42C - .incbin "data/tilesets/secondary/82D4FD4/metatiles.bin" +gMetatiles_Dummy4:: @ 82CA42C + .incbin "data/tilesets/secondary/dummy4/metatiles.bin" .align 1 -gMetatileAttributes_82CA44C:: @ 82CA44C - .incbin "data/tilesets/secondary/82D4FD4/metatile_attributes.bin" +gMetatileAttributes_Dummy4:: @ 82CA44C + .incbin "data/tilesets/secondary/dummy4/metatile_attributes.bin" .align 1 -gMetatiles_82CA454:: @ 82CA454 - .incbin "data/tilesets/secondary/82D4FEC/metatiles.bin" +gMetatiles_MtEmber:: @ 82CA454 + .incbin "data/tilesets/secondary/mt_ember/metatiles.bin" .align 1 -gMetatileAttributes_82CB274:: @ 82CB274 - .incbin "data/tilesets/secondary/82D4FEC/metatile_attributes.bin" +gMetatileAttributes_MtEmber:: @ 82CB274 + .incbin "data/tilesets/secondary/mt_ember/metatile_attributes.bin" .align 1 -gMetatiles_82CB5FC:: @ 82CB5FC - .incbin "data/tilesets/secondary/82D5004/metatiles.bin" +gMetatiles_BerryForest:: @ 82CB5FC + .incbin "data/tilesets/secondary/berry_forest/metatiles.bin" .align 1 -gMetatileAttributes_82CB89C:: @ 82CB89C - .incbin "data/tilesets/secondary/82D5004/metatile_attributes.bin" +gMetatileAttributes_BerryForest:: @ 82CB89C + .incbin "data/tilesets/secondary/berry_forest/metatile_attributes.bin" .align 1 -gMetatiles_82CB944:: @ 82CB944 - .incbin "data/tilesets/secondary/82D501C/metatiles.bin" +gMetatiles_NavelRock:: @ 82CB944 + .incbin "data/tilesets/secondary/navel_rock/metatiles.bin" .align 1 -gMetatileAttributes_82CC704:: @ 82CC704 - .incbin "data/tilesets/secondary/82D501C/metatile_attributes.bin" +gMetatileAttributes_NavelRock:: @ 82CC704 + .incbin "data/tilesets/secondary/navel_rock/metatile_attributes.bin" .align 1 -gMetatiles_82CCA74:: @ 82CCA74 - .incbin "data/tilesets/secondary/82D5034/metatiles.bin" +gMetatiles_TanobyRuins:: @ 82CCA74 + .incbin "data/tilesets/secondary/tanoby_ruins/metatiles.bin" .align 1 -gMetatileAttributes_82CD054:: @ 82CD054 - .incbin "data/tilesets/secondary/82D5034/metatile_attributes.bin" +gMetatileAttributes_TanobyRuins:: @ 82CD054 + .incbin "data/tilesets/secondary/tanoby_ruins/metatile_attributes.bin" .align 1 -gMetatiles_82CD1CC:: @ 82CD1CC - .incbin "data/tilesets/secondary/82D504C/metatiles.bin" +gMetatiles_SeviiIslands123:: @ 82CD1CC + .incbin "data/tilesets/secondary/sevii_islands_123/metatiles.bin" .align 1 -gMetatileAttributes_82CE39C:: @ 82CE39C - .incbin "data/tilesets/secondary/82D504C/metatile_attributes.bin" +gMetatileAttributes_SeviiIslands123:: @ 82CE39C + .incbin "data/tilesets/secondary/sevii_islands_123/metatile_attributes.bin" .align 1 -gMetatiles_82CE810:: @ 82CE810 - .incbin "data/tilesets/secondary/82D5064/metatiles.bin" +gMetatiles_SeviiIslands45:: @ 82CE810 + .incbin "data/tilesets/secondary/sevii_islands_45/metatiles.bin" .align 1 -gMetatileAttributes_82CF190:: @ 82CF190 - .incbin "data/tilesets/secondary/82D5064/metatile_attributes.bin" +gMetatileAttributes_SeviiIslands45:: @ 82CF190 + .incbin "data/tilesets/secondary/sevii_islands_45/metatile_attributes.bin" .align 1 -gMetatiles_82CF3F0:: @ 82CF3F0 - .incbin "data/tilesets/secondary/82D507C/metatiles.bin" +gMetatiles_SeviiIslands67:: @ 82CF3F0 + .incbin "data/tilesets/secondary/sevii_islands_67/metatiles.bin" .align 1 -gMetatileAttributes_82D02F0:: @ 82D02F0 - .incbin "data/tilesets/secondary/82D507C/metatile_attributes.bin" +gMetatileAttributes_SeviiIslands67:: @ 82D02F0 + .incbin "data/tilesets/secondary/sevii_islands_67/metatile_attributes.bin" .align 1 -gMetatiles_82D06B0:: @ 82D06B0 - .incbin "data/tilesets/secondary/82D5094/metatiles.bin" +gMetatiles_TrainerTower:: @ 82D06B0 + .incbin "data/tilesets/secondary/trainer_tower/metatiles.bin" .align 1 -gMetatileAttributes_82D18B0:: @ 82D18B0 - .incbin "data/tilesets/secondary/82D5094/metatile_attributes.bin" +gMetatileAttributes_TrainerTower:: @ 82D18B0 + .incbin "data/tilesets/secondary/trainer_tower/metatile_attributes.bin" .align 1 -gMetatiles_82D1D30:: @ 82D1D30 - .incbin "data/tilesets/secondary/82D50AC/metatiles.bin" +gMetatiles_IslandHarbor:: @ 82D1D30 + .incbin "data/tilesets/secondary/island_harbor/metatiles.bin" .align 1 -gMetatileAttributes_82D2220:: @ 82D2220 - .incbin "data/tilesets/secondary/82D50AC/metatile_attributes.bin" +gMetatileAttributes_IslandHarbor:: @ 82D2220 + .incbin "data/tilesets/secondary/island_harbor/metatile_attributes.bin" .align 1 -gMetatiles_82D235C:: @ 82D235C - .incbin "data/tilesets/secondary/82D50C4/metatiles.bin" +gMetatiles_PokemonLeague:: @ 82D235C + .incbin "data/tilesets/secondary/pokemon_league/metatiles.bin" .align 1 -gMetatileAttributes_82D3B5C:: @ 82D3B5C - .incbin "data/tilesets/secondary/82D50C4/metatile_attributes.bin" +gMetatileAttributes_PokemonLeague:: @ 82D3B5C + .incbin "data/tilesets/secondary/pokemon_league/metatile_attributes.bin" .align 1 -gMetatiles_82D415C:: @ 82D415C - .incbin "data/tilesets/secondary/82D50DC/metatiles.bin" +gMetatiles_HallOfFame:: @ 82D415C + .incbin "data/tilesets/secondary/hall_of_fame/metatiles.bin" .align 1 -gMetatileAttributes_82D48BC:: @ 82D48BC - .incbin "data/tilesets/secondary/82D50DC/metatile_attributes.bin" +gMetatileAttributes_HallOfFame:: @ 82D48BC + .incbin "data/tilesets/secondary/hall_of_fame/metatile_attributes.bin" diff --git a/data/tilesets/primary/82D4A94/metatile_attributes.bin b/data/tilesets/primary/82D4A94/metatile_attributes.bin deleted file mode 100644 index 45f6f352e..000000000 Binary files a/data/tilesets/primary/82D4A94/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/primary/82D4A94/metatiles.bin b/data/tilesets/primary/82D4A94/metatiles.bin deleted file mode 100644 index 7a228eeae..000000000 Binary files a/data/tilesets/primary/82D4A94/metatiles.bin and /dev/null differ diff --git a/data/tilesets/primary/82D4A94/palettes/0.pal b/data/tilesets/primary/82D4A94/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/primary/82D4A94/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/primary/82D4A94/palettes/1.pal b/data/tilesets/primary/82D4A94/palettes/1.pal deleted file mode 100644 index 09828f4f1..000000000 --- a/data/tilesets/primary/82D4A94/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -123 123 131 -32 49 57 -230 238 238 -90 189 139 -90 90 115 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -123 74 74 -90 57 65 -115 205 164 diff --git a/data/tilesets/primary/82D4A94/palettes/10.pal b/data/tilesets/primary/82D4A94/palettes/10.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/primary/82D4A94/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/primary/82D4A94/palettes/11.pal b/data/tilesets/primary/82D4A94/palettes/11.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/primary/82D4A94/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/primary/82D4A94/palettes/12.pal b/data/tilesets/primary/82D4A94/palettes/12.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/primary/82D4A94/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/primary/82D4A94/palettes/13.pal b/data/tilesets/primary/82D4A94/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/primary/82D4A94/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/primary/82D4A94/palettes/14.pal b/data/tilesets/primary/82D4A94/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/primary/82D4A94/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/primary/82D4A94/palettes/15.pal b/data/tilesets/primary/82D4A94/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/primary/82D4A94/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/primary/82D4A94/palettes/2.pal b/data/tilesets/primary/82D4A94/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/primary/82D4A94/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/primary/82D4A94/palettes/3.pal b/data/tilesets/primary/82D4A94/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/primary/82D4A94/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/primary/82D4A94/palettes/4.pal b/data/tilesets/primary/82D4A94/palettes/4.pal deleted file mode 100644 index 9b094a6aa..000000000 --- a/data/tilesets/primary/82D4A94/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 0 -230 246 255 -189 222 255 -139 164 255 -106 164 230 -74 148 222 -74 123 222 -82 156 230 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -49 115 197 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/primary/82D4A94/palettes/5.pal b/data/tilesets/primary/82D4A94/palettes/5.pal deleted file mode 100644 index c5a653979..000000000 --- a/data/tilesets/primary/82D4A94/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/primary/82D4A94/palettes/6.pal b/data/tilesets/primary/82D4A94/palettes/6.pal deleted file mode 100644 index cdf41b298..000000000 --- a/data/tilesets/primary/82D4A94/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 255 0 -205 230 246 -180 213 255 -123 156 238 -98 139 213 -65 123 189 -49 98 180 -82 123 205 -238 246 246 -205 222 238 -49 115 197 -139 189 255 -115 164 255 -65 139 222 -57 115 222 -82 148 230 diff --git a/data/tilesets/primary/82D4A94/palettes/7.pal b/data/tilesets/primary/82D4A94/palettes/7.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/primary/82D4A94/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/primary/82D4A94/palettes/8.pal b/data/tilesets/primary/82D4A94/palettes/8.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/primary/82D4A94/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/primary/82D4A94/palettes/9.pal b/data/tilesets/primary/82D4A94/palettes/9.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/primary/82D4A94/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/primary/82D4A94/tiles.png b/data/tilesets/primary/82D4A94/tiles.png deleted file mode 100644 index 84ba7b2f9..000000000 Binary files a/data/tilesets/primary/82D4A94/tiles.png and /dev/null differ diff --git a/data/tilesets/primary/82D4BB4/metatile_attributes.bin b/data/tilesets/primary/82D4BB4/metatile_attributes.bin deleted file mode 100644 index 3dbc31883..000000000 Binary files a/data/tilesets/primary/82D4BB4/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/primary/82D4BB4/metatiles.bin b/data/tilesets/primary/82D4BB4/metatiles.bin deleted file mode 100644 index 024797c8e..000000000 Binary files a/data/tilesets/primary/82D4BB4/metatiles.bin and /dev/null differ diff --git a/data/tilesets/primary/82D4BB4/palettes/0.pal b/data/tilesets/primary/82D4BB4/palettes/0.pal deleted file mode 100644 index 3b6416376..000000000 --- a/data/tilesets/primary/82D4BB4/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -156 213 255 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/primary/82D4BB4/palettes/1.pal b/data/tilesets/primary/82D4BB4/palettes/1.pal deleted file mode 100644 index 66561f6d3..000000000 --- a/data/tilesets/primary/82D4BB4/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -139 180 222 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/primary/82D4BB4/palettes/10.pal b/data/tilesets/primary/82D4BB4/palettes/10.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/primary/82D4BB4/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/primary/82D4BB4/palettes/11.pal b/data/tilesets/primary/82D4BB4/palettes/11.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/primary/82D4BB4/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/primary/82D4BB4/palettes/12.pal b/data/tilesets/primary/82D4BB4/palettes/12.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/primary/82D4BB4/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/primary/82D4BB4/palettes/13.pal b/data/tilesets/primary/82D4BB4/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/primary/82D4BB4/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/primary/82D4BB4/palettes/14.pal b/data/tilesets/primary/82D4BB4/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/primary/82D4BB4/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/primary/82D4BB4/palettes/15.pal b/data/tilesets/primary/82D4BB4/palettes/15.pal deleted file mode 100644 index 92e7ed309..000000000 --- a/data/tilesets/primary/82D4BB4/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -0 0 0 diff --git a/data/tilesets/primary/82D4BB4/palettes/2.pal b/data/tilesets/primary/82D4BB4/palettes/2.pal deleted file mode 100644 index 87a022102..000000000 --- a/data/tilesets/primary/82D4BB4/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -90 90 115 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/primary/82D4BB4/palettes/3.pal b/data/tilesets/primary/82D4BB4/palettes/3.pal deleted file mode 100644 index 783496dcd..000000000 --- a/data/tilesets/primary/82D4BB4/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -65 98 156 -90 123 180 -115 156 197 -222 213 131 -164 164 172 -205 205 213 -238 238 246 -106 172 115 -156 205 139 diff --git a/data/tilesets/primary/82D4BB4/palettes/4.pal b/data/tilesets/primary/82D4BB4/palettes/4.pal deleted file mode 100644 index 89eace605..000000000 --- a/data/tilesets/primary/82D4BB4/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 238 246 -172 197 180 -197 222 205 -90 189 172 -246 238 156 -205 189 131 -189 164 123 -148 131 106 -106 106 106 -213 222 230 -238 180 115 diff --git a/data/tilesets/primary/82D4BB4/palettes/5.pal b/data/tilesets/primary/82D4BB4/palettes/5.pal deleted file mode 100644 index c7780e5c7..000000000 --- a/data/tilesets/primary/82D4BB4/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -213 222 222 -164 180 189 -255 0 255 -131 115 74 -213 213 148 -197 189 139 -172 156 115 -148 131 90 -197 197 205 -205 82 65 -0 0 0 diff --git a/data/tilesets/primary/82D4BB4/palettes/6.pal b/data/tilesets/primary/82D4BB4/palettes/6.pal deleted file mode 100644 index 1d08ce9a2..000000000 --- a/data/tilesets/primary/82D4BB4/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/primary/82D4BB4/palettes/7.pal b/data/tilesets/primary/82D4BB4/palettes/7.pal deleted file mode 100644 index c1e7c3d5c..000000000 --- a/data/tilesets/primary/82D4BB4/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 diff --git a/data/tilesets/primary/82D4BB4/palettes/8.pal b/data/tilesets/primary/82D4BB4/palettes/8.pal deleted file mode 100644 index c1e7c3d5c..000000000 --- a/data/tilesets/primary/82D4BB4/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 diff --git a/data/tilesets/primary/82D4BB4/palettes/9.pal b/data/tilesets/primary/82D4BB4/palettes/9.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/primary/82D4BB4/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/primary/82D4BB4/tiles.png b/data/tilesets/primary/82D4BB4/tiles.png deleted file mode 100644 index 8d864f27e..000000000 Binary files a/data/tilesets/primary/82D4BB4/tiles.png and /dev/null differ diff --git a/data/tilesets/primary/building/metatile_attributes.bin b/data/tilesets/primary/building/metatile_attributes.bin new file mode 100644 index 000000000..3dbc31883 Binary files /dev/null and b/data/tilesets/primary/building/metatile_attributes.bin differ diff --git a/data/tilesets/primary/building/metatiles.bin b/data/tilesets/primary/building/metatiles.bin new file mode 100644 index 000000000..024797c8e Binary files /dev/null and b/data/tilesets/primary/building/metatiles.bin differ diff --git a/data/tilesets/primary/building/palettes/0.pal b/data/tilesets/primary/building/palettes/0.pal new file mode 100644 index 000000000..3b6416376 --- /dev/null +++ b/data/tilesets/primary/building/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +156 213 255 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/primary/building/palettes/1.pal b/data/tilesets/primary/building/palettes/1.pal new file mode 100644 index 000000000..66561f6d3 --- /dev/null +++ b/data/tilesets/primary/building/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +139 180 222 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/primary/building/palettes/10.pal b/data/tilesets/primary/building/palettes/10.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/primary/building/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/primary/building/palettes/11.pal b/data/tilesets/primary/building/palettes/11.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/primary/building/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/primary/building/palettes/12.pal b/data/tilesets/primary/building/palettes/12.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/primary/building/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/primary/building/palettes/13.pal b/data/tilesets/primary/building/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/primary/building/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/primary/building/palettes/14.pal b/data/tilesets/primary/building/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/primary/building/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/primary/building/palettes/15.pal b/data/tilesets/primary/building/palettes/15.pal new file mode 100644 index 000000000..92e7ed309 --- /dev/null +++ b/data/tilesets/primary/building/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +0 0 0 diff --git a/data/tilesets/primary/building/palettes/2.pal b/data/tilesets/primary/building/palettes/2.pal new file mode 100644 index 000000000..87a022102 --- /dev/null +++ b/data/tilesets/primary/building/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +90 90 115 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/primary/building/palettes/3.pal b/data/tilesets/primary/building/palettes/3.pal new file mode 100644 index 000000000..783496dcd --- /dev/null +++ b/data/tilesets/primary/building/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +65 98 156 +90 123 180 +115 156 197 +222 213 131 +164 164 172 +205 205 213 +238 238 246 +106 172 115 +156 205 139 diff --git a/data/tilesets/primary/building/palettes/4.pal b/data/tilesets/primary/building/palettes/4.pal new file mode 100644 index 000000000..89eace605 --- /dev/null +++ b/data/tilesets/primary/building/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 238 246 +172 197 180 +197 222 205 +90 189 172 +246 238 156 +205 189 131 +189 164 123 +148 131 106 +106 106 106 +213 222 230 +238 180 115 diff --git a/data/tilesets/primary/building/palettes/5.pal b/data/tilesets/primary/building/palettes/5.pal new file mode 100644 index 000000000..c7780e5c7 --- /dev/null +++ b/data/tilesets/primary/building/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +213 222 222 +164 180 189 +255 0 255 +131 115 74 +213 213 148 +197 189 139 +172 156 115 +148 131 90 +197 197 205 +205 82 65 +0 0 0 diff --git a/data/tilesets/primary/building/palettes/6.pal b/data/tilesets/primary/building/palettes/6.pal new file mode 100644 index 000000000..1d08ce9a2 --- /dev/null +++ b/data/tilesets/primary/building/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/primary/building/palettes/7.pal b/data/tilesets/primary/building/palettes/7.pal new file mode 100644 index 000000000..c1e7c3d5c --- /dev/null +++ b/data/tilesets/primary/building/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 diff --git a/data/tilesets/primary/building/palettes/8.pal b/data/tilesets/primary/building/palettes/8.pal new file mode 100644 index 000000000..c1e7c3d5c --- /dev/null +++ b/data/tilesets/primary/building/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 diff --git a/data/tilesets/primary/building/palettes/9.pal b/data/tilesets/primary/building/palettes/9.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/primary/building/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/primary/building/tiles.png b/data/tilesets/primary/building/tiles.png new file mode 100644 index 000000000..8d864f27e Binary files /dev/null and b/data/tilesets/primary/building/tiles.png differ diff --git a/data/tilesets/primary/general/metatile_attributes.bin b/data/tilesets/primary/general/metatile_attributes.bin new file mode 100644 index 000000000..45f6f352e Binary files /dev/null and b/data/tilesets/primary/general/metatile_attributes.bin differ diff --git a/data/tilesets/primary/general/metatiles.bin b/data/tilesets/primary/general/metatiles.bin new file mode 100644 index 000000000..7a228eeae Binary files /dev/null and b/data/tilesets/primary/general/metatiles.bin differ diff --git a/data/tilesets/primary/general/palettes/0.pal b/data/tilesets/primary/general/palettes/0.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/primary/general/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/primary/general/palettes/1.pal b/data/tilesets/primary/general/palettes/1.pal new file mode 100644 index 000000000..09828f4f1 --- /dev/null +++ b/data/tilesets/primary/general/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +123 123 131 +32 49 57 +230 238 238 +90 189 139 +90 90 115 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +123 74 74 +90 57 65 +115 205 164 diff --git a/data/tilesets/primary/general/palettes/10.pal b/data/tilesets/primary/general/palettes/10.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/primary/general/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/primary/general/palettes/11.pal b/data/tilesets/primary/general/palettes/11.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/primary/general/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/primary/general/palettes/12.pal b/data/tilesets/primary/general/palettes/12.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/primary/general/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/primary/general/palettes/13.pal b/data/tilesets/primary/general/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/primary/general/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/primary/general/palettes/14.pal b/data/tilesets/primary/general/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/primary/general/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/primary/general/palettes/15.pal b/data/tilesets/primary/general/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/primary/general/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/primary/general/palettes/2.pal b/data/tilesets/primary/general/palettes/2.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/primary/general/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/primary/general/palettes/3.pal b/data/tilesets/primary/general/palettes/3.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/primary/general/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/primary/general/palettes/4.pal b/data/tilesets/primary/general/palettes/4.pal new file mode 100644 index 000000000..9b094a6aa --- /dev/null +++ b/data/tilesets/primary/general/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 0 +230 246 255 +189 222 255 +139 164 255 +106 164 230 +74 148 222 +74 123 222 +82 156 230 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +49 115 197 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/primary/general/palettes/5.pal b/data/tilesets/primary/general/palettes/5.pal new file mode 100644 index 000000000..c5a653979 --- /dev/null +++ b/data/tilesets/primary/general/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/primary/general/palettes/6.pal b/data/tilesets/primary/general/palettes/6.pal new file mode 100644 index 000000000..cdf41b298 --- /dev/null +++ b/data/tilesets/primary/general/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 0 +205 230 246 +180 213 255 +123 156 238 +98 139 213 +65 123 189 +49 98 180 +82 123 205 +238 246 246 +205 222 238 +49 115 197 +139 189 255 +115 164 255 +65 139 222 +57 115 222 +82 148 230 diff --git a/data/tilesets/primary/general/palettes/7.pal b/data/tilesets/primary/general/palettes/7.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/primary/general/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/primary/general/palettes/8.pal b/data/tilesets/primary/general/palettes/8.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/primary/general/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/primary/general/palettes/9.pal b/data/tilesets/primary/general/palettes/9.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/primary/general/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/primary/general/tiles.png b/data/tilesets/primary/general/tiles.png new file mode 100644 index 000000000..84ba7b2f9 Binary files /dev/null and b/data/tilesets/primary/general/tiles.png differ diff --git a/data/tilesets/secondary/82D4AAC/metatile_attributes.bin b/data/tilesets/secondary/82D4AAC/metatile_attributes.bin deleted file mode 100644 index 2ba2894bc..000000000 Binary files a/data/tilesets/secondary/82D4AAC/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4AAC/metatiles.bin b/data/tilesets/secondary/82D4AAC/metatiles.bin deleted file mode 100644 index 41db27015..000000000 Binary files a/data/tilesets/secondary/82D4AAC/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4AAC/palettes/0.pal b/data/tilesets/secondary/82D4AAC/palettes/0.pal deleted file mode 100644 index 42246e9ea..000000000 --- a/data/tilesets/secondary/82D4AAC/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 139 49 -57 82 0 -115 98 98 -65 57 49 -255 255 255 -139 213 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 189 139 -24 172 106 diff --git a/data/tilesets/secondary/82D4AAC/palettes/1.pal b/data/tilesets/secondary/82D4AAC/palettes/1.pal deleted file mode 100644 index 28db536cb..000000000 --- a/data/tilesets/secondary/82D4AAC/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -238 238 238 -222 222 230 -172 189 205 -131 131 139 -65 49 65 -139 230 189 -74 205 131 -65 172 115 -238 213 197 -222 189 164 -189 148 139 -156 115 115 -123 82 82 -90 57 74 -115 205 164 diff --git a/data/tilesets/secondary/82D4AAC/palettes/10.pal b/data/tilesets/secondary/82D4AAC/palettes/10.pal deleted file mode 100644 index 1958eff11..000000000 --- a/data/tilesets/secondary/82D4AAC/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 205 148 -246 246 255 -189 197 222 -156 172 189 -123 123 131 -90 90 115 -65 74 106 -156 205 246 -98 156 238 -98 156 238 -205 139 148 -189 123 131 -164 90 106 -139 65 82 -32 172 98 diff --git a/data/tilesets/secondary/82D4AAC/palettes/11.pal b/data/tilesets/secondary/82D4AAC/palettes/11.pal deleted file mode 100644 index 896c79281..000000000 --- a/data/tilesets/secondary/82D4AAC/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -238 255 255 -156 230 197 -148 222 189 -139 213 189 -255 0 255 -255 0 255 -255 0 255 -189 238 213 -115 205 164 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4AAC/palettes/12.pal b/data/tilesets/secondary/82D4AAC/palettes/12.pal deleted file mode 100644 index 2bfc45b6d..000000000 --- a/data/tilesets/secondary/82D4AAC/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -156 230 197 -148 222 189 -139 213 189 -238 213 197 -222 189 164 -189 148 139 -156 115 115 -123 82 82 -90 57 74 -189 238 213 diff --git a/data/tilesets/secondary/82D4AAC/palettes/13.pal b/data/tilesets/secondary/82D4AAC/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4AAC/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4AAC/palettes/14.pal b/data/tilesets/secondary/82D4AAC/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4AAC/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4AAC/palettes/15.pal b/data/tilesets/secondary/82D4AAC/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4AAC/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4AAC/palettes/2.pal b/data/tilesets/secondary/82D4AAC/palettes/2.pal deleted file mode 100644 index 937cec4da..000000000 --- a/data/tilesets/secondary/82D4AAC/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -24 41 82 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -115 82 74 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -197 172 139 diff --git a/data/tilesets/secondary/82D4AAC/palettes/3.pal b/data/tilesets/secondary/82D4AAC/palettes/3.pal deleted file mode 100644 index 6d1dfb5af..000000000 --- a/data/tilesets/secondary/82D4AAC/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 238 246 -189 139 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -172 32 41 diff --git a/data/tilesets/secondary/82D4AAC/palettes/4.pal b/data/tilesets/secondary/82D4AAC/palettes/4.pal deleted file mode 100644 index cde020d4e..000000000 --- a/data/tilesets/secondary/82D4AAC/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 255 255 -222 230 238 -230 213 164 -205 197 148 -222 180 164 -156 164 189 -82 106 213 -65 90 189 -57 82 156 -41 65 139 -172 197 230 -139 164 222 -106 131 213 -82 106 213 -189 148 139 diff --git a/data/tilesets/secondary/82D4AAC/palettes/5.pal b/data/tilesets/secondary/82D4AAC/palettes/5.pal deleted file mode 100644 index bdcc7b8ed..000000000 --- a/data/tilesets/secondary/82D4AAC/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -238 222 164 -222 205 131 -205 180 106 -180 139 74 -238 230 172 -246 238 205 -222 205 131 -255 0 255 -65 189 139 -115 205 164 diff --git a/data/tilesets/secondary/82D4AAC/palettes/6.pal b/data/tilesets/secondary/82D4AAC/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4AAC/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4AAC/palettes/7.pal b/data/tilesets/secondary/82D4AAC/palettes/7.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/82D4AAC/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4AAC/palettes/8.pal b/data/tilesets/secondary/82D4AAC/palettes/8.pal deleted file mode 100644 index dcecb9c40..000000000 --- a/data/tilesets/secondary/82D4AAC/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -246 246 255 -222 230 246 -189 197 222 -156 172 189 -123 123 131 -90 90 115 -65 74 106 -156 205 246 -98 156 238 -57 123 222 -255 205 180 -246 164 131 -222 139 106 -189 98 74 -123 205 164 diff --git a/data/tilesets/secondary/82D4AAC/palettes/9.pal b/data/tilesets/secondary/82D4AAC/palettes/9.pal deleted file mode 100644 index 90bb77517..000000000 --- a/data/tilesets/secondary/82D4AAC/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -246 246 255 -222 230 246 -189 197 222 -156 172 189 -123 123 131 -90 90 115 -65 74 106 -156 205 246 -98 156 238 -57 123 222 -246 238 197 -230 222 148 -213 189 106 -197 148 74 -222 205 123 diff --git a/data/tilesets/secondary/82D4AAC/tiles.png b/data/tilesets/secondary/82D4AAC/tiles.png deleted file mode 100644 index 771eed906..000000000 Binary files a/data/tilesets/secondary/82D4AAC/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4AC4/metatile_attributes.bin b/data/tilesets/secondary/82D4AC4/metatile_attributes.bin deleted file mode 100644 index ee2d7d5b3..000000000 Binary files a/data/tilesets/secondary/82D4AC4/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4AC4/metatiles.bin b/data/tilesets/secondary/82D4AC4/metatiles.bin deleted file mode 100644 index 297673a4b..000000000 Binary files a/data/tilesets/secondary/82D4AC4/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4AC4/palettes/0.pal b/data/tilesets/secondary/82D4AC4/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/82D4AC4/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D4AC4/palettes/1.pal b/data/tilesets/secondary/82D4AC4/palettes/1.pal deleted file mode 100644 index cf1123812..000000000 --- a/data/tilesets/secondary/82D4AC4/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/82D4AC4/palettes/10.pal b/data/tilesets/secondary/82D4AC4/palettes/10.pal deleted file mode 100644 index 4baf904ae..000000000 --- a/data/tilesets/secondary/82D4AC4/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -65 65 82 -74 74 90 -123 123 131 -106 139 205 -172 213 230 -115 98 65 -148 123 65 -238 172 65 -230 213 74 -65 123 123 -65 156 131 -65 205 156 -74 123 65 -90 172 74 -123 213 98 -172 238 106 diff --git a/data/tilesets/secondary/82D4AC4/palettes/11.pal b/data/tilesets/secondary/82D4AC4/palettes/11.pal deleted file mode 100644 index 2e92b3cc3..000000000 --- a/data/tilesets/secondary/82D4AC4/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -246 246 205 -213 213 213 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -246 230 131 -222 205 65 -172 238 106 -123 213 98 -106 197 82 -90 172 74 -74 123 65 -115 205 164 diff --git a/data/tilesets/secondary/82D4AC4/palettes/12.pal b/data/tilesets/secondary/82D4AC4/palettes/12.pal deleted file mode 100644 index 70ed40322..000000000 --- a/data/tilesets/secondary/82D4AC4/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -213 230 197 -156 172 139 -123 123 131 -90 90 115 -65 74 106 -222 172 65 -180 98 0 -131 65 0 -205 205 123 -164 164 57 -115 189 246 -74 148 213 -49 115 180 -189 197 164 diff --git a/data/tilesets/secondary/82D4AC4/palettes/13.pal b/data/tilesets/secondary/82D4AC4/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4AC4/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4AC4/palettes/14.pal b/data/tilesets/secondary/82D4AC4/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4AC4/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4AC4/palettes/15.pal b/data/tilesets/secondary/82D4AC4/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4AC4/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4AC4/palettes/2.pal b/data/tilesets/secondary/82D4AC4/palettes/2.pal deleted file mode 100644 index 372fb5d7c..000000000 --- a/data/tilesets/secondary/82D4AC4/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/82D4AC4/palettes/3.pal b/data/tilesets/secondary/82D4AC4/palettes/3.pal deleted file mode 100644 index 5a5e60211..000000000 --- a/data/tilesets/secondary/82D4AC4/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4AC4/palettes/4.pal b/data/tilesets/secondary/82D4AC4/palettes/4.pal deleted file mode 100644 index 229f9132c..000000000 --- a/data/tilesets/secondary/82D4AC4/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -222 230 255 -197 213 255 -164 197 238 -123 172 230 -90 148 197 -65 123 180 -90 164 205 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -32 98 139 -238 230 139 -222 197 139 -205 180 106 diff --git a/data/tilesets/secondary/82D4AC4/palettes/5.pal b/data/tilesets/secondary/82D4AC4/palettes/5.pal deleted file mode 100644 index 215dd1272..000000000 --- a/data/tilesets/secondary/82D4AC4/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4AC4/palettes/6.pal b/data/tilesets/secondary/82D4AC4/palettes/6.pal deleted file mode 100644 index 7e7862a19..000000000 --- a/data/tilesets/secondary/82D4AC4/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -222 230 255 -197 213 255 -164 197 238 -123 172 230 -41 82 164 -41 57 131 -74 123 197 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -32 98 139 -238 230 139 -222 197 139 -205 180 106 diff --git a/data/tilesets/secondary/82D4AC4/palettes/7.pal b/data/tilesets/secondary/82D4AC4/palettes/7.pal deleted file mode 100644 index 93518605a..000000000 --- a/data/tilesets/secondary/82D4AC4/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/82D4AC4/palettes/8.pal b/data/tilesets/secondary/82D4AC4/palettes/8.pal deleted file mode 100644 index 219129eba..000000000 --- a/data/tilesets/secondary/82D4AC4/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -65 65 82 -74 74 90 -123 123 131 -106 139 205 -115 197 238 -164 230 238 -131 115 57 -180 172 65 -222 205 65 -246 246 205 -213 205 205 -90 90 115 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4AC4/palettes/9.pal b/data/tilesets/secondary/82D4AC4/palettes/9.pal deleted file mode 100644 index 0aa2b58dc..000000000 --- a/data/tilesets/secondary/82D4AC4/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 205 65 -222 172 65 -180 98 0 -213 213 139 -189 189 115 -148 148 82 -255 0 255 -115 205 164 diff --git a/data/tilesets/secondary/82D4AC4/tiles.png b/data/tilesets/secondary/82D4AC4/tiles.png deleted file mode 100644 index 39b80d8f9..000000000 Binary files a/data/tilesets/secondary/82D4AC4/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4ADC/metatile_attributes.bin b/data/tilesets/secondary/82D4ADC/metatile_attributes.bin deleted file mode 100644 index 4e19ca185..000000000 Binary files a/data/tilesets/secondary/82D4ADC/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4ADC/metatiles.bin b/data/tilesets/secondary/82D4ADC/metatiles.bin deleted file mode 100644 index a23224773..000000000 Binary files a/data/tilesets/secondary/82D4ADC/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4ADC/palettes/0.pal b/data/tilesets/secondary/82D4ADC/palettes/0.pal deleted file mode 100644 index 620015e77..000000000 --- a/data/tilesets/secondary/82D4ADC/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 139 49 -57 82 0 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D4ADC/palettes/1.pal b/data/tilesets/secondary/82D4ADC/palettes/1.pal deleted file mode 100644 index 60de8c7ad..000000000 --- a/data/tilesets/secondary/82D4ADC/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -255 0 255 -255 0 255 -238 213 197 -222 189 164 -189 148 139 -156 115 115 -123 82 82 -90 57 74 -115 205 164 diff --git a/data/tilesets/secondary/82D4ADC/palettes/10.pal b/data/tilesets/secondary/82D4ADC/palettes/10.pal deleted file mode 100644 index 76fda8006..000000000 --- a/data/tilesets/secondary/82D4ADC/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -230 238 255 -180 197 213 -131 148 164 -123 123 131 -90 90 115 -57 65 98 -255 246 238 -213 197 189 -172 156 148 -131 123 115 -246 213 246 -238 189 213 -197 115 180 -172 106 131 diff --git a/data/tilesets/secondary/82D4ADC/palettes/11.pal b/data/tilesets/secondary/82D4ADC/palettes/11.pal deleted file mode 100644 index 3f8fdc519..000000000 --- a/data/tilesets/secondary/82D4ADC/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -123 123 131 -230 238 255 -197 205 222 -164 180 197 -156 205 246 -98 156 238 -57 65 98 -255 246 238 -213 197 189 -172 156 148 -131 123 115 -57 123 222 -238 238 246 -213 222 222 -197 197 213 diff --git a/data/tilesets/secondary/82D4ADC/palettes/12.pal b/data/tilesets/secondary/82D4ADC/palettes/12.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/82D4ADC/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4ADC/palettes/13.pal b/data/tilesets/secondary/82D4ADC/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4ADC/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4ADC/palettes/14.pal b/data/tilesets/secondary/82D4ADC/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4ADC/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4ADC/palettes/15.pal b/data/tilesets/secondary/82D4ADC/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4ADC/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4ADC/palettes/2.pal b/data/tilesets/secondary/82D4ADC/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/82D4ADC/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/82D4ADC/palettes/3.pal b/data/tilesets/secondary/82D4ADC/palettes/3.pal deleted file mode 100644 index 9581f2cd8..000000000 --- a/data/tilesets/secondary/82D4ADC/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 131 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4ADC/palettes/4.pal b/data/tilesets/secondary/82D4ADC/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/82D4ADC/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/82D4ADC/palettes/5.pal b/data/tilesets/secondary/82D4ADC/palettes/5.pal deleted file mode 100644 index 3a2db72a7..000000000 --- a/data/tilesets/secondary/82D4ADC/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -222 205 131 -205 180 106 -180 139 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4ADC/palettes/6.pal b/data/tilesets/secondary/82D4ADC/palettes/6.pal deleted file mode 100644 index 93518605a..000000000 --- a/data/tilesets/secondary/82D4ADC/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/82D4ADC/palettes/7.pal b/data/tilesets/secondary/82D4ADC/palettes/7.pal deleted file mode 100644 index 93518605a..000000000 --- a/data/tilesets/secondary/82D4ADC/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/82D4ADC/palettes/8.pal b/data/tilesets/secondary/82D4ADC/palettes/8.pal deleted file mode 100644 index d404706ab..000000000 --- a/data/tilesets/secondary/82D4ADC/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -24 41 82 -246 246 255 -230 238 255 -197 205 222 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 205 246 -98 156 238 -57 123 222 -222 106 98 -205 82 74 -222 230 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4ADC/palettes/9.pal b/data/tilesets/secondary/82D4ADC/palettes/9.pal deleted file mode 100644 index cacf892a6..000000000 --- a/data/tilesets/secondary/82D4ADC/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 205 246 -98 156 238 -57 123 222 -222 197 139 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4ADC/tiles.png b/data/tilesets/secondary/82D4ADC/tiles.png deleted file mode 100644 index d3148ba5a..000000000 Binary files a/data/tilesets/secondary/82D4ADC/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4AF4/metatile_attributes.bin b/data/tilesets/secondary/82D4AF4/metatile_attributes.bin deleted file mode 100644 index 7de4de077..000000000 Binary files a/data/tilesets/secondary/82D4AF4/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4AF4/metatiles.bin b/data/tilesets/secondary/82D4AF4/metatiles.bin deleted file mode 100644 index b810e7996..000000000 Binary files a/data/tilesets/secondary/82D4AF4/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4AF4/palettes/0.pal b/data/tilesets/secondary/82D4AF4/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/82D4AF4/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D4AF4/palettes/1.pal b/data/tilesets/secondary/82D4AF4/palettes/1.pal deleted file mode 100644 index 31a636983..000000000 --- a/data/tilesets/secondary/82D4AF4/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/82D4AF4/palettes/10.pal b/data/tilesets/secondary/82D4AF4/palettes/10.pal deleted file mode 100644 index 536972f8f..000000000 --- a/data/tilesets/secondary/82D4AF4/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -255 238 197 -222 205 172 -180 164 123 -123 123 131 -90 90 115 -65 74 106 -123 180 222 -180 222 255 -255 213 164 -230 189 82 -213 164 57 -205 139 32 -172 90 16 -115 205 164 diff --git a/data/tilesets/secondary/82D4AF4/palettes/11.pal b/data/tilesets/secondary/82D4AF4/palettes/11.pal deleted file mode 100644 index 986335b74..000000000 --- a/data/tilesets/secondary/82D4AF4/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -255 238 197 -222 205 172 -180 164 123 -123 123 131 -90 90 115 -65 74 106 -230 222 131 -189 180 82 -180 230 172 -139 213 131 -106 180 106 -90 164 90 -57 131 65 -115 205 164 diff --git a/data/tilesets/secondary/82D4AF4/palettes/12.pal b/data/tilesets/secondary/82D4AF4/palettes/12.pal deleted file mode 100644 index c44bc32b5..000000000 --- a/data/tilesets/secondary/82D4AF4/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -238 222 180 -205 189 156 -180 164 123 -123 123 131 -90 90 115 -65 74 106 -139 197 98 -106 164 65 -172 222 238 -148 197 213 -115 164 189 -90 139 164 -74 123 148 -115 205 164 diff --git a/data/tilesets/secondary/82D4AF4/palettes/13.pal b/data/tilesets/secondary/82D4AF4/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4AF4/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4AF4/palettes/14.pal b/data/tilesets/secondary/82D4AF4/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4AF4/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4AF4/palettes/15.pal b/data/tilesets/secondary/82D4AF4/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4AF4/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4AF4/palettes/2.pal b/data/tilesets/secondary/82D4AF4/palettes/2.pal deleted file mode 100644 index 372fb5d7c..000000000 --- a/data/tilesets/secondary/82D4AF4/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/82D4AF4/palettes/3.pal b/data/tilesets/secondary/82D4AF4/palettes/3.pal deleted file mode 100644 index 973765509..000000000 --- a/data/tilesets/secondary/82D4AF4/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4AF4/palettes/4.pal b/data/tilesets/secondary/82D4AF4/palettes/4.pal deleted file mode 100644 index 91fdcabdf..000000000 --- a/data/tilesets/secondary/82D4AF4/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -213 238 255 -172 205 255 -139 180 238 -106 156 230 -74 139 189 -65 123 189 -82 139 205 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -49 115 172 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/82D4AF4/palettes/5.pal b/data/tilesets/secondary/82D4AF4/palettes/5.pal deleted file mode 100644 index 0edb843f5..000000000 --- a/data/tilesets/secondary/82D4AF4/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4AF4/palettes/6.pal b/data/tilesets/secondary/82D4AF4/palettes/6.pal deleted file mode 100644 index f8ebbc6dc..000000000 --- a/data/tilesets/secondary/82D4AF4/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -213 238 255 -172 205 255 -139 180 238 -106 156 230 -65 123 172 -41 98 156 -74 115 197 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -49 115 172 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/82D4AF4/palettes/7.pal b/data/tilesets/secondary/82D4AF4/palettes/7.pal deleted file mode 100644 index 93518605a..000000000 --- a/data/tilesets/secondary/82D4AF4/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/82D4AF4/palettes/8.pal b/data/tilesets/secondary/82D4AF4/palettes/8.pal deleted file mode 100644 index ae3dd3f0d..000000000 --- a/data/tilesets/secondary/82D4AF4/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -90 139 164 -115 164 189 -139 189 213 -172 222 238 -139 197 98 -156 222 106 -189 230 139 -222 205 172 -246 230 189 -255 246 213 -164 164 180 -82 82 106 -123 123 139 -205 205 222 -255 255 255 diff --git a/data/tilesets/secondary/82D4AF4/palettes/9.pal b/data/tilesets/secondary/82D4AF4/palettes/9.pal deleted file mode 100644 index 3ed18e08f..000000000 --- a/data/tilesets/secondary/82D4AF4/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -180 106 90 -222 180 65 -238 164 156 -246 238 131 -230 205 98 -205 131 123 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -164 164 180 -82 82 106 -123 123 139 -205 205 222 -255 255 255 diff --git a/data/tilesets/secondary/82D4AF4/tiles.png b/data/tilesets/secondary/82D4AF4/tiles.png deleted file mode 100644 index 737d3dd7f..000000000 Binary files a/data/tilesets/secondary/82D4AF4/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4B0C/metatile_attributes.bin b/data/tilesets/secondary/82D4B0C/metatile_attributes.bin deleted file mode 100644 index d103d7155..000000000 Binary files a/data/tilesets/secondary/82D4B0C/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4B0C/metatiles.bin b/data/tilesets/secondary/82D4B0C/metatiles.bin deleted file mode 100644 index f69885645..000000000 Binary files a/data/tilesets/secondary/82D4B0C/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4B0C/palettes/0.pal b/data/tilesets/secondary/82D4B0C/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/82D4B0C/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D4B0C/palettes/1.pal b/data/tilesets/secondary/82D4B0C/palettes/1.pal deleted file mode 100644 index d8a4e7757..000000000 --- a/data/tilesets/secondary/82D4B0C/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/82D4B0C/palettes/10.pal b/data/tilesets/secondary/82D4B0C/palettes/10.pal deleted file mode 100644 index b97e9df4b..000000000 --- a/data/tilesets/secondary/82D4B0C/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -255 255 255 -213 230 222 -148 164 180 -123 123 131 -90 90 115 -82 82 106 -213 238 255 -164 189 222 -123 148 180 -255 238 139 -222 180 65 -255 255 189 -164 98 98 -213 148 148 -197 123 131 diff --git a/data/tilesets/secondary/82D4B0C/palettes/11.pal b/data/tilesets/secondary/82D4B0C/palettes/11.pal deleted file mode 100644 index f71181976..000000000 --- a/data/tilesets/secondary/82D4B0C/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -255 255 255 -255 0 255 -255 0 255 -123 123 131 -255 0 255 -82 82 106 -213 238 255 -164 189 222 -123 148 180 -255 238 139 -222 180 65 -255 255 189 -156 213 255 -115 189 246 -98 164 222 diff --git a/data/tilesets/secondary/82D4B0C/palettes/12.pal b/data/tilesets/secondary/82D4B0C/palettes/12.pal deleted file mode 100644 index 0cdcab8c2..000000000 --- a/data/tilesets/secondary/82D4B0C/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -246 246 255 -222 205 246 -205 172 255 -172 139 213 -123 123 131 -90 90 115 -65 74 106 -230 222 131 -213 189 98 -222 197 255 -172 139 213 -148 115 189 -139 106 180 -255 246 164 -172 148 82 diff --git a/data/tilesets/secondary/82D4B0C/palettes/13.pal b/data/tilesets/secondary/82D4B0C/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4B0C/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4B0C/palettes/14.pal b/data/tilesets/secondary/82D4B0C/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4B0C/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4B0C/palettes/15.pal b/data/tilesets/secondary/82D4B0C/palettes/15.pal deleted file mode 100644 index 3973e491a..000000000 --- a/data/tilesets/secondary/82D4B0C/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -246 230 172 -246 213 180 -222 189 164 -180 148 123 -139 98 90 -90 57 74 -123 123 131 -65 74 106 -205 222 238 diff --git a/data/tilesets/secondary/82D4B0C/palettes/2.pal b/data/tilesets/secondary/82D4B0C/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/82D4B0C/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/82D4B0C/palettes/3.pal b/data/tilesets/secondary/82D4B0C/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/secondary/82D4B0C/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4B0C/palettes/4.pal b/data/tilesets/secondary/82D4B0C/palettes/4.pal deleted file mode 100644 index 07dcd957c..000000000 --- a/data/tilesets/secondary/82D4B0C/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 255 255 -172 222 255 -148 189 238 -106 156 230 -57 148 197 -32 131 172 -82 148 213 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -230 213 148 -238 230 139 -222 197 139 -213 189 106 diff --git a/data/tilesets/secondary/82D4B0C/palettes/5.pal b/data/tilesets/secondary/82D4B0C/palettes/5.pal deleted file mode 100644 index c5a653979..000000000 --- a/data/tilesets/secondary/82D4B0C/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4B0C/palettes/6.pal b/data/tilesets/secondary/82D4B0C/palettes/6.pal deleted file mode 100644 index 0dba59a72..000000000 --- a/data/tilesets/secondary/82D4B0C/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -222 255 255 -172 222 255 -148 189 238 -106 156 230 -41 90 172 -41 57 148 -74 123 197 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -230 213 148 -238 230 139 -222 197 139 -213 189 106 diff --git a/data/tilesets/secondary/82D4B0C/palettes/7.pal b/data/tilesets/secondary/82D4B0C/palettes/7.pal deleted file mode 100644 index 93518605a..000000000 --- a/data/tilesets/secondary/82D4B0C/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/82D4B0C/palettes/8.pal b/data/tilesets/secondary/82D4B0C/palettes/8.pal deleted file mode 100644 index 376749664..000000000 --- a/data/tilesets/secondary/82D4B0C/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -115 205 164 -148 164 180 -123 123 131 -65 74 106 -205 82 74 -172 32 41 -255 246 189 -238 230 156 -222 205 131 -189 164 90 -148 131 49 -123 90 24 -123 123 131 -65 74 106 -205 222 238 diff --git a/data/tilesets/secondary/82D4B0C/palettes/9.pal b/data/tilesets/secondary/82D4B0C/palettes/9.pal deleted file mode 100644 index 82b469a66..000000000 --- a/data/tilesets/secondary/82D4B0C/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -255 255 255 -230 246 238 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -172 172 106 -213 213 148 -180 205 180 -148 180 148 -131 164 131 -106 139 106 -197 222 197 -139 172 139 -90 115 90 diff --git a/data/tilesets/secondary/82D4B0C/tiles.png b/data/tilesets/secondary/82D4B0C/tiles.png deleted file mode 100644 index 66bd81f8b..000000000 Binary files a/data/tilesets/secondary/82D4B0C/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4B24/metatile_attributes.bin b/data/tilesets/secondary/82D4B24/metatile_attributes.bin deleted file mode 100644 index 1136f644a..000000000 Binary files a/data/tilesets/secondary/82D4B24/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4B24/metatiles.bin b/data/tilesets/secondary/82D4B24/metatiles.bin deleted file mode 100644 index c7978128e..000000000 Binary files a/data/tilesets/secondary/82D4B24/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4B24/palettes/0.pal b/data/tilesets/secondary/82D4B24/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/82D4B24/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D4B24/palettes/1.pal b/data/tilesets/secondary/82D4B24/palettes/1.pal deleted file mode 100644 index 09828f4f1..000000000 --- a/data/tilesets/secondary/82D4B24/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -123 123 131 -32 49 57 -230 238 238 -90 189 139 -90 90 115 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -123 74 74 -90 57 65 -115 205 164 diff --git a/data/tilesets/secondary/82D4B24/palettes/10.pal b/data/tilesets/secondary/82D4B24/palettes/10.pal deleted file mode 100644 index 892aae6ed..000000000 --- a/data/tilesets/secondary/82D4B24/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -115 82 41 -255 189 32 -222 156 0 -189 106 57 -123 123 131 -90 90 115 -65 74 106 -189 255 139 -131 213 98 -106 180 98 -255 230 131 -238 205 123 -197 164 90 -131 164 197 -255 0 255 diff --git a/data/tilesets/secondary/82D4B24/palettes/11.pal b/data/tilesets/secondary/82D4B24/palettes/11.pal deleted file mode 100644 index b2a405273..000000000 --- a/data/tilesets/secondary/82D4B24/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4B24/palettes/12.pal b/data/tilesets/secondary/82D4B24/palettes/12.pal deleted file mode 100644 index f124929b4..000000000 --- a/data/tilesets/secondary/82D4B24/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 238 189 -222 205 131 -205 180 106 -180 139 74 -246 246 255 -172 189 205 -222 106 98 -213 164 156 -213 148 49 -65 74 106 -123 123 131 -16 123 74 -49 148 106 -98 189 148 -164 230 197 diff --git a/data/tilesets/secondary/82D4B24/palettes/13.pal b/data/tilesets/secondary/82D4B24/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4B24/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4B24/palettes/14.pal b/data/tilesets/secondary/82D4B24/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4B24/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4B24/palettes/15.pal b/data/tilesets/secondary/82D4B24/palettes/15.pal deleted file mode 100644 index ac0d32eb0..000000000 --- a/data/tilesets/secondary/82D4B24/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -246 222 90 -246 197 65 -238 164 57 -172 189 205 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4B24/palettes/2.pal b/data/tilesets/secondary/82D4B24/palettes/2.pal deleted file mode 100644 index 372fb5d7c..000000000 --- a/data/tilesets/secondary/82D4B24/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/82D4B24/palettes/3.pal b/data/tilesets/secondary/82D4B24/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/secondary/82D4B24/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4B24/palettes/4.pal b/data/tilesets/secondary/82D4B24/palettes/4.pal deleted file mode 100644 index 5871a448c..000000000 --- a/data/tilesets/secondary/82D4B24/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -230 246 255 -189 222 255 -139 189 255 -115 164 255 -65 139 222 -57 115 222 -82 148 230 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -49 115 197 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/82D4B24/palettes/5.pal b/data/tilesets/secondary/82D4B24/palettes/5.pal deleted file mode 100644 index c5a653979..000000000 --- a/data/tilesets/secondary/82D4B24/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4B24/palettes/6.pal b/data/tilesets/secondary/82D4B24/palettes/6.pal deleted file mode 100644 index 9bad44649..000000000 --- a/data/tilesets/secondary/82D4B24/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -205 230 246 -180 213 255 -123 180 246 -98 148 230 -65 123 189 -49 98 180 -82 131 222 -213 230 238 -172 189 205 -123 123 131 -90 90 115 -238 246 246 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/82D4B24/palettes/7.pal b/data/tilesets/secondary/82D4B24/palettes/7.pal deleted file mode 100644 index 17b1a0ed2..000000000 --- a/data/tilesets/secondary/82D4B24/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/82D4B24/palettes/8.pal b/data/tilesets/secondary/82D4B24/palettes/8.pal deleted file mode 100644 index 7179b91bd..000000000 --- a/data/tilesets/secondary/82D4B24/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -255 246 172 -255 189 32 -222 156 0 -189 106 57 -123 123 131 -90 90 115 -65 74 106 -255 255 255 -205 205 222 -255 230 131 -238 205 123 -197 164 90 -131 164 197 -255 0 255 -180 156 49 diff --git a/data/tilesets/secondary/82D4B24/palettes/9.pal b/data/tilesets/secondary/82D4B24/palettes/9.pal deleted file mode 100644 index 746dac7da..000000000 --- a/data/tilesets/secondary/82D4B24/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -74 123 180 -90 164 213 -57 90 148 -213 148 49 -238 180 82 -205 205 222 -115 189 246 -74 131 197 diff --git a/data/tilesets/secondary/82D4B24/tiles.png b/data/tilesets/secondary/82D4B24/tiles.png deleted file mode 100644 index 8cfa9b4dd..000000000 Binary files a/data/tilesets/secondary/82D4B24/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4B3C/metatile_attributes.bin b/data/tilesets/secondary/82D4B3C/metatile_attributes.bin deleted file mode 100644 index 5dd139155..000000000 Binary files a/data/tilesets/secondary/82D4B3C/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4B3C/metatiles.bin b/data/tilesets/secondary/82D4B3C/metatiles.bin deleted file mode 100644 index 3bfb9d239..000000000 Binary files a/data/tilesets/secondary/82D4B3C/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4B3C/palettes/0.pal b/data/tilesets/secondary/82D4B3C/palettes/0.pal deleted file mode 100644 index 7af5bb7d2..000000000 --- a/data/tilesets/secondary/82D4B3C/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 82 0 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D4B3C/palettes/1.pal b/data/tilesets/secondary/82D4B3C/palettes/1.pal deleted file mode 100644 index 391d1e3d1..000000000 --- a/data/tilesets/secondary/82D4B3C/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 189 164 -189 148 139 -156 115 115 -123 82 82 -90 57 74 -115 205 164 diff --git a/data/tilesets/secondary/82D4B3C/palettes/10.pal b/data/tilesets/secondary/82D4B3C/palettes/10.pal deleted file mode 100644 index 361b133e6..000000000 --- a/data/tilesets/secondary/82D4B3C/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -255 255 255 -222 222 230 -123 123 131 -82 82 106 -238 230 255 -222 197 255 -180 148 222 -131 106 172 -255 0 255 -115 189 246 -74 148 205 -41 115 172 -148 164 180 -246 238 148 -213 172 74 diff --git a/data/tilesets/secondary/82D4B3C/palettes/11.pal b/data/tilesets/secondary/82D4B3C/palettes/11.pal deleted file mode 100644 index 00caf8dfc..000000000 --- a/data/tilesets/secondary/82D4B3C/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 255 255 -180 205 213 -148 164 180 -123 123 131 -82 82 106 -205 222 238 -197 213 222 -164 180 197 -222 180 82 -230 238 238 -255 205 139 -222 106 98 -197 74 65 -98 189 148 -115 205 164 diff --git a/data/tilesets/secondary/82D4B3C/palettes/12.pal b/data/tilesets/secondary/82D4B3C/palettes/12.pal deleted file mode 100644 index 4257575ae..000000000 --- a/data/tilesets/secondary/82D4B3C/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -213 222 164 -180 189 131 -139 148 90 -123 123 131 -90 90 115 -65 74 106 -180 148 222 -131 106 172 -189 230 222 -148 205 180 -115 172 148 -106 148 139 -74 115 106 -115 205 164 diff --git a/data/tilesets/secondary/82D4B3C/palettes/13.pal b/data/tilesets/secondary/82D4B3C/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4B3C/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4B3C/palettes/14.pal b/data/tilesets/secondary/82D4B3C/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4B3C/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4B3C/palettes/15.pal b/data/tilesets/secondary/82D4B3C/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4B3C/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4B3C/palettes/2.pal b/data/tilesets/secondary/82D4B3C/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/82D4B3C/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/82D4B3C/palettes/3.pal b/data/tilesets/secondary/82D4B3C/palettes/3.pal deleted file mode 100644 index 973765509..000000000 --- a/data/tilesets/secondary/82D4B3C/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4B3C/palettes/4.pal b/data/tilesets/secondary/82D4B3C/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/82D4B3C/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/82D4B3C/palettes/5.pal b/data/tilesets/secondary/82D4B3C/palettes/5.pal deleted file mode 100644 index 3a2db72a7..000000000 --- a/data/tilesets/secondary/82D4B3C/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -222 205 131 -205 180 106 -180 139 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4B3C/palettes/6.pal b/data/tilesets/secondary/82D4B3C/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4B3C/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4B3C/palettes/7.pal b/data/tilesets/secondary/82D4B3C/palettes/7.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4B3C/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4B3C/palettes/8.pal b/data/tilesets/secondary/82D4B3C/palettes/8.pal deleted file mode 100644 index 86930c1d1..000000000 --- a/data/tilesets/secondary/82D4B3C/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -255 255 255 -222 222 230 -123 123 131 -82 82 106 -197 238 255 -172 213 255 -123 164 222 -98 139 189 -246 230 139 -197 180 115 -172 156 90 -123 164 189 -148 189 238 -255 205 139 -230 131 115 diff --git a/data/tilesets/secondary/82D4B3C/palettes/9.pal b/data/tilesets/secondary/82D4B3C/palettes/9.pal deleted file mode 100644 index 5dc82505a..000000000 --- a/data/tilesets/secondary/82D4B3C/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -255 255 255 -222 222 230 -123 123 131 -82 82 106 -197 197 205 -255 213 164 -222 123 82 -189 90 57 -189 230 222 -131 189 164 -106 148 139 -246 238 189 -222 213 156 -213 189 123 -197 180 106 diff --git a/data/tilesets/secondary/82D4B3C/tiles.png b/data/tilesets/secondary/82D4B3C/tiles.png deleted file mode 100644 index db18cb938..000000000 Binary files a/data/tilesets/secondary/82D4B3C/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4B54/metatile_attributes.bin b/data/tilesets/secondary/82D4B54/metatile_attributes.bin deleted file mode 100644 index 3e370a747..000000000 Binary files a/data/tilesets/secondary/82D4B54/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4B54/metatiles.bin b/data/tilesets/secondary/82D4B54/metatiles.bin deleted file mode 100644 index 0e0e722da..000000000 Binary files a/data/tilesets/secondary/82D4B54/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4B54/palettes/0.pal b/data/tilesets/secondary/82D4B54/palettes/0.pal deleted file mode 100644 index 5fb8bdb01..000000000 --- a/data/tilesets/secondary/82D4B54/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -189 255 139 -131 213 98 -57 139 49 -57 82 0 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D4B54/palettes/1.pal b/data/tilesets/secondary/82D4B54/palettes/1.pal deleted file mode 100644 index 391d1e3d1..000000000 --- a/data/tilesets/secondary/82D4B54/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 189 164 -189 148 139 -156 115 115 -123 82 82 -90 57 74 -115 205 164 diff --git a/data/tilesets/secondary/82D4B54/palettes/10.pal b/data/tilesets/secondary/82D4B54/palettes/10.pal deleted file mode 100644 index d82bb0391..000000000 --- a/data/tilesets/secondary/82D4B54/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -65 74 106 -123 123 131 -180 164 90 -0 0 255 -255 238 197 -238 238 205 -189 180 172 -172 172 156 -205 205 172 -139 123 49 -164 148 74 -205 197 123 -230 213 139 -106 172 123 -123 197 139 diff --git a/data/tilesets/secondary/82D4B54/palettes/11.pal b/data/tilesets/secondary/82D4B54/palettes/11.pal deleted file mode 100644 index cc0cf52cf..000000000 --- a/data/tilesets/secondary/82D4B54/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -197 197 197 -180 238 82 -139 213 82 -90 164 49 -57 90 90 -74 123 74 -90 98 49 -139 131 49 -65 57 49 -57 139 98 -123 197 49 -123 197 82 -57 139 49 -115 205 164 -57 172 156 -255 0 255 diff --git a/data/tilesets/secondary/82D4B54/palettes/12.pal b/data/tilesets/secondary/82D4B54/palettes/12.pal deleted file mode 100644 index ebcfeb596..000000000 --- a/data/tilesets/secondary/82D4B54/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 131 -205 180 106 -238 180 139 -222 148 131 -189 123 115 -139 90 82 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4B54/palettes/13.pal b/data/tilesets/secondary/82D4B54/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4B54/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4B54/palettes/14.pal b/data/tilesets/secondary/82D4B54/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4B54/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4B54/palettes/15.pal b/data/tilesets/secondary/82D4B54/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4B54/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4B54/palettes/2.pal b/data/tilesets/secondary/82D4B54/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/82D4B54/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/82D4B54/palettes/3.pal b/data/tilesets/secondary/82D4B54/palettes/3.pal deleted file mode 100644 index 9581f2cd8..000000000 --- a/data/tilesets/secondary/82D4B54/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 131 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4B54/palettes/4.pal b/data/tilesets/secondary/82D4B54/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/82D4B54/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/82D4B54/palettes/5.pal b/data/tilesets/secondary/82D4B54/palettes/5.pal deleted file mode 100644 index 3a2db72a7..000000000 --- a/data/tilesets/secondary/82D4B54/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -222 205 131 -205 180 106 -180 139 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4B54/palettes/6.pal b/data/tilesets/secondary/82D4B54/palettes/6.pal deleted file mode 100644 index 93518605a..000000000 --- a/data/tilesets/secondary/82D4B54/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/82D4B54/palettes/7.pal b/data/tilesets/secondary/82D4B54/palettes/7.pal deleted file mode 100644 index 93518605a..000000000 --- a/data/tilesets/secondary/82D4B54/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/82D4B54/palettes/8.pal b/data/tilesets/secondary/82D4B54/palettes/8.pal deleted file mode 100644 index 8a0a9a1e0..000000000 --- a/data/tilesets/secondary/82D4B54/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -65 74 106 -123 123 131 -98 90 82 -115 106 98 -148 131 131 -180 156 131 -189 172 98 -213 205 131 -238 222 139 -90 106 164 -98 139 230 -115 205 255 -255 0 255 -255 0 255 -98 106 115 diff --git a/data/tilesets/secondary/82D4B54/palettes/9.pal b/data/tilesets/secondary/82D4B54/palettes/9.pal deleted file mode 100644 index d39bbb454..000000000 --- a/data/tilesets/secondary/82D4B54/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -65 74 106 -123 123 131 -139 90 82 -189 123 115 -222 148 131 -255 197 156 -156 156 172 -189 197 213 -230 238 238 -49 98 90 -74 148 131 -82 197 148 -106 230 172 -164 238 172 -98 106 115 diff --git a/data/tilesets/secondary/82D4B54/tiles.png b/data/tilesets/secondary/82D4B54/tiles.png deleted file mode 100644 index a9e9e13e8..000000000 Binary files a/data/tilesets/secondary/82D4B54/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4B6C/metatile_attributes.bin b/data/tilesets/secondary/82D4B6C/metatile_attributes.bin deleted file mode 100644 index d2c655c41..000000000 Binary files a/data/tilesets/secondary/82D4B6C/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4B6C/metatiles.bin b/data/tilesets/secondary/82D4B6C/metatiles.bin deleted file mode 100644 index 0abe4b18d..000000000 Binary files a/data/tilesets/secondary/82D4B6C/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4B6C/palettes/0.pal b/data/tilesets/secondary/82D4B6C/palettes/0.pal deleted file mode 100644 index 9dcb673aa..000000000 --- a/data/tilesets/secondary/82D4B6C/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -189 255 139 -131 213 98 -57 148 49 -57 82 0 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D4B6C/palettes/1.pal b/data/tilesets/secondary/82D4B6C/palettes/1.pal deleted file mode 100644 index 391d1e3d1..000000000 --- a/data/tilesets/secondary/82D4B6C/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 189 164 -189 148 139 -156 115 115 -123 82 82 -90 57 74 -115 205 164 diff --git a/data/tilesets/secondary/82D4B6C/palettes/10.pal b/data/tilesets/secondary/82D4B6C/palettes/10.pal deleted file mode 100644 index 608bbc2cf..000000000 --- a/data/tilesets/secondary/82D4B6C/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4B6C/palettes/11.pal b/data/tilesets/secondary/82D4B6C/palettes/11.pal deleted file mode 100644 index 608bbc2cf..000000000 --- a/data/tilesets/secondary/82D4B6C/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4B6C/palettes/12.pal b/data/tilesets/secondary/82D4B6C/palettes/12.pal deleted file mode 100644 index 608bbc2cf..000000000 --- a/data/tilesets/secondary/82D4B6C/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4B6C/palettes/13.pal b/data/tilesets/secondary/82D4B6C/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4B6C/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4B6C/palettes/14.pal b/data/tilesets/secondary/82D4B6C/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4B6C/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4B6C/palettes/15.pal b/data/tilesets/secondary/82D4B6C/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4B6C/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4B6C/palettes/2.pal b/data/tilesets/secondary/82D4B6C/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/82D4B6C/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/82D4B6C/palettes/3.pal b/data/tilesets/secondary/82D4B6C/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/secondary/82D4B6C/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4B6C/palettes/4.pal b/data/tilesets/secondary/82D4B6C/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/82D4B6C/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/82D4B6C/palettes/5.pal b/data/tilesets/secondary/82D4B6C/palettes/5.pal deleted file mode 100644 index 3a2db72a7..000000000 --- a/data/tilesets/secondary/82D4B6C/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -222 205 131 -205 180 106 -180 139 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4B6C/palettes/6.pal b/data/tilesets/secondary/82D4B6C/palettes/6.pal deleted file mode 100644 index 93518605a..000000000 --- a/data/tilesets/secondary/82D4B6C/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/82D4B6C/palettes/7.pal b/data/tilesets/secondary/82D4B6C/palettes/7.pal deleted file mode 100644 index 93518605a..000000000 --- a/data/tilesets/secondary/82D4B6C/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/82D4B6C/palettes/8.pal b/data/tilesets/secondary/82D4B6C/palettes/8.pal deleted file mode 100644 index f734cd166..000000000 --- a/data/tilesets/secondary/82D4B6C/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -139 82 57 -164 106 82 -205 148 123 -222 164 139 -172 189 238 -213 222 246 -156 131 90 -189 164 115 -222 205 156 -255 238 189 -164 164 180 -82 82 106 -123 123 139 -205 205 222 -255 255 255 diff --git a/data/tilesets/secondary/82D4B6C/palettes/9.pal b/data/tilesets/secondary/82D4B6C/palettes/9.pal deleted file mode 100644 index ca26d1b08..000000000 --- a/data/tilesets/secondary/82D4B6C/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -255 255 246 -230 230 189 -197 197 156 -172 172 131 -123 123 82 -65 74 106 -123 123 131 -123 123 131 -98 164 222 -74 131 197 -139 222 189 -106 189 156 -106 189 156 -74 156 123 -90 90 115 diff --git a/data/tilesets/secondary/82D4B6C/tiles.png b/data/tilesets/secondary/82D4B6C/tiles.png deleted file mode 100644 index ddb9ad0cb..000000000 Binary files a/data/tilesets/secondary/82D4B6C/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4B84/metatile_attributes.bin b/data/tilesets/secondary/82D4B84/metatile_attributes.bin deleted file mode 100644 index f840f6486..000000000 Binary files a/data/tilesets/secondary/82D4B84/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4B84/metatiles.bin b/data/tilesets/secondary/82D4B84/metatiles.bin deleted file mode 100644 index bbb7ffbee..000000000 Binary files a/data/tilesets/secondary/82D4B84/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4B84/palettes/0.pal b/data/tilesets/secondary/82D4B84/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/82D4B84/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D4B84/palettes/1.pal b/data/tilesets/secondary/82D4B84/palettes/1.pal deleted file mode 100644 index cf1123812..000000000 --- a/data/tilesets/secondary/82D4B84/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/82D4B84/palettes/10.pal b/data/tilesets/secondary/82D4B84/palettes/10.pal deleted file mode 100644 index 70ed40322..000000000 --- a/data/tilesets/secondary/82D4B84/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -213 230 197 -156 172 139 -123 123 131 -90 90 115 -65 74 106 -222 172 65 -180 98 0 -131 65 0 -205 205 123 -164 164 57 -115 189 246 -74 148 213 -49 115 180 -189 197 164 diff --git a/data/tilesets/secondary/82D4B84/palettes/11.pal b/data/tilesets/secondary/82D4B84/palettes/11.pal deleted file mode 100644 index 7b47acf60..000000000 --- a/data/tilesets/secondary/82D4B84/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -255 255 255 -213 213 222 -180 180 164 -148 148 139 -123 123 131 -82 82 106 -197 222 205 -148 172 156 -98 131 106 -230 139 24 -197 98 0 -172 65 0 -230 213 139 -205 180 106 -172 148 82 diff --git a/data/tilesets/secondary/82D4B84/palettes/12.pal b/data/tilesets/secondary/82D4B84/palettes/12.pal deleted file mode 100644 index f5ff3dddf..000000000 --- a/data/tilesets/secondary/82D4B84/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -148 148 139 -222 222 230 -205 205 213 -180 180 164 -255 0 255 -222 222 205 -205 205 189 -172 172 164 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -230 213 139 -205 180 106 -115 205 164 diff --git a/data/tilesets/secondary/82D4B84/palettes/13.pal b/data/tilesets/secondary/82D4B84/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4B84/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4B84/palettes/14.pal b/data/tilesets/secondary/82D4B84/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4B84/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4B84/palettes/15.pal b/data/tilesets/secondary/82D4B84/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4B84/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4B84/palettes/2.pal b/data/tilesets/secondary/82D4B84/palettes/2.pal deleted file mode 100644 index 372fb5d7c..000000000 --- a/data/tilesets/secondary/82D4B84/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/82D4B84/palettes/3.pal b/data/tilesets/secondary/82D4B84/palettes/3.pal deleted file mode 100644 index 5a5e60211..000000000 --- a/data/tilesets/secondary/82D4B84/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4B84/palettes/4.pal b/data/tilesets/secondary/82D4B84/palettes/4.pal deleted file mode 100644 index 229f9132c..000000000 --- a/data/tilesets/secondary/82D4B84/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -222 230 255 -197 213 255 -164 197 238 -123 172 230 -90 148 197 -65 123 180 -90 164 205 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -32 98 139 -238 230 139 -222 197 139 -205 180 106 diff --git a/data/tilesets/secondary/82D4B84/palettes/5.pal b/data/tilesets/secondary/82D4B84/palettes/5.pal deleted file mode 100644 index 215dd1272..000000000 --- a/data/tilesets/secondary/82D4B84/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4B84/palettes/6.pal b/data/tilesets/secondary/82D4B84/palettes/6.pal deleted file mode 100644 index 7e7862a19..000000000 --- a/data/tilesets/secondary/82D4B84/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -222 230 255 -197 213 255 -164 197 238 -123 172 230 -41 82 164 -41 57 131 -74 123 197 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -32 98 139 -238 230 139 -222 197 139 -205 180 106 diff --git a/data/tilesets/secondary/82D4B84/palettes/7.pal b/data/tilesets/secondary/82D4B84/palettes/7.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4B84/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4B84/palettes/8.pal b/data/tilesets/secondary/82D4B84/palettes/8.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/82D4B84/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4B84/palettes/9.pal b/data/tilesets/secondary/82D4B84/palettes/9.pal deleted file mode 100644 index 3ff6139ac..000000000 --- a/data/tilesets/secondary/82D4B84/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 205 65 -222 172 65 -180 98 0 -213 213 139 -189 189 115 -148 148 82 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4B84/tiles.png b/data/tilesets/secondary/82D4B84/tiles.png deleted file mode 100644 index 4a938b4c5..000000000 Binary files a/data/tilesets/secondary/82D4B84/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4B9C/metatile_attributes.bin b/data/tilesets/secondary/82D4B9C/metatile_attributes.bin deleted file mode 100644 index c6f6551c0..000000000 Binary files a/data/tilesets/secondary/82D4B9C/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4B9C/metatiles.bin b/data/tilesets/secondary/82D4B9C/metatiles.bin deleted file mode 100644 index dd43794df..000000000 Binary files a/data/tilesets/secondary/82D4B9C/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4B9C/palettes/0.pal b/data/tilesets/secondary/82D4B9C/palettes/0.pal deleted file mode 100644 index 9dcb673aa..000000000 --- a/data/tilesets/secondary/82D4B9C/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -189 255 139 -131 213 98 -57 148 49 -57 82 0 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D4B9C/palettes/1.pal b/data/tilesets/secondary/82D4B9C/palettes/1.pal deleted file mode 100644 index 391d1e3d1..000000000 --- a/data/tilesets/secondary/82D4B9C/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 189 164 -189 148 139 -156 115 115 -123 82 82 -90 57 74 -115 205 164 diff --git a/data/tilesets/secondary/82D4B9C/palettes/10.pal b/data/tilesets/secondary/82D4B9C/palettes/10.pal deleted file mode 100644 index ce671fee4..000000000 --- a/data/tilesets/secondary/82D4B9C/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -24 255 82 -238 238 238 -222 222 230 -123 123 131 -172 189 205 -65 74 106 -222 222 205 -205 205 189 -180 180 164 -213 213 164 -189 189 139 -148 148 98 -32 82 164 -156 205 246 -82 164 205 -115 205 164 diff --git a/data/tilesets/secondary/82D4B9C/palettes/11.pal b/data/tilesets/secondary/82D4B9C/palettes/11.pal deleted file mode 100644 index d1ae629c8..000000000 --- a/data/tilesets/secondary/82D4B9C/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -197 197 205 -49 98 164 -172 222 180 -139 189 148 -106 156 115 -82 131 90 -65 115 74 -255 0 255 diff --git a/data/tilesets/secondary/82D4B9C/palettes/12.pal b/data/tilesets/secondary/82D4B9C/palettes/12.pal deleted file mode 100644 index b66bd774a..000000000 --- a/data/tilesets/secondary/82D4B9C/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -255 255 255 -222 222 230 -139 156 172 -123 123 131 -82 82 106 -213 205 32 -246 238 74 -164 131 205 -164 156 16 -205 197 106 -255 255 148 -139 189 148 -74 131 197 -197 197 205 -115 189 246 diff --git a/data/tilesets/secondary/82D4B9C/palettes/13.pal b/data/tilesets/secondary/82D4B9C/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4B9C/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4B9C/palettes/14.pal b/data/tilesets/secondary/82D4B9C/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4B9C/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4B9C/palettes/15.pal b/data/tilesets/secondary/82D4B9C/palettes/15.pal deleted file mode 100644 index 3ffc684ac..000000000 --- a/data/tilesets/secondary/82D4B9C/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -230 222 164 -222 205 131 -205 180 106 -213 213 197 -197 197 180 -164 164 148 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4B9C/palettes/2.pal b/data/tilesets/secondary/82D4B9C/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/82D4B9C/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/82D4B9C/palettes/3.pal b/data/tilesets/secondary/82D4B9C/palettes/3.pal deleted file mode 100644 index 973765509..000000000 --- a/data/tilesets/secondary/82D4B9C/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4B9C/palettes/4.pal b/data/tilesets/secondary/82D4B9C/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/82D4B9C/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/82D4B9C/palettes/5.pal b/data/tilesets/secondary/82D4B9C/palettes/5.pal deleted file mode 100644 index 3a2db72a7..000000000 --- a/data/tilesets/secondary/82D4B9C/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -222 205 131 -205 180 106 -180 139 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4B9C/palettes/6.pal b/data/tilesets/secondary/82D4B9C/palettes/6.pal deleted file mode 100644 index 93518605a..000000000 --- a/data/tilesets/secondary/82D4B9C/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/82D4B9C/palettes/7.pal b/data/tilesets/secondary/82D4B9C/palettes/7.pal deleted file mode 100644 index 93518605a..000000000 --- a/data/tilesets/secondary/82D4B9C/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/82D4B9C/palettes/8.pal b/data/tilesets/secondary/82D4B9C/palettes/8.pal deleted file mode 100644 index b1e168855..000000000 --- a/data/tilesets/secondary/82D4B9C/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -197 197 197 -222 222 230 -148 164 180 -123 123 131 -65 74 106 -246 246 255 -205 164 255 -164 131 205 -123 90 164 -255 0 255 -255 0 255 -255 0 255 -164 131 205 -205 164 255 -90 90 115 diff --git a/data/tilesets/secondary/82D4B9C/palettes/9.pal b/data/tilesets/secondary/82D4B9C/palettes/9.pal deleted file mode 100644 index 7a88fdbbf..000000000 --- a/data/tilesets/secondary/82D4B9C/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -255 255 255 -205 205 213 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 238 246 -255 238 139 -230 189 82 -238 148 115 -222 246 255 -172 230 255 -123 205 213 -197 106 74 diff --git a/data/tilesets/secondary/82D4B9C/tiles.png b/data/tilesets/secondary/82D4B9C/tiles.png deleted file mode 100644 index ea835f8dd..000000000 Binary files a/data/tilesets/secondary/82D4B9C/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4BCC/metatile_attributes.bin b/data/tilesets/secondary/82D4BCC/metatile_attributes.bin deleted file mode 100644 index 31fdb5cc0..000000000 Binary files a/data/tilesets/secondary/82D4BCC/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4BCC/metatiles.bin b/data/tilesets/secondary/82D4BCC/metatiles.bin deleted file mode 100644 index 1c00836c1..000000000 Binary files a/data/tilesets/secondary/82D4BCC/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4BCC/palettes/0.pal b/data/tilesets/secondary/82D4BCC/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/82D4BCC/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D4BCC/palettes/1.pal b/data/tilesets/secondary/82D4BCC/palettes/1.pal deleted file mode 100644 index 3a16a45c7..000000000 --- a/data/tilesets/secondary/82D4BCC/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -238 246 238 diff --git a/data/tilesets/secondary/82D4BCC/palettes/10.pal b/data/tilesets/secondary/82D4BCC/palettes/10.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4BCC/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4BCC/palettes/11.pal b/data/tilesets/secondary/82D4BCC/palettes/11.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4BCC/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4BCC/palettes/12.pal b/data/tilesets/secondary/82D4BCC/palettes/12.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4BCC/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4BCC/palettes/13.pal b/data/tilesets/secondary/82D4BCC/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4BCC/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4BCC/palettes/14.pal b/data/tilesets/secondary/82D4BCC/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4BCC/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4BCC/palettes/15.pal b/data/tilesets/secondary/82D4BCC/palettes/15.pal deleted file mode 100644 index 92e7ed309..000000000 --- a/data/tilesets/secondary/82D4BCC/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -0 0 0 diff --git a/data/tilesets/secondary/82D4BCC/palettes/2.pal b/data/tilesets/secondary/82D4BCC/palettes/2.pal deleted file mode 100644 index cc3a9457d..000000000 --- a/data/tilesets/secondary/82D4BCC/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/82D4BCC/palettes/3.pal b/data/tilesets/secondary/82D4BCC/palettes/3.pal deleted file mode 100644 index e1b56cd57..000000000 --- a/data/tilesets/secondary/82D4BCC/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -164 172 164 -180 189 189 -238 246 246 -238 246 238 -213 230 222 -197 205 197 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4BCC/palettes/4.pal b/data/tilesets/secondary/82D4BCC/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4BCC/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4BCC/palettes/5.pal b/data/tilesets/secondary/82D4BCC/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4BCC/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4BCC/palettes/6.pal b/data/tilesets/secondary/82D4BCC/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4BCC/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4BCC/palettes/7.pal b/data/tilesets/secondary/82D4BCC/palettes/7.pal deleted file mode 100644 index 0a07057ec..000000000 --- a/data/tilesets/secondary/82D4BCC/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D4BCC/palettes/8.pal b/data/tilesets/secondary/82D4BCC/palettes/8.pal deleted file mode 100644 index 06fcc911b..000000000 --- a/data/tilesets/secondary/82D4BCC/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -115 189 139 -172 230 172 -205 246 205 -0 0 0 diff --git a/data/tilesets/secondary/82D4BCC/palettes/9.pal b/data/tilesets/secondary/82D4BCC/palettes/9.pal deleted file mode 100644 index ea018609b..000000000 --- a/data/tilesets/secondary/82D4BCC/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -164 172 164 -180 189 189 -238 246 246 -238 246 238 -213 230 222 -197 205 197 -255 0 255 -255 0 255 -156 205 255 -106 164 238 -74 139 230 -57 131 205 -41 98 189 -255 0 255 diff --git a/data/tilesets/secondary/82D4BCC/tiles.png b/data/tilesets/secondary/82D4BCC/tiles.png deleted file mode 100644 index 2bfeb4080..000000000 Binary files a/data/tilesets/secondary/82D4BCC/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4BE4/metatile_attributes.bin b/data/tilesets/secondary/82D4BE4/metatile_attributes.bin deleted file mode 100644 index f9bd3d289..000000000 Binary files a/data/tilesets/secondary/82D4BE4/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4BE4/metatiles.bin b/data/tilesets/secondary/82D4BE4/metatiles.bin deleted file mode 100644 index 2ec8817bc..000000000 Binary files a/data/tilesets/secondary/82D4BE4/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4BE4/palettes/0.pal b/data/tilesets/secondary/82D4BE4/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/82D4BE4/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D4BE4/palettes/1.pal b/data/tilesets/secondary/82D4BE4/palettes/1.pal deleted file mode 100644 index d99adafff..000000000 --- a/data/tilesets/secondary/82D4BE4/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/82D4BE4/palettes/10.pal b/data/tilesets/secondary/82D4BE4/palettes/10.pal deleted file mode 100644 index 62e3e6d6b..000000000 --- a/data/tilesets/secondary/82D4BE4/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -189 98 74 -255 131 115 -255 0 255 -255 0 255 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -189 230 255 -189 230 255 -156 189 213 -90 131 180 diff --git a/data/tilesets/secondary/82D4BE4/palettes/11.pal b/data/tilesets/secondary/82D4BE4/palettes/11.pal deleted file mode 100644 index 7ba7bccca..000000000 --- a/data/tilesets/secondary/82D4BE4/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -230 222 156 -82 82 106 -123 123 123 -180 180 164 -222 230 230 -180 213 230 -131 180 205 -98 156 164 -57 115 139 -255 65 0 -205 49 0 -8 90 255 -0 57 197 -255 180 0 -0 230 115 -255 255 255 diff --git a/data/tilesets/secondary/82D4BE4/palettes/12.pal b/data/tilesets/secondary/82D4BE4/palettes/12.pal deleted file mode 100644 index 0f1f36738..000000000 --- a/data/tilesets/secondary/82D4BE4/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -164 172 164 -180 189 189 -255 255 255 -115 115 123 -213 205 156 -238 238 172 -197 180 139 -230 222 156 -246 246 205 -0 82 123 -57 139 180 -115 197 238 -222 230 222 -131 131 139 diff --git a/data/tilesets/secondary/82D4BE4/palettes/13.pal b/data/tilesets/secondary/82D4BE4/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4BE4/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4BE4/palettes/14.pal b/data/tilesets/secondary/82D4BE4/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4BE4/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4BE4/palettes/15.pal b/data/tilesets/secondary/82D4BE4/palettes/15.pal deleted file mode 100644 index 92e7ed309..000000000 --- a/data/tilesets/secondary/82D4BE4/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -0 0 0 diff --git a/data/tilesets/secondary/82D4BE4/palettes/2.pal b/data/tilesets/secondary/82D4BE4/palettes/2.pal deleted file mode 100644 index cc3a9457d..000000000 --- a/data/tilesets/secondary/82D4BE4/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/82D4BE4/palettes/3.pal b/data/tilesets/secondary/82D4BE4/palettes/3.pal deleted file mode 100644 index 7ec794ae5..000000000 --- a/data/tilesets/secondary/82D4BE4/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4BE4/palettes/4.pal b/data/tilesets/secondary/82D4BE4/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4BE4/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4BE4/palettes/5.pal b/data/tilesets/secondary/82D4BE4/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4BE4/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4BE4/palettes/6.pal b/data/tilesets/secondary/82D4BE4/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4BE4/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4BE4/palettes/7.pal b/data/tilesets/secondary/82D4BE4/palettes/7.pal deleted file mode 100644 index 27ca86ca3..000000000 --- a/data/tilesets/secondary/82D4BE4/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -197 222 205 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D4BE4/palettes/8.pal b/data/tilesets/secondary/82D4BE4/palettes/8.pal deleted file mode 100644 index 6b6a0f25f..000000000 --- a/data/tilesets/secondary/82D4BE4/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -131 205 139 -230 189 115 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/82D4BE4/palettes/9.pal b/data/tilesets/secondary/82D4BE4/palettes/9.pal deleted file mode 100644 index 4b279ecf9..000000000 --- a/data/tilesets/secondary/82D4BE4/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 255 0 -82 82 106 -148 148 164 -205 189 197 -255 255 255 -189 148 49 -156 115 90 -197 238 148 -156 197 74 -106 164 41 -197 222 205 -139 180 172 -172 205 180 -123 123 139 -255 98 49 -238 222 164 diff --git a/data/tilesets/secondary/82D4BE4/tiles.png b/data/tilesets/secondary/82D4BE4/tiles.png deleted file mode 100644 index 92d0112f3..000000000 Binary files a/data/tilesets/secondary/82D4BE4/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4BFC/metatile_attributes.bin b/data/tilesets/secondary/82D4BFC/metatile_attributes.bin deleted file mode 100644 index 510f0fdf1..000000000 Binary files a/data/tilesets/secondary/82D4BFC/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4BFC/metatiles.bin b/data/tilesets/secondary/82D4BFC/metatiles.bin deleted file mode 100644 index 9f35adc11..000000000 Binary files a/data/tilesets/secondary/82D4BFC/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4BFC/palettes/0.pal b/data/tilesets/secondary/82D4BFC/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/82D4BFC/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D4BFC/palettes/1.pal b/data/tilesets/secondary/82D4BFC/palettes/1.pal deleted file mode 100644 index 09828f4f1..000000000 --- a/data/tilesets/secondary/82D4BFC/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -123 123 131 -32 49 57 -230 238 238 -90 189 139 -90 90 115 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -123 74 74 -90 57 65 -115 205 164 diff --git a/data/tilesets/secondary/82D4BFC/palettes/10.pal b/data/tilesets/secondary/82D4BFC/palettes/10.pal deleted file mode 100644 index 937405d15..000000000 --- a/data/tilesets/secondary/82D4BFC/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -255 0 255 -255 0 255 -255 0 255 -0 0 0 -255 238 164 -230 197 139 -205 172 123 -172 139 106 -213 197 189 -205 180 156 -189 148 139 -148 115 106 -115 65 74 -82 49 65 -90 90 98 diff --git a/data/tilesets/secondary/82D4BFC/palettes/11.pal b/data/tilesets/secondary/82D4BFC/palettes/11.pal deleted file mode 100644 index bb4f4867c..000000000 --- a/data/tilesets/secondary/82D4BFC/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -189 189 156 -172 172 139 -148 139 115 -123 115 90 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -238 222 148 -222 205 115 -205 180 98 -189 172 98 diff --git a/data/tilesets/secondary/82D4BFC/palettes/12.pal b/data/tilesets/secondary/82D4BFC/palettes/12.pal deleted file mode 100644 index 583384664..000000000 --- a/data/tilesets/secondary/82D4BFC/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -0 0 0 diff --git a/data/tilesets/secondary/82D4BFC/palettes/13.pal b/data/tilesets/secondary/82D4BFC/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4BFC/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4BFC/palettes/14.pal b/data/tilesets/secondary/82D4BFC/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4BFC/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4BFC/palettes/15.pal b/data/tilesets/secondary/82D4BFC/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4BFC/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4BFC/palettes/2.pal b/data/tilesets/secondary/82D4BFC/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/82D4BFC/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/82D4BFC/palettes/3.pal b/data/tilesets/secondary/82D4BFC/palettes/3.pal deleted file mode 100644 index ef7460f41..000000000 --- a/data/tilesets/secondary/82D4BFC/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -123 197 255 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4BFC/palettes/4.pal b/data/tilesets/secondary/82D4BFC/palettes/4.pal deleted file mode 100644 index e83c6b367..000000000 --- a/data/tilesets/secondary/82D4BFC/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -230 246 255 -189 222 255 -139 189 255 -115 164 255 -65 139 222 -57 115 205 -82 148 230 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -49 115 197 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/82D4BFC/palettes/5.pal b/data/tilesets/secondary/82D4BFC/palettes/5.pal deleted file mode 100644 index c5a653979..000000000 --- a/data/tilesets/secondary/82D4BFC/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4BFC/palettes/6.pal b/data/tilesets/secondary/82D4BFC/palettes/6.pal deleted file mode 100644 index 9bad44649..000000000 --- a/data/tilesets/secondary/82D4BFC/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -205 230 246 -180 213 255 -123 180 246 -98 148 230 -65 123 189 -49 98 180 -82 131 222 -213 230 238 -172 189 205 -123 123 131 -90 90 115 -238 246 246 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/82D4BFC/palettes/7.pal b/data/tilesets/secondary/82D4BFC/palettes/7.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4BFC/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4BFC/palettes/8.pal b/data/tilesets/secondary/82D4BFC/palettes/8.pal deleted file mode 100644 index 1c8d33fac..000000000 --- a/data/tilesets/secondary/82D4BFC/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -189 189 156 -172 172 139 -148 139 115 -123 115 90 -32 49 57 -255 0 255 -255 0 255 -255 0 255 -222 197 189 -205 180 156 -189 148 139 -148 115 106 -115 65 74 -82 49 65 -90 90 98 diff --git a/data/tilesets/secondary/82D4BFC/palettes/9.pal b/data/tilesets/secondary/82D4BFC/palettes/9.pal deleted file mode 100644 index 3795f6c6a..000000000 --- a/data/tilesets/secondary/82D4BFC/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 222 213 -189 189 156 -172 172 139 -148 139 115 -123 115 90 -255 238 164 -230 197 139 -205 172 123 -164 123 90 -148 115 74 -106 65 41 -74 74 57 -0 0 0 -98 139 197 -74 115 172 -57 98 156 diff --git a/data/tilesets/secondary/82D4BFC/tiles.png b/data/tilesets/secondary/82D4BFC/tiles.png deleted file mode 100644 index 8e0f64a78..000000000 Binary files a/data/tilesets/secondary/82D4BFC/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4C14/metatile_attributes.bin b/data/tilesets/secondary/82D4C14/metatile_attributes.bin deleted file mode 100644 index 1b1cb4d44..000000000 Binary files a/data/tilesets/secondary/82D4C14/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4C14/metatiles.bin b/data/tilesets/secondary/82D4C14/metatiles.bin deleted file mode 100644 index 274da22a6..000000000 Binary files a/data/tilesets/secondary/82D4C14/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4C14/palettes/0.pal b/data/tilesets/secondary/82D4C14/palettes/0.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C14/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C14/palettes/1.pal b/data/tilesets/secondary/82D4C14/palettes/1.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C14/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C14/palettes/10.pal b/data/tilesets/secondary/82D4C14/palettes/10.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C14/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C14/palettes/11.pal b/data/tilesets/secondary/82D4C14/palettes/11.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C14/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C14/palettes/12.pal b/data/tilesets/secondary/82D4C14/palettes/12.pal deleted file mode 100644 index 97d3f20bd..000000000 --- a/data/tilesets/secondary/82D4C14/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -65 74 106 -156 156 139 -164 148 65 -213 164 106 -230 213 131 -246 238 205 -0 0 0 -197 189 123 -222 213 139 -246 238 180 -238 205 172 -205 205 213 -255 148 131 -255 255 115 -156 197 230 diff --git a/data/tilesets/secondary/82D4C14/palettes/13.pal b/data/tilesets/secondary/82D4C14/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C14/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C14/palettes/14.pal b/data/tilesets/secondary/82D4C14/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C14/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C14/palettes/15.pal b/data/tilesets/secondary/82D4C14/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C14/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C14/palettes/2.pal b/data/tilesets/secondary/82D4C14/palettes/2.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C14/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C14/palettes/3.pal b/data/tilesets/secondary/82D4C14/palettes/3.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C14/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C14/palettes/4.pal b/data/tilesets/secondary/82D4C14/palettes/4.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C14/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C14/palettes/5.pal b/data/tilesets/secondary/82D4C14/palettes/5.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C14/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C14/palettes/6.pal b/data/tilesets/secondary/82D4C14/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C14/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C14/palettes/7.pal b/data/tilesets/secondary/82D4C14/palettes/7.pal deleted file mode 100644 index 4172436d0..000000000 --- a/data/tilesets/secondary/82D4C14/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -65 74 106 -246 246 255 -205 197 213 -156 156 164 -222 230 255 -172 205 213 -156 189 172 -189 230 148 -139 205 123 -106 131 98 -238 131 106 -205 106 106 -255 246 41 -255 205 148 -189 197 115 diff --git a/data/tilesets/secondary/82D4C14/palettes/8.pal b/data/tilesets/secondary/82D4C14/palettes/8.pal deleted file mode 100644 index 7fd087b3b..000000000 --- a/data/tilesets/secondary/82D4C14/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -65 74 106 -172 172 189 -222 213 205 -238 238 238 -123 139 74 -148 205 98 -205 246 123 -255 238 230 -222 222 189 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C14/palettes/9.pal b/data/tilesets/secondary/82D4C14/palettes/9.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C14/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C14/tiles.png b/data/tilesets/secondary/82D4C14/tiles.png deleted file mode 100644 index d4b21f3e4..000000000 Binary files a/data/tilesets/secondary/82D4C14/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4C2C/metatile_attributes.bin b/data/tilesets/secondary/82D4C2C/metatile_attributes.bin deleted file mode 100644 index 097e93ce1..000000000 Binary files a/data/tilesets/secondary/82D4C2C/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4C2C/metatiles.bin b/data/tilesets/secondary/82D4C2C/metatiles.bin deleted file mode 100644 index 993b73cbd..000000000 Binary files a/data/tilesets/secondary/82D4C2C/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4C2C/palettes/0.pal b/data/tilesets/secondary/82D4C2C/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/82D4C2C/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D4C2C/palettes/1.pal b/data/tilesets/secondary/82D4C2C/palettes/1.pal deleted file mode 100644 index 69f3f0b9e..000000000 --- a/data/tilesets/secondary/82D4C2C/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -180 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -238 246 238 diff --git a/data/tilesets/secondary/82D4C2C/palettes/10.pal b/data/tilesets/secondary/82D4C2C/palettes/10.pal deleted file mode 100644 index fc8da5d40..000000000 --- a/data/tilesets/secondary/82D4C2C/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -98 98 74 -164 139 82 -222 205 74 -65 123 164 -82 139 197 -98 189 213 -148 213 213 -180 238 230 -189 197 205 -238 246 238 -222 222 172 -205 131 82 -246 172 106 diff --git a/data/tilesets/secondary/82D4C2C/palettes/11.pal b/data/tilesets/secondary/82D4C2C/palettes/11.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C2C/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C2C/palettes/12.pal b/data/tilesets/secondary/82D4C2C/palettes/12.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C2C/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C2C/palettes/13.pal b/data/tilesets/secondary/82D4C2C/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C2C/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C2C/palettes/14.pal b/data/tilesets/secondary/82D4C2C/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C2C/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C2C/palettes/15.pal b/data/tilesets/secondary/82D4C2C/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C2C/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C2C/palettes/2.pal b/data/tilesets/secondary/82D4C2C/palettes/2.pal deleted file mode 100644 index 330e35b02..000000000 --- a/data/tilesets/secondary/82D4C2C/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -213 131 82 -156 205 246 -98 156 238 -57 123 222 -222 139 106 -189 98 74 diff --git a/data/tilesets/secondary/82D4C2C/palettes/3.pal b/data/tilesets/secondary/82D4C2C/palettes/3.pal deleted file mode 100644 index 1520bed0b..000000000 --- a/data/tilesets/secondary/82D4C2C/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -148 148 148 -180 180 180 -255 255 255 -238 246 238 -222 238 222 -197 205 197 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -90 90 90 -115 106 98 -148 123 98 diff --git a/data/tilesets/secondary/82D4C2C/palettes/4.pal b/data/tilesets/secondary/82D4C2C/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4C2C/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C2C/palettes/5.pal b/data/tilesets/secondary/82D4C2C/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4C2C/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C2C/palettes/6.pal b/data/tilesets/secondary/82D4C2C/palettes/6.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4C2C/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C2C/palettes/7.pal b/data/tilesets/secondary/82D4C2C/palettes/7.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4C2C/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C2C/palettes/8.pal b/data/tilesets/secondary/82D4C2C/palettes/8.pal deleted file mode 100644 index 223737ab6..000000000 --- a/data/tilesets/secondary/82D4C2C/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -106 98 74 -139 123 74 -164 139 74 -222 205 74 -123 123 123 -189 197 205 -238 246 238 -98 90 98 -156 131 106 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4C2C/palettes/9.pal b/data/tilesets/secondary/82D4C2C/palettes/9.pal deleted file mode 100644 index 6de173f90..000000000 --- a/data/tilesets/secondary/82D4C2C/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -98 98 74 -164 139 82 -222 205 74 -255 0 255 -255 0 255 -213 213 156 -222 230 172 -246 246 238 -90 90 98 -115 115 106 -156 131 106 -205 131 82 -238 164 106 diff --git a/data/tilesets/secondary/82D4C2C/tiles.png b/data/tilesets/secondary/82D4C2C/tiles.png deleted file mode 100644 index 9be5ebca9..000000000 Binary files a/data/tilesets/secondary/82D4C2C/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4C44/metatile_attributes.bin b/data/tilesets/secondary/82D4C44/metatile_attributes.bin deleted file mode 100644 index 53505839d..000000000 Binary files a/data/tilesets/secondary/82D4C44/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4C44/metatiles.bin b/data/tilesets/secondary/82D4C44/metatiles.bin deleted file mode 100644 index 0e2f2a6c3..000000000 Binary files a/data/tilesets/secondary/82D4C44/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4C44/palettes/0.pal b/data/tilesets/secondary/82D4C44/palettes/0.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C44/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C44/palettes/1.pal b/data/tilesets/secondary/82D4C44/palettes/1.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C44/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C44/palettes/10.pal b/data/tilesets/secondary/82D4C44/palettes/10.pal deleted file mode 100644 index ab8f75e5a..000000000 --- a/data/tilesets/secondary/82D4C44/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -65 74 106 -123 123 148 -246 255 255 -205 213 213 -0 0 0 -255 123 123 -172 123 115 -139 230 98 -115 189 57 -246 230 24 -189 180 49 -148 148 246 -123 123 180 -222 222 255 -180 172 213 diff --git a/data/tilesets/secondary/82D4C44/palettes/11.pal b/data/tilesets/secondary/82D4C44/palettes/11.pal deleted file mode 100644 index 468d7212c..000000000 --- a/data/tilesets/secondary/82D4C44/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -49 57 74 -172 164 255 -131 123 230 -106 98 172 -82 74 180 -82 74 98 -246 255 255 -115 172 65 -123 189 74 -148 205 90 -98 90 148 -139 156 213 -57 57 106 -148 205 90 -0 255 0 diff --git a/data/tilesets/secondary/82D4C44/palettes/12.pal b/data/tilesets/secondary/82D4C44/palettes/12.pal deleted file mode 100644 index 05794ac82..000000000 --- a/data/tilesets/secondary/82D4C44/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -65 74 106 -197 238 255 -172 205 213 -131 164 180 -123 156 180 -98 139 148 -246 255 255 -164 123 115 -180 74 24 -213 98 49 -98 139 148 -172 205 213 -197 238 255 -156 222 115 -148 189 98 diff --git a/data/tilesets/secondary/82D4C44/palettes/13.pal b/data/tilesets/secondary/82D4C44/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C44/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C44/palettes/14.pal b/data/tilesets/secondary/82D4C44/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C44/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C44/palettes/15.pal b/data/tilesets/secondary/82D4C44/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C44/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C44/palettes/2.pal b/data/tilesets/secondary/82D4C44/palettes/2.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C44/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C44/palettes/3.pal b/data/tilesets/secondary/82D4C44/palettes/3.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C44/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C44/palettes/4.pal b/data/tilesets/secondary/82D4C44/palettes/4.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C44/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C44/palettes/5.pal b/data/tilesets/secondary/82D4C44/palettes/5.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C44/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C44/palettes/6.pal b/data/tilesets/secondary/82D4C44/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C44/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C44/palettes/7.pal b/data/tilesets/secondary/82D4C44/palettes/7.pal deleted file mode 100644 index 00ca6903f..000000000 --- a/data/tilesets/secondary/82D4C44/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -65 74 106 -255 213 131 -246 180 82 -213 148 41 -180 172 148 -148 139 123 -255 255 222 -230 230 197 -180 74 24 -213 98 49 -90 156 139 -131 197 180 -172 230 205 -156 222 115 -148 189 106 diff --git a/data/tilesets/secondary/82D4C44/palettes/8.pal b/data/tilesets/secondary/82D4C44/palettes/8.pal deleted file mode 100644 index 43d6db90d..000000000 --- a/data/tilesets/secondary/82D4C44/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -65 74 106 -230 238 255 -213 205 246 -164 164 180 -156 197 156 -106 156 139 -246 255 255 -0 0 0 -180 74 24 -213 98 49 -123 106 164 -156 156 197 -197 197 230 -156 222 115 -148 189 106 diff --git a/data/tilesets/secondary/82D4C44/palettes/9.pal b/data/tilesets/secondary/82D4C44/palettes/9.pal deleted file mode 100644 index 87857607f..000000000 --- a/data/tilesets/secondary/82D4C44/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -65 74 106 -238 255 255 -213 222 238 -189 205 197 -156 164 172 -0 0 0 -189 139 90 -222 172 106 -246 189 115 -82 156 164 -115 197 222 -213 98 82 -246 148 131 -148 205 90 -49 131 24 diff --git a/data/tilesets/secondary/82D4C44/tiles.png b/data/tilesets/secondary/82D4C44/tiles.png deleted file mode 100644 index f71f29432..000000000 Binary files a/data/tilesets/secondary/82D4C44/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4C5C/metatile_attributes.bin b/data/tilesets/secondary/82D4C5C/metatile_attributes.bin deleted file mode 100644 index d1a4900c5..000000000 Binary files a/data/tilesets/secondary/82D4C5C/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4C5C/metatiles.bin b/data/tilesets/secondary/82D4C5C/metatiles.bin deleted file mode 100644 index f1c0ab02d..000000000 Binary files a/data/tilesets/secondary/82D4C5C/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4C5C/palettes/0.pal b/data/tilesets/secondary/82D4C5C/palettes/0.pal deleted file mode 100644 index 4b44e19f4..000000000 --- a/data/tilesets/secondary/82D4C5C/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -205 156 156 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D4C5C/palettes/1.pal b/data/tilesets/secondary/82D4C5C/palettes/1.pal deleted file mode 100644 index a39ca6aa8..000000000 --- a/data/tilesets/secondary/82D4C5C/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -205 156 156 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/82D4C5C/palettes/10.pal b/data/tilesets/secondary/82D4C5C/palettes/10.pal deleted file mode 100644 index c06a049b0..000000000 --- a/data/tilesets/secondary/82D4C5C/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C5C/palettes/11.pal b/data/tilesets/secondary/82D4C5C/palettes/11.pal deleted file mode 100644 index c06a049b0..000000000 --- a/data/tilesets/secondary/82D4C5C/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C5C/palettes/12.pal b/data/tilesets/secondary/82D4C5C/palettes/12.pal deleted file mode 100644 index c06a049b0..000000000 --- a/data/tilesets/secondary/82D4C5C/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C5C/palettes/13.pal b/data/tilesets/secondary/82D4C5C/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C5C/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C5C/palettes/14.pal b/data/tilesets/secondary/82D4C5C/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C5C/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C5C/palettes/15.pal b/data/tilesets/secondary/82D4C5C/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C5C/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C5C/palettes/2.pal b/data/tilesets/secondary/82D4C5C/palettes/2.pal deleted file mode 100644 index 5a4f127be..000000000 --- a/data/tilesets/secondary/82D4C5C/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -205 156 156 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/82D4C5C/palettes/3.pal b/data/tilesets/secondary/82D4C5C/palettes/3.pal deleted file mode 100644 index c84fa4a58..000000000 --- a/data/tilesets/secondary/82D4C5C/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -205 156 156 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4C5C/palettes/4.pal b/data/tilesets/secondary/82D4C5C/palettes/4.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C5C/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C5C/palettes/5.pal b/data/tilesets/secondary/82D4C5C/palettes/5.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C5C/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C5C/palettes/6.pal b/data/tilesets/secondary/82D4C5C/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C5C/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C5C/palettes/7.pal b/data/tilesets/secondary/82D4C5C/palettes/7.pal deleted file mode 100644 index a71b8fee2..000000000 --- a/data/tilesets/secondary/82D4C5C/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -82 82 106 -131 131 139 -172 172 139 -205 205 180 -238 238 222 -131 148 139 -172 189 172 -205 205 205 -213 222 213 -255 255 255 -164 123 74 -189 148 98 -222 172 123 -172 180 106 -197 205 131 diff --git a/data/tilesets/secondary/82D4C5C/palettes/8.pal b/data/tilesets/secondary/82D4C5C/palettes/8.pal deleted file mode 100644 index 0a666a9c9..000000000 --- a/data/tilesets/secondary/82D4C5C/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -65 74 106 -139 139 131 -197 197 197 -255 255 255 -0 0 0 -246 197 197 -74 74 213 -123 123 246 -180 180 0 -213 197 65 -246 246 32 -148 82 74 -205 49 41 -255 123 74 -0 0 0 diff --git a/data/tilesets/secondary/82D4C5C/palettes/9.pal b/data/tilesets/secondary/82D4C5C/palettes/9.pal deleted file mode 100644 index c06a049b0..000000000 --- a/data/tilesets/secondary/82D4C5C/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C5C/tiles.png b/data/tilesets/secondary/82D4C5C/tiles.png deleted file mode 100644 index 90124ff4a..000000000 Binary files a/data/tilesets/secondary/82D4C5C/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4C74/metatile_attributes.bin b/data/tilesets/secondary/82D4C74/metatile_attributes.bin deleted file mode 100644 index be95e451c..000000000 Binary files a/data/tilesets/secondary/82D4C74/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4C74/metatiles.bin b/data/tilesets/secondary/82D4C74/metatiles.bin deleted file mode 100644 index 806d040ce..000000000 Binary files a/data/tilesets/secondary/82D4C74/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4C74/palettes/0.pal b/data/tilesets/secondary/82D4C74/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/82D4C74/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D4C74/palettes/1.pal b/data/tilesets/secondary/82D4C74/palettes/1.pal deleted file mode 100644 index 69f3f0b9e..000000000 --- a/data/tilesets/secondary/82D4C74/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -180 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -238 246 238 diff --git a/data/tilesets/secondary/82D4C74/palettes/10.pal b/data/tilesets/secondary/82D4C74/palettes/10.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4C74/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C74/palettes/11.pal b/data/tilesets/secondary/82D4C74/palettes/11.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4C74/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C74/palettes/12.pal b/data/tilesets/secondary/82D4C74/palettes/12.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4C74/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C74/palettes/13.pal b/data/tilesets/secondary/82D4C74/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C74/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C74/palettes/14.pal b/data/tilesets/secondary/82D4C74/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C74/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C74/palettes/15.pal b/data/tilesets/secondary/82D4C74/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C74/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C74/palettes/2.pal b/data/tilesets/secondary/82D4C74/palettes/2.pal deleted file mode 100644 index c8ee236d7..000000000 --- a/data/tilesets/secondary/82D4C74/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -255 0 255 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/82D4C74/palettes/3.pal b/data/tilesets/secondary/82D4C74/palettes/3.pal deleted file mode 100644 index b17dbb054..000000000 --- a/data/tilesets/secondary/82D4C74/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -164 164 164 -180 189 189 -255 255 255 -238 246 238 -213 230 222 -197 205 197 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C74/palettes/4.pal b/data/tilesets/secondary/82D4C74/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4C74/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C74/palettes/5.pal b/data/tilesets/secondary/82D4C74/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4C74/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C74/palettes/6.pal b/data/tilesets/secondary/82D4C74/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C74/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C74/palettes/7.pal b/data/tilesets/secondary/82D4C74/palettes/7.pal deleted file mode 100644 index c1e7c3d5c..000000000 --- a/data/tilesets/secondary/82D4C74/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 diff --git a/data/tilesets/secondary/82D4C74/palettes/8.pal b/data/tilesets/secondary/82D4C74/palettes/8.pal deleted file mode 100644 index 18480092b..000000000 --- a/data/tilesets/secondary/82D4C74/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -139 222 156 -82 82 106 -115 123 131 -98 90 65 -139 123 82 -197 172 90 -230 230 238 -205 115 74 -238 172 82 -238 213 82 -131 189 57 -164 222 82 -156 139 172 -205 172 222 -213 205 230 -246 255 255 diff --git a/data/tilesets/secondary/82D4C74/palettes/9.pal b/data/tilesets/secondary/82D4C74/palettes/9.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4C74/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C74/tiles.png b/data/tilesets/secondary/82D4C74/tiles.png deleted file mode 100644 index 191287197..000000000 Binary files a/data/tilesets/secondary/82D4C74/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4C8C/metatile_attributes.bin b/data/tilesets/secondary/82D4C8C/metatile_attributes.bin deleted file mode 100644 index 0d685881c..000000000 Binary files a/data/tilesets/secondary/82D4C8C/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4C8C/metatiles.bin b/data/tilesets/secondary/82D4C8C/metatiles.bin deleted file mode 100644 index a7833446f..000000000 Binary files a/data/tilesets/secondary/82D4C8C/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4C8C/palettes/0.pal b/data/tilesets/secondary/82D4C8C/palettes/0.pal deleted file mode 100644 index 9fc16da3b..000000000 --- a/data/tilesets/secondary/82D4C8C/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -238 238 246 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D4C8C/palettes/1.pal b/data/tilesets/secondary/82D4C8C/palettes/1.pal deleted file mode 100644 index 76403e6d6..000000000 --- a/data/tilesets/secondary/82D4C8C/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -139 180 222 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/82D4C8C/palettes/10.pal b/data/tilesets/secondary/82D4C8C/palettes/10.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4C8C/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C8C/palettes/11.pal b/data/tilesets/secondary/82D4C8C/palettes/11.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4C8C/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C8C/palettes/12.pal b/data/tilesets/secondary/82D4C8C/palettes/12.pal deleted file mode 100644 index 3c32c9fd4..000000000 --- a/data/tilesets/secondary/82D4C8C/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -238 238 246 -82 82 106 -139 131 148 -180 172 180 -189 197 213 -255 255 255 -139 197 139 -156 205 246 -98 156 238 -90 123 180 -222 205 106 -213 230 246 -255 189 180 -230 106 65 -255 131 115 -246 238 148 diff --git a/data/tilesets/secondary/82D4C8C/palettes/13.pal b/data/tilesets/secondary/82D4C8C/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C8C/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C8C/palettes/14.pal b/data/tilesets/secondary/82D4C8C/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C8C/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C8C/palettes/15.pal b/data/tilesets/secondary/82D4C8C/palettes/15.pal deleted file mode 100644 index 92e7ed309..000000000 --- a/data/tilesets/secondary/82D4C8C/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -0 0 0 diff --git a/data/tilesets/secondary/82D4C8C/palettes/2.pal b/data/tilesets/secondary/82D4C8C/palettes/2.pal deleted file mode 100644 index b1ecd71dc..000000000 --- a/data/tilesets/secondary/82D4C8C/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -90 90 115 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/82D4C8C/palettes/3.pal b/data/tilesets/secondary/82D4C8C/palettes/3.pal deleted file mode 100644 index 43d9b60e3..000000000 --- a/data/tilesets/secondary/82D4C8C/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -65 98 156 -90 123 180 -115 156 197 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -106 172 115 -156 205 139 diff --git a/data/tilesets/secondary/82D4C8C/palettes/4.pal b/data/tilesets/secondary/82D4C8C/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4C8C/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C8C/palettes/5.pal b/data/tilesets/secondary/82D4C8C/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4C8C/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C8C/palettes/6.pal b/data/tilesets/secondary/82D4C8C/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4C8C/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C8C/palettes/7.pal b/data/tilesets/secondary/82D4C8C/palettes/7.pal deleted file mode 100644 index 3d7f8bd89..000000000 --- a/data/tilesets/secondary/82D4C8C/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -139 131 148 -180 172 180 -189 197 213 -255 255 255 -255 205 139 -230 164 98 -197 131 65 -172 90 24 -82 148 197 -131 189 222 -189 230 255 -123 123 123 -197 180 74 -246 238 148 diff --git a/data/tilesets/secondary/82D4C8C/palettes/8.pal b/data/tilesets/secondary/82D4C8C/palettes/8.pal deleted file mode 100644 index 7fce49d06..000000000 --- a/data/tilesets/secondary/82D4C8C/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -139 131 148 -180 172 180 -189 197 213 -255 255 255 -222 222 180 -197 197 148 -156 156 106 -230 164 98 -172 90 24 -172 164 65 -139 123 24 -246 238 148 -0 0 0 -246 238 148 diff --git a/data/tilesets/secondary/82D4C8C/palettes/9.pal b/data/tilesets/secondary/82D4C8C/palettes/9.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4C8C/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4C8C/tiles.png b/data/tilesets/secondary/82D4C8C/tiles.png deleted file mode 100644 index 6caeac8a8..000000000 Binary files a/data/tilesets/secondary/82D4C8C/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4CA4/metatile_attributes.bin b/data/tilesets/secondary/82D4CA4/metatile_attributes.bin deleted file mode 100644 index 1b7a02c1f..000000000 Binary files a/data/tilesets/secondary/82D4CA4/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4CA4/metatiles.bin b/data/tilesets/secondary/82D4CA4/metatiles.bin deleted file mode 100644 index 25e3b6297..000000000 Binary files a/data/tilesets/secondary/82D4CA4/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4CA4/palettes/0.pal b/data/tilesets/secondary/82D4CA4/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/82D4CA4/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D4CA4/palettes/1.pal b/data/tilesets/secondary/82D4CA4/palettes/1.pal deleted file mode 100644 index d99adafff..000000000 --- a/data/tilesets/secondary/82D4CA4/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/82D4CA4/palettes/10.pal b/data/tilesets/secondary/82D4CA4/palettes/10.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4CA4/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CA4/palettes/11.pal b/data/tilesets/secondary/82D4CA4/palettes/11.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4CA4/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CA4/palettes/12.pal b/data/tilesets/secondary/82D4CA4/palettes/12.pal deleted file mode 100644 index ebfedc7d5..000000000 --- a/data/tilesets/secondary/82D4CA4/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -131 131 131 -180 180 164 -255 255 255 -172 131 115 -197 156 148 -238 180 164 -255 222 197 -255 238 238 -230 164 98 -255 197 98 -205 164 156 -180 139 123 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4CA4/palettes/13.pal b/data/tilesets/secondary/82D4CA4/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4CA4/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CA4/palettes/14.pal b/data/tilesets/secondary/82D4CA4/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4CA4/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CA4/palettes/15.pal b/data/tilesets/secondary/82D4CA4/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4CA4/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CA4/palettes/2.pal b/data/tilesets/secondary/82D4CA4/palettes/2.pal deleted file mode 100644 index cc3a9457d..000000000 --- a/data/tilesets/secondary/82D4CA4/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/82D4CA4/palettes/3.pal b/data/tilesets/secondary/82D4CA4/palettes/3.pal deleted file mode 100644 index 7ec794ae5..000000000 --- a/data/tilesets/secondary/82D4CA4/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4CA4/palettes/4.pal b/data/tilesets/secondary/82D4CA4/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4CA4/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CA4/palettes/5.pal b/data/tilesets/secondary/82D4CA4/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4CA4/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CA4/palettes/6.pal b/data/tilesets/secondary/82D4CA4/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4CA4/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CA4/palettes/7.pal b/data/tilesets/secondary/82D4CA4/palettes/7.pal deleted file mode 100644 index 9020b628f..000000000 --- a/data/tilesets/secondary/82D4CA4/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -156 131 57 -213 197 106 -246 238 148 -213 222 238 -222 230 255 -41 106 82 -57 131 115 -172 131 115 -197 156 148 -238 180 164 -180 139 123 diff --git a/data/tilesets/secondary/82D4CA4/palettes/8.pal b/data/tilesets/secondary/82D4CA4/palettes/8.pal deleted file mode 100644 index 1873ad439..000000000 --- a/data/tilesets/secondary/82D4CA4/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -156 131 57 -213 197 106 -246 238 148 -156 205 246 -115 172 222 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4CA4/palettes/9.pal b/data/tilesets/secondary/82D4CA4/palettes/9.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4CA4/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CA4/tiles.png b/data/tilesets/secondary/82D4CA4/tiles.png deleted file mode 100644 index cf2fa4ff7..000000000 Binary files a/data/tilesets/secondary/82D4CA4/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4CBC/metatile_attributes.bin b/data/tilesets/secondary/82D4CBC/metatile_attributes.bin deleted file mode 100644 index a84364708..000000000 Binary files a/data/tilesets/secondary/82D4CBC/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4CBC/metatiles.bin b/data/tilesets/secondary/82D4CBC/metatiles.bin deleted file mode 100644 index 2980877c1..000000000 Binary files a/data/tilesets/secondary/82D4CBC/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4CBC/palettes/0.pal b/data/tilesets/secondary/82D4CBC/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/82D4CBC/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D4CBC/palettes/1.pal b/data/tilesets/secondary/82D4CBC/palettes/1.pal deleted file mode 100644 index 3a16a45c7..000000000 --- a/data/tilesets/secondary/82D4CBC/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -238 246 238 diff --git a/data/tilesets/secondary/82D4CBC/palettes/10.pal b/data/tilesets/secondary/82D4CBC/palettes/10.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4CBC/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CBC/palettes/11.pal b/data/tilesets/secondary/82D4CBC/palettes/11.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4CBC/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CBC/palettes/12.pal b/data/tilesets/secondary/82D4CBC/palettes/12.pal deleted file mode 100644 index d2c6cb089..000000000 --- a/data/tilesets/secondary/82D4CBC/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -230 230 230 -255 255 255 -180 115 82 -213 156 123 -123 123 123 -106 156 148 -139 189 180 -180 222 213 -255 0 255 -213 213 213 -230 189 123 -246 197 156 diff --git a/data/tilesets/secondary/82D4CBC/palettes/13.pal b/data/tilesets/secondary/82D4CBC/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4CBC/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CBC/palettes/14.pal b/data/tilesets/secondary/82D4CBC/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4CBC/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CBC/palettes/15.pal b/data/tilesets/secondary/82D4CBC/palettes/15.pal deleted file mode 100644 index 92e7ed309..000000000 --- a/data/tilesets/secondary/82D4CBC/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -0 0 0 diff --git a/data/tilesets/secondary/82D4CBC/palettes/2.pal b/data/tilesets/secondary/82D4CBC/palettes/2.pal deleted file mode 100644 index c8ee236d7..000000000 --- a/data/tilesets/secondary/82D4CBC/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -255 0 255 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/82D4CBC/palettes/3.pal b/data/tilesets/secondary/82D4CBC/palettes/3.pal deleted file mode 100644 index b17dbb054..000000000 --- a/data/tilesets/secondary/82D4CBC/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -164 164 164 -180 189 189 -255 255 255 -238 246 238 -213 230 222 -197 205 197 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CBC/palettes/4.pal b/data/tilesets/secondary/82D4CBC/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4CBC/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CBC/palettes/5.pal b/data/tilesets/secondary/82D4CBC/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4CBC/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CBC/palettes/6.pal b/data/tilesets/secondary/82D4CBC/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4CBC/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CBC/palettes/7.pal b/data/tilesets/secondary/82D4CBC/palettes/7.pal deleted file mode 100644 index f55e52fe2..000000000 --- a/data/tilesets/secondary/82D4CBC/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -139 139 148 -197 189 213 -255 255 255 -205 197 106 -246 238 148 -255 255 222 -98 98 123 -238 238 238 -82 222 123 -131 255 164 -82 164 57 -255 0 255 -255 0 255 -172 106 74 diff --git a/data/tilesets/secondary/82D4CBC/palettes/8.pal b/data/tilesets/secondary/82D4CBC/palettes/8.pal deleted file mode 100644 index 3a7dbc274..000000000 --- a/data/tilesets/secondary/82D4CBC/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -139 139 148 -197 189 213 -255 255 255 -222 222 238 -230 205 131 -189 197 82 -222 230 115 -238 230 148 -74 123 180 -131 131 139 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4CBC/palettes/9.pal b/data/tilesets/secondary/82D4CBC/palettes/9.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4CBC/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CBC/tiles.png b/data/tilesets/secondary/82D4CBC/tiles.png deleted file mode 100644 index b53b94b96..000000000 Binary files a/data/tilesets/secondary/82D4CBC/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4CD4/metatile_attributes.bin b/data/tilesets/secondary/82D4CD4/metatile_attributes.bin deleted file mode 100644 index 6c4ffed21..000000000 Binary files a/data/tilesets/secondary/82D4CD4/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4CD4/metatiles.bin b/data/tilesets/secondary/82D4CD4/metatiles.bin deleted file mode 100644 index af8effb11..000000000 Binary files a/data/tilesets/secondary/82D4CD4/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4CD4/palettes/0.pal b/data/tilesets/secondary/82D4CD4/palettes/0.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4CD4/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CD4/palettes/1.pal b/data/tilesets/secondary/82D4CD4/palettes/1.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4CD4/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CD4/palettes/10.pal b/data/tilesets/secondary/82D4CD4/palettes/10.pal deleted file mode 100644 index 432f42149..000000000 --- a/data/tilesets/secondary/82D4CD4/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -65 74 106 -123 123 131 -189 189 164 -255 255 255 -213 197 74 -213 180 131 -148 115 41 -172 139 57 -213 213 180 -106 139 49 -131 172 74 -164 205 106 -197 255 172 -115 90 57 -255 0 0 diff --git a/data/tilesets/secondary/82D4CD4/palettes/11.pal b/data/tilesets/secondary/82D4CD4/palettes/11.pal deleted file mode 100644 index 8c2460403..000000000 --- a/data/tilesets/secondary/82D4CD4/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -65 74 106 -139 139 139 -189 189 164 -255 255 255 -222 197 74 -230 230 106 -230 222 246 -148 98 123 -197 131 156 -197 164 189 -123 164 189 -131 197 98 -172 238 139 -90 156 57 -0 0 0 diff --git a/data/tilesets/secondary/82D4CD4/palettes/12.pal b/data/tilesets/secondary/82D4CD4/palettes/12.pal deleted file mode 100644 index 920ad12c9..000000000 --- a/data/tilesets/secondary/82D4CD4/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -65 74 106 -139 139 139 -180 180 164 -255 255 255 -189 180 49 -222 213 82 -123 115 49 -156 148 16 -213 213 180 -98 156 139 -123 180 189 -172 222 230 -255 205 139 -246 246 164 -222 131 90 diff --git a/data/tilesets/secondary/82D4CD4/palettes/13.pal b/data/tilesets/secondary/82D4CD4/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4CD4/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CD4/palettes/14.pal b/data/tilesets/secondary/82D4CD4/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4CD4/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CD4/palettes/15.pal b/data/tilesets/secondary/82D4CD4/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4CD4/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CD4/palettes/2.pal b/data/tilesets/secondary/82D4CD4/palettes/2.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4CD4/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CD4/palettes/3.pal b/data/tilesets/secondary/82D4CD4/palettes/3.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4CD4/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CD4/palettes/4.pal b/data/tilesets/secondary/82D4CD4/palettes/4.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4CD4/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CD4/palettes/5.pal b/data/tilesets/secondary/82D4CD4/palettes/5.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4CD4/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CD4/palettes/6.pal b/data/tilesets/secondary/82D4CD4/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4CD4/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CD4/palettes/7.pal b/data/tilesets/secondary/82D4CD4/palettes/7.pal deleted file mode 100644 index 533778712..000000000 --- a/data/tilesets/secondary/82D4CD4/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -65 74 106 -139 139 139 -189 189 164 -255 255 255 -230 222 246 -255 238 213 -255 0 0 -115 115 164 -131 139 230 -164 164 255 -156 106 16 -115 115 139 -213 213 172 -222 172 82 -189 139 49 diff --git a/data/tilesets/secondary/82D4CD4/palettes/8.pal b/data/tilesets/secondary/82D4CD4/palettes/8.pal deleted file mode 100644 index 0b01f1a0f..000000000 --- a/data/tilesets/secondary/82D4CD4/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -65 74 106 -139 139 148 -180 180 164 -255 255 255 -255 0 0 -255 0 0 -255 0 0 -255 0 0 -172 90 49 -205 98 57 -246 139 98 -255 205 139 -255 0 0 -255 0 0 -255 0 0 diff --git a/data/tilesets/secondary/82D4CD4/palettes/9.pal b/data/tilesets/secondary/82D4CD4/palettes/9.pal deleted file mode 100644 index 371e5a211..000000000 --- a/data/tilesets/secondary/82D4CD4/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -65 74 106 -139 139 139 -189 189 164 -255 255 255 -230 222 246 -148 148 197 -189 189 246 -205 106 49 -246 180 49 -255 246 131 -255 0 0 -189 172 82 -213 205 98 -148 115 41 -172 139 57 diff --git a/data/tilesets/secondary/82D4CD4/tiles.png b/data/tilesets/secondary/82D4CD4/tiles.png deleted file mode 100644 index ef8a943fa..000000000 Binary files a/data/tilesets/secondary/82D4CD4/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4CEC/metatile_attributes.bin b/data/tilesets/secondary/82D4CEC/metatile_attributes.bin deleted file mode 100644 index a2bcd959e..000000000 Binary files a/data/tilesets/secondary/82D4CEC/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4CEC/metatiles.bin b/data/tilesets/secondary/82D4CEC/metatiles.bin deleted file mode 100644 index 1529f8582..000000000 Binary files a/data/tilesets/secondary/82D4CEC/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4CEC/palettes/0.pal b/data/tilesets/secondary/82D4CEC/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/82D4CEC/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D4CEC/palettes/1.pal b/data/tilesets/secondary/82D4CEC/palettes/1.pal deleted file mode 100644 index d99adafff..000000000 --- a/data/tilesets/secondary/82D4CEC/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/82D4CEC/palettes/10.pal b/data/tilesets/secondary/82D4CEC/palettes/10.pal deleted file mode 100644 index 6d76050a9..000000000 --- a/data/tilesets/secondary/82D4CEC/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -230 230 230 -172 148 197 -205 164 230 -230 197 255 -238 230 123 -189 172 98 -255 255 148 -131 255 255 -74 131 197 -230 189 164 -255 0 255 diff --git a/data/tilesets/secondary/82D4CEC/palettes/11.pal b/data/tilesets/secondary/82D4CEC/palettes/11.pal deleted file mode 100644 index 9359b8858..000000000 --- a/data/tilesets/secondary/82D4CEC/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -172 172 156 -230 230 205 -197 197 172 -172 172 164 -189 189 164 -255 0 255 -131 172 238 -106 197 106 -197 180 74 -255 0 255 -222 222 222 -213 139 57 -255 255 255 diff --git a/data/tilesets/secondary/82D4CEC/palettes/12.pal b/data/tilesets/secondary/82D4CEC/palettes/12.pal deleted file mode 100644 index 61b3764be..000000000 --- a/data/tilesets/secondary/82D4CEC/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -222 238 255 -255 0 255 -255 0 255 -32 156 222 -139 197 255 -180 98 0 -197 123 0 -205 139 0 -213 164 0 -230 180 0 -230 197 65 diff --git a/data/tilesets/secondary/82D4CEC/palettes/13.pal b/data/tilesets/secondary/82D4CEC/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4CEC/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CEC/palettes/14.pal b/data/tilesets/secondary/82D4CEC/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4CEC/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CEC/palettes/15.pal b/data/tilesets/secondary/82D4CEC/palettes/15.pal deleted file mode 100644 index 3bb14e445..000000000 --- a/data/tilesets/secondary/82D4CEC/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -230 230 205 -205 205 180 -172 172 148 -222 222 222 -156 115 197 -131 172 238 -106 197 106 -197 180 74 -0 0 0 -213 139 57 -238 222 131 -255 255 255 diff --git a/data/tilesets/secondary/82D4CEC/palettes/2.pal b/data/tilesets/secondary/82D4CEC/palettes/2.pal deleted file mode 100644 index cc3a9457d..000000000 --- a/data/tilesets/secondary/82D4CEC/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/82D4CEC/palettes/3.pal b/data/tilesets/secondary/82D4CEC/palettes/3.pal deleted file mode 100644 index 7ec794ae5..000000000 --- a/data/tilesets/secondary/82D4CEC/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4CEC/palettes/4.pal b/data/tilesets/secondary/82D4CEC/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4CEC/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CEC/palettes/5.pal b/data/tilesets/secondary/82D4CEC/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4CEC/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CEC/palettes/6.pal b/data/tilesets/secondary/82D4CEC/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4CEC/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4CEC/palettes/7.pal b/data/tilesets/secondary/82D4CEC/palettes/7.pal deleted file mode 100644 index b3612e537..000000000 --- a/data/tilesets/secondary/82D4CEC/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -131 131 131 -180 180 164 -255 255 255 -255 164 115 -255 222 189 -123 164 238 -172 205 238 -213 230 238 -164 255 180 -238 164 0 -139 90 197 -213 156 255 -255 255 148 -255 0 255 diff --git a/data/tilesets/secondary/82D4CEC/palettes/8.pal b/data/tilesets/secondary/82D4CEC/palettes/8.pal deleted file mode 100644 index e58f94305..000000000 --- a/data/tilesets/secondary/82D4CEC/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 255 0 -82 82 106 -131 131 131 -180 180 164 -255 255 255 -255 255 123 -205 180 98 -246 230 172 -74 131 197 -139 197 255 -164 255 180 -238 246 246 -164 74 32 -213 115 57 -238 148 98 -255 189 98 diff --git a/data/tilesets/secondary/82D4CEC/palettes/9.pal b/data/tilesets/secondary/82D4CEC/palettes/9.pal deleted file mode 100644 index 75f1d81b5..000000000 --- a/data/tilesets/secondary/82D4CEC/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -255 0 255 -255 0 255 -255 255 255 -255 0 255 -131 172 238 -246 230 172 -82 180 172 -32 115 123 -255 148 115 -230 106 90 -90 213 156 -255 189 82 -16 123 255 -131 189 246 diff --git a/data/tilesets/secondary/82D4CEC/tiles.png b/data/tilesets/secondary/82D4CEC/tiles.png deleted file mode 100644 index b5b249d0a..000000000 Binary files a/data/tilesets/secondary/82D4CEC/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4D04/metatile_attributes.bin b/data/tilesets/secondary/82D4D04/metatile_attributes.bin deleted file mode 100644 index ead3610f0..000000000 Binary files a/data/tilesets/secondary/82D4D04/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4D04/metatiles.bin b/data/tilesets/secondary/82D4D04/metatiles.bin deleted file mode 100644 index 7034bb6d6..000000000 Binary files a/data/tilesets/secondary/82D4D04/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4D04/palettes/0.pal b/data/tilesets/secondary/82D4D04/palettes/0.pal deleted file mode 100644 index 8db07d418..000000000 --- a/data/tilesets/secondary/82D4D04/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D4D04/palettes/1.pal b/data/tilesets/secondary/82D4D04/palettes/1.pal deleted file mode 100644 index 66561f6d3..000000000 --- a/data/tilesets/secondary/82D4D04/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -139 180 222 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/82D4D04/palettes/10.pal b/data/tilesets/secondary/82D4D04/palettes/10.pal deleted file mode 100644 index 131aaa71c..000000000 --- a/data/tilesets/secondary/82D4D04/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4D04/palettes/11.pal b/data/tilesets/secondary/82D4D04/palettes/11.pal deleted file mode 100644 index 131aaa71c..000000000 --- a/data/tilesets/secondary/82D4D04/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4D04/palettes/12.pal b/data/tilesets/secondary/82D4D04/palettes/12.pal deleted file mode 100644 index c8dfac7d2..000000000 --- a/data/tilesets/secondary/82D4D04/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -131 131 131 -98 74 49 -131 106 82 -164 139 115 -197 189 139 -148 148 156 -172 172 172 -172 189 115 -205 222 148 -98 131 131 -131 164 164 -164 197 197 -82 82 106 -123 123 139 -205 205 197 -255 255 255 diff --git a/data/tilesets/secondary/82D4D04/palettes/13.pal b/data/tilesets/secondary/82D4D04/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D04/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D04/palettes/14.pal b/data/tilesets/secondary/82D4D04/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D04/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D04/palettes/15.pal b/data/tilesets/secondary/82D4D04/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D04/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D04/palettes/2.pal b/data/tilesets/secondary/82D4D04/palettes/2.pal deleted file mode 100644 index 87a022102..000000000 --- a/data/tilesets/secondary/82D4D04/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -90 90 115 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/82D4D04/palettes/3.pal b/data/tilesets/secondary/82D4D04/palettes/3.pal deleted file mode 100644 index 783496dcd..000000000 --- a/data/tilesets/secondary/82D4D04/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -65 98 156 -90 123 180 -115 156 197 -222 213 131 -164 164 172 -205 205 213 -238 238 246 -106 172 115 -156 205 139 diff --git a/data/tilesets/secondary/82D4D04/palettes/4.pal b/data/tilesets/secondary/82D4D04/palettes/4.pal deleted file mode 100644 index 89eace605..000000000 --- a/data/tilesets/secondary/82D4D04/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 238 246 -172 197 180 -197 222 205 -90 189 172 -246 238 156 -205 189 131 -189 164 123 -148 131 106 -106 106 106 -213 222 230 -238 180 115 diff --git a/data/tilesets/secondary/82D4D04/palettes/5.pal b/data/tilesets/secondary/82D4D04/palettes/5.pal deleted file mode 100644 index 0eef3df8e..000000000 --- a/data/tilesets/secondary/82D4D04/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -213 222 222 -164 180 189 -255 0 255 -131 115 74 -213 213 148 -197 189 139 -172 156 115 -148 131 90 -255 0 255 -255 0 255 -0 0 0 diff --git a/data/tilesets/secondary/82D4D04/palettes/6.pal b/data/tilesets/secondary/82D4D04/palettes/6.pal deleted file mode 100644 index 1d08ce9a2..000000000 --- a/data/tilesets/secondary/82D4D04/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D04/palettes/7.pal b/data/tilesets/secondary/82D4D04/palettes/7.pal deleted file mode 100644 index 34c0ddd17..000000000 --- a/data/tilesets/secondary/82D4D04/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -131 131 131 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -82 82 106 -123 123 139 -205 205 197 -255 255 255 diff --git a/data/tilesets/secondary/82D4D04/palettes/8.pal b/data/tilesets/secondary/82D4D04/palettes/8.pal deleted file mode 100644 index 77e03a48c..000000000 --- a/data/tilesets/secondary/82D4D04/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -172 172 164 -222 213 139 -180 172 98 -156 148 82 -213 255 197 -164 230 148 -123 172 148 -148 213 164 -156 74 41 -180 90 65 -213 131 106 -238 164 139 -246 238 205 diff --git a/data/tilesets/secondary/82D4D04/palettes/9.pal b/data/tilesets/secondary/82D4D04/palettes/9.pal deleted file mode 100644 index ef91ae987..000000000 --- a/data/tilesets/secondary/82D4D04/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -172 172 164 -156 189 131 -222 205 115 -156 148 82 -123 106 57 -74 131 164 -98 172 205 -49 139 49 -106 205 164 -156 148 82 -115 164 106 -205 230 197 -238 255 238 diff --git a/data/tilesets/secondary/82D4D04/tiles.png b/data/tilesets/secondary/82D4D04/tiles.png deleted file mode 100644 index 6e97a68a1..000000000 Binary files a/data/tilesets/secondary/82D4D04/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4D1C/metatile_attributes.bin b/data/tilesets/secondary/82D4D1C/metatile_attributes.bin deleted file mode 100644 index 84b5e2049..000000000 Binary files a/data/tilesets/secondary/82D4D1C/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4D1C/metatiles.bin b/data/tilesets/secondary/82D4D1C/metatiles.bin deleted file mode 100644 index c026eb65a..000000000 Binary files a/data/tilesets/secondary/82D4D1C/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4D1C/palettes/0.pal b/data/tilesets/secondary/82D4D1C/palettes/0.pal deleted file mode 100644 index 4b44e19f4..000000000 --- a/data/tilesets/secondary/82D4D1C/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -205 156 156 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D4D1C/palettes/1.pal b/data/tilesets/secondary/82D4D1C/palettes/1.pal deleted file mode 100644 index a39ca6aa8..000000000 --- a/data/tilesets/secondary/82D4D1C/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -205 156 156 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/82D4D1C/palettes/10.pal b/data/tilesets/secondary/82D4D1C/palettes/10.pal deleted file mode 100644 index c06a049b0..000000000 --- a/data/tilesets/secondary/82D4D1C/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D1C/palettes/11.pal b/data/tilesets/secondary/82D4D1C/palettes/11.pal deleted file mode 100644 index c06a049b0..000000000 --- a/data/tilesets/secondary/82D4D1C/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D1C/palettes/12.pal b/data/tilesets/secondary/82D4D1C/palettes/12.pal deleted file mode 100644 index 419c00911..000000000 --- a/data/tilesets/secondary/82D4D1C/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -123 164 172 -222 189 172 -246 213 189 -246 230 180 -255 246 213 -164 189 213 -189 205 230 -222 230 246 -98 123 148 -123 148 172 -148 172 197 -98 98 123 -148 139 131 -205 189 197 -255 255 255 diff --git a/data/tilesets/secondary/82D4D1C/palettes/13.pal b/data/tilesets/secondary/82D4D1C/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D1C/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D1C/palettes/14.pal b/data/tilesets/secondary/82D4D1C/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D1C/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D1C/palettes/15.pal b/data/tilesets/secondary/82D4D1C/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D1C/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D1C/palettes/2.pal b/data/tilesets/secondary/82D4D1C/palettes/2.pal deleted file mode 100644 index 5a4f127be..000000000 --- a/data/tilesets/secondary/82D4D1C/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -205 156 156 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/82D4D1C/palettes/3.pal b/data/tilesets/secondary/82D4D1C/palettes/3.pal deleted file mode 100644 index c84fa4a58..000000000 --- a/data/tilesets/secondary/82D4D1C/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -205 156 156 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4D1C/palettes/4.pal b/data/tilesets/secondary/82D4D1C/palettes/4.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D1C/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D1C/palettes/5.pal b/data/tilesets/secondary/82D4D1C/palettes/5.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D1C/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D1C/palettes/6.pal b/data/tilesets/secondary/82D4D1C/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D1C/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D1C/palettes/7.pal b/data/tilesets/secondary/82D4D1C/palettes/7.pal deleted file mode 100644 index aac016a72..000000000 --- a/data/tilesets/secondary/82D4D1C/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -156 205 246 -98 156 238 -0 0 0 -0 0 0 -123 164 172 -148 189 197 -172 205 213 -205 222 230 -98 123 148 -123 148 172 -148 172 197 -98 98 123 -148 139 131 -222 205 213 -255 255 255 diff --git a/data/tilesets/secondary/82D4D1C/palettes/8.pal b/data/tilesets/secondary/82D4D1C/palettes/8.pal deleted file mode 100644 index c06a049b0..000000000 --- a/data/tilesets/secondary/82D4D1C/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D1C/palettes/9.pal b/data/tilesets/secondary/82D4D1C/palettes/9.pal deleted file mode 100644 index c06a049b0..000000000 --- a/data/tilesets/secondary/82D4D1C/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D1C/tiles.png b/data/tilesets/secondary/82D4D1C/tiles.png deleted file mode 100644 index 44b7c0c34..000000000 Binary files a/data/tilesets/secondary/82D4D1C/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4D34/metatile_attributes.bin b/data/tilesets/secondary/82D4D34/metatile_attributes.bin deleted file mode 100644 index a5e733de0..000000000 Binary files a/data/tilesets/secondary/82D4D34/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4D34/metatiles.bin b/data/tilesets/secondary/82D4D34/metatiles.bin deleted file mode 100644 index 25a46724b..000000000 Binary files a/data/tilesets/secondary/82D4D34/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4D34/palettes/0.pal b/data/tilesets/secondary/82D4D34/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/82D4D34/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D4D34/palettes/1.pal b/data/tilesets/secondary/82D4D34/palettes/1.pal deleted file mode 100644 index d99adafff..000000000 --- a/data/tilesets/secondary/82D4D34/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/82D4D34/palettes/10.pal b/data/tilesets/secondary/82D4D34/palettes/10.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4D34/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D34/palettes/11.pal b/data/tilesets/secondary/82D4D34/palettes/11.pal deleted file mode 100644 index 9fa42f21f..000000000 --- a/data/tilesets/secondary/82D4D34/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -65 74 106 -90 90 115 -123 123 131 -148 164 180 -172 189 205 -205 222 238 -246 246 255 -255 0 255 -255 0 255 -205 82 65 -255 131 115 -230 172 57 -222 213 0 -222 180 65 -255 222 98 diff --git a/data/tilesets/secondary/82D4D34/palettes/12.pal b/data/tilesets/secondary/82D4D34/palettes/12.pal deleted file mode 100644 index 5e2756cc9..000000000 --- a/data/tilesets/secondary/82D4D34/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -131 131 131 -180 180 164 -255 255 255 -222 180 65 -238 197 82 -189 148 49 -246 238 164 -213 213 222 -156 156 205 -180 180 246 -82 106 156 -123 148 197 -189 197 255 -0 0 0 diff --git a/data/tilesets/secondary/82D4D34/palettes/13.pal b/data/tilesets/secondary/82D4D34/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D34/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D34/palettes/14.pal b/data/tilesets/secondary/82D4D34/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D34/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D34/palettes/15.pal b/data/tilesets/secondary/82D4D34/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D34/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D34/palettes/2.pal b/data/tilesets/secondary/82D4D34/palettes/2.pal deleted file mode 100644 index cc3a9457d..000000000 --- a/data/tilesets/secondary/82D4D34/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/82D4D34/palettes/3.pal b/data/tilesets/secondary/82D4D34/palettes/3.pal deleted file mode 100644 index 7ec794ae5..000000000 --- a/data/tilesets/secondary/82D4D34/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4D34/palettes/4.pal b/data/tilesets/secondary/82D4D34/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4D34/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D34/palettes/5.pal b/data/tilesets/secondary/82D4D34/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4D34/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D34/palettes/6.pal b/data/tilesets/secondary/82D4D34/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D34/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D34/palettes/7.pal b/data/tilesets/secondary/82D4D34/palettes/7.pal deleted file mode 100644 index efd64bcc5..000000000 --- a/data/tilesets/secondary/82D4D34/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -32 180 230 -172 255 230 -189 189 115 -238 222 164 -255 255 180 -205 82 65 -255 131 115 -189 180 106 -205 197 123 -222 222 148 -164 164 98 diff --git a/data/tilesets/secondary/82D4D34/palettes/8.pal b/data/tilesets/secondary/82D4D34/palettes/8.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4D34/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D34/palettes/9.pal b/data/tilesets/secondary/82D4D34/palettes/9.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4D34/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D34/tiles.png b/data/tilesets/secondary/82D4D34/tiles.png deleted file mode 100644 index 1baac0893..000000000 Binary files a/data/tilesets/secondary/82D4D34/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4D4C/metatile_attributes.bin b/data/tilesets/secondary/82D4D4C/metatile_attributes.bin deleted file mode 100644 index def1ee695..000000000 Binary files a/data/tilesets/secondary/82D4D4C/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4D4C/metatiles.bin b/data/tilesets/secondary/82D4D4C/metatiles.bin deleted file mode 100644 index f3f58a44d..000000000 Binary files a/data/tilesets/secondary/82D4D4C/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4D4C/palettes/0.pal b/data/tilesets/secondary/82D4D4C/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/82D4D4C/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D4D4C/palettes/1.pal b/data/tilesets/secondary/82D4D4C/palettes/1.pal deleted file mode 100644 index 69f3f0b9e..000000000 --- a/data/tilesets/secondary/82D4D4C/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -180 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -238 246 238 diff --git a/data/tilesets/secondary/82D4D4C/palettes/10.pal b/data/tilesets/secondary/82D4D4C/palettes/10.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D4C/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D4C/palettes/11.pal b/data/tilesets/secondary/82D4D4C/palettes/11.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D4C/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D4C/palettes/12.pal b/data/tilesets/secondary/82D4D4C/palettes/12.pal deleted file mode 100644 index 041512724..000000000 --- a/data/tilesets/secondary/82D4D4C/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -41 123 123 -41 156 156 -49 189 172 -65 230 189 -65 246 230 -106 90 74 -131 106 74 -156 131 65 -172 156 74 -172 156 106 -205 180 106 -222 205 98 -230 222 106 diff --git a/data/tilesets/secondary/82D4D4C/palettes/13.pal b/data/tilesets/secondary/82D4D4C/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D4C/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D4C/palettes/14.pal b/data/tilesets/secondary/82D4D4C/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D4C/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D4C/palettes/15.pal b/data/tilesets/secondary/82D4D4C/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D4C/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D4C/palettes/2.pal b/data/tilesets/secondary/82D4D4C/palettes/2.pal deleted file mode 100644 index 330e35b02..000000000 --- a/data/tilesets/secondary/82D4D4C/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -213 131 82 -156 205 246 -98 156 238 -57 123 222 -222 139 106 -189 98 74 diff --git a/data/tilesets/secondary/82D4D4C/palettes/3.pal b/data/tilesets/secondary/82D4D4C/palettes/3.pal deleted file mode 100644 index eac8236f1..000000000 --- a/data/tilesets/secondary/82D4D4C/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -148 148 148 -180 180 180 -255 255 255 -238 246 238 -222 238 222 -197 205 197 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D4C/palettes/4.pal b/data/tilesets/secondary/82D4D4C/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4D4C/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D4C/palettes/5.pal b/data/tilesets/secondary/82D4D4C/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4D4C/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D4C/palettes/6.pal b/data/tilesets/secondary/82D4D4C/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D4C/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D4C/palettes/7.pal b/data/tilesets/secondary/82D4D4C/palettes/7.pal deleted file mode 100644 index 9d84ecaba..000000000 --- a/data/tilesets/secondary/82D4D4C/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -139 139 148 -74 156 90 -65 139 139 -115 205 90 -148 238 74 -189 255 98 -156 131 82 -197 115 123 -255 164 123 -238 238 172 -82 115 82 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4D4C/palettes/8.pal b/data/tilesets/secondary/82D4D4C/palettes/8.pal deleted file mode 100644 index 085c49344..000000000 --- a/data/tilesets/secondary/82D4D4C/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -139 139 148 -222 213 246 -238 238 255 -123 156 246 -106 197 255 -131 222 255 -156 230 255 -115 90 98 -189 115 131 -246 189 115 -222 189 246 -255 230 115 -90 98 213 -255 172 197 diff --git a/data/tilesets/secondary/82D4D4C/palettes/9.pal b/data/tilesets/secondary/82D4D4C/palettes/9.pal deleted file mode 100644 index 9020b628f..000000000 --- a/data/tilesets/secondary/82D4D4C/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -156 131 57 -213 197 106 -246 238 148 -213 222 238 -222 230 255 -41 106 82 -57 131 115 -172 131 115 -197 156 148 -238 180 164 -180 139 123 diff --git a/data/tilesets/secondary/82D4D4C/tiles.png b/data/tilesets/secondary/82D4D4C/tiles.png deleted file mode 100644 index ef08ccc83..000000000 Binary files a/data/tilesets/secondary/82D4D4C/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4D64/metatile_attributes.bin b/data/tilesets/secondary/82D4D64/metatile_attributes.bin deleted file mode 100644 index ee895c35a..000000000 Binary files a/data/tilesets/secondary/82D4D64/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4D64/metatiles.bin b/data/tilesets/secondary/82D4D64/metatiles.bin deleted file mode 100644 index e0fdb79fb..000000000 Binary files a/data/tilesets/secondary/82D4D64/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4D64/palettes/0.pal b/data/tilesets/secondary/82D4D64/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/82D4D64/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D4D64/palettes/1.pal b/data/tilesets/secondary/82D4D64/palettes/1.pal deleted file mode 100644 index 3a16a45c7..000000000 --- a/data/tilesets/secondary/82D4D64/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -238 246 238 diff --git a/data/tilesets/secondary/82D4D64/palettes/10.pal b/data/tilesets/secondary/82D4D64/palettes/10.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4D64/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D64/palettes/11.pal b/data/tilesets/secondary/82D4D64/palettes/11.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4D64/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D64/palettes/12.pal b/data/tilesets/secondary/82D4D64/palettes/12.pal deleted file mode 100644 index 702c67ecb..000000000 --- a/data/tilesets/secondary/82D4D64/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 131 -197 189 213 -255 255 255 -148 148 156 -180 139 222 -205 172 246 -222 205 255 -106 123 172 -131 148 197 -156 172 230 -65 205 82 -180 255 197 -246 164 115 -255 230 148 diff --git a/data/tilesets/secondary/82D4D64/palettes/13.pal b/data/tilesets/secondary/82D4D64/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D64/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D64/palettes/14.pal b/data/tilesets/secondary/82D4D64/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D64/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D64/palettes/15.pal b/data/tilesets/secondary/82D4D64/palettes/15.pal deleted file mode 100644 index 92e7ed309..000000000 --- a/data/tilesets/secondary/82D4D64/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -0 0 0 diff --git a/data/tilesets/secondary/82D4D64/palettes/2.pal b/data/tilesets/secondary/82D4D64/palettes/2.pal deleted file mode 100644 index c8ee236d7..000000000 --- a/data/tilesets/secondary/82D4D64/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -255 0 255 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/82D4D64/palettes/3.pal b/data/tilesets/secondary/82D4D64/palettes/3.pal deleted file mode 100644 index b17dbb054..000000000 --- a/data/tilesets/secondary/82D4D64/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -164 164 164 -180 189 189 -255 255 255 -238 246 238 -213 230 222 -197 205 197 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D64/palettes/4.pal b/data/tilesets/secondary/82D4D64/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4D64/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D64/palettes/5.pal b/data/tilesets/secondary/82D4D64/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4D64/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D64/palettes/6.pal b/data/tilesets/secondary/82D4D64/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D64/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D64/palettes/7.pal b/data/tilesets/secondary/82D4D64/palettes/7.pal deleted file mode 100644 index c66eaedff..000000000 --- a/data/tilesets/secondary/82D4D64/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 131 -197 189 213 -255 255 255 -180 123 148 -230 139 230 -255 222 255 -213 213 222 -213 98 65 -246 139 106 -255 0 255 -255 0 255 -255 0 255 -205 246 255 -98 197 238 diff --git a/data/tilesets/secondary/82D4D64/palettes/8.pal b/data/tilesets/secondary/82D4D64/palettes/8.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4D64/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D64/palettes/9.pal b/data/tilesets/secondary/82D4D64/palettes/9.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4D64/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D64/tiles.png b/data/tilesets/secondary/82D4D64/tiles.png deleted file mode 100644 index 87641a309..000000000 Binary files a/data/tilesets/secondary/82D4D64/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4D7C/metatile_attributes.bin b/data/tilesets/secondary/82D4D7C/metatile_attributes.bin deleted file mode 100644 index 1d68a40a4..000000000 Binary files a/data/tilesets/secondary/82D4D7C/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4D7C/metatiles.bin b/data/tilesets/secondary/82D4D7C/metatiles.bin deleted file mode 100644 index 7a5532619..000000000 Binary files a/data/tilesets/secondary/82D4D7C/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4D7C/palettes/0.pal b/data/tilesets/secondary/82D4D7C/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/82D4D7C/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D4D7C/palettes/1.pal b/data/tilesets/secondary/82D4D7C/palettes/1.pal deleted file mode 100644 index 69f3f0b9e..000000000 --- a/data/tilesets/secondary/82D4D7C/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -180 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -238 246 238 diff --git a/data/tilesets/secondary/82D4D7C/palettes/10.pal b/data/tilesets/secondary/82D4D7C/palettes/10.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D7C/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D7C/palettes/11.pal b/data/tilesets/secondary/82D4D7C/palettes/11.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D7C/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D7C/palettes/12.pal b/data/tilesets/secondary/82D4D7C/palettes/12.pal deleted file mode 100644 index 3f9aa94d6..000000000 --- a/data/tilesets/secondary/82D4D7C/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -106 90 82 -148 115 82 -172 131 90 -213 172 90 -230 180 90 -164 90 172 -197 115 205 -230 148 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4D7C/palettes/13.pal b/data/tilesets/secondary/82D4D7C/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D7C/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D7C/palettes/14.pal b/data/tilesets/secondary/82D4D7C/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D7C/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D7C/palettes/15.pal b/data/tilesets/secondary/82D4D7C/palettes/15.pal deleted file mode 100644 index 92e7ed309..000000000 --- a/data/tilesets/secondary/82D4D7C/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -0 0 0 diff --git a/data/tilesets/secondary/82D4D7C/palettes/2.pal b/data/tilesets/secondary/82D4D7C/palettes/2.pal deleted file mode 100644 index 330e35b02..000000000 --- a/data/tilesets/secondary/82D4D7C/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -213 131 82 -156 205 246 -98 156 238 -57 123 222 -222 139 106 -189 98 74 diff --git a/data/tilesets/secondary/82D4D7C/palettes/3.pal b/data/tilesets/secondary/82D4D7C/palettes/3.pal deleted file mode 100644 index eac8236f1..000000000 --- a/data/tilesets/secondary/82D4D7C/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -148 148 148 -180 180 180 -255 255 255 -238 246 238 -222 238 222 -197 205 197 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D7C/palettes/4.pal b/data/tilesets/secondary/82D4D7C/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4D7C/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D7C/palettes/5.pal b/data/tilesets/secondary/82D4D7C/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4D7C/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D7C/palettes/6.pal b/data/tilesets/secondary/82D4D7C/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D7C/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D7C/palettes/7.pal b/data/tilesets/secondary/82D4D7C/palettes/7.pal deleted file mode 100644 index 5b659ef1b..000000000 --- a/data/tilesets/secondary/82D4D7C/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -139 139 148 -180 156 172 -205 189 189 -230 222 189 -90 115 90 -131 197 115 -205 238 115 -123 82 74 -180 98 98 -255 139 74 -238 246 172 -255 230 74 -106 90 82 -255 0 255 diff --git a/data/tilesets/secondary/82D4D7C/palettes/8.pal b/data/tilesets/secondary/82D4D7C/palettes/8.pal deleted file mode 100644 index f5a4ee678..000000000 --- a/data/tilesets/secondary/82D4D7C/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -139 139 148 -205 189 189 -246 246 255 -148 131 180 -205 189 230 -123 98 255 -82 172 148 -255 98 98 -90 115 90 -131 197 115 -205 238 115 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4D7C/palettes/9.pal b/data/tilesets/secondary/82D4D7C/palettes/9.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D7C/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D7C/tiles.png b/data/tilesets/secondary/82D4D7C/tiles.png deleted file mode 100644 index 213799158..000000000 Binary files a/data/tilesets/secondary/82D4D7C/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4D94/metatile_attributes.bin b/data/tilesets/secondary/82D4D94/metatile_attributes.bin deleted file mode 100644 index 949846f90..000000000 Binary files a/data/tilesets/secondary/82D4D94/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4D94/metatiles.bin b/data/tilesets/secondary/82D4D94/metatiles.bin deleted file mode 100644 index a976297b3..000000000 Binary files a/data/tilesets/secondary/82D4D94/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4D94/palettes/0.pal b/data/tilesets/secondary/82D4D94/palettes/0.pal deleted file mode 100644 index 28232d99e..000000000 --- a/data/tilesets/secondary/82D4D94/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D4D94/palettes/1.pal b/data/tilesets/secondary/82D4D94/palettes/1.pal deleted file mode 100644 index b43532470..000000000 --- a/data/tilesets/secondary/82D4D94/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/82D4D94/palettes/10.pal b/data/tilesets/secondary/82D4D94/palettes/10.pal deleted file mode 100644 index 2a1743eaa..000000000 --- a/data/tilesets/secondary/82D4D94/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -156 205 156 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4D94/palettes/11.pal b/data/tilesets/secondary/82D4D94/palettes/11.pal deleted file mode 100644 index 307e0ea7e..000000000 --- a/data/tilesets/secondary/82D4D94/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -156 205 156 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -0 0 0 diff --git a/data/tilesets/secondary/82D4D94/palettes/12.pal b/data/tilesets/secondary/82D4D94/palettes/12.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D94/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D94/palettes/13.pal b/data/tilesets/secondary/82D4D94/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D94/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D94/palettes/14.pal b/data/tilesets/secondary/82D4D94/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D94/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D94/palettes/15.pal b/data/tilesets/secondary/82D4D94/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4D94/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4D94/palettes/2.pal b/data/tilesets/secondary/82D4D94/palettes/2.pal deleted file mode 100644 index e267ae90e..000000000 --- a/data/tilesets/secondary/82D4D94/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/82D4D94/palettes/3.pal b/data/tilesets/secondary/82D4D94/palettes/3.pal deleted file mode 100644 index 503f22878..000000000 --- a/data/tilesets/secondary/82D4D94/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4D94/palettes/4.pal b/data/tilesets/secondary/82D4D94/palettes/4.pal deleted file mode 100644 index cdf1b6190..000000000 --- a/data/tilesets/secondary/82D4D94/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -222 255 255 -172 222 255 -148 189 238 -106 156 230 -57 148 197 -32 131 172 -82 148 213 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -230 213 148 -238 230 139 -222 197 139 -213 189 106 diff --git a/data/tilesets/secondary/82D4D94/palettes/5.pal b/data/tilesets/secondary/82D4D94/palettes/5.pal deleted file mode 100644 index 09555ded5..000000000 --- a/data/tilesets/secondary/82D4D94/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4D94/palettes/6.pal b/data/tilesets/secondary/82D4D94/palettes/6.pal deleted file mode 100644 index 0dba59a72..000000000 --- a/data/tilesets/secondary/82D4D94/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -222 255 255 -172 222 255 -148 189 238 -106 156 230 -41 90 172 -41 57 148 -74 123 197 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -230 213 148 -238 230 139 -222 197 139 -213 189 106 diff --git a/data/tilesets/secondary/82D4D94/palettes/7.pal b/data/tilesets/secondary/82D4D94/palettes/7.pal deleted file mode 100644 index e9848a1c0..000000000 --- a/data/tilesets/secondary/82D4D94/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -156 205 156 -82 82 106 -115 115 139 -148 148 172 -189 189 205 -222 222 230 -255 255 255 -180 180 74 -205 205 98 -255 255 98 -98 98 172 -131 131 213 -164 164 255 -131 98 41 -164 139 82 -205 180 123 diff --git a/data/tilesets/secondary/82D4D94/palettes/8.pal b/data/tilesets/secondary/82D4D94/palettes/8.pal deleted file mode 100644 index b5c80c8f4..000000000 --- a/data/tilesets/secondary/82D4D94/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -156 205 156 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -90 156 57 -131 180 49 -172 205 49 -197 230 98 -222 255 148 -222 172 98 -255 197 98 -255 222 156 -131 98 41 -164 139 82 -205 180 123 diff --git a/data/tilesets/secondary/82D4D94/palettes/9.pal b/data/tilesets/secondary/82D4D94/palettes/9.pal deleted file mode 100644 index b66b2399a..000000000 --- a/data/tilesets/secondary/82D4D94/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -156 205 156 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -255 0 255 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -255 0 255 -255 0 255 -255 0 255 -131 98 41 -164 139 82 -205 180 123 diff --git a/data/tilesets/secondary/82D4D94/tiles.png b/data/tilesets/secondary/82D4D94/tiles.png deleted file mode 100644 index 280f3e227..000000000 Binary files a/data/tilesets/secondary/82D4D94/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4DAC/metatile_attributes.bin b/data/tilesets/secondary/82D4DAC/metatile_attributes.bin deleted file mode 100644 index 1b1cb4d44..000000000 Binary files a/data/tilesets/secondary/82D4DAC/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4DAC/metatiles.bin b/data/tilesets/secondary/82D4DAC/metatiles.bin deleted file mode 100644 index c15edf653..000000000 Binary files a/data/tilesets/secondary/82D4DAC/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4DAC/palettes/0.pal b/data/tilesets/secondary/82D4DAC/palettes/0.pal deleted file mode 100644 index 0fd74602e..000000000 --- a/data/tilesets/secondary/82D4DAC/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -24 41 82 -255 255 255 -222 230 238 -189 205 230 -156 180 222 -131 131 139 -98 98 123 -65 74 106 -189 189 131 -115 189 246 -98 172 238 -115 189 246 -98 164 222 -82 139 197 -74 115 172 -115 197 164 diff --git a/data/tilesets/secondary/82D4DAC/palettes/1.pal b/data/tilesets/secondary/82D4DAC/palettes/1.pal deleted file mode 100644 index 3c6e40c2e..000000000 --- a/data/tilesets/secondary/82D4DAC/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -24 41 82 -255 255 255 -222 230 238 -189 205 230 -156 180 222 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -115 189 246 -98 172 238 -255 189 131 -238 148 115 -222 106 98 -205 65 82 -115 197 164 diff --git a/data/tilesets/secondary/82D4DAC/palettes/10.pal b/data/tilesets/secondary/82D4DAC/palettes/10.pal deleted file mode 100644 index cd86ca4ae..000000000 --- a/data/tilesets/secondary/82D4DAC/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -82 82 106 -148 148 164 -205 189 197 -255 255 255 -222 213 230 -189 172 180 -255 205 106 -230 189 106 -205 156 82 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -57 139 49 -106 106 123 diff --git a/data/tilesets/secondary/82D4DAC/palettes/11.pal b/data/tilesets/secondary/82D4DAC/palettes/11.pal deleted file mode 100644 index ec8e2f42d..000000000 --- a/data/tilesets/secondary/82D4DAC/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -74 74 98 -106 106 115 -0 0 0 -0 0 0 -148 106 57 -189 139 57 -213 189 131 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4DAC/palettes/12.pal b/data/tilesets/secondary/82D4DAC/palettes/12.pal deleted file mode 100644 index 5caa038ad..000000000 --- a/data/tilesets/secondary/82D4DAC/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 255 255 -213 222 246 -164 172 222 -98 98 123 -65 74 106 -238 213 205 -222 172 164 -205 131 123 -189 98 82 -222 222 222 -172 180 189 -139 148 164 -106 123 123 -222 74 0 -213 213 57 diff --git a/data/tilesets/secondary/82D4DAC/palettes/13.pal b/data/tilesets/secondary/82D4DAC/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4DAC/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4DAC/palettes/14.pal b/data/tilesets/secondary/82D4DAC/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4DAC/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4DAC/palettes/15.pal b/data/tilesets/secondary/82D4DAC/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4DAC/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4DAC/palettes/2.pal b/data/tilesets/secondary/82D4DAC/palettes/2.pal deleted file mode 100644 index 4c41030f6..000000000 --- a/data/tilesets/secondary/82D4DAC/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -24 41 82 -180 255 131 -131 197 98 -57 139 49 -57 82 0 -222 148 115 -106 90 90 -164 98 90 -65 57 49 -255 197 148 -222 106 98 -205 65 82 -164 213 197 -115 197 164 -65 180 131 -24 164 106 diff --git a/data/tilesets/secondary/82D4DAC/palettes/3.pal b/data/tilesets/secondary/82D4DAC/palettes/3.pal deleted file mode 100644 index 5665ddc22..000000000 --- a/data/tilesets/secondary/82D4DAC/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -24 41 82 -255 255 255 -213 213 213 -189 189 189 -164 164 164 -131 131 139 -65 180 131 -164 213 197 -65 49 65 -238 213 205 -222 180 164 -189 148 139 -156 115 115 -131 90 90 -98 65 82 -115 197 164 diff --git a/data/tilesets/secondary/82D4DAC/palettes/4.pal b/data/tilesets/secondary/82D4DAC/palettes/4.pal deleted file mode 100644 index d8051b7ba..000000000 --- a/data/tilesets/secondary/82D4DAC/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -24 41 82 -255 255 255 -222 230 238 -255 0 255 -255 0 255 -255 0 255 -156 164 189 -82 106 213 -65 90 189 -57 82 156 -41 65 139 -172 197 230 -139 164 222 -106 131 213 -82 106 213 -115 197 164 diff --git a/data/tilesets/secondary/82D4DAC/palettes/5.pal b/data/tilesets/secondary/82D4DAC/palettes/5.pal deleted file mode 100644 index 4e684594c..000000000 --- a/data/tilesets/secondary/82D4DAC/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -24 41 82 -255 255 255 -222 230 238 -189 205 230 -156 180 222 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -131 197 246 -106 180 222 -238 230 164 -222 205 131 -213 180 106 -205 156 82 -115 197 164 diff --git a/data/tilesets/secondary/82D4DAC/palettes/6.pal b/data/tilesets/secondary/82D4DAC/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4DAC/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4DAC/palettes/7.pal b/data/tilesets/secondary/82D4DAC/palettes/7.pal deleted file mode 100644 index 2064b3bd2..000000000 --- a/data/tilesets/secondary/82D4DAC/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 255 255 -238 222 172 -230 156 98 -197 90 65 -65 74 106 -106 106 123 -131 90 49 -90 65 49 -57 57 57 -222 222 197 -172 180 148 -131 148 115 -106 123 65 -156 205 230 -156 156 156 diff --git a/data/tilesets/secondary/82D4DAC/palettes/8.pal b/data/tilesets/secondary/82D4DAC/palettes/8.pal deleted file mode 100644 index 42a3483c0..000000000 --- a/data/tilesets/secondary/82D4DAC/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 255 255 -213 222 246 -131 131 139 -98 98 123 -65 74 106 -164 205 189 -139 180 172 -115 156 139 -98 139 131 -189 172 180 -156 139 148 -230 106 57 -205 49 24 -148 57 24 -0 0 0 diff --git a/data/tilesets/secondary/82D4DAC/palettes/9.pal b/data/tilesets/secondary/82D4DAC/palettes/9.pal deleted file mode 100644 index b06dfbda7..000000000 --- a/data/tilesets/secondary/82D4DAC/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 255 255 -213 222 246 -164 172 222 -98 98 123 -65 74 106 -98 98 123 -65 74 106 -115 123 164 -49 49 74 -189 238 180 -106 222 115 -74 180 98 -57 131 82 -131 197 230 -98 156 172 diff --git a/data/tilesets/secondary/82D4DAC/tiles.png b/data/tilesets/secondary/82D4DAC/tiles.png deleted file mode 100644 index c00ba0d61..000000000 Binary files a/data/tilesets/secondary/82D4DAC/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4DC4/metatile_attributes.bin b/data/tilesets/secondary/82D4DC4/metatile_attributes.bin deleted file mode 100644 index 990d6861c..000000000 Binary files a/data/tilesets/secondary/82D4DC4/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4DC4/metatiles.bin b/data/tilesets/secondary/82D4DC4/metatiles.bin deleted file mode 100644 index cd0bd5f53..000000000 Binary files a/data/tilesets/secondary/82D4DC4/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4DC4/palettes/0.pal b/data/tilesets/secondary/82D4DC4/palettes/0.pal deleted file mode 100644 index 7af5bb7d2..000000000 --- a/data/tilesets/secondary/82D4DC4/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 82 0 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D4DC4/palettes/1.pal b/data/tilesets/secondary/82D4DC4/palettes/1.pal deleted file mode 100644 index 391d1e3d1..000000000 --- a/data/tilesets/secondary/82D4DC4/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 189 164 -189 148 139 -156 115 115 -123 82 82 -90 57 74 -115 205 164 diff --git a/data/tilesets/secondary/82D4DC4/palettes/10.pal b/data/tilesets/secondary/82D4DC4/palettes/10.pal deleted file mode 100644 index 746437492..000000000 --- a/data/tilesets/secondary/82D4DC4/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -222 230 246 -189 197 222 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -49 139 49 -57 82 0 -49 180 98 -238 230 164 -222 205 131 -213 180 106 -205 156 82 -106 205 164 diff --git a/data/tilesets/secondary/82D4DC4/palettes/11.pal b/data/tilesets/secondary/82D4DC4/palettes/11.pal deleted file mode 100644 index 410d5193a..000000000 --- a/data/tilesets/secondary/82D4DC4/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4DC4/palettes/12.pal b/data/tilesets/secondary/82D4DC4/palettes/12.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4DC4/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4DC4/palettes/13.pal b/data/tilesets/secondary/82D4DC4/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4DC4/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4DC4/palettes/14.pal b/data/tilesets/secondary/82D4DC4/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4DC4/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4DC4/palettes/15.pal b/data/tilesets/secondary/82D4DC4/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4DC4/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4DC4/palettes/2.pal b/data/tilesets/secondary/82D4DC4/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/82D4DC4/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/82D4DC4/palettes/3.pal b/data/tilesets/secondary/82D4DC4/palettes/3.pal deleted file mode 100644 index 9581f2cd8..000000000 --- a/data/tilesets/secondary/82D4DC4/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 131 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4DC4/palettes/4.pal b/data/tilesets/secondary/82D4DC4/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/82D4DC4/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/82D4DC4/palettes/5.pal b/data/tilesets/secondary/82D4DC4/palettes/5.pal deleted file mode 100644 index 3a2db72a7..000000000 --- a/data/tilesets/secondary/82D4DC4/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -222 205 131 -205 180 106 -180 139 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4DC4/palettes/6.pal b/data/tilesets/secondary/82D4DC4/palettes/6.pal deleted file mode 100644 index 93518605a..000000000 --- a/data/tilesets/secondary/82D4DC4/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/82D4DC4/palettes/7.pal b/data/tilesets/secondary/82D4DC4/palettes/7.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4DC4/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4DC4/palettes/8.pal b/data/tilesets/secondary/82D4DC4/palettes/8.pal deleted file mode 100644 index 650a35cc8..000000000 --- a/data/tilesets/secondary/82D4DC4/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 82 0 -57 115 24 -98 65 74 -131 106 82 -65 57 49 -255 0 255 -255 0 255 -255 0 255 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D4DC4/palettes/9.pal b/data/tilesets/secondary/82D4DC4/palettes/9.pal deleted file mode 100644 index df2d04037..000000000 --- a/data/tilesets/secondary/82D4DC4/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -213 230 189 -57 172 131 -222 230 246 -230 172 123 -106 205 164 diff --git a/data/tilesets/secondary/82D4DC4/tiles.png b/data/tilesets/secondary/82D4DC4/tiles.png deleted file mode 100644 index 451eb8d5a..000000000 Binary files a/data/tilesets/secondary/82D4DC4/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4DDC/metatile_attributes.bin b/data/tilesets/secondary/82D4DDC/metatile_attributes.bin deleted file mode 100644 index 3549eaa93..000000000 Binary files a/data/tilesets/secondary/82D4DDC/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4DDC/metatiles.bin b/data/tilesets/secondary/82D4DDC/metatiles.bin deleted file mode 100644 index ea1398be3..000000000 Binary files a/data/tilesets/secondary/82D4DDC/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4DDC/palettes/0.pal b/data/tilesets/secondary/82D4DDC/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/82D4DDC/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D4DDC/palettes/1.pal b/data/tilesets/secondary/82D4DDC/palettes/1.pal deleted file mode 100644 index d99adafff..000000000 --- a/data/tilesets/secondary/82D4DDC/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/82D4DDC/palettes/10.pal b/data/tilesets/secondary/82D4DDC/palettes/10.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4DDC/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4DDC/palettes/11.pal b/data/tilesets/secondary/82D4DDC/palettes/11.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4DDC/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4DDC/palettes/12.pal b/data/tilesets/secondary/82D4DDC/palettes/12.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4DDC/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4DDC/palettes/13.pal b/data/tilesets/secondary/82D4DDC/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4DDC/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4DDC/palettes/14.pal b/data/tilesets/secondary/82D4DDC/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4DDC/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4DDC/palettes/15.pal b/data/tilesets/secondary/82D4DDC/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4DDC/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4DDC/palettes/2.pal b/data/tilesets/secondary/82D4DDC/palettes/2.pal deleted file mode 100644 index cc3a9457d..000000000 --- a/data/tilesets/secondary/82D4DDC/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/82D4DDC/palettes/3.pal b/data/tilesets/secondary/82D4DDC/palettes/3.pal deleted file mode 100644 index 7ec794ae5..000000000 --- a/data/tilesets/secondary/82D4DDC/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4DDC/palettes/4.pal b/data/tilesets/secondary/82D4DDC/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4DDC/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4DDC/palettes/5.pal b/data/tilesets/secondary/82D4DDC/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4DDC/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4DDC/palettes/6.pal b/data/tilesets/secondary/82D4DDC/palettes/6.pal deleted file mode 100644 index 2903bb074..000000000 --- a/data/tilesets/secondary/82D4DDC/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -131 131 131 -180 180 164 -255 255 255 -189 164 82 -222 197 106 -230 222 156 -123 197 189 -156 222 213 -213 255 246 -255 0 255 -255 0 255 -213 131 65 -222 230 222 -246 238 189 diff --git a/data/tilesets/secondary/82D4DDC/palettes/7.pal b/data/tilesets/secondary/82D4DDC/palettes/7.pal deleted file mode 100644 index c62a40b0d..000000000 --- a/data/tilesets/secondary/82D4DDC/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -148 172 139 -180 197 164 -213 222 197 -238 255 213 -115 156 180 -197 222 238 -123 197 189 -156 222 213 -213 255 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4DDC/palettes/8.pal b/data/tilesets/secondary/82D4DDC/palettes/8.pal deleted file mode 100644 index 8c66b4998..000000000 --- a/data/tilesets/secondary/82D4DDC/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -230 222 156 -189 98 74 -230 156 98 -213 205 156 -115 156 180 -246 238 189 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4DDC/palettes/9.pal b/data/tilesets/secondary/82D4DDC/palettes/9.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4DDC/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4DDC/tiles.png b/data/tilesets/secondary/82D4DDC/tiles.png deleted file mode 100644 index 6d376f447..000000000 Binary files a/data/tilesets/secondary/82D4DDC/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4DF4/metatile_attributes.bin b/data/tilesets/secondary/82D4DF4/metatile_attributes.bin deleted file mode 100644 index 96ef6a853..000000000 Binary files a/data/tilesets/secondary/82D4DF4/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4DF4/metatiles.bin b/data/tilesets/secondary/82D4DF4/metatiles.bin deleted file mode 100644 index 0ee478c87..000000000 Binary files a/data/tilesets/secondary/82D4DF4/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4DF4/palettes/0.pal b/data/tilesets/secondary/82D4DF4/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/82D4DF4/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D4DF4/palettes/1.pal b/data/tilesets/secondary/82D4DF4/palettes/1.pal deleted file mode 100644 index d8a4e7757..000000000 --- a/data/tilesets/secondary/82D4DF4/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/82D4DF4/palettes/10.pal b/data/tilesets/secondary/82D4DF4/palettes/10.pal deleted file mode 100644 index 4235579fc..000000000 --- a/data/tilesets/secondary/82D4DF4/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -255 0 255 -255 0 255 -255 0 255 -0 0 0 -238 238 180 -230 213 123 -205 180 98 -156 156 115 -197 230 230 -180 213 213 -172 189 197 -131 156 156 -90 115 115 -74 82 82 -49 57 57 diff --git a/data/tilesets/secondary/82D4DF4/palettes/11.pal b/data/tilesets/secondary/82D4DF4/palettes/11.pal deleted file mode 100644 index 277172976..000000000 --- a/data/tilesets/secondary/82D4DF4/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -205 189 115 -172 172 115 -156 156 115 -131 131 115 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 156 98 -148 139 98 -115 123 98 diff --git a/data/tilesets/secondary/82D4DF4/palettes/12.pal b/data/tilesets/secondary/82D4DF4/palettes/12.pal deleted file mode 100644 index 2fa21e9fb..000000000 --- a/data/tilesets/secondary/82D4DF4/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -0 0 0 diff --git a/data/tilesets/secondary/82D4DF4/palettes/13.pal b/data/tilesets/secondary/82D4DF4/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4DF4/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4DF4/palettes/14.pal b/data/tilesets/secondary/82D4DF4/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4DF4/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4DF4/palettes/15.pal b/data/tilesets/secondary/82D4DF4/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4DF4/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4DF4/palettes/2.pal b/data/tilesets/secondary/82D4DF4/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/82D4DF4/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/82D4DF4/palettes/3.pal b/data/tilesets/secondary/82D4DF4/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/secondary/82D4DF4/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4DF4/palettes/4.pal b/data/tilesets/secondary/82D4DF4/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/82D4DF4/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/82D4DF4/palettes/5.pal b/data/tilesets/secondary/82D4DF4/palettes/5.pal deleted file mode 100644 index c5a653979..000000000 --- a/data/tilesets/secondary/82D4DF4/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4DF4/palettes/6.pal b/data/tilesets/secondary/82D4DF4/palettes/6.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/82D4DF4/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4DF4/palettes/7.pal b/data/tilesets/secondary/82D4DF4/palettes/7.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/82D4DF4/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4DF4/palettes/8.pal b/data/tilesets/secondary/82D4DF4/palettes/8.pal deleted file mode 100644 index 34a637b1a..000000000 --- a/data/tilesets/secondary/82D4DF4/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -205 189 115 -172 172 115 -156 156 115 -131 131 115 -98 106 90 -255 0 255 -255 0 255 -255 0 255 -197 230 230 -180 213 213 -172 189 197 -131 156 156 -90 115 115 -74 82 82 -49 57 57 diff --git a/data/tilesets/secondary/82D4DF4/palettes/9.pal b/data/tilesets/secondary/82D4DF4/palettes/9.pal deleted file mode 100644 index f10a94f7c..000000000 --- a/data/tilesets/secondary/82D4DF4/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -205 189 115 -172 172 115 -156 156 115 -131 131 115 -238 222 123 -255 0 255 -222 180 57 -189 148 57 -148 115 74 -106 106 82 -74 74 74 -0 0 0 -98 139 197 -74 115 172 -57 98 156 diff --git a/data/tilesets/secondary/82D4DF4/tiles.png b/data/tilesets/secondary/82D4DF4/tiles.png deleted file mode 100644 index cb4078fa9..000000000 Binary files a/data/tilesets/secondary/82D4DF4/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4E0C/metatile_attributes.bin b/data/tilesets/secondary/82D4E0C/metatile_attributes.bin deleted file mode 100644 index 2b24a5266..000000000 Binary files a/data/tilesets/secondary/82D4E0C/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4E0C/metatiles.bin b/data/tilesets/secondary/82D4E0C/metatiles.bin deleted file mode 100644 index 37ef8fe34..000000000 Binary files a/data/tilesets/secondary/82D4E0C/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4E0C/palettes/0.pal b/data/tilesets/secondary/82D4E0C/palettes/0.pal deleted file mode 100644 index a3fab1c2f..000000000 --- a/data/tilesets/secondary/82D4E0C/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D4E0C/palettes/1.pal b/data/tilesets/secondary/82D4E0C/palettes/1.pal deleted file mode 100644 index d8a4e7757..000000000 --- a/data/tilesets/secondary/82D4E0C/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/82D4E0C/palettes/10.pal b/data/tilesets/secondary/82D4E0C/palettes/10.pal deleted file mode 100644 index 5ccabc5a0..000000000 --- a/data/tilesets/secondary/82D4E0C/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -255 0 255 -255 0 255 -255 0 255 -0 0 0 -255 238 180 -222 205 148 -197 172 123 -172 139 90 -222 222 156 -189 189 123 -148 148 106 -115 106 90 -82 74 65 -57 49 41 -65 65 74 diff --git a/data/tilesets/secondary/82D4E0C/palettes/11.pal b/data/tilesets/secondary/82D4E0C/palettes/11.pal deleted file mode 100644 index fa0038726..000000000 --- a/data/tilesets/secondary/82D4E0C/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -197 172 123 -172 139 90 -148 106 65 -123 74 41 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -230 222 164 -213 197 131 -197 172 106 -172 148 74 diff --git a/data/tilesets/secondary/82D4E0C/palettes/12.pal b/data/tilesets/secondary/82D4E0C/palettes/12.pal deleted file mode 100644 index c19d59bd0..000000000 --- a/data/tilesets/secondary/82D4E0C/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -180 180 98 -164 164 74 -139 139 49 -123 115 41 -255 238 180 -222 205 148 -197 172 123 -172 139 90 -222 222 156 -189 189 123 -148 148 82 -115 106 49 -90 82 41 -57 49 41 -65 65 74 diff --git a/data/tilesets/secondary/82D4E0C/palettes/13.pal b/data/tilesets/secondary/82D4E0C/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4E0C/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E0C/palettes/14.pal b/data/tilesets/secondary/82D4E0C/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4E0C/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E0C/palettes/15.pal b/data/tilesets/secondary/82D4E0C/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4E0C/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E0C/palettes/2.pal b/data/tilesets/secondary/82D4E0C/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/82D4E0C/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/82D4E0C/palettes/3.pal b/data/tilesets/secondary/82D4E0C/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/secondary/82D4E0C/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4E0C/palettes/4.pal b/data/tilesets/secondary/82D4E0C/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/82D4E0C/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/82D4E0C/palettes/5.pal b/data/tilesets/secondary/82D4E0C/palettes/5.pal deleted file mode 100644 index c5a653979..000000000 --- a/data/tilesets/secondary/82D4E0C/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4E0C/palettes/6.pal b/data/tilesets/secondary/82D4E0C/palettes/6.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/82D4E0C/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E0C/palettes/7.pal b/data/tilesets/secondary/82D4E0C/palettes/7.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/82D4E0C/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E0C/palettes/8.pal b/data/tilesets/secondary/82D4E0C/palettes/8.pal deleted file mode 100644 index 74cbc54c6..000000000 --- a/data/tilesets/secondary/82D4E0C/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -197 172 123 -172 139 90 -148 106 65 -123 74 41 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -222 222 156 -189 189 123 -148 148 106 -115 106 90 -82 74 65 -57 49 41 -65 65 74 diff --git a/data/tilesets/secondary/82D4E0C/palettes/9.pal b/data/tilesets/secondary/82D4E0C/palettes/9.pal deleted file mode 100644 index def7acffc..000000000 --- a/data/tilesets/secondary/82D4E0C/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -197 172 123 -172 139 90 -148 106 65 -123 74 41 -164 180 230 -139 156 222 -98 106 139 -65 65 57 -255 0 255 -255 0 255 -65 65 74 -0 0 0 -98 139 197 -74 115 172 -57 98 156 diff --git a/data/tilesets/secondary/82D4E0C/tiles.png b/data/tilesets/secondary/82D4E0C/tiles.png deleted file mode 100644 index 77b767b79..000000000 Binary files a/data/tilesets/secondary/82D4E0C/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4E24/metatile_attributes.bin b/data/tilesets/secondary/82D4E24/metatile_attributes.bin deleted file mode 100644 index 87564066c..000000000 Binary files a/data/tilesets/secondary/82D4E24/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4E24/metatiles.bin b/data/tilesets/secondary/82D4E24/metatiles.bin deleted file mode 100644 index 8f8bd569b..000000000 Binary files a/data/tilesets/secondary/82D4E24/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4E24/palettes/0.pal b/data/tilesets/secondary/82D4E24/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/82D4E24/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D4E24/palettes/1.pal b/data/tilesets/secondary/82D4E24/palettes/1.pal deleted file mode 100644 index d8a4e7757..000000000 --- a/data/tilesets/secondary/82D4E24/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/82D4E24/palettes/10.pal b/data/tilesets/secondary/82D4E24/palettes/10.pal deleted file mode 100644 index 7116e91ff..000000000 --- a/data/tilesets/secondary/82D4E24/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -255 0 255 -255 0 255 -255 0 255 -0 0 0 -238 238 180 -238 222 148 -189 222 156 -205 230 238 -238 238 246 -180 205 238 -123 180 230 -90 156 197 -98 123 172 -82 98 131 -65 74 82 diff --git a/data/tilesets/secondary/82D4E24/palettes/11.pal b/data/tilesets/secondary/82D4E24/palettes/11.pal deleted file mode 100644 index b237ef1c8..000000000 --- a/data/tilesets/secondary/82D4E24/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -189 213 230 -189 197 230 -172 180 213 -148 156 172 -156 238 255 -164 246 255 -213 255 255 -106 230 255 -41 205 255 -32 131 255 -32 82 197 -32 74 131 -205 230 172 -189 213 172 -0 0 0 diff --git a/data/tilesets/secondary/82D4E24/palettes/12.pal b/data/tilesets/secondary/82D4E24/palettes/12.pal deleted file mode 100644 index ed56edee1..000000000 --- a/data/tilesets/secondary/82D4E24/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -0 0 0 diff --git a/data/tilesets/secondary/82D4E24/palettes/13.pal b/data/tilesets/secondary/82D4E24/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4E24/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E24/palettes/14.pal b/data/tilesets/secondary/82D4E24/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4E24/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E24/palettes/15.pal b/data/tilesets/secondary/82D4E24/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4E24/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E24/palettes/2.pal b/data/tilesets/secondary/82D4E24/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/82D4E24/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/82D4E24/palettes/3.pal b/data/tilesets/secondary/82D4E24/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/secondary/82D4E24/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4E24/palettes/4.pal b/data/tilesets/secondary/82D4E24/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/82D4E24/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/82D4E24/palettes/5.pal b/data/tilesets/secondary/82D4E24/palettes/5.pal deleted file mode 100644 index c5a653979..000000000 --- a/data/tilesets/secondary/82D4E24/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4E24/palettes/6.pal b/data/tilesets/secondary/82D4E24/palettes/6.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/82D4E24/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E24/palettes/7.pal b/data/tilesets/secondary/82D4E24/palettes/7.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/82D4E24/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E24/palettes/8.pal b/data/tilesets/secondary/82D4E24/palettes/8.pal deleted file mode 100644 index d96f3f0fc..000000000 --- a/data/tilesets/secondary/82D4E24/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -189 213 230 -189 197 230 -172 180 213 -148 156 172 -156 238 255 -164 246 255 -213 255 255 -205 230 238 -238 238 246 -180 205 238 -123 180 230 -90 156 197 -98 123 172 -82 98 131 -65 74 82 diff --git a/data/tilesets/secondary/82D4E24/palettes/9.pal b/data/tilesets/secondary/82D4E24/palettes/9.pal deleted file mode 100644 index 1a1dc881b..000000000 --- a/data/tilesets/secondary/82D4E24/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -189 213 230 -189 197 230 -172 180 213 -148 156 172 -255 238 164 -238 230 139 -230 205 90 -197 172 74 -156 123 57 -106 82 115 -65 57 74 -0 0 0 -98 139 197 -74 115 172 -57 98 156 diff --git a/data/tilesets/secondary/82D4E24/tiles.png b/data/tilesets/secondary/82D4E24/tiles.png deleted file mode 100644 index e085d8e33..000000000 Binary files a/data/tilesets/secondary/82D4E24/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4E3C/metatile_attributes.bin b/data/tilesets/secondary/82D4E3C/metatile_attributes.bin deleted file mode 100644 index 3549eaa93..000000000 Binary files a/data/tilesets/secondary/82D4E3C/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4E3C/metatiles.bin b/data/tilesets/secondary/82D4E3C/metatiles.bin deleted file mode 100644 index ea1398be3..000000000 Binary files a/data/tilesets/secondary/82D4E3C/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4E3C/palettes/0.pal b/data/tilesets/secondary/82D4E3C/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/82D4E3C/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D4E3C/palettes/1.pal b/data/tilesets/secondary/82D4E3C/palettes/1.pal deleted file mode 100644 index d99adafff..000000000 --- a/data/tilesets/secondary/82D4E3C/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/82D4E3C/palettes/10.pal b/data/tilesets/secondary/82D4E3C/palettes/10.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4E3C/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E3C/palettes/11.pal b/data/tilesets/secondary/82D4E3C/palettes/11.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4E3C/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E3C/palettes/12.pal b/data/tilesets/secondary/82D4E3C/palettes/12.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4E3C/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E3C/palettes/13.pal b/data/tilesets/secondary/82D4E3C/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4E3C/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E3C/palettes/14.pal b/data/tilesets/secondary/82D4E3C/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4E3C/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E3C/palettes/15.pal b/data/tilesets/secondary/82D4E3C/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4E3C/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E3C/palettes/2.pal b/data/tilesets/secondary/82D4E3C/palettes/2.pal deleted file mode 100644 index cc3a9457d..000000000 --- a/data/tilesets/secondary/82D4E3C/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/82D4E3C/palettes/3.pal b/data/tilesets/secondary/82D4E3C/palettes/3.pal deleted file mode 100644 index 7ec794ae5..000000000 --- a/data/tilesets/secondary/82D4E3C/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4E3C/palettes/4.pal b/data/tilesets/secondary/82D4E3C/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4E3C/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E3C/palettes/5.pal b/data/tilesets/secondary/82D4E3C/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4E3C/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E3C/palettes/6.pal b/data/tilesets/secondary/82D4E3C/palettes/6.pal deleted file mode 100644 index 2903bb074..000000000 --- a/data/tilesets/secondary/82D4E3C/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -131 131 131 -180 180 164 -255 255 255 -189 164 82 -222 197 106 -230 222 156 -123 197 189 -156 222 213 -213 255 246 -255 0 255 -255 0 255 -213 131 65 -222 230 222 -246 238 189 diff --git a/data/tilesets/secondary/82D4E3C/palettes/7.pal b/data/tilesets/secondary/82D4E3C/palettes/7.pal deleted file mode 100644 index c62a40b0d..000000000 --- a/data/tilesets/secondary/82D4E3C/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -148 172 139 -180 197 164 -213 222 197 -238 255 213 -115 156 180 -197 222 238 -123 197 189 -156 222 213 -213 255 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4E3C/palettes/8.pal b/data/tilesets/secondary/82D4E3C/palettes/8.pal deleted file mode 100644 index 8c66b4998..000000000 --- a/data/tilesets/secondary/82D4E3C/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -230 222 156 -189 98 74 -230 156 98 -213 205 156 -115 156 180 -246 238 189 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4E3C/palettes/9.pal b/data/tilesets/secondary/82D4E3C/palettes/9.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4E3C/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E3C/tiles.png b/data/tilesets/secondary/82D4E3C/tiles.png deleted file mode 100644 index 6d376f447..000000000 Binary files a/data/tilesets/secondary/82D4E3C/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4E54/metatile_attributes.bin b/data/tilesets/secondary/82D4E54/metatile_attributes.bin deleted file mode 100644 index 45b5bef90..000000000 Binary files a/data/tilesets/secondary/82D4E54/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4E54/metatiles.bin b/data/tilesets/secondary/82D4E54/metatiles.bin deleted file mode 100644 index 249addbc7..000000000 Binary files a/data/tilesets/secondary/82D4E54/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4E54/palettes/0.pal b/data/tilesets/secondary/82D4E54/palettes/0.pal deleted file mode 100644 index a3fab1c2f..000000000 --- a/data/tilesets/secondary/82D4E54/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D4E54/palettes/1.pal b/data/tilesets/secondary/82D4E54/palettes/1.pal deleted file mode 100644 index d8a4e7757..000000000 --- a/data/tilesets/secondary/82D4E54/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/82D4E54/palettes/10.pal b/data/tilesets/secondary/82D4E54/palettes/10.pal deleted file mode 100644 index eb9198b0a..000000000 --- a/data/tilesets/secondary/82D4E54/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -255 0 255 -255 0 255 -255 0 255 -0 0 0 -255 238 180 -230 205 164 -189 180 164 -172 164 156 -205 246 172 -172 213 148 -139 180 131 -115 156 106 -82 123 90 -57 98 74 -65 65 74 diff --git a/data/tilesets/secondary/82D4E54/palettes/11.pal b/data/tilesets/secondary/82D4E54/palettes/11.pal deleted file mode 100644 index 9afe8750d..000000000 --- a/data/tilesets/secondary/82D4E54/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -197 205 222 -172 180 197 -156 164 180 -115 123 139 -148 156 164 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -123 189 156 -106 156 139 -98 123 123 -90 98 115 diff --git a/data/tilesets/secondary/82D4E54/palettes/12.pal b/data/tilesets/secondary/82D4E54/palettes/12.pal deleted file mode 100644 index aced117f7..000000000 --- a/data/tilesets/secondary/82D4E54/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -197 205 222 -197 205 222 -172 180 197 -156 164 180 -115 123 139 -238 238 164 -205 205 106 -172 172 90 -123 131 74 -115 123 139 -82 90 32 -65 65 74 -16 16 24 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4E54/palettes/13.pal b/data/tilesets/secondary/82D4E54/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4E54/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E54/palettes/14.pal b/data/tilesets/secondary/82D4E54/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4E54/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E54/palettes/15.pal b/data/tilesets/secondary/82D4E54/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4E54/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E54/palettes/2.pal b/data/tilesets/secondary/82D4E54/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/82D4E54/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/82D4E54/palettes/3.pal b/data/tilesets/secondary/82D4E54/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/secondary/82D4E54/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4E54/palettes/4.pal b/data/tilesets/secondary/82D4E54/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/82D4E54/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/82D4E54/palettes/5.pal b/data/tilesets/secondary/82D4E54/palettes/5.pal deleted file mode 100644 index c5a653979..000000000 --- a/data/tilesets/secondary/82D4E54/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4E54/palettes/6.pal b/data/tilesets/secondary/82D4E54/palettes/6.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/82D4E54/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E54/palettes/7.pal b/data/tilesets/secondary/82D4E54/palettes/7.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/82D4E54/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E54/palettes/8.pal b/data/tilesets/secondary/82D4E54/palettes/8.pal deleted file mode 100644 index db2216a05..000000000 --- a/data/tilesets/secondary/82D4E54/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -197 205 222 -172 180 197 -156 164 180 -115 123 139 -148 156 164 -255 0 255 -255 0 255 -255 0 255 -205 246 172 -172 213 148 -139 180 131 -115 156 106 -82 123 90 -57 98 74 -65 65 74 diff --git a/data/tilesets/secondary/82D4E54/palettes/9.pal b/data/tilesets/secondary/82D4E54/palettes/9.pal deleted file mode 100644 index c1a5d4f29..000000000 --- a/data/tilesets/secondary/82D4E54/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -197 205 222 -197 205 222 -172 180 197 -156 164 180 -115 123 139 -255 246 164 -205 189 106 -156 131 57 -82 74 32 -90 106 115 -255 0 255 -65 65 74 -16 16 24 -98 139 197 -74 115 172 -57 98 156 diff --git a/data/tilesets/secondary/82D4E54/tiles.png b/data/tilesets/secondary/82D4E54/tiles.png deleted file mode 100644 index d53a0cf17..000000000 Binary files a/data/tilesets/secondary/82D4E54/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4E6C/metatile_attributes.bin b/data/tilesets/secondary/82D4E6C/metatile_attributes.bin deleted file mode 100644 index 5eca0b5c7..000000000 Binary files a/data/tilesets/secondary/82D4E6C/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4E6C/metatiles.bin b/data/tilesets/secondary/82D4E6C/metatiles.bin deleted file mode 100644 index 053045190..000000000 Binary files a/data/tilesets/secondary/82D4E6C/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4E6C/palettes/0.pal b/data/tilesets/secondary/82D4E6C/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/82D4E6C/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D4E6C/palettes/1.pal b/data/tilesets/secondary/82D4E6C/palettes/1.pal deleted file mode 100644 index 30be2fbe3..000000000 --- a/data/tilesets/secondary/82D4E6C/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/82D4E6C/palettes/10.pal b/data/tilesets/secondary/82D4E6C/palettes/10.pal deleted file mode 100644 index c6e769ccc..000000000 --- a/data/tilesets/secondary/82D4E6C/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -139 222 156 -82 82 106 -131 131 131 -57 106 82 -41 156 98 -90 205 115 -197 172 90 -156 131 82 -213 205 106 -230 197 238 -180 189 164 -213 222 189 -156 172 172 -205 180 213 -189 197 213 -230 246 238 diff --git a/data/tilesets/secondary/82D4E6C/palettes/11.pal b/data/tilesets/secondary/82D4E6C/palettes/11.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4E6C/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E6C/palettes/12.pal b/data/tilesets/secondary/82D4E6C/palettes/12.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4E6C/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E6C/palettes/13.pal b/data/tilesets/secondary/82D4E6C/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4E6C/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E6C/palettes/14.pal b/data/tilesets/secondary/82D4E6C/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4E6C/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E6C/palettes/15.pal b/data/tilesets/secondary/82D4E6C/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4E6C/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E6C/palettes/2.pal b/data/tilesets/secondary/82D4E6C/palettes/2.pal deleted file mode 100644 index cc3a9457d..000000000 --- a/data/tilesets/secondary/82D4E6C/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/82D4E6C/palettes/3.pal b/data/tilesets/secondary/82D4E6C/palettes/3.pal deleted file mode 100644 index 7ec794ae5..000000000 --- a/data/tilesets/secondary/82D4E6C/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4E6C/palettes/4.pal b/data/tilesets/secondary/82D4E6C/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4E6C/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E6C/palettes/5.pal b/data/tilesets/secondary/82D4E6C/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4E6C/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E6C/palettes/6.pal b/data/tilesets/secondary/82D4E6C/palettes/6.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4E6C/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E6C/palettes/7.pal b/data/tilesets/secondary/82D4E6C/palettes/7.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4E6C/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E6C/palettes/8.pal b/data/tilesets/secondary/82D4E6C/palettes/8.pal deleted file mode 100644 index 18480092b..000000000 --- a/data/tilesets/secondary/82D4E6C/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -139 222 156 -82 82 106 -115 123 131 -98 90 65 -139 123 82 -197 172 90 -230 230 238 -205 115 74 -238 172 82 -238 213 82 -131 189 57 -164 222 82 -156 139 172 -205 172 222 -213 205 230 -246 255 255 diff --git a/data/tilesets/secondary/82D4E6C/palettes/9.pal b/data/tilesets/secondary/82D4E6C/palettes/9.pal deleted file mode 100644 index dd18b9d07..000000000 --- a/data/tilesets/secondary/82D4E6C/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -139 222 156 -82 82 106 -131 131 131 -172 123 82 -205 131 65 -213 148 65 -205 148 82 -238 164 82 -238 180 82 -148 106 74 -189 197 213 -222 230 230 -156 172 172 -90 131 238 -106 164 255 -156 189 255 diff --git a/data/tilesets/secondary/82D4E6C/tiles.png b/data/tilesets/secondary/82D4E6C/tiles.png deleted file mode 100644 index 421932118..000000000 Binary files a/data/tilesets/secondary/82D4E6C/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4E84/metatile_attributes.bin b/data/tilesets/secondary/82D4E84/metatile_attributes.bin deleted file mode 100644 index 18d7517d9..000000000 Binary files a/data/tilesets/secondary/82D4E84/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4E84/metatiles.bin b/data/tilesets/secondary/82D4E84/metatiles.bin deleted file mode 100644 index 0943dc7af..000000000 Binary files a/data/tilesets/secondary/82D4E84/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4E84/palettes/0.pal b/data/tilesets/secondary/82D4E84/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/82D4E84/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D4E84/palettes/1.pal b/data/tilesets/secondary/82D4E84/palettes/1.pal deleted file mode 100644 index d99adafff..000000000 --- a/data/tilesets/secondary/82D4E84/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/82D4E84/palettes/10.pal b/data/tilesets/secondary/82D4E84/palettes/10.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4E84/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E84/palettes/11.pal b/data/tilesets/secondary/82D4E84/palettes/11.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4E84/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E84/palettes/12.pal b/data/tilesets/secondary/82D4E84/palettes/12.pal deleted file mode 100644 index 2903bb074..000000000 --- a/data/tilesets/secondary/82D4E84/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -131 131 131 -180 180 164 -255 255 255 -189 164 82 -222 197 106 -230 222 156 -123 197 189 -156 222 213 -213 255 246 -255 0 255 -255 0 255 -213 131 65 -222 230 222 -246 238 189 diff --git a/data/tilesets/secondary/82D4E84/palettes/13.pal b/data/tilesets/secondary/82D4E84/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4E84/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E84/palettes/14.pal b/data/tilesets/secondary/82D4E84/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4E84/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E84/palettes/15.pal b/data/tilesets/secondary/82D4E84/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4E84/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E84/palettes/2.pal b/data/tilesets/secondary/82D4E84/palettes/2.pal deleted file mode 100644 index cc3a9457d..000000000 --- a/data/tilesets/secondary/82D4E84/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/82D4E84/palettes/3.pal b/data/tilesets/secondary/82D4E84/palettes/3.pal deleted file mode 100644 index 7ec794ae5..000000000 --- a/data/tilesets/secondary/82D4E84/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4E84/palettes/4.pal b/data/tilesets/secondary/82D4E84/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4E84/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E84/palettes/5.pal b/data/tilesets/secondary/82D4E84/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4E84/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E84/palettes/6.pal b/data/tilesets/secondary/82D4E84/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4E84/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E84/palettes/7.pal b/data/tilesets/secondary/82D4E84/palettes/7.pal deleted file mode 100644 index c62a40b0d..000000000 --- a/data/tilesets/secondary/82D4E84/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -148 172 139 -180 197 164 -213 222 197 -238 255 213 -115 156 180 -197 222 238 -123 197 189 -156 222 213 -213 255 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4E84/palettes/8.pal b/data/tilesets/secondary/82D4E84/palettes/8.pal deleted file mode 100644 index 8c66b4998..000000000 --- a/data/tilesets/secondary/82D4E84/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -230 222 156 -189 98 74 -230 156 98 -213 205 156 -115 156 180 -246 238 189 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4E84/palettes/9.pal b/data/tilesets/secondary/82D4E84/palettes/9.pal deleted file mode 100644 index 25d5d7019..000000000 --- a/data/tilesets/secondary/82D4E84/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -156 213 255 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -0 0 0 diff --git a/data/tilesets/secondary/82D4E84/tiles.png b/data/tilesets/secondary/82D4E84/tiles.png deleted file mode 100644 index ca6e21f03..000000000 Binary files a/data/tilesets/secondary/82D4E84/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4E9C/metatile_attributes.bin b/data/tilesets/secondary/82D4E9C/metatile_attributes.bin deleted file mode 100644 index 1105056c9..000000000 Binary files a/data/tilesets/secondary/82D4E9C/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4E9C/metatiles.bin b/data/tilesets/secondary/82D4E9C/metatiles.bin deleted file mode 100644 index 7d1e15676..000000000 Binary files a/data/tilesets/secondary/82D4E9C/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4E9C/palettes/0.pal b/data/tilesets/secondary/82D4E9C/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/82D4E9C/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D4E9C/palettes/1.pal b/data/tilesets/secondary/82D4E9C/palettes/1.pal deleted file mode 100644 index 30be2fbe3..000000000 --- a/data/tilesets/secondary/82D4E9C/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/82D4E9C/palettes/10.pal b/data/tilesets/secondary/82D4E9C/palettes/10.pal deleted file mode 100644 index 2a1743eaa..000000000 --- a/data/tilesets/secondary/82D4E9C/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -156 205 156 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4E9C/palettes/11.pal b/data/tilesets/secondary/82D4E9C/palettes/11.pal deleted file mode 100644 index 307e0ea7e..000000000 --- a/data/tilesets/secondary/82D4E9C/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -156 205 156 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -0 0 0 diff --git a/data/tilesets/secondary/82D4E9C/palettes/12.pal b/data/tilesets/secondary/82D4E9C/palettes/12.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4E9C/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E9C/palettes/13.pal b/data/tilesets/secondary/82D4E9C/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4E9C/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E9C/palettes/14.pal b/data/tilesets/secondary/82D4E9C/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4E9C/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E9C/palettes/15.pal b/data/tilesets/secondary/82D4E9C/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4E9C/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E9C/palettes/2.pal b/data/tilesets/secondary/82D4E9C/palettes/2.pal deleted file mode 100644 index e7c4b911a..000000000 --- a/data/tilesets/secondary/82D4E9C/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/82D4E9C/palettes/3.pal b/data/tilesets/secondary/82D4E9C/palettes/3.pal deleted file mode 100644 index 54b77e0c8..000000000 --- a/data/tilesets/secondary/82D4E9C/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4E9C/palettes/4.pal b/data/tilesets/secondary/82D4E9C/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4E9C/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E9C/palettes/5.pal b/data/tilesets/secondary/82D4E9C/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4E9C/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E9C/palettes/6.pal b/data/tilesets/secondary/82D4E9C/palettes/6.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4E9C/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4E9C/palettes/7.pal b/data/tilesets/secondary/82D4E9C/palettes/7.pal deleted file mode 100644 index b69e6cfa4..000000000 --- a/data/tilesets/secondary/82D4E9C/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -156 205 156 -156 65 65 -57 106 16 -0 0 139 -98 123 156 -131 156 180 -164 189 213 -197 197 148 -213 205 172 -230 222 197 -164 156 164 -205 197 189 -82 82 106 -123 123 139 -246 238 222 -255 255 255 diff --git a/data/tilesets/secondary/82D4E9C/palettes/8.pal b/data/tilesets/secondary/82D4E9C/palettes/8.pal deleted file mode 100644 index 3cada9fa1..000000000 --- a/data/tilesets/secondary/82D4E9C/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -156 205 156 -180 180 90 -222 222 148 -246 246 180 -156 65 65 -222 131 131 -189 98 98 -255 0 255 -255 0 255 -255 0 255 -164 156 164 -205 197 189 -82 82 106 -123 123 139 -246 238 222 -255 255 255 diff --git a/data/tilesets/secondary/82D4E9C/palettes/9.pal b/data/tilesets/secondary/82D4E9C/palettes/9.pal deleted file mode 100644 index 2a1743eaa..000000000 --- a/data/tilesets/secondary/82D4E9C/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -156 205 156 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4E9C/tiles.png b/data/tilesets/secondary/82D4E9C/tiles.png deleted file mode 100644 index d252dbcd3..000000000 Binary files a/data/tilesets/secondary/82D4E9C/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4EB4/metatile_attributes.bin b/data/tilesets/secondary/82D4EB4/metatile_attributes.bin deleted file mode 100644 index 05caeb58b..000000000 Binary files a/data/tilesets/secondary/82D4EB4/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4EB4/metatiles.bin b/data/tilesets/secondary/82D4EB4/metatiles.bin deleted file mode 100644 index 6ac3cbf98..000000000 Binary files a/data/tilesets/secondary/82D4EB4/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4EB4/palettes/0.pal b/data/tilesets/secondary/82D4EB4/palettes/0.pal deleted file mode 100644 index ed708dd79..000000000 --- a/data/tilesets/secondary/82D4EB4/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 205 172 -189 255 139 -131 213 98 -57 148 49 -57 82 0 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D4EB4/palettes/1.pal b/data/tilesets/secondary/82D4EB4/palettes/1.pal deleted file mode 100644 index 4d2b48991..000000000 --- a/data/tilesets/secondary/82D4EB4/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 205 172 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 189 164 -189 148 139 -156 115 115 -123 82 82 -90 57 74 -115 205 164 diff --git a/data/tilesets/secondary/82D4EB4/palettes/10.pal b/data/tilesets/secondary/82D4EB4/palettes/10.pal deleted file mode 100644 index e8624e82f..000000000 --- a/data/tilesets/secondary/82D4EB4/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 205 172 -82 82 106 -131 131 131 -139 164 164 -164 189 189 -205 222 222 -205 238 238 -90 139 115 -0 0 0 -0 0 0 -82 180 106 -115 222 148 -205 197 57 -230 230 139 -238 131 74 -255 180 98 diff --git a/data/tilesets/secondary/82D4EB4/palettes/11.pal b/data/tilesets/secondary/82D4EB4/palettes/11.pal deleted file mode 100644 index 9cec1272b..000000000 --- a/data/tilesets/secondary/82D4EB4/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 205 172 -82 82 106 -131 131 131 -0 0 0 -0 0 0 -0 0 0 -205 238 238 -222 255 255 -0 0 0 -106 189 197 -106 246 230 -164 255 238 -0 0 0 -131 123 57 -197 106 74 -238 148 74 diff --git a/data/tilesets/secondary/82D4EB4/palettes/12.pal b/data/tilesets/secondary/82D4EB4/palettes/12.pal deleted file mode 100644 index 600d8f469..000000000 --- a/data/tilesets/secondary/82D4EB4/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 205 172 -82 82 106 -131 131 131 -255 255 255 -90 230 255 -213 255 255 -148 238 255 -90 139 115 -0 0 0 -0 0 0 -82 180 106 -115 222 148 -148 246 180 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4EB4/palettes/13.pal b/data/tilesets/secondary/82D4EB4/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4EB4/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4EB4/palettes/14.pal b/data/tilesets/secondary/82D4EB4/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4EB4/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4EB4/palettes/15.pal b/data/tilesets/secondary/82D4EB4/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4EB4/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4EB4/palettes/2.pal b/data/tilesets/secondary/82D4EB4/palettes/2.pal deleted file mode 100644 index 878c13c95..000000000 --- a/data/tilesets/secondary/82D4EB4/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 205 172 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/82D4EB4/palettes/3.pal b/data/tilesets/secondary/82D4EB4/palettes/3.pal deleted file mode 100644 index bed4c20c3..000000000 --- a/data/tilesets/secondary/82D4EB4/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 205 172 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4EB4/palettes/4.pal b/data/tilesets/secondary/82D4EB4/palettes/4.pal deleted file mode 100644 index b77ba3e87..000000000 --- a/data/tilesets/secondary/82D4EB4/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 205 172 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/82D4EB4/palettes/5.pal b/data/tilesets/secondary/82D4EB4/palettes/5.pal deleted file mode 100644 index 74a2a9ed0..000000000 --- a/data/tilesets/secondary/82D4EB4/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 205 172 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -222 205 131 -205 180 106 -180 139 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4EB4/palettes/6.pal b/data/tilesets/secondary/82D4EB4/palettes/6.pal deleted file mode 100644 index 93518605a..000000000 --- a/data/tilesets/secondary/82D4EB4/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/82D4EB4/palettes/7.pal b/data/tilesets/secondary/82D4EB4/palettes/7.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4EB4/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4EB4/palettes/8.pal b/data/tilesets/secondary/82D4EB4/palettes/8.pal deleted file mode 100644 index 370a3d2db..000000000 --- a/data/tilesets/secondary/82D4EB4/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 205 172 -82 82 106 -131 131 131 -139 164 164 -164 189 189 -205 222 222 -205 238 238 -90 139 115 -139 148 115 -106 189 197 -82 180 106 -115 222 148 -148 246 180 -131 123 57 -197 106 74 -238 148 74 diff --git a/data/tilesets/secondary/82D4EB4/palettes/9.pal b/data/tilesets/secondary/82D4EB4/palettes/9.pal deleted file mode 100644 index 1193cc807..000000000 --- a/data/tilesets/secondary/82D4EB4/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 205 172 -82 82 106 -131 131 131 -98 106 148 -115 131 197 -139 164 230 -164 213 246 -197 197 197 -238 230 205 -255 0 255 -106 98 90 -131 115 90 -156 139 90 -131 139 90 -164 156 90 -189 172 90 diff --git a/data/tilesets/secondary/82D4EB4/tiles.png b/data/tilesets/secondary/82D4EB4/tiles.png deleted file mode 100644 index 42d557bcf..000000000 Binary files a/data/tilesets/secondary/82D4EB4/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4ECC/metatile_attributes.bin b/data/tilesets/secondary/82D4ECC/metatile_attributes.bin deleted file mode 100644 index a118a0181..000000000 Binary files a/data/tilesets/secondary/82D4ECC/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4ECC/metatiles.bin b/data/tilesets/secondary/82D4ECC/metatiles.bin deleted file mode 100644 index c86070668..000000000 Binary files a/data/tilesets/secondary/82D4ECC/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4EE4/metatile_attributes.bin b/data/tilesets/secondary/82D4EE4/metatile_attributes.bin deleted file mode 100644 index 29caa862d..000000000 Binary files a/data/tilesets/secondary/82D4EE4/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4EE4/metatiles.bin b/data/tilesets/secondary/82D4EE4/metatiles.bin deleted file mode 100644 index 2010e1eca..000000000 Binary files a/data/tilesets/secondary/82D4EE4/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4EE4/palettes/0.pal b/data/tilesets/secondary/82D4EE4/palettes/0.pal deleted file mode 100644 index 6d876039d..000000000 --- a/data/tilesets/secondary/82D4EE4/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D4EE4/palettes/1.pal b/data/tilesets/secondary/82D4EE4/palettes/1.pal deleted file mode 100644 index 66561f6d3..000000000 --- a/data/tilesets/secondary/82D4EE4/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -139 180 222 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/82D4EE4/palettes/10.pal b/data/tilesets/secondary/82D4EE4/palettes/10.pal deleted file mode 100644 index e12b8edac..000000000 --- a/data/tilesets/secondary/82D4EE4/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4EE4/palettes/11.pal b/data/tilesets/secondary/82D4EE4/palettes/11.pal deleted file mode 100644 index e12b8edac..000000000 --- a/data/tilesets/secondary/82D4EE4/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4EE4/palettes/12.pal b/data/tilesets/secondary/82D4EE4/palettes/12.pal deleted file mode 100644 index e12b8edac..000000000 --- a/data/tilesets/secondary/82D4EE4/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4EE4/palettes/13.pal b/data/tilesets/secondary/82D4EE4/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4EE4/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4EE4/palettes/14.pal b/data/tilesets/secondary/82D4EE4/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4EE4/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4EE4/palettes/15.pal b/data/tilesets/secondary/82D4EE4/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4EE4/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4EE4/palettes/2.pal b/data/tilesets/secondary/82D4EE4/palettes/2.pal deleted file mode 100644 index 87a022102..000000000 --- a/data/tilesets/secondary/82D4EE4/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -90 90 115 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/82D4EE4/palettes/3.pal b/data/tilesets/secondary/82D4EE4/palettes/3.pal deleted file mode 100644 index 783496dcd..000000000 --- a/data/tilesets/secondary/82D4EE4/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -65 98 156 -90 123 180 -115 156 197 -222 213 131 -164 164 172 -205 205 213 -238 238 246 -106 172 115 -156 205 139 diff --git a/data/tilesets/secondary/82D4EE4/palettes/4.pal b/data/tilesets/secondary/82D4EE4/palettes/4.pal deleted file mode 100644 index 89eace605..000000000 --- a/data/tilesets/secondary/82D4EE4/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 238 246 -172 197 180 -197 222 205 -90 189 172 -246 238 156 -205 189 131 -189 164 123 -148 131 106 -106 106 106 -213 222 230 -238 180 115 diff --git a/data/tilesets/secondary/82D4EE4/palettes/5.pal b/data/tilesets/secondary/82D4EE4/palettes/5.pal deleted file mode 100644 index 0eef3df8e..000000000 --- a/data/tilesets/secondary/82D4EE4/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -213 222 222 -164 180 189 -255 0 255 -131 115 74 -213 213 148 -197 189 139 -172 156 115 -148 131 90 -255 0 255 -255 0 255 -0 0 0 diff --git a/data/tilesets/secondary/82D4EE4/palettes/6.pal b/data/tilesets/secondary/82D4EE4/palettes/6.pal deleted file mode 100644 index 1d08ce9a2..000000000 --- a/data/tilesets/secondary/82D4EE4/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4EE4/palettes/7.pal b/data/tilesets/secondary/82D4EE4/palettes/7.pal deleted file mode 100644 index 23e995640..000000000 --- a/data/tilesets/secondary/82D4EE4/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -148 148 156 -205 205 197 -148 139 90 -172 164 106 -197 189 131 -82 139 148 -115 164 172 -156 189 197 -180 90 74 -205 115 90 -238 156 123 diff --git a/data/tilesets/secondary/82D4EE4/palettes/8.pal b/data/tilesets/secondary/82D4EE4/palettes/8.pal deleted file mode 100644 index 3ce3570a1..000000000 --- a/data/tilesets/secondary/82D4EE4/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -255 255 156 -197 197 156 -172 172 139 -148 148 131 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4EE4/palettes/9.pal b/data/tilesets/secondary/82D4EE4/palettes/9.pal deleted file mode 100644 index e12b8edac..000000000 --- a/data/tilesets/secondary/82D4EE4/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4EE4/tiles.png b/data/tilesets/secondary/82D4EE4/tiles.png deleted file mode 100644 index b8865022d..000000000 Binary files a/data/tilesets/secondary/82D4EE4/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4EFC/metatile_attributes.bin b/data/tilesets/secondary/82D4EFC/metatile_attributes.bin deleted file mode 100644 index 8c16318f0..000000000 Binary files a/data/tilesets/secondary/82D4EFC/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4EFC/metatiles.bin b/data/tilesets/secondary/82D4EFC/metatiles.bin deleted file mode 100644 index d4216989e..000000000 Binary files a/data/tilesets/secondary/82D4EFC/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4EFC/palettes/0.pal b/data/tilesets/secondary/82D4EFC/palettes/0.pal deleted file mode 100644 index 8db07d418..000000000 --- a/data/tilesets/secondary/82D4EFC/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D4EFC/palettes/1.pal b/data/tilesets/secondary/82D4EFC/palettes/1.pal deleted file mode 100644 index 30be2fbe3..000000000 --- a/data/tilesets/secondary/82D4EFC/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/82D4EFC/palettes/10.pal b/data/tilesets/secondary/82D4EFC/palettes/10.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4EFC/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4EFC/palettes/11.pal b/data/tilesets/secondary/82D4EFC/palettes/11.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4EFC/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4EFC/palettes/12.pal b/data/tilesets/secondary/82D4EFC/palettes/12.pal deleted file mode 100644 index fa56f966e..000000000 --- a/data/tilesets/secondary/82D4EFC/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -131 106 189 -156 123 205 -230 230 255 -115 115 123 -106 156 106 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -106 82 156 -156 131 205 -205 172 246 -189 164 230 -115 115 123 diff --git a/data/tilesets/secondary/82D4EFC/palettes/13.pal b/data/tilesets/secondary/82D4EFC/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4EFC/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4EFC/palettes/14.pal b/data/tilesets/secondary/82D4EFC/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4EFC/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4EFC/palettes/15.pal b/data/tilesets/secondary/82D4EFC/palettes/15.pal deleted file mode 100644 index 92e7ed309..000000000 --- a/data/tilesets/secondary/82D4EFC/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -0 0 0 diff --git a/data/tilesets/secondary/82D4EFC/palettes/2.pal b/data/tilesets/secondary/82D4EFC/palettes/2.pal deleted file mode 100644 index e7c4b911a..000000000 --- a/data/tilesets/secondary/82D4EFC/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/82D4EFC/palettes/3.pal b/data/tilesets/secondary/82D4EFC/palettes/3.pal deleted file mode 100644 index 54b77e0c8..000000000 --- a/data/tilesets/secondary/82D4EFC/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4EFC/palettes/4.pal b/data/tilesets/secondary/82D4EFC/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4EFC/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4EFC/palettes/5.pal b/data/tilesets/secondary/82D4EFC/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4EFC/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4EFC/palettes/6.pal b/data/tilesets/secondary/82D4EFC/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4EFC/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4EFC/palettes/7.pal b/data/tilesets/secondary/82D4EFC/palettes/7.pal deleted file mode 100644 index 241a2678c..000000000 --- a/data/tilesets/secondary/82D4EFC/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -115 115 115 -180 180 164 -238 238 246 -82 123 82 -90 131 90 -106 156 106 -131 172 131 -180 156 222 -106 82 156 -139 115 189 -213 189 255 -255 0 255 -65 106 65 -255 255 255 diff --git a/data/tilesets/secondary/82D4EFC/palettes/8.pal b/data/tilesets/secondary/82D4EFC/palettes/8.pal deleted file mode 100644 index ebd9e912c..000000000 --- a/data/tilesets/secondary/82D4EFC/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -115 115 115 -180 180 164 -238 238 246 -98 139 98 -106 156 106 -131 172 131 -148 189 148 -180 156 222 -205 139 32 -222 172 57 -246 238 164 -255 0 255 -82 123 82 -255 255 255 diff --git a/data/tilesets/secondary/82D4EFC/palettes/9.pal b/data/tilesets/secondary/82D4EFC/palettes/9.pal deleted file mode 100644 index 51daf6701..000000000 --- a/data/tilesets/secondary/82D4EFC/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -115 115 115 -180 180 164 -238 238 246 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -172 123 32 -238 189 74 -74 205 205 -164 255 255 -255 255 255 diff --git a/data/tilesets/secondary/82D4EFC/tiles.png b/data/tilesets/secondary/82D4EFC/tiles.png deleted file mode 100644 index b8f8c6a4d..000000000 Binary files a/data/tilesets/secondary/82D4EFC/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4F14/metatile_attributes.bin b/data/tilesets/secondary/82D4F14/metatile_attributes.bin deleted file mode 100644 index 9656d8ed7..000000000 Binary files a/data/tilesets/secondary/82D4F14/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4F14/metatiles.bin b/data/tilesets/secondary/82D4F14/metatiles.bin deleted file mode 100644 index 3337a5393..000000000 Binary files a/data/tilesets/secondary/82D4F14/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4F14/palettes/0.pal b/data/tilesets/secondary/82D4F14/palettes/0.pal deleted file mode 100644 index 620015e77..000000000 --- a/data/tilesets/secondary/82D4F14/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 139 49 -57 82 0 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D4F14/palettes/1.pal b/data/tilesets/secondary/82D4F14/palettes/1.pal deleted file mode 100644 index 66561f6d3..000000000 --- a/data/tilesets/secondary/82D4F14/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -139 180 222 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/82D4F14/palettes/10.pal b/data/tilesets/secondary/82D4F14/palettes/10.pal deleted file mode 100644 index 1f08b0f6f..000000000 --- a/data/tilesets/secondary/82D4F14/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -238 172 115 -205 156 115 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -156 148 98 diff --git a/data/tilesets/secondary/82D4F14/palettes/11.pal b/data/tilesets/secondary/82D4F14/palettes/11.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4F14/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F14/palettes/12.pal b/data/tilesets/secondary/82D4F14/palettes/12.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F14/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F14/palettes/13.pal b/data/tilesets/secondary/82D4F14/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F14/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F14/palettes/14.pal b/data/tilesets/secondary/82D4F14/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F14/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F14/palettes/15.pal b/data/tilesets/secondary/82D4F14/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F14/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F14/palettes/2.pal b/data/tilesets/secondary/82D4F14/palettes/2.pal deleted file mode 100644 index ddec077d0..000000000 --- a/data/tilesets/secondary/82D4F14/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -115 82 74 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -197 172 139 diff --git a/data/tilesets/secondary/82D4F14/palettes/3.pal b/data/tilesets/secondary/82D4F14/palettes/3.pal deleted file mode 100644 index 6d1dfb5af..000000000 --- a/data/tilesets/secondary/82D4F14/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 238 246 -189 139 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -172 32 41 diff --git a/data/tilesets/secondary/82D4F14/palettes/4.pal b/data/tilesets/secondary/82D4F14/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/82D4F14/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/82D4F14/palettes/5.pal b/data/tilesets/secondary/82D4F14/palettes/5.pal deleted file mode 100644 index 9de0ef422..000000000 --- a/data/tilesets/secondary/82D4F14/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -222 205 131 -205 180 106 -180 139 74 -238 238 164 -255 0 255 -255 0 255 -180 222 164 -131 213 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4F14/palettes/6.pal b/data/tilesets/secondary/82D4F14/palettes/6.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/82D4F14/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F14/palettes/7.pal b/data/tilesets/secondary/82D4F14/palettes/7.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/82D4F14/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F14/palettes/8.pal b/data/tilesets/secondary/82D4F14/palettes/8.pal deleted file mode 100644 index eed6dbc35..000000000 --- a/data/tilesets/secondary/82D4F14/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -123 197 180 -74 74 90 -123 123 131 -189 197 189 -255 0 255 -205 222 222 -90 90 65 -131 115 74 -148 148 115 -189 189 131 -238 238 139 -238 238 246 -74 98 65 -74 156 65 -115 197 98 -156 230 98 diff --git a/data/tilesets/secondary/82D4F14/palettes/9.pal b/data/tilesets/secondary/82D4F14/palettes/9.pal deleted file mode 100644 index e9b93cfd2..000000000 --- a/data/tilesets/secondary/82D4F14/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -123 197 180 -74 74 90 -123 123 131 -205 213 213 -205 156 115 -238 172 115 -106 123 74 -156 148 98 -197 172 115 -222 205 139 -230 222 156 -90 90 49 -213 180 230 -164 139 197 -148 115 172 -123 98 131 diff --git a/data/tilesets/secondary/82D4F14/tiles.png b/data/tilesets/secondary/82D4F14/tiles.png deleted file mode 100644 index 6c8d53e34..000000000 Binary files a/data/tilesets/secondary/82D4F14/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4F2C/metatile_attributes.bin b/data/tilesets/secondary/82D4F2C/metatile_attributes.bin deleted file mode 100644 index 91b8105d3..000000000 Binary files a/data/tilesets/secondary/82D4F2C/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4F2C/metatiles.bin b/data/tilesets/secondary/82D4F2C/metatiles.bin deleted file mode 100644 index 5caba25a7..000000000 Binary files a/data/tilesets/secondary/82D4F2C/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4F2C/palettes/0.pal b/data/tilesets/secondary/82D4F2C/palettes/0.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F2C/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F2C/palettes/1.pal b/data/tilesets/secondary/82D4F2C/palettes/1.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F2C/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F2C/palettes/10.pal b/data/tilesets/secondary/82D4F2C/palettes/10.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F2C/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F2C/palettes/11.pal b/data/tilesets/secondary/82D4F2C/palettes/11.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F2C/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F2C/palettes/12.pal b/data/tilesets/secondary/82D4F2C/palettes/12.pal deleted file mode 100644 index 9c9a571ef..000000000 --- a/data/tilesets/secondary/82D4F2C/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -148 148 148 -164 98 74 -222 148 123 -255 189 164 -139 82 57 -189 131 156 -246 205 238 -139 115 49 -156 131 90 -189 164 115 -222 205 156 -255 238 189 -82 82 106 -123 123 139 -205 205 197 -255 255 255 diff --git a/data/tilesets/secondary/82D4F2C/palettes/13.pal b/data/tilesets/secondary/82D4F2C/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F2C/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F2C/palettes/14.pal b/data/tilesets/secondary/82D4F2C/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F2C/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F2C/palettes/15.pal b/data/tilesets/secondary/82D4F2C/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F2C/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F2C/palettes/2.pal b/data/tilesets/secondary/82D4F2C/palettes/2.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F2C/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F2C/palettes/3.pal b/data/tilesets/secondary/82D4F2C/palettes/3.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F2C/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F2C/palettes/4.pal b/data/tilesets/secondary/82D4F2C/palettes/4.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F2C/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F2C/palettes/5.pal b/data/tilesets/secondary/82D4F2C/palettes/5.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F2C/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F2C/palettes/6.pal b/data/tilesets/secondary/82D4F2C/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F2C/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F2C/palettes/7.pal b/data/tilesets/secondary/82D4F2C/palettes/7.pal deleted file mode 100644 index 4d22869cd..000000000 --- a/data/tilesets/secondary/82D4F2C/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -148 148 148 -82 131 106 -131 180 156 -180 230 205 -180 0 0 -255 0 0 -148 148 156 -172 172 172 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -82 82 106 -123 123 139 -205 205 197 -255 255 255 diff --git a/data/tilesets/secondary/82D4F2C/palettes/8.pal b/data/tilesets/secondary/82D4F2C/palettes/8.pal deleted file mode 100644 index 2a9d791a4..000000000 --- a/data/tilesets/secondary/82D4F2C/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -148 148 148 -164 98 74 -222 148 123 -255 189 164 -139 82 57 -172 197 230 -213 222 238 -0 0 0 -0 0 0 -189 164 115 -0 0 0 -255 238 189 -82 82 106 -123 123 139 -205 205 197 -255 255 255 diff --git a/data/tilesets/secondary/82D4F2C/palettes/9.pal b/data/tilesets/secondary/82D4F2C/palettes/9.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F2C/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F2C/tiles.png b/data/tilesets/secondary/82D4F2C/tiles.png deleted file mode 100644 index 3e69db5c3..000000000 Binary files a/data/tilesets/secondary/82D4F2C/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4F44/metatile_attributes.bin b/data/tilesets/secondary/82D4F44/metatile_attributes.bin deleted file mode 100644 index a2ac291b5..000000000 Binary files a/data/tilesets/secondary/82D4F44/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4F44/metatiles.bin b/data/tilesets/secondary/82D4F44/metatiles.bin deleted file mode 100644 index 5cddd954c..000000000 Binary files a/data/tilesets/secondary/82D4F44/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4F44/palettes/0.pal b/data/tilesets/secondary/82D4F44/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/82D4F44/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D4F44/palettes/1.pal b/data/tilesets/secondary/82D4F44/palettes/1.pal deleted file mode 100644 index 30be2fbe3..000000000 --- a/data/tilesets/secondary/82D4F44/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/82D4F44/palettes/10.pal b/data/tilesets/secondary/82D4F44/palettes/10.pal deleted file mode 100644 index c06a049b0..000000000 --- a/data/tilesets/secondary/82D4F44/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F44/palettes/11.pal b/data/tilesets/secondary/82D4F44/palettes/11.pal deleted file mode 100644 index c06a049b0..000000000 --- a/data/tilesets/secondary/82D4F44/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F44/palettes/12.pal b/data/tilesets/secondary/82D4F44/palettes/12.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F44/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F44/palettes/13.pal b/data/tilesets/secondary/82D4F44/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F44/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F44/palettes/14.pal b/data/tilesets/secondary/82D4F44/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F44/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F44/palettes/15.pal b/data/tilesets/secondary/82D4F44/palettes/15.pal deleted file mode 100644 index 71b5ee827..000000000 --- a/data/tilesets/secondary/82D4F44/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 diff --git a/data/tilesets/secondary/82D4F44/palettes/2.pal b/data/tilesets/secondary/82D4F44/palettes/2.pal deleted file mode 100644 index e7c4b911a..000000000 --- a/data/tilesets/secondary/82D4F44/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/82D4F44/palettes/3.pal b/data/tilesets/secondary/82D4F44/palettes/3.pal deleted file mode 100644 index 54b77e0c8..000000000 --- a/data/tilesets/secondary/82D4F44/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4F44/palettes/4.pal b/data/tilesets/secondary/82D4F44/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4F44/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F44/palettes/5.pal b/data/tilesets/secondary/82D4F44/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4F44/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F44/palettes/6.pal b/data/tilesets/secondary/82D4F44/palettes/6.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4F44/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F44/palettes/7.pal b/data/tilesets/secondary/82D4F44/palettes/7.pal deleted file mode 100644 index 5e3bac102..000000000 --- a/data/tilesets/secondary/82D4F44/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -106 197 106 -255 205 90 -82 148 197 -189 230 255 -139 98 41 -156 123 65 -180 148 90 -205 172 115 -246 213 172 -205 106 90 -255 148 131 diff --git a/data/tilesets/secondary/82D4F44/palettes/8.pal b/data/tilesets/secondary/82D4F44/palettes/8.pal deleted file mode 100644 index 2257c0006..000000000 --- a/data/tilesets/secondary/82D4F44/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -82 82 106 -131 131 139 -230 222 246 -255 255 255 -255 205 98 -255 255 148 -189 230 255 -180 148 90 -255 139 180 -197 180 131 -213 213 164 -238 238 213 -106 197 106 -205 106 90 -131 115 16 diff --git a/data/tilesets/secondary/82D4F44/palettes/9.pal b/data/tilesets/secondary/82D4F44/palettes/9.pal deleted file mode 100644 index c06a049b0..000000000 --- a/data/tilesets/secondary/82D4F44/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F44/tiles.png b/data/tilesets/secondary/82D4F44/tiles.png deleted file mode 100644 index 5c8a38b9e..000000000 Binary files a/data/tilesets/secondary/82D4F44/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4F5C/metatile_attributes.bin b/data/tilesets/secondary/82D4F5C/metatile_attributes.bin deleted file mode 100644 index cdcb96c53..000000000 Binary files a/data/tilesets/secondary/82D4F5C/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4F5C/metatiles.bin b/data/tilesets/secondary/82D4F5C/metatiles.bin deleted file mode 100644 index 35009a690..000000000 Binary files a/data/tilesets/secondary/82D4F5C/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4F5C/palettes/0.pal b/data/tilesets/secondary/82D4F5C/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/82D4F5C/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D4F5C/palettes/1.pal b/data/tilesets/secondary/82D4F5C/palettes/1.pal deleted file mode 100644 index 30be2fbe3..000000000 --- a/data/tilesets/secondary/82D4F5C/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/82D4F5C/palettes/10.pal b/data/tilesets/secondary/82D4F5C/palettes/10.pal deleted file mode 100644 index c06a049b0..000000000 --- a/data/tilesets/secondary/82D4F5C/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F5C/palettes/11.pal b/data/tilesets/secondary/82D4F5C/palettes/11.pal deleted file mode 100644 index c06a049b0..000000000 --- a/data/tilesets/secondary/82D4F5C/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F5C/palettes/12.pal b/data/tilesets/secondary/82D4F5C/palettes/12.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F5C/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F5C/palettes/13.pal b/data/tilesets/secondary/82D4F5C/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F5C/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F5C/palettes/14.pal b/data/tilesets/secondary/82D4F5C/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F5C/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F5C/palettes/15.pal b/data/tilesets/secondary/82D4F5C/palettes/15.pal deleted file mode 100644 index 71b5ee827..000000000 --- a/data/tilesets/secondary/82D4F5C/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 diff --git a/data/tilesets/secondary/82D4F5C/palettes/2.pal b/data/tilesets/secondary/82D4F5C/palettes/2.pal deleted file mode 100644 index e7c4b911a..000000000 --- a/data/tilesets/secondary/82D4F5C/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/82D4F5C/palettes/3.pal b/data/tilesets/secondary/82D4F5C/palettes/3.pal deleted file mode 100644 index 54b77e0c8..000000000 --- a/data/tilesets/secondary/82D4F5C/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D4F5C/palettes/4.pal b/data/tilesets/secondary/82D4F5C/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4F5C/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F5C/palettes/5.pal b/data/tilesets/secondary/82D4F5C/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4F5C/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F5C/palettes/6.pal b/data/tilesets/secondary/82D4F5C/palettes/6.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/82D4F5C/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F5C/palettes/7.pal b/data/tilesets/secondary/82D4F5C/palettes/7.pal deleted file mode 100644 index 6c1a5b096..000000000 --- a/data/tilesets/secondary/82D4F5C/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -172 148 90 -213 189 131 -255 230 172 -255 255 98 -255 197 197 -98 156 74 -148 205 123 -98 156 172 -123 180 197 -156 205 222 -189 230 246 diff --git a/data/tilesets/secondary/82D4F5C/palettes/8.pal b/data/tilesets/secondary/82D4F5C/palettes/8.pal deleted file mode 100644 index 1557a55f0..000000000 --- a/data/tilesets/secondary/82D4F5C/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -123 131 82 -139 148 82 -156 164 90 -172 180 106 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F5C/palettes/9.pal b/data/tilesets/secondary/82D4F5C/palettes/9.pal deleted file mode 100644 index c06a049b0..000000000 --- a/data/tilesets/secondary/82D4F5C/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F5C/tiles.png b/data/tilesets/secondary/82D4F5C/tiles.png deleted file mode 100644 index 935afccd2..000000000 Binary files a/data/tilesets/secondary/82D4F5C/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4F74/metatile_attributes.bin b/data/tilesets/secondary/82D4F74/metatile_attributes.bin deleted file mode 100644 index 8255cca20..000000000 Binary files a/data/tilesets/secondary/82D4F74/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4F74/metatiles.bin b/data/tilesets/secondary/82D4F74/metatiles.bin deleted file mode 100644 index 63ddd975b..000000000 Binary files a/data/tilesets/secondary/82D4F74/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4F74/palettes/0.pal b/data/tilesets/secondary/82D4F74/palettes/0.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F74/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F74/palettes/1.pal b/data/tilesets/secondary/82D4F74/palettes/1.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F74/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F74/palettes/10.pal b/data/tilesets/secondary/82D4F74/palettes/10.pal deleted file mode 100644 index afe462f8e..000000000 --- a/data/tilesets/secondary/82D4F74/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 197 -82 82 106 -131 131 131 -123 189 222 -123 156 189 -164 222 246 -189 238 238 -74 139 98 -106 172 106 -123 205 123 -90 148 115 -139 197 131 -197 238 123 -197 172 74 -255 0 255 -230 230 106 diff --git a/data/tilesets/secondary/82D4F74/palettes/11.pal b/data/tilesets/secondary/82D4F74/palettes/11.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F74/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F74/palettes/12.pal b/data/tilesets/secondary/82D4F74/palettes/12.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F74/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F74/palettes/13.pal b/data/tilesets/secondary/82D4F74/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F74/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F74/palettes/14.pal b/data/tilesets/secondary/82D4F74/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F74/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F74/palettes/15.pal b/data/tilesets/secondary/82D4F74/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F74/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F74/palettes/2.pal b/data/tilesets/secondary/82D4F74/palettes/2.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F74/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F74/palettes/3.pal b/data/tilesets/secondary/82D4F74/palettes/3.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F74/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F74/palettes/4.pal b/data/tilesets/secondary/82D4F74/palettes/4.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F74/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F74/palettes/5.pal b/data/tilesets/secondary/82D4F74/palettes/5.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F74/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F74/palettes/6.pal b/data/tilesets/secondary/82D4F74/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F74/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F74/palettes/7.pal b/data/tilesets/secondary/82D4F74/palettes/7.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F74/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F74/palettes/8.pal b/data/tilesets/secondary/82D4F74/palettes/8.pal deleted file mode 100644 index 4b7de8012..000000000 --- a/data/tilesets/secondary/82D4F74/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 197 -82 82 106 -131 131 131 -131 115 90 -189 131 90 -205 156 90 -238 180 90 -172 172 131 -222 222 172 -172 180 205 -238 230 172 -255 255 246 -255 255 246 -197 205 222 -205 213 230 -230 230 246 diff --git a/data/tilesets/secondary/82D4F74/palettes/9.pal b/data/tilesets/secondary/82D4F74/palettes/9.pal deleted file mode 100644 index 8fe0861de..000000000 --- a/data/tilesets/secondary/82D4F74/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 197 -82 82 106 -131 131 131 -246 246 189 -180 180 139 -205 156 90 -230 230 131 -222 213 131 -205 205 115 -197 180 115 -255 0 255 -123 123 98 -156 156 98 -205 148 197 -90 164 205 -90 189 246 diff --git a/data/tilesets/secondary/82D4F74/tiles.png b/data/tilesets/secondary/82D4F74/tiles.png deleted file mode 100644 index b8a2a1a4f..000000000 Binary files a/data/tilesets/secondary/82D4F74/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4F8C/metatile_attributes.bin b/data/tilesets/secondary/82D4F8C/metatile_attributes.bin deleted file mode 100644 index aa43d15ee..000000000 Binary files a/data/tilesets/secondary/82D4F8C/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4F8C/metatiles.bin b/data/tilesets/secondary/82D4F8C/metatiles.bin deleted file mode 100644 index 117c036fa..000000000 Binary files a/data/tilesets/secondary/82D4F8C/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4F8C/palettes/0.pal b/data/tilesets/secondary/82D4F8C/palettes/0.pal deleted file mode 100644 index 5867e5ba6..000000000 --- a/data/tilesets/secondary/82D4F8C/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -156 213 255 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D4F8C/palettes/1.pal b/data/tilesets/secondary/82D4F8C/palettes/1.pal deleted file mode 100644 index 66561f6d3..000000000 --- a/data/tilesets/secondary/82D4F8C/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -139 180 222 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/82D4F8C/palettes/10.pal b/data/tilesets/secondary/82D4F8C/palettes/10.pal deleted file mode 100644 index 3c091df8b..000000000 --- a/data/tilesets/secondary/82D4F8C/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -148 148 164 -205 189 197 -255 255 255 -255 213 115 -189 148 49 -139 98 74 -90 106 180 -255 205 139 -230 172 90 -230 148 65 -180 98 24 -238 213 172 -222 156 139 -123 123 123 diff --git a/data/tilesets/secondary/82D4F8C/palettes/11.pal b/data/tilesets/secondary/82D4F8C/palettes/11.pal deleted file mode 100644 index 79494336b..000000000 --- a/data/tilesets/secondary/82D4F8C/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -115 115 115 -180 180 164 -238 238 238 -213 222 164 -115 156 148 -230 213 115 -180 172 90 -139 148 90 -98 123 180 -148 156 156 -189 197 197 -246 230 164 -180 189 131 -205 213 213 diff --git a/data/tilesets/secondary/82D4F8C/palettes/12.pal b/data/tilesets/secondary/82D4F8C/palettes/12.pal deleted file mode 100644 index b9b1e6061..000000000 --- a/data/tilesets/secondary/82D4F8C/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -131 131 82 -164 164 98 -197 197 156 -106 164 172 -197 205 213 -205 156 32 -172 148 197 -205 164 230 -230 197 255 -205 197 106 -230 230 230 diff --git a/data/tilesets/secondary/82D4F8C/palettes/13.pal b/data/tilesets/secondary/82D4F8C/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F8C/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F8C/palettes/14.pal b/data/tilesets/secondary/82D4F8C/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4F8C/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F8C/palettes/15.pal b/data/tilesets/secondary/82D4F8C/palettes/15.pal deleted file mode 100644 index 093fbdd6c..000000000 --- a/data/tilesets/secondary/82D4F8C/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -213 222 164 -180 189 131 -139 148 90 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F8C/palettes/2.pal b/data/tilesets/secondary/82D4F8C/palettes/2.pal deleted file mode 100644 index 87a022102..000000000 --- a/data/tilesets/secondary/82D4F8C/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -90 90 115 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/82D4F8C/palettes/3.pal b/data/tilesets/secondary/82D4F8C/palettes/3.pal deleted file mode 100644 index 783496dcd..000000000 --- a/data/tilesets/secondary/82D4F8C/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -65 98 156 -90 123 180 -115 156 197 -222 213 131 -164 164 172 -205 205 213 -238 238 246 -106 172 115 -156 205 139 diff --git a/data/tilesets/secondary/82D4F8C/palettes/4.pal b/data/tilesets/secondary/82D4F8C/palettes/4.pal deleted file mode 100644 index 89eace605..000000000 --- a/data/tilesets/secondary/82D4F8C/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 238 246 -172 197 180 -197 222 205 -90 189 172 -246 238 156 -205 189 131 -189 164 123 -148 131 106 -106 106 106 -213 222 230 -238 180 115 diff --git a/data/tilesets/secondary/82D4F8C/palettes/5.pal b/data/tilesets/secondary/82D4F8C/palettes/5.pal deleted file mode 100644 index c7780e5c7..000000000 --- a/data/tilesets/secondary/82D4F8C/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -213 222 222 -164 180 189 -255 0 255 -131 115 74 -213 213 148 -197 189 139 -172 156 115 -148 131 90 -197 197 205 -205 82 65 -0 0 0 diff --git a/data/tilesets/secondary/82D4F8C/palettes/6.pal b/data/tilesets/secondary/82D4F8C/palettes/6.pal deleted file mode 100644 index 1d08ce9a2..000000000 --- a/data/tilesets/secondary/82D4F8C/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4F8C/palettes/7.pal b/data/tilesets/secondary/82D4F8C/palettes/7.pal deleted file mode 100644 index 35987db53..000000000 --- a/data/tilesets/secondary/82D4F8C/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -139 139 148 -180 180 164 -255 255 255 -205 197 106 -246 238 148 -255 255 222 -98 98 123 -238 238 238 -82 222 123 -131 255 164 -82 164 57 -230 139 98 -189 98 74 -213 213 213 diff --git a/data/tilesets/secondary/82D4F8C/palettes/8.pal b/data/tilesets/secondary/82D4F8C/palettes/8.pal deleted file mode 100644 index 7f33e006f..000000000 --- a/data/tilesets/secondary/82D4F8C/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -148 148 164 -180 180 164 -255 255 255 -213 213 213 -106 156 164 -131 189 197 -172 222 230 -238 180 222 -180 115 164 -213 213 180 -255 0 255 -156 205 246 -98 156 238 diff --git a/data/tilesets/secondary/82D4F8C/palettes/9.pal b/data/tilesets/secondary/82D4F8C/palettes/9.pal deleted file mode 100644 index 75022050d..000000000 --- a/data/tilesets/secondary/82D4F8C/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -148 148 164 -180 180 164 -255 255 255 -213 213 213 -148 205 180 -115 172 148 -106 148 139 -197 238 255 -172 213 255 -123 164 222 -98 139 189 -123 164 189 -148 189 238 diff --git a/data/tilesets/secondary/82D4F8C/tiles.png b/data/tilesets/secondary/82D4F8C/tiles.png deleted file mode 100644 index 324b42c9f..000000000 Binary files a/data/tilesets/secondary/82D4F8C/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4FA4/metatile_attributes.bin b/data/tilesets/secondary/82D4FA4/metatile_attributes.bin deleted file mode 100644 index db0f7817e..000000000 Binary files a/data/tilesets/secondary/82D4FA4/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4FA4/metatiles.bin b/data/tilesets/secondary/82D4FA4/metatiles.bin deleted file mode 100644 index dfe78c910..000000000 Binary files a/data/tilesets/secondary/82D4FA4/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4FA4/palettes/0.pal b/data/tilesets/secondary/82D4FA4/palettes/0.pal deleted file mode 100644 index 6d876039d..000000000 --- a/data/tilesets/secondary/82D4FA4/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D4FA4/palettes/1.pal b/data/tilesets/secondary/82D4FA4/palettes/1.pal deleted file mode 100644 index 66561f6d3..000000000 --- a/data/tilesets/secondary/82D4FA4/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -139 180 222 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/82D4FA4/palettes/10.pal b/data/tilesets/secondary/82D4FA4/palettes/10.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4FA4/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4FA4/palettes/11.pal b/data/tilesets/secondary/82D4FA4/palettes/11.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4FA4/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4FA4/palettes/12.pal b/data/tilesets/secondary/82D4FA4/palettes/12.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4FA4/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4FA4/palettes/13.pal b/data/tilesets/secondary/82D4FA4/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4FA4/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4FA4/palettes/14.pal b/data/tilesets/secondary/82D4FA4/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4FA4/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4FA4/palettes/15.pal b/data/tilesets/secondary/82D4FA4/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4FA4/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4FA4/palettes/2.pal b/data/tilesets/secondary/82D4FA4/palettes/2.pal deleted file mode 100644 index 87a022102..000000000 --- a/data/tilesets/secondary/82D4FA4/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -90 90 115 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/82D4FA4/palettes/3.pal b/data/tilesets/secondary/82D4FA4/palettes/3.pal deleted file mode 100644 index 783496dcd..000000000 --- a/data/tilesets/secondary/82D4FA4/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -65 98 156 -90 123 180 -115 156 197 -222 213 131 -164 164 172 -205 205 213 -238 238 246 -106 172 115 -156 205 139 diff --git a/data/tilesets/secondary/82D4FA4/palettes/4.pal b/data/tilesets/secondary/82D4FA4/palettes/4.pal deleted file mode 100644 index 89eace605..000000000 --- a/data/tilesets/secondary/82D4FA4/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 238 246 -172 197 180 -197 222 205 -90 189 172 -246 238 156 -205 189 131 -189 164 123 -148 131 106 -106 106 106 -213 222 230 -238 180 115 diff --git a/data/tilesets/secondary/82D4FA4/palettes/5.pal b/data/tilesets/secondary/82D4FA4/palettes/5.pal deleted file mode 100644 index 0eef3df8e..000000000 --- a/data/tilesets/secondary/82D4FA4/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -213 222 222 -164 180 189 -255 0 255 -131 115 74 -213 213 148 -197 189 139 -172 156 115 -148 131 90 -255 0 255 -255 0 255 -0 0 0 diff --git a/data/tilesets/secondary/82D4FA4/palettes/6.pal b/data/tilesets/secondary/82D4FA4/palettes/6.pal deleted file mode 100644 index 1d08ce9a2..000000000 --- a/data/tilesets/secondary/82D4FA4/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4FA4/palettes/7.pal b/data/tilesets/secondary/82D4FA4/palettes/7.pal deleted file mode 100644 index c1e7c3d5c..000000000 --- a/data/tilesets/secondary/82D4FA4/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 diff --git a/data/tilesets/secondary/82D4FA4/palettes/8.pal b/data/tilesets/secondary/82D4FA4/palettes/8.pal deleted file mode 100644 index c1e7c3d5c..000000000 --- a/data/tilesets/secondary/82D4FA4/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 diff --git a/data/tilesets/secondary/82D4FA4/palettes/9.pal b/data/tilesets/secondary/82D4FA4/palettes/9.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D4FA4/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4FA4/tiles.png b/data/tilesets/secondary/82D4FA4/tiles.png deleted file mode 100644 index 9fcf94314..000000000 Binary files a/data/tilesets/secondary/82D4FA4/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4FBC/metatile_attributes.bin b/data/tilesets/secondary/82D4FBC/metatile_attributes.bin deleted file mode 100644 index 1b1cb4d44..000000000 Binary files a/data/tilesets/secondary/82D4FBC/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4FBC/metatiles.bin b/data/tilesets/secondary/82D4FBC/metatiles.bin deleted file mode 100644 index 274da22a6..000000000 Binary files a/data/tilesets/secondary/82D4FBC/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4FBC/palettes/0.pal b/data/tilesets/secondary/82D4FBC/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/82D4FBC/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D4FBC/palettes/1.pal b/data/tilesets/secondary/82D4FBC/palettes/1.pal deleted file mode 100644 index d8a4e7757..000000000 --- a/data/tilesets/secondary/82D4FBC/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/82D4FBC/palettes/10.pal b/data/tilesets/secondary/82D4FBC/palettes/10.pal deleted file mode 100644 index 937405d15..000000000 --- a/data/tilesets/secondary/82D4FBC/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -255 0 255 -255 0 255 -255 0 255 -0 0 0 -255 238 164 -230 197 139 -205 172 123 -172 139 106 -213 197 189 -205 180 156 -189 148 139 -148 115 106 -115 65 74 -82 49 65 -90 90 98 diff --git a/data/tilesets/secondary/82D4FBC/palettes/11.pal b/data/tilesets/secondary/82D4FBC/palettes/11.pal deleted file mode 100644 index bb4f4867c..000000000 --- a/data/tilesets/secondary/82D4FBC/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -189 189 156 -172 172 139 -148 139 115 -123 115 90 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -238 222 148 -222 205 115 -205 180 98 -189 172 98 diff --git a/data/tilesets/secondary/82D4FBC/palettes/12.pal b/data/tilesets/secondary/82D4FBC/palettes/12.pal deleted file mode 100644 index 583384664..000000000 --- a/data/tilesets/secondary/82D4FBC/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -0 0 0 diff --git a/data/tilesets/secondary/82D4FBC/palettes/13.pal b/data/tilesets/secondary/82D4FBC/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4FBC/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4FBC/palettes/14.pal b/data/tilesets/secondary/82D4FBC/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4FBC/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4FBC/palettes/15.pal b/data/tilesets/secondary/82D4FBC/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4FBC/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4FBC/palettes/2.pal b/data/tilesets/secondary/82D4FBC/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/82D4FBC/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/82D4FBC/palettes/3.pal b/data/tilesets/secondary/82D4FBC/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/secondary/82D4FBC/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4FBC/palettes/4.pal b/data/tilesets/secondary/82D4FBC/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/82D4FBC/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/82D4FBC/palettes/5.pal b/data/tilesets/secondary/82D4FBC/palettes/5.pal deleted file mode 100644 index c5a653979..000000000 --- a/data/tilesets/secondary/82D4FBC/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4FBC/palettes/6.pal b/data/tilesets/secondary/82D4FBC/palettes/6.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/82D4FBC/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4FBC/palettes/7.pal b/data/tilesets/secondary/82D4FBC/palettes/7.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/82D4FBC/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4FBC/palettes/8.pal b/data/tilesets/secondary/82D4FBC/palettes/8.pal deleted file mode 100644 index 6774e407f..000000000 --- a/data/tilesets/secondary/82D4FBC/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -189 189 156 -172 172 139 -148 139 115 -123 115 90 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -222 197 189 -205 180 156 -189 148 139 -148 115 106 -115 65 74 -82 49 65 -90 90 98 diff --git a/data/tilesets/secondary/82D4FBC/palettes/9.pal b/data/tilesets/secondary/82D4FBC/palettes/9.pal deleted file mode 100644 index 3795f6c6a..000000000 --- a/data/tilesets/secondary/82D4FBC/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 222 213 -189 189 156 -172 172 139 -148 139 115 -123 115 90 -255 238 164 -230 197 139 -205 172 123 -164 123 90 -148 115 74 -106 65 41 -74 74 57 -0 0 0 -98 139 197 -74 115 172 -57 98 156 diff --git a/data/tilesets/secondary/82D4FBC/tiles.png b/data/tilesets/secondary/82D4FBC/tiles.png deleted file mode 100644 index b2d960c60..000000000 Binary files a/data/tilesets/secondary/82D4FBC/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4FD4/metatile_attributes.bin b/data/tilesets/secondary/82D4FD4/metatile_attributes.bin deleted file mode 100644 index 1b1cb4d44..000000000 Binary files a/data/tilesets/secondary/82D4FD4/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4FD4/metatiles.bin b/data/tilesets/secondary/82D4FD4/metatiles.bin deleted file mode 100644 index 8f740f6af..000000000 Binary files a/data/tilesets/secondary/82D4FD4/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4FD4/palettes/0.pal b/data/tilesets/secondary/82D4FD4/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/82D4FD4/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D4FD4/palettes/1.pal b/data/tilesets/secondary/82D4FD4/palettes/1.pal deleted file mode 100644 index d8a4e7757..000000000 --- a/data/tilesets/secondary/82D4FD4/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/82D4FD4/palettes/10.pal b/data/tilesets/secondary/82D4FD4/palettes/10.pal deleted file mode 100644 index 937405d15..000000000 --- a/data/tilesets/secondary/82D4FD4/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -255 0 255 -255 0 255 -255 0 255 -0 0 0 -255 238 164 -230 197 139 -205 172 123 -172 139 106 -213 197 189 -205 180 156 -189 148 139 -148 115 106 -115 65 74 -82 49 65 -90 90 98 diff --git a/data/tilesets/secondary/82D4FD4/palettes/11.pal b/data/tilesets/secondary/82D4FD4/palettes/11.pal deleted file mode 100644 index bb4f4867c..000000000 --- a/data/tilesets/secondary/82D4FD4/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -189 189 156 -172 172 139 -148 139 115 -123 115 90 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -238 222 148 -222 205 115 -205 180 98 -189 172 98 diff --git a/data/tilesets/secondary/82D4FD4/palettes/12.pal b/data/tilesets/secondary/82D4FD4/palettes/12.pal deleted file mode 100644 index 583384664..000000000 --- a/data/tilesets/secondary/82D4FD4/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -0 0 0 diff --git a/data/tilesets/secondary/82D4FD4/palettes/13.pal b/data/tilesets/secondary/82D4FD4/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4FD4/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4FD4/palettes/14.pal b/data/tilesets/secondary/82D4FD4/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4FD4/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4FD4/palettes/15.pal b/data/tilesets/secondary/82D4FD4/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4FD4/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4FD4/palettes/2.pal b/data/tilesets/secondary/82D4FD4/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/82D4FD4/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/82D4FD4/palettes/3.pal b/data/tilesets/secondary/82D4FD4/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/secondary/82D4FD4/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4FD4/palettes/4.pal b/data/tilesets/secondary/82D4FD4/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/82D4FD4/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/82D4FD4/palettes/5.pal b/data/tilesets/secondary/82D4FD4/palettes/5.pal deleted file mode 100644 index c5a653979..000000000 --- a/data/tilesets/secondary/82D4FD4/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4FD4/palettes/6.pal b/data/tilesets/secondary/82D4FD4/palettes/6.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/82D4FD4/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4FD4/palettes/7.pal b/data/tilesets/secondary/82D4FD4/palettes/7.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/82D4FD4/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4FD4/palettes/8.pal b/data/tilesets/secondary/82D4FD4/palettes/8.pal deleted file mode 100644 index 6774e407f..000000000 --- a/data/tilesets/secondary/82D4FD4/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -189 189 156 -172 172 139 -148 139 115 -123 115 90 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -222 197 189 -205 180 156 -189 148 139 -148 115 106 -115 65 74 -82 49 65 -90 90 98 diff --git a/data/tilesets/secondary/82D4FD4/palettes/9.pal b/data/tilesets/secondary/82D4FD4/palettes/9.pal deleted file mode 100644 index 3795f6c6a..000000000 --- a/data/tilesets/secondary/82D4FD4/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 222 213 -189 189 156 -172 172 139 -148 139 115 -123 115 90 -255 238 164 -230 197 139 -205 172 123 -164 123 90 -148 115 74 -106 65 41 -74 74 57 -0 0 0 -98 139 197 -74 115 172 -57 98 156 diff --git a/data/tilesets/secondary/82D4FD4/tiles.png b/data/tilesets/secondary/82D4FD4/tiles.png deleted file mode 100644 index 201df80fb..000000000 Binary files a/data/tilesets/secondary/82D4FD4/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D4FEC/metatile_attributes.bin b/data/tilesets/secondary/82D4FEC/metatile_attributes.bin deleted file mode 100644 index 45432b773..000000000 Binary files a/data/tilesets/secondary/82D4FEC/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4FEC/metatiles.bin b/data/tilesets/secondary/82D4FEC/metatiles.bin deleted file mode 100644 index b80796821..000000000 Binary files a/data/tilesets/secondary/82D4FEC/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D4FEC/palettes/0.pal b/data/tilesets/secondary/82D4FEC/palettes/0.pal deleted file mode 100644 index 30ff4070a..000000000 --- a/data/tilesets/secondary/82D4FEC/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D4FEC/palettes/1.pal b/data/tilesets/secondary/82D4FEC/palettes/1.pal deleted file mode 100644 index e15d979f1..000000000 --- a/data/tilesets/secondary/82D4FEC/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -222 230 230 -197 205 213 -172 189 205 -123 123 131 -65 49 65 -230 238 238 -90 189 139 -90 90 115 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/82D4FEC/palettes/10.pal b/data/tilesets/secondary/82D4FEC/palettes/10.pal deleted file mode 100644 index fc340ed15..000000000 --- a/data/tilesets/secondary/82D4FEC/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -255 0 255 -255 0 255 -255 0 255 -0 0 0 -255 238 164 -230 197 139 -205 172 123 -172 139 106 -213 172 172 -197 156 148 -172 123 123 -131 82 74 -115 49 49 -90 24 24 -90 90 98 diff --git a/data/tilesets/secondary/82D4FEC/palettes/11.pal b/data/tilesets/secondary/82D4FEC/palettes/11.pal deleted file mode 100644 index e07ce6909..000000000 --- a/data/tilesets/secondary/82D4FEC/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -197 197 180 -172 172 156 -148 148 123 -123 123 106 -164 172 172 -255 230 65 -123 123 106 -255 255 255 -74 65 74 -238 238 230 -189 189 180 -230 230 205 -205 205 180 -180 180 164 -164 164 148 diff --git a/data/tilesets/secondary/82D4FEC/palettes/12.pal b/data/tilesets/secondary/82D4FEC/palettes/12.pal deleted file mode 100644 index cc53a5940..000000000 --- a/data/tilesets/secondary/82D4FEC/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -139 205 246 -98 172 197 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -139 90 90 -106 65 65 -82 49 49 -49 32 32 -24 16 16 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4FEC/palettes/13.pal b/data/tilesets/secondary/82D4FEC/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4FEC/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4FEC/palettes/14.pal b/data/tilesets/secondary/82D4FEC/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4FEC/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4FEC/palettes/15.pal b/data/tilesets/secondary/82D4FEC/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D4FEC/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D4FEC/palettes/2.pal b/data/tilesets/secondary/82D4FEC/palettes/2.pal deleted file mode 100644 index 372fb5d7c..000000000 --- a/data/tilesets/secondary/82D4FEC/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/82D4FEC/palettes/3.pal b/data/tilesets/secondary/82D4FEC/palettes/3.pal deleted file mode 100644 index 973765509..000000000 --- a/data/tilesets/secondary/82D4FEC/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4FEC/palettes/4.pal b/data/tilesets/secondary/82D4FEC/palettes/4.pal deleted file mode 100644 index 91fdcabdf..000000000 --- a/data/tilesets/secondary/82D4FEC/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -213 238 255 -172 205 255 -139 180 238 -106 156 230 -74 139 189 -65 123 189 -82 139 205 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -49 115 172 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/82D4FEC/palettes/5.pal b/data/tilesets/secondary/82D4FEC/palettes/5.pal deleted file mode 100644 index 0edb843f5..000000000 --- a/data/tilesets/secondary/82D4FEC/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/82D4FEC/palettes/6.pal b/data/tilesets/secondary/82D4FEC/palettes/6.pal deleted file mode 100644 index 32afdccbb..000000000 --- a/data/tilesets/secondary/82D4FEC/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -213 238 255 -172 205 255 -139 180 238 -106 156 230 -65 123 172 -41 98 156 -74 115 197 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -49 115 172 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/82D4FEC/palettes/7.pal b/data/tilesets/secondary/82D4FEC/palettes/7.pal deleted file mode 100644 index fa9d5d633..000000000 --- a/data/tilesets/secondary/82D4FEC/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -172 123 123 -139 98 98 -115 74 74 -90 49 49 -65 24 24 -41 0 0 -41 41 49 diff --git a/data/tilesets/secondary/82D4FEC/palettes/8.pal b/data/tilesets/secondary/82D4FEC/palettes/8.pal deleted file mode 100644 index f4a797b87..000000000 --- a/data/tilesets/secondary/82D4FEC/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -197 197 180 -172 172 156 -148 148 123 -123 123 106 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -213 172 172 -197 156 148 -172 123 123 -131 82 74 -115 49 49 -90 24 24 -90 90 98 diff --git a/data/tilesets/secondary/82D4FEC/palettes/9.pal b/data/tilesets/secondary/82D4FEC/palettes/9.pal deleted file mode 100644 index 0a2109195..000000000 --- a/data/tilesets/secondary/82D4FEC/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -197 197 180 -172 172 156 -148 148 123 -123 123 106 -255 238 164 -230 197 139 -205 172 123 -164 123 90 -148 115 74 -106 65 41 -74 74 57 -0 0 0 -98 139 197 -74 115 172 -57 98 156 diff --git a/data/tilesets/secondary/82D4FEC/tiles.png b/data/tilesets/secondary/82D4FEC/tiles.png deleted file mode 100644 index 04d2b7b67..000000000 Binary files a/data/tilesets/secondary/82D4FEC/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D5004/metatile_attributes.bin b/data/tilesets/secondary/82D5004/metatile_attributes.bin deleted file mode 100644 index 6d6c6d544..000000000 Binary files a/data/tilesets/secondary/82D5004/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D5004/metatiles.bin b/data/tilesets/secondary/82D5004/metatiles.bin deleted file mode 100644 index fb47747c4..000000000 Binary files a/data/tilesets/secondary/82D5004/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D5004/palettes/0.pal b/data/tilesets/secondary/82D5004/palettes/0.pal deleted file mode 100644 index 7af5bb7d2..000000000 --- a/data/tilesets/secondary/82D5004/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 82 0 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D5004/palettes/1.pal b/data/tilesets/secondary/82D5004/palettes/1.pal deleted file mode 100644 index 391d1e3d1..000000000 --- a/data/tilesets/secondary/82D5004/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 189 164 -189 148 139 -156 115 115 -123 82 82 -90 57 74 -115 205 164 diff --git a/data/tilesets/secondary/82D5004/palettes/10.pal b/data/tilesets/secondary/82D5004/palettes/10.pal deleted file mode 100644 index 746437492..000000000 --- a/data/tilesets/secondary/82D5004/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -222 230 246 -189 197 222 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -49 139 49 -57 82 0 -49 180 98 -238 230 164 -222 205 131 -213 180 106 -205 156 82 -106 205 164 diff --git a/data/tilesets/secondary/82D5004/palettes/11.pal b/data/tilesets/secondary/82D5004/palettes/11.pal deleted file mode 100644 index 6fe747b2d..000000000 --- a/data/tilesets/secondary/82D5004/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 255 148 -222 213 98 -57 148 49 -57 82 0 -57 115 24 -98 65 74 -131 106 82 -65 57 49 -164 164 49 -115 106 49 -255 0 255 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D5004/palettes/12.pal b/data/tilesets/secondary/82D5004/palettes/12.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D5004/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D5004/palettes/13.pal b/data/tilesets/secondary/82D5004/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D5004/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D5004/palettes/14.pal b/data/tilesets/secondary/82D5004/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D5004/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D5004/palettes/15.pal b/data/tilesets/secondary/82D5004/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D5004/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D5004/palettes/2.pal b/data/tilesets/secondary/82D5004/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/82D5004/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/82D5004/palettes/3.pal b/data/tilesets/secondary/82D5004/palettes/3.pal deleted file mode 100644 index 9581f2cd8..000000000 --- a/data/tilesets/secondary/82D5004/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 131 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/82D5004/palettes/4.pal b/data/tilesets/secondary/82D5004/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/82D5004/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/82D5004/palettes/5.pal b/data/tilesets/secondary/82D5004/palettes/5.pal deleted file mode 100644 index 3a2db72a7..000000000 --- a/data/tilesets/secondary/82D5004/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -222 205 131 -205 180 106 -180 139 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/82D5004/palettes/6.pal b/data/tilesets/secondary/82D5004/palettes/6.pal deleted file mode 100644 index 93518605a..000000000 --- a/data/tilesets/secondary/82D5004/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/82D5004/palettes/7.pal b/data/tilesets/secondary/82D5004/palettes/7.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D5004/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D5004/palettes/8.pal b/data/tilesets/secondary/82D5004/palettes/8.pal deleted file mode 100644 index 650a35cc8..000000000 --- a/data/tilesets/secondary/82D5004/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 82 0 -57 115 24 -98 65 74 -131 106 82 -65 57 49 -255 0 255 -255 0 255 -255 0 255 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D5004/palettes/9.pal b/data/tilesets/secondary/82D5004/palettes/9.pal deleted file mode 100644 index df2d04037..000000000 --- a/data/tilesets/secondary/82D5004/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -213 230 189 -57 172 131 -222 230 246 -230 172 123 -106 205 164 diff --git a/data/tilesets/secondary/82D5004/tiles.png b/data/tilesets/secondary/82D5004/tiles.png deleted file mode 100644 index dacbc0120..000000000 Binary files a/data/tilesets/secondary/82D5004/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D501C/metatile_attributes.bin b/data/tilesets/secondary/82D501C/metatile_attributes.bin deleted file mode 100644 index 6e3d955e2..000000000 Binary files a/data/tilesets/secondary/82D501C/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D501C/metatiles.bin b/data/tilesets/secondary/82D501C/metatiles.bin deleted file mode 100644 index 7fdc5c55d..000000000 Binary files a/data/tilesets/secondary/82D501C/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D501C/palettes/0.pal b/data/tilesets/secondary/82D501C/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/82D501C/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D501C/palettes/1.pal b/data/tilesets/secondary/82D501C/palettes/1.pal deleted file mode 100644 index d8a4e7757..000000000 --- a/data/tilesets/secondary/82D501C/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/82D501C/palettes/10.pal b/data/tilesets/secondary/82D501C/palettes/10.pal deleted file mode 100644 index 334da8f23..000000000 --- a/data/tilesets/secondary/82D501C/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -238 238 230 -172 172 164 -74 74 74 -0 0 0 -255 246 180 -238 222 123 -197 205 123 -197 213 205 -255 255 255 -255 255 255 -246 246 238 -222 222 213 -189 189 180 -156 156 139 -98 98 90 diff --git a/data/tilesets/secondary/82D501C/palettes/11.pal b/data/tilesets/secondary/82D501C/palettes/11.pal deleted file mode 100644 index 0c3d2870e..000000000 --- a/data/tilesets/secondary/82D501C/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -230 197 65 -197 213 205 -180 197 189 -164 172 172 -205 205 197 -255 230 65 -123 123 131 -255 255 255 -74 65 74 -238 238 230 -189 189 180 -238 238 230 -222 222 213 -205 205 197 -156 156 164 diff --git a/data/tilesets/secondary/82D501C/palettes/12.pal b/data/tilesets/secondary/82D501C/palettes/12.pal deleted file mode 100644 index a68c94c2c..000000000 --- a/data/tilesets/secondary/82D501C/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -197 213 205 -180 197 189 -164 172 172 -131 148 139 -255 0 255 -255 0 255 -255 0 255 -139 156 180 -139 139 164 -131 139 148 -115 115 131 -90 90 106 -82 82 82 -57 65 65 diff --git a/data/tilesets/secondary/82D501C/palettes/13.pal b/data/tilesets/secondary/82D501C/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D501C/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D501C/palettes/14.pal b/data/tilesets/secondary/82D501C/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D501C/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D501C/palettes/15.pal b/data/tilesets/secondary/82D501C/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D501C/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D501C/palettes/2.pal b/data/tilesets/secondary/82D501C/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/82D501C/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/82D501C/palettes/3.pal b/data/tilesets/secondary/82D501C/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/secondary/82D501C/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/82D501C/palettes/4.pal b/data/tilesets/secondary/82D501C/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/82D501C/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/82D501C/palettes/5.pal b/data/tilesets/secondary/82D501C/palettes/5.pal deleted file mode 100644 index c5a653979..000000000 --- a/data/tilesets/secondary/82D501C/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/82D501C/palettes/6.pal b/data/tilesets/secondary/82D501C/palettes/6.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/82D501C/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D501C/palettes/7.pal b/data/tilesets/secondary/82D501C/palettes/7.pal deleted file mode 100644 index 364379ad9..000000000 --- a/data/tilesets/secondary/82D501C/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -255 0 255 -197 213 205 -180 197 189 -164 172 172 -131 148 139 -255 0 255 -246 205 74 -255 0 255 -180 189 197 -180 189 197 -189 197 197 -164 172 172 -131 139 139 -106 106 106 -90 90 82 diff --git a/data/tilesets/secondary/82D501C/palettes/8.pal b/data/tilesets/secondary/82D501C/palettes/8.pal deleted file mode 100644 index 102aaaf2c..000000000 --- a/data/tilesets/secondary/82D501C/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -255 0 255 -197 213 205 -180 197 189 -164 172 172 -131 148 139 -255 0 255 -255 0 255 -255 0 255 -255 255 255 -255 255 255 -246 246 238 -222 222 213 -189 189 180 -156 156 139 -98 98 90 diff --git a/data/tilesets/secondary/82D501C/palettes/9.pal b/data/tilesets/secondary/82D501C/palettes/9.pal deleted file mode 100644 index 91329f82e..000000000 --- a/data/tilesets/secondary/82D501C/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -238 238 164 -197 213 205 -180 197 189 -164 172 172 -205 205 106 -205 205 197 -172 172 90 -123 131 74 -82 90 32 -106 106 82 -74 74 74 -0 0 0 -98 139 197 -74 115 172 -57 98 156 diff --git a/data/tilesets/secondary/82D501C/tiles.png b/data/tilesets/secondary/82D501C/tiles.png deleted file mode 100644 index cbce25763..000000000 Binary files a/data/tilesets/secondary/82D501C/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D5034/metatile_attributes.bin b/data/tilesets/secondary/82D5034/metatile_attributes.bin deleted file mode 100644 index 5fe7d59fc..000000000 Binary files a/data/tilesets/secondary/82D5034/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D5034/metatiles.bin b/data/tilesets/secondary/82D5034/metatiles.bin deleted file mode 100644 index 2b3a9543e..000000000 Binary files a/data/tilesets/secondary/82D5034/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D5034/palettes/0.pal b/data/tilesets/secondary/82D5034/palettes/0.pal deleted file mode 100644 index 83b30fc17..000000000 --- a/data/tilesets/secondary/82D5034/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 172 82 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D5034/palettes/1.pal b/data/tilesets/secondary/82D5034/palettes/1.pal deleted file mode 100644 index 66561f6d3..000000000 --- a/data/tilesets/secondary/82D5034/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -139 180 222 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/82D5034/palettes/10.pal b/data/tilesets/secondary/82D5034/palettes/10.pal deleted file mode 100644 index fb565545b..000000000 --- a/data/tilesets/secondary/82D5034/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 172 82 -82 82 106 -230 222 164 -156 148 90 -123 115 115 -205 197 106 -164 156 90 -189 172 90 -246 246 222 -238 238 164 -98 106 90 -205 213 156 -139 148 106 -98 98 106 -90 0 255 -222 222 230 diff --git a/data/tilesets/secondary/82D5034/palettes/11.pal b/data/tilesets/secondary/82D5034/palettes/11.pal deleted file mode 100644 index e637019c6..000000000 --- a/data/tilesets/secondary/82D5034/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 172 82 -82 82 106 -230 222 164 -156 148 90 -123 115 115 -205 197 106 -164 156 90 -189 172 90 -246 246 222 -238 238 164 -98 106 90 -205 213 156 -139 148 106 -98 98 106 -90 0 255 -139 148 139 diff --git a/data/tilesets/secondary/82D5034/palettes/12.pal b/data/tilesets/secondary/82D5034/palettes/12.pal deleted file mode 100644 index 775369fed..000000000 --- a/data/tilesets/secondary/82D5034/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 172 82 -82 82 106 -230 222 164 -156 148 90 -123 115 115 -205 197 106 -164 156 90 -189 172 90 -246 246 222 -238 238 164 -98 106 90 -205 213 156 -139 148 106 -98 98 106 -90 0 255 -156 197 213 diff --git a/data/tilesets/secondary/82D5034/palettes/13.pal b/data/tilesets/secondary/82D5034/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D5034/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D5034/palettes/14.pal b/data/tilesets/secondary/82D5034/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D5034/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D5034/palettes/15.pal b/data/tilesets/secondary/82D5034/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D5034/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D5034/palettes/2.pal b/data/tilesets/secondary/82D5034/palettes/2.pal deleted file mode 100644 index 87a022102..000000000 --- a/data/tilesets/secondary/82D5034/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -90 90 115 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/82D5034/palettes/3.pal b/data/tilesets/secondary/82D5034/palettes/3.pal deleted file mode 100644 index 783496dcd..000000000 --- a/data/tilesets/secondary/82D5034/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -65 98 156 -90 123 180 -115 156 197 -222 213 131 -164 164 172 -205 205 213 -238 238 246 -106 172 115 -156 205 139 diff --git a/data/tilesets/secondary/82D5034/palettes/4.pal b/data/tilesets/secondary/82D5034/palettes/4.pal deleted file mode 100644 index 89eace605..000000000 --- a/data/tilesets/secondary/82D5034/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 238 246 -172 197 180 -197 222 205 -90 189 172 -246 238 156 -205 189 131 -189 164 123 -148 131 106 -106 106 106 -213 222 230 -238 180 115 diff --git a/data/tilesets/secondary/82D5034/palettes/5.pal b/data/tilesets/secondary/82D5034/palettes/5.pal deleted file mode 100644 index c7780e5c7..000000000 --- a/data/tilesets/secondary/82D5034/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -213 222 222 -164 180 189 -255 0 255 -131 115 74 -213 213 148 -197 189 139 -172 156 115 -148 131 90 -197 197 205 -205 82 65 -0 0 0 diff --git a/data/tilesets/secondary/82D5034/palettes/6.pal b/data/tilesets/secondary/82D5034/palettes/6.pal deleted file mode 100644 index 1d08ce9a2..000000000 --- a/data/tilesets/secondary/82D5034/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D5034/palettes/7.pal b/data/tilesets/secondary/82D5034/palettes/7.pal deleted file mode 100644 index dfa779635..000000000 --- a/data/tilesets/secondary/82D5034/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 172 82 -82 82 106 -131 131 131 -98 131 131 -139 172 172 -164 205 189 -98 106 131 -90 98 106 -98 156 197 -164 172 139 -139 156 139 -115 123 123 -205 213 156 -180 197 156 -164 172 156 -90 0 255 diff --git a/data/tilesets/secondary/82D5034/palettes/8.pal b/data/tilesets/secondary/82D5034/palettes/8.pal deleted file mode 100644 index fd7d8a9d7..000000000 --- a/data/tilesets/secondary/82D5034/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 172 82 -82 82 106 -230 222 164 -156 148 90 -123 115 115 -205 197 106 -164 156 90 -189 172 90 -246 246 222 -238 238 164 -98 106 90 -205 213 156 -139 148 106 -98 98 106 -205 139 189 -213 148 74 diff --git a/data/tilesets/secondary/82D5034/palettes/9.pal b/data/tilesets/secondary/82D5034/palettes/9.pal deleted file mode 100644 index 0d43d6ef9..000000000 --- a/data/tilesets/secondary/82D5034/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 172 82 -82 82 106 -230 222 164 -156 148 90 -123 115 115 -205 197 106 -164 156 90 -189 172 90 -246 246 222 -238 238 164 -98 106 90 -205 213 156 -139 148 106 -98 98 106 -131 205 82 -230 213 82 diff --git a/data/tilesets/secondary/82D5034/tiles.png b/data/tilesets/secondary/82D5034/tiles.png deleted file mode 100644 index c61f91c47..000000000 Binary files a/data/tilesets/secondary/82D5034/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D504C/metatile_attributes.bin b/data/tilesets/secondary/82D504C/metatile_attributes.bin deleted file mode 100644 index 62eb1b917..000000000 Binary files a/data/tilesets/secondary/82D504C/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D504C/metatiles.bin b/data/tilesets/secondary/82D504C/metatiles.bin deleted file mode 100644 index 52d2f020d..000000000 Binary files a/data/tilesets/secondary/82D504C/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D504C/palettes/0.pal b/data/tilesets/secondary/82D504C/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/82D504C/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D504C/palettes/1.pal b/data/tilesets/secondary/82D504C/palettes/1.pal deleted file mode 100644 index e15d979f1..000000000 --- a/data/tilesets/secondary/82D504C/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -222 230 230 -197 205 213 -172 189 205 -123 123 131 -65 49 65 -230 238 238 -90 189 139 -90 90 115 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/82D504C/palettes/10.pal b/data/tilesets/secondary/82D504C/palettes/10.pal deleted file mode 100644 index 265fb0625..000000000 --- a/data/tilesets/secondary/82D504C/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -205 222 238 -156 172 189 -123 123 131 -90 90 115 -65 74 106 -255 255 180 -255 238 123 -156 115 65 -238 197 246 -213 156 213 -189 106 172 -238 230 74 -238 189 0 -222 156 0 -255 255 255 diff --git a/data/tilesets/secondary/82D504C/palettes/11.pal b/data/tilesets/secondary/82D504C/palettes/11.pal deleted file mode 100644 index 9e1e423c6..000000000 --- a/data/tilesets/secondary/82D504C/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -238 238 246 -197 205 222 -172 172 197 -139 156 172 -123 123 131 -90 90 115 -65 74 106 -123 139 222 -115 189 246 -255 230 156 -255 189 65 -238 164 41 -213 131 16 -180 82 0 -255 205 106 diff --git a/data/tilesets/secondary/82D504C/palettes/12.pal b/data/tilesets/secondary/82D504C/palettes/12.pal deleted file mode 100644 index 375e3914b..000000000 --- a/data/tilesets/secondary/82D504C/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -222 230 230 -197 205 213 -172 189 205 -123 123 131 -65 49 65 -230 238 238 -90 189 139 -90 90 115 -230 230 222 -213 213 197 -180 180 164 -148 148 131 -123 123 90 -98 98 74 -115 205 164 diff --git a/data/tilesets/secondary/82D504C/palettes/13.pal b/data/tilesets/secondary/82D504C/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D504C/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D504C/palettes/14.pal b/data/tilesets/secondary/82D504C/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D504C/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D504C/palettes/15.pal b/data/tilesets/secondary/82D504C/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D504C/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D504C/palettes/2.pal b/data/tilesets/secondary/82D504C/palettes/2.pal deleted file mode 100644 index 372fb5d7c..000000000 --- a/data/tilesets/secondary/82D504C/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/82D504C/palettes/3.pal b/data/tilesets/secondary/82D504C/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/secondary/82D504C/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/82D504C/palettes/4.pal b/data/tilesets/secondary/82D504C/palettes/4.pal deleted file mode 100644 index fca4a2623..000000000 --- a/data/tilesets/secondary/82D504C/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -213 238 255 -172 205 255 -139 180 238 -106 156 230 -74 139 189 -65 123 189 -82 139 205 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -49 115 172 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/82D504C/palettes/5.pal b/data/tilesets/secondary/82D504C/palettes/5.pal deleted file mode 100644 index 09555ded5..000000000 --- a/data/tilesets/secondary/82D504C/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/82D504C/palettes/6.pal b/data/tilesets/secondary/82D504C/palettes/6.pal deleted file mode 100644 index f8ebbc6dc..000000000 --- a/data/tilesets/secondary/82D504C/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -213 238 255 -172 205 255 -139 180 238 -106 156 230 -65 123 172 -41 98 156 -74 115 197 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -49 115 172 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/82D504C/palettes/7.pal b/data/tilesets/secondary/82D504C/palettes/7.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D504C/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D504C/palettes/8.pal b/data/tilesets/secondary/82D504C/palettes/8.pal deleted file mode 100644 index 4d9ab6348..000000000 --- a/data/tilesets/secondary/82D504C/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -131 197 164 -98 164 131 -123 123 131 -90 90 115 -65 74 106 -222 230 238 -197 213 230 -164 180 197 -255 222 255 -222 172 230 -172 123 189 -148 98 164 -115 65 131 -238 213 156 -205 189 123 diff --git a/data/tilesets/secondary/82D504C/palettes/9.pal b/data/tilesets/secondary/82D504C/palettes/9.pal deleted file mode 100644 index b66fdcdbf..000000000 --- a/data/tilesets/secondary/82D504C/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -115 189 246 -98 164 222 -123 123 131 -90 90 115 -65 74 106 -246 246 213 -230 230 189 -189 189 148 -172 172 131 -156 156 115 -230 222 115 -246 156 115 -222 115 98 -131 230 180 -49 164 123 diff --git a/data/tilesets/secondary/82D504C/tiles.png b/data/tilesets/secondary/82D504C/tiles.png deleted file mode 100644 index ad8f73a2c..000000000 Binary files a/data/tilesets/secondary/82D504C/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D5064/metatile_attributes.bin b/data/tilesets/secondary/82D5064/metatile_attributes.bin deleted file mode 100644 index d67c4690c..000000000 Binary files a/data/tilesets/secondary/82D5064/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D5064/metatiles.bin b/data/tilesets/secondary/82D5064/metatiles.bin deleted file mode 100644 index 7613f3702..000000000 Binary files a/data/tilesets/secondary/82D5064/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D5064/palettes/0.pal b/data/tilesets/secondary/82D5064/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/82D5064/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D5064/palettes/1.pal b/data/tilesets/secondary/82D5064/palettes/1.pal deleted file mode 100644 index d8a4e7757..000000000 --- a/data/tilesets/secondary/82D5064/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/82D5064/palettes/10.pal b/data/tilesets/secondary/82D5064/palettes/10.pal deleted file mode 100644 index 86502dd48..000000000 --- a/data/tilesets/secondary/82D5064/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -205 222 230 -164 180 197 -123 123 131 -90 90 115 -65 74 106 -205 197 148 -180 172 123 -156 148 106 -230 156 106 -197 115 74 -172 98 49 -148 82 32 -205 222 230 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D5064/palettes/11.pal b/data/tilesets/secondary/82D5064/palettes/11.pal deleted file mode 100644 index b05410cba..000000000 --- a/data/tilesets/secondary/82D5064/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -0 0 0 -0 0 0 -0 0 0 -131 131 139 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -0 0 0 diff --git a/data/tilesets/secondary/82D5064/palettes/12.pal b/data/tilesets/secondary/82D5064/palettes/12.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/82D5064/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D5064/palettes/13.pal b/data/tilesets/secondary/82D5064/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D5064/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D5064/palettes/14.pal b/data/tilesets/secondary/82D5064/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D5064/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D5064/palettes/15.pal b/data/tilesets/secondary/82D5064/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D5064/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D5064/palettes/2.pal b/data/tilesets/secondary/82D5064/palettes/2.pal deleted file mode 100644 index 372fb5d7c..000000000 --- a/data/tilesets/secondary/82D5064/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/82D5064/palettes/3.pal b/data/tilesets/secondary/82D5064/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/secondary/82D5064/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/82D5064/palettes/4.pal b/data/tilesets/secondary/82D5064/palettes/4.pal deleted file mode 100644 index fca4a2623..000000000 --- a/data/tilesets/secondary/82D5064/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -213 238 255 -172 205 255 -139 180 238 -106 156 230 -74 139 189 -65 123 189 -82 139 205 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -49 115 172 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/82D5064/palettes/5.pal b/data/tilesets/secondary/82D5064/palettes/5.pal deleted file mode 100644 index 09555ded5..000000000 --- a/data/tilesets/secondary/82D5064/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/82D5064/palettes/6.pal b/data/tilesets/secondary/82D5064/palettes/6.pal deleted file mode 100644 index f8ebbc6dc..000000000 --- a/data/tilesets/secondary/82D5064/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -213 238 255 -172 205 255 -139 180 238 -106 156 230 -65 123 172 -41 98 156 -74 115 197 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -49 115 172 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/82D5064/palettes/7.pal b/data/tilesets/secondary/82D5064/palettes/7.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D5064/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D5064/palettes/8.pal b/data/tilesets/secondary/82D5064/palettes/8.pal deleted file mode 100644 index 4d9ab6348..000000000 --- a/data/tilesets/secondary/82D5064/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -131 197 164 -98 164 131 -123 123 131 -90 90 115 -65 74 106 -222 230 238 -197 213 230 -164 180 197 -255 222 255 -222 172 230 -172 123 189 -148 98 164 -115 65 131 -238 213 156 -205 189 123 diff --git a/data/tilesets/secondary/82D5064/palettes/9.pal b/data/tilesets/secondary/82D5064/palettes/9.pal deleted file mode 100644 index 5ac617b25..000000000 --- a/data/tilesets/secondary/82D5064/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -156 156 222 -255 238 189 -123 123 131 -90 90 115 -65 74 106 -222 230 238 -197 213 230 -164 180 197 -255 222 139 -230 172 98 -213 139 74 -197 115 49 -156 90 16 -115 189 246 -74 131 197 diff --git a/data/tilesets/secondary/82D5064/tiles.png b/data/tilesets/secondary/82D5064/tiles.png deleted file mode 100644 index 744b38638..000000000 Binary files a/data/tilesets/secondary/82D5064/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D507C/metatile_attributes.bin b/data/tilesets/secondary/82D507C/metatile_attributes.bin deleted file mode 100644 index edf192276..000000000 Binary files a/data/tilesets/secondary/82D507C/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D507C/metatiles.bin b/data/tilesets/secondary/82D507C/metatiles.bin deleted file mode 100644 index 13f97073b..000000000 Binary files a/data/tilesets/secondary/82D507C/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D507C/palettes/0.pal b/data/tilesets/secondary/82D507C/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/82D507C/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D507C/palettes/1.pal b/data/tilesets/secondary/82D507C/palettes/1.pal deleted file mode 100644 index 09828f4f1..000000000 --- a/data/tilesets/secondary/82D507C/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -123 123 131 -32 49 57 -230 238 238 -90 189 139 -90 90 115 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -123 74 74 -90 57 65 -115 205 164 diff --git a/data/tilesets/secondary/82D507C/palettes/10.pal b/data/tilesets/secondary/82D507C/palettes/10.pal deleted file mode 100644 index d26d003af..000000000 --- a/data/tilesets/secondary/82D507C/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -238 246 255 -197 213 222 -172 189 197 -139 156 172 -123 123 131 -90 90 115 -65 74 106 -255 0 255 -131 172 148 -189 180 164 -172 164 156 -148 139 139 -123 115 115 -106 98 106 -115 205 164 diff --git a/data/tilesets/secondary/82D507C/palettes/11.pal b/data/tilesets/secondary/82D507C/palettes/11.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/82D507C/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D507C/palettes/12.pal b/data/tilesets/secondary/82D507C/palettes/12.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/82D507C/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D507C/palettes/13.pal b/data/tilesets/secondary/82D507C/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D507C/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D507C/palettes/14.pal b/data/tilesets/secondary/82D507C/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D507C/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D507C/palettes/15.pal b/data/tilesets/secondary/82D507C/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D507C/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D507C/palettes/2.pal b/data/tilesets/secondary/82D507C/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/82D507C/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/82D507C/palettes/3.pal b/data/tilesets/secondary/82D507C/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/secondary/82D507C/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/82D507C/palettes/4.pal b/data/tilesets/secondary/82D507C/palettes/4.pal deleted file mode 100644 index 5871a448c..000000000 --- a/data/tilesets/secondary/82D507C/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -230 246 255 -189 222 255 -139 189 255 -115 164 255 -65 139 222 -57 115 222 -82 148 230 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -49 115 197 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/82D507C/palettes/5.pal b/data/tilesets/secondary/82D507C/palettes/5.pal deleted file mode 100644 index c5a653979..000000000 --- a/data/tilesets/secondary/82D507C/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/82D507C/palettes/6.pal b/data/tilesets/secondary/82D507C/palettes/6.pal deleted file mode 100644 index 9bad44649..000000000 --- a/data/tilesets/secondary/82D507C/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -205 230 246 -180 213 255 -123 180 246 -98 148 230 -65 123 189 -49 98 180 -82 131 222 -213 230 238 -172 189 205 -123 123 131 -90 90 115 -238 246 246 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/82D507C/palettes/7.pal b/data/tilesets/secondary/82D507C/palettes/7.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D507C/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D507C/palettes/8.pal b/data/tilesets/secondary/82D507C/palettes/8.pal deleted file mode 100644 index 4d9ab6348..000000000 --- a/data/tilesets/secondary/82D507C/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -131 197 164 -98 164 131 -123 123 131 -90 90 115 -65 74 106 -222 230 238 -197 213 230 -164 180 197 -255 222 255 -222 172 230 -172 123 189 -148 98 164 -115 65 131 -238 213 156 -205 189 123 diff --git a/data/tilesets/secondary/82D507C/palettes/9.pal b/data/tilesets/secondary/82D507C/palettes/9.pal deleted file mode 100644 index edc5961bb..000000000 --- a/data/tilesets/secondary/82D507C/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -238 246 255 -197 213 222 -139 156 172 -123 123 131 -90 90 115 -65 74 106 -115 172 246 -65 123 172 -49 90 139 -32 74 123 -189 230 164 -115 156 90 -148 131 74 -156 213 255 -98 164 230 diff --git a/data/tilesets/secondary/82D507C/tiles.png b/data/tilesets/secondary/82D507C/tiles.png deleted file mode 100644 index d40c92649..000000000 Binary files a/data/tilesets/secondary/82D507C/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D5094/metatile_attributes.bin b/data/tilesets/secondary/82D5094/metatile_attributes.bin deleted file mode 100644 index 96b25bb0f..000000000 Binary files a/data/tilesets/secondary/82D5094/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D5094/metatiles.bin b/data/tilesets/secondary/82D5094/metatiles.bin deleted file mode 100644 index f045f57e8..000000000 Binary files a/data/tilesets/secondary/82D5094/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D5094/palettes/0.pal b/data/tilesets/secondary/82D5094/palettes/0.pal deleted file mode 100644 index 8db07d418..000000000 --- a/data/tilesets/secondary/82D5094/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D5094/palettes/1.pal b/data/tilesets/secondary/82D5094/palettes/1.pal deleted file mode 100644 index 66561f6d3..000000000 --- a/data/tilesets/secondary/82D5094/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -139 180 222 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/82D5094/palettes/10.pal b/data/tilesets/secondary/82D5094/palettes/10.pal deleted file mode 100644 index ab3a7d14f..000000000 --- a/data/tilesets/secondary/82D5094/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -172 213 255 -139 189 246 -123 172 222 -98 180 230 -106 148 213 -255 0 255 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -189 230 255 -189 230 255 -156 189 213 -90 131 180 diff --git a/data/tilesets/secondary/82D5094/palettes/11.pal b/data/tilesets/secondary/82D5094/palettes/11.pal deleted file mode 100644 index bb88b4d57..000000000 --- a/data/tilesets/secondary/82D5094/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -148 148 148 -123 123 123 -98 98 98 -82 82 106 -255 213 90 -230 164 74 -255 0 255 -222 230 238 -197 205 156 -205 139 115 -172 172 172 -222 230 189 -230 172 139 -0 0 0 -255 255 255 diff --git a/data/tilesets/secondary/82D5094/palettes/12.pal b/data/tilesets/secondary/82D5094/palettes/12.pal deleted file mode 100644 index b0d005f21..000000000 --- a/data/tilesets/secondary/82D5094/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -205 205 205 -255 131 65 -222 98 32 -255 0 255 -222 213 90 -197 189 65 -189 180 49 -172 164 32 -213 205 90 -148 148 148 -230 230 230 diff --git a/data/tilesets/secondary/82D5094/palettes/13.pal b/data/tilesets/secondary/82D5094/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D5094/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D5094/palettes/14.pal b/data/tilesets/secondary/82D5094/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D5094/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D5094/palettes/15.pal b/data/tilesets/secondary/82D5094/palettes/15.pal deleted file mode 100644 index 6a17f18dc..000000000 --- a/data/tilesets/secondary/82D5094/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -172 222 172 -189 238 197 -139 189 139 -205 246 213 -172 222 172 -74 106 156 -90 131 180 -213 222 222 -156 189 213 -238 139 98 -189 98 74 -156 65 49 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D5094/palettes/2.pal b/data/tilesets/secondary/82D5094/palettes/2.pal deleted file mode 100644 index 87a022102..000000000 --- a/data/tilesets/secondary/82D5094/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -90 90 115 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/82D5094/palettes/3.pal b/data/tilesets/secondary/82D5094/palettes/3.pal deleted file mode 100644 index 783496dcd..000000000 --- a/data/tilesets/secondary/82D5094/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -65 98 156 -90 123 180 -115 156 197 -222 213 131 -164 164 172 -205 205 213 -238 238 246 -106 172 115 -156 205 139 diff --git a/data/tilesets/secondary/82D5094/palettes/4.pal b/data/tilesets/secondary/82D5094/palettes/4.pal deleted file mode 100644 index 89eace605..000000000 --- a/data/tilesets/secondary/82D5094/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 238 246 -172 197 180 -197 222 205 -90 189 172 -246 238 156 -205 189 131 -189 164 123 -148 131 106 -106 106 106 -213 222 230 -238 180 115 diff --git a/data/tilesets/secondary/82D5094/palettes/5.pal b/data/tilesets/secondary/82D5094/palettes/5.pal deleted file mode 100644 index c7780e5c7..000000000 --- a/data/tilesets/secondary/82D5094/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -213 222 222 -164 180 189 -255 0 255 -131 115 74 -213 213 148 -197 189 139 -172 156 115 -148 131 90 -197 197 205 -205 82 65 -0 0 0 diff --git a/data/tilesets/secondary/82D5094/palettes/6.pal b/data/tilesets/secondary/82D5094/palettes/6.pal deleted file mode 100644 index 1d08ce9a2..000000000 --- a/data/tilesets/secondary/82D5094/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D5094/palettes/7.pal b/data/tilesets/secondary/82D5094/palettes/7.pal deleted file mode 100644 index edc5961bb..000000000 --- a/data/tilesets/secondary/82D5094/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -238 246 255 -197 213 222 -139 156 172 -123 123 131 -90 90 115 -65 74 106 -115 172 246 -65 123 172 -49 90 139 -32 74 123 -189 230 164 -115 156 90 -148 131 74 -156 213 255 -98 164 230 diff --git a/data/tilesets/secondary/82D5094/palettes/8.pal b/data/tilesets/secondary/82D5094/palettes/8.pal deleted file mode 100644 index 317213c42..000000000 --- a/data/tilesets/secondary/82D5094/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -123 74 148 -148 106 180 -230 213 246 -205 172 213 -222 213 90 -197 189 65 -189 180 49 -172 164 32 -213 205 90 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/82D5094/palettes/9.pal b/data/tilesets/secondary/82D5094/palettes/9.pal deleted file mode 100644 index 19dc9a47e..000000000 --- a/data/tilesets/secondary/82D5094/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -255 0 255 -255 131 115 -106 197 106 -164 255 180 -238 197 115 -213 131 74 -189 213 230 -123 156 180 -90 123 156 -156 180 205 -222 230 238 diff --git a/data/tilesets/secondary/82D5094/tiles.png b/data/tilesets/secondary/82D5094/tiles.png deleted file mode 100644 index f74f7c9f7..000000000 Binary files a/data/tilesets/secondary/82D5094/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D50AC/metatile_attributes.bin b/data/tilesets/secondary/82D50AC/metatile_attributes.bin deleted file mode 100644 index 9dd5f613d..000000000 Binary files a/data/tilesets/secondary/82D50AC/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D50AC/metatiles.bin b/data/tilesets/secondary/82D50AC/metatiles.bin deleted file mode 100644 index d5916a2cf..000000000 Binary files a/data/tilesets/secondary/82D50AC/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D50AC/palettes/0.pal b/data/tilesets/secondary/82D50AC/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/82D50AC/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/82D50AC/palettes/1.pal b/data/tilesets/secondary/82D50AC/palettes/1.pal deleted file mode 100644 index 22eb1667c..000000000 --- a/data/tilesets/secondary/82D50AC/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -123 123 131 -65 49 65 -230 238 238 -90 189 139 -90 90 115 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/82D50AC/palettes/10.pal b/data/tilesets/secondary/82D50AC/palettes/10.pal deleted file mode 100644 index 3c091df8b..000000000 --- a/data/tilesets/secondary/82D50AC/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -148 148 164 -205 189 197 -255 255 255 -255 213 115 -189 148 49 -139 98 74 -90 106 180 -255 205 139 -230 172 90 -230 148 65 -180 98 24 -238 213 172 -222 156 139 -123 123 123 diff --git a/data/tilesets/secondary/82D50AC/palettes/11.pal b/data/tilesets/secondary/82D50AC/palettes/11.pal deleted file mode 100644 index c42eeb7e1..000000000 --- a/data/tilesets/secondary/82D50AC/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -148 148 164 -172 172 164 -164 222 255 -115 180 205 -65 139 164 -41 106 148 -205 213 213 -238 230 139 -189 180 98 -139 131 65 -0 0 0 -255 255 255 -230 172 90 -189 246 255 diff --git a/data/tilesets/secondary/82D50AC/palettes/12.pal b/data/tilesets/secondary/82D50AC/palettes/12.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D50AC/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D50AC/palettes/13.pal b/data/tilesets/secondary/82D50AC/palettes/13.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D50AC/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D50AC/palettes/14.pal b/data/tilesets/secondary/82D50AC/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D50AC/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D50AC/palettes/15.pal b/data/tilesets/secondary/82D50AC/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D50AC/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D50AC/palettes/2.pal b/data/tilesets/secondary/82D50AC/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/82D50AC/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/82D50AC/palettes/3.pal b/data/tilesets/secondary/82D50AC/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/secondary/82D50AC/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/82D50AC/palettes/4.pal b/data/tilesets/secondary/82D50AC/palettes/4.pal deleted file mode 100644 index 5871a448c..000000000 --- a/data/tilesets/secondary/82D50AC/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -230 246 255 -189 222 255 -139 189 255 -115 164 255 -65 139 222 -57 115 222 -82 148 230 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -49 115 197 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/82D50AC/palettes/5.pal b/data/tilesets/secondary/82D50AC/palettes/5.pal deleted file mode 100644 index c5a653979..000000000 --- a/data/tilesets/secondary/82D50AC/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/82D50AC/palettes/6.pal b/data/tilesets/secondary/82D50AC/palettes/6.pal deleted file mode 100644 index 9bad44649..000000000 --- a/data/tilesets/secondary/82D50AC/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -205 230 246 -180 213 255 -123 180 246 -98 148 230 -65 123 189 -49 98 180 -82 131 222 -213 230 238 -172 189 205 -123 123 131 -90 90 115 -238 246 246 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/82D50AC/palettes/7.pal b/data/tilesets/secondary/82D50AC/palettes/7.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/82D50AC/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D50AC/palettes/8.pal b/data/tilesets/secondary/82D50AC/palettes/8.pal deleted file mode 100644 index 5c1251024..000000000 --- a/data/tilesets/secondary/82D50AC/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -172 172 164 -205 213 213 -180 189 189 -148 156 156 -106 115 115 -197 246 230 -106 205 164 -57 156 115 -222 106 98 -222 213 123 -255 180 148 -197 189 98 -238 246 255 diff --git a/data/tilesets/secondary/82D50AC/palettes/9.pal b/data/tilesets/secondary/82D50AC/palettes/9.pal deleted file mode 100644 index c25501332..000000000 --- a/data/tilesets/secondary/82D50AC/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -65 123 180 -238 246 255 -222 230 238 -189 205 230 -156 164 189 -139 139 156 -98 98 123 -57 57 106 -197 98 98 -172 65 106 -32 74 156 -197 148 0 -246 213 24 -222 238 255 -255 255 255 -74 106 139 diff --git a/data/tilesets/secondary/82D50AC/tiles.png b/data/tilesets/secondary/82D50AC/tiles.png deleted file mode 100644 index 166ae2e18..000000000 Binary files a/data/tilesets/secondary/82D50AC/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D50C4/metatile_attributes.bin b/data/tilesets/secondary/82D50C4/metatile_attributes.bin deleted file mode 100644 index bcc2fedb4..000000000 Binary files a/data/tilesets/secondary/82D50C4/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D50C4/metatiles.bin b/data/tilesets/secondary/82D50C4/metatiles.bin deleted file mode 100644 index 7cdfa846a..000000000 Binary files a/data/tilesets/secondary/82D50C4/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D50C4/palettes/0.pal b/data/tilesets/secondary/82D50C4/palettes/0.pal deleted file mode 100644 index 8db07d418..000000000 --- a/data/tilesets/secondary/82D50C4/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D50C4/palettes/1.pal b/data/tilesets/secondary/82D50C4/palettes/1.pal deleted file mode 100644 index fc945ef6c..000000000 --- a/data/tilesets/secondary/82D50C4/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -139 180 222 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/82D50C4/palettes/10.pal b/data/tilesets/secondary/82D50C4/palettes/10.pal deleted file mode 100644 index 18908d2ef..000000000 --- a/data/tilesets/secondary/82D50C4/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -255 255 255 -222 222 222 -106 115 115 -230 197 246 -180 82 205 -148 57 180 -230 222 123 -189 180 82 -230 230 172 -222 213 139 -222 164 164 -205 139 139 -205 180 238 -189 148 230 -164 131 205 diff --git a/data/tilesets/secondary/82D50C4/palettes/11.pal b/data/tilesets/secondary/82D50C4/palettes/11.pal deleted file mode 100644 index edc05893b..000000000 --- a/data/tilesets/secondary/82D50C4/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -82 164 164 -255 255 255 -230 230 230 -123 123 123 -189 189 197 -148 148 156 -213 213 222 -98 98 106 -180 180 164 -230 172 164 -197 131 131 -180 82 205 -148 57 180 -106 189 189 -82 164 164 -57 139 139 diff --git a/data/tilesets/secondary/82D50C4/palettes/12.pal b/data/tilesets/secondary/82D50C4/palettes/12.pal deleted file mode 100644 index 36807053a..000000000 --- a/data/tilesets/secondary/82D50C4/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -74 90 98 -98 123 139 -164 197 197 -222 238 238 -255 255 255 -123 123 123 -180 82 205 -131 49 164 -131 164 164 -230 213 156 -255 0 255 -213 131 222 -255 246 156 -90 16 131 -41 49 57 diff --git a/data/tilesets/secondary/82D50C4/palettes/13.pal b/data/tilesets/secondary/82D50C4/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D50C4/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D50C4/palettes/14.pal b/data/tilesets/secondary/82D50C4/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D50C4/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D50C4/palettes/15.pal b/data/tilesets/secondary/82D50C4/palettes/15.pal deleted file mode 100644 index 0b5e86def..000000000 --- a/data/tilesets/secondary/82D50C4/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -131 230 255 diff --git a/data/tilesets/secondary/82D50C4/palettes/2.pal b/data/tilesets/secondary/82D50C4/palettes/2.pal deleted file mode 100644 index 87a022102..000000000 --- a/data/tilesets/secondary/82D50C4/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -90 90 115 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/82D50C4/palettes/3.pal b/data/tilesets/secondary/82D50C4/palettes/3.pal deleted file mode 100644 index 783496dcd..000000000 --- a/data/tilesets/secondary/82D50C4/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -65 98 156 -90 123 180 -115 156 197 -222 213 131 -164 164 172 -205 205 213 -238 238 246 -106 172 115 -156 205 139 diff --git a/data/tilesets/secondary/82D50C4/palettes/4.pal b/data/tilesets/secondary/82D50C4/palettes/4.pal deleted file mode 100644 index 89eace605..000000000 --- a/data/tilesets/secondary/82D50C4/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 238 246 -172 197 180 -197 222 205 -90 189 172 -246 238 156 -205 189 131 -189 164 123 -148 131 106 -106 106 106 -213 222 230 -238 180 115 diff --git a/data/tilesets/secondary/82D50C4/palettes/5.pal b/data/tilesets/secondary/82D50C4/palettes/5.pal deleted file mode 100644 index 34ef2f2d2..000000000 --- a/data/tilesets/secondary/82D50C4/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -213 222 222 -164 180 189 -222 164 115 -131 115 74 -213 213 148 -197 189 139 -172 156 115 -148 131 90 -197 197 205 -205 82 65 -0 0 0 diff --git a/data/tilesets/secondary/82D50C4/palettes/6.pal b/data/tilesets/secondary/82D50C4/palettes/6.pal deleted file mode 100644 index 1d08ce9a2..000000000 --- a/data/tilesets/secondary/82D50C4/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D50C4/palettes/7.pal b/data/tilesets/secondary/82D50C4/palettes/7.pal deleted file mode 100644 index 6528f9f75..000000000 --- a/data/tilesets/secondary/82D50C4/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -255 74 0 -255 213 131 -230 164 98 -197 115 74 -164 82 65 -255 255 180 -189 189 115 -82 82 106 -82 82 106 -82 82 106 -82 82 106 -82 82 106 -82 82 106 diff --git a/data/tilesets/secondary/82D50C4/palettes/8.pal b/data/tilesets/secondary/82D50C4/palettes/8.pal deleted file mode 100644 index 6b56cd49e..000000000 --- a/data/tilesets/secondary/82D50C4/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -255 255 255 -222 222 222 -106 115 115 -189 230 255 -123 205 255 -98 180 246 -49 139 213 -180 180 164 -172 213 222 -156 197 205 -180 156 222 -156 131 205 -139 197 230 -131 172 222 -98 148 197 diff --git a/data/tilesets/secondary/82D50C4/palettes/9.pal b/data/tilesets/secondary/82D50C4/palettes/9.pal deleted file mode 100644 index 5c2ed43a0..000000000 --- a/data/tilesets/secondary/82D50C4/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -255 255 255 -222 222 222 -106 115 115 -222 230 238 -180 197 205 -148 164 180 -131 139 139 -238 238 238 -230 230 230 -213 213 213 -139 213 156 -123 189 139 -230 222 123 -213 205 106 -189 180 90 diff --git a/data/tilesets/secondary/82D50C4/tiles.png b/data/tilesets/secondary/82D50C4/tiles.png deleted file mode 100644 index 0f65e1ff3..000000000 Binary files a/data/tilesets/secondary/82D50C4/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/82D50DC/metatile_attributes.bin b/data/tilesets/secondary/82D50DC/metatile_attributes.bin deleted file mode 100644 index 2fa59412a..000000000 Binary files a/data/tilesets/secondary/82D50DC/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D50DC/metatiles.bin b/data/tilesets/secondary/82D50DC/metatiles.bin deleted file mode 100644 index 6f4e8a22e..000000000 Binary files a/data/tilesets/secondary/82D50DC/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/82D50DC/palettes/0.pal b/data/tilesets/secondary/82D50DC/palettes/0.pal deleted file mode 100644 index 8db07d418..000000000 --- a/data/tilesets/secondary/82D50DC/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/82D50DC/palettes/1.pal b/data/tilesets/secondary/82D50DC/palettes/1.pal deleted file mode 100644 index 66561f6d3..000000000 --- a/data/tilesets/secondary/82D50DC/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -139 180 222 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/82D50DC/palettes/10.pal b/data/tilesets/secondary/82D50DC/palettes/10.pal deleted file mode 100644 index 6ea570459..000000000 --- a/data/tilesets/secondary/82D50DC/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -238 230 156 -230 189 131 -131 189 172 -205 82 65 -255 148 0 -106 164 148 -82 139 123 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -156 213 197 -164 172 139 -90 0 255 -90 0 255 diff --git a/data/tilesets/secondary/82D50DC/palettes/11.pal b/data/tilesets/secondary/82D50DC/palettes/11.pal deleted file mode 100644 index 008f150c7..000000000 --- a/data/tilesets/secondary/82D50DC/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -148 148 164 -205 189 197 -255 255 255 -115 115 131 -255 0 255 -0 255 156 -106 164 148 -82 139 123 -255 0 255 -255 255 172 -255 213 115 -213 180 106 -164 131 74 -222 213 230 diff --git a/data/tilesets/secondary/82D50DC/palettes/12.pal b/data/tilesets/secondary/82D50DC/palettes/12.pal deleted file mode 100644 index c1e7c3d5c..000000000 --- a/data/tilesets/secondary/82D50DC/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 diff --git a/data/tilesets/secondary/82D50DC/palettes/13.pal b/data/tilesets/secondary/82D50DC/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D50DC/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D50DC/palettes/14.pal b/data/tilesets/secondary/82D50DC/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D50DC/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D50DC/palettes/15.pal b/data/tilesets/secondary/82D50DC/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/82D50DC/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D50DC/palettes/2.pal b/data/tilesets/secondary/82D50DC/palettes/2.pal deleted file mode 100644 index 87a022102..000000000 --- a/data/tilesets/secondary/82D50DC/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -90 90 115 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/82D50DC/palettes/3.pal b/data/tilesets/secondary/82D50DC/palettes/3.pal deleted file mode 100644 index 783496dcd..000000000 --- a/data/tilesets/secondary/82D50DC/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -65 98 156 -90 123 180 -115 156 197 -222 213 131 -164 164 172 -205 205 213 -238 238 246 -106 172 115 -156 205 139 diff --git a/data/tilesets/secondary/82D50DC/palettes/4.pal b/data/tilesets/secondary/82D50DC/palettes/4.pal deleted file mode 100644 index 89eace605..000000000 --- a/data/tilesets/secondary/82D50DC/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 238 246 -172 197 180 -197 222 205 -90 189 172 -246 238 156 -205 189 131 -189 164 123 -148 131 106 -106 106 106 -213 222 230 -238 180 115 diff --git a/data/tilesets/secondary/82D50DC/palettes/5.pal b/data/tilesets/secondary/82D50DC/palettes/5.pal deleted file mode 100644 index c7780e5c7..000000000 --- a/data/tilesets/secondary/82D50DC/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -213 222 222 -164 180 189 -255 0 255 -131 115 74 -213 213 148 -197 189 139 -172 156 115 -148 131 90 -197 197 205 -205 82 65 -0 0 0 diff --git a/data/tilesets/secondary/82D50DC/palettes/6.pal b/data/tilesets/secondary/82D50DC/palettes/6.pal deleted file mode 100644 index 1d08ce9a2..000000000 --- a/data/tilesets/secondary/82D50DC/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/82D50DC/palettes/7.pal b/data/tilesets/secondary/82D50DC/palettes/7.pal deleted file mode 100644 index f0c97cf87..000000000 --- a/data/tilesets/secondary/82D50DC/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -156 189 255 -82 123 197 -49 90 156 -106 164 148 -82 139 123 -106 164 222 -222 230 148 -189 197 115 -90 148 197 -222 164 32 -189 230 255 diff --git a/data/tilesets/secondary/82D50DC/palettes/8.pal b/data/tilesets/secondary/82D50DC/palettes/8.pal deleted file mode 100644 index 33b52bbbd..000000000 --- a/data/tilesets/secondary/82D50DC/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -213 222 222 -180 197 213 -156 172 197 -230 106 90 -189 65 49 -255 131 115 -139 41 24 -197 255 205 -238 197 106 -255 255 213 -255 246 172 diff --git a/data/tilesets/secondary/82D50DC/palettes/9.pal b/data/tilesets/secondary/82D50DC/palettes/9.pal deleted file mode 100644 index 3a2cf3b7a..000000000 --- a/data/tilesets/secondary/82D50DC/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -139 222 148 -156 238 164 -197 255 205 -172 246 180 -238 238 197 -255 0 255 -255 0 255 -0 255 156 -189 65 49 -255 222 123 -246 197 0 diff --git a/data/tilesets/secondary/82D50DC/tiles.png b/data/tilesets/secondary/82D50DC/tiles.png deleted file mode 100644 index f5ab3a9cb..000000000 Binary files a/data/tilesets/secondary/82D50DC/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/berry_forest/metatile_attributes.bin b/data/tilesets/secondary/berry_forest/metatile_attributes.bin new file mode 100644 index 000000000..6d6c6d544 Binary files /dev/null and b/data/tilesets/secondary/berry_forest/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/berry_forest/metatiles.bin b/data/tilesets/secondary/berry_forest/metatiles.bin new file mode 100644 index 000000000..fb47747c4 Binary files /dev/null and b/data/tilesets/secondary/berry_forest/metatiles.bin differ diff --git a/data/tilesets/secondary/berry_forest/palettes/0.pal b/data/tilesets/secondary/berry_forest/palettes/0.pal new file mode 100644 index 000000000..7af5bb7d2 --- /dev/null +++ b/data/tilesets/secondary/berry_forest/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 82 0 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/berry_forest/palettes/1.pal b/data/tilesets/secondary/berry_forest/palettes/1.pal new file mode 100644 index 000000000..391d1e3d1 --- /dev/null +++ b/data/tilesets/secondary/berry_forest/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 189 164 +189 148 139 +156 115 115 +123 82 82 +90 57 74 +115 205 164 diff --git a/data/tilesets/secondary/berry_forest/palettes/10.pal b/data/tilesets/secondary/berry_forest/palettes/10.pal new file mode 100644 index 000000000..746437492 --- /dev/null +++ b/data/tilesets/secondary/berry_forest/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +222 230 246 +189 197 222 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +49 139 49 +57 82 0 +49 180 98 +238 230 164 +222 205 131 +213 180 106 +205 156 82 +106 205 164 diff --git a/data/tilesets/secondary/berry_forest/palettes/11.pal b/data/tilesets/secondary/berry_forest/palettes/11.pal new file mode 100644 index 000000000..6fe747b2d --- /dev/null +++ b/data/tilesets/secondary/berry_forest/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 148 +222 213 98 +57 148 49 +57 82 0 +57 115 24 +98 65 74 +131 106 82 +65 57 49 +164 164 49 +115 106 49 +255 0 255 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/berry_forest/palettes/12.pal b/data/tilesets/secondary/berry_forest/palettes/12.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/berry_forest/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/berry_forest/palettes/13.pal b/data/tilesets/secondary/berry_forest/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/berry_forest/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/berry_forest/palettes/14.pal b/data/tilesets/secondary/berry_forest/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/berry_forest/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/berry_forest/palettes/15.pal b/data/tilesets/secondary/berry_forest/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/berry_forest/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/berry_forest/palettes/2.pal b/data/tilesets/secondary/berry_forest/palettes/2.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/berry_forest/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/berry_forest/palettes/3.pal b/data/tilesets/secondary/berry_forest/palettes/3.pal new file mode 100644 index 000000000..9581f2cd8 --- /dev/null +++ b/data/tilesets/secondary/berry_forest/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 131 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/berry_forest/palettes/4.pal b/data/tilesets/secondary/berry_forest/palettes/4.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/berry_forest/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/berry_forest/palettes/5.pal b/data/tilesets/secondary/berry_forest/palettes/5.pal new file mode 100644 index 000000000..3a2db72a7 --- /dev/null +++ b/data/tilesets/secondary/berry_forest/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +222 205 131 +205 180 106 +180 139 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/berry_forest/palettes/6.pal b/data/tilesets/secondary/berry_forest/palettes/6.pal new file mode 100644 index 000000000..93518605a --- /dev/null +++ b/data/tilesets/secondary/berry_forest/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/berry_forest/palettes/7.pal b/data/tilesets/secondary/berry_forest/palettes/7.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/berry_forest/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/berry_forest/palettes/8.pal b/data/tilesets/secondary/berry_forest/palettes/8.pal new file mode 100644 index 000000000..650a35cc8 --- /dev/null +++ b/data/tilesets/secondary/berry_forest/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 82 0 +57 115 24 +98 65 74 +131 106 82 +65 57 49 +255 0 255 +255 0 255 +255 0 255 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/berry_forest/palettes/9.pal b/data/tilesets/secondary/berry_forest/palettes/9.pal new file mode 100644 index 000000000..df2d04037 --- /dev/null +++ b/data/tilesets/secondary/berry_forest/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +213 230 189 +57 172 131 +222 230 246 +230 172 123 +106 205 164 diff --git a/data/tilesets/secondary/berry_forest/tiles.png b/data/tilesets/secondary/berry_forest/tiles.png new file mode 100644 index 000000000..dacbc0120 Binary files /dev/null and b/data/tilesets/secondary/berry_forest/tiles.png differ diff --git a/data/tilesets/secondary/bike_shop/metatile_attributes.bin b/data/tilesets/secondary/bike_shop/metatile_attributes.bin new file mode 100644 index 000000000..d1a4900c5 Binary files /dev/null and b/data/tilesets/secondary/bike_shop/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/bike_shop/metatiles.bin b/data/tilesets/secondary/bike_shop/metatiles.bin new file mode 100644 index 000000000..f1c0ab02d Binary files /dev/null and b/data/tilesets/secondary/bike_shop/metatiles.bin differ diff --git a/data/tilesets/secondary/bike_shop/palettes/0.pal b/data/tilesets/secondary/bike_shop/palettes/0.pal new file mode 100644 index 000000000..4b44e19f4 --- /dev/null +++ b/data/tilesets/secondary/bike_shop/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 156 156 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/bike_shop/palettes/1.pal b/data/tilesets/secondary/bike_shop/palettes/1.pal new file mode 100644 index 000000000..a39ca6aa8 --- /dev/null +++ b/data/tilesets/secondary/bike_shop/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 156 156 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/bike_shop/palettes/10.pal b/data/tilesets/secondary/bike_shop/palettes/10.pal new file mode 100644 index 000000000..c06a049b0 --- /dev/null +++ b/data/tilesets/secondary/bike_shop/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/bike_shop/palettes/11.pal b/data/tilesets/secondary/bike_shop/palettes/11.pal new file mode 100644 index 000000000..c06a049b0 --- /dev/null +++ b/data/tilesets/secondary/bike_shop/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/bike_shop/palettes/12.pal b/data/tilesets/secondary/bike_shop/palettes/12.pal new file mode 100644 index 000000000..c06a049b0 --- /dev/null +++ b/data/tilesets/secondary/bike_shop/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/bike_shop/palettes/13.pal b/data/tilesets/secondary/bike_shop/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/bike_shop/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/bike_shop/palettes/14.pal b/data/tilesets/secondary/bike_shop/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/bike_shop/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/bike_shop/palettes/15.pal b/data/tilesets/secondary/bike_shop/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/bike_shop/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/bike_shop/palettes/2.pal b/data/tilesets/secondary/bike_shop/palettes/2.pal new file mode 100644 index 000000000..5a4f127be --- /dev/null +++ b/data/tilesets/secondary/bike_shop/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 156 156 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/bike_shop/palettes/3.pal b/data/tilesets/secondary/bike_shop/palettes/3.pal new file mode 100644 index 000000000..c84fa4a58 --- /dev/null +++ b/data/tilesets/secondary/bike_shop/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 156 156 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/bike_shop/palettes/4.pal b/data/tilesets/secondary/bike_shop/palettes/4.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/bike_shop/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/bike_shop/palettes/5.pal b/data/tilesets/secondary/bike_shop/palettes/5.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/bike_shop/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/bike_shop/palettes/6.pal b/data/tilesets/secondary/bike_shop/palettes/6.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/bike_shop/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/bike_shop/palettes/7.pal b/data/tilesets/secondary/bike_shop/palettes/7.pal new file mode 100644 index 000000000..a71b8fee2 --- /dev/null +++ b/data/tilesets/secondary/bike_shop/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +82 82 106 +131 131 139 +172 172 139 +205 205 180 +238 238 222 +131 148 139 +172 189 172 +205 205 205 +213 222 213 +255 255 255 +164 123 74 +189 148 98 +222 172 123 +172 180 106 +197 205 131 diff --git a/data/tilesets/secondary/bike_shop/palettes/8.pal b/data/tilesets/secondary/bike_shop/palettes/8.pal new file mode 100644 index 000000000..0a666a9c9 --- /dev/null +++ b/data/tilesets/secondary/bike_shop/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +65 74 106 +139 139 131 +197 197 197 +255 255 255 +0 0 0 +246 197 197 +74 74 213 +123 123 246 +180 180 0 +213 197 65 +246 246 32 +148 82 74 +205 49 41 +255 123 74 +0 0 0 diff --git a/data/tilesets/secondary/bike_shop/palettes/9.pal b/data/tilesets/secondary/bike_shop/palettes/9.pal new file mode 100644 index 000000000..c06a049b0 --- /dev/null +++ b/data/tilesets/secondary/bike_shop/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/bike_shop/tiles.png b/data/tilesets/secondary/bike_shop/tiles.png new file mode 100644 index 000000000..90124ff4a Binary files /dev/null and b/data/tilesets/secondary/bike_shop/tiles.png differ diff --git a/data/tilesets/secondary/building1/metatile_attributes.bin b/data/tilesets/secondary/building1/metatile_attributes.bin new file mode 100644 index 000000000..be95e451c Binary files /dev/null and b/data/tilesets/secondary/building1/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/building1/metatiles.bin b/data/tilesets/secondary/building1/metatiles.bin new file mode 100644 index 000000000..806d040ce Binary files /dev/null and b/data/tilesets/secondary/building1/metatiles.bin differ diff --git a/data/tilesets/secondary/building1/palettes/0.pal b/data/tilesets/secondary/building1/palettes/0.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/building1/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/building1/palettes/1.pal b/data/tilesets/secondary/building1/palettes/1.pal new file mode 100644 index 000000000..69f3f0b9e --- /dev/null +++ b/data/tilesets/secondary/building1/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +180 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +238 246 238 diff --git a/data/tilesets/secondary/building1/palettes/10.pal b/data/tilesets/secondary/building1/palettes/10.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/building1/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/building1/palettes/11.pal b/data/tilesets/secondary/building1/palettes/11.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/building1/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/building1/palettes/12.pal b/data/tilesets/secondary/building1/palettes/12.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/building1/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/building1/palettes/13.pal b/data/tilesets/secondary/building1/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/building1/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/building1/palettes/14.pal b/data/tilesets/secondary/building1/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/building1/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/building1/palettes/15.pal b/data/tilesets/secondary/building1/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/building1/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/building1/palettes/2.pal b/data/tilesets/secondary/building1/palettes/2.pal new file mode 100644 index 000000000..c8ee236d7 --- /dev/null +++ b/data/tilesets/secondary/building1/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +255 0 255 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/building1/palettes/3.pal b/data/tilesets/secondary/building1/palettes/3.pal new file mode 100644 index 000000000..b17dbb054 --- /dev/null +++ b/data/tilesets/secondary/building1/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +164 164 164 +180 189 189 +255 255 255 +238 246 238 +213 230 222 +197 205 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/building1/palettes/4.pal b/data/tilesets/secondary/building1/palettes/4.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/building1/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/building1/palettes/5.pal b/data/tilesets/secondary/building1/palettes/5.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/building1/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/building1/palettes/6.pal b/data/tilesets/secondary/building1/palettes/6.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/building1/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/building1/palettes/7.pal b/data/tilesets/secondary/building1/palettes/7.pal new file mode 100644 index 000000000..c1e7c3d5c --- /dev/null +++ b/data/tilesets/secondary/building1/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 diff --git a/data/tilesets/secondary/building1/palettes/8.pal b/data/tilesets/secondary/building1/palettes/8.pal new file mode 100644 index 000000000..18480092b --- /dev/null +++ b/data/tilesets/secondary/building1/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 222 156 +82 82 106 +115 123 131 +98 90 65 +139 123 82 +197 172 90 +230 230 238 +205 115 74 +238 172 82 +238 213 82 +131 189 57 +164 222 82 +156 139 172 +205 172 222 +213 205 230 +246 255 255 diff --git a/data/tilesets/secondary/building1/palettes/9.pal b/data/tilesets/secondary/building1/palettes/9.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/building1/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/building1/tiles.png b/data/tilesets/secondary/building1/tiles.png new file mode 100644 index 000000000..191287197 Binary files /dev/null and b/data/tilesets/secondary/building1/tiles.png differ diff --git a/data/tilesets/secondary/building2/metatile_attributes.bin b/data/tilesets/secondary/building2/metatile_attributes.bin new file mode 100644 index 000000000..18d7517d9 Binary files /dev/null and b/data/tilesets/secondary/building2/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/building2/metatiles.bin b/data/tilesets/secondary/building2/metatiles.bin new file mode 100644 index 000000000..0943dc7af Binary files /dev/null and b/data/tilesets/secondary/building2/metatiles.bin differ diff --git a/data/tilesets/secondary/building2/palettes/0.pal b/data/tilesets/secondary/building2/palettes/0.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/building2/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/building2/palettes/1.pal b/data/tilesets/secondary/building2/palettes/1.pal new file mode 100644 index 000000000..d99adafff --- /dev/null +++ b/data/tilesets/secondary/building2/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/building2/palettes/10.pal b/data/tilesets/secondary/building2/palettes/10.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/building2/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/building2/palettes/11.pal b/data/tilesets/secondary/building2/palettes/11.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/building2/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/building2/palettes/12.pal b/data/tilesets/secondary/building2/palettes/12.pal new file mode 100644 index 000000000..2903bb074 --- /dev/null +++ b/data/tilesets/secondary/building2/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +131 131 131 +180 180 164 +255 255 255 +189 164 82 +222 197 106 +230 222 156 +123 197 189 +156 222 213 +213 255 246 +255 0 255 +255 0 255 +213 131 65 +222 230 222 +246 238 189 diff --git a/data/tilesets/secondary/building2/palettes/13.pal b/data/tilesets/secondary/building2/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/building2/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/building2/palettes/14.pal b/data/tilesets/secondary/building2/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/building2/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/building2/palettes/15.pal b/data/tilesets/secondary/building2/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/building2/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/building2/palettes/2.pal b/data/tilesets/secondary/building2/palettes/2.pal new file mode 100644 index 000000000..cc3a9457d --- /dev/null +++ b/data/tilesets/secondary/building2/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/building2/palettes/3.pal b/data/tilesets/secondary/building2/palettes/3.pal new file mode 100644 index 000000000..7ec794ae5 --- /dev/null +++ b/data/tilesets/secondary/building2/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/building2/palettes/4.pal b/data/tilesets/secondary/building2/palettes/4.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/building2/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/building2/palettes/5.pal b/data/tilesets/secondary/building2/palettes/5.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/building2/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/building2/palettes/6.pal b/data/tilesets/secondary/building2/palettes/6.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/building2/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/building2/palettes/7.pal b/data/tilesets/secondary/building2/palettes/7.pal new file mode 100644 index 000000000..c62a40b0d --- /dev/null +++ b/data/tilesets/secondary/building2/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +148 172 139 +180 197 164 +213 222 197 +238 255 213 +115 156 180 +197 222 238 +123 197 189 +156 222 213 +213 255 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/building2/palettes/8.pal b/data/tilesets/secondary/building2/palettes/8.pal new file mode 100644 index 000000000..8c66b4998 --- /dev/null +++ b/data/tilesets/secondary/building2/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +230 222 156 +189 98 74 +230 156 98 +213 205 156 +115 156 180 +246 238 189 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/building2/palettes/9.pal b/data/tilesets/secondary/building2/palettes/9.pal new file mode 100644 index 000000000..25d5d7019 --- /dev/null +++ b/data/tilesets/secondary/building2/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +156 213 255 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +0 0 0 diff --git a/data/tilesets/secondary/building2/tiles.png b/data/tilesets/secondary/building2/tiles.png new file mode 100644 index 000000000..ca6e21f03 Binary files /dev/null and b/data/tilesets/secondary/building2/tiles.png differ diff --git a/data/tilesets/secondary/burgled_house/metatile_attributes.bin b/data/tilesets/secondary/burgled_house/metatile_attributes.bin new file mode 100644 index 000000000..db0f7817e Binary files /dev/null and b/data/tilesets/secondary/burgled_house/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/burgled_house/metatiles.bin b/data/tilesets/secondary/burgled_house/metatiles.bin new file mode 100644 index 000000000..dfe78c910 Binary files /dev/null and b/data/tilesets/secondary/burgled_house/metatiles.bin differ diff --git a/data/tilesets/secondary/burgled_house/palettes/0.pal b/data/tilesets/secondary/burgled_house/palettes/0.pal new file mode 100644 index 000000000..6d876039d --- /dev/null +++ b/data/tilesets/secondary/burgled_house/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/burgled_house/palettes/1.pal b/data/tilesets/secondary/burgled_house/palettes/1.pal new file mode 100644 index 000000000..66561f6d3 --- /dev/null +++ b/data/tilesets/secondary/burgled_house/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +139 180 222 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/burgled_house/palettes/10.pal b/data/tilesets/secondary/burgled_house/palettes/10.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/burgled_house/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/burgled_house/palettes/11.pal b/data/tilesets/secondary/burgled_house/palettes/11.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/burgled_house/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/burgled_house/palettes/12.pal b/data/tilesets/secondary/burgled_house/palettes/12.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/burgled_house/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/burgled_house/palettes/13.pal b/data/tilesets/secondary/burgled_house/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/burgled_house/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/burgled_house/palettes/14.pal b/data/tilesets/secondary/burgled_house/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/burgled_house/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/burgled_house/palettes/15.pal b/data/tilesets/secondary/burgled_house/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/burgled_house/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/burgled_house/palettes/2.pal b/data/tilesets/secondary/burgled_house/palettes/2.pal new file mode 100644 index 000000000..87a022102 --- /dev/null +++ b/data/tilesets/secondary/burgled_house/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +90 90 115 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/burgled_house/palettes/3.pal b/data/tilesets/secondary/burgled_house/palettes/3.pal new file mode 100644 index 000000000..783496dcd --- /dev/null +++ b/data/tilesets/secondary/burgled_house/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +65 98 156 +90 123 180 +115 156 197 +222 213 131 +164 164 172 +205 205 213 +238 238 246 +106 172 115 +156 205 139 diff --git a/data/tilesets/secondary/burgled_house/palettes/4.pal b/data/tilesets/secondary/burgled_house/palettes/4.pal new file mode 100644 index 000000000..89eace605 --- /dev/null +++ b/data/tilesets/secondary/burgled_house/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 238 246 +172 197 180 +197 222 205 +90 189 172 +246 238 156 +205 189 131 +189 164 123 +148 131 106 +106 106 106 +213 222 230 +238 180 115 diff --git a/data/tilesets/secondary/burgled_house/palettes/5.pal b/data/tilesets/secondary/burgled_house/palettes/5.pal new file mode 100644 index 000000000..0eef3df8e --- /dev/null +++ b/data/tilesets/secondary/burgled_house/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +213 222 222 +164 180 189 +255 0 255 +131 115 74 +213 213 148 +197 189 139 +172 156 115 +148 131 90 +255 0 255 +255 0 255 +0 0 0 diff --git a/data/tilesets/secondary/burgled_house/palettes/6.pal b/data/tilesets/secondary/burgled_house/palettes/6.pal new file mode 100644 index 000000000..1d08ce9a2 --- /dev/null +++ b/data/tilesets/secondary/burgled_house/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/burgled_house/palettes/7.pal b/data/tilesets/secondary/burgled_house/palettes/7.pal new file mode 100644 index 000000000..c1e7c3d5c --- /dev/null +++ b/data/tilesets/secondary/burgled_house/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 diff --git a/data/tilesets/secondary/burgled_house/palettes/8.pal b/data/tilesets/secondary/burgled_house/palettes/8.pal new file mode 100644 index 000000000..c1e7c3d5c --- /dev/null +++ b/data/tilesets/secondary/burgled_house/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 diff --git a/data/tilesets/secondary/burgled_house/palettes/9.pal b/data/tilesets/secondary/burgled_house/palettes/9.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/burgled_house/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/burgled_house/tiles.png b/data/tilesets/secondary/burgled_house/tiles.png new file mode 100644 index 000000000..9fcf94314 Binary files /dev/null and b/data/tilesets/secondary/burgled_house/tiles.png differ diff --git a/data/tilesets/secondary/cable_club/metatile_attributes.bin b/data/tilesets/secondary/cable_club/metatile_attributes.bin new file mode 100644 index 000000000..53505839d Binary files /dev/null and b/data/tilesets/secondary/cable_club/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/cable_club/metatiles.bin b/data/tilesets/secondary/cable_club/metatiles.bin new file mode 100644 index 000000000..0e2f2a6c3 Binary files /dev/null and b/data/tilesets/secondary/cable_club/metatiles.bin differ diff --git a/data/tilesets/secondary/cable_club/palettes/0.pal b/data/tilesets/secondary/cable_club/palettes/0.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cable_club/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cable_club/palettes/1.pal b/data/tilesets/secondary/cable_club/palettes/1.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cable_club/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cable_club/palettes/10.pal b/data/tilesets/secondary/cable_club/palettes/10.pal new file mode 100644 index 000000000..ab8f75e5a --- /dev/null +++ b/data/tilesets/secondary/cable_club/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +65 74 106 +123 123 148 +246 255 255 +205 213 213 +0 0 0 +255 123 123 +172 123 115 +139 230 98 +115 189 57 +246 230 24 +189 180 49 +148 148 246 +123 123 180 +222 222 255 +180 172 213 diff --git a/data/tilesets/secondary/cable_club/palettes/11.pal b/data/tilesets/secondary/cable_club/palettes/11.pal new file mode 100644 index 000000000..468d7212c --- /dev/null +++ b/data/tilesets/secondary/cable_club/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +49 57 74 +172 164 255 +131 123 230 +106 98 172 +82 74 180 +82 74 98 +246 255 255 +115 172 65 +123 189 74 +148 205 90 +98 90 148 +139 156 213 +57 57 106 +148 205 90 +0 255 0 diff --git a/data/tilesets/secondary/cable_club/palettes/12.pal b/data/tilesets/secondary/cable_club/palettes/12.pal new file mode 100644 index 000000000..05794ac82 --- /dev/null +++ b/data/tilesets/secondary/cable_club/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +65 74 106 +197 238 255 +172 205 213 +131 164 180 +123 156 180 +98 139 148 +246 255 255 +164 123 115 +180 74 24 +213 98 49 +98 139 148 +172 205 213 +197 238 255 +156 222 115 +148 189 98 diff --git a/data/tilesets/secondary/cable_club/palettes/13.pal b/data/tilesets/secondary/cable_club/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cable_club/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cable_club/palettes/14.pal b/data/tilesets/secondary/cable_club/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cable_club/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cable_club/palettes/15.pal b/data/tilesets/secondary/cable_club/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cable_club/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cable_club/palettes/2.pal b/data/tilesets/secondary/cable_club/palettes/2.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cable_club/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cable_club/palettes/3.pal b/data/tilesets/secondary/cable_club/palettes/3.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cable_club/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cable_club/palettes/4.pal b/data/tilesets/secondary/cable_club/palettes/4.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cable_club/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cable_club/palettes/5.pal b/data/tilesets/secondary/cable_club/palettes/5.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cable_club/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cable_club/palettes/6.pal b/data/tilesets/secondary/cable_club/palettes/6.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cable_club/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cable_club/palettes/7.pal b/data/tilesets/secondary/cable_club/palettes/7.pal new file mode 100644 index 000000000..00ca6903f --- /dev/null +++ b/data/tilesets/secondary/cable_club/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +65 74 106 +255 213 131 +246 180 82 +213 148 41 +180 172 148 +148 139 123 +255 255 222 +230 230 197 +180 74 24 +213 98 49 +90 156 139 +131 197 180 +172 230 205 +156 222 115 +148 189 106 diff --git a/data/tilesets/secondary/cable_club/palettes/8.pal b/data/tilesets/secondary/cable_club/palettes/8.pal new file mode 100644 index 000000000..43d6db90d --- /dev/null +++ b/data/tilesets/secondary/cable_club/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +65 74 106 +230 238 255 +213 205 246 +164 164 180 +156 197 156 +106 156 139 +246 255 255 +0 0 0 +180 74 24 +213 98 49 +123 106 164 +156 156 197 +197 197 230 +156 222 115 +148 189 106 diff --git a/data/tilesets/secondary/cable_club/palettes/9.pal b/data/tilesets/secondary/cable_club/palettes/9.pal new file mode 100644 index 000000000..87857607f --- /dev/null +++ b/data/tilesets/secondary/cable_club/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +65 74 106 +238 255 255 +213 222 238 +189 205 197 +156 164 172 +0 0 0 +189 139 90 +222 172 106 +246 189 115 +82 156 164 +115 197 222 +213 98 82 +246 148 131 +148 205 90 +49 131 24 diff --git a/data/tilesets/secondary/cable_club/tiles.png b/data/tilesets/secondary/cable_club/tiles.png new file mode 100644 index 000000000..f71f29432 Binary files /dev/null and b/data/tilesets/secondary/cable_club/tiles.png differ diff --git a/data/tilesets/secondary/cave/metatile_attributes.bin b/data/tilesets/secondary/cave/metatile_attributes.bin new file mode 100644 index 000000000..510f0fdf1 Binary files /dev/null and b/data/tilesets/secondary/cave/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/cave/metatiles.bin b/data/tilesets/secondary/cave/metatiles.bin new file mode 100644 index 000000000..9f35adc11 Binary files /dev/null and b/data/tilesets/secondary/cave/metatiles.bin differ diff --git a/data/tilesets/secondary/cave/palettes/0.pal b/data/tilesets/secondary/cave/palettes/0.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/cave/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/cave/palettes/1.pal b/data/tilesets/secondary/cave/palettes/1.pal new file mode 100644 index 000000000..09828f4f1 --- /dev/null +++ b/data/tilesets/secondary/cave/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +123 123 131 +32 49 57 +230 238 238 +90 189 139 +90 90 115 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +123 74 74 +90 57 65 +115 205 164 diff --git a/data/tilesets/secondary/cave/palettes/10.pal b/data/tilesets/secondary/cave/palettes/10.pal new file mode 100644 index 000000000..937405d15 --- /dev/null +++ b/data/tilesets/secondary/cave/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +255 0 255 +255 0 255 +255 0 255 +0 0 0 +255 238 164 +230 197 139 +205 172 123 +172 139 106 +213 197 189 +205 180 156 +189 148 139 +148 115 106 +115 65 74 +82 49 65 +90 90 98 diff --git a/data/tilesets/secondary/cave/palettes/11.pal b/data/tilesets/secondary/cave/palettes/11.pal new file mode 100644 index 000000000..bb4f4867c --- /dev/null +++ b/data/tilesets/secondary/cave/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +189 189 156 +172 172 139 +148 139 115 +123 115 90 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +238 222 148 +222 205 115 +205 180 98 +189 172 98 diff --git a/data/tilesets/secondary/cave/palettes/12.pal b/data/tilesets/secondary/cave/palettes/12.pal new file mode 100644 index 000000000..583384664 --- /dev/null +++ b/data/tilesets/secondary/cave/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +0 0 0 diff --git a/data/tilesets/secondary/cave/palettes/13.pal b/data/tilesets/secondary/cave/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cave/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cave/palettes/14.pal b/data/tilesets/secondary/cave/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cave/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cave/palettes/15.pal b/data/tilesets/secondary/cave/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cave/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cave/palettes/2.pal b/data/tilesets/secondary/cave/palettes/2.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/cave/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/cave/palettes/3.pal b/data/tilesets/secondary/cave/palettes/3.pal new file mode 100644 index 000000000..ef7460f41 --- /dev/null +++ b/data/tilesets/secondary/cave/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +123 197 255 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/cave/palettes/4.pal b/data/tilesets/secondary/cave/palettes/4.pal new file mode 100644 index 000000000..e83c6b367 --- /dev/null +++ b/data/tilesets/secondary/cave/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +230 246 255 +189 222 255 +139 189 255 +115 164 255 +65 139 222 +57 115 205 +82 148 230 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +49 115 197 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/cave/palettes/5.pal b/data/tilesets/secondary/cave/palettes/5.pal new file mode 100644 index 000000000..c5a653979 --- /dev/null +++ b/data/tilesets/secondary/cave/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/cave/palettes/6.pal b/data/tilesets/secondary/cave/palettes/6.pal new file mode 100644 index 000000000..9bad44649 --- /dev/null +++ b/data/tilesets/secondary/cave/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +205 230 246 +180 213 255 +123 180 246 +98 148 230 +65 123 189 +49 98 180 +82 131 222 +213 230 238 +172 189 205 +123 123 131 +90 90 115 +238 246 246 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/cave/palettes/7.pal b/data/tilesets/secondary/cave/palettes/7.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/cave/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cave/palettes/8.pal b/data/tilesets/secondary/cave/palettes/8.pal new file mode 100644 index 000000000..1c8d33fac --- /dev/null +++ b/data/tilesets/secondary/cave/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +189 189 156 +172 172 139 +148 139 115 +123 115 90 +32 49 57 +255 0 255 +255 0 255 +255 0 255 +222 197 189 +205 180 156 +189 148 139 +148 115 106 +115 65 74 +82 49 65 +90 90 98 diff --git a/data/tilesets/secondary/cave/palettes/9.pal b/data/tilesets/secondary/cave/palettes/9.pal new file mode 100644 index 000000000..3795f6c6a --- /dev/null +++ b/data/tilesets/secondary/cave/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 222 213 +189 189 156 +172 172 139 +148 139 115 +123 115 90 +255 238 164 +230 197 139 +205 172 123 +164 123 90 +148 115 74 +106 65 41 +74 74 57 +0 0 0 +98 139 197 +74 115 172 +57 98 156 diff --git a/data/tilesets/secondary/cave/tiles.png b/data/tilesets/secondary/cave/tiles.png new file mode 100644 index 000000000..8e0f64a78 Binary files /dev/null and b/data/tilesets/secondary/cave/tiles.png differ diff --git a/data/tilesets/secondary/celadon_city/metatile_attributes.bin b/data/tilesets/secondary/celadon_city/metatile_attributes.bin new file mode 100644 index 000000000..5dd139155 Binary files /dev/null and b/data/tilesets/secondary/celadon_city/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/celadon_city/metatiles.bin b/data/tilesets/secondary/celadon_city/metatiles.bin new file mode 100644 index 000000000..3bfb9d239 Binary files /dev/null and b/data/tilesets/secondary/celadon_city/metatiles.bin differ diff --git a/data/tilesets/secondary/celadon_city/palettes/0.pal b/data/tilesets/secondary/celadon_city/palettes/0.pal new file mode 100644 index 000000000..7af5bb7d2 --- /dev/null +++ b/data/tilesets/secondary/celadon_city/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 82 0 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/celadon_city/palettes/1.pal b/data/tilesets/secondary/celadon_city/palettes/1.pal new file mode 100644 index 000000000..391d1e3d1 --- /dev/null +++ b/data/tilesets/secondary/celadon_city/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 189 164 +189 148 139 +156 115 115 +123 82 82 +90 57 74 +115 205 164 diff --git a/data/tilesets/secondary/celadon_city/palettes/10.pal b/data/tilesets/secondary/celadon_city/palettes/10.pal new file mode 100644 index 000000000..361b133e6 --- /dev/null +++ b/data/tilesets/secondary/celadon_city/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 255 255 +222 222 230 +123 123 131 +82 82 106 +238 230 255 +222 197 255 +180 148 222 +131 106 172 +255 0 255 +115 189 246 +74 148 205 +41 115 172 +148 164 180 +246 238 148 +213 172 74 diff --git a/data/tilesets/secondary/celadon_city/palettes/11.pal b/data/tilesets/secondary/celadon_city/palettes/11.pal new file mode 100644 index 000000000..00caf8dfc --- /dev/null +++ b/data/tilesets/secondary/celadon_city/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +180 205 213 +148 164 180 +123 123 131 +82 82 106 +205 222 238 +197 213 222 +164 180 197 +222 180 82 +230 238 238 +255 205 139 +222 106 98 +197 74 65 +98 189 148 +115 205 164 diff --git a/data/tilesets/secondary/celadon_city/palettes/12.pal b/data/tilesets/secondary/celadon_city/palettes/12.pal new file mode 100644 index 000000000..4257575ae --- /dev/null +++ b/data/tilesets/secondary/celadon_city/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +213 222 164 +180 189 131 +139 148 90 +123 123 131 +90 90 115 +65 74 106 +180 148 222 +131 106 172 +189 230 222 +148 205 180 +115 172 148 +106 148 139 +74 115 106 +115 205 164 diff --git a/data/tilesets/secondary/celadon_city/palettes/13.pal b/data/tilesets/secondary/celadon_city/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_city/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/celadon_city/palettes/14.pal b/data/tilesets/secondary/celadon_city/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_city/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/celadon_city/palettes/15.pal b/data/tilesets/secondary/celadon_city/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_city/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/celadon_city/palettes/2.pal b/data/tilesets/secondary/celadon_city/palettes/2.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/celadon_city/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/celadon_city/palettes/3.pal b/data/tilesets/secondary/celadon_city/palettes/3.pal new file mode 100644 index 000000000..973765509 --- /dev/null +++ b/data/tilesets/secondary/celadon_city/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/celadon_city/palettes/4.pal b/data/tilesets/secondary/celadon_city/palettes/4.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/celadon_city/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/celadon_city/palettes/5.pal b/data/tilesets/secondary/celadon_city/palettes/5.pal new file mode 100644 index 000000000..3a2db72a7 --- /dev/null +++ b/data/tilesets/secondary/celadon_city/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +222 205 131 +205 180 106 +180 139 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/celadon_city/palettes/6.pal b/data/tilesets/secondary/celadon_city/palettes/6.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_city/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/celadon_city/palettes/7.pal b/data/tilesets/secondary/celadon_city/palettes/7.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_city/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/celadon_city/palettes/8.pal b/data/tilesets/secondary/celadon_city/palettes/8.pal new file mode 100644 index 000000000..86930c1d1 --- /dev/null +++ b/data/tilesets/secondary/celadon_city/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 255 255 +222 222 230 +123 123 131 +82 82 106 +197 238 255 +172 213 255 +123 164 222 +98 139 189 +246 230 139 +197 180 115 +172 156 90 +123 164 189 +148 189 238 +255 205 139 +230 131 115 diff --git a/data/tilesets/secondary/celadon_city/palettes/9.pal b/data/tilesets/secondary/celadon_city/palettes/9.pal new file mode 100644 index 000000000..5dc82505a --- /dev/null +++ b/data/tilesets/secondary/celadon_city/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 255 255 +222 222 230 +123 123 131 +82 82 106 +197 197 205 +255 213 164 +222 123 82 +189 90 57 +189 230 222 +131 189 164 +106 148 139 +246 238 189 +222 213 156 +213 189 123 +197 180 106 diff --git a/data/tilesets/secondary/celadon_city/tiles.png b/data/tilesets/secondary/celadon_city/tiles.png new file mode 100644 index 000000000..db18cb938 Binary files /dev/null and b/data/tilesets/secondary/celadon_city/tiles.png differ diff --git a/data/tilesets/secondary/celadon_gym/metatile_attributes.bin b/data/tilesets/secondary/celadon_gym/metatile_attributes.bin new file mode 100644 index 000000000..def1ee695 Binary files /dev/null and b/data/tilesets/secondary/celadon_gym/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/celadon_gym/metatiles.bin b/data/tilesets/secondary/celadon_gym/metatiles.bin new file mode 100644 index 000000000..f3f58a44d Binary files /dev/null and b/data/tilesets/secondary/celadon_gym/metatiles.bin differ diff --git a/data/tilesets/secondary/celadon_gym/palettes/0.pal b/data/tilesets/secondary/celadon_gym/palettes/0.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/celadon_gym/palettes/1.pal b/data/tilesets/secondary/celadon_gym/palettes/1.pal new file mode 100644 index 000000000..69f3f0b9e --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +180 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +238 246 238 diff --git a/data/tilesets/secondary/celadon_gym/palettes/10.pal b/data/tilesets/secondary/celadon_gym/palettes/10.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/celadon_gym/palettes/11.pal b/data/tilesets/secondary/celadon_gym/palettes/11.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/celadon_gym/palettes/12.pal b/data/tilesets/secondary/celadon_gym/palettes/12.pal new file mode 100644 index 000000000..041512724 --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +41 123 123 +41 156 156 +49 189 172 +65 230 189 +65 246 230 +106 90 74 +131 106 74 +156 131 65 +172 156 74 +172 156 106 +205 180 106 +222 205 98 +230 222 106 diff --git a/data/tilesets/secondary/celadon_gym/palettes/13.pal b/data/tilesets/secondary/celadon_gym/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/celadon_gym/palettes/14.pal b/data/tilesets/secondary/celadon_gym/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/celadon_gym/palettes/15.pal b/data/tilesets/secondary/celadon_gym/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/celadon_gym/palettes/2.pal b/data/tilesets/secondary/celadon_gym/palettes/2.pal new file mode 100644 index 000000000..330e35b02 --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +213 131 82 +156 205 246 +98 156 238 +57 123 222 +222 139 106 +189 98 74 diff --git a/data/tilesets/secondary/celadon_gym/palettes/3.pal b/data/tilesets/secondary/celadon_gym/palettes/3.pal new file mode 100644 index 000000000..eac8236f1 --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +148 148 148 +180 180 180 +255 255 255 +238 246 238 +222 238 222 +197 205 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/celadon_gym/palettes/4.pal b/data/tilesets/secondary/celadon_gym/palettes/4.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/celadon_gym/palettes/5.pal b/data/tilesets/secondary/celadon_gym/palettes/5.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/celadon_gym/palettes/6.pal b/data/tilesets/secondary/celadon_gym/palettes/6.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/celadon_gym/palettes/7.pal b/data/tilesets/secondary/celadon_gym/palettes/7.pal new file mode 100644 index 000000000..9d84ecaba --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +139 139 148 +74 156 90 +65 139 139 +115 205 90 +148 238 74 +189 255 98 +156 131 82 +197 115 123 +255 164 123 +238 238 172 +82 115 82 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/celadon_gym/palettes/8.pal b/data/tilesets/secondary/celadon_gym/palettes/8.pal new file mode 100644 index 000000000..085c49344 --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +139 139 148 +222 213 246 +238 238 255 +123 156 246 +106 197 255 +131 222 255 +156 230 255 +115 90 98 +189 115 131 +246 189 115 +222 189 246 +255 230 115 +90 98 213 +255 172 197 diff --git a/data/tilesets/secondary/celadon_gym/palettes/9.pal b/data/tilesets/secondary/celadon_gym/palettes/9.pal new file mode 100644 index 000000000..9020b628f --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +156 131 57 +213 197 106 +246 238 148 +213 222 238 +222 230 255 +41 106 82 +57 131 115 +172 131 115 +197 156 148 +238 180 164 +180 139 123 diff --git a/data/tilesets/secondary/celadon_gym/tiles.png b/data/tilesets/secondary/celadon_gym/tiles.png new file mode 100644 index 000000000..ef08ccc83 Binary files /dev/null and b/data/tilesets/secondary/celadon_gym/tiles.png differ diff --git a/data/tilesets/secondary/cerulean_cave/metatile_attributes.bin b/data/tilesets/secondary/cerulean_cave/metatile_attributes.bin new file mode 100644 index 000000000..45b5bef90 Binary files /dev/null and b/data/tilesets/secondary/cerulean_cave/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/cerulean_cave/metatiles.bin b/data/tilesets/secondary/cerulean_cave/metatiles.bin new file mode 100644 index 000000000..249addbc7 Binary files /dev/null and b/data/tilesets/secondary/cerulean_cave/metatiles.bin differ diff --git a/data/tilesets/secondary/cerulean_cave/palettes/0.pal b/data/tilesets/secondary/cerulean_cave/palettes/0.pal new file mode 100644 index 000000000..a3fab1c2f --- /dev/null +++ b/data/tilesets/secondary/cerulean_cave/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/1.pal b/data/tilesets/secondary/cerulean_cave/palettes/1.pal new file mode 100644 index 000000000..d8a4e7757 --- /dev/null +++ b/data/tilesets/secondary/cerulean_cave/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/10.pal b/data/tilesets/secondary/cerulean_cave/palettes/10.pal new file mode 100644 index 000000000..eb9198b0a --- /dev/null +++ b/data/tilesets/secondary/cerulean_cave/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +255 0 255 +255 0 255 +255 0 255 +0 0 0 +255 238 180 +230 205 164 +189 180 164 +172 164 156 +205 246 172 +172 213 148 +139 180 131 +115 156 106 +82 123 90 +57 98 74 +65 65 74 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/11.pal b/data/tilesets/secondary/cerulean_cave/palettes/11.pal new file mode 100644 index 000000000..9afe8750d --- /dev/null +++ b/data/tilesets/secondary/cerulean_cave/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +197 205 222 +172 180 197 +156 164 180 +115 123 139 +148 156 164 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +123 189 156 +106 156 139 +98 123 123 +90 98 115 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/12.pal b/data/tilesets/secondary/cerulean_cave/palettes/12.pal new file mode 100644 index 000000000..aced117f7 --- /dev/null +++ b/data/tilesets/secondary/cerulean_cave/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 205 222 +197 205 222 +172 180 197 +156 164 180 +115 123 139 +238 238 164 +205 205 106 +172 172 90 +123 131 74 +115 123 139 +82 90 32 +65 65 74 +16 16 24 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/13.pal b/data/tilesets/secondary/cerulean_cave/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cerulean_cave/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/14.pal b/data/tilesets/secondary/cerulean_cave/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cerulean_cave/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/15.pal b/data/tilesets/secondary/cerulean_cave/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cerulean_cave/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/2.pal b/data/tilesets/secondary/cerulean_cave/palettes/2.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/cerulean_cave/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/3.pal b/data/tilesets/secondary/cerulean_cave/palettes/3.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/secondary/cerulean_cave/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/4.pal b/data/tilesets/secondary/cerulean_cave/palettes/4.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/cerulean_cave/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/5.pal b/data/tilesets/secondary/cerulean_cave/palettes/5.pal new file mode 100644 index 000000000..c5a653979 --- /dev/null +++ b/data/tilesets/secondary/cerulean_cave/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/6.pal b/data/tilesets/secondary/cerulean_cave/palettes/6.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/cerulean_cave/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/7.pal b/data/tilesets/secondary/cerulean_cave/palettes/7.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/cerulean_cave/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/8.pal b/data/tilesets/secondary/cerulean_cave/palettes/8.pal new file mode 100644 index 000000000..db2216a05 --- /dev/null +++ b/data/tilesets/secondary/cerulean_cave/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +197 205 222 +172 180 197 +156 164 180 +115 123 139 +148 156 164 +255 0 255 +255 0 255 +255 0 255 +205 246 172 +172 213 148 +139 180 131 +115 156 106 +82 123 90 +57 98 74 +65 65 74 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/9.pal b/data/tilesets/secondary/cerulean_cave/palettes/9.pal new file mode 100644 index 000000000..c1a5d4f29 --- /dev/null +++ b/data/tilesets/secondary/cerulean_cave/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 205 222 +197 205 222 +172 180 197 +156 164 180 +115 123 139 +255 246 164 +205 189 106 +156 131 57 +82 74 32 +90 106 115 +255 0 255 +65 65 74 +16 16 24 +98 139 197 +74 115 172 +57 98 156 diff --git a/data/tilesets/secondary/cerulean_cave/tiles.png b/data/tilesets/secondary/cerulean_cave/tiles.png new file mode 100644 index 000000000..d53a0cf17 Binary files /dev/null and b/data/tilesets/secondary/cerulean_cave/tiles.png differ diff --git a/data/tilesets/secondary/cerulean_city/metatile_attributes.bin b/data/tilesets/secondary/cerulean_city/metatile_attributes.bin new file mode 100644 index 000000000..7de4de077 Binary files /dev/null and b/data/tilesets/secondary/cerulean_city/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/cerulean_city/metatiles.bin b/data/tilesets/secondary/cerulean_city/metatiles.bin new file mode 100644 index 000000000..b810e7996 Binary files /dev/null and b/data/tilesets/secondary/cerulean_city/metatiles.bin differ diff --git a/data/tilesets/secondary/cerulean_city/palettes/0.pal b/data/tilesets/secondary/cerulean_city/palettes/0.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/cerulean_city/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/cerulean_city/palettes/1.pal b/data/tilesets/secondary/cerulean_city/palettes/1.pal new file mode 100644 index 000000000..31a636983 --- /dev/null +++ b/data/tilesets/secondary/cerulean_city/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/cerulean_city/palettes/10.pal b/data/tilesets/secondary/cerulean_city/palettes/10.pal new file mode 100644 index 000000000..536972f8f --- /dev/null +++ b/data/tilesets/secondary/cerulean_city/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +255 238 197 +222 205 172 +180 164 123 +123 123 131 +90 90 115 +65 74 106 +123 180 222 +180 222 255 +255 213 164 +230 189 82 +213 164 57 +205 139 32 +172 90 16 +115 205 164 diff --git a/data/tilesets/secondary/cerulean_city/palettes/11.pal b/data/tilesets/secondary/cerulean_city/palettes/11.pal new file mode 100644 index 000000000..986335b74 --- /dev/null +++ b/data/tilesets/secondary/cerulean_city/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +255 238 197 +222 205 172 +180 164 123 +123 123 131 +90 90 115 +65 74 106 +230 222 131 +189 180 82 +180 230 172 +139 213 131 +106 180 106 +90 164 90 +57 131 65 +115 205 164 diff --git a/data/tilesets/secondary/cerulean_city/palettes/12.pal b/data/tilesets/secondary/cerulean_city/palettes/12.pal new file mode 100644 index 000000000..c44bc32b5 --- /dev/null +++ b/data/tilesets/secondary/cerulean_city/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +238 222 180 +205 189 156 +180 164 123 +123 123 131 +90 90 115 +65 74 106 +139 197 98 +106 164 65 +172 222 238 +148 197 213 +115 164 189 +90 139 164 +74 123 148 +115 205 164 diff --git a/data/tilesets/secondary/cerulean_city/palettes/13.pal b/data/tilesets/secondary/cerulean_city/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cerulean_city/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cerulean_city/palettes/14.pal b/data/tilesets/secondary/cerulean_city/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cerulean_city/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cerulean_city/palettes/15.pal b/data/tilesets/secondary/cerulean_city/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cerulean_city/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cerulean_city/palettes/2.pal b/data/tilesets/secondary/cerulean_city/palettes/2.pal new file mode 100644 index 000000000..372fb5d7c --- /dev/null +++ b/data/tilesets/secondary/cerulean_city/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/cerulean_city/palettes/3.pal b/data/tilesets/secondary/cerulean_city/palettes/3.pal new file mode 100644 index 000000000..973765509 --- /dev/null +++ b/data/tilesets/secondary/cerulean_city/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/cerulean_city/palettes/4.pal b/data/tilesets/secondary/cerulean_city/palettes/4.pal new file mode 100644 index 000000000..91fdcabdf --- /dev/null +++ b/data/tilesets/secondary/cerulean_city/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +213 238 255 +172 205 255 +139 180 238 +106 156 230 +74 139 189 +65 123 189 +82 139 205 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +49 115 172 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/cerulean_city/palettes/5.pal b/data/tilesets/secondary/cerulean_city/palettes/5.pal new file mode 100644 index 000000000..0edb843f5 --- /dev/null +++ b/data/tilesets/secondary/cerulean_city/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/cerulean_city/palettes/6.pal b/data/tilesets/secondary/cerulean_city/palettes/6.pal new file mode 100644 index 000000000..f8ebbc6dc --- /dev/null +++ b/data/tilesets/secondary/cerulean_city/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +213 238 255 +172 205 255 +139 180 238 +106 156 230 +65 123 172 +41 98 156 +74 115 197 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +49 115 172 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/cerulean_city/palettes/7.pal b/data/tilesets/secondary/cerulean_city/palettes/7.pal new file mode 100644 index 000000000..93518605a --- /dev/null +++ b/data/tilesets/secondary/cerulean_city/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/cerulean_city/palettes/8.pal b/data/tilesets/secondary/cerulean_city/palettes/8.pal new file mode 100644 index 000000000..ae3dd3f0d --- /dev/null +++ b/data/tilesets/secondary/cerulean_city/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +90 139 164 +115 164 189 +139 189 213 +172 222 238 +139 197 98 +156 222 106 +189 230 139 +222 205 172 +246 230 189 +255 246 213 +164 164 180 +82 82 106 +123 123 139 +205 205 222 +255 255 255 diff --git a/data/tilesets/secondary/cerulean_city/palettes/9.pal b/data/tilesets/secondary/cerulean_city/palettes/9.pal new file mode 100644 index 000000000..3ed18e08f --- /dev/null +++ b/data/tilesets/secondary/cerulean_city/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +180 106 90 +222 180 65 +238 164 156 +246 238 131 +230 205 98 +205 131 123 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +164 164 180 +82 82 106 +123 123 139 +205 205 222 +255 255 255 diff --git a/data/tilesets/secondary/cerulean_city/tiles.png b/data/tilesets/secondary/cerulean_city/tiles.png new file mode 100644 index 000000000..737d3dd7f Binary files /dev/null and b/data/tilesets/secondary/cerulean_city/tiles.png differ diff --git a/data/tilesets/secondary/cerulean_gym/metatile_attributes.bin b/data/tilesets/secondary/cerulean_gym/metatile_attributes.bin new file mode 100644 index 000000000..84b5e2049 Binary files /dev/null and b/data/tilesets/secondary/cerulean_gym/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/cerulean_gym/metatiles.bin b/data/tilesets/secondary/cerulean_gym/metatiles.bin new file mode 100644 index 000000000..c026eb65a Binary files /dev/null and b/data/tilesets/secondary/cerulean_gym/metatiles.bin differ diff --git a/data/tilesets/secondary/cerulean_gym/palettes/0.pal b/data/tilesets/secondary/cerulean_gym/palettes/0.pal new file mode 100644 index 000000000..4b44e19f4 --- /dev/null +++ b/data/tilesets/secondary/cerulean_gym/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 156 156 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/1.pal b/data/tilesets/secondary/cerulean_gym/palettes/1.pal new file mode 100644 index 000000000..a39ca6aa8 --- /dev/null +++ b/data/tilesets/secondary/cerulean_gym/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 156 156 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/10.pal b/data/tilesets/secondary/cerulean_gym/palettes/10.pal new file mode 100644 index 000000000..c06a049b0 --- /dev/null +++ b/data/tilesets/secondary/cerulean_gym/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/11.pal b/data/tilesets/secondary/cerulean_gym/palettes/11.pal new file mode 100644 index 000000000..c06a049b0 --- /dev/null +++ b/data/tilesets/secondary/cerulean_gym/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/12.pal b/data/tilesets/secondary/cerulean_gym/palettes/12.pal new file mode 100644 index 000000000..419c00911 --- /dev/null +++ b/data/tilesets/secondary/cerulean_gym/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +123 164 172 +222 189 172 +246 213 189 +246 230 180 +255 246 213 +164 189 213 +189 205 230 +222 230 246 +98 123 148 +123 148 172 +148 172 197 +98 98 123 +148 139 131 +205 189 197 +255 255 255 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/13.pal b/data/tilesets/secondary/cerulean_gym/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cerulean_gym/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/14.pal b/data/tilesets/secondary/cerulean_gym/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cerulean_gym/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/15.pal b/data/tilesets/secondary/cerulean_gym/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cerulean_gym/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/2.pal b/data/tilesets/secondary/cerulean_gym/palettes/2.pal new file mode 100644 index 000000000..5a4f127be --- /dev/null +++ b/data/tilesets/secondary/cerulean_gym/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 156 156 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/3.pal b/data/tilesets/secondary/cerulean_gym/palettes/3.pal new file mode 100644 index 000000000..c84fa4a58 --- /dev/null +++ b/data/tilesets/secondary/cerulean_gym/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 156 156 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/4.pal b/data/tilesets/secondary/cerulean_gym/palettes/4.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cerulean_gym/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/5.pal b/data/tilesets/secondary/cerulean_gym/palettes/5.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cerulean_gym/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/6.pal b/data/tilesets/secondary/cerulean_gym/palettes/6.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cerulean_gym/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/7.pal b/data/tilesets/secondary/cerulean_gym/palettes/7.pal new file mode 100644 index 000000000..aac016a72 --- /dev/null +++ b/data/tilesets/secondary/cerulean_gym/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +156 205 246 +98 156 238 +0 0 0 +0 0 0 +123 164 172 +148 189 197 +172 205 213 +205 222 230 +98 123 148 +123 148 172 +148 172 197 +98 98 123 +148 139 131 +222 205 213 +255 255 255 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/8.pal b/data/tilesets/secondary/cerulean_gym/palettes/8.pal new file mode 100644 index 000000000..c06a049b0 --- /dev/null +++ b/data/tilesets/secondary/cerulean_gym/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/9.pal b/data/tilesets/secondary/cerulean_gym/palettes/9.pal new file mode 100644 index 000000000..c06a049b0 --- /dev/null +++ b/data/tilesets/secondary/cerulean_gym/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cerulean_gym/tiles.png b/data/tilesets/secondary/cerulean_gym/tiles.png new file mode 100644 index 000000000..44b7c0c34 Binary files /dev/null and b/data/tilesets/secondary/cerulean_gym/tiles.png differ diff --git a/data/tilesets/secondary/cinnabar_gym/metatile_attributes.bin b/data/tilesets/secondary/cinnabar_gym/metatile_attributes.bin new file mode 100644 index 000000000..1d68a40a4 Binary files /dev/null and b/data/tilesets/secondary/cinnabar_gym/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/cinnabar_gym/metatiles.bin b/data/tilesets/secondary/cinnabar_gym/metatiles.bin new file mode 100644 index 000000000..7a5532619 Binary files /dev/null and b/data/tilesets/secondary/cinnabar_gym/metatiles.bin differ diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/0.pal b/data/tilesets/secondary/cinnabar_gym/palettes/0.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_gym/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/1.pal b/data/tilesets/secondary/cinnabar_gym/palettes/1.pal new file mode 100644 index 000000000..69f3f0b9e --- /dev/null +++ b/data/tilesets/secondary/cinnabar_gym/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +180 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +238 246 238 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/10.pal b/data/tilesets/secondary/cinnabar_gym/palettes/10.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_gym/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/11.pal b/data/tilesets/secondary/cinnabar_gym/palettes/11.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_gym/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/12.pal b/data/tilesets/secondary/cinnabar_gym/palettes/12.pal new file mode 100644 index 000000000..3f9aa94d6 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_gym/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +106 90 82 +148 115 82 +172 131 90 +213 172 90 +230 180 90 +164 90 172 +197 115 205 +230 148 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/13.pal b/data/tilesets/secondary/cinnabar_gym/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_gym/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/14.pal b/data/tilesets/secondary/cinnabar_gym/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_gym/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/15.pal b/data/tilesets/secondary/cinnabar_gym/palettes/15.pal new file mode 100644 index 000000000..92e7ed309 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_gym/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +0 0 0 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/2.pal b/data/tilesets/secondary/cinnabar_gym/palettes/2.pal new file mode 100644 index 000000000..330e35b02 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_gym/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +213 131 82 +156 205 246 +98 156 238 +57 123 222 +222 139 106 +189 98 74 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/3.pal b/data/tilesets/secondary/cinnabar_gym/palettes/3.pal new file mode 100644 index 000000000..eac8236f1 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_gym/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +148 148 148 +180 180 180 +255 255 255 +238 246 238 +222 238 222 +197 205 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/4.pal b/data/tilesets/secondary/cinnabar_gym/palettes/4.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_gym/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/5.pal b/data/tilesets/secondary/cinnabar_gym/palettes/5.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_gym/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/6.pal b/data/tilesets/secondary/cinnabar_gym/palettes/6.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_gym/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/7.pal b/data/tilesets/secondary/cinnabar_gym/palettes/7.pal new file mode 100644 index 000000000..5b659ef1b --- /dev/null +++ b/data/tilesets/secondary/cinnabar_gym/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +139 139 148 +180 156 172 +205 189 189 +230 222 189 +90 115 90 +131 197 115 +205 238 115 +123 82 74 +180 98 98 +255 139 74 +238 246 172 +255 230 74 +106 90 82 +255 0 255 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/8.pal b/data/tilesets/secondary/cinnabar_gym/palettes/8.pal new file mode 100644 index 000000000..f5a4ee678 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_gym/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +139 139 148 +205 189 189 +246 246 255 +148 131 180 +205 189 230 +123 98 255 +82 172 148 +255 98 98 +90 115 90 +131 197 115 +205 238 115 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/9.pal b/data/tilesets/secondary/cinnabar_gym/palettes/9.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_gym/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cinnabar_gym/tiles.png b/data/tilesets/secondary/cinnabar_gym/tiles.png new file mode 100644 index 000000000..213799158 Binary files /dev/null and b/data/tilesets/secondary/cinnabar_gym/tiles.png differ diff --git a/data/tilesets/secondary/cinnabar_island/metatile_attributes.bin b/data/tilesets/secondary/cinnabar_island/metatile_attributes.bin new file mode 100644 index 000000000..d2c655c41 Binary files /dev/null and b/data/tilesets/secondary/cinnabar_island/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/cinnabar_island/metatiles.bin b/data/tilesets/secondary/cinnabar_island/metatiles.bin new file mode 100644 index 000000000..0abe4b18d Binary files /dev/null and b/data/tilesets/secondary/cinnabar_island/metatiles.bin differ diff --git a/data/tilesets/secondary/cinnabar_island/palettes/0.pal b/data/tilesets/secondary/cinnabar_island/palettes/0.pal new file mode 100644 index 000000000..9dcb673aa --- /dev/null +++ b/data/tilesets/secondary/cinnabar_island/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +189 255 139 +131 213 98 +57 148 49 +57 82 0 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/1.pal b/data/tilesets/secondary/cinnabar_island/palettes/1.pal new file mode 100644 index 000000000..391d1e3d1 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_island/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 189 164 +189 148 139 +156 115 115 +123 82 82 +90 57 74 +115 205 164 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/10.pal b/data/tilesets/secondary/cinnabar_island/palettes/10.pal new file mode 100644 index 000000000..608bbc2cf --- /dev/null +++ b/data/tilesets/secondary/cinnabar_island/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/11.pal b/data/tilesets/secondary/cinnabar_island/palettes/11.pal new file mode 100644 index 000000000..608bbc2cf --- /dev/null +++ b/data/tilesets/secondary/cinnabar_island/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/12.pal b/data/tilesets/secondary/cinnabar_island/palettes/12.pal new file mode 100644 index 000000000..608bbc2cf --- /dev/null +++ b/data/tilesets/secondary/cinnabar_island/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/13.pal b/data/tilesets/secondary/cinnabar_island/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_island/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/14.pal b/data/tilesets/secondary/cinnabar_island/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_island/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/15.pal b/data/tilesets/secondary/cinnabar_island/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_island/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/2.pal b/data/tilesets/secondary/cinnabar_island/palettes/2.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_island/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/3.pal b/data/tilesets/secondary/cinnabar_island/palettes/3.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_island/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/4.pal b/data/tilesets/secondary/cinnabar_island/palettes/4.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_island/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/5.pal b/data/tilesets/secondary/cinnabar_island/palettes/5.pal new file mode 100644 index 000000000..3a2db72a7 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_island/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +222 205 131 +205 180 106 +180 139 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/6.pal b/data/tilesets/secondary/cinnabar_island/palettes/6.pal new file mode 100644 index 000000000..93518605a --- /dev/null +++ b/data/tilesets/secondary/cinnabar_island/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/7.pal b/data/tilesets/secondary/cinnabar_island/palettes/7.pal new file mode 100644 index 000000000..93518605a --- /dev/null +++ b/data/tilesets/secondary/cinnabar_island/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/8.pal b/data/tilesets/secondary/cinnabar_island/palettes/8.pal new file mode 100644 index 000000000..f734cd166 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_island/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +139 82 57 +164 106 82 +205 148 123 +222 164 139 +172 189 238 +213 222 246 +156 131 90 +189 164 115 +222 205 156 +255 238 189 +164 164 180 +82 82 106 +123 123 139 +205 205 222 +255 255 255 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/9.pal b/data/tilesets/secondary/cinnabar_island/palettes/9.pal new file mode 100644 index 000000000..ca26d1b08 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_island/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 255 246 +230 230 189 +197 197 156 +172 172 131 +123 123 82 +65 74 106 +123 123 131 +123 123 131 +98 164 222 +74 131 197 +139 222 189 +106 189 156 +106 189 156 +74 156 123 +90 90 115 diff --git a/data/tilesets/secondary/cinnabar_island/tiles.png b/data/tilesets/secondary/cinnabar_island/tiles.png new file mode 100644 index 000000000..ddb9ad0cb Binary files /dev/null and b/data/tilesets/secondary/cinnabar_island/tiles.png differ diff --git a/data/tilesets/secondary/condominiums/metatile_attributes.bin b/data/tilesets/secondary/condominiums/metatile_attributes.bin new file mode 100644 index 000000000..aa43d15ee Binary files /dev/null and b/data/tilesets/secondary/condominiums/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/condominiums/metatiles.bin b/data/tilesets/secondary/condominiums/metatiles.bin new file mode 100644 index 000000000..117c036fa Binary files /dev/null and b/data/tilesets/secondary/condominiums/metatiles.bin differ diff --git a/data/tilesets/secondary/condominiums/palettes/0.pal b/data/tilesets/secondary/condominiums/palettes/0.pal new file mode 100644 index 000000000..5867e5ba6 --- /dev/null +++ b/data/tilesets/secondary/condominiums/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +156 213 255 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/condominiums/palettes/1.pal b/data/tilesets/secondary/condominiums/palettes/1.pal new file mode 100644 index 000000000..66561f6d3 --- /dev/null +++ b/data/tilesets/secondary/condominiums/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +139 180 222 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/condominiums/palettes/10.pal b/data/tilesets/secondary/condominiums/palettes/10.pal new file mode 100644 index 000000000..3c091df8b --- /dev/null +++ b/data/tilesets/secondary/condominiums/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +148 148 164 +205 189 197 +255 255 255 +255 213 115 +189 148 49 +139 98 74 +90 106 180 +255 205 139 +230 172 90 +230 148 65 +180 98 24 +238 213 172 +222 156 139 +123 123 123 diff --git a/data/tilesets/secondary/condominiums/palettes/11.pal b/data/tilesets/secondary/condominiums/palettes/11.pal new file mode 100644 index 000000000..79494336b --- /dev/null +++ b/data/tilesets/secondary/condominiums/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +115 115 115 +180 180 164 +238 238 238 +213 222 164 +115 156 148 +230 213 115 +180 172 90 +139 148 90 +98 123 180 +148 156 156 +189 197 197 +246 230 164 +180 189 131 +205 213 213 diff --git a/data/tilesets/secondary/condominiums/palettes/12.pal b/data/tilesets/secondary/condominiums/palettes/12.pal new file mode 100644 index 000000000..b9b1e6061 --- /dev/null +++ b/data/tilesets/secondary/condominiums/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +131 131 82 +164 164 98 +197 197 156 +106 164 172 +197 205 213 +205 156 32 +172 148 197 +205 164 230 +230 197 255 +205 197 106 +230 230 230 diff --git a/data/tilesets/secondary/condominiums/palettes/13.pal b/data/tilesets/secondary/condominiums/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/condominiums/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/condominiums/palettes/14.pal b/data/tilesets/secondary/condominiums/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/condominiums/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/condominiums/palettes/15.pal b/data/tilesets/secondary/condominiums/palettes/15.pal new file mode 100644 index 000000000..093fbdd6c --- /dev/null +++ b/data/tilesets/secondary/condominiums/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +213 222 164 +180 189 131 +139 148 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/condominiums/palettes/2.pal b/data/tilesets/secondary/condominiums/palettes/2.pal new file mode 100644 index 000000000..87a022102 --- /dev/null +++ b/data/tilesets/secondary/condominiums/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +90 90 115 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/condominiums/palettes/3.pal b/data/tilesets/secondary/condominiums/palettes/3.pal new file mode 100644 index 000000000..783496dcd --- /dev/null +++ b/data/tilesets/secondary/condominiums/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +65 98 156 +90 123 180 +115 156 197 +222 213 131 +164 164 172 +205 205 213 +238 238 246 +106 172 115 +156 205 139 diff --git a/data/tilesets/secondary/condominiums/palettes/4.pal b/data/tilesets/secondary/condominiums/palettes/4.pal new file mode 100644 index 000000000..89eace605 --- /dev/null +++ b/data/tilesets/secondary/condominiums/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 238 246 +172 197 180 +197 222 205 +90 189 172 +246 238 156 +205 189 131 +189 164 123 +148 131 106 +106 106 106 +213 222 230 +238 180 115 diff --git a/data/tilesets/secondary/condominiums/palettes/5.pal b/data/tilesets/secondary/condominiums/palettes/5.pal new file mode 100644 index 000000000..c7780e5c7 --- /dev/null +++ b/data/tilesets/secondary/condominiums/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +213 222 222 +164 180 189 +255 0 255 +131 115 74 +213 213 148 +197 189 139 +172 156 115 +148 131 90 +197 197 205 +205 82 65 +0 0 0 diff --git a/data/tilesets/secondary/condominiums/palettes/6.pal b/data/tilesets/secondary/condominiums/palettes/6.pal new file mode 100644 index 000000000..1d08ce9a2 --- /dev/null +++ b/data/tilesets/secondary/condominiums/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/condominiums/palettes/7.pal b/data/tilesets/secondary/condominiums/palettes/7.pal new file mode 100644 index 000000000..35987db53 --- /dev/null +++ b/data/tilesets/secondary/condominiums/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +139 139 148 +180 180 164 +255 255 255 +205 197 106 +246 238 148 +255 255 222 +98 98 123 +238 238 238 +82 222 123 +131 255 164 +82 164 57 +230 139 98 +189 98 74 +213 213 213 diff --git a/data/tilesets/secondary/condominiums/palettes/8.pal b/data/tilesets/secondary/condominiums/palettes/8.pal new file mode 100644 index 000000000..7f33e006f --- /dev/null +++ b/data/tilesets/secondary/condominiums/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +148 148 164 +180 180 164 +255 255 255 +213 213 213 +106 156 164 +131 189 197 +172 222 230 +238 180 222 +180 115 164 +213 213 180 +255 0 255 +156 205 246 +98 156 238 diff --git a/data/tilesets/secondary/condominiums/palettes/9.pal b/data/tilesets/secondary/condominiums/palettes/9.pal new file mode 100644 index 000000000..75022050d --- /dev/null +++ b/data/tilesets/secondary/condominiums/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +148 148 164 +180 180 164 +255 255 255 +213 213 213 +148 205 180 +115 172 148 +106 148 139 +197 238 255 +172 213 255 +123 164 222 +98 139 189 +123 164 189 +148 189 238 diff --git a/data/tilesets/secondary/condominiums/tiles.png b/data/tilesets/secondary/condominiums/tiles.png new file mode 100644 index 000000000..324b42c9f Binary files /dev/null and b/data/tilesets/secondary/condominiums/tiles.png differ diff --git a/data/tilesets/secondary/department_store/metatile_attributes.bin b/data/tilesets/secondary/department_store/metatile_attributes.bin new file mode 100644 index 000000000..5eca0b5c7 Binary files /dev/null and b/data/tilesets/secondary/department_store/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/department_store/metatiles.bin b/data/tilesets/secondary/department_store/metatiles.bin new file mode 100644 index 000000000..053045190 Binary files /dev/null and b/data/tilesets/secondary/department_store/metatiles.bin differ diff --git a/data/tilesets/secondary/department_store/palettes/0.pal b/data/tilesets/secondary/department_store/palettes/0.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/department_store/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/department_store/palettes/1.pal b/data/tilesets/secondary/department_store/palettes/1.pal new file mode 100644 index 000000000..30be2fbe3 --- /dev/null +++ b/data/tilesets/secondary/department_store/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/department_store/palettes/10.pal b/data/tilesets/secondary/department_store/palettes/10.pal new file mode 100644 index 000000000..c6e769ccc --- /dev/null +++ b/data/tilesets/secondary/department_store/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 222 156 +82 82 106 +131 131 131 +57 106 82 +41 156 98 +90 205 115 +197 172 90 +156 131 82 +213 205 106 +230 197 238 +180 189 164 +213 222 189 +156 172 172 +205 180 213 +189 197 213 +230 246 238 diff --git a/data/tilesets/secondary/department_store/palettes/11.pal b/data/tilesets/secondary/department_store/palettes/11.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/department_store/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/department_store/palettes/12.pal b/data/tilesets/secondary/department_store/palettes/12.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/department_store/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/department_store/palettes/13.pal b/data/tilesets/secondary/department_store/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/department_store/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/department_store/palettes/14.pal b/data/tilesets/secondary/department_store/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/department_store/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/department_store/palettes/15.pal b/data/tilesets/secondary/department_store/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/department_store/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/department_store/palettes/2.pal b/data/tilesets/secondary/department_store/palettes/2.pal new file mode 100644 index 000000000..cc3a9457d --- /dev/null +++ b/data/tilesets/secondary/department_store/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/department_store/palettes/3.pal b/data/tilesets/secondary/department_store/palettes/3.pal new file mode 100644 index 000000000..7ec794ae5 --- /dev/null +++ b/data/tilesets/secondary/department_store/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/department_store/palettes/4.pal b/data/tilesets/secondary/department_store/palettes/4.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/department_store/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/department_store/palettes/5.pal b/data/tilesets/secondary/department_store/palettes/5.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/department_store/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/department_store/palettes/6.pal b/data/tilesets/secondary/department_store/palettes/6.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/department_store/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/department_store/palettes/7.pal b/data/tilesets/secondary/department_store/palettes/7.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/department_store/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/department_store/palettes/8.pal b/data/tilesets/secondary/department_store/palettes/8.pal new file mode 100644 index 000000000..18480092b --- /dev/null +++ b/data/tilesets/secondary/department_store/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 222 156 +82 82 106 +115 123 131 +98 90 65 +139 123 82 +197 172 90 +230 230 238 +205 115 74 +238 172 82 +238 213 82 +131 189 57 +164 222 82 +156 139 172 +205 172 222 +213 205 230 +246 255 255 diff --git a/data/tilesets/secondary/department_store/palettes/9.pal b/data/tilesets/secondary/department_store/palettes/9.pal new file mode 100644 index 000000000..dd18b9d07 --- /dev/null +++ b/data/tilesets/secondary/department_store/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 222 156 +82 82 106 +131 131 131 +172 123 82 +205 131 65 +213 148 65 +205 148 82 +238 164 82 +238 180 82 +148 106 74 +189 197 213 +222 230 230 +156 172 172 +90 131 238 +106 164 255 +156 189 255 diff --git a/data/tilesets/secondary/department_store/tiles.png b/data/tilesets/secondary/department_store/tiles.png new file mode 100644 index 000000000..421932118 Binary files /dev/null and b/data/tilesets/secondary/department_store/tiles.png differ diff --git a/data/tilesets/secondary/digletts_cave/metatile_attributes.bin b/data/tilesets/secondary/digletts_cave/metatile_attributes.bin new file mode 100644 index 000000000..2b24a5266 Binary files /dev/null and b/data/tilesets/secondary/digletts_cave/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/digletts_cave/metatiles.bin b/data/tilesets/secondary/digletts_cave/metatiles.bin new file mode 100644 index 000000000..37ef8fe34 Binary files /dev/null and b/data/tilesets/secondary/digletts_cave/metatiles.bin differ diff --git a/data/tilesets/secondary/digletts_cave/palettes/0.pal b/data/tilesets/secondary/digletts_cave/palettes/0.pal new file mode 100644 index 000000000..a3fab1c2f --- /dev/null +++ b/data/tilesets/secondary/digletts_cave/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/digletts_cave/palettes/1.pal b/data/tilesets/secondary/digletts_cave/palettes/1.pal new file mode 100644 index 000000000..d8a4e7757 --- /dev/null +++ b/data/tilesets/secondary/digletts_cave/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/digletts_cave/palettes/10.pal b/data/tilesets/secondary/digletts_cave/palettes/10.pal new file mode 100644 index 000000000..5ccabc5a0 --- /dev/null +++ b/data/tilesets/secondary/digletts_cave/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +255 0 255 +255 0 255 +255 0 255 +0 0 0 +255 238 180 +222 205 148 +197 172 123 +172 139 90 +222 222 156 +189 189 123 +148 148 106 +115 106 90 +82 74 65 +57 49 41 +65 65 74 diff --git a/data/tilesets/secondary/digletts_cave/palettes/11.pal b/data/tilesets/secondary/digletts_cave/palettes/11.pal new file mode 100644 index 000000000..fa0038726 --- /dev/null +++ b/data/tilesets/secondary/digletts_cave/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +197 172 123 +172 139 90 +148 106 65 +123 74 41 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +230 222 164 +213 197 131 +197 172 106 +172 148 74 diff --git a/data/tilesets/secondary/digletts_cave/palettes/12.pal b/data/tilesets/secondary/digletts_cave/palettes/12.pal new file mode 100644 index 000000000..c19d59bd0 --- /dev/null +++ b/data/tilesets/secondary/digletts_cave/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +180 180 98 +164 164 74 +139 139 49 +123 115 41 +255 238 180 +222 205 148 +197 172 123 +172 139 90 +222 222 156 +189 189 123 +148 148 82 +115 106 49 +90 82 41 +57 49 41 +65 65 74 diff --git a/data/tilesets/secondary/digletts_cave/palettes/13.pal b/data/tilesets/secondary/digletts_cave/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/digletts_cave/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/digletts_cave/palettes/14.pal b/data/tilesets/secondary/digletts_cave/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/digletts_cave/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/digletts_cave/palettes/15.pal b/data/tilesets/secondary/digletts_cave/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/digletts_cave/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/digletts_cave/palettes/2.pal b/data/tilesets/secondary/digletts_cave/palettes/2.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/digletts_cave/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/digletts_cave/palettes/3.pal b/data/tilesets/secondary/digletts_cave/palettes/3.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/secondary/digletts_cave/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/digletts_cave/palettes/4.pal b/data/tilesets/secondary/digletts_cave/palettes/4.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/digletts_cave/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/digletts_cave/palettes/5.pal b/data/tilesets/secondary/digletts_cave/palettes/5.pal new file mode 100644 index 000000000..c5a653979 --- /dev/null +++ b/data/tilesets/secondary/digletts_cave/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/digletts_cave/palettes/6.pal b/data/tilesets/secondary/digletts_cave/palettes/6.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/digletts_cave/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/digletts_cave/palettes/7.pal b/data/tilesets/secondary/digletts_cave/palettes/7.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/digletts_cave/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/digletts_cave/palettes/8.pal b/data/tilesets/secondary/digletts_cave/palettes/8.pal new file mode 100644 index 000000000..74cbc54c6 --- /dev/null +++ b/data/tilesets/secondary/digletts_cave/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +197 172 123 +172 139 90 +148 106 65 +123 74 41 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +222 222 156 +189 189 123 +148 148 106 +115 106 90 +82 74 65 +57 49 41 +65 65 74 diff --git a/data/tilesets/secondary/digletts_cave/palettes/9.pal b/data/tilesets/secondary/digletts_cave/palettes/9.pal new file mode 100644 index 000000000..def7acffc --- /dev/null +++ b/data/tilesets/secondary/digletts_cave/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +197 172 123 +172 139 90 +148 106 65 +123 74 41 +164 180 230 +139 156 222 +98 106 139 +65 65 57 +255 0 255 +255 0 255 +65 65 74 +0 0 0 +98 139 197 +74 115 172 +57 98 156 diff --git a/data/tilesets/secondary/digletts_cave/tiles.png b/data/tilesets/secondary/digletts_cave/tiles.png new file mode 100644 index 000000000..77b767b79 Binary files /dev/null and b/data/tilesets/secondary/digletts_cave/tiles.png differ diff --git a/data/tilesets/secondary/dummy1/metatile_attributes.bin b/data/tilesets/secondary/dummy1/metatile_attributes.bin new file mode 100644 index 000000000..1b1cb4d44 Binary files /dev/null and b/data/tilesets/secondary/dummy1/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/dummy1/metatiles.bin b/data/tilesets/secondary/dummy1/metatiles.bin new file mode 100644 index 000000000..274da22a6 Binary files /dev/null and b/data/tilesets/secondary/dummy1/metatiles.bin differ diff --git a/data/tilesets/secondary/dummy1/palettes/0.pal b/data/tilesets/secondary/dummy1/palettes/0.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy1/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/1.pal b/data/tilesets/secondary/dummy1/palettes/1.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy1/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/10.pal b/data/tilesets/secondary/dummy1/palettes/10.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy1/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/11.pal b/data/tilesets/secondary/dummy1/palettes/11.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy1/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/12.pal b/data/tilesets/secondary/dummy1/palettes/12.pal new file mode 100644 index 000000000..97d3f20bd --- /dev/null +++ b/data/tilesets/secondary/dummy1/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +65 74 106 +156 156 139 +164 148 65 +213 164 106 +230 213 131 +246 238 205 +0 0 0 +197 189 123 +222 213 139 +246 238 180 +238 205 172 +205 205 213 +255 148 131 +255 255 115 +156 197 230 diff --git a/data/tilesets/secondary/dummy1/palettes/13.pal b/data/tilesets/secondary/dummy1/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy1/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/14.pal b/data/tilesets/secondary/dummy1/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy1/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/15.pal b/data/tilesets/secondary/dummy1/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy1/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/2.pal b/data/tilesets/secondary/dummy1/palettes/2.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy1/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/3.pal b/data/tilesets/secondary/dummy1/palettes/3.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy1/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/4.pal b/data/tilesets/secondary/dummy1/palettes/4.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy1/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/5.pal b/data/tilesets/secondary/dummy1/palettes/5.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy1/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/6.pal b/data/tilesets/secondary/dummy1/palettes/6.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy1/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/7.pal b/data/tilesets/secondary/dummy1/palettes/7.pal new file mode 100644 index 000000000..4172436d0 --- /dev/null +++ b/data/tilesets/secondary/dummy1/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +65 74 106 +246 246 255 +205 197 213 +156 156 164 +222 230 255 +172 205 213 +156 189 172 +189 230 148 +139 205 123 +106 131 98 +238 131 106 +205 106 106 +255 246 41 +255 205 148 +189 197 115 diff --git a/data/tilesets/secondary/dummy1/palettes/8.pal b/data/tilesets/secondary/dummy1/palettes/8.pal new file mode 100644 index 000000000..7fd087b3b --- /dev/null +++ b/data/tilesets/secondary/dummy1/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +65 74 106 +172 172 189 +222 213 205 +238 238 238 +123 139 74 +148 205 98 +205 246 123 +255 238 230 +222 222 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/9.pal b/data/tilesets/secondary/dummy1/palettes/9.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy1/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy1/tiles.png b/data/tilesets/secondary/dummy1/tiles.png new file mode 100644 index 000000000..d4b21f3e4 Binary files /dev/null and b/data/tilesets/secondary/dummy1/tiles.png differ diff --git a/data/tilesets/secondary/dummy2/metatile_attributes.bin b/data/tilesets/secondary/dummy2/metatile_attributes.bin new file mode 100644 index 000000000..1b1cb4d44 Binary files /dev/null and b/data/tilesets/secondary/dummy2/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/dummy2/metatiles.bin b/data/tilesets/secondary/dummy2/metatiles.bin new file mode 100644 index 000000000..c15edf653 Binary files /dev/null and b/data/tilesets/secondary/dummy2/metatiles.bin differ diff --git a/data/tilesets/secondary/dummy2/palettes/0.pal b/data/tilesets/secondary/dummy2/palettes/0.pal new file mode 100644 index 000000000..0fd74602e --- /dev/null +++ b/data/tilesets/secondary/dummy2/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 41 82 +255 255 255 +222 230 238 +189 205 230 +156 180 222 +131 131 139 +98 98 123 +65 74 106 +189 189 131 +115 189 246 +98 172 238 +115 189 246 +98 164 222 +82 139 197 +74 115 172 +115 197 164 diff --git a/data/tilesets/secondary/dummy2/palettes/1.pal b/data/tilesets/secondary/dummy2/palettes/1.pal new file mode 100644 index 000000000..3c6e40c2e --- /dev/null +++ b/data/tilesets/secondary/dummy2/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 41 82 +255 255 255 +222 230 238 +189 205 230 +156 180 222 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +115 189 246 +98 172 238 +255 189 131 +238 148 115 +222 106 98 +205 65 82 +115 197 164 diff --git a/data/tilesets/secondary/dummy2/palettes/10.pal b/data/tilesets/secondary/dummy2/palettes/10.pal new file mode 100644 index 000000000..cd86ca4ae --- /dev/null +++ b/data/tilesets/secondary/dummy2/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +82 82 106 +148 148 164 +205 189 197 +255 255 255 +222 213 230 +189 172 180 +255 205 106 +230 189 106 +205 156 82 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +57 139 49 +106 106 123 diff --git a/data/tilesets/secondary/dummy2/palettes/11.pal b/data/tilesets/secondary/dummy2/palettes/11.pal new file mode 100644 index 000000000..ec8e2f42d --- /dev/null +++ b/data/tilesets/secondary/dummy2/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +74 74 98 +106 106 115 +0 0 0 +0 0 0 +148 106 57 +189 139 57 +213 189 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy2/palettes/12.pal b/data/tilesets/secondary/dummy2/palettes/12.pal new file mode 100644 index 000000000..5caa038ad --- /dev/null +++ b/data/tilesets/secondary/dummy2/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 255 255 +213 222 246 +164 172 222 +98 98 123 +65 74 106 +238 213 205 +222 172 164 +205 131 123 +189 98 82 +222 222 222 +172 180 189 +139 148 164 +106 123 123 +222 74 0 +213 213 57 diff --git a/data/tilesets/secondary/dummy2/palettes/13.pal b/data/tilesets/secondary/dummy2/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy2/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy2/palettes/14.pal b/data/tilesets/secondary/dummy2/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy2/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy2/palettes/15.pal b/data/tilesets/secondary/dummy2/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy2/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy2/palettes/2.pal b/data/tilesets/secondary/dummy2/palettes/2.pal new file mode 100644 index 000000000..4c41030f6 --- /dev/null +++ b/data/tilesets/secondary/dummy2/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 41 82 +180 255 131 +131 197 98 +57 139 49 +57 82 0 +222 148 115 +106 90 90 +164 98 90 +65 57 49 +255 197 148 +222 106 98 +205 65 82 +164 213 197 +115 197 164 +65 180 131 +24 164 106 diff --git a/data/tilesets/secondary/dummy2/palettes/3.pal b/data/tilesets/secondary/dummy2/palettes/3.pal new file mode 100644 index 000000000..5665ddc22 --- /dev/null +++ b/data/tilesets/secondary/dummy2/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 41 82 +255 255 255 +213 213 213 +189 189 189 +164 164 164 +131 131 139 +65 180 131 +164 213 197 +65 49 65 +238 213 205 +222 180 164 +189 148 139 +156 115 115 +131 90 90 +98 65 82 +115 197 164 diff --git a/data/tilesets/secondary/dummy2/palettes/4.pal b/data/tilesets/secondary/dummy2/palettes/4.pal new file mode 100644 index 000000000..d8051b7ba --- /dev/null +++ b/data/tilesets/secondary/dummy2/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 41 82 +255 255 255 +222 230 238 +255 0 255 +255 0 255 +255 0 255 +156 164 189 +82 106 213 +65 90 189 +57 82 156 +41 65 139 +172 197 230 +139 164 222 +106 131 213 +82 106 213 +115 197 164 diff --git a/data/tilesets/secondary/dummy2/palettes/5.pal b/data/tilesets/secondary/dummy2/palettes/5.pal new file mode 100644 index 000000000..4e684594c --- /dev/null +++ b/data/tilesets/secondary/dummy2/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 41 82 +255 255 255 +222 230 238 +189 205 230 +156 180 222 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +131 197 246 +106 180 222 +238 230 164 +222 205 131 +213 180 106 +205 156 82 +115 197 164 diff --git a/data/tilesets/secondary/dummy2/palettes/6.pal b/data/tilesets/secondary/dummy2/palettes/6.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy2/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy2/palettes/7.pal b/data/tilesets/secondary/dummy2/palettes/7.pal new file mode 100644 index 000000000..2064b3bd2 --- /dev/null +++ b/data/tilesets/secondary/dummy2/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 255 255 +238 222 172 +230 156 98 +197 90 65 +65 74 106 +106 106 123 +131 90 49 +90 65 49 +57 57 57 +222 222 197 +172 180 148 +131 148 115 +106 123 65 +156 205 230 +156 156 156 diff --git a/data/tilesets/secondary/dummy2/palettes/8.pal b/data/tilesets/secondary/dummy2/palettes/8.pal new file mode 100644 index 000000000..42a3483c0 --- /dev/null +++ b/data/tilesets/secondary/dummy2/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 255 255 +213 222 246 +131 131 139 +98 98 123 +65 74 106 +164 205 189 +139 180 172 +115 156 139 +98 139 131 +189 172 180 +156 139 148 +230 106 57 +205 49 24 +148 57 24 +0 0 0 diff --git a/data/tilesets/secondary/dummy2/palettes/9.pal b/data/tilesets/secondary/dummy2/palettes/9.pal new file mode 100644 index 000000000..b06dfbda7 --- /dev/null +++ b/data/tilesets/secondary/dummy2/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 255 255 +213 222 246 +164 172 222 +98 98 123 +65 74 106 +98 98 123 +65 74 106 +115 123 164 +49 49 74 +189 238 180 +106 222 115 +74 180 98 +57 131 82 +131 197 230 +98 156 172 diff --git a/data/tilesets/secondary/dummy2/tiles.png b/data/tilesets/secondary/dummy2/tiles.png new file mode 100644 index 000000000..c00ba0d61 Binary files /dev/null and b/data/tilesets/secondary/dummy2/tiles.png differ diff --git a/data/tilesets/secondary/dummy3/metatile_attributes.bin b/data/tilesets/secondary/dummy3/metatile_attributes.bin new file mode 100644 index 000000000..1b1cb4d44 Binary files /dev/null and b/data/tilesets/secondary/dummy3/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/dummy3/metatiles.bin b/data/tilesets/secondary/dummy3/metatiles.bin new file mode 100644 index 000000000..274da22a6 Binary files /dev/null and b/data/tilesets/secondary/dummy3/metatiles.bin differ diff --git a/data/tilesets/secondary/dummy3/palettes/0.pal b/data/tilesets/secondary/dummy3/palettes/0.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/dummy3/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/dummy3/palettes/1.pal b/data/tilesets/secondary/dummy3/palettes/1.pal new file mode 100644 index 000000000..d8a4e7757 --- /dev/null +++ b/data/tilesets/secondary/dummy3/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/dummy3/palettes/10.pal b/data/tilesets/secondary/dummy3/palettes/10.pal new file mode 100644 index 000000000..937405d15 --- /dev/null +++ b/data/tilesets/secondary/dummy3/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +255 0 255 +255 0 255 +255 0 255 +0 0 0 +255 238 164 +230 197 139 +205 172 123 +172 139 106 +213 197 189 +205 180 156 +189 148 139 +148 115 106 +115 65 74 +82 49 65 +90 90 98 diff --git a/data/tilesets/secondary/dummy3/palettes/11.pal b/data/tilesets/secondary/dummy3/palettes/11.pal new file mode 100644 index 000000000..bb4f4867c --- /dev/null +++ b/data/tilesets/secondary/dummy3/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +189 189 156 +172 172 139 +148 139 115 +123 115 90 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +238 222 148 +222 205 115 +205 180 98 +189 172 98 diff --git a/data/tilesets/secondary/dummy3/palettes/12.pal b/data/tilesets/secondary/dummy3/palettes/12.pal new file mode 100644 index 000000000..583384664 --- /dev/null +++ b/data/tilesets/secondary/dummy3/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +0 0 0 diff --git a/data/tilesets/secondary/dummy3/palettes/13.pal b/data/tilesets/secondary/dummy3/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy3/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy3/palettes/14.pal b/data/tilesets/secondary/dummy3/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy3/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy3/palettes/15.pal b/data/tilesets/secondary/dummy3/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy3/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy3/palettes/2.pal b/data/tilesets/secondary/dummy3/palettes/2.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/dummy3/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/dummy3/palettes/3.pal b/data/tilesets/secondary/dummy3/palettes/3.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/secondary/dummy3/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/dummy3/palettes/4.pal b/data/tilesets/secondary/dummy3/palettes/4.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/dummy3/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/dummy3/palettes/5.pal b/data/tilesets/secondary/dummy3/palettes/5.pal new file mode 100644 index 000000000..c5a653979 --- /dev/null +++ b/data/tilesets/secondary/dummy3/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/dummy3/palettes/6.pal b/data/tilesets/secondary/dummy3/palettes/6.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/dummy3/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy3/palettes/7.pal b/data/tilesets/secondary/dummy3/palettes/7.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/dummy3/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy3/palettes/8.pal b/data/tilesets/secondary/dummy3/palettes/8.pal new file mode 100644 index 000000000..6774e407f --- /dev/null +++ b/data/tilesets/secondary/dummy3/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +189 189 156 +172 172 139 +148 139 115 +123 115 90 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +222 197 189 +205 180 156 +189 148 139 +148 115 106 +115 65 74 +82 49 65 +90 90 98 diff --git a/data/tilesets/secondary/dummy3/palettes/9.pal b/data/tilesets/secondary/dummy3/palettes/9.pal new file mode 100644 index 000000000..3795f6c6a --- /dev/null +++ b/data/tilesets/secondary/dummy3/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 222 213 +189 189 156 +172 172 139 +148 139 115 +123 115 90 +255 238 164 +230 197 139 +205 172 123 +164 123 90 +148 115 74 +106 65 41 +74 74 57 +0 0 0 +98 139 197 +74 115 172 +57 98 156 diff --git a/data/tilesets/secondary/dummy3/tiles.png b/data/tilesets/secondary/dummy3/tiles.png new file mode 100644 index 000000000..b2d960c60 Binary files /dev/null and b/data/tilesets/secondary/dummy3/tiles.png differ diff --git a/data/tilesets/secondary/dummy4/metatile_attributes.bin b/data/tilesets/secondary/dummy4/metatile_attributes.bin new file mode 100644 index 000000000..1b1cb4d44 Binary files /dev/null and b/data/tilesets/secondary/dummy4/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/dummy4/metatiles.bin b/data/tilesets/secondary/dummy4/metatiles.bin new file mode 100644 index 000000000..8f740f6af Binary files /dev/null and b/data/tilesets/secondary/dummy4/metatiles.bin differ diff --git a/data/tilesets/secondary/dummy4/palettes/0.pal b/data/tilesets/secondary/dummy4/palettes/0.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/dummy4/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/dummy4/palettes/1.pal b/data/tilesets/secondary/dummy4/palettes/1.pal new file mode 100644 index 000000000..d8a4e7757 --- /dev/null +++ b/data/tilesets/secondary/dummy4/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/dummy4/palettes/10.pal b/data/tilesets/secondary/dummy4/palettes/10.pal new file mode 100644 index 000000000..937405d15 --- /dev/null +++ b/data/tilesets/secondary/dummy4/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +255 0 255 +255 0 255 +255 0 255 +0 0 0 +255 238 164 +230 197 139 +205 172 123 +172 139 106 +213 197 189 +205 180 156 +189 148 139 +148 115 106 +115 65 74 +82 49 65 +90 90 98 diff --git a/data/tilesets/secondary/dummy4/palettes/11.pal b/data/tilesets/secondary/dummy4/palettes/11.pal new file mode 100644 index 000000000..bb4f4867c --- /dev/null +++ b/data/tilesets/secondary/dummy4/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +189 189 156 +172 172 139 +148 139 115 +123 115 90 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +238 222 148 +222 205 115 +205 180 98 +189 172 98 diff --git a/data/tilesets/secondary/dummy4/palettes/12.pal b/data/tilesets/secondary/dummy4/palettes/12.pal new file mode 100644 index 000000000..583384664 --- /dev/null +++ b/data/tilesets/secondary/dummy4/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +0 0 0 diff --git a/data/tilesets/secondary/dummy4/palettes/13.pal b/data/tilesets/secondary/dummy4/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy4/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy4/palettes/14.pal b/data/tilesets/secondary/dummy4/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy4/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy4/palettes/15.pal b/data/tilesets/secondary/dummy4/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy4/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy4/palettes/2.pal b/data/tilesets/secondary/dummy4/palettes/2.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/dummy4/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/dummy4/palettes/3.pal b/data/tilesets/secondary/dummy4/palettes/3.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/secondary/dummy4/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/dummy4/palettes/4.pal b/data/tilesets/secondary/dummy4/palettes/4.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/dummy4/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/dummy4/palettes/5.pal b/data/tilesets/secondary/dummy4/palettes/5.pal new file mode 100644 index 000000000..c5a653979 --- /dev/null +++ b/data/tilesets/secondary/dummy4/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/dummy4/palettes/6.pal b/data/tilesets/secondary/dummy4/palettes/6.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/dummy4/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy4/palettes/7.pal b/data/tilesets/secondary/dummy4/palettes/7.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/dummy4/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy4/palettes/8.pal b/data/tilesets/secondary/dummy4/palettes/8.pal new file mode 100644 index 000000000..6774e407f --- /dev/null +++ b/data/tilesets/secondary/dummy4/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +189 189 156 +172 172 139 +148 139 115 +123 115 90 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +222 197 189 +205 180 156 +189 148 139 +148 115 106 +115 65 74 +82 49 65 +90 90 98 diff --git a/data/tilesets/secondary/dummy4/palettes/9.pal b/data/tilesets/secondary/dummy4/palettes/9.pal new file mode 100644 index 000000000..3795f6c6a --- /dev/null +++ b/data/tilesets/secondary/dummy4/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 222 213 +189 189 156 +172 172 139 +148 139 115 +123 115 90 +255 238 164 +230 197 139 +205 172 123 +164 123 90 +148 115 74 +106 65 41 +74 74 57 +0 0 0 +98 139 197 +74 115 172 +57 98 156 diff --git a/data/tilesets/secondary/dummy4/tiles.png b/data/tilesets/secondary/dummy4/tiles.png new file mode 100644 index 000000000..201df80fb Binary files /dev/null and b/data/tilesets/secondary/dummy4/tiles.png differ diff --git a/data/tilesets/secondary/fan_club_daycare/metatile_attributes.bin b/data/tilesets/secondary/fan_club_daycare/metatile_attributes.bin new file mode 100644 index 000000000..8255cca20 Binary files /dev/null and b/data/tilesets/secondary/fan_club_daycare/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/fan_club_daycare/metatiles.bin b/data/tilesets/secondary/fan_club_daycare/metatiles.bin new file mode 100644 index 000000000..63ddd975b Binary files /dev/null and b/data/tilesets/secondary/fan_club_daycare/metatiles.bin differ diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/0.pal b/data/tilesets/secondary/fan_club_daycare/palettes/0.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fan_club_daycare/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/1.pal b/data/tilesets/secondary/fan_club_daycare/palettes/1.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fan_club_daycare/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/10.pal b/data/tilesets/secondary/fan_club_daycare/palettes/10.pal new file mode 100644 index 000000000..afe462f8e --- /dev/null +++ b/data/tilesets/secondary/fan_club_daycare/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 197 +82 82 106 +131 131 131 +123 189 222 +123 156 189 +164 222 246 +189 238 238 +74 139 98 +106 172 106 +123 205 123 +90 148 115 +139 197 131 +197 238 123 +197 172 74 +255 0 255 +230 230 106 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/11.pal b/data/tilesets/secondary/fan_club_daycare/palettes/11.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fan_club_daycare/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/12.pal b/data/tilesets/secondary/fan_club_daycare/palettes/12.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fan_club_daycare/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/13.pal b/data/tilesets/secondary/fan_club_daycare/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fan_club_daycare/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/14.pal b/data/tilesets/secondary/fan_club_daycare/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fan_club_daycare/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/15.pal b/data/tilesets/secondary/fan_club_daycare/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fan_club_daycare/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/2.pal b/data/tilesets/secondary/fan_club_daycare/palettes/2.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fan_club_daycare/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/3.pal b/data/tilesets/secondary/fan_club_daycare/palettes/3.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fan_club_daycare/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/4.pal b/data/tilesets/secondary/fan_club_daycare/palettes/4.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fan_club_daycare/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/5.pal b/data/tilesets/secondary/fan_club_daycare/palettes/5.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fan_club_daycare/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/6.pal b/data/tilesets/secondary/fan_club_daycare/palettes/6.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fan_club_daycare/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/7.pal b/data/tilesets/secondary/fan_club_daycare/palettes/7.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fan_club_daycare/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/8.pal b/data/tilesets/secondary/fan_club_daycare/palettes/8.pal new file mode 100644 index 000000000..4b7de8012 --- /dev/null +++ b/data/tilesets/secondary/fan_club_daycare/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 197 +82 82 106 +131 131 131 +131 115 90 +189 131 90 +205 156 90 +238 180 90 +172 172 131 +222 222 172 +172 180 205 +238 230 172 +255 255 246 +255 255 246 +197 205 222 +205 213 230 +230 230 246 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/9.pal b/data/tilesets/secondary/fan_club_daycare/palettes/9.pal new file mode 100644 index 000000000..8fe0861de --- /dev/null +++ b/data/tilesets/secondary/fan_club_daycare/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 197 +82 82 106 +131 131 131 +246 246 189 +180 180 139 +205 156 90 +230 230 131 +222 213 131 +205 205 115 +197 180 115 +255 0 255 +123 123 98 +156 156 98 +205 148 197 +90 164 205 +90 189 246 diff --git a/data/tilesets/secondary/fan_club_daycare/tiles.png b/data/tilesets/secondary/fan_club_daycare/tiles.png new file mode 100644 index 000000000..b8a2a1a4f Binary files /dev/null and b/data/tilesets/secondary/fan_club_daycare/tiles.png differ diff --git a/data/tilesets/secondary/fuchsia_city/metatile_attributes.bin b/data/tilesets/secondary/fuchsia_city/metatile_attributes.bin new file mode 100644 index 000000000..3e370a747 Binary files /dev/null and b/data/tilesets/secondary/fuchsia_city/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/fuchsia_city/metatiles.bin b/data/tilesets/secondary/fuchsia_city/metatiles.bin new file mode 100644 index 000000000..0e0e722da Binary files /dev/null and b/data/tilesets/secondary/fuchsia_city/metatiles.bin differ diff --git a/data/tilesets/secondary/fuchsia_city/palettes/0.pal b/data/tilesets/secondary/fuchsia_city/palettes/0.pal new file mode 100644 index 000000000..5fb8bdb01 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_city/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +189 255 139 +131 213 98 +57 139 49 +57 82 0 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/1.pal b/data/tilesets/secondary/fuchsia_city/palettes/1.pal new file mode 100644 index 000000000..391d1e3d1 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_city/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 189 164 +189 148 139 +156 115 115 +123 82 82 +90 57 74 +115 205 164 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/10.pal b/data/tilesets/secondary/fuchsia_city/palettes/10.pal new file mode 100644 index 000000000..d82bb0391 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_city/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +65 74 106 +123 123 131 +180 164 90 +0 0 255 +255 238 197 +238 238 205 +189 180 172 +172 172 156 +205 205 172 +139 123 49 +164 148 74 +205 197 123 +230 213 139 +106 172 123 +123 197 139 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/11.pal b/data/tilesets/secondary/fuchsia_city/palettes/11.pal new file mode 100644 index 000000000..cc0cf52cf --- /dev/null +++ b/data/tilesets/secondary/fuchsia_city/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 197 197 +180 238 82 +139 213 82 +90 164 49 +57 90 90 +74 123 74 +90 98 49 +139 131 49 +65 57 49 +57 139 98 +123 197 49 +123 197 82 +57 139 49 +115 205 164 +57 172 156 +255 0 255 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/12.pal b/data/tilesets/secondary/fuchsia_city/palettes/12.pal new file mode 100644 index 000000000..ebcfeb596 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_city/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 131 +205 180 106 +238 180 139 +222 148 131 +189 123 115 +139 90 82 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/13.pal b/data/tilesets/secondary/fuchsia_city/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_city/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/14.pal b/data/tilesets/secondary/fuchsia_city/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_city/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/15.pal b/data/tilesets/secondary/fuchsia_city/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_city/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/2.pal b/data/tilesets/secondary/fuchsia_city/palettes/2.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_city/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/3.pal b/data/tilesets/secondary/fuchsia_city/palettes/3.pal new file mode 100644 index 000000000..9581f2cd8 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_city/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 131 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/4.pal b/data/tilesets/secondary/fuchsia_city/palettes/4.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_city/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/5.pal b/data/tilesets/secondary/fuchsia_city/palettes/5.pal new file mode 100644 index 000000000..3a2db72a7 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_city/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +222 205 131 +205 180 106 +180 139 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/6.pal b/data/tilesets/secondary/fuchsia_city/palettes/6.pal new file mode 100644 index 000000000..93518605a --- /dev/null +++ b/data/tilesets/secondary/fuchsia_city/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/7.pal b/data/tilesets/secondary/fuchsia_city/palettes/7.pal new file mode 100644 index 000000000..93518605a --- /dev/null +++ b/data/tilesets/secondary/fuchsia_city/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/8.pal b/data/tilesets/secondary/fuchsia_city/palettes/8.pal new file mode 100644 index 000000000..8a0a9a1e0 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_city/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +65 74 106 +123 123 131 +98 90 82 +115 106 98 +148 131 131 +180 156 131 +189 172 98 +213 205 131 +238 222 139 +90 106 164 +98 139 230 +115 205 255 +255 0 255 +255 0 255 +98 106 115 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/9.pal b/data/tilesets/secondary/fuchsia_city/palettes/9.pal new file mode 100644 index 000000000..d39bbb454 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_city/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +65 74 106 +123 123 131 +139 90 82 +189 123 115 +222 148 131 +255 197 156 +156 156 172 +189 197 213 +230 238 238 +49 98 90 +74 148 131 +82 197 148 +106 230 172 +164 238 172 +98 106 115 diff --git a/data/tilesets/secondary/fuchsia_city/tiles.png b/data/tilesets/secondary/fuchsia_city/tiles.png new file mode 100644 index 000000000..a9e9e13e8 Binary files /dev/null and b/data/tilesets/secondary/fuchsia_city/tiles.png differ diff --git a/data/tilesets/secondary/fuchsia_gym/metatile_attributes.bin b/data/tilesets/secondary/fuchsia_gym/metatile_attributes.bin new file mode 100644 index 000000000..1b7a02c1f Binary files /dev/null and b/data/tilesets/secondary/fuchsia_gym/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/fuchsia_gym/metatiles.bin b/data/tilesets/secondary/fuchsia_gym/metatiles.bin new file mode 100644 index 000000000..25e3b6297 Binary files /dev/null and b/data/tilesets/secondary/fuchsia_gym/metatiles.bin differ diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/0.pal b/data/tilesets/secondary/fuchsia_gym/palettes/0.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_gym/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/1.pal b/data/tilesets/secondary/fuchsia_gym/palettes/1.pal new file mode 100644 index 000000000..d99adafff --- /dev/null +++ b/data/tilesets/secondary/fuchsia_gym/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/10.pal b/data/tilesets/secondary/fuchsia_gym/palettes/10.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_gym/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/11.pal b/data/tilesets/secondary/fuchsia_gym/palettes/11.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_gym/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/12.pal b/data/tilesets/secondary/fuchsia_gym/palettes/12.pal new file mode 100644 index 000000000..ebfedc7d5 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_gym/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +131 131 131 +180 180 164 +255 255 255 +172 131 115 +197 156 148 +238 180 164 +255 222 197 +255 238 238 +230 164 98 +255 197 98 +205 164 156 +180 139 123 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/13.pal b/data/tilesets/secondary/fuchsia_gym/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_gym/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/14.pal b/data/tilesets/secondary/fuchsia_gym/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_gym/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/15.pal b/data/tilesets/secondary/fuchsia_gym/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_gym/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/2.pal b/data/tilesets/secondary/fuchsia_gym/palettes/2.pal new file mode 100644 index 000000000..cc3a9457d --- /dev/null +++ b/data/tilesets/secondary/fuchsia_gym/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/3.pal b/data/tilesets/secondary/fuchsia_gym/palettes/3.pal new file mode 100644 index 000000000..7ec794ae5 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_gym/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/4.pal b/data/tilesets/secondary/fuchsia_gym/palettes/4.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_gym/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/5.pal b/data/tilesets/secondary/fuchsia_gym/palettes/5.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_gym/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/6.pal b/data/tilesets/secondary/fuchsia_gym/palettes/6.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_gym/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/7.pal b/data/tilesets/secondary/fuchsia_gym/palettes/7.pal new file mode 100644 index 000000000..9020b628f --- /dev/null +++ b/data/tilesets/secondary/fuchsia_gym/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +156 131 57 +213 197 106 +246 238 148 +213 222 238 +222 230 255 +41 106 82 +57 131 115 +172 131 115 +197 156 148 +238 180 164 +180 139 123 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/8.pal b/data/tilesets/secondary/fuchsia_gym/palettes/8.pal new file mode 100644 index 000000000..1873ad439 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_gym/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +156 131 57 +213 197 106 +246 238 148 +156 205 246 +115 172 222 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/9.pal b/data/tilesets/secondary/fuchsia_gym/palettes/9.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_gym/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fuchsia_gym/tiles.png b/data/tilesets/secondary/fuchsia_gym/tiles.png new file mode 100644 index 000000000..cf2fa4ff7 Binary files /dev/null and b/data/tilesets/secondary/fuchsia_gym/tiles.png differ diff --git a/data/tilesets/secondary/game_corner/metatile_attributes.bin b/data/tilesets/secondary/game_corner/metatile_attributes.bin new file mode 100644 index 000000000..a2bcd959e Binary files /dev/null and b/data/tilesets/secondary/game_corner/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/game_corner/metatiles.bin b/data/tilesets/secondary/game_corner/metatiles.bin new file mode 100644 index 000000000..1529f8582 Binary files /dev/null and b/data/tilesets/secondary/game_corner/metatiles.bin differ diff --git a/data/tilesets/secondary/game_corner/palettes/0.pal b/data/tilesets/secondary/game_corner/palettes/0.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/game_corner/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/game_corner/palettes/1.pal b/data/tilesets/secondary/game_corner/palettes/1.pal new file mode 100644 index 000000000..d99adafff --- /dev/null +++ b/data/tilesets/secondary/game_corner/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/game_corner/palettes/10.pal b/data/tilesets/secondary/game_corner/palettes/10.pal new file mode 100644 index 000000000..6d76050a9 --- /dev/null +++ b/data/tilesets/secondary/game_corner/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +230 230 230 +172 148 197 +205 164 230 +230 197 255 +238 230 123 +189 172 98 +255 255 148 +131 255 255 +74 131 197 +230 189 164 +255 0 255 diff --git a/data/tilesets/secondary/game_corner/palettes/11.pal b/data/tilesets/secondary/game_corner/palettes/11.pal new file mode 100644 index 000000000..9359b8858 --- /dev/null +++ b/data/tilesets/secondary/game_corner/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +172 172 156 +230 230 205 +197 197 172 +172 172 164 +189 189 164 +255 0 255 +131 172 238 +106 197 106 +197 180 74 +255 0 255 +222 222 222 +213 139 57 +255 255 255 diff --git a/data/tilesets/secondary/game_corner/palettes/12.pal b/data/tilesets/secondary/game_corner/palettes/12.pal new file mode 100644 index 000000000..61b3764be --- /dev/null +++ b/data/tilesets/secondary/game_corner/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +222 238 255 +255 0 255 +255 0 255 +32 156 222 +139 197 255 +180 98 0 +197 123 0 +205 139 0 +213 164 0 +230 180 0 +230 197 65 diff --git a/data/tilesets/secondary/game_corner/palettes/13.pal b/data/tilesets/secondary/game_corner/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/game_corner/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/game_corner/palettes/14.pal b/data/tilesets/secondary/game_corner/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/game_corner/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/game_corner/palettes/15.pal b/data/tilesets/secondary/game_corner/palettes/15.pal new file mode 100644 index 000000000..3bb14e445 --- /dev/null +++ b/data/tilesets/secondary/game_corner/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +230 230 205 +205 205 180 +172 172 148 +222 222 222 +156 115 197 +131 172 238 +106 197 106 +197 180 74 +0 0 0 +213 139 57 +238 222 131 +255 255 255 diff --git a/data/tilesets/secondary/game_corner/palettes/2.pal b/data/tilesets/secondary/game_corner/palettes/2.pal new file mode 100644 index 000000000..cc3a9457d --- /dev/null +++ b/data/tilesets/secondary/game_corner/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/game_corner/palettes/3.pal b/data/tilesets/secondary/game_corner/palettes/3.pal new file mode 100644 index 000000000..7ec794ae5 --- /dev/null +++ b/data/tilesets/secondary/game_corner/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/game_corner/palettes/4.pal b/data/tilesets/secondary/game_corner/palettes/4.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/game_corner/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/game_corner/palettes/5.pal b/data/tilesets/secondary/game_corner/palettes/5.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/game_corner/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/game_corner/palettes/6.pal b/data/tilesets/secondary/game_corner/palettes/6.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/game_corner/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/game_corner/palettes/7.pal b/data/tilesets/secondary/game_corner/palettes/7.pal new file mode 100644 index 000000000..b3612e537 --- /dev/null +++ b/data/tilesets/secondary/game_corner/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +131 131 131 +180 180 164 +255 255 255 +255 164 115 +255 222 189 +123 164 238 +172 205 238 +213 230 238 +164 255 180 +238 164 0 +139 90 197 +213 156 255 +255 255 148 +255 0 255 diff --git a/data/tilesets/secondary/game_corner/palettes/8.pal b/data/tilesets/secondary/game_corner/palettes/8.pal new file mode 100644 index 000000000..e58f94305 --- /dev/null +++ b/data/tilesets/secondary/game_corner/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 255 0 +82 82 106 +131 131 131 +180 180 164 +255 255 255 +255 255 123 +205 180 98 +246 230 172 +74 131 197 +139 197 255 +164 255 180 +238 246 246 +164 74 32 +213 115 57 +238 148 98 +255 189 98 diff --git a/data/tilesets/secondary/game_corner/palettes/9.pal b/data/tilesets/secondary/game_corner/palettes/9.pal new file mode 100644 index 000000000..75f1d81b5 --- /dev/null +++ b/data/tilesets/secondary/game_corner/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +255 0 255 +255 0 255 +255 255 255 +255 0 255 +131 172 238 +246 230 172 +82 180 172 +32 115 123 +255 148 115 +230 106 90 +90 213 156 +255 189 82 +16 123 255 +131 189 246 diff --git a/data/tilesets/secondary/game_corner/tiles.png b/data/tilesets/secondary/game_corner/tiles.png new file mode 100644 index 000000000..b5b249d0a Binary files /dev/null and b/data/tilesets/secondary/game_corner/tiles.png differ diff --git a/data/tilesets/secondary/hall_of_fame/metatile_attributes.bin b/data/tilesets/secondary/hall_of_fame/metatile_attributes.bin new file mode 100644 index 000000000..2fa59412a Binary files /dev/null and b/data/tilesets/secondary/hall_of_fame/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/hall_of_fame/metatiles.bin b/data/tilesets/secondary/hall_of_fame/metatiles.bin new file mode 100644 index 000000000..6f4e8a22e Binary files /dev/null and b/data/tilesets/secondary/hall_of_fame/metatiles.bin differ diff --git a/data/tilesets/secondary/hall_of_fame/palettes/0.pal b/data/tilesets/secondary/hall_of_fame/palettes/0.pal new file mode 100644 index 000000000..8db07d418 --- /dev/null +++ b/data/tilesets/secondary/hall_of_fame/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/1.pal b/data/tilesets/secondary/hall_of_fame/palettes/1.pal new file mode 100644 index 000000000..66561f6d3 --- /dev/null +++ b/data/tilesets/secondary/hall_of_fame/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +139 180 222 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/10.pal b/data/tilesets/secondary/hall_of_fame/palettes/10.pal new file mode 100644 index 000000000..6ea570459 --- /dev/null +++ b/data/tilesets/secondary/hall_of_fame/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +238 230 156 +230 189 131 +131 189 172 +205 82 65 +255 148 0 +106 164 148 +82 139 123 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +156 213 197 +164 172 139 +90 0 255 +90 0 255 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/11.pal b/data/tilesets/secondary/hall_of_fame/palettes/11.pal new file mode 100644 index 000000000..008f150c7 --- /dev/null +++ b/data/tilesets/secondary/hall_of_fame/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +148 148 164 +205 189 197 +255 255 255 +115 115 131 +255 0 255 +0 255 156 +106 164 148 +82 139 123 +255 0 255 +255 255 172 +255 213 115 +213 180 106 +164 131 74 +222 213 230 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/12.pal b/data/tilesets/secondary/hall_of_fame/palettes/12.pal new file mode 100644 index 000000000..c1e7c3d5c --- /dev/null +++ b/data/tilesets/secondary/hall_of_fame/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/13.pal b/data/tilesets/secondary/hall_of_fame/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/hall_of_fame/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/14.pal b/data/tilesets/secondary/hall_of_fame/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/hall_of_fame/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/15.pal b/data/tilesets/secondary/hall_of_fame/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/hall_of_fame/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/2.pal b/data/tilesets/secondary/hall_of_fame/palettes/2.pal new file mode 100644 index 000000000..87a022102 --- /dev/null +++ b/data/tilesets/secondary/hall_of_fame/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +90 90 115 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/3.pal b/data/tilesets/secondary/hall_of_fame/palettes/3.pal new file mode 100644 index 000000000..783496dcd --- /dev/null +++ b/data/tilesets/secondary/hall_of_fame/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +65 98 156 +90 123 180 +115 156 197 +222 213 131 +164 164 172 +205 205 213 +238 238 246 +106 172 115 +156 205 139 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/4.pal b/data/tilesets/secondary/hall_of_fame/palettes/4.pal new file mode 100644 index 000000000..89eace605 --- /dev/null +++ b/data/tilesets/secondary/hall_of_fame/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 238 246 +172 197 180 +197 222 205 +90 189 172 +246 238 156 +205 189 131 +189 164 123 +148 131 106 +106 106 106 +213 222 230 +238 180 115 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/5.pal b/data/tilesets/secondary/hall_of_fame/palettes/5.pal new file mode 100644 index 000000000..c7780e5c7 --- /dev/null +++ b/data/tilesets/secondary/hall_of_fame/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +213 222 222 +164 180 189 +255 0 255 +131 115 74 +213 213 148 +197 189 139 +172 156 115 +148 131 90 +197 197 205 +205 82 65 +0 0 0 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/6.pal b/data/tilesets/secondary/hall_of_fame/palettes/6.pal new file mode 100644 index 000000000..1d08ce9a2 --- /dev/null +++ b/data/tilesets/secondary/hall_of_fame/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/7.pal b/data/tilesets/secondary/hall_of_fame/palettes/7.pal new file mode 100644 index 000000000..f0c97cf87 --- /dev/null +++ b/data/tilesets/secondary/hall_of_fame/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +156 189 255 +82 123 197 +49 90 156 +106 164 148 +82 139 123 +106 164 222 +222 230 148 +189 197 115 +90 148 197 +222 164 32 +189 230 255 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/8.pal b/data/tilesets/secondary/hall_of_fame/palettes/8.pal new file mode 100644 index 000000000..33b52bbbd --- /dev/null +++ b/data/tilesets/secondary/hall_of_fame/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +213 222 222 +180 197 213 +156 172 197 +230 106 90 +189 65 49 +255 131 115 +139 41 24 +197 255 205 +238 197 106 +255 255 213 +255 246 172 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/9.pal b/data/tilesets/secondary/hall_of_fame/palettes/9.pal new file mode 100644 index 000000000..3a2cf3b7a --- /dev/null +++ b/data/tilesets/secondary/hall_of_fame/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +139 222 148 +156 238 164 +197 255 205 +172 246 180 +238 238 197 +255 0 255 +255 0 255 +0 255 156 +189 65 49 +255 222 123 +246 197 0 diff --git a/data/tilesets/secondary/hall_of_fame/tiles.png b/data/tilesets/secondary/hall_of_fame/tiles.png new file mode 100644 index 000000000..f5ab3a9cb Binary files /dev/null and b/data/tilesets/secondary/hall_of_fame/tiles.png differ diff --git a/data/tilesets/secondary/hoenn_building/metatile_attributes.bin b/data/tilesets/secondary/hoenn_building/metatile_attributes.bin new file mode 100644 index 000000000..6c4ffed21 Binary files /dev/null and b/data/tilesets/secondary/hoenn_building/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/hoenn_building/metatiles.bin b/data/tilesets/secondary/hoenn_building/metatiles.bin new file mode 100644 index 000000000..af8effb11 Binary files /dev/null and b/data/tilesets/secondary/hoenn_building/metatiles.bin differ diff --git a/data/tilesets/secondary/hoenn_building/palettes/0.pal b/data/tilesets/secondary/hoenn_building/palettes/0.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/hoenn_building/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/1.pal b/data/tilesets/secondary/hoenn_building/palettes/1.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/hoenn_building/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/10.pal b/data/tilesets/secondary/hoenn_building/palettes/10.pal new file mode 100644 index 000000000..432f42149 --- /dev/null +++ b/data/tilesets/secondary/hoenn_building/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +65 74 106 +123 123 131 +189 189 164 +255 255 255 +213 197 74 +213 180 131 +148 115 41 +172 139 57 +213 213 180 +106 139 49 +131 172 74 +164 205 106 +197 255 172 +115 90 57 +255 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/11.pal b/data/tilesets/secondary/hoenn_building/palettes/11.pal new file mode 100644 index 000000000..8c2460403 --- /dev/null +++ b/data/tilesets/secondary/hoenn_building/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +65 74 106 +139 139 139 +189 189 164 +255 255 255 +222 197 74 +230 230 106 +230 222 246 +148 98 123 +197 131 156 +197 164 189 +123 164 189 +131 197 98 +172 238 139 +90 156 57 +0 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/12.pal b/data/tilesets/secondary/hoenn_building/palettes/12.pal new file mode 100644 index 000000000..920ad12c9 --- /dev/null +++ b/data/tilesets/secondary/hoenn_building/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +65 74 106 +139 139 139 +180 180 164 +255 255 255 +189 180 49 +222 213 82 +123 115 49 +156 148 16 +213 213 180 +98 156 139 +123 180 189 +172 222 230 +255 205 139 +246 246 164 +222 131 90 diff --git a/data/tilesets/secondary/hoenn_building/palettes/13.pal b/data/tilesets/secondary/hoenn_building/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/hoenn_building/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/14.pal b/data/tilesets/secondary/hoenn_building/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/hoenn_building/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/15.pal b/data/tilesets/secondary/hoenn_building/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/hoenn_building/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/2.pal b/data/tilesets/secondary/hoenn_building/palettes/2.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/hoenn_building/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/3.pal b/data/tilesets/secondary/hoenn_building/palettes/3.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/hoenn_building/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/4.pal b/data/tilesets/secondary/hoenn_building/palettes/4.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/hoenn_building/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/5.pal b/data/tilesets/secondary/hoenn_building/palettes/5.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/hoenn_building/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/6.pal b/data/tilesets/secondary/hoenn_building/palettes/6.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/hoenn_building/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/7.pal b/data/tilesets/secondary/hoenn_building/palettes/7.pal new file mode 100644 index 000000000..533778712 --- /dev/null +++ b/data/tilesets/secondary/hoenn_building/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +65 74 106 +139 139 139 +189 189 164 +255 255 255 +230 222 246 +255 238 213 +255 0 0 +115 115 164 +131 139 230 +164 164 255 +156 106 16 +115 115 139 +213 213 172 +222 172 82 +189 139 49 diff --git a/data/tilesets/secondary/hoenn_building/palettes/8.pal b/data/tilesets/secondary/hoenn_building/palettes/8.pal new file mode 100644 index 000000000..0b01f1a0f --- /dev/null +++ b/data/tilesets/secondary/hoenn_building/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +65 74 106 +139 139 148 +180 180 164 +255 255 255 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +172 90 49 +205 98 57 +246 139 98 +255 205 139 +255 0 0 +255 0 0 +255 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/9.pal b/data/tilesets/secondary/hoenn_building/palettes/9.pal new file mode 100644 index 000000000..371e5a211 --- /dev/null +++ b/data/tilesets/secondary/hoenn_building/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +65 74 106 +139 139 139 +189 189 164 +255 255 255 +230 222 246 +148 148 197 +189 189 246 +205 106 49 +246 180 49 +255 246 131 +255 0 0 +189 172 82 +213 205 98 +148 115 41 +172 139 57 diff --git a/data/tilesets/secondary/hoenn_building/tiles.png b/data/tilesets/secondary/hoenn_building/tiles.png new file mode 100644 index 000000000..ef8a943fa Binary files /dev/null and b/data/tilesets/secondary/hoenn_building/tiles.png differ diff --git a/data/tilesets/secondary/indigo_plateau/metatile_attributes.bin b/data/tilesets/secondary/indigo_plateau/metatile_attributes.bin new file mode 100644 index 000000000..f840f6486 Binary files /dev/null and b/data/tilesets/secondary/indigo_plateau/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/indigo_plateau/metatiles.bin b/data/tilesets/secondary/indigo_plateau/metatiles.bin new file mode 100644 index 000000000..bbb7ffbee Binary files /dev/null and b/data/tilesets/secondary/indigo_plateau/metatiles.bin differ diff --git a/data/tilesets/secondary/indigo_plateau/palettes/0.pal b/data/tilesets/secondary/indigo_plateau/palettes/0.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/indigo_plateau/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/1.pal b/data/tilesets/secondary/indigo_plateau/palettes/1.pal new file mode 100644 index 000000000..cf1123812 --- /dev/null +++ b/data/tilesets/secondary/indigo_plateau/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/10.pal b/data/tilesets/secondary/indigo_plateau/palettes/10.pal new file mode 100644 index 000000000..70ed40322 --- /dev/null +++ b/data/tilesets/secondary/indigo_plateau/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +213 230 197 +156 172 139 +123 123 131 +90 90 115 +65 74 106 +222 172 65 +180 98 0 +131 65 0 +205 205 123 +164 164 57 +115 189 246 +74 148 213 +49 115 180 +189 197 164 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/11.pal b/data/tilesets/secondary/indigo_plateau/palettes/11.pal new file mode 100644 index 000000000..7b47acf60 --- /dev/null +++ b/data/tilesets/secondary/indigo_plateau/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +255 255 255 +213 213 222 +180 180 164 +148 148 139 +123 123 131 +82 82 106 +197 222 205 +148 172 156 +98 131 106 +230 139 24 +197 98 0 +172 65 0 +230 213 139 +205 180 106 +172 148 82 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/12.pal b/data/tilesets/secondary/indigo_plateau/palettes/12.pal new file mode 100644 index 000000000..f5ff3dddf --- /dev/null +++ b/data/tilesets/secondary/indigo_plateau/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +148 148 139 +222 222 230 +205 205 213 +180 180 164 +255 0 255 +222 222 205 +205 205 189 +172 172 164 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +230 213 139 +205 180 106 +115 205 164 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/13.pal b/data/tilesets/secondary/indigo_plateau/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/indigo_plateau/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/14.pal b/data/tilesets/secondary/indigo_plateau/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/indigo_plateau/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/15.pal b/data/tilesets/secondary/indigo_plateau/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/indigo_plateau/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/2.pal b/data/tilesets/secondary/indigo_plateau/palettes/2.pal new file mode 100644 index 000000000..372fb5d7c --- /dev/null +++ b/data/tilesets/secondary/indigo_plateau/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/3.pal b/data/tilesets/secondary/indigo_plateau/palettes/3.pal new file mode 100644 index 000000000..5a5e60211 --- /dev/null +++ b/data/tilesets/secondary/indigo_plateau/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/4.pal b/data/tilesets/secondary/indigo_plateau/palettes/4.pal new file mode 100644 index 000000000..229f9132c --- /dev/null +++ b/data/tilesets/secondary/indigo_plateau/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +222 230 255 +197 213 255 +164 197 238 +123 172 230 +90 148 197 +65 123 180 +90 164 205 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +32 98 139 +238 230 139 +222 197 139 +205 180 106 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/5.pal b/data/tilesets/secondary/indigo_plateau/palettes/5.pal new file mode 100644 index 000000000..215dd1272 --- /dev/null +++ b/data/tilesets/secondary/indigo_plateau/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/6.pal b/data/tilesets/secondary/indigo_plateau/palettes/6.pal new file mode 100644 index 000000000..7e7862a19 --- /dev/null +++ b/data/tilesets/secondary/indigo_plateau/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +222 230 255 +197 213 255 +164 197 238 +123 172 230 +41 82 164 +41 57 131 +74 123 197 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +32 98 139 +238 230 139 +222 197 139 +205 180 106 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/7.pal b/data/tilesets/secondary/indigo_plateau/palettes/7.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/indigo_plateau/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/8.pal b/data/tilesets/secondary/indigo_plateau/palettes/8.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/indigo_plateau/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/9.pal b/data/tilesets/secondary/indigo_plateau/palettes/9.pal new file mode 100644 index 000000000..3ff6139ac --- /dev/null +++ b/data/tilesets/secondary/indigo_plateau/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 205 65 +222 172 65 +180 98 0 +213 213 139 +189 189 115 +148 148 82 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/indigo_plateau/tiles.png b/data/tilesets/secondary/indigo_plateau/tiles.png new file mode 100644 index 000000000..4a938b4c5 Binary files /dev/null and b/data/tilesets/secondary/indigo_plateau/tiles.png differ diff --git a/data/tilesets/secondary/island_harbor/metatile_attributes.bin b/data/tilesets/secondary/island_harbor/metatile_attributes.bin new file mode 100644 index 000000000..9dd5f613d Binary files /dev/null and b/data/tilesets/secondary/island_harbor/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/island_harbor/metatiles.bin b/data/tilesets/secondary/island_harbor/metatiles.bin new file mode 100644 index 000000000..d5916a2cf Binary files /dev/null and b/data/tilesets/secondary/island_harbor/metatiles.bin differ diff --git a/data/tilesets/secondary/island_harbor/palettes/0.pal b/data/tilesets/secondary/island_harbor/palettes/0.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/island_harbor/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/island_harbor/palettes/1.pal b/data/tilesets/secondary/island_harbor/palettes/1.pal new file mode 100644 index 000000000..22eb1667c --- /dev/null +++ b/data/tilesets/secondary/island_harbor/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +123 123 131 +65 49 65 +230 238 238 +90 189 139 +90 90 115 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/island_harbor/palettes/10.pal b/data/tilesets/secondary/island_harbor/palettes/10.pal new file mode 100644 index 000000000..3c091df8b --- /dev/null +++ b/data/tilesets/secondary/island_harbor/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +148 148 164 +205 189 197 +255 255 255 +255 213 115 +189 148 49 +139 98 74 +90 106 180 +255 205 139 +230 172 90 +230 148 65 +180 98 24 +238 213 172 +222 156 139 +123 123 123 diff --git a/data/tilesets/secondary/island_harbor/palettes/11.pal b/data/tilesets/secondary/island_harbor/palettes/11.pal new file mode 100644 index 000000000..c42eeb7e1 --- /dev/null +++ b/data/tilesets/secondary/island_harbor/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +148 148 164 +172 172 164 +164 222 255 +115 180 205 +65 139 164 +41 106 148 +205 213 213 +238 230 139 +189 180 98 +139 131 65 +0 0 0 +255 255 255 +230 172 90 +189 246 255 diff --git a/data/tilesets/secondary/island_harbor/palettes/12.pal b/data/tilesets/secondary/island_harbor/palettes/12.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/island_harbor/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/island_harbor/palettes/13.pal b/data/tilesets/secondary/island_harbor/palettes/13.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/island_harbor/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/island_harbor/palettes/14.pal b/data/tilesets/secondary/island_harbor/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/island_harbor/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/island_harbor/palettes/15.pal b/data/tilesets/secondary/island_harbor/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/island_harbor/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/island_harbor/palettes/2.pal b/data/tilesets/secondary/island_harbor/palettes/2.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/island_harbor/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/island_harbor/palettes/3.pal b/data/tilesets/secondary/island_harbor/palettes/3.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/secondary/island_harbor/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/island_harbor/palettes/4.pal b/data/tilesets/secondary/island_harbor/palettes/4.pal new file mode 100644 index 000000000..5871a448c --- /dev/null +++ b/data/tilesets/secondary/island_harbor/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +230 246 255 +189 222 255 +139 189 255 +115 164 255 +65 139 222 +57 115 222 +82 148 230 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +49 115 197 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/island_harbor/palettes/5.pal b/data/tilesets/secondary/island_harbor/palettes/5.pal new file mode 100644 index 000000000..c5a653979 --- /dev/null +++ b/data/tilesets/secondary/island_harbor/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/island_harbor/palettes/6.pal b/data/tilesets/secondary/island_harbor/palettes/6.pal new file mode 100644 index 000000000..9bad44649 --- /dev/null +++ b/data/tilesets/secondary/island_harbor/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +205 230 246 +180 213 255 +123 180 246 +98 148 230 +65 123 189 +49 98 180 +82 131 222 +213 230 238 +172 189 205 +123 123 131 +90 90 115 +238 246 246 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/island_harbor/palettes/7.pal b/data/tilesets/secondary/island_harbor/palettes/7.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/island_harbor/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/island_harbor/palettes/8.pal b/data/tilesets/secondary/island_harbor/palettes/8.pal new file mode 100644 index 000000000..5c1251024 --- /dev/null +++ b/data/tilesets/secondary/island_harbor/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +172 172 164 +205 213 213 +180 189 189 +148 156 156 +106 115 115 +197 246 230 +106 205 164 +57 156 115 +222 106 98 +222 213 123 +255 180 148 +197 189 98 +238 246 255 diff --git a/data/tilesets/secondary/island_harbor/palettes/9.pal b/data/tilesets/secondary/island_harbor/palettes/9.pal new file mode 100644 index 000000000..c25501332 --- /dev/null +++ b/data/tilesets/secondary/island_harbor/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +65 123 180 +238 246 255 +222 230 238 +189 205 230 +156 164 189 +139 139 156 +98 98 123 +57 57 106 +197 98 98 +172 65 106 +32 74 156 +197 148 0 +246 213 24 +222 238 255 +255 255 255 +74 106 139 diff --git a/data/tilesets/secondary/island_harbor/tiles.png b/data/tilesets/secondary/island_harbor/tiles.png new file mode 100644 index 000000000..166ae2e18 Binary files /dev/null and b/data/tilesets/secondary/island_harbor/tiles.png differ diff --git a/data/tilesets/secondary/lab/metatile_attributes.bin b/data/tilesets/secondary/lab/metatile_attributes.bin new file mode 100644 index 000000000..0d685881c Binary files /dev/null and b/data/tilesets/secondary/lab/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/lab/metatiles.bin b/data/tilesets/secondary/lab/metatiles.bin new file mode 100644 index 000000000..a7833446f Binary files /dev/null and b/data/tilesets/secondary/lab/metatiles.bin differ diff --git a/data/tilesets/secondary/lab/palettes/0.pal b/data/tilesets/secondary/lab/palettes/0.pal new file mode 100644 index 000000000..9fc16da3b --- /dev/null +++ b/data/tilesets/secondary/lab/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +238 238 246 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/lab/palettes/1.pal b/data/tilesets/secondary/lab/palettes/1.pal new file mode 100644 index 000000000..76403e6d6 --- /dev/null +++ b/data/tilesets/secondary/lab/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +139 180 222 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/lab/palettes/10.pal b/data/tilesets/secondary/lab/palettes/10.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/lab/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/lab/palettes/11.pal b/data/tilesets/secondary/lab/palettes/11.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/lab/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/lab/palettes/12.pal b/data/tilesets/secondary/lab/palettes/12.pal new file mode 100644 index 000000000..3c32c9fd4 --- /dev/null +++ b/data/tilesets/secondary/lab/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +238 238 246 +82 82 106 +139 131 148 +180 172 180 +189 197 213 +255 255 255 +139 197 139 +156 205 246 +98 156 238 +90 123 180 +222 205 106 +213 230 246 +255 189 180 +230 106 65 +255 131 115 +246 238 148 diff --git a/data/tilesets/secondary/lab/palettes/13.pal b/data/tilesets/secondary/lab/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/lab/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/lab/palettes/14.pal b/data/tilesets/secondary/lab/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/lab/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/lab/palettes/15.pal b/data/tilesets/secondary/lab/palettes/15.pal new file mode 100644 index 000000000..92e7ed309 --- /dev/null +++ b/data/tilesets/secondary/lab/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +0 0 0 diff --git a/data/tilesets/secondary/lab/palettes/2.pal b/data/tilesets/secondary/lab/palettes/2.pal new file mode 100644 index 000000000..b1ecd71dc --- /dev/null +++ b/data/tilesets/secondary/lab/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +90 90 115 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/lab/palettes/3.pal b/data/tilesets/secondary/lab/palettes/3.pal new file mode 100644 index 000000000..43d9b60e3 --- /dev/null +++ b/data/tilesets/secondary/lab/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +65 98 156 +90 123 180 +115 156 197 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +106 172 115 +156 205 139 diff --git a/data/tilesets/secondary/lab/palettes/4.pal b/data/tilesets/secondary/lab/palettes/4.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/lab/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/lab/palettes/5.pal b/data/tilesets/secondary/lab/palettes/5.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/lab/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/lab/palettes/6.pal b/data/tilesets/secondary/lab/palettes/6.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/lab/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/lab/palettes/7.pal b/data/tilesets/secondary/lab/palettes/7.pal new file mode 100644 index 000000000..3d7f8bd89 --- /dev/null +++ b/data/tilesets/secondary/lab/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +139 131 148 +180 172 180 +189 197 213 +255 255 255 +255 205 139 +230 164 98 +197 131 65 +172 90 24 +82 148 197 +131 189 222 +189 230 255 +123 123 123 +197 180 74 +246 238 148 diff --git a/data/tilesets/secondary/lab/palettes/8.pal b/data/tilesets/secondary/lab/palettes/8.pal new file mode 100644 index 000000000..7fce49d06 --- /dev/null +++ b/data/tilesets/secondary/lab/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +139 131 148 +180 172 180 +189 197 213 +255 255 255 +222 222 180 +197 197 148 +156 156 106 +230 164 98 +172 90 24 +172 164 65 +139 123 24 +246 238 148 +0 0 0 +246 238 148 diff --git a/data/tilesets/secondary/lab/palettes/9.pal b/data/tilesets/secondary/lab/palettes/9.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/lab/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/lab/tiles.png b/data/tilesets/secondary/lab/tiles.png new file mode 100644 index 000000000..6caeac8a8 Binary files /dev/null and b/data/tilesets/secondary/lab/tiles.png differ diff --git a/data/tilesets/secondary/lavender_town/metatile_attributes.bin b/data/tilesets/secondary/lavender_town/metatile_attributes.bin new file mode 100644 index 000000000..d103d7155 Binary files /dev/null and b/data/tilesets/secondary/lavender_town/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/lavender_town/metatiles.bin b/data/tilesets/secondary/lavender_town/metatiles.bin new file mode 100644 index 000000000..f69885645 Binary files /dev/null and b/data/tilesets/secondary/lavender_town/metatiles.bin differ diff --git a/data/tilesets/secondary/lavender_town/palettes/0.pal b/data/tilesets/secondary/lavender_town/palettes/0.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/lavender_town/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/lavender_town/palettes/1.pal b/data/tilesets/secondary/lavender_town/palettes/1.pal new file mode 100644 index 000000000..d8a4e7757 --- /dev/null +++ b/data/tilesets/secondary/lavender_town/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/lavender_town/palettes/10.pal b/data/tilesets/secondary/lavender_town/palettes/10.pal new file mode 100644 index 000000000..b97e9df4b --- /dev/null +++ b/data/tilesets/secondary/lavender_town/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +255 255 255 +213 230 222 +148 164 180 +123 123 131 +90 90 115 +82 82 106 +213 238 255 +164 189 222 +123 148 180 +255 238 139 +222 180 65 +255 255 189 +164 98 98 +213 148 148 +197 123 131 diff --git a/data/tilesets/secondary/lavender_town/palettes/11.pal b/data/tilesets/secondary/lavender_town/palettes/11.pal new file mode 100644 index 000000000..f71181976 --- /dev/null +++ b/data/tilesets/secondary/lavender_town/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +255 255 255 +255 0 255 +255 0 255 +123 123 131 +255 0 255 +82 82 106 +213 238 255 +164 189 222 +123 148 180 +255 238 139 +222 180 65 +255 255 189 +156 213 255 +115 189 246 +98 164 222 diff --git a/data/tilesets/secondary/lavender_town/palettes/12.pal b/data/tilesets/secondary/lavender_town/palettes/12.pal new file mode 100644 index 000000000..0cdcab8c2 --- /dev/null +++ b/data/tilesets/secondary/lavender_town/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +246 246 255 +222 205 246 +205 172 255 +172 139 213 +123 123 131 +90 90 115 +65 74 106 +230 222 131 +213 189 98 +222 197 255 +172 139 213 +148 115 189 +139 106 180 +255 246 164 +172 148 82 diff --git a/data/tilesets/secondary/lavender_town/palettes/13.pal b/data/tilesets/secondary/lavender_town/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/lavender_town/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/lavender_town/palettes/14.pal b/data/tilesets/secondary/lavender_town/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/lavender_town/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/lavender_town/palettes/15.pal b/data/tilesets/secondary/lavender_town/palettes/15.pal new file mode 100644 index 000000000..3973e491a --- /dev/null +++ b/data/tilesets/secondary/lavender_town/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +246 230 172 +246 213 180 +222 189 164 +180 148 123 +139 98 90 +90 57 74 +123 123 131 +65 74 106 +205 222 238 diff --git a/data/tilesets/secondary/lavender_town/palettes/2.pal b/data/tilesets/secondary/lavender_town/palettes/2.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/lavender_town/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/lavender_town/palettes/3.pal b/data/tilesets/secondary/lavender_town/palettes/3.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/secondary/lavender_town/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/lavender_town/palettes/4.pal b/data/tilesets/secondary/lavender_town/palettes/4.pal new file mode 100644 index 000000000..07dcd957c --- /dev/null +++ b/data/tilesets/secondary/lavender_town/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 255 255 +172 222 255 +148 189 238 +106 156 230 +57 148 197 +32 131 172 +82 148 213 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +230 213 148 +238 230 139 +222 197 139 +213 189 106 diff --git a/data/tilesets/secondary/lavender_town/palettes/5.pal b/data/tilesets/secondary/lavender_town/palettes/5.pal new file mode 100644 index 000000000..c5a653979 --- /dev/null +++ b/data/tilesets/secondary/lavender_town/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/lavender_town/palettes/6.pal b/data/tilesets/secondary/lavender_town/palettes/6.pal new file mode 100644 index 000000000..0dba59a72 --- /dev/null +++ b/data/tilesets/secondary/lavender_town/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +222 255 255 +172 222 255 +148 189 238 +106 156 230 +41 90 172 +41 57 148 +74 123 197 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +230 213 148 +238 230 139 +222 197 139 +213 189 106 diff --git a/data/tilesets/secondary/lavender_town/palettes/7.pal b/data/tilesets/secondary/lavender_town/palettes/7.pal new file mode 100644 index 000000000..93518605a --- /dev/null +++ b/data/tilesets/secondary/lavender_town/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/lavender_town/palettes/8.pal b/data/tilesets/secondary/lavender_town/palettes/8.pal new file mode 100644 index 000000000..376749664 --- /dev/null +++ b/data/tilesets/secondary/lavender_town/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +115 205 164 +148 164 180 +123 123 131 +65 74 106 +205 82 74 +172 32 41 +255 246 189 +238 230 156 +222 205 131 +189 164 90 +148 131 49 +123 90 24 +123 123 131 +65 74 106 +205 222 238 diff --git a/data/tilesets/secondary/lavender_town/palettes/9.pal b/data/tilesets/secondary/lavender_town/palettes/9.pal new file mode 100644 index 000000000..82b469a66 --- /dev/null +++ b/data/tilesets/secondary/lavender_town/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +255 255 255 +230 246 238 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +172 172 106 +213 213 148 +180 205 180 +148 180 148 +131 164 131 +106 139 106 +197 222 197 +139 172 139 +90 115 90 diff --git a/data/tilesets/secondary/lavender_town/tiles.png b/data/tilesets/secondary/lavender_town/tiles.png new file mode 100644 index 000000000..66bd81f8b Binary files /dev/null and b/data/tilesets/secondary/lavender_town/tiles.png differ diff --git a/data/tilesets/secondary/mart/metatile_attributes.bin b/data/tilesets/secondary/mart/metatile_attributes.bin new file mode 100644 index 000000000..31fdb5cc0 Binary files /dev/null and b/data/tilesets/secondary/mart/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/mart/metatiles.bin b/data/tilesets/secondary/mart/metatiles.bin new file mode 100644 index 000000000..1c00836c1 Binary files /dev/null and b/data/tilesets/secondary/mart/metatiles.bin differ diff --git a/data/tilesets/secondary/mart/palettes/0.pal b/data/tilesets/secondary/mart/palettes/0.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/mart/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/mart/palettes/1.pal b/data/tilesets/secondary/mart/palettes/1.pal new file mode 100644 index 000000000..3a16a45c7 --- /dev/null +++ b/data/tilesets/secondary/mart/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +238 246 238 diff --git a/data/tilesets/secondary/mart/palettes/10.pal b/data/tilesets/secondary/mart/palettes/10.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/mart/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/mart/palettes/11.pal b/data/tilesets/secondary/mart/palettes/11.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/mart/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/mart/palettes/12.pal b/data/tilesets/secondary/mart/palettes/12.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/mart/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/mart/palettes/13.pal b/data/tilesets/secondary/mart/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/mart/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/mart/palettes/14.pal b/data/tilesets/secondary/mart/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/mart/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/mart/palettes/15.pal b/data/tilesets/secondary/mart/palettes/15.pal new file mode 100644 index 000000000..92e7ed309 --- /dev/null +++ b/data/tilesets/secondary/mart/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +0 0 0 diff --git a/data/tilesets/secondary/mart/palettes/2.pal b/data/tilesets/secondary/mart/palettes/2.pal new file mode 100644 index 000000000..cc3a9457d --- /dev/null +++ b/data/tilesets/secondary/mart/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/mart/palettes/3.pal b/data/tilesets/secondary/mart/palettes/3.pal new file mode 100644 index 000000000..e1b56cd57 --- /dev/null +++ b/data/tilesets/secondary/mart/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +164 172 164 +180 189 189 +238 246 246 +238 246 238 +213 230 222 +197 205 197 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/mart/palettes/4.pal b/data/tilesets/secondary/mart/palettes/4.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/mart/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/mart/palettes/5.pal b/data/tilesets/secondary/mart/palettes/5.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/mart/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/mart/palettes/6.pal b/data/tilesets/secondary/mart/palettes/6.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/mart/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/mart/palettes/7.pal b/data/tilesets/secondary/mart/palettes/7.pal new file mode 100644 index 000000000..0a07057ec --- /dev/null +++ b/data/tilesets/secondary/mart/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/mart/palettes/8.pal b/data/tilesets/secondary/mart/palettes/8.pal new file mode 100644 index 000000000..06fcc911b --- /dev/null +++ b/data/tilesets/secondary/mart/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +115 189 139 +172 230 172 +205 246 205 +0 0 0 diff --git a/data/tilesets/secondary/mart/palettes/9.pal b/data/tilesets/secondary/mart/palettes/9.pal new file mode 100644 index 000000000..ea018609b --- /dev/null +++ b/data/tilesets/secondary/mart/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +164 172 164 +180 189 189 +238 246 246 +238 246 238 +213 230 222 +197 205 197 +255 0 255 +255 0 255 +156 205 255 +106 164 238 +74 139 230 +57 131 205 +41 98 189 +255 0 255 diff --git a/data/tilesets/secondary/mart/tiles.png b/data/tilesets/secondary/mart/tiles.png new file mode 100644 index 000000000..2bfeb4080 Binary files /dev/null and b/data/tilesets/secondary/mart/tiles.png differ diff --git a/data/tilesets/secondary/mt_ember/metatile_attributes.bin b/data/tilesets/secondary/mt_ember/metatile_attributes.bin new file mode 100644 index 000000000..45432b773 Binary files /dev/null and b/data/tilesets/secondary/mt_ember/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/mt_ember/metatiles.bin b/data/tilesets/secondary/mt_ember/metatiles.bin new file mode 100644 index 000000000..b80796821 Binary files /dev/null and b/data/tilesets/secondary/mt_ember/metatiles.bin differ diff --git a/data/tilesets/secondary/mt_ember/palettes/0.pal b/data/tilesets/secondary/mt_ember/palettes/0.pal new file mode 100644 index 000000000..30ff4070a --- /dev/null +++ b/data/tilesets/secondary/mt_ember/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/mt_ember/palettes/1.pal b/data/tilesets/secondary/mt_ember/palettes/1.pal new file mode 100644 index 000000000..e15d979f1 --- /dev/null +++ b/data/tilesets/secondary/mt_ember/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +222 230 230 +197 205 213 +172 189 205 +123 123 131 +65 49 65 +230 238 238 +90 189 139 +90 90 115 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/mt_ember/palettes/10.pal b/data/tilesets/secondary/mt_ember/palettes/10.pal new file mode 100644 index 000000000..fc340ed15 --- /dev/null +++ b/data/tilesets/secondary/mt_ember/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +255 0 255 +255 0 255 +255 0 255 +0 0 0 +255 238 164 +230 197 139 +205 172 123 +172 139 106 +213 172 172 +197 156 148 +172 123 123 +131 82 74 +115 49 49 +90 24 24 +90 90 98 diff --git a/data/tilesets/secondary/mt_ember/palettes/11.pal b/data/tilesets/secondary/mt_ember/palettes/11.pal new file mode 100644 index 000000000..e07ce6909 --- /dev/null +++ b/data/tilesets/secondary/mt_ember/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +197 197 180 +172 172 156 +148 148 123 +123 123 106 +164 172 172 +255 230 65 +123 123 106 +255 255 255 +74 65 74 +238 238 230 +189 189 180 +230 230 205 +205 205 180 +180 180 164 +164 164 148 diff --git a/data/tilesets/secondary/mt_ember/palettes/12.pal b/data/tilesets/secondary/mt_ember/palettes/12.pal new file mode 100644 index 000000000..cc53a5940 --- /dev/null +++ b/data/tilesets/secondary/mt_ember/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +139 205 246 +98 172 197 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +139 90 90 +106 65 65 +82 49 49 +49 32 32 +24 16 16 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/mt_ember/palettes/13.pal b/data/tilesets/secondary/mt_ember/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/mt_ember/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/mt_ember/palettes/14.pal b/data/tilesets/secondary/mt_ember/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/mt_ember/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/mt_ember/palettes/15.pal b/data/tilesets/secondary/mt_ember/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/mt_ember/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/mt_ember/palettes/2.pal b/data/tilesets/secondary/mt_ember/palettes/2.pal new file mode 100644 index 000000000..372fb5d7c --- /dev/null +++ b/data/tilesets/secondary/mt_ember/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/mt_ember/palettes/3.pal b/data/tilesets/secondary/mt_ember/palettes/3.pal new file mode 100644 index 000000000..973765509 --- /dev/null +++ b/data/tilesets/secondary/mt_ember/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/mt_ember/palettes/4.pal b/data/tilesets/secondary/mt_ember/palettes/4.pal new file mode 100644 index 000000000..91fdcabdf --- /dev/null +++ b/data/tilesets/secondary/mt_ember/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +213 238 255 +172 205 255 +139 180 238 +106 156 230 +74 139 189 +65 123 189 +82 139 205 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +49 115 172 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/mt_ember/palettes/5.pal b/data/tilesets/secondary/mt_ember/palettes/5.pal new file mode 100644 index 000000000..0edb843f5 --- /dev/null +++ b/data/tilesets/secondary/mt_ember/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/mt_ember/palettes/6.pal b/data/tilesets/secondary/mt_ember/palettes/6.pal new file mode 100644 index 000000000..32afdccbb --- /dev/null +++ b/data/tilesets/secondary/mt_ember/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +213 238 255 +172 205 255 +139 180 238 +106 156 230 +65 123 172 +41 98 156 +74 115 197 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +49 115 172 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/mt_ember/palettes/7.pal b/data/tilesets/secondary/mt_ember/palettes/7.pal new file mode 100644 index 000000000..fa9d5d633 --- /dev/null +++ b/data/tilesets/secondary/mt_ember/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +172 123 123 +139 98 98 +115 74 74 +90 49 49 +65 24 24 +41 0 0 +41 41 49 diff --git a/data/tilesets/secondary/mt_ember/palettes/8.pal b/data/tilesets/secondary/mt_ember/palettes/8.pal new file mode 100644 index 000000000..f4a797b87 --- /dev/null +++ b/data/tilesets/secondary/mt_ember/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +197 197 180 +172 172 156 +148 148 123 +123 123 106 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +213 172 172 +197 156 148 +172 123 123 +131 82 74 +115 49 49 +90 24 24 +90 90 98 diff --git a/data/tilesets/secondary/mt_ember/palettes/9.pal b/data/tilesets/secondary/mt_ember/palettes/9.pal new file mode 100644 index 000000000..0a2109195 --- /dev/null +++ b/data/tilesets/secondary/mt_ember/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +197 197 180 +172 172 156 +148 148 123 +123 123 106 +255 238 164 +230 197 139 +205 172 123 +164 123 90 +148 115 74 +106 65 41 +74 74 57 +0 0 0 +98 139 197 +74 115 172 +57 98 156 diff --git a/data/tilesets/secondary/mt_ember/tiles.png b/data/tilesets/secondary/mt_ember/tiles.png new file mode 100644 index 000000000..04d2b7b67 Binary files /dev/null and b/data/tilesets/secondary/mt_ember/tiles.png differ diff --git a/data/tilesets/secondary/museum/metatile_attributes.bin b/data/tilesets/secondary/museum/metatile_attributes.bin new file mode 100644 index 000000000..097e93ce1 Binary files /dev/null and b/data/tilesets/secondary/museum/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/museum/metatiles.bin b/data/tilesets/secondary/museum/metatiles.bin new file mode 100644 index 000000000..993b73cbd Binary files /dev/null and b/data/tilesets/secondary/museum/metatiles.bin differ diff --git a/data/tilesets/secondary/museum/palettes/0.pal b/data/tilesets/secondary/museum/palettes/0.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/museum/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/museum/palettes/1.pal b/data/tilesets/secondary/museum/palettes/1.pal new file mode 100644 index 000000000..69f3f0b9e --- /dev/null +++ b/data/tilesets/secondary/museum/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +180 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +238 246 238 diff --git a/data/tilesets/secondary/museum/palettes/10.pal b/data/tilesets/secondary/museum/palettes/10.pal new file mode 100644 index 000000000..fc8da5d40 --- /dev/null +++ b/data/tilesets/secondary/museum/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +98 98 74 +164 139 82 +222 205 74 +65 123 164 +82 139 197 +98 189 213 +148 213 213 +180 238 230 +189 197 205 +238 246 238 +222 222 172 +205 131 82 +246 172 106 diff --git a/data/tilesets/secondary/museum/palettes/11.pal b/data/tilesets/secondary/museum/palettes/11.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/museum/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/museum/palettes/12.pal b/data/tilesets/secondary/museum/palettes/12.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/museum/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/museum/palettes/13.pal b/data/tilesets/secondary/museum/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/museum/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/museum/palettes/14.pal b/data/tilesets/secondary/museum/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/museum/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/museum/palettes/15.pal b/data/tilesets/secondary/museum/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/museum/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/museum/palettes/2.pal b/data/tilesets/secondary/museum/palettes/2.pal new file mode 100644 index 000000000..330e35b02 --- /dev/null +++ b/data/tilesets/secondary/museum/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +213 131 82 +156 205 246 +98 156 238 +57 123 222 +222 139 106 +189 98 74 diff --git a/data/tilesets/secondary/museum/palettes/3.pal b/data/tilesets/secondary/museum/palettes/3.pal new file mode 100644 index 000000000..1520bed0b --- /dev/null +++ b/data/tilesets/secondary/museum/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +148 148 148 +180 180 180 +255 255 255 +238 246 238 +222 238 222 +197 205 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +90 90 90 +115 106 98 +148 123 98 diff --git a/data/tilesets/secondary/museum/palettes/4.pal b/data/tilesets/secondary/museum/palettes/4.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/museum/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/museum/palettes/5.pal b/data/tilesets/secondary/museum/palettes/5.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/museum/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/museum/palettes/6.pal b/data/tilesets/secondary/museum/palettes/6.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/museum/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/museum/palettes/7.pal b/data/tilesets/secondary/museum/palettes/7.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/museum/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/museum/palettes/8.pal b/data/tilesets/secondary/museum/palettes/8.pal new file mode 100644 index 000000000..223737ab6 --- /dev/null +++ b/data/tilesets/secondary/museum/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +106 98 74 +139 123 74 +164 139 74 +222 205 74 +123 123 123 +189 197 205 +238 246 238 +98 90 98 +156 131 106 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/museum/palettes/9.pal b/data/tilesets/secondary/museum/palettes/9.pal new file mode 100644 index 000000000..6de173f90 --- /dev/null +++ b/data/tilesets/secondary/museum/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +98 98 74 +164 139 82 +222 205 74 +255 0 255 +255 0 255 +213 213 156 +222 230 172 +246 246 238 +90 90 98 +115 115 106 +156 131 106 +205 131 82 +238 164 106 diff --git a/data/tilesets/secondary/museum/tiles.png b/data/tilesets/secondary/museum/tiles.png new file mode 100644 index 000000000..9be5ebca9 Binary files /dev/null and b/data/tilesets/secondary/museum/tiles.png differ diff --git a/data/tilesets/secondary/navel_rock/metatile_attributes.bin b/data/tilesets/secondary/navel_rock/metatile_attributes.bin new file mode 100644 index 000000000..6e3d955e2 Binary files /dev/null and b/data/tilesets/secondary/navel_rock/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/navel_rock/metatiles.bin b/data/tilesets/secondary/navel_rock/metatiles.bin new file mode 100644 index 000000000..7fdc5c55d Binary files /dev/null and b/data/tilesets/secondary/navel_rock/metatiles.bin differ diff --git a/data/tilesets/secondary/navel_rock/palettes/0.pal b/data/tilesets/secondary/navel_rock/palettes/0.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/navel_rock/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/navel_rock/palettes/1.pal b/data/tilesets/secondary/navel_rock/palettes/1.pal new file mode 100644 index 000000000..d8a4e7757 --- /dev/null +++ b/data/tilesets/secondary/navel_rock/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/navel_rock/palettes/10.pal b/data/tilesets/secondary/navel_rock/palettes/10.pal new file mode 100644 index 000000000..334da8f23 --- /dev/null +++ b/data/tilesets/secondary/navel_rock/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +238 238 230 +172 172 164 +74 74 74 +0 0 0 +255 246 180 +238 222 123 +197 205 123 +197 213 205 +255 255 255 +255 255 255 +246 246 238 +222 222 213 +189 189 180 +156 156 139 +98 98 90 diff --git a/data/tilesets/secondary/navel_rock/palettes/11.pal b/data/tilesets/secondary/navel_rock/palettes/11.pal new file mode 100644 index 000000000..0c3d2870e --- /dev/null +++ b/data/tilesets/secondary/navel_rock/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +230 197 65 +197 213 205 +180 197 189 +164 172 172 +205 205 197 +255 230 65 +123 123 131 +255 255 255 +74 65 74 +238 238 230 +189 189 180 +238 238 230 +222 222 213 +205 205 197 +156 156 164 diff --git a/data/tilesets/secondary/navel_rock/palettes/12.pal b/data/tilesets/secondary/navel_rock/palettes/12.pal new file mode 100644 index 000000000..a68c94c2c --- /dev/null +++ b/data/tilesets/secondary/navel_rock/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +197 213 205 +180 197 189 +164 172 172 +131 148 139 +255 0 255 +255 0 255 +255 0 255 +139 156 180 +139 139 164 +131 139 148 +115 115 131 +90 90 106 +82 82 82 +57 65 65 diff --git a/data/tilesets/secondary/navel_rock/palettes/13.pal b/data/tilesets/secondary/navel_rock/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/navel_rock/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/navel_rock/palettes/14.pal b/data/tilesets/secondary/navel_rock/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/navel_rock/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/navel_rock/palettes/15.pal b/data/tilesets/secondary/navel_rock/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/navel_rock/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/navel_rock/palettes/2.pal b/data/tilesets/secondary/navel_rock/palettes/2.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/navel_rock/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/navel_rock/palettes/3.pal b/data/tilesets/secondary/navel_rock/palettes/3.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/secondary/navel_rock/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/navel_rock/palettes/4.pal b/data/tilesets/secondary/navel_rock/palettes/4.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/navel_rock/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/navel_rock/palettes/5.pal b/data/tilesets/secondary/navel_rock/palettes/5.pal new file mode 100644 index 000000000..c5a653979 --- /dev/null +++ b/data/tilesets/secondary/navel_rock/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/navel_rock/palettes/6.pal b/data/tilesets/secondary/navel_rock/palettes/6.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/navel_rock/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/navel_rock/palettes/7.pal b/data/tilesets/secondary/navel_rock/palettes/7.pal new file mode 100644 index 000000000..364379ad9 --- /dev/null +++ b/data/tilesets/secondary/navel_rock/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +255 0 255 +197 213 205 +180 197 189 +164 172 172 +131 148 139 +255 0 255 +246 205 74 +255 0 255 +180 189 197 +180 189 197 +189 197 197 +164 172 172 +131 139 139 +106 106 106 +90 90 82 diff --git a/data/tilesets/secondary/navel_rock/palettes/8.pal b/data/tilesets/secondary/navel_rock/palettes/8.pal new file mode 100644 index 000000000..102aaaf2c --- /dev/null +++ b/data/tilesets/secondary/navel_rock/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +255 0 255 +197 213 205 +180 197 189 +164 172 172 +131 148 139 +255 0 255 +255 0 255 +255 0 255 +255 255 255 +255 255 255 +246 246 238 +222 222 213 +189 189 180 +156 156 139 +98 98 90 diff --git a/data/tilesets/secondary/navel_rock/palettes/9.pal b/data/tilesets/secondary/navel_rock/palettes/9.pal new file mode 100644 index 000000000..91329f82e --- /dev/null +++ b/data/tilesets/secondary/navel_rock/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +238 238 164 +197 213 205 +180 197 189 +164 172 172 +205 205 106 +205 205 197 +172 172 90 +123 131 74 +82 90 32 +106 106 82 +74 74 74 +0 0 0 +98 139 197 +74 115 172 +57 98 156 diff --git a/data/tilesets/secondary/navel_rock/tiles.png b/data/tilesets/secondary/navel_rock/tiles.png new file mode 100644 index 000000000..cbce25763 Binary files /dev/null and b/data/tilesets/secondary/navel_rock/tiles.png differ diff --git a/data/tilesets/secondary/pallet_town/metatile_attributes.bin b/data/tilesets/secondary/pallet_town/metatile_attributes.bin new file mode 100644 index 000000000..2ba2894bc Binary files /dev/null and b/data/tilesets/secondary/pallet_town/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/pallet_town/metatiles.bin b/data/tilesets/secondary/pallet_town/metatiles.bin new file mode 100644 index 000000000..41db27015 Binary files /dev/null and b/data/tilesets/secondary/pallet_town/metatiles.bin differ diff --git a/data/tilesets/secondary/pallet_town/palettes/0.pal b/data/tilesets/secondary/pallet_town/palettes/0.pal new file mode 100644 index 000000000..42246e9ea --- /dev/null +++ b/data/tilesets/secondary/pallet_town/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 139 49 +57 82 0 +115 98 98 +65 57 49 +255 255 255 +139 213 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 189 139 +24 172 106 diff --git a/data/tilesets/secondary/pallet_town/palettes/1.pal b/data/tilesets/secondary/pallet_town/palettes/1.pal new file mode 100644 index 000000000..28db536cb --- /dev/null +++ b/data/tilesets/secondary/pallet_town/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +238 238 238 +222 222 230 +172 189 205 +131 131 139 +65 49 65 +139 230 189 +74 205 131 +65 172 115 +238 213 197 +222 189 164 +189 148 139 +156 115 115 +123 82 82 +90 57 74 +115 205 164 diff --git a/data/tilesets/secondary/pallet_town/palettes/10.pal b/data/tilesets/secondary/pallet_town/palettes/10.pal new file mode 100644 index 000000000..1958eff11 --- /dev/null +++ b/data/tilesets/secondary/pallet_town/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 205 148 +246 246 255 +189 197 222 +156 172 189 +123 123 131 +90 90 115 +65 74 106 +156 205 246 +98 156 238 +98 156 238 +205 139 148 +189 123 131 +164 90 106 +139 65 82 +32 172 98 diff --git a/data/tilesets/secondary/pallet_town/palettes/11.pal b/data/tilesets/secondary/pallet_town/palettes/11.pal new file mode 100644 index 000000000..896c79281 --- /dev/null +++ b/data/tilesets/secondary/pallet_town/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +238 255 255 +156 230 197 +148 222 189 +139 213 189 +255 0 255 +255 0 255 +255 0 255 +189 238 213 +115 205 164 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/pallet_town/palettes/12.pal b/data/tilesets/secondary/pallet_town/palettes/12.pal new file mode 100644 index 000000000..2bfc45b6d --- /dev/null +++ b/data/tilesets/secondary/pallet_town/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +156 230 197 +148 222 189 +139 213 189 +238 213 197 +222 189 164 +189 148 139 +156 115 115 +123 82 82 +90 57 74 +189 238 213 diff --git a/data/tilesets/secondary/pallet_town/palettes/13.pal b/data/tilesets/secondary/pallet_town/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pallet_town/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pallet_town/palettes/14.pal b/data/tilesets/secondary/pallet_town/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pallet_town/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pallet_town/palettes/15.pal b/data/tilesets/secondary/pallet_town/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pallet_town/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pallet_town/palettes/2.pal b/data/tilesets/secondary/pallet_town/palettes/2.pal new file mode 100644 index 000000000..937cec4da --- /dev/null +++ b/data/tilesets/secondary/pallet_town/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 41 82 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +115 82 74 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +197 172 139 diff --git a/data/tilesets/secondary/pallet_town/palettes/3.pal b/data/tilesets/secondary/pallet_town/palettes/3.pal new file mode 100644 index 000000000..6d1dfb5af --- /dev/null +++ b/data/tilesets/secondary/pallet_town/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 238 246 +189 139 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +172 32 41 diff --git a/data/tilesets/secondary/pallet_town/palettes/4.pal b/data/tilesets/secondary/pallet_town/palettes/4.pal new file mode 100644 index 000000000..cde020d4e --- /dev/null +++ b/data/tilesets/secondary/pallet_town/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +222 230 238 +230 213 164 +205 197 148 +222 180 164 +156 164 189 +82 106 213 +65 90 189 +57 82 156 +41 65 139 +172 197 230 +139 164 222 +106 131 213 +82 106 213 +189 148 139 diff --git a/data/tilesets/secondary/pallet_town/palettes/5.pal b/data/tilesets/secondary/pallet_town/palettes/5.pal new file mode 100644 index 000000000..bdcc7b8ed --- /dev/null +++ b/data/tilesets/secondary/pallet_town/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +238 222 164 +222 205 131 +205 180 106 +180 139 74 +238 230 172 +246 238 205 +222 205 131 +255 0 255 +65 189 139 +115 205 164 diff --git a/data/tilesets/secondary/pallet_town/palettes/6.pal b/data/tilesets/secondary/pallet_town/palettes/6.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pallet_town/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pallet_town/palettes/7.pal b/data/tilesets/secondary/pallet_town/palettes/7.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/pallet_town/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pallet_town/palettes/8.pal b/data/tilesets/secondary/pallet_town/palettes/8.pal new file mode 100644 index 000000000..dcecb9c40 --- /dev/null +++ b/data/tilesets/secondary/pallet_town/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +246 246 255 +222 230 246 +189 197 222 +156 172 189 +123 123 131 +90 90 115 +65 74 106 +156 205 246 +98 156 238 +57 123 222 +255 205 180 +246 164 131 +222 139 106 +189 98 74 +123 205 164 diff --git a/data/tilesets/secondary/pallet_town/palettes/9.pal b/data/tilesets/secondary/pallet_town/palettes/9.pal new file mode 100644 index 000000000..90bb77517 --- /dev/null +++ b/data/tilesets/secondary/pallet_town/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +246 246 255 +222 230 246 +189 197 222 +156 172 189 +123 123 131 +90 90 115 +65 74 106 +156 205 246 +98 156 238 +57 123 222 +246 238 197 +230 222 148 +213 189 106 +197 148 74 +222 205 123 diff --git a/data/tilesets/secondary/pallet_town/tiles.png b/data/tilesets/secondary/pallet_town/tiles.png new file mode 100644 index 000000000..771eed906 Binary files /dev/null and b/data/tilesets/secondary/pallet_town/tiles.png differ diff --git a/data/tilesets/secondary/pewter_city/metatile_attributes.bin b/data/tilesets/secondary/pewter_city/metatile_attributes.bin new file mode 100644 index 000000000..4e19ca185 Binary files /dev/null and b/data/tilesets/secondary/pewter_city/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/pewter_city/metatiles.bin b/data/tilesets/secondary/pewter_city/metatiles.bin new file mode 100644 index 000000000..a23224773 Binary files /dev/null and b/data/tilesets/secondary/pewter_city/metatiles.bin differ diff --git a/data/tilesets/secondary/pewter_city/palettes/0.pal b/data/tilesets/secondary/pewter_city/palettes/0.pal new file mode 100644 index 000000000..620015e77 --- /dev/null +++ b/data/tilesets/secondary/pewter_city/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 139 49 +57 82 0 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/pewter_city/palettes/1.pal b/data/tilesets/secondary/pewter_city/palettes/1.pal new file mode 100644 index 000000000..60de8c7ad --- /dev/null +++ b/data/tilesets/secondary/pewter_city/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +255 0 255 +255 0 255 +238 213 197 +222 189 164 +189 148 139 +156 115 115 +123 82 82 +90 57 74 +115 205 164 diff --git a/data/tilesets/secondary/pewter_city/palettes/10.pal b/data/tilesets/secondary/pewter_city/palettes/10.pal new file mode 100644 index 000000000..76fda8006 --- /dev/null +++ b/data/tilesets/secondary/pewter_city/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +230 238 255 +180 197 213 +131 148 164 +123 123 131 +90 90 115 +57 65 98 +255 246 238 +213 197 189 +172 156 148 +131 123 115 +246 213 246 +238 189 213 +197 115 180 +172 106 131 diff --git a/data/tilesets/secondary/pewter_city/palettes/11.pal b/data/tilesets/secondary/pewter_city/palettes/11.pal new file mode 100644 index 000000000..3f8fdc519 --- /dev/null +++ b/data/tilesets/secondary/pewter_city/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +123 123 131 +230 238 255 +197 205 222 +164 180 197 +156 205 246 +98 156 238 +57 65 98 +255 246 238 +213 197 189 +172 156 148 +131 123 115 +57 123 222 +238 238 246 +213 222 222 +197 197 213 diff --git a/data/tilesets/secondary/pewter_city/palettes/12.pal b/data/tilesets/secondary/pewter_city/palettes/12.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/pewter_city/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pewter_city/palettes/13.pal b/data/tilesets/secondary/pewter_city/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pewter_city/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pewter_city/palettes/14.pal b/data/tilesets/secondary/pewter_city/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pewter_city/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pewter_city/palettes/15.pal b/data/tilesets/secondary/pewter_city/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pewter_city/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pewter_city/palettes/2.pal b/data/tilesets/secondary/pewter_city/palettes/2.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/pewter_city/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/pewter_city/palettes/3.pal b/data/tilesets/secondary/pewter_city/palettes/3.pal new file mode 100644 index 000000000..9581f2cd8 --- /dev/null +++ b/data/tilesets/secondary/pewter_city/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 131 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/pewter_city/palettes/4.pal b/data/tilesets/secondary/pewter_city/palettes/4.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/pewter_city/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/pewter_city/palettes/5.pal b/data/tilesets/secondary/pewter_city/palettes/5.pal new file mode 100644 index 000000000..3a2db72a7 --- /dev/null +++ b/data/tilesets/secondary/pewter_city/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +222 205 131 +205 180 106 +180 139 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/pewter_city/palettes/6.pal b/data/tilesets/secondary/pewter_city/palettes/6.pal new file mode 100644 index 000000000..93518605a --- /dev/null +++ b/data/tilesets/secondary/pewter_city/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/pewter_city/palettes/7.pal b/data/tilesets/secondary/pewter_city/palettes/7.pal new file mode 100644 index 000000000..93518605a --- /dev/null +++ b/data/tilesets/secondary/pewter_city/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/pewter_city/palettes/8.pal b/data/tilesets/secondary/pewter_city/palettes/8.pal new file mode 100644 index 000000000..d404706ab --- /dev/null +++ b/data/tilesets/secondary/pewter_city/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 41 82 +246 246 255 +230 238 255 +197 205 222 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 205 246 +98 156 238 +57 123 222 +222 106 98 +205 82 74 +222 230 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/pewter_city/palettes/9.pal b/data/tilesets/secondary/pewter_city/palettes/9.pal new file mode 100644 index 000000000..cacf892a6 --- /dev/null +++ b/data/tilesets/secondary/pewter_city/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 205 246 +98 156 238 +57 123 222 +222 197 139 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/pewter_city/tiles.png b/data/tilesets/secondary/pewter_city/tiles.png new file mode 100644 index 000000000..d3148ba5a Binary files /dev/null and b/data/tilesets/secondary/pewter_city/tiles.png differ diff --git a/data/tilesets/secondary/pewter_gym/metatile_attributes.bin b/data/tilesets/secondary/pewter_gym/metatile_attributes.bin new file mode 100644 index 000000000..ead3610f0 Binary files /dev/null and b/data/tilesets/secondary/pewter_gym/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/pewter_gym/metatiles.bin b/data/tilesets/secondary/pewter_gym/metatiles.bin new file mode 100644 index 000000000..7034bb6d6 Binary files /dev/null and b/data/tilesets/secondary/pewter_gym/metatiles.bin differ diff --git a/data/tilesets/secondary/pewter_gym/palettes/0.pal b/data/tilesets/secondary/pewter_gym/palettes/0.pal new file mode 100644 index 000000000..8db07d418 --- /dev/null +++ b/data/tilesets/secondary/pewter_gym/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/pewter_gym/palettes/1.pal b/data/tilesets/secondary/pewter_gym/palettes/1.pal new file mode 100644 index 000000000..66561f6d3 --- /dev/null +++ b/data/tilesets/secondary/pewter_gym/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +139 180 222 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/pewter_gym/palettes/10.pal b/data/tilesets/secondary/pewter_gym/palettes/10.pal new file mode 100644 index 000000000..131aaa71c --- /dev/null +++ b/data/tilesets/secondary/pewter_gym/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/pewter_gym/palettes/11.pal b/data/tilesets/secondary/pewter_gym/palettes/11.pal new file mode 100644 index 000000000..131aaa71c --- /dev/null +++ b/data/tilesets/secondary/pewter_gym/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/pewter_gym/palettes/12.pal b/data/tilesets/secondary/pewter_gym/palettes/12.pal new file mode 100644 index 000000000..c8dfac7d2 --- /dev/null +++ b/data/tilesets/secondary/pewter_gym/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 131 131 +98 74 49 +131 106 82 +164 139 115 +197 189 139 +148 148 156 +172 172 172 +172 189 115 +205 222 148 +98 131 131 +131 164 164 +164 197 197 +82 82 106 +123 123 139 +205 205 197 +255 255 255 diff --git a/data/tilesets/secondary/pewter_gym/palettes/13.pal b/data/tilesets/secondary/pewter_gym/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pewter_gym/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pewter_gym/palettes/14.pal b/data/tilesets/secondary/pewter_gym/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pewter_gym/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pewter_gym/palettes/15.pal b/data/tilesets/secondary/pewter_gym/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pewter_gym/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pewter_gym/palettes/2.pal b/data/tilesets/secondary/pewter_gym/palettes/2.pal new file mode 100644 index 000000000..87a022102 --- /dev/null +++ b/data/tilesets/secondary/pewter_gym/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +90 90 115 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/pewter_gym/palettes/3.pal b/data/tilesets/secondary/pewter_gym/palettes/3.pal new file mode 100644 index 000000000..783496dcd --- /dev/null +++ b/data/tilesets/secondary/pewter_gym/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +65 98 156 +90 123 180 +115 156 197 +222 213 131 +164 164 172 +205 205 213 +238 238 246 +106 172 115 +156 205 139 diff --git a/data/tilesets/secondary/pewter_gym/palettes/4.pal b/data/tilesets/secondary/pewter_gym/palettes/4.pal new file mode 100644 index 000000000..89eace605 --- /dev/null +++ b/data/tilesets/secondary/pewter_gym/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 238 246 +172 197 180 +197 222 205 +90 189 172 +246 238 156 +205 189 131 +189 164 123 +148 131 106 +106 106 106 +213 222 230 +238 180 115 diff --git a/data/tilesets/secondary/pewter_gym/palettes/5.pal b/data/tilesets/secondary/pewter_gym/palettes/5.pal new file mode 100644 index 000000000..0eef3df8e --- /dev/null +++ b/data/tilesets/secondary/pewter_gym/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +213 222 222 +164 180 189 +255 0 255 +131 115 74 +213 213 148 +197 189 139 +172 156 115 +148 131 90 +255 0 255 +255 0 255 +0 0 0 diff --git a/data/tilesets/secondary/pewter_gym/palettes/6.pal b/data/tilesets/secondary/pewter_gym/palettes/6.pal new file mode 100644 index 000000000..1d08ce9a2 --- /dev/null +++ b/data/tilesets/secondary/pewter_gym/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pewter_gym/palettes/7.pal b/data/tilesets/secondary/pewter_gym/palettes/7.pal new file mode 100644 index 000000000..34c0ddd17 --- /dev/null +++ b/data/tilesets/secondary/pewter_gym/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 131 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +82 82 106 +123 123 139 +205 205 197 +255 255 255 diff --git a/data/tilesets/secondary/pewter_gym/palettes/8.pal b/data/tilesets/secondary/pewter_gym/palettes/8.pal new file mode 100644 index 000000000..77e03a48c --- /dev/null +++ b/data/tilesets/secondary/pewter_gym/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +172 172 164 +222 213 139 +180 172 98 +156 148 82 +213 255 197 +164 230 148 +123 172 148 +148 213 164 +156 74 41 +180 90 65 +213 131 106 +238 164 139 +246 238 205 diff --git a/data/tilesets/secondary/pewter_gym/palettes/9.pal b/data/tilesets/secondary/pewter_gym/palettes/9.pal new file mode 100644 index 000000000..ef91ae987 --- /dev/null +++ b/data/tilesets/secondary/pewter_gym/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +172 172 164 +156 189 131 +222 205 115 +156 148 82 +123 106 57 +74 131 164 +98 172 205 +49 139 49 +106 205 164 +156 148 82 +115 164 106 +205 230 197 +238 255 238 diff --git a/data/tilesets/secondary/pewter_gym/tiles.png b/data/tilesets/secondary/pewter_gym/tiles.png new file mode 100644 index 000000000..6e97a68a1 Binary files /dev/null and b/data/tilesets/secondary/pewter_gym/tiles.png differ diff --git a/data/tilesets/secondary/pokemon_center/metatile_attributes.bin b/data/tilesets/secondary/pokemon_center/metatile_attributes.bin new file mode 100644 index 000000000..f9bd3d289 Binary files /dev/null and b/data/tilesets/secondary/pokemon_center/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/pokemon_center/metatiles.bin b/data/tilesets/secondary/pokemon_center/metatiles.bin new file mode 100644 index 000000000..2ec8817bc Binary files /dev/null and b/data/tilesets/secondary/pokemon_center/metatiles.bin differ diff --git a/data/tilesets/secondary/pokemon_center/palettes/0.pal b/data/tilesets/secondary/pokemon_center/palettes/0.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/pokemon_center/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/pokemon_center/palettes/1.pal b/data/tilesets/secondary/pokemon_center/palettes/1.pal new file mode 100644 index 000000000..d99adafff --- /dev/null +++ b/data/tilesets/secondary/pokemon_center/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/pokemon_center/palettes/10.pal b/data/tilesets/secondary/pokemon_center/palettes/10.pal new file mode 100644 index 000000000..62e3e6d6b --- /dev/null +++ b/data/tilesets/secondary/pokemon_center/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +189 98 74 +255 131 115 +255 0 255 +255 0 255 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +189 230 255 +189 230 255 +156 189 213 +90 131 180 diff --git a/data/tilesets/secondary/pokemon_center/palettes/11.pal b/data/tilesets/secondary/pokemon_center/palettes/11.pal new file mode 100644 index 000000000..7ba7bccca --- /dev/null +++ b/data/tilesets/secondary/pokemon_center/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 222 156 +82 82 106 +123 123 123 +180 180 164 +222 230 230 +180 213 230 +131 180 205 +98 156 164 +57 115 139 +255 65 0 +205 49 0 +8 90 255 +0 57 197 +255 180 0 +0 230 115 +255 255 255 diff --git a/data/tilesets/secondary/pokemon_center/palettes/12.pal b/data/tilesets/secondary/pokemon_center/palettes/12.pal new file mode 100644 index 000000000..0f1f36738 --- /dev/null +++ b/data/tilesets/secondary/pokemon_center/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +164 172 164 +180 189 189 +255 255 255 +115 115 123 +213 205 156 +238 238 172 +197 180 139 +230 222 156 +246 246 205 +0 82 123 +57 139 180 +115 197 238 +222 230 222 +131 131 139 diff --git a/data/tilesets/secondary/pokemon_center/palettes/13.pal b/data/tilesets/secondary/pokemon_center/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_center/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_center/palettes/14.pal b/data/tilesets/secondary/pokemon_center/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_center/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_center/palettes/15.pal b/data/tilesets/secondary/pokemon_center/palettes/15.pal new file mode 100644 index 000000000..92e7ed309 --- /dev/null +++ b/data/tilesets/secondary/pokemon_center/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_center/palettes/2.pal b/data/tilesets/secondary/pokemon_center/palettes/2.pal new file mode 100644 index 000000000..cc3a9457d --- /dev/null +++ b/data/tilesets/secondary/pokemon_center/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/pokemon_center/palettes/3.pal b/data/tilesets/secondary/pokemon_center/palettes/3.pal new file mode 100644 index 000000000..7ec794ae5 --- /dev/null +++ b/data/tilesets/secondary/pokemon_center/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/pokemon_center/palettes/4.pal b/data/tilesets/secondary/pokemon_center/palettes/4.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/pokemon_center/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_center/palettes/5.pal b/data/tilesets/secondary/pokemon_center/palettes/5.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/pokemon_center/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_center/palettes/6.pal b/data/tilesets/secondary/pokemon_center/palettes/6.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_center/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_center/palettes/7.pal b/data/tilesets/secondary/pokemon_center/palettes/7.pal new file mode 100644 index 000000000..27ca86ca3 --- /dev/null +++ b/data/tilesets/secondary/pokemon_center/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 222 205 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/pokemon_center/palettes/8.pal b/data/tilesets/secondary/pokemon_center/palettes/8.pal new file mode 100644 index 000000000..6b6a0f25f --- /dev/null +++ b/data/tilesets/secondary/pokemon_center/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +131 205 139 +230 189 115 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/pokemon_center/palettes/9.pal b/data/tilesets/secondary/pokemon_center/palettes/9.pal new file mode 100644 index 000000000..4b279ecf9 --- /dev/null +++ b/data/tilesets/secondary/pokemon_center/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 255 0 +82 82 106 +148 148 164 +205 189 197 +255 255 255 +189 148 49 +156 115 90 +197 238 148 +156 197 74 +106 164 41 +197 222 205 +139 180 172 +172 205 180 +123 123 139 +255 98 49 +238 222 164 diff --git a/data/tilesets/secondary/pokemon_center/tiles.png b/data/tilesets/secondary/pokemon_center/tiles.png new file mode 100644 index 000000000..92d0112f3 Binary files /dev/null and b/data/tilesets/secondary/pokemon_center/tiles.png differ diff --git a/data/tilesets/secondary/pokemon_league/metatile_attributes.bin b/data/tilesets/secondary/pokemon_league/metatile_attributes.bin new file mode 100644 index 000000000..bcc2fedb4 Binary files /dev/null and b/data/tilesets/secondary/pokemon_league/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/pokemon_league/metatiles.bin b/data/tilesets/secondary/pokemon_league/metatiles.bin new file mode 100644 index 000000000..7cdfa846a Binary files /dev/null and b/data/tilesets/secondary/pokemon_league/metatiles.bin differ diff --git a/data/tilesets/secondary/pokemon_league/palettes/0.pal b/data/tilesets/secondary/pokemon_league/palettes/0.pal new file mode 100644 index 000000000..8db07d418 --- /dev/null +++ b/data/tilesets/secondary/pokemon_league/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/pokemon_league/palettes/1.pal b/data/tilesets/secondary/pokemon_league/palettes/1.pal new file mode 100644 index 000000000..fc945ef6c --- /dev/null +++ b/data/tilesets/secondary/pokemon_league/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +139 180 222 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/pokemon_league/palettes/10.pal b/data/tilesets/secondary/pokemon_league/palettes/10.pal new file mode 100644 index 000000000..18908d2ef --- /dev/null +++ b/data/tilesets/secondary/pokemon_league/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +255 255 255 +222 222 222 +106 115 115 +230 197 246 +180 82 205 +148 57 180 +230 222 123 +189 180 82 +230 230 172 +222 213 139 +222 164 164 +205 139 139 +205 180 238 +189 148 230 +164 131 205 diff --git a/data/tilesets/secondary/pokemon_league/palettes/11.pal b/data/tilesets/secondary/pokemon_league/palettes/11.pal new file mode 100644 index 000000000..edc05893b --- /dev/null +++ b/data/tilesets/secondary/pokemon_league/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +82 164 164 +255 255 255 +230 230 230 +123 123 123 +189 189 197 +148 148 156 +213 213 222 +98 98 106 +180 180 164 +230 172 164 +197 131 131 +180 82 205 +148 57 180 +106 189 189 +82 164 164 +57 139 139 diff --git a/data/tilesets/secondary/pokemon_league/palettes/12.pal b/data/tilesets/secondary/pokemon_league/palettes/12.pal new file mode 100644 index 000000000..36807053a --- /dev/null +++ b/data/tilesets/secondary/pokemon_league/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +74 90 98 +98 123 139 +164 197 197 +222 238 238 +255 255 255 +123 123 123 +180 82 205 +131 49 164 +131 164 164 +230 213 156 +255 0 255 +213 131 222 +255 246 156 +90 16 131 +41 49 57 diff --git a/data/tilesets/secondary/pokemon_league/palettes/13.pal b/data/tilesets/secondary/pokemon_league/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_league/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_league/palettes/14.pal b/data/tilesets/secondary/pokemon_league/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_league/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_league/palettes/15.pal b/data/tilesets/secondary/pokemon_league/palettes/15.pal new file mode 100644 index 000000000..0b5e86def --- /dev/null +++ b/data/tilesets/secondary/pokemon_league/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +131 230 255 diff --git a/data/tilesets/secondary/pokemon_league/palettes/2.pal b/data/tilesets/secondary/pokemon_league/palettes/2.pal new file mode 100644 index 000000000..87a022102 --- /dev/null +++ b/data/tilesets/secondary/pokemon_league/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +90 90 115 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/pokemon_league/palettes/3.pal b/data/tilesets/secondary/pokemon_league/palettes/3.pal new file mode 100644 index 000000000..783496dcd --- /dev/null +++ b/data/tilesets/secondary/pokemon_league/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +65 98 156 +90 123 180 +115 156 197 +222 213 131 +164 164 172 +205 205 213 +238 238 246 +106 172 115 +156 205 139 diff --git a/data/tilesets/secondary/pokemon_league/palettes/4.pal b/data/tilesets/secondary/pokemon_league/palettes/4.pal new file mode 100644 index 000000000..89eace605 --- /dev/null +++ b/data/tilesets/secondary/pokemon_league/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 238 246 +172 197 180 +197 222 205 +90 189 172 +246 238 156 +205 189 131 +189 164 123 +148 131 106 +106 106 106 +213 222 230 +238 180 115 diff --git a/data/tilesets/secondary/pokemon_league/palettes/5.pal b/data/tilesets/secondary/pokemon_league/palettes/5.pal new file mode 100644 index 000000000..34ef2f2d2 --- /dev/null +++ b/data/tilesets/secondary/pokemon_league/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +213 222 222 +164 180 189 +222 164 115 +131 115 74 +213 213 148 +197 189 139 +172 156 115 +148 131 90 +197 197 205 +205 82 65 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_league/palettes/6.pal b/data/tilesets/secondary/pokemon_league/palettes/6.pal new file mode 100644 index 000000000..1d08ce9a2 --- /dev/null +++ b/data/tilesets/secondary/pokemon_league/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_league/palettes/7.pal b/data/tilesets/secondary/pokemon_league/palettes/7.pal new file mode 100644 index 000000000..6528f9f75 --- /dev/null +++ b/data/tilesets/secondary/pokemon_league/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +82 82 106 +82 82 106 +82 82 106 +82 82 106 +82 82 106 +82 82 106 diff --git a/data/tilesets/secondary/pokemon_league/palettes/8.pal b/data/tilesets/secondary/pokemon_league/palettes/8.pal new file mode 100644 index 000000000..6b56cd49e --- /dev/null +++ b/data/tilesets/secondary/pokemon_league/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +255 255 255 +222 222 222 +106 115 115 +189 230 255 +123 205 255 +98 180 246 +49 139 213 +180 180 164 +172 213 222 +156 197 205 +180 156 222 +156 131 205 +139 197 230 +131 172 222 +98 148 197 diff --git a/data/tilesets/secondary/pokemon_league/palettes/9.pal b/data/tilesets/secondary/pokemon_league/palettes/9.pal new file mode 100644 index 000000000..5c2ed43a0 --- /dev/null +++ b/data/tilesets/secondary/pokemon_league/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +255 255 255 +222 222 222 +106 115 115 +222 230 238 +180 197 205 +148 164 180 +131 139 139 +238 238 238 +230 230 230 +213 213 213 +139 213 156 +123 189 139 +230 222 123 +213 205 106 +189 180 90 diff --git a/data/tilesets/secondary/pokemon_league/tiles.png b/data/tilesets/secondary/pokemon_league/tiles.png new file mode 100644 index 000000000..0f65e1ff3 Binary files /dev/null and b/data/tilesets/secondary/pokemon_league/tiles.png differ diff --git a/data/tilesets/secondary/pokemon_mansion/metatile_attributes.bin b/data/tilesets/secondary/pokemon_mansion/metatile_attributes.bin new file mode 100644 index 000000000..91b8105d3 Binary files /dev/null and b/data/tilesets/secondary/pokemon_mansion/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/pokemon_mansion/metatiles.bin b/data/tilesets/secondary/pokemon_mansion/metatiles.bin new file mode 100644 index 000000000..5caba25a7 Binary files /dev/null and b/data/tilesets/secondary/pokemon_mansion/metatiles.bin differ diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/0.pal b/data/tilesets/secondary/pokemon_mansion/palettes/0.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_mansion/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/1.pal b/data/tilesets/secondary/pokemon_mansion/palettes/1.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_mansion/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/10.pal b/data/tilesets/secondary/pokemon_mansion/palettes/10.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_mansion/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/11.pal b/data/tilesets/secondary/pokemon_mansion/palettes/11.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_mansion/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/12.pal b/data/tilesets/secondary/pokemon_mansion/palettes/12.pal new file mode 100644 index 000000000..9c9a571ef --- /dev/null +++ b/data/tilesets/secondary/pokemon_mansion/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 148 +164 98 74 +222 148 123 +255 189 164 +139 82 57 +189 131 156 +246 205 238 +139 115 49 +156 131 90 +189 164 115 +222 205 156 +255 238 189 +82 82 106 +123 123 139 +205 205 197 +255 255 255 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/13.pal b/data/tilesets/secondary/pokemon_mansion/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_mansion/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/14.pal b/data/tilesets/secondary/pokemon_mansion/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_mansion/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/15.pal b/data/tilesets/secondary/pokemon_mansion/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_mansion/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/2.pal b/data/tilesets/secondary/pokemon_mansion/palettes/2.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_mansion/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/3.pal b/data/tilesets/secondary/pokemon_mansion/palettes/3.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_mansion/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/4.pal b/data/tilesets/secondary/pokemon_mansion/palettes/4.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_mansion/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/5.pal b/data/tilesets/secondary/pokemon_mansion/palettes/5.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_mansion/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/6.pal b/data/tilesets/secondary/pokemon_mansion/palettes/6.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_mansion/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/7.pal b/data/tilesets/secondary/pokemon_mansion/palettes/7.pal new file mode 100644 index 000000000..4d22869cd --- /dev/null +++ b/data/tilesets/secondary/pokemon_mansion/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 148 +82 131 106 +131 180 156 +180 230 205 +180 0 0 +255 0 0 +148 148 156 +172 172 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +82 82 106 +123 123 139 +205 205 197 +255 255 255 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/8.pal b/data/tilesets/secondary/pokemon_mansion/palettes/8.pal new file mode 100644 index 000000000..2a9d791a4 --- /dev/null +++ b/data/tilesets/secondary/pokemon_mansion/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 148 +164 98 74 +222 148 123 +255 189 164 +139 82 57 +172 197 230 +213 222 238 +0 0 0 +0 0 0 +189 164 115 +0 0 0 +255 238 189 +82 82 106 +123 123 139 +205 205 197 +255 255 255 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/9.pal b/data/tilesets/secondary/pokemon_mansion/palettes/9.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_mansion/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_mansion/tiles.png b/data/tilesets/secondary/pokemon_mansion/tiles.png new file mode 100644 index 000000000..3e69db5c3 Binary files /dev/null and b/data/tilesets/secondary/pokemon_mansion/tiles.png differ diff --git a/data/tilesets/secondary/pokemon_tower/metatile_attributes.bin b/data/tilesets/secondary/pokemon_tower/metatile_attributes.bin new file mode 100644 index 000000000..8c16318f0 Binary files /dev/null and b/data/tilesets/secondary/pokemon_tower/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/pokemon_tower/metatiles.bin b/data/tilesets/secondary/pokemon_tower/metatiles.bin new file mode 100644 index 000000000..d4216989e Binary files /dev/null and b/data/tilesets/secondary/pokemon_tower/metatiles.bin differ diff --git a/data/tilesets/secondary/pokemon_tower/palettes/0.pal b/data/tilesets/secondary/pokemon_tower/palettes/0.pal new file mode 100644 index 000000000..8db07d418 --- /dev/null +++ b/data/tilesets/secondary/pokemon_tower/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/1.pal b/data/tilesets/secondary/pokemon_tower/palettes/1.pal new file mode 100644 index 000000000..30be2fbe3 --- /dev/null +++ b/data/tilesets/secondary/pokemon_tower/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/10.pal b/data/tilesets/secondary/pokemon_tower/palettes/10.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/pokemon_tower/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/11.pal b/data/tilesets/secondary/pokemon_tower/palettes/11.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/pokemon_tower/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/12.pal b/data/tilesets/secondary/pokemon_tower/palettes/12.pal new file mode 100644 index 000000000..fa56f966e --- /dev/null +++ b/data/tilesets/secondary/pokemon_tower/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +131 106 189 +156 123 205 +230 230 255 +115 115 123 +106 156 106 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +106 82 156 +156 131 205 +205 172 246 +189 164 230 +115 115 123 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/13.pal b/data/tilesets/secondary/pokemon_tower/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_tower/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/14.pal b/data/tilesets/secondary/pokemon_tower/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_tower/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/15.pal b/data/tilesets/secondary/pokemon_tower/palettes/15.pal new file mode 100644 index 000000000..92e7ed309 --- /dev/null +++ b/data/tilesets/secondary/pokemon_tower/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/2.pal b/data/tilesets/secondary/pokemon_tower/palettes/2.pal new file mode 100644 index 000000000..e7c4b911a --- /dev/null +++ b/data/tilesets/secondary/pokemon_tower/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/3.pal b/data/tilesets/secondary/pokemon_tower/palettes/3.pal new file mode 100644 index 000000000..54b77e0c8 --- /dev/null +++ b/data/tilesets/secondary/pokemon_tower/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/4.pal b/data/tilesets/secondary/pokemon_tower/palettes/4.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/pokemon_tower/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/5.pal b/data/tilesets/secondary/pokemon_tower/palettes/5.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/pokemon_tower/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/6.pal b/data/tilesets/secondary/pokemon_tower/palettes/6.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_tower/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/7.pal b/data/tilesets/secondary/pokemon_tower/palettes/7.pal new file mode 100644 index 000000000..241a2678c --- /dev/null +++ b/data/tilesets/secondary/pokemon_tower/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +115 115 115 +180 180 164 +238 238 246 +82 123 82 +90 131 90 +106 156 106 +131 172 131 +180 156 222 +106 82 156 +139 115 189 +213 189 255 +255 0 255 +65 106 65 +255 255 255 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/8.pal b/data/tilesets/secondary/pokemon_tower/palettes/8.pal new file mode 100644 index 000000000..ebd9e912c --- /dev/null +++ b/data/tilesets/secondary/pokemon_tower/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +115 115 115 +180 180 164 +238 238 246 +98 139 98 +106 156 106 +131 172 131 +148 189 148 +180 156 222 +205 139 32 +222 172 57 +246 238 164 +255 0 255 +82 123 82 +255 255 255 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/9.pal b/data/tilesets/secondary/pokemon_tower/palettes/9.pal new file mode 100644 index 000000000..51daf6701 --- /dev/null +++ b/data/tilesets/secondary/pokemon_tower/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +115 115 115 +180 180 164 +238 238 246 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +172 123 32 +238 189 74 +74 205 205 +164 255 255 +255 255 255 diff --git a/data/tilesets/secondary/pokemon_tower/tiles.png b/data/tilesets/secondary/pokemon_tower/tiles.png new file mode 100644 index 000000000..b8f8c6a4d Binary files /dev/null and b/data/tilesets/secondary/pokemon_tower/tiles.png differ diff --git a/data/tilesets/secondary/power_plant/metatile_attributes.bin b/data/tilesets/secondary/power_plant/metatile_attributes.bin new file mode 100644 index 000000000..1105056c9 Binary files /dev/null and b/data/tilesets/secondary/power_plant/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/power_plant/metatiles.bin b/data/tilesets/secondary/power_plant/metatiles.bin new file mode 100644 index 000000000..7d1e15676 Binary files /dev/null and b/data/tilesets/secondary/power_plant/metatiles.bin differ diff --git a/data/tilesets/secondary/power_plant/palettes/0.pal b/data/tilesets/secondary/power_plant/palettes/0.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/power_plant/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/power_plant/palettes/1.pal b/data/tilesets/secondary/power_plant/palettes/1.pal new file mode 100644 index 000000000..30be2fbe3 --- /dev/null +++ b/data/tilesets/secondary/power_plant/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/power_plant/palettes/10.pal b/data/tilesets/secondary/power_plant/palettes/10.pal new file mode 100644 index 000000000..2a1743eaa --- /dev/null +++ b/data/tilesets/secondary/power_plant/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 205 156 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/power_plant/palettes/11.pal b/data/tilesets/secondary/power_plant/palettes/11.pal new file mode 100644 index 000000000..307e0ea7e --- /dev/null +++ b/data/tilesets/secondary/power_plant/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 205 156 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +0 0 0 diff --git a/data/tilesets/secondary/power_plant/palettes/12.pal b/data/tilesets/secondary/power_plant/palettes/12.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/power_plant/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/power_plant/palettes/13.pal b/data/tilesets/secondary/power_plant/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/power_plant/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/power_plant/palettes/14.pal b/data/tilesets/secondary/power_plant/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/power_plant/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/power_plant/palettes/15.pal b/data/tilesets/secondary/power_plant/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/power_plant/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/power_plant/palettes/2.pal b/data/tilesets/secondary/power_plant/palettes/2.pal new file mode 100644 index 000000000..e7c4b911a --- /dev/null +++ b/data/tilesets/secondary/power_plant/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/power_plant/palettes/3.pal b/data/tilesets/secondary/power_plant/palettes/3.pal new file mode 100644 index 000000000..54b77e0c8 --- /dev/null +++ b/data/tilesets/secondary/power_plant/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/power_plant/palettes/4.pal b/data/tilesets/secondary/power_plant/palettes/4.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/power_plant/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/power_plant/palettes/5.pal b/data/tilesets/secondary/power_plant/palettes/5.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/power_plant/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/power_plant/palettes/6.pal b/data/tilesets/secondary/power_plant/palettes/6.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/power_plant/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/power_plant/palettes/7.pal b/data/tilesets/secondary/power_plant/palettes/7.pal new file mode 100644 index 000000000..b69e6cfa4 --- /dev/null +++ b/data/tilesets/secondary/power_plant/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 205 156 +156 65 65 +57 106 16 +0 0 139 +98 123 156 +131 156 180 +164 189 213 +197 197 148 +213 205 172 +230 222 197 +164 156 164 +205 197 189 +82 82 106 +123 123 139 +246 238 222 +255 255 255 diff --git a/data/tilesets/secondary/power_plant/palettes/8.pal b/data/tilesets/secondary/power_plant/palettes/8.pal new file mode 100644 index 000000000..3cada9fa1 --- /dev/null +++ b/data/tilesets/secondary/power_plant/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 205 156 +180 180 90 +222 222 148 +246 246 180 +156 65 65 +222 131 131 +189 98 98 +255 0 255 +255 0 255 +255 0 255 +164 156 164 +205 197 189 +82 82 106 +123 123 139 +246 238 222 +255 255 255 diff --git a/data/tilesets/secondary/power_plant/palettes/9.pal b/data/tilesets/secondary/power_plant/palettes/9.pal new file mode 100644 index 000000000..2a1743eaa --- /dev/null +++ b/data/tilesets/secondary/power_plant/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 205 156 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/power_plant/tiles.png b/data/tilesets/secondary/power_plant/tiles.png new file mode 100644 index 000000000..d252dbcd3 Binary files /dev/null and b/data/tilesets/secondary/power_plant/tiles.png differ diff --git a/data/tilesets/secondary/restaurant_hotel/metatile_attributes.bin b/data/tilesets/secondary/restaurant_hotel/metatile_attributes.bin new file mode 100644 index 000000000..a2ac291b5 Binary files /dev/null and b/data/tilesets/secondary/restaurant_hotel/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/restaurant_hotel/metatiles.bin b/data/tilesets/secondary/restaurant_hotel/metatiles.bin new file mode 100644 index 000000000..5cddd954c Binary files /dev/null and b/data/tilesets/secondary/restaurant_hotel/metatiles.bin differ diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/0.pal b/data/tilesets/secondary/restaurant_hotel/palettes/0.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/restaurant_hotel/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/1.pal b/data/tilesets/secondary/restaurant_hotel/palettes/1.pal new file mode 100644 index 000000000..30be2fbe3 --- /dev/null +++ b/data/tilesets/secondary/restaurant_hotel/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/10.pal b/data/tilesets/secondary/restaurant_hotel/palettes/10.pal new file mode 100644 index 000000000..c06a049b0 --- /dev/null +++ b/data/tilesets/secondary/restaurant_hotel/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/11.pal b/data/tilesets/secondary/restaurant_hotel/palettes/11.pal new file mode 100644 index 000000000..c06a049b0 --- /dev/null +++ b/data/tilesets/secondary/restaurant_hotel/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/12.pal b/data/tilesets/secondary/restaurant_hotel/palettes/12.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/restaurant_hotel/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/13.pal b/data/tilesets/secondary/restaurant_hotel/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/restaurant_hotel/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/14.pal b/data/tilesets/secondary/restaurant_hotel/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/restaurant_hotel/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/15.pal b/data/tilesets/secondary/restaurant_hotel/palettes/15.pal new file mode 100644 index 000000000..71b5ee827 --- /dev/null +++ b/data/tilesets/secondary/restaurant_hotel/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/2.pal b/data/tilesets/secondary/restaurant_hotel/palettes/2.pal new file mode 100644 index 000000000..e7c4b911a --- /dev/null +++ b/data/tilesets/secondary/restaurant_hotel/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/3.pal b/data/tilesets/secondary/restaurant_hotel/palettes/3.pal new file mode 100644 index 000000000..54b77e0c8 --- /dev/null +++ b/data/tilesets/secondary/restaurant_hotel/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/4.pal b/data/tilesets/secondary/restaurant_hotel/palettes/4.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/restaurant_hotel/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/5.pal b/data/tilesets/secondary/restaurant_hotel/palettes/5.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/restaurant_hotel/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/6.pal b/data/tilesets/secondary/restaurant_hotel/palettes/6.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/restaurant_hotel/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/7.pal b/data/tilesets/secondary/restaurant_hotel/palettes/7.pal new file mode 100644 index 000000000..5e3bac102 --- /dev/null +++ b/data/tilesets/secondary/restaurant_hotel/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +106 197 106 +255 205 90 +82 148 197 +189 230 255 +139 98 41 +156 123 65 +180 148 90 +205 172 115 +246 213 172 +205 106 90 +255 148 131 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/8.pal b/data/tilesets/secondary/restaurant_hotel/palettes/8.pal new file mode 100644 index 000000000..2257c0006 --- /dev/null +++ b/data/tilesets/secondary/restaurant_hotel/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +82 82 106 +131 131 139 +230 222 246 +255 255 255 +255 205 98 +255 255 148 +189 230 255 +180 148 90 +255 139 180 +197 180 131 +213 213 164 +238 238 213 +106 197 106 +205 106 90 +131 115 16 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/9.pal b/data/tilesets/secondary/restaurant_hotel/palettes/9.pal new file mode 100644 index 000000000..c06a049b0 --- /dev/null +++ b/data/tilesets/secondary/restaurant_hotel/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/restaurant_hotel/tiles.png b/data/tilesets/secondary/restaurant_hotel/tiles.png new file mode 100644 index 000000000..5c8a38b9e Binary files /dev/null and b/data/tilesets/secondary/restaurant_hotel/tiles.png differ diff --git a/data/tilesets/secondary/rock_tunnel/metatile_attributes.bin b/data/tilesets/secondary/rock_tunnel/metatile_attributes.bin new file mode 100644 index 000000000..96ef6a853 Binary files /dev/null and b/data/tilesets/secondary/rock_tunnel/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/rock_tunnel/metatiles.bin b/data/tilesets/secondary/rock_tunnel/metatiles.bin new file mode 100644 index 000000000..0ee478c87 Binary files /dev/null and b/data/tilesets/secondary/rock_tunnel/metatiles.bin differ diff --git a/data/tilesets/secondary/rock_tunnel/palettes/0.pal b/data/tilesets/secondary/rock_tunnel/palettes/0.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/rock_tunnel/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/1.pal b/data/tilesets/secondary/rock_tunnel/palettes/1.pal new file mode 100644 index 000000000..d8a4e7757 --- /dev/null +++ b/data/tilesets/secondary/rock_tunnel/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/10.pal b/data/tilesets/secondary/rock_tunnel/palettes/10.pal new file mode 100644 index 000000000..4235579fc --- /dev/null +++ b/data/tilesets/secondary/rock_tunnel/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +255 0 255 +255 0 255 +255 0 255 +0 0 0 +238 238 180 +230 213 123 +205 180 98 +156 156 115 +197 230 230 +180 213 213 +172 189 197 +131 156 156 +90 115 115 +74 82 82 +49 57 57 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/11.pal b/data/tilesets/secondary/rock_tunnel/palettes/11.pal new file mode 100644 index 000000000..277172976 --- /dev/null +++ b/data/tilesets/secondary/rock_tunnel/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +205 189 115 +172 172 115 +156 156 115 +131 131 115 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 156 98 +148 139 98 +115 123 98 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/12.pal b/data/tilesets/secondary/rock_tunnel/palettes/12.pal new file mode 100644 index 000000000..2fa21e9fb --- /dev/null +++ b/data/tilesets/secondary/rock_tunnel/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +0 0 0 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/13.pal b/data/tilesets/secondary/rock_tunnel/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/rock_tunnel/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/14.pal b/data/tilesets/secondary/rock_tunnel/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/rock_tunnel/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/15.pal b/data/tilesets/secondary/rock_tunnel/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/rock_tunnel/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/2.pal b/data/tilesets/secondary/rock_tunnel/palettes/2.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/rock_tunnel/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/3.pal b/data/tilesets/secondary/rock_tunnel/palettes/3.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/secondary/rock_tunnel/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/4.pal b/data/tilesets/secondary/rock_tunnel/palettes/4.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/rock_tunnel/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/5.pal b/data/tilesets/secondary/rock_tunnel/palettes/5.pal new file mode 100644 index 000000000..c5a653979 --- /dev/null +++ b/data/tilesets/secondary/rock_tunnel/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/6.pal b/data/tilesets/secondary/rock_tunnel/palettes/6.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/rock_tunnel/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/7.pal b/data/tilesets/secondary/rock_tunnel/palettes/7.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/rock_tunnel/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/8.pal b/data/tilesets/secondary/rock_tunnel/palettes/8.pal new file mode 100644 index 000000000..34a637b1a --- /dev/null +++ b/data/tilesets/secondary/rock_tunnel/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +205 189 115 +172 172 115 +156 156 115 +131 131 115 +98 106 90 +255 0 255 +255 0 255 +255 0 255 +197 230 230 +180 213 213 +172 189 197 +131 156 156 +90 115 115 +74 82 82 +49 57 57 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/9.pal b/data/tilesets/secondary/rock_tunnel/palettes/9.pal new file mode 100644 index 000000000..f10a94f7c --- /dev/null +++ b/data/tilesets/secondary/rock_tunnel/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +205 189 115 +172 172 115 +156 156 115 +131 131 115 +238 222 123 +255 0 255 +222 180 57 +189 148 57 +148 115 74 +106 106 82 +74 74 74 +0 0 0 +98 139 197 +74 115 172 +57 98 156 diff --git a/data/tilesets/secondary/rock_tunnel/tiles.png b/data/tilesets/secondary/rock_tunnel/tiles.png new file mode 100644 index 000000000..cb4078fa9 Binary files /dev/null and b/data/tilesets/secondary/rock_tunnel/tiles.png differ diff --git a/data/tilesets/secondary/safari_zone_building/metatile_attributes.bin b/data/tilesets/secondary/safari_zone_building/metatile_attributes.bin new file mode 100644 index 000000000..9656d8ed7 Binary files /dev/null and b/data/tilesets/secondary/safari_zone_building/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/safari_zone_building/metatiles.bin b/data/tilesets/secondary/safari_zone_building/metatiles.bin new file mode 100644 index 000000000..3337a5393 Binary files /dev/null and b/data/tilesets/secondary/safari_zone_building/metatiles.bin differ diff --git a/data/tilesets/secondary/safari_zone_building/palettes/0.pal b/data/tilesets/secondary/safari_zone_building/palettes/0.pal new file mode 100644 index 000000000..620015e77 --- /dev/null +++ b/data/tilesets/secondary/safari_zone_building/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 139 49 +57 82 0 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/1.pal b/data/tilesets/secondary/safari_zone_building/palettes/1.pal new file mode 100644 index 000000000..66561f6d3 --- /dev/null +++ b/data/tilesets/secondary/safari_zone_building/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +139 180 222 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/10.pal b/data/tilesets/secondary/safari_zone_building/palettes/10.pal new file mode 100644 index 000000000..1f08b0f6f --- /dev/null +++ b/data/tilesets/secondary/safari_zone_building/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +238 172 115 +205 156 115 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +156 148 98 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/11.pal b/data/tilesets/secondary/safari_zone_building/palettes/11.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/safari_zone_building/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/12.pal b/data/tilesets/secondary/safari_zone_building/palettes/12.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/safari_zone_building/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/13.pal b/data/tilesets/secondary/safari_zone_building/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/safari_zone_building/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/14.pal b/data/tilesets/secondary/safari_zone_building/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/safari_zone_building/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/15.pal b/data/tilesets/secondary/safari_zone_building/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/safari_zone_building/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/2.pal b/data/tilesets/secondary/safari_zone_building/palettes/2.pal new file mode 100644 index 000000000..ddec077d0 --- /dev/null +++ b/data/tilesets/secondary/safari_zone_building/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +115 82 74 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +197 172 139 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/3.pal b/data/tilesets/secondary/safari_zone_building/palettes/3.pal new file mode 100644 index 000000000..6d1dfb5af --- /dev/null +++ b/data/tilesets/secondary/safari_zone_building/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 238 246 +189 139 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +172 32 41 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/4.pal b/data/tilesets/secondary/safari_zone_building/palettes/4.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/safari_zone_building/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/5.pal b/data/tilesets/secondary/safari_zone_building/palettes/5.pal new file mode 100644 index 000000000..9de0ef422 --- /dev/null +++ b/data/tilesets/secondary/safari_zone_building/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +222 205 131 +205 180 106 +180 139 74 +238 238 164 +255 0 255 +255 0 255 +180 222 164 +131 213 164 +115 205 164 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/6.pal b/data/tilesets/secondary/safari_zone_building/palettes/6.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/safari_zone_building/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/7.pal b/data/tilesets/secondary/safari_zone_building/palettes/7.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/safari_zone_building/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/8.pal b/data/tilesets/secondary/safari_zone_building/palettes/8.pal new file mode 100644 index 000000000..eed6dbc35 --- /dev/null +++ b/data/tilesets/secondary/safari_zone_building/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +123 197 180 +74 74 90 +123 123 131 +189 197 189 +255 0 255 +205 222 222 +90 90 65 +131 115 74 +148 148 115 +189 189 131 +238 238 139 +238 238 246 +74 98 65 +74 156 65 +115 197 98 +156 230 98 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/9.pal b/data/tilesets/secondary/safari_zone_building/palettes/9.pal new file mode 100644 index 000000000..e9b93cfd2 --- /dev/null +++ b/data/tilesets/secondary/safari_zone_building/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +123 197 180 +74 74 90 +123 123 131 +205 213 213 +205 156 115 +238 172 115 +106 123 74 +156 148 98 +197 172 115 +222 205 139 +230 222 156 +90 90 49 +213 180 230 +164 139 197 +148 115 172 +123 98 131 diff --git a/data/tilesets/secondary/safari_zone_building/tiles.png b/data/tilesets/secondary/safari_zone_building/tiles.png new file mode 100644 index 000000000..6c8d53e34 Binary files /dev/null and b/data/tilesets/secondary/safari_zone_building/tiles.png differ diff --git a/data/tilesets/secondary/saffron_city/metatile_attributes.bin b/data/tilesets/secondary/saffron_city/metatile_attributes.bin new file mode 100644 index 000000000..c6f6551c0 Binary files /dev/null and b/data/tilesets/secondary/saffron_city/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/saffron_city/metatiles.bin b/data/tilesets/secondary/saffron_city/metatiles.bin new file mode 100644 index 000000000..dd43794df Binary files /dev/null and b/data/tilesets/secondary/saffron_city/metatiles.bin differ diff --git a/data/tilesets/secondary/saffron_city/palettes/0.pal b/data/tilesets/secondary/saffron_city/palettes/0.pal new file mode 100644 index 000000000..9dcb673aa --- /dev/null +++ b/data/tilesets/secondary/saffron_city/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +189 255 139 +131 213 98 +57 148 49 +57 82 0 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/saffron_city/palettes/1.pal b/data/tilesets/secondary/saffron_city/palettes/1.pal new file mode 100644 index 000000000..391d1e3d1 --- /dev/null +++ b/data/tilesets/secondary/saffron_city/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 189 164 +189 148 139 +156 115 115 +123 82 82 +90 57 74 +115 205 164 diff --git a/data/tilesets/secondary/saffron_city/palettes/10.pal b/data/tilesets/secondary/saffron_city/palettes/10.pal new file mode 100644 index 000000000..ce671fee4 --- /dev/null +++ b/data/tilesets/secondary/saffron_city/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 255 82 +238 238 238 +222 222 230 +123 123 131 +172 189 205 +65 74 106 +222 222 205 +205 205 189 +180 180 164 +213 213 164 +189 189 139 +148 148 98 +32 82 164 +156 205 246 +82 164 205 +115 205 164 diff --git a/data/tilesets/secondary/saffron_city/palettes/11.pal b/data/tilesets/secondary/saffron_city/palettes/11.pal new file mode 100644 index 000000000..d1ae629c8 --- /dev/null +++ b/data/tilesets/secondary/saffron_city/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +197 197 205 +49 98 164 +172 222 180 +139 189 148 +106 156 115 +82 131 90 +65 115 74 +255 0 255 diff --git a/data/tilesets/secondary/saffron_city/palettes/12.pal b/data/tilesets/secondary/saffron_city/palettes/12.pal new file mode 100644 index 000000000..b66bd774a --- /dev/null +++ b/data/tilesets/secondary/saffron_city/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 255 255 +222 222 230 +139 156 172 +123 123 131 +82 82 106 +213 205 32 +246 238 74 +164 131 205 +164 156 16 +205 197 106 +255 255 148 +139 189 148 +74 131 197 +197 197 205 +115 189 246 diff --git a/data/tilesets/secondary/saffron_city/palettes/13.pal b/data/tilesets/secondary/saffron_city/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/saffron_city/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/saffron_city/palettes/14.pal b/data/tilesets/secondary/saffron_city/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/saffron_city/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/saffron_city/palettes/15.pal b/data/tilesets/secondary/saffron_city/palettes/15.pal new file mode 100644 index 000000000..3ffc684ac --- /dev/null +++ b/data/tilesets/secondary/saffron_city/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +230 222 164 +222 205 131 +205 180 106 +213 213 197 +197 197 180 +164 164 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/saffron_city/palettes/2.pal b/data/tilesets/secondary/saffron_city/palettes/2.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/saffron_city/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/saffron_city/palettes/3.pal b/data/tilesets/secondary/saffron_city/palettes/3.pal new file mode 100644 index 000000000..973765509 --- /dev/null +++ b/data/tilesets/secondary/saffron_city/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/saffron_city/palettes/4.pal b/data/tilesets/secondary/saffron_city/palettes/4.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/saffron_city/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/saffron_city/palettes/5.pal b/data/tilesets/secondary/saffron_city/palettes/5.pal new file mode 100644 index 000000000..3a2db72a7 --- /dev/null +++ b/data/tilesets/secondary/saffron_city/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +222 205 131 +205 180 106 +180 139 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/saffron_city/palettes/6.pal b/data/tilesets/secondary/saffron_city/palettes/6.pal new file mode 100644 index 000000000..93518605a --- /dev/null +++ b/data/tilesets/secondary/saffron_city/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/saffron_city/palettes/7.pal b/data/tilesets/secondary/saffron_city/palettes/7.pal new file mode 100644 index 000000000..93518605a --- /dev/null +++ b/data/tilesets/secondary/saffron_city/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/saffron_city/palettes/8.pal b/data/tilesets/secondary/saffron_city/palettes/8.pal new file mode 100644 index 000000000..b1e168855 --- /dev/null +++ b/data/tilesets/secondary/saffron_city/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +197 197 197 +222 222 230 +148 164 180 +123 123 131 +65 74 106 +246 246 255 +205 164 255 +164 131 205 +123 90 164 +255 0 255 +255 0 255 +255 0 255 +164 131 205 +205 164 255 +90 90 115 diff --git a/data/tilesets/secondary/saffron_city/palettes/9.pal b/data/tilesets/secondary/saffron_city/palettes/9.pal new file mode 100644 index 000000000..7a88fdbbf --- /dev/null +++ b/data/tilesets/secondary/saffron_city/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +255 255 255 +205 205 213 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 238 246 +255 238 139 +230 189 82 +238 148 115 +222 246 255 +172 230 255 +123 205 213 +197 106 74 diff --git a/data/tilesets/secondary/saffron_city/tiles.png b/data/tilesets/secondary/saffron_city/tiles.png new file mode 100644 index 000000000..ea835f8dd Binary files /dev/null and b/data/tilesets/secondary/saffron_city/tiles.png differ diff --git a/data/tilesets/secondary/saffron_gym/metatile_attributes.bin b/data/tilesets/secondary/saffron_gym/metatile_attributes.bin new file mode 100644 index 000000000..ee895c35a Binary files /dev/null and b/data/tilesets/secondary/saffron_gym/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/saffron_gym/metatiles.bin b/data/tilesets/secondary/saffron_gym/metatiles.bin new file mode 100644 index 000000000..e0fdb79fb Binary files /dev/null and b/data/tilesets/secondary/saffron_gym/metatiles.bin differ diff --git a/data/tilesets/secondary/saffron_gym/palettes/0.pal b/data/tilesets/secondary/saffron_gym/palettes/0.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/saffron_gym/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/saffron_gym/palettes/1.pal b/data/tilesets/secondary/saffron_gym/palettes/1.pal new file mode 100644 index 000000000..3a16a45c7 --- /dev/null +++ b/data/tilesets/secondary/saffron_gym/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +238 246 238 diff --git a/data/tilesets/secondary/saffron_gym/palettes/10.pal b/data/tilesets/secondary/saffron_gym/palettes/10.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/saffron_gym/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/saffron_gym/palettes/11.pal b/data/tilesets/secondary/saffron_gym/palettes/11.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/saffron_gym/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/saffron_gym/palettes/12.pal b/data/tilesets/secondary/saffron_gym/palettes/12.pal new file mode 100644 index 000000000..702c67ecb --- /dev/null +++ b/data/tilesets/secondary/saffron_gym/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 131 +197 189 213 +255 255 255 +148 148 156 +180 139 222 +205 172 246 +222 205 255 +106 123 172 +131 148 197 +156 172 230 +65 205 82 +180 255 197 +246 164 115 +255 230 148 diff --git a/data/tilesets/secondary/saffron_gym/palettes/13.pal b/data/tilesets/secondary/saffron_gym/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/saffron_gym/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/saffron_gym/palettes/14.pal b/data/tilesets/secondary/saffron_gym/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/saffron_gym/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/saffron_gym/palettes/15.pal b/data/tilesets/secondary/saffron_gym/palettes/15.pal new file mode 100644 index 000000000..92e7ed309 --- /dev/null +++ b/data/tilesets/secondary/saffron_gym/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +0 0 0 diff --git a/data/tilesets/secondary/saffron_gym/palettes/2.pal b/data/tilesets/secondary/saffron_gym/palettes/2.pal new file mode 100644 index 000000000..c8ee236d7 --- /dev/null +++ b/data/tilesets/secondary/saffron_gym/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +255 0 255 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/saffron_gym/palettes/3.pal b/data/tilesets/secondary/saffron_gym/palettes/3.pal new file mode 100644 index 000000000..b17dbb054 --- /dev/null +++ b/data/tilesets/secondary/saffron_gym/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +164 164 164 +180 189 189 +255 255 255 +238 246 238 +213 230 222 +197 205 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/saffron_gym/palettes/4.pal b/data/tilesets/secondary/saffron_gym/palettes/4.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/saffron_gym/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/saffron_gym/palettes/5.pal b/data/tilesets/secondary/saffron_gym/palettes/5.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/saffron_gym/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/saffron_gym/palettes/6.pal b/data/tilesets/secondary/saffron_gym/palettes/6.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/saffron_gym/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/saffron_gym/palettes/7.pal b/data/tilesets/secondary/saffron_gym/palettes/7.pal new file mode 100644 index 000000000..c66eaedff --- /dev/null +++ b/data/tilesets/secondary/saffron_gym/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 131 +197 189 213 +255 255 255 +180 123 148 +230 139 230 +255 222 255 +213 213 222 +213 98 65 +246 139 106 +255 0 255 +255 0 255 +255 0 255 +205 246 255 +98 197 238 diff --git a/data/tilesets/secondary/saffron_gym/palettes/8.pal b/data/tilesets/secondary/saffron_gym/palettes/8.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/saffron_gym/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/saffron_gym/palettes/9.pal b/data/tilesets/secondary/saffron_gym/palettes/9.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/saffron_gym/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/saffron_gym/tiles.png b/data/tilesets/secondary/saffron_gym/tiles.png new file mode 100644 index 000000000..87641a309 Binary files /dev/null and b/data/tilesets/secondary/saffron_gym/tiles.png differ diff --git a/data/tilesets/secondary/school/metatile_attributes.bin b/data/tilesets/secondary/school/metatile_attributes.bin new file mode 100644 index 000000000..cdcb96c53 Binary files /dev/null and b/data/tilesets/secondary/school/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/school/metatiles.bin b/data/tilesets/secondary/school/metatiles.bin new file mode 100644 index 000000000..35009a690 Binary files /dev/null and b/data/tilesets/secondary/school/metatiles.bin differ diff --git a/data/tilesets/secondary/school/palettes/0.pal b/data/tilesets/secondary/school/palettes/0.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/school/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/school/palettes/1.pal b/data/tilesets/secondary/school/palettes/1.pal new file mode 100644 index 000000000..30be2fbe3 --- /dev/null +++ b/data/tilesets/secondary/school/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/school/palettes/10.pal b/data/tilesets/secondary/school/palettes/10.pal new file mode 100644 index 000000000..c06a049b0 --- /dev/null +++ b/data/tilesets/secondary/school/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/school/palettes/11.pal b/data/tilesets/secondary/school/palettes/11.pal new file mode 100644 index 000000000..c06a049b0 --- /dev/null +++ b/data/tilesets/secondary/school/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/school/palettes/12.pal b/data/tilesets/secondary/school/palettes/12.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/school/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/school/palettes/13.pal b/data/tilesets/secondary/school/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/school/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/school/palettes/14.pal b/data/tilesets/secondary/school/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/school/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/school/palettes/15.pal b/data/tilesets/secondary/school/palettes/15.pal new file mode 100644 index 000000000..71b5ee827 --- /dev/null +++ b/data/tilesets/secondary/school/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 diff --git a/data/tilesets/secondary/school/palettes/2.pal b/data/tilesets/secondary/school/palettes/2.pal new file mode 100644 index 000000000..e7c4b911a --- /dev/null +++ b/data/tilesets/secondary/school/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/school/palettes/3.pal b/data/tilesets/secondary/school/palettes/3.pal new file mode 100644 index 000000000..54b77e0c8 --- /dev/null +++ b/data/tilesets/secondary/school/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/school/palettes/4.pal b/data/tilesets/secondary/school/palettes/4.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/school/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/school/palettes/5.pal b/data/tilesets/secondary/school/palettes/5.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/school/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/school/palettes/6.pal b/data/tilesets/secondary/school/palettes/6.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/school/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/school/palettes/7.pal b/data/tilesets/secondary/school/palettes/7.pal new file mode 100644 index 000000000..6c1a5b096 --- /dev/null +++ b/data/tilesets/secondary/school/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +172 148 90 +213 189 131 +255 230 172 +255 255 98 +255 197 197 +98 156 74 +148 205 123 +98 156 172 +123 180 197 +156 205 222 +189 230 246 diff --git a/data/tilesets/secondary/school/palettes/8.pal b/data/tilesets/secondary/school/palettes/8.pal new file mode 100644 index 000000000..1557a55f0 --- /dev/null +++ b/data/tilesets/secondary/school/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +123 131 82 +139 148 82 +156 164 90 +172 180 106 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/school/palettes/9.pal b/data/tilesets/secondary/school/palettes/9.pal new file mode 100644 index 000000000..c06a049b0 --- /dev/null +++ b/data/tilesets/secondary/school/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/school/tiles.png b/data/tilesets/secondary/school/tiles.png new file mode 100644 index 000000000..935afccd2 Binary files /dev/null and b/data/tilesets/secondary/school/tiles.png differ diff --git a/data/tilesets/secondary/sea_cottage/metatile_attributes.bin b/data/tilesets/secondary/sea_cottage/metatile_attributes.bin new file mode 100644 index 000000000..05caeb58b Binary files /dev/null and b/data/tilesets/secondary/sea_cottage/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/sea_cottage/metatiles.bin b/data/tilesets/secondary/sea_cottage/metatiles.bin new file mode 100644 index 000000000..6ac3cbf98 Binary files /dev/null and b/data/tilesets/secondary/sea_cottage/metatiles.bin differ diff --git a/data/tilesets/secondary/sea_cottage/palettes/0.pal b/data/tilesets/secondary/sea_cottage/palettes/0.pal new file mode 100644 index 000000000..ed708dd79 --- /dev/null +++ b/data/tilesets/secondary/sea_cottage/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 205 172 +189 255 139 +131 213 98 +57 148 49 +57 82 0 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/sea_cottage/palettes/1.pal b/data/tilesets/secondary/sea_cottage/palettes/1.pal new file mode 100644 index 000000000..4d2b48991 --- /dev/null +++ b/data/tilesets/secondary/sea_cottage/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 205 172 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 189 164 +189 148 139 +156 115 115 +123 82 82 +90 57 74 +115 205 164 diff --git a/data/tilesets/secondary/sea_cottage/palettes/10.pal b/data/tilesets/secondary/sea_cottage/palettes/10.pal new file mode 100644 index 000000000..e8624e82f --- /dev/null +++ b/data/tilesets/secondary/sea_cottage/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 205 172 +82 82 106 +131 131 131 +139 164 164 +164 189 189 +205 222 222 +205 238 238 +90 139 115 +0 0 0 +0 0 0 +82 180 106 +115 222 148 +205 197 57 +230 230 139 +238 131 74 +255 180 98 diff --git a/data/tilesets/secondary/sea_cottage/palettes/11.pal b/data/tilesets/secondary/sea_cottage/palettes/11.pal new file mode 100644 index 000000000..9cec1272b --- /dev/null +++ b/data/tilesets/secondary/sea_cottage/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 205 172 +82 82 106 +131 131 131 +0 0 0 +0 0 0 +0 0 0 +205 238 238 +222 255 255 +0 0 0 +106 189 197 +106 246 230 +164 255 238 +0 0 0 +131 123 57 +197 106 74 +238 148 74 diff --git a/data/tilesets/secondary/sea_cottage/palettes/12.pal b/data/tilesets/secondary/sea_cottage/palettes/12.pal new file mode 100644 index 000000000..600d8f469 --- /dev/null +++ b/data/tilesets/secondary/sea_cottage/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 205 172 +82 82 106 +131 131 131 +255 255 255 +90 230 255 +213 255 255 +148 238 255 +90 139 115 +0 0 0 +0 0 0 +82 180 106 +115 222 148 +148 246 180 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/sea_cottage/palettes/13.pal b/data/tilesets/secondary/sea_cottage/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/sea_cottage/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/sea_cottage/palettes/14.pal b/data/tilesets/secondary/sea_cottage/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/sea_cottage/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/sea_cottage/palettes/15.pal b/data/tilesets/secondary/sea_cottage/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/sea_cottage/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/sea_cottage/palettes/2.pal b/data/tilesets/secondary/sea_cottage/palettes/2.pal new file mode 100644 index 000000000..878c13c95 --- /dev/null +++ b/data/tilesets/secondary/sea_cottage/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 205 172 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/sea_cottage/palettes/3.pal b/data/tilesets/secondary/sea_cottage/palettes/3.pal new file mode 100644 index 000000000..bed4c20c3 --- /dev/null +++ b/data/tilesets/secondary/sea_cottage/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 205 172 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/sea_cottage/palettes/4.pal b/data/tilesets/secondary/sea_cottage/palettes/4.pal new file mode 100644 index 000000000..b77ba3e87 --- /dev/null +++ b/data/tilesets/secondary/sea_cottage/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 205 172 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/sea_cottage/palettes/5.pal b/data/tilesets/secondary/sea_cottage/palettes/5.pal new file mode 100644 index 000000000..74a2a9ed0 --- /dev/null +++ b/data/tilesets/secondary/sea_cottage/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 205 172 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +222 205 131 +205 180 106 +180 139 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/sea_cottage/palettes/6.pal b/data/tilesets/secondary/sea_cottage/palettes/6.pal new file mode 100644 index 000000000..93518605a --- /dev/null +++ b/data/tilesets/secondary/sea_cottage/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/sea_cottage/palettes/7.pal b/data/tilesets/secondary/sea_cottage/palettes/7.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/sea_cottage/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/sea_cottage/palettes/8.pal b/data/tilesets/secondary/sea_cottage/palettes/8.pal new file mode 100644 index 000000000..370a3d2db --- /dev/null +++ b/data/tilesets/secondary/sea_cottage/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 205 172 +82 82 106 +131 131 131 +139 164 164 +164 189 189 +205 222 222 +205 238 238 +90 139 115 +139 148 115 +106 189 197 +82 180 106 +115 222 148 +148 246 180 +131 123 57 +197 106 74 +238 148 74 diff --git a/data/tilesets/secondary/sea_cottage/palettes/9.pal b/data/tilesets/secondary/sea_cottage/palettes/9.pal new file mode 100644 index 000000000..1193cc807 --- /dev/null +++ b/data/tilesets/secondary/sea_cottage/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 205 172 +82 82 106 +131 131 131 +98 106 148 +115 131 197 +139 164 230 +164 213 246 +197 197 197 +238 230 205 +255 0 255 +106 98 90 +131 115 90 +156 139 90 +131 139 90 +164 156 90 +189 172 90 diff --git a/data/tilesets/secondary/sea_cottage/tiles.png b/data/tilesets/secondary/sea_cottage/tiles.png new file mode 100644 index 000000000..42d557bcf Binary files /dev/null and b/data/tilesets/secondary/sea_cottage/tiles.png differ diff --git a/data/tilesets/secondary/seafoam_islands/metatile_attributes.bin b/data/tilesets/secondary/seafoam_islands/metatile_attributes.bin new file mode 100644 index 000000000..87564066c Binary files /dev/null and b/data/tilesets/secondary/seafoam_islands/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/seafoam_islands/metatiles.bin b/data/tilesets/secondary/seafoam_islands/metatiles.bin new file mode 100644 index 000000000..8f8bd569b Binary files /dev/null and b/data/tilesets/secondary/seafoam_islands/metatiles.bin differ diff --git a/data/tilesets/secondary/seafoam_islands/palettes/0.pal b/data/tilesets/secondary/seafoam_islands/palettes/0.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/seafoam_islands/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/1.pal b/data/tilesets/secondary/seafoam_islands/palettes/1.pal new file mode 100644 index 000000000..d8a4e7757 --- /dev/null +++ b/data/tilesets/secondary/seafoam_islands/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/10.pal b/data/tilesets/secondary/seafoam_islands/palettes/10.pal new file mode 100644 index 000000000..7116e91ff --- /dev/null +++ b/data/tilesets/secondary/seafoam_islands/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 0 255 +255 0 255 +255 0 255 +0 0 0 +238 238 180 +238 222 148 +189 222 156 +205 230 238 +238 238 246 +180 205 238 +123 180 230 +90 156 197 +98 123 172 +82 98 131 +65 74 82 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/11.pal b/data/tilesets/secondary/seafoam_islands/palettes/11.pal new file mode 100644 index 000000000..b237ef1c8 --- /dev/null +++ b/data/tilesets/secondary/seafoam_islands/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +189 213 230 +189 197 230 +172 180 213 +148 156 172 +156 238 255 +164 246 255 +213 255 255 +106 230 255 +41 205 255 +32 131 255 +32 82 197 +32 74 131 +205 230 172 +189 213 172 +0 0 0 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/12.pal b/data/tilesets/secondary/seafoam_islands/palettes/12.pal new file mode 100644 index 000000000..ed56edee1 --- /dev/null +++ b/data/tilesets/secondary/seafoam_islands/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +0 0 0 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/13.pal b/data/tilesets/secondary/seafoam_islands/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/seafoam_islands/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/14.pal b/data/tilesets/secondary/seafoam_islands/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/seafoam_islands/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/15.pal b/data/tilesets/secondary/seafoam_islands/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/seafoam_islands/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/2.pal b/data/tilesets/secondary/seafoam_islands/palettes/2.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/seafoam_islands/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/3.pal b/data/tilesets/secondary/seafoam_islands/palettes/3.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/secondary/seafoam_islands/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/4.pal b/data/tilesets/secondary/seafoam_islands/palettes/4.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/seafoam_islands/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/5.pal b/data/tilesets/secondary/seafoam_islands/palettes/5.pal new file mode 100644 index 000000000..c5a653979 --- /dev/null +++ b/data/tilesets/secondary/seafoam_islands/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/6.pal b/data/tilesets/secondary/seafoam_islands/palettes/6.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/seafoam_islands/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/7.pal b/data/tilesets/secondary/seafoam_islands/palettes/7.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/seafoam_islands/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/8.pal b/data/tilesets/secondary/seafoam_islands/palettes/8.pal new file mode 100644 index 000000000..d96f3f0fc --- /dev/null +++ b/data/tilesets/secondary/seafoam_islands/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +189 213 230 +189 197 230 +172 180 213 +148 156 172 +156 238 255 +164 246 255 +213 255 255 +205 230 238 +238 238 246 +180 205 238 +123 180 230 +90 156 197 +98 123 172 +82 98 131 +65 74 82 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/9.pal b/data/tilesets/secondary/seafoam_islands/palettes/9.pal new file mode 100644 index 000000000..1a1dc881b --- /dev/null +++ b/data/tilesets/secondary/seafoam_islands/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +189 213 230 +189 197 230 +172 180 213 +148 156 172 +255 238 164 +238 230 139 +230 205 90 +197 172 74 +156 123 57 +106 82 115 +65 57 74 +0 0 0 +98 139 197 +74 115 172 +57 98 156 diff --git a/data/tilesets/secondary/seafoam_islands/tiles.png b/data/tilesets/secondary/seafoam_islands/tiles.png new file mode 100644 index 000000000..e085d8e33 Binary files /dev/null and b/data/tilesets/secondary/seafoam_islands/tiles.png differ diff --git a/data/tilesets/secondary/sevii_islands_123/metatile_attributes.bin b/data/tilesets/secondary/sevii_islands_123/metatile_attributes.bin new file mode 100644 index 000000000..62eb1b917 Binary files /dev/null and b/data/tilesets/secondary/sevii_islands_123/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/sevii_islands_123/metatiles.bin b/data/tilesets/secondary/sevii_islands_123/metatiles.bin new file mode 100644 index 000000000..52d2f020d Binary files /dev/null and b/data/tilesets/secondary/sevii_islands_123/metatiles.bin differ diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/0.pal b/data/tilesets/secondary/sevii_islands_123/palettes/0.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_123/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/1.pal b/data/tilesets/secondary/sevii_islands_123/palettes/1.pal new file mode 100644 index 000000000..e15d979f1 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_123/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +222 230 230 +197 205 213 +172 189 205 +123 123 131 +65 49 65 +230 238 238 +90 189 139 +90 90 115 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/10.pal b/data/tilesets/secondary/sevii_islands_123/palettes/10.pal new file mode 100644 index 000000000..265fb0625 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_123/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +205 222 238 +156 172 189 +123 123 131 +90 90 115 +65 74 106 +255 255 180 +255 238 123 +156 115 65 +238 197 246 +213 156 213 +189 106 172 +238 230 74 +238 189 0 +222 156 0 +255 255 255 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/11.pal b/data/tilesets/secondary/sevii_islands_123/palettes/11.pal new file mode 100644 index 000000000..9e1e423c6 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_123/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +238 238 246 +197 205 222 +172 172 197 +139 156 172 +123 123 131 +90 90 115 +65 74 106 +123 139 222 +115 189 246 +255 230 156 +255 189 65 +238 164 41 +213 131 16 +180 82 0 +255 205 106 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/12.pal b/data/tilesets/secondary/sevii_islands_123/palettes/12.pal new file mode 100644 index 000000000..375e3914b --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_123/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +222 230 230 +197 205 213 +172 189 205 +123 123 131 +65 49 65 +230 238 238 +90 189 139 +90 90 115 +230 230 222 +213 213 197 +180 180 164 +148 148 131 +123 123 90 +98 98 74 +115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/13.pal b/data/tilesets/secondary/sevii_islands_123/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_123/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/14.pal b/data/tilesets/secondary/sevii_islands_123/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_123/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/15.pal b/data/tilesets/secondary/sevii_islands_123/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_123/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/2.pal b/data/tilesets/secondary/sevii_islands_123/palettes/2.pal new file mode 100644 index 000000000..372fb5d7c --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_123/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/3.pal b/data/tilesets/secondary/sevii_islands_123/palettes/3.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_123/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/4.pal b/data/tilesets/secondary/sevii_islands_123/palettes/4.pal new file mode 100644 index 000000000..fca4a2623 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_123/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +213 238 255 +172 205 255 +139 180 238 +106 156 230 +74 139 189 +65 123 189 +82 139 205 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +49 115 172 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/5.pal b/data/tilesets/secondary/sevii_islands_123/palettes/5.pal new file mode 100644 index 000000000..09555ded5 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_123/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/6.pal b/data/tilesets/secondary/sevii_islands_123/palettes/6.pal new file mode 100644 index 000000000..f8ebbc6dc --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_123/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +213 238 255 +172 205 255 +139 180 238 +106 156 230 +65 123 172 +41 98 156 +74 115 197 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +49 115 172 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/7.pal b/data/tilesets/secondary/sevii_islands_123/palettes/7.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_123/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/8.pal b/data/tilesets/secondary/sevii_islands_123/palettes/8.pal new file mode 100644 index 000000000..4d9ab6348 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_123/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +131 197 164 +98 164 131 +123 123 131 +90 90 115 +65 74 106 +222 230 238 +197 213 230 +164 180 197 +255 222 255 +222 172 230 +172 123 189 +148 98 164 +115 65 131 +238 213 156 +205 189 123 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/9.pal b/data/tilesets/secondary/sevii_islands_123/palettes/9.pal new file mode 100644 index 000000000..b66fdcdbf --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_123/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +115 189 246 +98 164 222 +123 123 131 +90 90 115 +65 74 106 +246 246 213 +230 230 189 +189 189 148 +172 172 131 +156 156 115 +230 222 115 +246 156 115 +222 115 98 +131 230 180 +49 164 123 diff --git a/data/tilesets/secondary/sevii_islands_123/tiles.png b/data/tilesets/secondary/sevii_islands_123/tiles.png new file mode 100644 index 000000000..ad8f73a2c Binary files /dev/null and b/data/tilesets/secondary/sevii_islands_123/tiles.png differ diff --git a/data/tilesets/secondary/sevii_islands_45/metatile_attributes.bin b/data/tilesets/secondary/sevii_islands_45/metatile_attributes.bin new file mode 100644 index 000000000..d67c4690c Binary files /dev/null and b/data/tilesets/secondary/sevii_islands_45/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/sevii_islands_45/metatiles.bin b/data/tilesets/secondary/sevii_islands_45/metatiles.bin new file mode 100644 index 000000000..7613f3702 Binary files /dev/null and b/data/tilesets/secondary/sevii_islands_45/metatiles.bin differ diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/0.pal b/data/tilesets/secondary/sevii_islands_45/palettes/0.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_45/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/1.pal b/data/tilesets/secondary/sevii_islands_45/palettes/1.pal new file mode 100644 index 000000000..d8a4e7757 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_45/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/10.pal b/data/tilesets/secondary/sevii_islands_45/palettes/10.pal new file mode 100644 index 000000000..86502dd48 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_45/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +205 222 230 +164 180 197 +123 123 131 +90 90 115 +65 74 106 +205 197 148 +180 172 123 +156 148 106 +230 156 106 +197 115 74 +172 98 49 +148 82 32 +205 222 230 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/11.pal b/data/tilesets/secondary/sevii_islands_45/palettes/11.pal new file mode 100644 index 000000000..b05410cba --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_45/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +0 0 0 +0 0 0 +0 0 0 +131 131 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +0 0 0 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/12.pal b/data/tilesets/secondary/sevii_islands_45/palettes/12.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_45/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/13.pal b/data/tilesets/secondary/sevii_islands_45/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_45/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/14.pal b/data/tilesets/secondary/sevii_islands_45/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_45/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/15.pal b/data/tilesets/secondary/sevii_islands_45/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_45/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/2.pal b/data/tilesets/secondary/sevii_islands_45/palettes/2.pal new file mode 100644 index 000000000..372fb5d7c --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_45/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/3.pal b/data/tilesets/secondary/sevii_islands_45/palettes/3.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_45/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/4.pal b/data/tilesets/secondary/sevii_islands_45/palettes/4.pal new file mode 100644 index 000000000..fca4a2623 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_45/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +213 238 255 +172 205 255 +139 180 238 +106 156 230 +74 139 189 +65 123 189 +82 139 205 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +49 115 172 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/5.pal b/data/tilesets/secondary/sevii_islands_45/palettes/5.pal new file mode 100644 index 000000000..09555ded5 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_45/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/6.pal b/data/tilesets/secondary/sevii_islands_45/palettes/6.pal new file mode 100644 index 000000000..f8ebbc6dc --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_45/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +213 238 255 +172 205 255 +139 180 238 +106 156 230 +65 123 172 +41 98 156 +74 115 197 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +49 115 172 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/7.pal b/data/tilesets/secondary/sevii_islands_45/palettes/7.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_45/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/8.pal b/data/tilesets/secondary/sevii_islands_45/palettes/8.pal new file mode 100644 index 000000000..4d9ab6348 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_45/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +131 197 164 +98 164 131 +123 123 131 +90 90 115 +65 74 106 +222 230 238 +197 213 230 +164 180 197 +255 222 255 +222 172 230 +172 123 189 +148 98 164 +115 65 131 +238 213 156 +205 189 123 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/9.pal b/data/tilesets/secondary/sevii_islands_45/palettes/9.pal new file mode 100644 index 000000000..5ac617b25 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_45/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +156 156 222 +255 238 189 +123 123 131 +90 90 115 +65 74 106 +222 230 238 +197 213 230 +164 180 197 +255 222 139 +230 172 98 +213 139 74 +197 115 49 +156 90 16 +115 189 246 +74 131 197 diff --git a/data/tilesets/secondary/sevii_islands_45/tiles.png b/data/tilesets/secondary/sevii_islands_45/tiles.png new file mode 100644 index 000000000..744b38638 Binary files /dev/null and b/data/tilesets/secondary/sevii_islands_45/tiles.png differ diff --git a/data/tilesets/secondary/sevii_islands_67/metatile_attributes.bin b/data/tilesets/secondary/sevii_islands_67/metatile_attributes.bin new file mode 100644 index 000000000..edf192276 Binary files /dev/null and b/data/tilesets/secondary/sevii_islands_67/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/sevii_islands_67/metatiles.bin b/data/tilesets/secondary/sevii_islands_67/metatiles.bin new file mode 100644 index 000000000..13f97073b Binary files /dev/null and b/data/tilesets/secondary/sevii_islands_67/metatiles.bin differ diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/0.pal b/data/tilesets/secondary/sevii_islands_67/palettes/0.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_67/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/1.pal b/data/tilesets/secondary/sevii_islands_67/palettes/1.pal new file mode 100644 index 000000000..09828f4f1 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_67/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +123 123 131 +32 49 57 +230 238 238 +90 189 139 +90 90 115 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +123 74 74 +90 57 65 +115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/10.pal b/data/tilesets/secondary/sevii_islands_67/palettes/10.pal new file mode 100644 index 000000000..d26d003af --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_67/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +238 246 255 +197 213 222 +172 189 197 +139 156 172 +123 123 131 +90 90 115 +65 74 106 +255 0 255 +131 172 148 +189 180 164 +172 164 156 +148 139 139 +123 115 115 +106 98 106 +115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/11.pal b/data/tilesets/secondary/sevii_islands_67/palettes/11.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_67/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/12.pal b/data/tilesets/secondary/sevii_islands_67/palettes/12.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_67/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/13.pal b/data/tilesets/secondary/sevii_islands_67/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_67/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/14.pal b/data/tilesets/secondary/sevii_islands_67/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_67/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/15.pal b/data/tilesets/secondary/sevii_islands_67/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_67/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/2.pal b/data/tilesets/secondary/sevii_islands_67/palettes/2.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_67/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/3.pal b/data/tilesets/secondary/sevii_islands_67/palettes/3.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_67/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/4.pal b/data/tilesets/secondary/sevii_islands_67/palettes/4.pal new file mode 100644 index 000000000..5871a448c --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_67/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +230 246 255 +189 222 255 +139 189 255 +115 164 255 +65 139 222 +57 115 222 +82 148 230 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +49 115 197 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/5.pal b/data/tilesets/secondary/sevii_islands_67/palettes/5.pal new file mode 100644 index 000000000..c5a653979 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_67/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/6.pal b/data/tilesets/secondary/sevii_islands_67/palettes/6.pal new file mode 100644 index 000000000..9bad44649 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_67/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +205 230 246 +180 213 255 +123 180 246 +98 148 230 +65 123 189 +49 98 180 +82 131 222 +213 230 238 +172 189 205 +123 123 131 +90 90 115 +238 246 246 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/7.pal b/data/tilesets/secondary/sevii_islands_67/palettes/7.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_67/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/8.pal b/data/tilesets/secondary/sevii_islands_67/palettes/8.pal new file mode 100644 index 000000000..4d9ab6348 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_67/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +131 197 164 +98 164 131 +123 123 131 +90 90 115 +65 74 106 +222 230 238 +197 213 230 +164 180 197 +255 222 255 +222 172 230 +172 123 189 +148 98 164 +115 65 131 +238 213 156 +205 189 123 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/9.pal b/data/tilesets/secondary/sevii_islands_67/palettes/9.pal new file mode 100644 index 000000000..edc5961bb --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_67/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +238 246 255 +197 213 222 +139 156 172 +123 123 131 +90 90 115 +65 74 106 +115 172 246 +65 123 172 +49 90 139 +32 74 123 +189 230 164 +115 156 90 +148 131 74 +156 213 255 +98 164 230 diff --git a/data/tilesets/secondary/sevii_islands_67/tiles.png b/data/tilesets/secondary/sevii_islands_67/tiles.png new file mode 100644 index 000000000..d40c92649 Binary files /dev/null and b/data/tilesets/secondary/sevii_islands_67/tiles.png differ diff --git a/data/tilesets/secondary/silph_co/metatile_attributes.bin b/data/tilesets/secondary/silph_co/metatile_attributes.bin new file mode 100644 index 000000000..a118a0181 Binary files /dev/null and b/data/tilesets/secondary/silph_co/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/silph_co/metatiles.bin b/data/tilesets/secondary/silph_co/metatiles.bin new file mode 100644 index 000000000..c86070668 Binary files /dev/null and b/data/tilesets/secondary/silph_co/metatiles.bin differ diff --git a/data/tilesets/secondary/ss_anne/metatile_attributes.bin b/data/tilesets/secondary/ss_anne/metatile_attributes.bin new file mode 100644 index 000000000..949846f90 Binary files /dev/null and b/data/tilesets/secondary/ss_anne/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/ss_anne/metatiles.bin b/data/tilesets/secondary/ss_anne/metatiles.bin new file mode 100644 index 000000000..a976297b3 Binary files /dev/null and b/data/tilesets/secondary/ss_anne/metatiles.bin differ diff --git a/data/tilesets/secondary/ss_anne/palettes/0.pal b/data/tilesets/secondary/ss_anne/palettes/0.pal new file mode 100644 index 000000000..28232d99e --- /dev/null +++ b/data/tilesets/secondary/ss_anne/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/ss_anne/palettes/1.pal b/data/tilesets/secondary/ss_anne/palettes/1.pal new file mode 100644 index 000000000..b43532470 --- /dev/null +++ b/data/tilesets/secondary/ss_anne/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/ss_anne/palettes/10.pal b/data/tilesets/secondary/ss_anne/palettes/10.pal new file mode 100644 index 000000000..2a1743eaa --- /dev/null +++ b/data/tilesets/secondary/ss_anne/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 205 156 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/ss_anne/palettes/11.pal b/data/tilesets/secondary/ss_anne/palettes/11.pal new file mode 100644 index 000000000..307e0ea7e --- /dev/null +++ b/data/tilesets/secondary/ss_anne/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 205 156 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +0 0 0 diff --git a/data/tilesets/secondary/ss_anne/palettes/12.pal b/data/tilesets/secondary/ss_anne/palettes/12.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/ss_anne/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/ss_anne/palettes/13.pal b/data/tilesets/secondary/ss_anne/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/ss_anne/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/ss_anne/palettes/14.pal b/data/tilesets/secondary/ss_anne/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/ss_anne/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/ss_anne/palettes/15.pal b/data/tilesets/secondary/ss_anne/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/ss_anne/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/ss_anne/palettes/2.pal b/data/tilesets/secondary/ss_anne/palettes/2.pal new file mode 100644 index 000000000..e267ae90e --- /dev/null +++ b/data/tilesets/secondary/ss_anne/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/ss_anne/palettes/3.pal b/data/tilesets/secondary/ss_anne/palettes/3.pal new file mode 100644 index 000000000..503f22878 --- /dev/null +++ b/data/tilesets/secondary/ss_anne/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/ss_anne/palettes/4.pal b/data/tilesets/secondary/ss_anne/palettes/4.pal new file mode 100644 index 000000000..cdf1b6190 --- /dev/null +++ b/data/tilesets/secondary/ss_anne/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +222 255 255 +172 222 255 +148 189 238 +106 156 230 +57 148 197 +32 131 172 +82 148 213 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +230 213 148 +238 230 139 +222 197 139 +213 189 106 diff --git a/data/tilesets/secondary/ss_anne/palettes/5.pal b/data/tilesets/secondary/ss_anne/palettes/5.pal new file mode 100644 index 000000000..09555ded5 --- /dev/null +++ b/data/tilesets/secondary/ss_anne/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/ss_anne/palettes/6.pal b/data/tilesets/secondary/ss_anne/palettes/6.pal new file mode 100644 index 000000000..0dba59a72 --- /dev/null +++ b/data/tilesets/secondary/ss_anne/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +222 255 255 +172 222 255 +148 189 238 +106 156 230 +41 90 172 +41 57 148 +74 123 197 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +230 213 148 +238 230 139 +222 197 139 +213 189 106 diff --git a/data/tilesets/secondary/ss_anne/palettes/7.pal b/data/tilesets/secondary/ss_anne/palettes/7.pal new file mode 100644 index 000000000..e9848a1c0 --- /dev/null +++ b/data/tilesets/secondary/ss_anne/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 205 156 +82 82 106 +115 115 139 +148 148 172 +189 189 205 +222 222 230 +255 255 255 +180 180 74 +205 205 98 +255 255 98 +98 98 172 +131 131 213 +164 164 255 +131 98 41 +164 139 82 +205 180 123 diff --git a/data/tilesets/secondary/ss_anne/palettes/8.pal b/data/tilesets/secondary/ss_anne/palettes/8.pal new file mode 100644 index 000000000..b5c80c8f4 --- /dev/null +++ b/data/tilesets/secondary/ss_anne/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 205 156 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +90 156 57 +131 180 49 +172 205 49 +197 230 98 +222 255 148 +222 172 98 +255 197 98 +255 222 156 +131 98 41 +164 139 82 +205 180 123 diff --git a/data/tilesets/secondary/ss_anne/palettes/9.pal b/data/tilesets/secondary/ss_anne/palettes/9.pal new file mode 100644 index 000000000..b66b2399a --- /dev/null +++ b/data/tilesets/secondary/ss_anne/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 205 156 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +255 0 255 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +255 0 255 +255 0 255 +255 0 255 +131 98 41 +164 139 82 +205 180 123 diff --git a/data/tilesets/secondary/ss_anne/tiles.png b/data/tilesets/secondary/ss_anne/tiles.png new file mode 100644 index 000000000..280f3e227 Binary files /dev/null and b/data/tilesets/secondary/ss_anne/tiles.png differ diff --git a/data/tilesets/secondary/tanoby_ruins/metatile_attributes.bin b/data/tilesets/secondary/tanoby_ruins/metatile_attributes.bin new file mode 100644 index 000000000..5fe7d59fc Binary files /dev/null and b/data/tilesets/secondary/tanoby_ruins/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/tanoby_ruins/metatiles.bin b/data/tilesets/secondary/tanoby_ruins/metatiles.bin new file mode 100644 index 000000000..2b3a9543e Binary files /dev/null and b/data/tilesets/secondary/tanoby_ruins/metatiles.bin differ diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/0.pal b/data/tilesets/secondary/tanoby_ruins/palettes/0.pal new file mode 100644 index 000000000..83b30fc17 --- /dev/null +++ b/data/tilesets/secondary/tanoby_ruins/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 172 82 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/1.pal b/data/tilesets/secondary/tanoby_ruins/palettes/1.pal new file mode 100644 index 000000000..66561f6d3 --- /dev/null +++ b/data/tilesets/secondary/tanoby_ruins/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +139 180 222 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/10.pal b/data/tilesets/secondary/tanoby_ruins/palettes/10.pal new file mode 100644 index 000000000..fb565545b --- /dev/null +++ b/data/tilesets/secondary/tanoby_ruins/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 172 82 +82 82 106 +230 222 164 +156 148 90 +123 115 115 +205 197 106 +164 156 90 +189 172 90 +246 246 222 +238 238 164 +98 106 90 +205 213 156 +139 148 106 +98 98 106 +90 0 255 +222 222 230 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/11.pal b/data/tilesets/secondary/tanoby_ruins/palettes/11.pal new file mode 100644 index 000000000..e637019c6 --- /dev/null +++ b/data/tilesets/secondary/tanoby_ruins/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 172 82 +82 82 106 +230 222 164 +156 148 90 +123 115 115 +205 197 106 +164 156 90 +189 172 90 +246 246 222 +238 238 164 +98 106 90 +205 213 156 +139 148 106 +98 98 106 +90 0 255 +139 148 139 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/12.pal b/data/tilesets/secondary/tanoby_ruins/palettes/12.pal new file mode 100644 index 000000000..775369fed --- /dev/null +++ b/data/tilesets/secondary/tanoby_ruins/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 172 82 +82 82 106 +230 222 164 +156 148 90 +123 115 115 +205 197 106 +164 156 90 +189 172 90 +246 246 222 +238 238 164 +98 106 90 +205 213 156 +139 148 106 +98 98 106 +90 0 255 +156 197 213 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/13.pal b/data/tilesets/secondary/tanoby_ruins/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/tanoby_ruins/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/14.pal b/data/tilesets/secondary/tanoby_ruins/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/tanoby_ruins/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/15.pal b/data/tilesets/secondary/tanoby_ruins/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/tanoby_ruins/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/2.pal b/data/tilesets/secondary/tanoby_ruins/palettes/2.pal new file mode 100644 index 000000000..87a022102 --- /dev/null +++ b/data/tilesets/secondary/tanoby_ruins/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +90 90 115 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/3.pal b/data/tilesets/secondary/tanoby_ruins/palettes/3.pal new file mode 100644 index 000000000..783496dcd --- /dev/null +++ b/data/tilesets/secondary/tanoby_ruins/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +65 98 156 +90 123 180 +115 156 197 +222 213 131 +164 164 172 +205 205 213 +238 238 246 +106 172 115 +156 205 139 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/4.pal b/data/tilesets/secondary/tanoby_ruins/palettes/4.pal new file mode 100644 index 000000000..89eace605 --- /dev/null +++ b/data/tilesets/secondary/tanoby_ruins/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 238 246 +172 197 180 +197 222 205 +90 189 172 +246 238 156 +205 189 131 +189 164 123 +148 131 106 +106 106 106 +213 222 230 +238 180 115 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/5.pal b/data/tilesets/secondary/tanoby_ruins/palettes/5.pal new file mode 100644 index 000000000..c7780e5c7 --- /dev/null +++ b/data/tilesets/secondary/tanoby_ruins/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +213 222 222 +164 180 189 +255 0 255 +131 115 74 +213 213 148 +197 189 139 +172 156 115 +148 131 90 +197 197 205 +205 82 65 +0 0 0 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/6.pal b/data/tilesets/secondary/tanoby_ruins/palettes/6.pal new file mode 100644 index 000000000..1d08ce9a2 --- /dev/null +++ b/data/tilesets/secondary/tanoby_ruins/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/7.pal b/data/tilesets/secondary/tanoby_ruins/palettes/7.pal new file mode 100644 index 000000000..dfa779635 --- /dev/null +++ b/data/tilesets/secondary/tanoby_ruins/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 172 82 +82 82 106 +131 131 131 +98 131 131 +139 172 172 +164 205 189 +98 106 131 +90 98 106 +98 156 197 +164 172 139 +139 156 139 +115 123 123 +205 213 156 +180 197 156 +164 172 156 +90 0 255 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/8.pal b/data/tilesets/secondary/tanoby_ruins/palettes/8.pal new file mode 100644 index 000000000..fd7d8a9d7 --- /dev/null +++ b/data/tilesets/secondary/tanoby_ruins/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 172 82 +82 82 106 +230 222 164 +156 148 90 +123 115 115 +205 197 106 +164 156 90 +189 172 90 +246 246 222 +238 238 164 +98 106 90 +205 213 156 +139 148 106 +98 98 106 +205 139 189 +213 148 74 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/9.pal b/data/tilesets/secondary/tanoby_ruins/palettes/9.pal new file mode 100644 index 000000000..0d43d6ef9 --- /dev/null +++ b/data/tilesets/secondary/tanoby_ruins/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 172 82 +82 82 106 +230 222 164 +156 148 90 +123 115 115 +205 197 106 +164 156 90 +189 172 90 +246 246 222 +238 238 164 +98 106 90 +205 213 156 +139 148 106 +98 98 106 +131 205 82 +230 213 82 diff --git a/data/tilesets/secondary/tanoby_ruins/tiles.png b/data/tilesets/secondary/tanoby_ruins/tiles.png new file mode 100644 index 000000000..c61f91c47 Binary files /dev/null and b/data/tilesets/secondary/tanoby_ruins/tiles.png differ diff --git a/data/tilesets/secondary/trainer_tower/metatile_attributes.bin b/data/tilesets/secondary/trainer_tower/metatile_attributes.bin new file mode 100644 index 000000000..96b25bb0f Binary files /dev/null and b/data/tilesets/secondary/trainer_tower/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/trainer_tower/metatiles.bin b/data/tilesets/secondary/trainer_tower/metatiles.bin new file mode 100644 index 000000000..f045f57e8 Binary files /dev/null and b/data/tilesets/secondary/trainer_tower/metatiles.bin differ diff --git a/data/tilesets/secondary/trainer_tower/palettes/0.pal b/data/tilesets/secondary/trainer_tower/palettes/0.pal new file mode 100644 index 000000000..8db07d418 --- /dev/null +++ b/data/tilesets/secondary/trainer_tower/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/trainer_tower/palettes/1.pal b/data/tilesets/secondary/trainer_tower/palettes/1.pal new file mode 100644 index 000000000..66561f6d3 --- /dev/null +++ b/data/tilesets/secondary/trainer_tower/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +139 180 222 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/trainer_tower/palettes/10.pal b/data/tilesets/secondary/trainer_tower/palettes/10.pal new file mode 100644 index 000000000..ab3a7d14f --- /dev/null +++ b/data/tilesets/secondary/trainer_tower/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +172 213 255 +139 189 246 +123 172 222 +98 180 230 +106 148 213 +255 0 255 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +189 230 255 +189 230 255 +156 189 213 +90 131 180 diff --git a/data/tilesets/secondary/trainer_tower/palettes/11.pal b/data/tilesets/secondary/trainer_tower/palettes/11.pal new file mode 100644 index 000000000..bb88b4d57 --- /dev/null +++ b/data/tilesets/secondary/trainer_tower/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +148 148 148 +123 123 123 +98 98 98 +82 82 106 +255 213 90 +230 164 74 +255 0 255 +222 230 238 +197 205 156 +205 139 115 +172 172 172 +222 230 189 +230 172 139 +0 0 0 +255 255 255 diff --git a/data/tilesets/secondary/trainer_tower/palettes/12.pal b/data/tilesets/secondary/trainer_tower/palettes/12.pal new file mode 100644 index 000000000..b0d005f21 --- /dev/null +++ b/data/tilesets/secondary/trainer_tower/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +205 205 205 +255 131 65 +222 98 32 +255 0 255 +222 213 90 +197 189 65 +189 180 49 +172 164 32 +213 205 90 +148 148 148 +230 230 230 diff --git a/data/tilesets/secondary/trainer_tower/palettes/13.pal b/data/tilesets/secondary/trainer_tower/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/trainer_tower/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/trainer_tower/palettes/14.pal b/data/tilesets/secondary/trainer_tower/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/trainer_tower/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/trainer_tower/palettes/15.pal b/data/tilesets/secondary/trainer_tower/palettes/15.pal new file mode 100644 index 000000000..6a17f18dc --- /dev/null +++ b/data/tilesets/secondary/trainer_tower/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +172 222 172 +189 238 197 +139 189 139 +205 246 213 +172 222 172 +74 106 156 +90 131 180 +213 222 222 +156 189 213 +238 139 98 +189 98 74 +156 65 49 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/trainer_tower/palettes/2.pal b/data/tilesets/secondary/trainer_tower/palettes/2.pal new file mode 100644 index 000000000..87a022102 --- /dev/null +++ b/data/tilesets/secondary/trainer_tower/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +90 90 115 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/trainer_tower/palettes/3.pal b/data/tilesets/secondary/trainer_tower/palettes/3.pal new file mode 100644 index 000000000..783496dcd --- /dev/null +++ b/data/tilesets/secondary/trainer_tower/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +65 98 156 +90 123 180 +115 156 197 +222 213 131 +164 164 172 +205 205 213 +238 238 246 +106 172 115 +156 205 139 diff --git a/data/tilesets/secondary/trainer_tower/palettes/4.pal b/data/tilesets/secondary/trainer_tower/palettes/4.pal new file mode 100644 index 000000000..89eace605 --- /dev/null +++ b/data/tilesets/secondary/trainer_tower/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 238 246 +172 197 180 +197 222 205 +90 189 172 +246 238 156 +205 189 131 +189 164 123 +148 131 106 +106 106 106 +213 222 230 +238 180 115 diff --git a/data/tilesets/secondary/trainer_tower/palettes/5.pal b/data/tilesets/secondary/trainer_tower/palettes/5.pal new file mode 100644 index 000000000..c7780e5c7 --- /dev/null +++ b/data/tilesets/secondary/trainer_tower/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +213 222 222 +164 180 189 +255 0 255 +131 115 74 +213 213 148 +197 189 139 +172 156 115 +148 131 90 +197 197 205 +205 82 65 +0 0 0 diff --git a/data/tilesets/secondary/trainer_tower/palettes/6.pal b/data/tilesets/secondary/trainer_tower/palettes/6.pal new file mode 100644 index 000000000..1d08ce9a2 --- /dev/null +++ b/data/tilesets/secondary/trainer_tower/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/trainer_tower/palettes/7.pal b/data/tilesets/secondary/trainer_tower/palettes/7.pal new file mode 100644 index 000000000..edc5961bb --- /dev/null +++ b/data/tilesets/secondary/trainer_tower/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +238 246 255 +197 213 222 +139 156 172 +123 123 131 +90 90 115 +65 74 106 +115 172 246 +65 123 172 +49 90 139 +32 74 123 +189 230 164 +115 156 90 +148 131 74 +156 213 255 +98 164 230 diff --git a/data/tilesets/secondary/trainer_tower/palettes/8.pal b/data/tilesets/secondary/trainer_tower/palettes/8.pal new file mode 100644 index 000000000..317213c42 --- /dev/null +++ b/data/tilesets/secondary/trainer_tower/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +123 74 148 +148 106 180 +230 213 246 +205 172 213 +222 213 90 +197 189 65 +189 180 49 +172 164 32 +213 205 90 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/trainer_tower/palettes/9.pal b/data/tilesets/secondary/trainer_tower/palettes/9.pal new file mode 100644 index 000000000..19dc9a47e --- /dev/null +++ b/data/tilesets/secondary/trainer_tower/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +255 0 255 +255 131 115 +106 197 106 +164 255 180 +238 197 115 +213 131 74 +189 213 230 +123 156 180 +90 123 156 +156 180 205 +222 230 238 diff --git a/data/tilesets/secondary/trainer_tower/tiles.png b/data/tilesets/secondary/trainer_tower/tiles.png new file mode 100644 index 000000000..f74f7c9f7 Binary files /dev/null and b/data/tilesets/secondary/trainer_tower/tiles.png differ diff --git a/data/tilesets/secondary/underground_path/metatile_attributes.bin b/data/tilesets/secondary/underground_path/metatile_attributes.bin new file mode 100644 index 000000000..29caa862d Binary files /dev/null and b/data/tilesets/secondary/underground_path/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/underground_path/metatiles.bin b/data/tilesets/secondary/underground_path/metatiles.bin new file mode 100644 index 000000000..2010e1eca Binary files /dev/null and b/data/tilesets/secondary/underground_path/metatiles.bin differ diff --git a/data/tilesets/secondary/underground_path/palettes/0.pal b/data/tilesets/secondary/underground_path/palettes/0.pal new file mode 100644 index 000000000..6d876039d --- /dev/null +++ b/data/tilesets/secondary/underground_path/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/underground_path/palettes/1.pal b/data/tilesets/secondary/underground_path/palettes/1.pal new file mode 100644 index 000000000..66561f6d3 --- /dev/null +++ b/data/tilesets/secondary/underground_path/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +139 180 222 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/underground_path/palettes/10.pal b/data/tilesets/secondary/underground_path/palettes/10.pal new file mode 100644 index 000000000..e12b8edac --- /dev/null +++ b/data/tilesets/secondary/underground_path/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/underground_path/palettes/11.pal b/data/tilesets/secondary/underground_path/palettes/11.pal new file mode 100644 index 000000000..e12b8edac --- /dev/null +++ b/data/tilesets/secondary/underground_path/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/underground_path/palettes/12.pal b/data/tilesets/secondary/underground_path/palettes/12.pal new file mode 100644 index 000000000..e12b8edac --- /dev/null +++ b/data/tilesets/secondary/underground_path/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/underground_path/palettes/13.pal b/data/tilesets/secondary/underground_path/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/underground_path/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/underground_path/palettes/14.pal b/data/tilesets/secondary/underground_path/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/underground_path/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/underground_path/palettes/15.pal b/data/tilesets/secondary/underground_path/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/underground_path/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/underground_path/palettes/2.pal b/data/tilesets/secondary/underground_path/palettes/2.pal new file mode 100644 index 000000000..87a022102 --- /dev/null +++ b/data/tilesets/secondary/underground_path/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +90 90 115 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/underground_path/palettes/3.pal b/data/tilesets/secondary/underground_path/palettes/3.pal new file mode 100644 index 000000000..783496dcd --- /dev/null +++ b/data/tilesets/secondary/underground_path/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +65 98 156 +90 123 180 +115 156 197 +222 213 131 +164 164 172 +205 205 213 +238 238 246 +106 172 115 +156 205 139 diff --git a/data/tilesets/secondary/underground_path/palettes/4.pal b/data/tilesets/secondary/underground_path/palettes/4.pal new file mode 100644 index 000000000..89eace605 --- /dev/null +++ b/data/tilesets/secondary/underground_path/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 238 246 +172 197 180 +197 222 205 +90 189 172 +246 238 156 +205 189 131 +189 164 123 +148 131 106 +106 106 106 +213 222 230 +238 180 115 diff --git a/data/tilesets/secondary/underground_path/palettes/5.pal b/data/tilesets/secondary/underground_path/palettes/5.pal new file mode 100644 index 000000000..0eef3df8e --- /dev/null +++ b/data/tilesets/secondary/underground_path/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +213 222 222 +164 180 189 +255 0 255 +131 115 74 +213 213 148 +197 189 139 +172 156 115 +148 131 90 +255 0 255 +255 0 255 +0 0 0 diff --git a/data/tilesets/secondary/underground_path/palettes/6.pal b/data/tilesets/secondary/underground_path/palettes/6.pal new file mode 100644 index 000000000..1d08ce9a2 --- /dev/null +++ b/data/tilesets/secondary/underground_path/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/underground_path/palettes/7.pal b/data/tilesets/secondary/underground_path/palettes/7.pal new file mode 100644 index 000000000..23e995640 --- /dev/null +++ b/data/tilesets/secondary/underground_path/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +148 148 156 +205 205 197 +148 139 90 +172 164 106 +197 189 131 +82 139 148 +115 164 172 +156 189 197 +180 90 74 +205 115 90 +238 156 123 diff --git a/data/tilesets/secondary/underground_path/palettes/8.pal b/data/tilesets/secondary/underground_path/palettes/8.pal new file mode 100644 index 000000000..3ce3570a1 --- /dev/null +++ b/data/tilesets/secondary/underground_path/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +255 255 156 +197 197 156 +172 172 139 +148 148 131 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/underground_path/palettes/9.pal b/data/tilesets/secondary/underground_path/palettes/9.pal new file mode 100644 index 000000000..e12b8edac --- /dev/null +++ b/data/tilesets/secondary/underground_path/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/underground_path/tiles.png b/data/tilesets/secondary/underground_path/tiles.png new file mode 100644 index 000000000..b8865022d Binary files /dev/null and b/data/tilesets/secondary/underground_path/tiles.png differ diff --git a/data/tilesets/secondary/unused_gatehouse1/metatile_attributes.bin b/data/tilesets/secondary/unused_gatehouse1/metatile_attributes.bin new file mode 100644 index 000000000..3549eaa93 Binary files /dev/null and b/data/tilesets/secondary/unused_gatehouse1/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/unused_gatehouse1/metatiles.bin b/data/tilesets/secondary/unused_gatehouse1/metatiles.bin new file mode 100644 index 000000000..ea1398be3 Binary files /dev/null and b/data/tilesets/secondary/unused_gatehouse1/metatiles.bin differ diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/0.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/0.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse1/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/1.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/1.pal new file mode 100644 index 000000000..d99adafff --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse1/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/10.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/10.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse1/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/11.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/11.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse1/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/12.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/12.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse1/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/13.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse1/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/14.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse1/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/15.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse1/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/2.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/2.pal new file mode 100644 index 000000000..cc3a9457d --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse1/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/3.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/3.pal new file mode 100644 index 000000000..7ec794ae5 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse1/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/4.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/4.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse1/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/5.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/5.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse1/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/6.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/6.pal new file mode 100644 index 000000000..2903bb074 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse1/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +131 131 131 +180 180 164 +255 255 255 +189 164 82 +222 197 106 +230 222 156 +123 197 189 +156 222 213 +213 255 246 +255 0 255 +255 0 255 +213 131 65 +222 230 222 +246 238 189 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/7.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/7.pal new file mode 100644 index 000000000..c62a40b0d --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse1/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +148 172 139 +180 197 164 +213 222 197 +238 255 213 +115 156 180 +197 222 238 +123 197 189 +156 222 213 +213 255 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/8.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/8.pal new file mode 100644 index 000000000..8c66b4998 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse1/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +230 222 156 +189 98 74 +230 156 98 +213 205 156 +115 156 180 +246 238 189 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/9.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/9.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse1/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse1/tiles.png b/data/tilesets/secondary/unused_gatehouse1/tiles.png new file mode 100644 index 000000000..6d376f447 Binary files /dev/null and b/data/tilesets/secondary/unused_gatehouse1/tiles.png differ diff --git a/data/tilesets/secondary/unused_gatehouse2/metatile_attributes.bin b/data/tilesets/secondary/unused_gatehouse2/metatile_attributes.bin new file mode 100644 index 000000000..3549eaa93 Binary files /dev/null and b/data/tilesets/secondary/unused_gatehouse2/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/unused_gatehouse2/metatiles.bin b/data/tilesets/secondary/unused_gatehouse2/metatiles.bin new file mode 100644 index 000000000..ea1398be3 Binary files /dev/null and b/data/tilesets/secondary/unused_gatehouse2/metatiles.bin differ diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/0.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/0.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse2/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/1.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/1.pal new file mode 100644 index 000000000..d99adafff --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse2/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/10.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/10.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse2/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/11.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/11.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse2/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/12.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/12.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse2/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/13.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse2/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/14.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse2/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/15.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse2/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/2.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/2.pal new file mode 100644 index 000000000..cc3a9457d --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse2/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/3.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/3.pal new file mode 100644 index 000000000..7ec794ae5 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse2/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/4.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/4.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse2/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/5.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/5.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse2/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/6.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/6.pal new file mode 100644 index 000000000..2903bb074 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse2/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +131 131 131 +180 180 164 +255 255 255 +189 164 82 +222 197 106 +230 222 156 +123 197 189 +156 222 213 +213 255 246 +255 0 255 +255 0 255 +213 131 65 +222 230 222 +246 238 189 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/7.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/7.pal new file mode 100644 index 000000000..c62a40b0d --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse2/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +148 172 139 +180 197 164 +213 222 197 +238 255 213 +115 156 180 +197 222 238 +123 197 189 +156 222 213 +213 255 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/8.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/8.pal new file mode 100644 index 000000000..8c66b4998 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse2/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +230 222 156 +189 98 74 +230 156 98 +213 205 156 +115 156 180 +246 238 189 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/9.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/9.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse2/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse2/tiles.png b/data/tilesets/secondary/unused_gatehouse2/tiles.png new file mode 100644 index 000000000..6d376f447 Binary files /dev/null and b/data/tilesets/secondary/unused_gatehouse2/tiles.png differ diff --git a/data/tilesets/secondary/vermilion_city/metatile_attributes.bin b/data/tilesets/secondary/vermilion_city/metatile_attributes.bin new file mode 100644 index 000000000..1136f644a Binary files /dev/null and b/data/tilesets/secondary/vermilion_city/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/vermilion_city/metatiles.bin b/data/tilesets/secondary/vermilion_city/metatiles.bin new file mode 100644 index 000000000..c7978128e Binary files /dev/null and b/data/tilesets/secondary/vermilion_city/metatiles.bin differ diff --git a/data/tilesets/secondary/vermilion_city/palettes/0.pal b/data/tilesets/secondary/vermilion_city/palettes/0.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/vermilion_city/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/vermilion_city/palettes/1.pal b/data/tilesets/secondary/vermilion_city/palettes/1.pal new file mode 100644 index 000000000..09828f4f1 --- /dev/null +++ b/data/tilesets/secondary/vermilion_city/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +123 123 131 +32 49 57 +230 238 238 +90 189 139 +90 90 115 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +123 74 74 +90 57 65 +115 205 164 diff --git a/data/tilesets/secondary/vermilion_city/palettes/10.pal b/data/tilesets/secondary/vermilion_city/palettes/10.pal new file mode 100644 index 000000000..892aae6ed --- /dev/null +++ b/data/tilesets/secondary/vermilion_city/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +115 82 41 +255 189 32 +222 156 0 +189 106 57 +123 123 131 +90 90 115 +65 74 106 +189 255 139 +131 213 98 +106 180 98 +255 230 131 +238 205 123 +197 164 90 +131 164 197 +255 0 255 diff --git a/data/tilesets/secondary/vermilion_city/palettes/11.pal b/data/tilesets/secondary/vermilion_city/palettes/11.pal new file mode 100644 index 000000000..b2a405273 --- /dev/null +++ b/data/tilesets/secondary/vermilion_city/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/vermilion_city/palettes/12.pal b/data/tilesets/secondary/vermilion_city/palettes/12.pal new file mode 100644 index 000000000..f124929b4 --- /dev/null +++ b/data/tilesets/secondary/vermilion_city/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 238 189 +222 205 131 +205 180 106 +180 139 74 +246 246 255 +172 189 205 +222 106 98 +213 164 156 +213 148 49 +65 74 106 +123 123 131 +16 123 74 +49 148 106 +98 189 148 +164 230 197 diff --git a/data/tilesets/secondary/vermilion_city/palettes/13.pal b/data/tilesets/secondary/vermilion_city/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/vermilion_city/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/vermilion_city/palettes/14.pal b/data/tilesets/secondary/vermilion_city/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/vermilion_city/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/vermilion_city/palettes/15.pal b/data/tilesets/secondary/vermilion_city/palettes/15.pal new file mode 100644 index 000000000..ac0d32eb0 --- /dev/null +++ b/data/tilesets/secondary/vermilion_city/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +246 222 90 +246 197 65 +238 164 57 +172 189 205 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/vermilion_city/palettes/2.pal b/data/tilesets/secondary/vermilion_city/palettes/2.pal new file mode 100644 index 000000000..372fb5d7c --- /dev/null +++ b/data/tilesets/secondary/vermilion_city/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/vermilion_city/palettes/3.pal b/data/tilesets/secondary/vermilion_city/palettes/3.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/secondary/vermilion_city/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/vermilion_city/palettes/4.pal b/data/tilesets/secondary/vermilion_city/palettes/4.pal new file mode 100644 index 000000000..5871a448c --- /dev/null +++ b/data/tilesets/secondary/vermilion_city/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +230 246 255 +189 222 255 +139 189 255 +115 164 255 +65 139 222 +57 115 222 +82 148 230 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +49 115 197 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/vermilion_city/palettes/5.pal b/data/tilesets/secondary/vermilion_city/palettes/5.pal new file mode 100644 index 000000000..c5a653979 --- /dev/null +++ b/data/tilesets/secondary/vermilion_city/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/vermilion_city/palettes/6.pal b/data/tilesets/secondary/vermilion_city/palettes/6.pal new file mode 100644 index 000000000..9bad44649 --- /dev/null +++ b/data/tilesets/secondary/vermilion_city/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +205 230 246 +180 213 255 +123 180 246 +98 148 230 +65 123 189 +49 98 180 +82 131 222 +213 230 238 +172 189 205 +123 123 131 +90 90 115 +238 246 246 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/vermilion_city/palettes/7.pal b/data/tilesets/secondary/vermilion_city/palettes/7.pal new file mode 100644 index 000000000..17b1a0ed2 --- /dev/null +++ b/data/tilesets/secondary/vermilion_city/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/vermilion_city/palettes/8.pal b/data/tilesets/secondary/vermilion_city/palettes/8.pal new file mode 100644 index 000000000..7179b91bd --- /dev/null +++ b/data/tilesets/secondary/vermilion_city/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 246 172 +255 189 32 +222 156 0 +189 106 57 +123 123 131 +90 90 115 +65 74 106 +255 255 255 +205 205 222 +255 230 131 +238 205 123 +197 164 90 +131 164 197 +255 0 255 +180 156 49 diff --git a/data/tilesets/secondary/vermilion_city/palettes/9.pal b/data/tilesets/secondary/vermilion_city/palettes/9.pal new file mode 100644 index 000000000..746dac7da --- /dev/null +++ b/data/tilesets/secondary/vermilion_city/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +74 123 180 +90 164 213 +57 90 148 +213 148 49 +238 180 82 +205 205 222 +115 189 246 +74 131 197 diff --git a/data/tilesets/secondary/vermilion_city/tiles.png b/data/tilesets/secondary/vermilion_city/tiles.png new file mode 100644 index 000000000..8cfa9b4dd Binary files /dev/null and b/data/tilesets/secondary/vermilion_city/tiles.png differ diff --git a/data/tilesets/secondary/vermilion_gym/metatile_attributes.bin b/data/tilesets/secondary/vermilion_gym/metatile_attributes.bin new file mode 100644 index 000000000..a5e733de0 Binary files /dev/null and b/data/tilesets/secondary/vermilion_gym/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/vermilion_gym/metatiles.bin b/data/tilesets/secondary/vermilion_gym/metatiles.bin new file mode 100644 index 000000000..25a46724b Binary files /dev/null and b/data/tilesets/secondary/vermilion_gym/metatiles.bin differ diff --git a/data/tilesets/secondary/vermilion_gym/palettes/0.pal b/data/tilesets/secondary/vermilion_gym/palettes/0.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/vermilion_gym/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/1.pal b/data/tilesets/secondary/vermilion_gym/palettes/1.pal new file mode 100644 index 000000000..d99adafff --- /dev/null +++ b/data/tilesets/secondary/vermilion_gym/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/10.pal b/data/tilesets/secondary/vermilion_gym/palettes/10.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/vermilion_gym/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/11.pal b/data/tilesets/secondary/vermilion_gym/palettes/11.pal new file mode 100644 index 000000000..9fa42f21f --- /dev/null +++ b/data/tilesets/secondary/vermilion_gym/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +65 74 106 +90 90 115 +123 123 131 +148 164 180 +172 189 205 +205 222 238 +246 246 255 +255 0 255 +255 0 255 +205 82 65 +255 131 115 +230 172 57 +222 213 0 +222 180 65 +255 222 98 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/12.pal b/data/tilesets/secondary/vermilion_gym/palettes/12.pal new file mode 100644 index 000000000..5e2756cc9 --- /dev/null +++ b/data/tilesets/secondary/vermilion_gym/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +131 131 131 +180 180 164 +255 255 255 +222 180 65 +238 197 82 +189 148 49 +246 238 164 +213 213 222 +156 156 205 +180 180 246 +82 106 156 +123 148 197 +189 197 255 +0 0 0 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/13.pal b/data/tilesets/secondary/vermilion_gym/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/vermilion_gym/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/14.pal b/data/tilesets/secondary/vermilion_gym/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/vermilion_gym/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/15.pal b/data/tilesets/secondary/vermilion_gym/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/vermilion_gym/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/2.pal b/data/tilesets/secondary/vermilion_gym/palettes/2.pal new file mode 100644 index 000000000..cc3a9457d --- /dev/null +++ b/data/tilesets/secondary/vermilion_gym/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/3.pal b/data/tilesets/secondary/vermilion_gym/palettes/3.pal new file mode 100644 index 000000000..7ec794ae5 --- /dev/null +++ b/data/tilesets/secondary/vermilion_gym/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/4.pal b/data/tilesets/secondary/vermilion_gym/palettes/4.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/vermilion_gym/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/5.pal b/data/tilesets/secondary/vermilion_gym/palettes/5.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/vermilion_gym/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/6.pal b/data/tilesets/secondary/vermilion_gym/palettes/6.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/vermilion_gym/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/7.pal b/data/tilesets/secondary/vermilion_gym/palettes/7.pal new file mode 100644 index 000000000..efd64bcc5 --- /dev/null +++ b/data/tilesets/secondary/vermilion_gym/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +32 180 230 +172 255 230 +189 189 115 +238 222 164 +255 255 180 +205 82 65 +255 131 115 +189 180 106 +205 197 123 +222 222 148 +164 164 98 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/8.pal b/data/tilesets/secondary/vermilion_gym/palettes/8.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/vermilion_gym/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/9.pal b/data/tilesets/secondary/vermilion_gym/palettes/9.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/vermilion_gym/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/vermilion_gym/tiles.png b/data/tilesets/secondary/vermilion_gym/tiles.png new file mode 100644 index 000000000..1baac0893 Binary files /dev/null and b/data/tilesets/secondary/vermilion_gym/tiles.png differ diff --git a/data/tilesets/secondary/viridian_city/metatile_attributes.bin b/data/tilesets/secondary/viridian_city/metatile_attributes.bin new file mode 100644 index 000000000..ee2d7d5b3 Binary files /dev/null and b/data/tilesets/secondary/viridian_city/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/viridian_city/metatiles.bin b/data/tilesets/secondary/viridian_city/metatiles.bin new file mode 100644 index 000000000..297673a4b Binary files /dev/null and b/data/tilesets/secondary/viridian_city/metatiles.bin differ diff --git a/data/tilesets/secondary/viridian_city/palettes/0.pal b/data/tilesets/secondary/viridian_city/palettes/0.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/viridian_city/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/viridian_city/palettes/1.pal b/data/tilesets/secondary/viridian_city/palettes/1.pal new file mode 100644 index 000000000..cf1123812 --- /dev/null +++ b/data/tilesets/secondary/viridian_city/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/viridian_city/palettes/10.pal b/data/tilesets/secondary/viridian_city/palettes/10.pal new file mode 100644 index 000000000..4baf904ae --- /dev/null +++ b/data/tilesets/secondary/viridian_city/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +65 65 82 +74 74 90 +123 123 131 +106 139 205 +172 213 230 +115 98 65 +148 123 65 +238 172 65 +230 213 74 +65 123 123 +65 156 131 +65 205 156 +74 123 65 +90 172 74 +123 213 98 +172 238 106 diff --git a/data/tilesets/secondary/viridian_city/palettes/11.pal b/data/tilesets/secondary/viridian_city/palettes/11.pal new file mode 100644 index 000000000..2e92b3cc3 --- /dev/null +++ b/data/tilesets/secondary/viridian_city/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +246 246 205 +213 213 213 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +246 230 131 +222 205 65 +172 238 106 +123 213 98 +106 197 82 +90 172 74 +74 123 65 +115 205 164 diff --git a/data/tilesets/secondary/viridian_city/palettes/12.pal b/data/tilesets/secondary/viridian_city/palettes/12.pal new file mode 100644 index 000000000..70ed40322 --- /dev/null +++ b/data/tilesets/secondary/viridian_city/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +213 230 197 +156 172 139 +123 123 131 +90 90 115 +65 74 106 +222 172 65 +180 98 0 +131 65 0 +205 205 123 +164 164 57 +115 189 246 +74 148 213 +49 115 180 +189 197 164 diff --git a/data/tilesets/secondary/viridian_city/palettes/13.pal b/data/tilesets/secondary/viridian_city/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/viridian_city/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/viridian_city/palettes/14.pal b/data/tilesets/secondary/viridian_city/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/viridian_city/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/viridian_city/palettes/15.pal b/data/tilesets/secondary/viridian_city/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/viridian_city/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/viridian_city/palettes/2.pal b/data/tilesets/secondary/viridian_city/palettes/2.pal new file mode 100644 index 000000000..372fb5d7c --- /dev/null +++ b/data/tilesets/secondary/viridian_city/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/viridian_city/palettes/3.pal b/data/tilesets/secondary/viridian_city/palettes/3.pal new file mode 100644 index 000000000..5a5e60211 --- /dev/null +++ b/data/tilesets/secondary/viridian_city/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/viridian_city/palettes/4.pal b/data/tilesets/secondary/viridian_city/palettes/4.pal new file mode 100644 index 000000000..229f9132c --- /dev/null +++ b/data/tilesets/secondary/viridian_city/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +222 230 255 +197 213 255 +164 197 238 +123 172 230 +90 148 197 +65 123 180 +90 164 205 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +32 98 139 +238 230 139 +222 197 139 +205 180 106 diff --git a/data/tilesets/secondary/viridian_city/palettes/5.pal b/data/tilesets/secondary/viridian_city/palettes/5.pal new file mode 100644 index 000000000..215dd1272 --- /dev/null +++ b/data/tilesets/secondary/viridian_city/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/viridian_city/palettes/6.pal b/data/tilesets/secondary/viridian_city/palettes/6.pal new file mode 100644 index 000000000..7e7862a19 --- /dev/null +++ b/data/tilesets/secondary/viridian_city/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +222 230 255 +197 213 255 +164 197 238 +123 172 230 +41 82 164 +41 57 131 +74 123 197 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +32 98 139 +238 230 139 +222 197 139 +205 180 106 diff --git a/data/tilesets/secondary/viridian_city/palettes/7.pal b/data/tilesets/secondary/viridian_city/palettes/7.pal new file mode 100644 index 000000000..93518605a --- /dev/null +++ b/data/tilesets/secondary/viridian_city/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/viridian_city/palettes/8.pal b/data/tilesets/secondary/viridian_city/palettes/8.pal new file mode 100644 index 000000000..219129eba --- /dev/null +++ b/data/tilesets/secondary/viridian_city/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +65 65 82 +74 74 90 +123 123 131 +106 139 205 +115 197 238 +164 230 238 +131 115 57 +180 172 65 +222 205 65 +246 246 205 +213 205 205 +90 90 115 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/viridian_city/palettes/9.pal b/data/tilesets/secondary/viridian_city/palettes/9.pal new file mode 100644 index 000000000..0aa2b58dc --- /dev/null +++ b/data/tilesets/secondary/viridian_city/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 205 65 +222 172 65 +180 98 0 +213 213 139 +189 189 115 +148 148 82 +255 0 255 +115 205 164 diff --git a/data/tilesets/secondary/viridian_city/tiles.png b/data/tilesets/secondary/viridian_city/tiles.png new file mode 100644 index 000000000..39b80d8f9 Binary files /dev/null and b/data/tilesets/secondary/viridian_city/tiles.png differ diff --git a/data/tilesets/secondary/viridian_forest/metatile_attributes.bin b/data/tilesets/secondary/viridian_forest/metatile_attributes.bin new file mode 100644 index 000000000..990d6861c Binary files /dev/null and b/data/tilesets/secondary/viridian_forest/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/viridian_forest/metatiles.bin b/data/tilesets/secondary/viridian_forest/metatiles.bin new file mode 100644 index 000000000..cd0bd5f53 Binary files /dev/null and b/data/tilesets/secondary/viridian_forest/metatiles.bin differ diff --git a/data/tilesets/secondary/viridian_forest/palettes/0.pal b/data/tilesets/secondary/viridian_forest/palettes/0.pal new file mode 100644 index 000000000..7af5bb7d2 --- /dev/null +++ b/data/tilesets/secondary/viridian_forest/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 82 0 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/viridian_forest/palettes/1.pal b/data/tilesets/secondary/viridian_forest/palettes/1.pal new file mode 100644 index 000000000..391d1e3d1 --- /dev/null +++ b/data/tilesets/secondary/viridian_forest/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 189 164 +189 148 139 +156 115 115 +123 82 82 +90 57 74 +115 205 164 diff --git a/data/tilesets/secondary/viridian_forest/palettes/10.pal b/data/tilesets/secondary/viridian_forest/palettes/10.pal new file mode 100644 index 000000000..746437492 --- /dev/null +++ b/data/tilesets/secondary/viridian_forest/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +222 230 246 +189 197 222 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +49 139 49 +57 82 0 +49 180 98 +238 230 164 +222 205 131 +213 180 106 +205 156 82 +106 205 164 diff --git a/data/tilesets/secondary/viridian_forest/palettes/11.pal b/data/tilesets/secondary/viridian_forest/palettes/11.pal new file mode 100644 index 000000000..410d5193a --- /dev/null +++ b/data/tilesets/secondary/viridian_forest/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/viridian_forest/palettes/12.pal b/data/tilesets/secondary/viridian_forest/palettes/12.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/viridian_forest/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/viridian_forest/palettes/13.pal b/data/tilesets/secondary/viridian_forest/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/viridian_forest/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/viridian_forest/palettes/14.pal b/data/tilesets/secondary/viridian_forest/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/viridian_forest/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/viridian_forest/palettes/15.pal b/data/tilesets/secondary/viridian_forest/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/viridian_forest/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/viridian_forest/palettes/2.pal b/data/tilesets/secondary/viridian_forest/palettes/2.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/viridian_forest/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/viridian_forest/palettes/3.pal b/data/tilesets/secondary/viridian_forest/palettes/3.pal new file mode 100644 index 000000000..9581f2cd8 --- /dev/null +++ b/data/tilesets/secondary/viridian_forest/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 131 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/viridian_forest/palettes/4.pal b/data/tilesets/secondary/viridian_forest/palettes/4.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/viridian_forest/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/viridian_forest/palettes/5.pal b/data/tilesets/secondary/viridian_forest/palettes/5.pal new file mode 100644 index 000000000..3a2db72a7 --- /dev/null +++ b/data/tilesets/secondary/viridian_forest/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +222 205 131 +205 180 106 +180 139 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/viridian_forest/palettes/6.pal b/data/tilesets/secondary/viridian_forest/palettes/6.pal new file mode 100644 index 000000000..93518605a --- /dev/null +++ b/data/tilesets/secondary/viridian_forest/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/viridian_forest/palettes/7.pal b/data/tilesets/secondary/viridian_forest/palettes/7.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/viridian_forest/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/viridian_forest/palettes/8.pal b/data/tilesets/secondary/viridian_forest/palettes/8.pal new file mode 100644 index 000000000..650a35cc8 --- /dev/null +++ b/data/tilesets/secondary/viridian_forest/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 82 0 +57 115 24 +98 65 74 +131 106 82 +65 57 49 +255 0 255 +255 0 255 +255 0 255 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/viridian_forest/palettes/9.pal b/data/tilesets/secondary/viridian_forest/palettes/9.pal new file mode 100644 index 000000000..df2d04037 --- /dev/null +++ b/data/tilesets/secondary/viridian_forest/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +213 230 189 +57 172 131 +222 230 246 +230 172 123 +106 205 164 diff --git a/data/tilesets/secondary/viridian_forest/tiles.png b/data/tilesets/secondary/viridian_forest/tiles.png new file mode 100644 index 000000000..451eb8d5a Binary files /dev/null and b/data/tilesets/secondary/viridian_forest/tiles.png differ diff --git a/data/tilesets/secondary/viridian_gym/metatile_attributes.bin b/data/tilesets/secondary/viridian_gym/metatile_attributes.bin new file mode 100644 index 000000000..a84364708 Binary files /dev/null and b/data/tilesets/secondary/viridian_gym/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/viridian_gym/metatiles.bin b/data/tilesets/secondary/viridian_gym/metatiles.bin new file mode 100644 index 000000000..2980877c1 Binary files /dev/null and b/data/tilesets/secondary/viridian_gym/metatiles.bin differ diff --git a/data/tilesets/secondary/viridian_gym/palettes/0.pal b/data/tilesets/secondary/viridian_gym/palettes/0.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/viridian_gym/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/viridian_gym/palettes/1.pal b/data/tilesets/secondary/viridian_gym/palettes/1.pal new file mode 100644 index 000000000..3a16a45c7 --- /dev/null +++ b/data/tilesets/secondary/viridian_gym/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +238 246 238 diff --git a/data/tilesets/secondary/viridian_gym/palettes/10.pal b/data/tilesets/secondary/viridian_gym/palettes/10.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/viridian_gym/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/viridian_gym/palettes/11.pal b/data/tilesets/secondary/viridian_gym/palettes/11.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/viridian_gym/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/viridian_gym/palettes/12.pal b/data/tilesets/secondary/viridian_gym/palettes/12.pal new file mode 100644 index 000000000..d2c6cb089 --- /dev/null +++ b/data/tilesets/secondary/viridian_gym/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +230 230 230 +255 255 255 +180 115 82 +213 156 123 +123 123 123 +106 156 148 +139 189 180 +180 222 213 +255 0 255 +213 213 213 +230 189 123 +246 197 156 diff --git a/data/tilesets/secondary/viridian_gym/palettes/13.pal b/data/tilesets/secondary/viridian_gym/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/viridian_gym/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/viridian_gym/palettes/14.pal b/data/tilesets/secondary/viridian_gym/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/viridian_gym/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/viridian_gym/palettes/15.pal b/data/tilesets/secondary/viridian_gym/palettes/15.pal new file mode 100644 index 000000000..92e7ed309 --- /dev/null +++ b/data/tilesets/secondary/viridian_gym/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +0 0 0 diff --git a/data/tilesets/secondary/viridian_gym/palettes/2.pal b/data/tilesets/secondary/viridian_gym/palettes/2.pal new file mode 100644 index 000000000..c8ee236d7 --- /dev/null +++ b/data/tilesets/secondary/viridian_gym/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +255 0 255 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/viridian_gym/palettes/3.pal b/data/tilesets/secondary/viridian_gym/palettes/3.pal new file mode 100644 index 000000000..b17dbb054 --- /dev/null +++ b/data/tilesets/secondary/viridian_gym/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +164 164 164 +180 189 189 +255 255 255 +238 246 238 +213 230 222 +197 205 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/viridian_gym/palettes/4.pal b/data/tilesets/secondary/viridian_gym/palettes/4.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/viridian_gym/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/viridian_gym/palettes/5.pal b/data/tilesets/secondary/viridian_gym/palettes/5.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/viridian_gym/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/viridian_gym/palettes/6.pal b/data/tilesets/secondary/viridian_gym/palettes/6.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/viridian_gym/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/viridian_gym/palettes/7.pal b/data/tilesets/secondary/viridian_gym/palettes/7.pal new file mode 100644 index 000000000..f55e52fe2 --- /dev/null +++ b/data/tilesets/secondary/viridian_gym/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +139 139 148 +197 189 213 +255 255 255 +205 197 106 +246 238 148 +255 255 222 +98 98 123 +238 238 238 +82 222 123 +131 255 164 +82 164 57 +255 0 255 +255 0 255 +172 106 74 diff --git a/data/tilesets/secondary/viridian_gym/palettes/8.pal b/data/tilesets/secondary/viridian_gym/palettes/8.pal new file mode 100644 index 000000000..3a7dbc274 --- /dev/null +++ b/data/tilesets/secondary/viridian_gym/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +139 139 148 +197 189 213 +255 255 255 +222 222 238 +230 205 131 +189 197 82 +222 230 115 +238 230 148 +74 123 180 +131 131 139 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/viridian_gym/palettes/9.pal b/data/tilesets/secondary/viridian_gym/palettes/9.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/viridian_gym/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/viridian_gym/tiles.png b/data/tilesets/secondary/viridian_gym/tiles.png new file mode 100644 index 000000000..b53b94b96 Binary files /dev/null and b/data/tilesets/secondary/viridian_gym/tiles.png differ -- cgit v1.2.3 From a1ea8cc82958679baee1c65acc30069d051463c6 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 29 Jan 2020 21:03:07 -0500 Subject: Document Routes 3-9 scripts --- data/maps/Route3/map.json | 20 +- data/maps/Route3/scripts.inc | 8 +- data/maps/Route3/text.inc | 52 +- data/maps/Route4/map.json | 10 +- data/maps/Route4/scripts.inc | 14 +- data/maps/Route4/text.inc | 67 +- data/maps/Route4_PokemonCenter_1F/map.json | 12 +- data/maps/Route4_PokemonCenter_1F/scripts.inc | 108 +-- data/maps/Route4_PokemonCenter_1F/text.inc | 22 +- data/maps/Route5/map.json | 2 +- data/maps/Route5/scripts.inc | 4 +- data/maps/Route5/text.inc | 58 +- data/maps/Route6/map.json | 14 +- data/maps/Route6/scripts.inc | 4 +- data/maps/Route6/text.inc | 38 +- data/maps/Route7/map.json | 2 +- data/maps/Route7/scripts.inc | 4 +- data/maps/Route7/text.inc | 2 +- data/maps/Route8/map.json | 28 +- data/maps/Route8/scripts.inc | 4 +- data/maps/Route8/text.inc | 108 ++- data/maps/Route9/map.json | 20 +- data/maps/Route9/scripts.inc | 4 +- data/maps/Route9/text.inc | 109 +-- data/scripts/fame_checker.inc | 4 +- data/scripts/trainers.inc | 986 +++++++++++++------------- data/text/trainers.inc | 74 +- 27 files changed, 889 insertions(+), 889 deletions(-) (limited to 'data') diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index f2ad40c5e..a881483f8 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route3_EventScript_167F78", + "script": "Route3_EventScript_Youngster", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route3_EventScript_1A957B", + "script": "Route3_EventScript_Robin", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route3_EventScript_1A94C1", + "script": "Route3_EventScript_James", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route3_EventScript_1A953D", + "script": "Route3_EventScript_Sally", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route3_EventScript_1A9483", + "script": "Route3_EventScript_Greg", "flag": "0" }, { @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route3_EventScript_1A9407", + "script": "Route3_EventScript_Calvin", "flag": "0" }, { @@ -112,7 +112,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route3_EventScript_1A94FF", + "script": "Route3_EventScript_Janice", "flag": "0" }, { @@ -125,7 +125,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route3_EventScript_1A9445", + "script": "Route3_EventScript_Colton", "flag": "0" }, { @@ -138,7 +138,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route3_EventScript_1A93C9", + "script": "Route3_EventScript_Ben", "flag": "0" } ], @@ -150,7 +150,7 @@ "x": 72, "y": 11, "elevation": 0, - "script": "Route3_EventScript_167F81" + "script": "Route3_EventScript_RouteSign" }, { "type": "hidden_item", diff --git a/data/maps/Route3/scripts.inc b/data/maps/Route3/scripts.inc index bc44936d0..c8e3c1a58 100644 --- a/data/maps/Route3/scripts.inc +++ b/data/maps/Route3/scripts.inc @@ -1,10 +1,10 @@ Route3_MapScripts:: @ 8167F77 .byte 0 -Route3_EventScript_167F78:: @ 8167F78 - msgbox gUnknown_8183491, MSGBOX_NPC +Route3_EventScript_Youngster:: @ 8167F78 + msgbox Route3_Text_TunnelFromCeruleanTiring, MSGBOX_NPC end -Route3_EventScript_167F81:: @ 8167F81 - msgbox gUnknown_81838C0, MSGBOX_SIGN +Route3_EventScript_RouteSign:: @ 8167F81 + msgbox Route3_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route3/text.inc b/data/maps/Route3/text.inc index 32aa96e19..6e5ad9c69 100644 --- a/data/maps/Route3/text.inc +++ b/data/maps/Route3/text.inc @@ -1,104 +1,104 @@ -gUnknown_8183491:: @ 8183491 +Route3_Text_TunnelFromCeruleanTiring:: @ 8183491 .string "Whew… I better take a rest…\n" .string "Groan…\p" .string "That tunnel from CERULEAN takes a\n" .string "lot out of you!$" -Text_1834E6:: @ 81834E6 +Route3_Text_ColtonIntro:: @ 81834E6 .string "Hey!\n" .string "I saw you in VIRIDIAN FOREST!$" -Text_183509:: @ 8183509 +Route3_Text_ColtonDefeat:: @ 8183509 .string "You beat me again!$" -Text_18351C:: @ 818351C +Route3_Text_ColtonPostBattle:: @ 818351C .string "There are other kinds of POKéMON\n" .string "than the ones you find in forests.$" -Text_183560:: @ 8183560 +Route3_Text_BenIntro:: @ 8183560 .string "Hi!\n" .string "I like shorts!\p" .string "They're delightfully comfy and\n" .string "easy to wear!$" -Text_1835A0:: @ 81835A0 +Route3_Text_BenDefeat:: @ 81835A0 .string "I don't believe it!$" -Text_1835B4:: @ 81835B4 +Route3_Text_BenPostBattle:: @ 81835B4 .string "Are you using a POKéMON CENTER's\n" .string "PC for storing your POKéMON?\p" .string "Each BOX can hold up to\n" .string "30 POKéMON.$" -Text_183616:: @ 8183616 +Route3_Text_JaniceIntro:: @ 8183616 .string "Excuse me!\n" .string "You looked at me, didn't you?$" -Text_18363F:: @ 818363F +Route3_Text_JaniceDefeat:: @ 818363F .string "You're mean!$" -Text_18364C:: @ 818364C +Route3_Text_JanicePostBattle:: @ 818364C .string "You shouldn't be staring if you\n" .string "don't want to battle!$" -Text_183682:: @ 8183682 +Route3_Text_GregIntro:: @ 8183682 .string "Are you a TRAINER?\n" .string "Let's get with it right away!$" -Text_1836B3:: @ 81836B3 +Route3_Text_GregDefeat:: @ 81836B3 .string "If I had new POKéMON, I would've\n" .string "won!$" -Text_1836D9:: @ 81836D9 +Route3_Text_GregPostBattle:: @ 81836D9 .string "If a POKéMON BOX on the PC gets\n" .string "full, just switch to another BOX.$" -Text_18371B:: @ 818371B +Route3_Text_SallyIntro:: @ 818371B .string "That look you gave me…\n" .string "It's so intriguing!$" -Text_183746:: @ 8183746 +Route3_Text_SallyDefeat:: @ 8183746 .string "Be nice!$" -Text_18374F:: @ 818374F +Route3_Text_SallyPostBattle:: @ 818374F .string "You can avoid battles by not\n" .string "letting TRAINERS see you.$" -Text_183786:: @ 8183786 +Route3_Text_CalvinIntro:: @ 8183786 .string "Hey! You're not wearing shorts!\n" .string "What's wrong with you?$" -Text_1837BD:: @ 81837BD +Route3_Text_CalvinDefeat:: @ 81837BD .string "Lost!\n" .string "Lost! Lost!$" -Text_1837CF:: @ 81837CF +Route3_Text_CalvinPostBattle:: @ 81837CF .string "I always wear shorts, even in\n" .string "winter. That's my policy.$" -Text_183807:: @ 8183807 +Route3_Text_JamesIntro:: @ 8183807 .string "I'll battle you with the POKéMON\n" .string "I just caught.$" -Text_183837:: @ 8183837 +Route3_Text_JamesDefeat:: @ 8183837 .string "Done like dinner!$" -Text_183849:: @ 8183849 +Route3_Text_JamesPostBattle:: @ 8183849 .string "Trained POKéMON are stronger than\n" .string "the wild ones.$" -Text_18387A:: @ 818387A +Route3_Text_RobinIntro:: @ 818387A .string "Eek!\n" .string "Did you touch me?$" -Text_183891:: @ 8183891 +Route3_Text_RobinDefeat:: @ 8183891 .string "That's it?$" -Text_18389C:: @ 818389C +Route3_Text_RobinPostBattle:: @ 818389C .string "ROUTE 4 is at the foot of\n" .string "MT. MOON.$" -gUnknown_81838C0:: @ 81838C0 +Route3_Text_RouteSign:: @ 81838C0 .string "ROUTE 3\n" .string "MT. MOON AHEAD$" diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index b992a7d89..6271d5043 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_EventScript_167F8C", + "script": "Route4_EventScript_Woman", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route4_EventScript_1A95B9", + "script": "Route4_EventScript_Crissy", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_EventScript_1ACDEA", + "script": "Route4_EventScript_Boy", "flag": "0" }, { @@ -146,14 +146,14 @@ "x": 18, "y": 7, "elevation": 0, - "script": "Route4_EventScript_167F95" + "script": "Route4_EventScript_MtMoonSign" }, { "type": "bg_event_type_0", "x": 34, "y": 7, "elevation": 0, - "script": "Route4_EventScript_167F9E" + "script": "Route4_EventScript_RouteSign" }, { "type": "hidden_item", diff --git a/data/maps/Route4/scripts.inc b/data/maps/Route4/scripts.inc index 9055722eb..c6c7e6bbd 100644 --- a/data/maps/Route4/scripts.inc +++ b/data/maps/Route4/scripts.inc @@ -1,17 +1,17 @@ Route4_MapScripts:: @ 8167F8A .byte 0 -Route4_EventScript_167F8B:: @ 8167F8B +Route4_EventScript_Unused:: @ 8167F8B end -Route4_EventScript_167F8C:: @ 8167F8C - msgbox gUnknown_81838D7, MSGBOX_NPC +Route4_EventScript_Woman:: @ 8167F8C + msgbox Route4_Text_TrippedOverGeodude, MSGBOX_NPC end -Route4_EventScript_167F95:: @ 8167F95 - msgbox gUnknown_818399B, MSGBOX_SIGN +Route4_EventScript_MtMoonSign:: @ 8167F95 + msgbox Route4_Text_MtMoonEntrance, MSGBOX_SIGN end -Route4_EventScript_167F9E:: @ 8167F9E - msgbox gUnknown_81839B4, MSGBOX_SIGN +Route4_EventScript_RouteSign:: @ 8167F9E + msgbox Route4_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route4/text.inc b/data/maps/Route4/text.inc index 49648cde0..a6bd24787 100644 --- a/data/maps/Route4/text.inc +++ b/data/maps/Route4/text.inc @@ -1,24 +1,79 @@ -gUnknown_81838D7:: @ 81838D7 +Route4_Text_TrippedOverGeodude:: @ 81838D7 .string "Ouch! I tripped over a rocky\n" .string "POKéMON, GEODUDE!$" -Text_183906:: @ 8183906 +Route4_Text_CrissyIntro:: @ 8183906 .string "I came to MT. MOON in search of\n" .string "mushroom POKéMON.$" -Text_183938:: @ 8183938 +Route4_Text_CrissyDefeat:: @ 8183938 .string "After all I did to catch them!$" -Text_183957:: @ 8183957 +Route4_Text_CrissyPostBattle:: @ 8183957 .string "There might not be any more\n" .string "mushrooms here.\p" .string "I think I got them all.$" -gUnknown_818399B:: @ 818399B +Route4_Text_MtMoonEntrance:: @ 818399B .string "MT. MOON\n" .string "Tunnel Entrance$" -gUnknown_81839B4:: @ 81839B4 +Route4_Text_RouteSign:: @ 81839B4 .string "ROUTE 4\n" .string "MT. MOON - CERULEAN CITY$" +Text_MegaPunchTeach:: @ 81839D5 + .string "A punch of roaring ferocity!\p" + .string "Packed with destructive power!\p" + .string "When the chips are down,\n" + .string "MEGA PUNCH is the ultimate attack!\l" + .string "You agree, yes?\p" + .string "Now!\n" + .string "Let me teach it to your POKéMON!$" + +Text_MegaPunchDeclined:: @ 8183A83 + .string "You'll be back when you understand\n" + .string "the worth of MEGA PUNCH.$" + +Text_MegaPunchWhichMon:: @ 8183ABF + .string "Fine!\n" + .string "Which POKéMON will learn it?$" + +Text_MegaPunchTaught:: @ 8183AE2 + .string "Now, we are comrades in the way of\n" + .string "punching!\p" + .string "You should go before you're seen\n" + .string "by the misguided fool who trains\l" + .string "only his silly kicking over there.$" + +Text_MegaKickTeach:: @ 8183B74 + .string "A kick of brutal ferocity!\p" + .string "Packed with destructive power!\p" + .string "When you get right down to it,\n" + .string "MEGA KICK is the ultimate attack!\l" + .string "Don't you agree?\p" + .string "Okay!\n" + .string "I'll teach it to your POKéMON!$" + +Text_MegaKickDeclined:: @ 8183C25 + .string "You'll come crawling back when you\n" + .string "realize the value of MEGA KICK.$" + +Text_MegaKickWhichMon:: @ 8183C68 + .string "All right!\n" + .string "Which POKéMON wants to learn it?$" + +Text_MegaKickTaught:: @ 8183C94 + .string "Now, we are soul mates in the way\n" + .string "of kicking!\p" + .string "You should run before you're seen\n" + .string "by the deluded nitwit who trains\l" + .string "only simple punching over there.$" + +Route4_Text_PeopleLikeAndRespectBrock:: @ 8183D26 + .string "Oh, wow, that's the BOULDERBADGE!\n" + .string "You got it from BROCK, didn't you?\p" + .string "BROCK is cool. He's not just tough.\n" + .string "People like and respect him.\p" + .string "I want to become a GYM LEADER\n" + .string "like him.$" diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json index 29c7c514c..6eb5f6730 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_1F_EventScript_16F8BB", + "script": "Route4_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_1F_EventScript_16F75F", + "script": "Route4_PokemonCenter_1F_EventScript_MagikarpSalesman", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_1F_EventScript_16F754", + "script": "Route4_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_1F_EventScript_16F74B", + "script": "Route4_PokemonCenter_1F_EventScript_Boy", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_1F_EventScript_16F8C4", + "script": "Route4_PokemonCenter_1F_EventScript_Youngster", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_1F_EventScript_16F8CD", + "script": "Route4_PokemonCenter_1F_EventScript_Newspaper", "flag": "0" } ], diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index ca2c5f611..420e18d1a 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -1,3 +1,5 @@ +.equ MAGIKARP_PRICE, 500 + Route4_PokemonCenter_1F_MapScripts:: @ 816F739 map_script MAP_SCRIPT_ON_TRANSITION, Route4_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume @@ -8,149 +10,149 @@ Route4_PokemonCenter_1F_OnTransition:: @ 816F744 setrespawn SPAWN_ROUTE4 end -Route4_PokemonCenter_1F_EventScript_16F74B:: @ 816F74B - msgbox gUnknown_819D9D4, MSGBOX_NPC +Route4_PokemonCenter_1F_EventScript_Boy:: @ 816F74B + msgbox Route4_PokemonCenter_1F_Text_CanHaveSixMonsWithYou, MSGBOX_NPC end -Route4_PokemonCenter_1F_EventScript_16F754:: @ 816F754 +Route4_PokemonCenter_1F_EventScript_Gentleman:: @ 816F754 lock - msgbox gUnknown_819DA3A + msgbox Route4_PokemonCenter_1F_Text_TeamRocketAttacksCerulean release end -Route4_PokemonCenter_1F_EventScript_16F75F:: @ 816F75F +Route4_PokemonCenter_1F_EventScript_MagikarpSalesman:: @ 816F75F lock faceplayer - goto_if_set FLAG_BOUGHT_MAGIKARP, EventScript_16F8A2 + goto_if_set FLAG_BOUGHT_MAGIKARP, Route4_PokemonCenter_1F_EventScript_AlreadyBoughtMagikarp showmoneybox 0, 0, 0 checkplayergender compare VAR_RESULT, MALE - goto_if_eq EventScript_16F786 + goto_if_eq Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpMale compare VAR_RESULT, FEMALE - goto_if_eq EventScript_16F794 + goto_if_eq Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpFemale end -EventScript_16F786:: @ 816F786 - msgbox gUnknown_819DA9A, MSGBOX_YESNO - goto EventScript_16F7A2 +Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpMale:: @ 816F786 + msgbox Route4_PokemonCenter_1F_Text_LaddieBuyMagikarpForJust500, MSGBOX_YESNO + goto Route4_PokemonCenter_1F_EventScript_TryBuyMagikarp end -EventScript_16F794:: @ 816F794 - msgbox gUnknown_819DB34, MSGBOX_YESNO - goto EventScript_16F7A2 +Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpFemale:: @ 816F794 + msgbox Route4_PokemonCenter_1F_Text_SweetieBuyMagikarpForJust500, MSGBOX_YESNO + goto Route4_PokemonCenter_1F_EventScript_TryBuyMagikarp end -EventScript_16F7A2:: @ 816F7A2 +Route4_PokemonCenter_1F_EventScript_TryBuyMagikarp:: @ 816F7A2 compare VAR_RESULT, NO - goto_if_eq EventScript_16F888 - checkmoney 500, 0 + goto_if_eq Route4_PokemonCenter_1F_EventScript_DeclineMagikarp + checkmoney MAGIKARP_PRICE, 0 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16F895 + goto_if_eq Route4_PokemonCenter_1F_EventScript_NotEnoughMoney textcolor 3 - setvar VAR_TEMP_1, 129 + setvar VAR_TEMP_1, SPECIES_MAGIKARP givemon SPECIES_MAGIKARP, 5, ITEM_NONE compare VAR_RESULT, 0 - goto_if_eq EventScript_16F7F6 + goto_if_eq Route4_PokemonCenter_1F_EventScript_BuyMagikarpParty compare VAR_RESULT, 1 - goto_if_eq EventScript_16F822 + goto_if_eq Route4_PokemonCenter_1F_EventScript_BuyMagikarpPC compare VAR_RESULT, 2 - goto_if_eq EventScript_16F8AC + goto_if_eq Route4_PokemonCenter_1F_EventScript_NoRoomForMagikarp end -EventScript_16F7F6:: @ 816F7F6 - call EventScript_16F86F +Route4_PokemonCenter_1F_EventScript_BuyMagikarpParty:: @ 816F7F6 + call Route4_PokemonCenter_1F_EventScript_PayForMagikarp msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16F861 + goto_if_eq Route4_PokemonCenter_1F_EventScript_EndPurchaseMagikarp call EventScript_GetGiftMonPartySlot fadescreen FADE_TO_BLACK hidemoneybox 0, 0 special ChangePokemonNickname waitstate - goto EventScript_16F86A + goto Route4_PokemonCenter_1F_EventScript_BoughtMagikarp end -EventScript_16F822:: @ 816F822 - call EventScript_16F86F +Route4_PokemonCenter_1F_EventScript_BuyMagikarpPC:: @ 816F822 + call Route4_PokemonCenter_1F_EventScript_PayForMagikarp msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16F84B + goto_if_eq Route4_PokemonCenter_1F_EventScript_TransferMagikarpCloseMoneyBox fadescreen FADE_TO_BLACK hidemoneybox 0, 0 special ChangeBoxPokemonNickname waitstate lock faceplayer - goto EventScript_16F856 + goto Route4_PokemonCenter_1F_EventScript_TransferMagikarp end -EventScript_16F84B:: @ 816F84B +Route4_PokemonCenter_1F_EventScript_TransferMagikarpCloseMoneyBox:: @ 816F84B call EventScript_TransferredToPC - goto EventScript_16F861 + goto Route4_PokemonCenter_1F_EventScript_EndPurchaseMagikarp end -EventScript_16F856:: @ 816F856 +Route4_PokemonCenter_1F_EventScript_TransferMagikarp:: @ 816F856 call EventScript_TransferredToPC - goto EventScript_16F86A + goto Route4_PokemonCenter_1F_EventScript_BoughtMagikarp end -EventScript_16F861:: @ 816F861 +Route4_PokemonCenter_1F_EventScript_EndPurchaseMagikarp:: @ 816F861 hidemoneybox 0, 0 - goto EventScript_16F86A + goto Route4_PokemonCenter_1F_EventScript_BoughtMagikarp end -EventScript_16F86A:: @ 816F86A +Route4_PokemonCenter_1F_EventScript_BoughtMagikarp:: @ 816F86A setflag FLAG_BOUGHT_MAGIKARP release end -EventScript_16F86F:: @ 816F86F - removemoney 500, 0 +Route4_PokemonCenter_1F_EventScript_PayForMagikarp:: @ 816F86F + removemoney MAGIKARP_PRICE, 0 updatemoneybox 0, 0, 0 playfanfare MUS_FANFA1 - message Text_19DBD3 + message Route4_PokemonCenter_1F_Text_PaidOutrageouslyForMagikarp waitmessage waitfanfare getspeciesname 0, SPECIES_MAGIKARP return -EventScript_16F888:: @ 816F888 - msgbox gUnknown_819DC07 +Route4_PokemonCenter_1F_EventScript_DeclineMagikarp:: @ 816F888 + msgbox Route4_PokemonCenter_1F_Text_OnlyDoingThisAsFavorToYou hidemoneybox 0, 0 release end -EventScript_16F895:: @ 816F895 - msgbox gUnknown_819DC78 +Route4_PokemonCenter_1F_EventScript_NotEnoughMoney:: @ 816F895 + msgbox Route4_PokemonCenter_1F_Text_YoullNeedMoreMoney hidemoneybox 0, 0 release end -EventScript_16F8A2:: @ 816F8A2 - msgbox gUnknown_819DC9A +Route4_PokemonCenter_1F_EventScript_AlreadyBoughtMagikarp:: @ 816F8A2 + msgbox Route4_PokemonCenter_1F_Text_IDontGiveRefunds release end -EventScript_16F8AC:: @ 816F8AC +Route4_PokemonCenter_1F_EventScript_NoRoomForMagikarp:: @ 816F8AC textcolor 0 - msgbox gUnknown_819DC3E + msgbox Route4_PokemonCenter_1F_Text_NoRoomForMorePokemon hidemoneybox 0, 0 release end -Route4_PokemonCenter_1F_EventScript_16F8BB:: @ 816F8BB +Route4_PokemonCenter_1F_EventScript_Nurse:: @ 816F8BB lock faceplayer call EventScript_PkmnCenterNurse release end -Route4_PokemonCenter_1F_EventScript_16F8C4:: @ 816F8C4 - msgbox gUnknown_819DCDB, MSGBOX_NPC +Route4_PokemonCenter_1F_EventScript_Youngster:: @ 816F8C4 + msgbox Route4_PokemonCenter_1F_Text_ShouldStoreMonsUsingPC, MSGBOX_NPC end -Route4_PokemonCenter_1F_EventScript_16F8CD:: @ 816F8CD +Route4_PokemonCenter_1F_EventScript_Newspaper:: @ 816F8CD lock - msgbox gUnknown_819DD54 + msgbox Route4_PokemonCenter_1F_Text_ItsANewspaper release end diff --git a/data/maps/Route4_PokemonCenter_1F/text.inc b/data/maps/Route4_PokemonCenter_1F/text.inc index f357b7f76..df65ae33a 100644 --- a/data/maps/Route4_PokemonCenter_1F/text.inc +++ b/data/maps/Route4_PokemonCenter_1F/text.inc @@ -1,54 +1,54 @@ -gUnknown_819D9D4:: @ 819D9D4 +Route4_PokemonCenter_1F_Text_CanHaveSixMonsWithYou:: @ 819D9D4 .string "Okay, set six POKé BALLS in my\n" .string "belt…\p" .string "Yeah, that'll do it. At most, you\n" .string "can have six POKéMON with you.$" -gUnknown_819DA3A:: @ 819DA3A +Route4_PokemonCenter_1F_Text_TeamRocketAttacksCerulean:: @ 819DA3A .string "TEAM ROCKET attacks CERULEAN\n" .string "citizens…\p" .string "Not a day goes by without TEAM\n" .string "ROCKET being in the news.$" -gUnknown_819DA9A:: @ 819DA9A +Route4_PokemonCenter_1F_Text_LaddieBuyMagikarpForJust500:: @ 819DA9A .string "MAN: Hello there, laddie!\n" .string "Have I got a deal just for you!\p" .string "I'll let you have a secret POKéMON\n" .string "- a MAGIKARP - for just ¥500!\p" .string "So, you'll buy it, am I right?$" -gUnknown_819DB34:: @ 819DB34 +Route4_PokemonCenter_1F_Text_SweetieBuyMagikarpForJust500:: @ 819DB34 .string "MAN: Hello there, sweetie pie!\n" .string "Have I got a deal just for you!\p" .string "I'll let you have a secret POKéMON\n" .string "- a MAGIKARP - for just ¥500!\p" .string "So, you'll buy it, am I right?$" -Text_19DBD3:: @ 819DBD3 +Route4_PokemonCenter_1F_Text_PaidOutrageouslyForMagikarp:: @ 819DBD3 .string "{PLAYER} paid an outrageous ¥500\n" .string "and bought the MAGIKARP…$" -gUnknown_819DC07:: @ 819DC07 +Route4_PokemonCenter_1F_Text_OnlyDoingThisAsFavorToYou:: @ 819DC07 .string "No? You say no? I'm only doing this\n" .string "as a favor to you!$" -gUnknown_819DC3E:: @ 819DC3E +Route4_PokemonCenter_1F_Text_NoRoomForMorePokemon:: @ 819DC3E .string "There's no more room for any more\n" .string "POKéMON, it looks like.$" -gUnknown_819DC78:: @ 819DC78 +Route4_PokemonCenter_1F_Text_YoullNeedMoreMoney:: @ 819DC78 .string "You'll need more money than that!$" -gUnknown_819DC9A:: @ 819DC9A +Route4_PokemonCenter_1F_Text_IDontGiveRefunds:: @ 819DC9A .string "MAN: Well, I don't give refunds.\n" .string "You knew what you were getting!$" -gUnknown_819DCDB:: @ 819DCDB +Route4_PokemonCenter_1F_Text_ShouldStoreMonsUsingPC:: @ 819DCDB .string "Sometimes, you'll have too many\n" .string "POKéMON with you to add any more.\p" .string "In that case, you should just\n" .string "store some using any PC.$" -gUnknown_819DD54:: @ 819DD54 +Route4_PokemonCenter_1F_Text_ItsANewspaper:: @ 819DD54 .string "It's a newspaper.$" diff --git a/data/maps/Route5/map.json b/data/maps/Route5/map.json index 8b047231e..585054ddd 100644 --- a/data/maps/Route5/map.json +++ b/data/maps/Route5/map.json @@ -61,7 +61,7 @@ "x": 32, "y": 32, "elevation": 0, - "script": "Route5_EventScript_167FA8" + "script": "Route5_EventScript_UndergroundPathSign" } ] } diff --git a/data/maps/Route5/scripts.inc b/data/maps/Route5/scripts.inc index 3e1b507d2..cc5b0d1d2 100644 --- a/data/maps/Route5/scripts.inc +++ b/data/maps/Route5/scripts.inc @@ -1,6 +1,6 @@ Route5_MapScripts:: @ 8167FA7 .byte 0 -Route5_EventScript_167FA8:: @ 8167FA8 - msgbox gUnknown_8183DD4, MSGBOX_SIGN +Route5_EventScript_UndergroundPathSign:: @ 8167FA8 + msgbox Route5_Text_UndergroundPathSign, MSGBOX_SIGN end diff --git a/data/maps/Route5/text.inc b/data/maps/Route5/text.inc index 0a3e80874..1aab5cc6b 100644 --- a/data/maps/Route5/text.inc +++ b/data/maps/Route5/text.inc @@ -1,60 +1,4 @@ -Text_MegaPunchTeach:: @ 81839D5 - .string "A punch of roaring ferocity!\p" - .string "Packed with destructive power!\p" - .string "When the chips are down,\n" - .string "MEGA PUNCH is the ultimate attack!\l" - .string "You agree, yes?\p" - .string "Now!\n" - .string "Let me teach it to your POKéMON!$" - -Text_MegaPunchDeclined:: @ 8183A83 - .string "You'll be back when you understand\n" - .string "the worth of MEGA PUNCH.$" - -Text_MegaPunchWhichMon:: @ 8183ABF - .string "Fine!\n" - .string "Which POKéMON will learn it?$" - -Text_MegaPunchTaught:: @ 8183AE2 - .string "Now, we are comrades in the way of\n" - .string "punching!\p" - .string "You should go before you're seen\n" - .string "by the misguided fool who trains\l" - .string "only his silly kicking over there.$" - -Text_MegaKickTeach:: @ 8183B74 - .string "A kick of brutal ferocity!\p" - .string "Packed with destructive power!\p" - .string "When you get right down to it,\n" - .string "MEGA KICK is the ultimate attack!\l" - .string "Don't you agree?\p" - .string "Okay!\n" - .string "I'll teach it to your POKéMON!$" - -Text_MegaKickDeclined:: @ 8183C25 - .string "You'll come crawling back when you\n" - .string "realize the value of MEGA KICK.$" - -Text_MegaKickWhichMon:: @ 8183C68 - .string "All right!\n" - .string "Which POKéMON wants to learn it?$" - -Text_MegaKickTaught:: @ 8183C94 - .string "Now, we are soul mates in the way\n" - .string "of kicking!\p" - .string "You should run before you're seen\n" - .string "by the deluded nitwit who trains\l" - .string "only simple punching over there.$" - -Text_183D26:: @ 8183D26 - .string "Oh, wow, that's the BOULDERBADGE!\n" - .string "You got it from BROCK, didn't you?\p" - .string "BROCK is cool. He's not just tough.\n" - .string "People like and respect him.\p" - .string "I want to become a GYM LEADER\n" - .string "like him.$" - -gUnknown_8183DD4:: @ 8183DD4 +Route5_Text_UndergroundPathSign:: @ 8183DD4 .string "UNDERGROUND PATH\n" .string "CERULEAN CITY - VERMILION CITY$" diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index f67590481..b827521ae 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route6_EventScript_1A9999", + "script": "Route6_EventScript_Keigo", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "Route6_EventScript_1A9A15", + "script": "Route6_EventScript_Ricky", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "Route6_EventScript_1A9A91", + "script": "Route6_EventScript_Nancy", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route6_EventScript_1A99D7", + "script": "Route6_EventScript_Elijah", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route6_EventScript_1A9ACF", + "script": "Route6_EventScript_Isabelle", "flag": "0" }, { @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route6_EventScript_1A9A53", + "script": "Route6_EventScript_Jeff", "flag": "0" } ], @@ -133,7 +133,7 @@ "x": 21, "y": 15, "elevation": 0, - "script": "Route6_EventScript_167FB2" + "script": "Route6_EventScript_UndergroundPathSign" }, { "type": "hidden_item", diff --git a/data/maps/Route6/scripts.inc b/data/maps/Route6/scripts.inc index 00b3efb56..575c05fe6 100644 --- a/data/maps/Route6/scripts.inc +++ b/data/maps/Route6/scripts.inc @@ -1,6 +1,6 @@ Route6_MapScripts:: @ 8167FB1 .byte 0 -Route6_EventScript_167FB2:: @ 8167FB2 - msgbox gUnknown_8184067, MSGBOX_SIGN +Route6_EventScript_UndergroundPathSign:: @ 8167FB2 + msgbox Route6_Text_UndergroundPathSign, MSGBOX_SIGN end diff --git a/data/maps/Route6/text.inc b/data/maps/Route6/text.inc index b8ae84e32..0242ceee8 100644 --- a/data/maps/Route6/text.inc +++ b/data/maps/Route6/text.inc @@ -1,73 +1,73 @@ -Text_183E04:: @ 8183E04 +Route6_Text_RickyIntro:: @ 8183E04 .string "Who's there?\n" .string "Quit listening in on us!$" -Text_183E2A:: @ 8183E2A +Route6_Text_RickyDefeat:: @ 8183E2A .string "I just can't win!$" -Text_183E3C:: @ 8183E3C +Route6_Text_RickyPostBattle:: @ 8183E3C .string "Whisper…\n" .string "Whisper…$" -Text_183E4E:: @ 8183E4E +Route6_Text_NancyIntro:: @ 8183E4E .string "Excuse me!\n" .string "This is a private conversation!$" -Text_183E79:: @ 8183E79 +Route6_Text_NancyDefeat:: @ 8183E79 .string "Ugh!\n" .string "I hate losing.$" -Text_183E8D:: @ 8183E8D +Route6_Text_NancyPostBattle:: @ 8183E8D .string "Whisper…\n" .string "Whisper…$" -Text_183E9F:: @ 8183E9F +Route6_Text_KeigoIntro:: @ 8183E9F .string "There aren't many bugs out here.$" -Text_183EC0:: @ 8183EC0 +Route6_Text_KeigoDefeat:: @ 8183EC0 .string "No!\n" .string "You're kidding!$" -Text_183ED4:: @ 8183ED4 +Route6_Text_KeigoPostBattle:: @ 8183ED4 .string "I like bugs, so I'm going back to\n" .string "VIRIDIAN FOREST.$" -Text_183F07:: @ 8183F07 +Route6_Text_JeffIntro:: @ 8183F07 .string "Huh?\n" .string "You want to talk to me?$" -Text_183F24:: @ 8183F24 +Route6_Text_JeffDefeat:: @ 8183F24 .string "This stinks…\n" .string "I couldn't beat your challenge…$" -Text_183F51:: @ 8183F51 +Route6_Text_JeffPostBattle:: @ 8183F51 .string "I should bring more POKéMON with\n" .string "me. I'll feel safer that way.$" -Text_183F90:: @ 8183F90 +Route6_Text_IsabelleIntro:: @ 8183F90 .string "Me?\n" .string "Well, okay. I'll play!$" -Text_183FAB:: @ 8183FAB +Route6_Text_IsabelleDefeat:: @ 8183FAB .string "Things just didn't work…$" -Text_183FC4:: @ 8183FC4 +Route6_Text_IsabellePostBattle:: @ 8183FC4 .string "I want to get stronger.\n" .string "What's your secret?$" -Text_183FF0:: @ 8183FF0 +Route6_Text_ElijahIntro:: @ 8183FF0 .string "I've never seen you around.\n" .string "Are you good?$" -Text_18401A:: @ 818401A +Route6_Text_ElijahDefeat:: @ 818401A .string "You're too good!$" -Text_18402B:: @ 818402B +Route6_Text_ElijahPostBattle:: @ 818402B .string "Are my POKéMON weak?\n" .string "Or, am I just bad?\l" .string "Which do you think?$" -gUnknown_8184067:: @ 8184067 +Route6_Text_UndergroundPathSign:: @ 8184067 .string "UNDERGROUND PATH\n" .string "CERULEAN CITY - VERMILION CITY$" diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index e30bc8149..66833b93b 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -61,7 +61,7 @@ "x": 5, "y": 14, "elevation": 0, - "script": "Route7_EventScript_167FBC" + "script": "Route7_EventScript_UndergroundPathSign" }, { "type": "hidden_item", diff --git a/data/maps/Route7/scripts.inc b/data/maps/Route7/scripts.inc index 52d0f5f36..299d6bad8 100644 --- a/data/maps/Route7/scripts.inc +++ b/data/maps/Route7/scripts.inc @@ -1,6 +1,6 @@ Route7_MapScripts:: @ 8167FBB .byte 0 -Route7_EventScript_167FBC:: @ 8167FBC - msgbox gUnknown_8184097, MSGBOX_SIGN +Route7_EventScript_UndergroundPathSign:: @ 8167FBC + msgbox Route7_Text_UndergroundPathSign, MSGBOX_SIGN end diff --git a/data/maps/Route7/text.inc b/data/maps/Route7/text.inc index 3f1cdda5b..4a58cc14b 100644 --- a/data/maps/Route7/text.inc +++ b/data/maps/Route7/text.inc @@ -1,4 +1,4 @@ -gUnknown_8184097:: @ 8184097 +Route7_Text_UndergroundPathSign:: @ 8184097 .string "UNDERGROUND PATH\n" .string "CELADON CITY - LAVENDER TOWN$" diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index 7ed8e635d..92e0154a4 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "Route8_EventScript_1AA1D5", + "script": "Route8_EventScript_Julia", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route8_EventScript_1AA30B", + "script": "Route8_EventScript_Rich", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route8_EventScript_1AA251", + "script": "Route8_EventScript_Glenn", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route8_EventScript_1AA11B", + "script": "Route8_EventScript_Paige", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "Route8_EventScript_1AA28F", + "script": "Route8_EventScript_Leslie", "flag": "0" }, { @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route8_EventScript_1AA159", + "script": "Route8_EventScript_Andrea", "flag": "0" }, { @@ -112,7 +112,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "Route8_EventScript_1AA197", + "script": "Route8_EventScript_Megan", "flag": "0" }, { @@ -125,7 +125,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route8_EventScript_1AA2CD", + "script": "Route8_EventScript_Stan", "flag": "0" }, { @@ -138,7 +138,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route8_EventScript_1AA213", + "script": "Route8_EventScript_Aidan", "flag": "0" }, { @@ -177,7 +177,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route8_EventScript_1AA349", + "script": "Route8_EventScript_Eli", "flag": "0" }, { @@ -190,7 +190,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route8_EventScript_1AA38F", + "script": "Route8_EventScript_Anne", "flag": "0" }, { @@ -203,7 +203,7 @@ "movement_range_y": 2, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route8_EventScript_1AA3D5", + "script": "Route8_EventScript_Ricardo", "flag": "0" }, { @@ -216,7 +216,7 @@ "movement_range_y": 5, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route8_EventScript_1AA413", + "script": "Route8_EventScript_Jaren", "flag": "0" } ], @@ -243,7 +243,7 @@ "x": 16, "y": 5, "elevation": 0, - "script": "Route8_EventScript_167FC6" + "script": "Route8_EventScript_UndergroundPathSign" }, { "type": "hidden_item", diff --git a/data/maps/Route8/scripts.inc b/data/maps/Route8/scripts.inc index c0f7475f3..93e0aa38a 100644 --- a/data/maps/Route8/scripts.inc +++ b/data/maps/Route8/scripts.inc @@ -1,6 +1,6 @@ Route8_MapScripts:: @ 8167FC5 .byte 0 -Route8_EventScript_167FC6:: @ 8167FC6 - msgbox gUnknown_8184576, MSGBOX_SIGN +Route8_EventScript_UndergroundPathSign:: @ 8167FC6 + msgbox Route8_Text_UndergroundPathSign, MSGBOX_SIGN end diff --git a/data/maps/Route8/text.inc b/data/maps/Route8/text.inc index 83f725c6a..c9891575c 100644 --- a/data/maps/Route8/text.inc +++ b/data/maps/Route8/text.inc @@ -1,110 +1,162 @@ -Text_1840C5:: @ 81840C5 +Route8_Text_AidanIntro:: @ 81840C5 .string "You look good at POKéMON, but how\n" .string "is your chemistry grade?$" -Text_184100:: @ 8184100 +Route8_Text_AidanDefeat:: @ 8184100 .string "Ow!\n" .string "Meltdown!$" -Text_18410E:: @ 818410E +Route8_Text_AidanPostBattle:: @ 818410E .string "I am better at school than this!$" -Text_18412F:: @ 818412F +Route8_Text_StanIntro:: @ 818412F .string "All right!\n" .string "Let's play a game!$" -Text_18414D:: @ 818414D +Route8_Text_StanDefeat:: @ 818414D .string "Drat!\n" .string "Came up short!$" -Text_184162:: @ 8184162 +Route8_Text_StanPostBattle:: @ 8184162 .string "Things didn't work today.$" -Text_18417C:: @ 818417C +Route8_Text_GlennIntro:: @ 818417C .string "You should be informed.\n" .string "You need strategy to win at this!$" -Text_1841B6:: @ 81841B6 +Route8_Text_GlennDefeat:: @ 81841B6 .string "It's not logical!$" -Text_1841C8:: @ 81841C8 +Route8_Text_GlennPostBattle:: @ 81841C8 .string "Go with GRIMER first…and…\n" .string "…and…then…$" -Text_1841ED:: @ 81841ED +Route8_Text_PaigeIntro:: @ 81841ED .string "I like NIDORAN, so I collect them!$" -Text_184210:: @ 8184210 +Route8_Text_PaigeDefeat:: @ 8184210 .string "Why?\n" .string "Why??$" -Text_18421B:: @ 818421B +Route8_Text_PaigePostBattle:: @ 818421B .string "When POKéMON grow up, they get\n" .string "ugly! They shouldn't evolve.$" -Text_184257:: @ 8184257 +Route8_Text_LeslieIntro:: @ 8184257 .string "School is fun, but so are POKéMON.$" -Text_18427A:: @ 818427A +Route8_Text_LeslieDefeat:: @ 818427A .string "You made it clear to me that\n" .string "I should stick with school.$" -Text_1842B3:: @ 81842B3 +Route8_Text_LesliePostBattle:: @ 81842B3 .string "I was planning on getting some\n" .string "fresh air for a change, but…\p" .string "We're stuck here because of the\n" .string "gates at SAFFRON.$" -Text_184321:: @ 8184321 +Route8_Text_AndreaIntro:: @ 8184321 .string "MEOWTH is so cute, meow, meow,\n" .string "meow!$" -Text_184346:: @ 8184346 +Route8_Text_AndreaDefeat:: @ 8184346 .string "Meeeeyow!$" -Text_184350:: @ 8184350 +Route8_Text_AndreaPostBattle:: @ 8184350 .string "I think PIDGEY and RATTATA are\n" .string "cute, too!$" -Text_18437A:: @ 818437A +Route8_Text_MeganIntro:: @ 818437A .string "We must look silly standing here\n" .string "like this.$" -Text_1843A6:: @ 81843A6 +Route8_Text_MeganDefeat:: @ 81843A6 .string "Look what you did to my poor, cute\n" .string "POKéMON!$" -Text_1843D2:: @ 81843D2 +Route8_Text_MeganPostBattle:: @ 81843D2 .string "SAFFRON's gatekeeper won't let us\n" .string "go through.\p" .string "I know he's doing his job, but I\n" .string "think he's mean.$" -Text_184432:: @ 8184432 +Route8_Text_RichIntro:: @ 8184432 .string "I'm a rambling, gaming dude!$" -Text_18444F:: @ 818444F +Route8_Text_RichDefeat:: @ 818444F .string "Missed the big chance!$" -Text_184466:: @ 8184466 +Route8_Text_RichPostBattle:: @ 8184466 .string "Playing games and POKéMON are like\n" .string "eating peanuts! I just can't stop!$" -Text_1844AC:: @ 81844AC +Route8_Text_JuliaIntro:: @ 81844AC .string "What's a cute, round, and fluffy\n" .string "POKéMON?$" -Text_1844D6:: @ 81844D6 +Route8_Text_JuliaDefeat:: @ 81844D6 .string "Stop!\p" .string "Don't be so mean to my CLEFAIRY!$" -Text_1844FD:: @ 81844FD +Route8_Text_JuliaPostBattle:: @ 81844FD .string "I read that CLEFAIRY evolves when\n" .string "it's exposed to a MOON STONE.\p" .string "I read that in a POKéMON JOURNAL.\n" .string "I wonder if it's true?$" -gUnknown_8184576:: @ 8184576 +Route8_Text_UndergroundPathSign:: @ 8184576 .string "UNDERGROUND PATH\n" .string "CELADON CITY - LAVENDER TOWN$" +Route8_Text_EliIntro:: @ 81845A4 + .string "ELI: Twin power is fantastic.\n" + .string "Did you know?$" + +Route8_Text_EliDefeat:: @ 81845D0 + .string "ELI: But…\n" + .string "We used our twin power…$" + +Route8_Text_EliPostBattle:: @ 81845F2 + .string "ELI: I caught my POKéMON with\n" + .string "ANNE!$" + +Route8_Text_EliNotEnoughMons:: @ 8184616 + .string "ELI: We can't battle if you don't\n" + .string "have two POKéMON.$" + +Route8_Text_AnneIntro:: @ 818464A + .string "ANNE: We'll shock you with our twin\n" + .string "power!$" + +Route8_Text_AnneDefeat:: @ 8184675 + .string "ANNE: Our twin power…$" + +Route8_Text_AnnePostBattle:: @ 818468B + .string "ANNE: I'm raising POKéMON with\n" + .string "ELI.$" + +Route8_Text_AnneNotEnoughMons:: @ 81846AF + .string "ANNE: Hi, hi! Let's battle!\n" + .string "But bring two POKéMON.$" + +Route8_Text_RicardoIntro:: @ 81846E2 + .string "My bike's acting up, man.$" + +Route8_Text_RicardoDefeat:: @ 81846FC + .string "Aww, man.\n" + .string "I'm not into this.$" + +Route8_Text_RicardoPostBattle:: @ 8184719 + .string "I got grass caught up in my\n" + .string "spokes, man.$" + +Route8_Text_JarenIntro:: @ 8184742 + .string "Clear the way, or I'll run you\n" + .string "down!$" + +Route8_Text_JarenDefeat:: @ 8184767 + .string "You for real, kid?$" + +Route8_Text_JarenPostBattle:: @ 818477A + .string "Don't think you're all special and\n" + .string "all just because of this.$" diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index 24e5c3c4f..ffb83f27c 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route9_EventScript_1A9E71", + "script": "Route9_EventScript_Alicia", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route9_EventScript_1A9F69", + "script": "Route9_EventScript_Jeremy", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route9_EventScript_1A9EED", + "script": "Route9_EventScript_Alan", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route9_EventScript_1A9DF5", + "script": "Route9_EventScript_Chris", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route9_EventScript_1A9D79", + "script": "Route9_EventScript_Brent", "flag": "0" }, { @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route9_EventScript_1A9DB7", + "script": "Route9_EventScript_Conner", "flag": "0" }, { @@ -112,7 +112,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route9_EventScript_1A9F2B", + "script": "Route9_EventScript_Brice", "flag": "0" }, { @@ -125,7 +125,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route9_EventScript_1A9EAF", + "script": "Route9_EventScript_Caitlin", "flag": "0" }, { @@ -138,7 +138,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route9_EventScript_1A9E33", + "script": "Route9_EventScript_Drew", "flag": "0" }, { @@ -189,7 +189,7 @@ "x": 29, "y": 7, "elevation": 0, - "script": "Route9_EventScript_167FD0" + "script": "Route9_EventScript_RouteSign" }, { "type": "hidden_item", diff --git a/data/maps/Route9/scripts.inc b/data/maps/Route9/scripts.inc index 1b48cd68e..bd4be2115 100644 --- a/data/maps/Route9/scripts.inc +++ b/data/maps/Route9/scripts.inc @@ -1,6 +1,6 @@ Route9_MapScripts:: @ 8167FCF .byte 0 -Route9_EventScript_167FD0:: @ 8167FD0 - msgbox gUnknown_8184B66, MSGBOX_SIGN +Route9_EventScript_RouteSign:: @ 8167FD0 + msgbox Route9_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route9/text.inc b/data/maps/Route9/text.inc index 3a4506533..2f3762a87 100644 --- a/data/maps/Route9/text.inc +++ b/data/maps/Route9/text.inc @@ -1,159 +1,106 @@ -Text_1845A4:: @ 81845A4 - .string "ELI: Twin power is fantastic.\n" - .string "Did you know?$" - -Text_1845D0:: @ 81845D0 - .string "ELI: But…\n" - .string "We used our twin power…$" - -Text_1845F2:: @ 81845F2 - .string "ELI: I caught my POKéMON with\n" - .string "ANNE!$" - -Text_184616:: @ 8184616 - .string "ELI: We can't battle if you don't\n" - .string "have two POKéMON.$" - -Text_18464A:: @ 818464A - .string "ANNE: We'll shock you with our twin\n" - .string "power!$" - -Text_184675:: @ 8184675 - .string "ANNE: Our twin power…$" - -Text_18468B:: @ 818468B - .string "ANNE: I'm raising POKéMON with\n" - .string "ELI.$" - -Text_1846AF:: @ 81846AF - .string "ANNE: Hi, hi! Let's battle!\n" - .string "But bring two POKéMON.$" - -Text_1846E2:: @ 81846E2 - .string "My bike's acting up, man.$" - -Text_1846FC:: @ 81846FC - .string "Aww, man.\n" - .string "I'm not into this.$" - -Text_184719:: @ 8184719 - .string "I got grass caught up in my\n" - .string "spokes, man.$" - -Text_184742:: @ 8184742 - .string "Clear the way, or I'll run you\n" - .string "down!$" - -Text_184767:: @ 8184767 - .string "You for real, kid?$" - -Text_18477A:: @ 818477A - .string "Don't think you're all special and\n" - .string "all just because of this.$" - -Text_1847B7:: @ 81847B7 +Route9_Text_AliciaIntro:: @ 81847B7 .string "You have POKéMON with you!\n" .string "You're mine!$" -Text_1847DF:: @ 81847DF +Route9_Text_AliciaDefeat:: @ 81847DF .string "You deceived me…$" -Text_1847F0:: @ 81847F0 +Route9_Text_AliciaPostBattle:: @ 81847F0 .string "The tunnel coming up is pitch-black\n" .string "inside.\p" .string "You'll need FLASH to get through\n" .string "there.$" -Text_184844:: @ 8184844 +Route9_Text_ChrisIntro:: @ 8184844 .string "Who's that walking there with those\n" .string "good-looking POKéMON?$" -Text_18487E:: @ 818487E +Route9_Text_ChrisDefeat:: @ 818487E .string "Out like a light!$" -Text_184890:: @ 8184890 +Route9_Text_ChrisPostBattle:: @ 8184890 .string "Keep walking!$" -Text_18489E:: @ 818489E +Route9_Text_DrewIntro:: @ 818489E .string "I'm taking the ROCK TUNNEL to\n" .string "go to LAVENDER…$" -Text_1848CC:: @ 81848CC +Route9_Text_DrewDefeat:: @ 81848CC .string "Can't measure up…$" -Text_1848DE:: @ 81848DE +Route9_Text_DrewPostBattle:: @ 81848DE .string "Are you off to ROCK TUNNEL, too?$" -Text_1848FF:: @ 81848FF +Route9_Text_CaitlinIntro:: @ 81848FF .string "Don't you dare patronize me!$" -Text_18491C:: @ 818491C +Route9_Text_CaitlinDefeat:: @ 818491C .string "No!\n" .string "You're too much.$" -Text_184931:: @ 8184931 +Route9_Text_CaitlinPostBattle:: @ 8184931 .string "You're obviously talented.\n" .string "Good luck to you!$" -Text_18495E:: @ 818495E +Route9_Text_JeremyIntro:: @ 818495E .string "Bwahaha!\n" .string "Great! I was bored, eh!$" -Text_18497F:: @ 818497F +Route9_Text_JeremyDefeat:: @ 818497F .string "Keep it coming, eh!\p" .string "Oh wait.\n" .string "I'm out of POKéMON!$" -Text_1849B0:: @ 81849B0 +Route9_Text_JeremyPostBattle:: @ 81849B0 .string "You sure had guts standing up to\n" .string "me there, eh?$" -Text_1849DF:: @ 81849DF +Route9_Text_BriceIntro:: @ 81849DF .string "Hahaha!\n" .string "Aren't you a little toughie!$" -Text_184A04:: @ 8184A04 +Route9_Text_BriceDefeat:: @ 8184A04 .string "What's that?$" -Text_184A11:: @ 8184A11 +Route9_Text_BricePostBattle:: @ 8184A11 .string "Hahaha!\n" .string "Kids should be tough!$" -Text_184A2F:: @ 8184A2F +Route9_Text_BrentIntro:: @ 8184A2F .string "I got up early every day to raise\n" .string "my POKéMON from cocoons!$" -Text_184A6A:: @ 8184A6A +Route9_Text_BrentDefeat:: @ 8184A6A .string "WHAT?\p" .string "What a total waste of time!$" -Text_184A8C:: @ 8184A8C +Route9_Text_BrentPostBattle:: @ 8184A8C .string "I have to collect more than bugs\n" .string "to get stronger…$" -Text_184ABE:: @ 8184ABE +Route9_Text_AlanIntro:: @ 8184ABE .string "Hahahaha!\n" .string "Bring it on!$" -Text_184AD5:: @ 8184AD5 +Route9_Text_AlanDefeat:: @ 8184AD5 .string "Hahahaha!\n" .string "You beat me fair!$" -Text_184AF1:: @ 8184AF1 +Route9_Text_AlanPostBattle:: @ 8184AF1 .string "Hahahaha!\n" .string "Us hearty guys always laugh!$" -Text_184B18:: @ 8184B18 +Route9_Text_ConnerIntro:: @ 8184B18 .string "Go, my super BUG POKéMON!$" -Text_184B32:: @ 8184B32 +Route9_Text_ConnerDefeat:: @ 8184B32 .string "My bugs…$" -Text_184B3B:: @ 8184B3B +Route9_Text_ConnerPostBattle:: @ 8184B3B .string "If you don't like BUG POKéMON,\n" .string "you bug me!$" -gUnknown_8184B66:: @ 8184B66 +Route9_Text_RouteSign:: @ 8184B66 .string "ROUTE 9\n" .string "CERULEAN CITY - ROCK TUNNEL$" diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index 36383bfb8..9741b2899 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -35,11 +35,11 @@ FourIsland_PokemonCenter_1F_EventScript_1ACDD0:: @ 81ACDD0 releaseall end -Route4_EventScript_1ACDEA:: @ 81ACDEA +Route4_EventScript_Boy:: @ 81ACDEA lock faceplayer famechecker FAMECHECKER_BROCK, 3 - msgbox Text_183D26 + msgbox Route4_Text_PeopleLikeAndRespectBrock release end diff --git a/data/scripts/trainers.inc b/data/scripts/trainers.inc index d08364a6a..68d7e1157 100644 --- a/data/scripts/trainers.inc +++ b/data/scripts/trainers.inc @@ -1,124 +1,124 @@ -Route3_EventScript_1A93C9:: @ 81A93C9 - trainerbattle_single TRAINER_YOUNGSTER_BEN, Text_183560, Text_1835A0 +Route3_EventScript_Ben:: @ 81A93C9 + trainerbattle_single TRAINER_YOUNGSTER_BEN, Route3_Text_BenIntro, Route3_Text_BenDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A93F0 - msgbox Text_1835B4, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route3_EventScript_BenRematch + msgbox Route3_Text_BenPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A93F0:: @ 81A93F0 - trainerbattle_rematch TRAINER_YOUNGSTER_BEN, Text_1C149D, Text_1835A0 - msgbox Text_1835B4, MSGBOX_AUTOCLOSE +Route3_EventScript_BenRematch:: @ 81A93F0 + trainerbattle_rematch TRAINER_YOUNGSTER_BEN, Route3_Text_BenRematchIntro, Route3_Text_BenDefeat + msgbox Route3_Text_BenPostBattle, MSGBOX_AUTOCLOSE end -Route3_EventScript_1A9407:: @ 81A9407 - trainerbattle_single TRAINER_YOUNGSTER_CALVIN, Text_183786, Text_1837BD +Route3_EventScript_Calvin:: @ 81A9407 + trainerbattle_single TRAINER_YOUNGSTER_CALVIN, Route3_Text_CalvinIntro, Route3_Text_CalvinDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A942E - msgbox Text_1837CF, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route3_EventScript_CalvinRematch + msgbox Route3_Text_CalvinPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A942E:: @ 81A942E - trainerbattle_rematch TRAINER_YOUNGSTER_CALVIN, Text_1C1588, Text_1837BD - msgbox Text_1837CF, MSGBOX_AUTOCLOSE +Route3_EventScript_CalvinRematch:: @ 81A942E + trainerbattle_rematch TRAINER_YOUNGSTER_CALVIN, Route3_Text_CalvinRematchIntro, Route3_Text_CalvinDefeat + msgbox Route3_Text_CalvinPostBattle, MSGBOX_AUTOCLOSE end -Route3_EventScript_1A9445:: @ 81A9445 - trainerbattle_single TRAINER_BUG_CATCHER_COLTON, Text_1834E6, Text_183509 +Route3_EventScript_Colton:: @ 81A9445 + trainerbattle_single TRAINER_BUG_CATCHER_COLTON, Route3_Text_ColtonIntro, Route3_Text_ColtonDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A946C - msgbox Text_18351C, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route3_EventScript_ColtonRematch + msgbox Route3_Text_ColtonPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A946C:: @ 81A946C - trainerbattle_rematch TRAINER_BUG_CATCHER_COLTON, Text_1C147A, Text_183509 - msgbox Text_18351C, MSGBOX_AUTOCLOSE +Route3_EventScript_ColtonRematch:: @ 81A946C + trainerbattle_rematch TRAINER_BUG_CATCHER_COLTON, Route3_Text_ColtonRematchIntro, Route3_Text_ColtonDefeat + msgbox Route3_Text_ColtonPostBattle, MSGBOX_AUTOCLOSE end -Route3_EventScript_1A9483:: @ 81A9483 - trainerbattle_single TRAINER_BUG_CATCHER_GREG, Text_183682, Text_1836B3 +Route3_EventScript_Greg:: @ 81A9483 + trainerbattle_single TRAINER_BUG_CATCHER_GREG, Route3_Text_GregIntro, Route3_Text_GregDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A94AA - msgbox Text_1836D9, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route3_EventScript_GregRematch + msgbox Route3_Text_GregPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A94AA:: @ 81A94AA - trainerbattle_rematch TRAINER_BUG_CATCHER_GREG, Text_1C1521, Text_1836B3 - msgbox Text_1836D9, MSGBOX_AUTOCLOSE +Route3_EventScript_GregRematch:: @ 81A94AA + trainerbattle_rematch TRAINER_BUG_CATCHER_GREG, Route3_Text_GregRematchIntro, Route3_Text_GregDefeat + msgbox Route3_Text_GregPostBattle, MSGBOX_AUTOCLOSE end -Route3_EventScript_1A94C1:: @ 81A94C1 - trainerbattle_single TRAINER_BUG_CATCHER_JAMES, Text_183807, Text_183837 +Route3_EventScript_James:: @ 81A94C1 + trainerbattle_single TRAINER_BUG_CATCHER_JAMES, Route3_Text_JamesIntro, Route3_Text_JamesDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A94E8 - msgbox Text_183849, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route3_EventScript_JamesRematch + msgbox Route3_Text_JamesPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A94E8:: @ 81A94E8 - trainerbattle_rematch TRAINER_BUG_CATCHER_JAMES, Text_1C15C5, Text_183837 - msgbox Text_183849, MSGBOX_AUTOCLOSE +Route3_EventScript_JamesRematch:: @ 81A94E8 + trainerbattle_rematch TRAINER_BUG_CATCHER_JAMES, Route3_Text_JamesRematchIntro, Route3_Text_JamesDefeat + msgbox Route3_Text_JamesPostBattle, MSGBOX_AUTOCLOSE end -Route3_EventScript_1A94FF:: @ 81A94FF - trainerbattle_single TRAINER_LASS_JANICE, Text_183616, Text_18363F +Route3_EventScript_Janice:: @ 81A94FF + trainerbattle_single TRAINER_LASS_JANICE, Route3_Text_JaniceIntro, Route3_Text_JaniceDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A9526 - msgbox Text_18364C, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route3_EventScript_JaniceRematch + msgbox Route3_Text_JanicePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9526:: @ 81A9526 - trainerbattle_rematch TRAINER_LASS_JANICE, Text_1C14F3, Text_18363F - msgbox Text_18364C, MSGBOX_AUTOCLOSE +Route3_EventScript_JaniceRematch:: @ 81A9526 + trainerbattle_rematch TRAINER_LASS_JANICE, Route3_Text_JaniceRematchIntro, Route3_Text_JaniceDefeat + msgbox Route3_Text_JanicePostBattle, MSGBOX_AUTOCLOSE end -Route3_EventScript_1A953D:: @ 81A953D - trainerbattle_single TRAINER_LASS_SALLY, Text_18371B, Text_183746 +Route3_EventScript_Sally:: @ 81A953D + trainerbattle_single TRAINER_LASS_SALLY, Route3_Text_SallyIntro, Route3_Text_SallyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A9564 - msgbox Text_18374F, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route3_EventScript_SallyRematch + msgbox Route3_Text_SallyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9564:: @ 81A9564 - trainerbattle_rematch TRAINER_LASS_SALLY, Text_1C155D, Text_183746 - msgbox Text_18374F, MSGBOX_AUTOCLOSE +Route3_EventScript_SallyRematch:: @ 81A9564 + trainerbattle_rematch TRAINER_LASS_SALLY, Route3_Text_SallyRematchIntro, Route3_Text_SallyDefeat + msgbox Route3_Text_SallyPostBattle, MSGBOX_AUTOCLOSE end -Route3_EventScript_1A957B:: @ 81A957B - trainerbattle_single TRAINER_LASS_ROBIN, Text_18387A, Text_183891 +Route3_EventScript_Robin:: @ 81A957B + trainerbattle_single TRAINER_LASS_ROBIN, Route3_Text_RobinIntro, Route3_Text_RobinDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A95A2 - msgbox Text_18389C, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route3_EventScript_RobinRematch + msgbox Route3_Text_RobinPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A95A2:: @ 81A95A2 - trainerbattle_rematch TRAINER_LASS_ROBIN, Text_1C15F9, Text_183891 - msgbox Text_18389C, MSGBOX_AUTOCLOSE +Route3_EventScript_RobinRematch:: @ 81A95A2 + trainerbattle_rematch TRAINER_LASS_ROBIN, Route3_Text_RobinRematchIntro, Route3_Text_RobinDefeat + msgbox Route3_Text_RobinPostBattle, MSGBOX_AUTOCLOSE end -Route4_EventScript_1A95B9:: @ 81A95B9 - trainerbattle_single TRAINER_LASS_CRISSY, Text_183906, Text_183938 +Route4_EventScript_Crissy:: @ 81A95B9 + trainerbattle_single TRAINER_LASS_CRISSY, Route4_Text_CrissyIntro, Route4_Text_CrissyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A95E0 - msgbox Text_183957, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route4_EventScript_CrissyRematch + msgbox Route4_Text_CrissyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A95E0:: @ 81A95E0 - trainerbattle_rematch TRAINER_LASS_CRISSY, Text_1C160F, Text_183938 - msgbox Text_183957, MSGBOX_AUTOCLOSE +Route4_EventScript_CrissyRematch:: @ 81A95E0 + trainerbattle_rematch TRAINER_LASS_CRISSY, Route4_Text_CrissyRematchIntro, Route4_Text_CrissyDefeat + msgbox Route4_Text_CrissyPostBattle, MSGBOX_AUTOCLOSE end Route24_EventScript_1A95F7:: @ 81A95F7 trainerbattle_single TRAINER_YOUNGSTER_TIMMY, Text_188F76, Text_188F95 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A961E msgbox Text_188FA7, MSGBOX_AUTOCLOSE end @@ -131,7 +131,7 @@ EventScript_1A961E:: @ 81A961E Route24_EventScript_1A9635:: @ 81A9635 trainerbattle_single TRAINER_BUG_CATCHER_CALE, Text_18901B, Text_18908C specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A965C msgbox Text_18909E, MSGBOX_AUTOCLOSE end @@ -144,7 +144,7 @@ EventScript_1A965C:: @ 81A965C Route24_EventScript_1A9673:: @ 81A9673 trainerbattle_single TRAINER_LASS_RELI, Text_188F2C, Text_188F46 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A969A msgbox Text_188F53, MSGBOX_AUTOCLOSE end @@ -157,7 +157,7 @@ EventScript_1A969A:: @ 81A969A Route24_EventScript_1A96B1:: @ 81A96B1 trainerbattle_single TRAINER_LASS_ALI, Text_188FC9, Text_188FE7 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A96D8 msgbox Text_188FF9, MSGBOX_AUTOCLOSE end @@ -170,7 +170,7 @@ EventScript_1A96D8:: @ 81A96D8 Route24_EventScript_1A96EF:: @ 81A96EF trainerbattle_single TRAINER_CAMPER_SHANE, Text_188E74, Text_188E94 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9716 msgbox Text_188EA3, MSGBOX_AUTOCLOSE end @@ -183,7 +183,7 @@ EventScript_1A9716:: @ 81A9716 Route24_EventScript_1A972D:: @ 81A972D trainerbattle_single TRAINER_CAMPER_ETHAN, Text_188ED9, Text_188EFA specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9754 msgbox Text_188F0A, MSGBOX_AUTOCLOSE end @@ -196,7 +196,7 @@ EventScript_1A9754:: @ 81A9754 Route25_EventScript_1A976B:: @ 81A976B trainerbattle_single TRAINER_YOUNGSTER_JOEY, Text_1890C0, Text_1890E6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9792 msgbox Text_1890F5, MSGBOX_AUTOCLOSE end @@ -209,7 +209,7 @@ EventScript_1A9792:: @ 81A9792 Route25_EventScript_1A97A9:: @ 81A97A9 trainerbattle_single TRAINER_YOUNGSTER_DAN, Text_189165, Text_1891A6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A97D0 msgbox Text_1891B3, MSGBOX_AUTOCLOSE end @@ -222,7 +222,7 @@ EventScript_1A97D0:: @ 81A97D0 Route25_EventScript_1A97E7:: @ 81A97E7 trainerbattle_single TRAINER_YOUNGSTER_CHAD, Text_1892A9, Text_1892D9 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A980E msgbox Text_1892EF, MSGBOX_AUTOCLOSE end @@ -235,7 +235,7 @@ EventScript_1A980E:: @ 81A980E Route25_EventScript_1A9825:: @ 81A9825 trainerbattle_single TRAINER_PICNICKER_KELSEY, Text_189247, Text_189261 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A984C msgbox Text_189281, MSGBOX_AUTOCLOSE end @@ -248,7 +248,7 @@ EventScript_1A984C:: @ 81A984C Route25_EventScript_1A9863:: @ 81A9863 trainerbattle_single TRAINER_LASS_HALEY, Text_189333, Text_189364 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A988A msgbox Text_189378, MSGBOX_AUTOCLOSE end @@ -261,7 +261,7 @@ EventScript_1A988A:: @ 81A988A Route25_EventScript_1A98A1:: @ 81A98A1 trainerbattle_single TRAINER_HIKER_FRANKLIN, Text_1893A7, Text_1893EA specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A98C8 msgbox Text_1893FB, MSGBOX_AUTOCLOSE end @@ -274,7 +274,7 @@ EventScript_1A98C8:: @ 81A98C8 Route25_EventScript_1A98DF:: @ 81A98DF trainerbattle_single TRAINER_HIKER_NOB, Text_189423, Text_189459 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9906 msgbox Text_18947E, MSGBOX_AUTOCLOSE end @@ -287,7 +287,7 @@ EventScript_1A9906:: @ 81A9906 Route25_EventScript_1A991D:: @ 81A991D trainerbattle_single TRAINER_HIKER_WAYNE, Text_1894DE, Text_18950A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9944 msgbox Text_18951C, MSGBOX_AUTOCLOSE end @@ -300,7 +300,7 @@ EventScript_1A9944:: @ 81A9944 Route25_EventScript_1A995B:: @ 81A995B trainerbattle_single TRAINER_CAMPER_FLINT, Text_1891EB, Text_189212 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9982 msgbox Text_18921D, MSGBOX_AUTOCLOSE end @@ -310,88 +310,88 @@ EventScript_1A9982:: @ 81A9982 msgbox Text_18921D, MSGBOX_AUTOCLOSE end -Route6_EventScript_1A9999:: @ 81A9999 - trainerbattle_single TRAINER_BUG_CATCHER_KEIGO, Text_183E9F, Text_183EC0 +Route6_EventScript_Keigo:: @ 81A9999 + trainerbattle_single TRAINER_BUG_CATCHER_KEIGO, Route6_Text_KeigoIntro, Route6_Text_KeigoDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A99C0 - msgbox Text_183ED4, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route6_EventScript_KeigoRematch + msgbox Route6_Text_KeigoPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A99C0:: @ 81A99C0 - trainerbattle_rematch TRAINER_BUG_CATCHER_KEIGO, Text_1C16E2, Text_183EC0 - msgbox Text_183ED4, MSGBOX_AUTOCLOSE +Route6_EventScript_KeigoRematch:: @ 81A99C0 + trainerbattle_rematch TRAINER_BUG_CATCHER_KEIGO, Route6_Text_KeigoRematchIntro, Route6_Text_KeigoDefeat + msgbox Route6_Text_KeigoPostBattle, MSGBOX_AUTOCLOSE end -Route6_EventScript_1A99D7:: @ 81A99D7 - trainerbattle_single TRAINER_BUG_CATCHER_ELIJAH, Text_183FF0, Text_18401A +Route6_EventScript_Elijah:: @ 81A99D7 + trainerbattle_single TRAINER_BUG_CATCHER_ELIJAH, Route6_Text_ElijahIntro, Route6_Text_ElijahDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A99FE - msgbox Text_18402B, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route6_EventScript_ElijahRematch + msgbox Route6_Text_ElijahPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A99FE:: @ 81A99FE - trainerbattle_rematch TRAINER_BUG_CATCHER_ELIJAH, Text_1C176B, Text_18401A - msgbox Text_18402B, MSGBOX_AUTOCLOSE +Route6_EventScript_ElijahRematch:: @ 81A99FE + trainerbattle_rematch TRAINER_BUG_CATCHER_ELIJAH, Route6_Text_ElijahRematchIntro, Route6_Text_ElijahDefeat + msgbox Route6_Text_ElijahPostBattle, MSGBOX_AUTOCLOSE end -Route6_EventScript_1A9A15:: @ 81A9A15 - trainerbattle_single TRAINER_CAMPER_RICKY, Text_183E04, Text_183E2A +Route6_EventScript_Ricky:: @ 81A9A15 + trainerbattle_single TRAINER_CAMPER_RICKY, Route6_Text_RickyIntro, Route6_Text_RickyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A9A3C - msgbox Text_183E3C, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route6_EventScript_RickyRematch + msgbox Route6_Text_RickyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9A3C:: @ 81A9A3C - trainerbattle_rematch TRAINER_CAMPER_RICKY, Text_1C163C, Text_183E2A - msgbox Text_183E3C, MSGBOX_AUTOCLOSE +Route6_EventScript_RickyRematch:: @ 81A9A3C + trainerbattle_rematch TRAINER_CAMPER_RICKY, Route6_Text_RickyRematchIntro, Route6_Text_RickyDefeat + msgbox Route6_Text_RickyPostBattle, MSGBOX_AUTOCLOSE end -Route6_EventScript_1A9A53:: @ 81A9A53 - trainerbattle_single TRAINER_CAMPER_JEFF, Text_183F07, Text_183F24 +Route6_EventScript_Jeff:: @ 81A9A53 + trainerbattle_single TRAINER_CAMPER_JEFF, Route6_Text_JeffIntro, Route6_Text_JeffDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A9A7A - msgbox Text_183F51, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route6_EventScript_JeffRematch + msgbox Route6_Text_JeffPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9A7A:: @ 81A9A7A - trainerbattle_rematch TRAINER_CAMPER_JEFF, Text_1C1723, Text_183F24 - msgbox Text_183F51, MSGBOX_AUTOCLOSE +Route6_EventScript_JeffRematch:: @ 81A9A7A + trainerbattle_rematch TRAINER_CAMPER_JEFF, Route6_Text_JeffRematchIntro, Route6_Text_JeffDefeat + msgbox Route6_Text_JeffPostBattle, MSGBOX_AUTOCLOSE end -Route6_EventScript_1A9A91:: @ 81A9A91 - trainerbattle_single TRAINER_PICNICKER_NANCY, Text_183E4E, Text_183E79 +Route6_EventScript_Nancy:: @ 81A9A91 + trainerbattle_single TRAINER_PICNICKER_NANCY, Route6_Text_NancyIntro, Route6_Text_NancyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A9AB8 - msgbox Text_183E8D, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route6_EventScript_NancyRematch + msgbox Route6_Text_NancyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9AB8:: @ 81A9AB8 - trainerbattle_rematch TRAINER_PICNICKER_NANCY, Text_1C166D, Text_183E79 - msgbox Text_183E8D, MSGBOX_AUTOCLOSE +Route6_EventScript_NancyRematch:: @ 81A9AB8 + trainerbattle_rematch TRAINER_PICNICKER_NANCY, Route6_Text_NancyRematchIntro, Route6_Text_NancyDefeat + msgbox Route6_Text_NancyPostBattle, MSGBOX_AUTOCLOSE end -Route6_EventScript_1A9ACF:: @ 81A9ACF - trainerbattle_single TRAINER_PICNICKER_ISABELLE, Text_183F90, Text_183FAB +Route6_EventScript_Isabelle:: @ 81A9ACF + trainerbattle_single TRAINER_PICNICKER_ISABELLE, Route6_Text_IsabelleIntro, Route6_Text_IsabelleDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A9AF6 - msgbox Text_183FC4, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route6_EventScript_IsabelleRematch + msgbox Route6_Text_IsabellePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9AF6:: @ 81A9AF6 - trainerbattle_rematch TRAINER_PICNICKER_ISABELLE, Text_1C1746, Text_183FAB - msgbox Text_183FC4, MSGBOX_AUTOCLOSE +Route6_EventScript_IsabelleRematch:: @ 81A9AF6 + trainerbattle_rematch TRAINER_PICNICKER_ISABELLE, Route6_Text_IsabelleRematchIntro, Route6_Text_IsabelleDefeat + msgbox Route6_Text_IsabellePostBattle, MSGBOX_AUTOCLOSE end Route11_EventScript_1A9B0D:: @ 81A9B0D trainerbattle_single TRAINER_YOUNGSTER_EDDIE, Text_184FBD, Text_184FD8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9B34 msgbox Text_184FEF, MSGBOX_AUTOCLOSE end @@ -404,7 +404,7 @@ EventScript_1A9B34:: @ 81A9B34 Route11_EventScript_1A9B4B:: @ 81A9B4B trainerbattle_single TRAINER_YOUNGSTER_DILLON, Text_18506A, Text_18509B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9B72 msgbox Text_1850CF, MSGBOX_AUTOCLOSE end @@ -417,7 +417,7 @@ EventScript_1A9B72:: @ 81A9B72 Route11_EventScript_1A9B89:: @ 81A9B89 trainerbattle_single TRAINER_YOUNGSTER_YASU, Text_18517B, Text_1851AC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9BB0 msgbox Text_1851D2, MSGBOX_AUTOCLOSE end @@ -430,7 +430,7 @@ EventScript_1A9BB0:: @ 81A9BB0 Route11_EventScript_1A9BC7:: @ 81A9BC7 trainerbattle_single TRAINER_YOUNGSTER_DAVE, Text_185285, Text_1852C1 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9BEE msgbox Text_1852E3, MSGBOX_AUTOCLOSE end @@ -443,7 +443,7 @@ EventScript_1A9BEE:: @ 81A9BEE Route11_EventScript_1A9C05:: @ 81A9C05 trainerbattle_single TRAINER_ENGINEER_BRAXTON, Text_185011, Text_185037 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9C2C msgbox Text_18504A, MSGBOX_AUTOCLOSE end @@ -456,7 +456,7 @@ EventScript_1A9C2C:: @ 81A9C2C Route11_EventScript_1A9C43:: @ 81A9C43 trainerbattle_single TRAINER_ENGINEER_BERNIE, Text_185236, Text_185250 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9C6A msgbox Text_185266, MSGBOX_AUTOCLOSE end @@ -469,7 +469,7 @@ EventScript_1A9C6A:: @ 81A9C6A Route11_EventScript_1A9C81:: @ 81A9C81 trainerbattle_single TRAINER_GAMER_HUGO, Text_184F01, Text_184F15 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9CA8 msgbox Text_184F2E, MSGBOX_AUTOCLOSE end @@ -482,7 +482,7 @@ EventScript_1A9CA8:: @ 81A9CA8 Route11_EventScript_1A9CBF:: @ 81A9CBF trainerbattle_single TRAINER_GAMER_JASPER, Text_184F5D, Text_184F7E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9CE6 msgbox Text_184F8E, MSGBOX_AUTOCLOSE end @@ -495,7 +495,7 @@ EventScript_1A9CE6:: @ 81A9CE6 Route11_EventScript_1A9CFD:: @ 81A9CFD trainerbattle_single TRAINER_GAMER_DIRK, Text_1850E9, Text_185105 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9D24 msgbox Text_185114, MSGBOX_AUTOCLOSE end @@ -508,7 +508,7 @@ EventScript_1A9D24:: @ 81A9D24 Route11_EventScript_1A9D3B:: @ 81A9D3B trainerbattle_single TRAINER_GAMER_DARIAN, Text_185135, Text_18514E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9D62 msgbox Text_185161, MSGBOX_AUTOCLOSE end @@ -518,127 +518,127 @@ EventScript_1A9D62:: @ 81A9D62 msgbox Text_185161, MSGBOX_AUTOCLOSE end -Route9_EventScript_1A9D79:: @ 81A9D79 - trainerbattle_single TRAINER_BUG_CATCHER_BRENT, Text_184A2F, Text_184A6A +Route9_EventScript_Brent:: @ 81A9D79 + trainerbattle_single TRAINER_BUG_CATCHER_BRENT, Route9_Text_BrentIntro, Route9_Text_BrentDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A9DA0 - msgbox Text_184A8C, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route9_EventScript_BrentRematch + msgbox Route9_Text_BrentPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9DA0:: @ 81A9DA0 - trainerbattle_rematch TRAINER_BUG_CATCHER_BRENT, Text_1C1B83, Text_184A6A - msgbox Text_184A8C, MSGBOX_AUTOCLOSE +Route9_EventScript_BrentRematch:: @ 81A9DA0 + trainerbattle_rematch TRAINER_BUG_CATCHER_BRENT, Route9_Text_BrentRematchIntro, Route9_Text_BrentDefeat + msgbox Route9_Text_BrentPostBattle, MSGBOX_AUTOCLOSE end -Route9_EventScript_1A9DB7:: @ 81A9DB7 - trainerbattle_single TRAINER_BUG_CATCHER_CONNER, Text_184B18, Text_184B32 +Route9_EventScript_Conner:: @ 81A9DB7 + trainerbattle_single TRAINER_BUG_CATCHER_CONNER, Route9_Text_ConnerIntro, Route9_Text_ConnerDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A9DDE - msgbox Text_184B3B, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route9_EventScript_ConnerRematch + msgbox Route9_Text_ConnerPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9DDE:: @ 81A9DDE - trainerbattle_rematch TRAINER_BUG_CATCHER_CONNER, Text_1C1BDC, Text_184B32 - msgbox Text_184B3B, MSGBOX_AUTOCLOSE +Route9_EventScript_ConnerRematch:: @ 81A9DDE + trainerbattle_rematch TRAINER_BUG_CATCHER_CONNER, Route9_Text_ConnerRematchIntro, Route9_Text_ConnerDefeat + msgbox Route9_Text_ConnerPostBattle, MSGBOX_AUTOCLOSE end -Route9_EventScript_1A9DF5:: @ 81A9DF5 - trainerbattle_single TRAINER_CAMPER_CHRIS, Text_184844, Text_18487E +Route9_EventScript_Chris:: @ 81A9DF5 + trainerbattle_single TRAINER_CAMPER_CHRIS, Route9_Text_ChrisIntro, Route9_Text_ChrisDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A9E1C - msgbox Text_184890, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route9_EventScript_ChrisRematch + msgbox Route9_Text_ChrisPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9E1C:: @ 81A9E1C - trainerbattle_rematch TRAINER_CAMPER_CHRIS, Text_1C1A5D, Text_18487E - msgbox Text_184890, MSGBOX_AUTOCLOSE +Route9_EventScript_ChrisRematch:: @ 81A9E1C + trainerbattle_rematch TRAINER_CAMPER_CHRIS, Route9_Text_ChrisRematchIntro, Route9_Text_ChrisDefeat + msgbox Route9_Text_ChrisPostBattle, MSGBOX_AUTOCLOSE end -Route9_EventScript_1A9E33:: @ 81A9E33 - trainerbattle_single TRAINER_CAMPER_DREW, Text_18489E, Text_1848CC +Route9_EventScript_Drew:: @ 81A9E33 + trainerbattle_single TRAINER_CAMPER_DREW, Route9_Text_DrewIntro, Route9_Text_DrewDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A9E5A - msgbox Text_1848DE, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route9_EventScript_DrewRematch + msgbox Route9_Text_DrewPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9E5A:: @ 81A9E5A - trainerbattle_rematch TRAINER_CAMPER_DREW, Text_1C1A9B, Text_1848CC - msgbox Text_1848DE, MSGBOX_AUTOCLOSE +Route9_EventScript_DrewRematch:: @ 81A9E5A + trainerbattle_rematch TRAINER_CAMPER_DREW, Route9_Text_DrewRematchIntro, Route9_Text_DrewDefeat + msgbox Route9_Text_DrewPostBattle, MSGBOX_AUTOCLOSE end -Route9_EventScript_1A9E71:: @ 81A9E71 - trainerbattle_single TRAINER_PICNICKER_ALICIA, Text_1847B7, Text_1847DF +Route9_EventScript_Alicia:: @ 81A9E71 + trainerbattle_single TRAINER_PICNICKER_ALICIA, Route9_Text_AliciaIntro, Route9_Text_AliciaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A9E98 - msgbox Text_1847F0, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route9_EventScript_AliciaRematch + msgbox Route9_Text_AliciaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9E98:: @ 81A9E98 - trainerbattle_rematch TRAINER_PICNICKER_ALICIA, Text_1C1A2E, Text_1847DF - msgbox Text_1847F0, MSGBOX_AUTOCLOSE +Route9_EventScript_AliciaRematch:: @ 81A9E98 + trainerbattle_rematch TRAINER_PICNICKER_ALICIA, Route9_Text_AliciaRematchIntro, Route9_Text_AliciaDefeat + msgbox Route9_Text_AliciaPostBattle, MSGBOX_AUTOCLOSE end -Route9_EventScript_1A9EAF:: @ 81A9EAF - trainerbattle_single TRAINER_PICNICKER_CAITLIN, Text_1848FF, Text_18491C +Route9_EventScript_Caitlin:: @ 81A9EAF + trainerbattle_single TRAINER_PICNICKER_CAITLIN, Route9_Text_CaitlinIntro, Route9_Text_CaitlinDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A9ED6 - msgbox Text_184931, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route9_EventScript_CaitlinRematch + msgbox Route9_Text_CaitlinPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9ED6:: @ 81A9ED6 - trainerbattle_rematch TRAINER_PICNICKER_CAITLIN, Text_1C1AFB, Text_18491C - msgbox Text_184931, MSGBOX_AUTOCLOSE +Route9_EventScript_CaitlinRematch:: @ 81A9ED6 + trainerbattle_rematch TRAINER_PICNICKER_CAITLIN, Route9_Text_CaitlinRematchIntro, Route9_Text_CaitlinDefeat + msgbox Route9_Text_CaitlinPostBattle, MSGBOX_AUTOCLOSE end -Route9_EventScript_1A9EED:: @ 81A9EED - trainerbattle_single TRAINER_HIKER_ALAN, Text_184ABE, Text_184AD5 +Route9_EventScript_Alan:: @ 81A9EED + trainerbattle_single TRAINER_HIKER_ALAN, Route9_Text_AlanIntro, Route9_Text_AlanDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A9F14 - msgbox Text_184AF1, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route9_EventScript_AlanRematch + msgbox Route9_Text_AlanPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9F14:: @ 81A9F14 - trainerbattle_rematch TRAINER_HIKER_ALAN, Text_1C1BBE, Text_184AD5 - msgbox Text_184AF1, MSGBOX_AUTOCLOSE +Route9_EventScript_AlanRematch:: @ 81A9F14 + trainerbattle_rematch TRAINER_HIKER_ALAN, Route9_Text_AlanRematchIntro, Route9_Text_AlanDefeat + msgbox Route9_Text_AlanPostBattle, MSGBOX_AUTOCLOSE end -Route9_EventScript_1A9F2B:: @ 81A9F2B - trainerbattle_single TRAINER_HIKER_BRICE, Text_1849DF, Text_184A04 +Route9_EventScript_Brice:: @ 81A9F2B + trainerbattle_single TRAINER_HIKER_BRICE, Route9_Text_BriceIntro, Route9_Text_BriceDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A9F52 - msgbox Text_184A11, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route9_EventScript_BriceRematch + msgbox Route9_Text_BricePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9F52:: @ 81A9F52 - trainerbattle_rematch TRAINER_HIKER_BRICE, Text_1C1B5E, Text_184A04 - msgbox Text_184A11, MSGBOX_AUTOCLOSE +Route9_EventScript_BriceRematch:: @ 81A9F52 + trainerbattle_rematch TRAINER_HIKER_BRICE, Route9_Text_BriceRematchIntro, Route9_Text_BriceDefeat + msgbox Route9_Text_BricePostBattle, MSGBOX_AUTOCLOSE end -Route9_EventScript_1A9F69:: @ 81A9F69 - trainerbattle_single TRAINER_HIKER_JEREMY, Text_18495E, Text_18497F +Route9_EventScript_Jeremy:: @ 81A9F69 + trainerbattle_single TRAINER_HIKER_JEREMY, Route9_Text_JeremyIntro, Route9_Text_JeremyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A9F90 - msgbox Text_1849B0, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route9_EventScript_JeremyRematch + msgbox Route9_Text_JeremyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9F90:: @ 81A9F90 - trainerbattle_rematch TRAINER_HIKER_JEREMY, Text_1C1B37, Text_18497F - msgbox Text_1849B0, MSGBOX_AUTOCLOSE +Route9_EventScript_JeremyRematch:: @ 81A9F90 + trainerbattle_rematch TRAINER_HIKER_JEREMY, Route9_Text_JeremyRematchIntro, Route9_Text_JeremyDefeat + msgbox Route9_Text_JeremyPostBattle, MSGBOX_AUTOCLOSE end Route10_EventScript_1A9FA7:: @ 81A9FA7 trainerbattle_single TRAINER_PICNICKER_HEIDI, Text_184CF1, Text_184D31 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9FCE msgbox Text_184D4D, MSGBOX_AUTOCLOSE end @@ -651,7 +651,7 @@ EventScript_1A9FCE:: @ 81A9FCE Route10_EventScript_1A9FE5:: @ 81A9FE5 trainerbattle_single TRAINER_PICNICKER_CAROL, Text_184E04, Text_184E3B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA00C msgbox Text_184E5E, MSGBOX_AUTOCLOSE end @@ -664,7 +664,7 @@ EventScript_1AA00C:: @ 81AA00C Route10_EventScript_1AA023:: @ 81AA023 trainerbattle_single TRAINER_POKEMANIAC_MARK, Text_184B8A, Text_184BE5 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA04A msgbox Text_184BFB, MSGBOX_AUTOCLOSE end @@ -677,7 +677,7 @@ EventScript_1AA04A:: @ 81AA04A Route10_EventScript_1AA061:: @ 81AA061 trainerbattle_single TRAINER_POKEMANIAC_HERMAN, Text_184C86, Text_184CA7 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA088 msgbox Text_184CBB, MSGBOX_AUTOCLOSE end @@ -690,7 +690,7 @@ EventScript_1AA088:: @ 81AA088 Route10_EventScript_1AA09F:: @ 81AA09F trainerbattle_single TRAINER_HIKER_CLARK, Text_184C1D, Text_184C2D specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA0C6 msgbox Text_184C60, MSGBOX_AUTOCLOSE end @@ -703,7 +703,7 @@ EventScript_1AA0C6:: @ 81AA0C6 Route10_EventScript_1AA0DD:: @ 81AA0DD trainerbattle_single TRAINER_HIKER_TRENT, Text_184DAA, Text_184DCE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA104 msgbox Text_184DE4, MSGBOX_AUTOCLOSE end @@ -713,179 +713,179 @@ EventScript_1AA104:: @ 81AA104 msgbox Text_184DE4, MSGBOX_AUTOCLOSE end -Route8_EventScript_1AA11B:: @ 81AA11B - trainerbattle_single TRAINER_LASS_PAIGE, Text_1841ED, Text_184210 +Route8_EventScript_Paige:: @ 81AA11B + trainerbattle_single TRAINER_LASS_PAIGE, Route8_Text_PaigeIntro, Route8_Text_PaigeDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA142 - msgbox Text_18421B, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route8_EventScript_PaigeRematch + msgbox Route8_Text_PaigePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA142:: @ 81AA142 - trainerbattle_rematch TRAINER_LASS_PAIGE, Text_1C1834, Text_184210 - msgbox Text_18421B, MSGBOX_AUTOCLOSE +Route8_EventScript_PaigeRematch:: @ 81AA142 + trainerbattle_rematch TRAINER_LASS_PAIGE, Route8_Text_PaigeRematchIntro, Route8_Text_PaigeDefeat + msgbox Route8_Text_PaigePostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_1AA159:: @ 81AA159 - trainerbattle_single TRAINER_LASS_ANDREA, Text_184321, Text_184346 +Route8_EventScript_Andrea:: @ 81AA159 + trainerbattle_single TRAINER_LASS_ANDREA, Route8_Text_AndreaIntro, Route8_Text_AndreaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA180 - msgbox Text_184350, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route8_EventScript_AndreaRematch + msgbox Route8_Text_AndreaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA180:: @ 81AA180 - trainerbattle_rematch TRAINER_LASS_ANDREA, Text_1C18AA, Text_184346 - msgbox Text_184350, MSGBOX_AUTOCLOSE +Route8_EventScript_AndreaRematch:: @ 81AA180 + trainerbattle_rematch TRAINER_LASS_ANDREA, Route8_Text_AndreaRematchIntro, Route8_Text_AndreaDefeat + msgbox Route8_Text_AndreaPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_1AA197:: @ 81AA197 - trainerbattle_single TRAINER_LASS_MEGAN, Text_18437A, Text_1843A6 +Route8_EventScript_Megan:: @ 81AA197 + trainerbattle_single TRAINER_LASS_MEGAN, Route8_Text_MeganIntro, Route8_Text_MeganDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA1BE - msgbox Text_1843D2, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route8_EventScript_MeganRematch + msgbox Route8_Text_MeganPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA1BE:: @ 81AA1BE - trainerbattle_rematch TRAINER_LASS_MEGAN, Text_1C18DC, Text_1843A6 - msgbox Text_1843D2, MSGBOX_AUTOCLOSE +Route8_EventScript_MeganRematch:: @ 81AA1BE + trainerbattle_rematch TRAINER_LASS_MEGAN, Route8_Text_MeganRematchIntro, Route8_Text_MeganDefeat + msgbox Route8_Text_MeganPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_1AA1D5:: @ 81AA1D5 - trainerbattle_single TRAINER_LASS_JULIA, Text_1844AC, Text_1844D6 +Route8_EventScript_Julia:: @ 81AA1D5 + trainerbattle_single TRAINER_LASS_JULIA, Route8_Text_JuliaIntro, Route8_Text_JuliaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA1FC - msgbox Text_1844FD, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route8_EventScript_JuliaRematch + msgbox Route8_Text_JuliaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA1FC:: @ 81AA1FC - trainerbattle_rematch TRAINER_LASS_JULIA, Text_1C1955, Text_1844D6 - msgbox Text_1844FD, MSGBOX_AUTOCLOSE +Route8_EventScript_JuliaRematch:: @ 81AA1FC + trainerbattle_rematch TRAINER_LASS_JULIA, Route8_Text_JuliaRematchIntro, Route8_Text_JuliaDefeat + msgbox Route8_Text_JuliaPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_1AA213:: @ 81AA213 - trainerbattle_single TRAINER_SUPER_NERD_AIDAN, Text_1840C5, Text_184100 +Route8_EventScript_Aidan:: @ 81AA213 + trainerbattle_single TRAINER_SUPER_NERD_AIDAN, Route8_Text_AidanIntro, Route8_Text_AidanDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA23A - msgbox Text_18410E, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route8_EventScript_AidanRematch + msgbox Route8_Text_AidanPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA23A:: @ 81AA23A - trainerbattle_rematch TRAINER_SUPER_NERD_AIDAN, Text_1C1793, Text_184100 - msgbox Text_18410E, MSGBOX_AUTOCLOSE +Route8_EventScript_AidanRematch:: @ 81AA23A + trainerbattle_rematch TRAINER_SUPER_NERD_AIDAN, Route8_Text_AidanRematchIntro, Route8_Text_AidanDefeat + msgbox Route8_Text_AidanPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_1AA251:: @ 81AA251 - trainerbattle_single TRAINER_SUPER_NERD_GLENN, Text_18417C, Text_1841B6 +Route8_EventScript_Glenn:: @ 81AA251 + trainerbattle_single TRAINER_SUPER_NERD_GLENN, Route8_Text_GlennIntro, Route8_Text_GlennDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA278 - msgbox Text_1841C8, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route8_EventScript_GlennRematch + msgbox Route8_Text_GlennPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA278:: @ 81AA278 - trainerbattle_rematch TRAINER_SUPER_NERD_GLENN, Text_1C17F1, Text_1841B6 - msgbox Text_1841C8, MSGBOX_AUTOCLOSE +Route8_EventScript_GlennRematch:: @ 81AA278 + trainerbattle_rematch TRAINER_SUPER_NERD_GLENN, Route8_Text_GlennRematchIntro, Route8_Text_GlennDefeat + msgbox Route8_Text_GlennPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_1AA28F:: @ 81AA28F - trainerbattle_single TRAINER_SUPER_NERD_LESLIE, Text_184257, Text_18427A +Route8_EventScript_Leslie:: @ 81AA28F + trainerbattle_single TRAINER_SUPER_NERD_LESLIE, Route8_Text_LeslieIntro, Route8_Text_LeslieDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA2B6 - msgbox Text_1842B3, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route8_EventScript_LeslieRematch + msgbox Route8_Text_LesliePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA2B6:: @ 81AA2B6 - trainerbattle_rematch TRAINER_SUPER_NERD_LESLIE, Text_1C1873, Text_18427A - msgbox Text_1842B3, MSGBOX_AUTOCLOSE +Route8_EventScript_LeslieRematch:: @ 81AA2B6 + trainerbattle_rematch TRAINER_SUPER_NERD_LESLIE, Route8_Text_LeslieRematchIntro, Route8_Text_LeslieDefeat + msgbox Route8_Text_LesliePostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_1AA2CD:: @ 81AA2CD - trainerbattle_single TRAINER_GAMER_STAN, Text_18412F, Text_18414D +Route8_EventScript_Stan:: @ 81AA2CD + trainerbattle_single TRAINER_GAMER_STAN, Route8_Text_StanIntro, Route8_Text_StanDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA2F4 - msgbox Text_184162, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route8_EventScript_StanRematch + msgbox Route8_Text_StanPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA2F4:: @ 81AA2F4 - trainerbattle_rematch TRAINER_GAMER_STAN, Text_1C17CD, Text_18414D - msgbox Text_184162, MSGBOX_AUTOCLOSE +Route8_EventScript_StanRematch:: @ 81AA2F4 + trainerbattle_rematch TRAINER_GAMER_STAN, Route8_Text_StanRematchIntro, Route8_Text_StanDefeat + msgbox Route8_Text_StanPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_1AA30B:: @ 81AA30B - trainerbattle_single TRAINER_GAMER_RICH, Text_184432, Text_18444F +Route8_EventScript_Rich:: @ 81AA30B + trainerbattle_single TRAINER_GAMER_RICH, Route8_Text_RichIntro, Route8_Text_RichDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA332 - msgbox Text_184466, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route8_EventScript_RichRematch + msgbox Route8_Text_RichPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA332:: @ 81AA332 - trainerbattle_rematch TRAINER_GAMER_RICH, Text_1C191F, Text_18444F - msgbox Text_184466, MSGBOX_AUTOCLOSE +Route8_EventScript_RichRematch:: @ 81AA332 + trainerbattle_rematch TRAINER_GAMER_RICH, Route8_Text_RichRematchIntro, Route8_Text_RichDefeat + msgbox Route8_Text_RichPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_1AA349:: @ 81AA349 - trainerbattle_double TRAINER_TWINS_ELI_ANNE, Text_1845A4, Text_1845D0, Text_184616 +Route8_EventScript_Eli:: @ 81AA349 + trainerbattle_double TRAINER_TWINS_ELI_ANNE, Route8_Text_EliIntro, Route8_Text_EliDefeat, Route8_Text_EliNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA374 - msgbox Text_1845F2, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route8_EventScript_EliRematch + msgbox Route8_Text_EliPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA374:: @ 81AA374 - trainerbattle_rematch_double TRAINER_TWINS_ELI_ANNE, Text_1C19E5, Text_1845D0, Text_184616 - msgbox Text_1845F2, MSGBOX_AUTOCLOSE +Route8_EventScript_EliRematch:: @ 81AA374 + trainerbattle_rematch_double TRAINER_TWINS_ELI_ANNE, Route8_Text_EliRematchIntro, Route8_Text_EliDefeat, Route8_Text_EliNotEnoughMons + msgbox Route8_Text_EliPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_1AA38F:: @ 81AA38F - trainerbattle_double TRAINER_TWINS_ELI_ANNE, Text_18464A, Text_184675, Text_1846AF +Route8_EventScript_Anne:: @ 81AA38F + trainerbattle_double TRAINER_TWINS_ELI_ANNE, Route8_Text_AnneIntro, Route8_Text_AnneDefeat, Route8_Text_AnneNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA3BA - msgbox Text_18468B, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route8_EventScript_AnneRematch + msgbox Route8_Text_AnnePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA3BA:: @ 81AA3BA - trainerbattle_rematch_double TRAINER_TWINS_ELI_ANNE, Text_1C1A0D, Text_184675, Text_1846AF - msgbox Text_18468B, MSGBOX_AUTOCLOSE +Route8_EventScript_AnneRematch:: @ 81AA3BA + trainerbattle_rematch_double TRAINER_TWINS_ELI_ANNE, Route8_Text_AnneRematchIntro, Route8_Text_AnneDefeat, Route8_Text_AnneNotEnoughMons + msgbox Route8_Text_AnnePostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_1AA3D5:: @ 81AA3D5 - trainerbattle_single TRAINER_BIKER_RICARDO, Text_1846E2, Text_1846FC +Route8_EventScript_Ricardo:: @ 81AA3D5 + trainerbattle_single TRAINER_BIKER_RICARDO, Route8_Text_RicardoIntro, Route8_Text_RicardoDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA3FC - msgbox Text_184719, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route8_EventScript_RicardoRematch + msgbox Route8_Text_RicardoPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA3FC:: @ 81AA3FC - trainerbattle_rematch TRAINER_BIKER_RICARDO, Text_1C199C, Text_1846FC - msgbox Text_184719, MSGBOX_AUTOCLOSE +Route8_EventScript_RicardoRematch:: @ 81AA3FC + trainerbattle_rematch TRAINER_BIKER_RICARDO, Route8_Text_RicardoRematchIntro, Route8_Text_RicardoDefeat + msgbox Route8_Text_RicardoPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_1AA413:: @ 81AA413 - trainerbattle_single TRAINER_BIKER_JAREN, Text_184742, Text_184767 +Route8_EventScript_Jaren:: @ 81AA413 + trainerbattle_single TRAINER_BIKER_JAREN, Route8_Text_JarenIntro, Route8_Text_JarenDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA43A - msgbox Text_18477A, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route8_EventScript_JarenRematch + msgbox Route8_Text_JarenPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA43A:: @ 81AA43A - trainerbattle_rematch TRAINER_BIKER_JAREN, Text_1C19BC, Text_184767 - msgbox Text_18477A, MSGBOX_AUTOCLOSE +Route8_EventScript_JarenRematch:: @ 81AA43A + trainerbattle_rematch TRAINER_BIKER_JAREN, Route8_Text_JarenRematchIntro, Route8_Text_JarenDefeat + msgbox Route8_Text_JarenPostBattle, MSGBOX_AUTOCLOSE end Route12_EventScript_1AA451:: @ 81AA451 trainerbattle_single TRAINER_FISHERMAN_NED, Text_185402, Text_18541B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA478 msgbox Text_185432, MSGBOX_AUTOCLOSE end @@ -898,7 +898,7 @@ EventScript_1AA478:: @ 81AA478 Route12_EventScript_1AA48F:: @ 81AA48F trainerbattle_single TRAINER_FISHERMAN_CHIP, Text_18544E, Text_185475 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA4B6 msgbox Text_185488, MSGBOX_AUTOCLOSE end @@ -911,7 +911,7 @@ EventScript_1AA4B6:: @ 81AA4B6 Route12_EventScript_1AA4CD:: @ 81AA4CD trainerbattle_single TRAINER_FISHERMAN_HANK, Text_1855E1, Text_185606 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA4F4 msgbox Text_185616, MSGBOX_AUTOCLOSE end @@ -924,7 +924,7 @@ EventScript_1AA4F4:: @ 81AA4F4 Route12_EventScript_1AA50B:: @ 81AA50B trainerbattle_single TRAINER_FISHERMAN_ELLIOT, Text_185682, Text_1856D0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA532 msgbox Text_1856DF, MSGBOX_AUTOCLOSE end @@ -937,7 +937,7 @@ EventScript_1AA532:: @ 81AA532 Route12_EventScript_1AA549:: @ 81AA549 trainerbattle_single TRAINER_FISHERMAN_ANDREW, Text_18570E, Text_185744 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA570 msgbox Text_18574D, MSGBOX_AUTOCLOSE end @@ -950,7 +950,7 @@ EventScript_1AA570:: @ 81AA570 Route12_EventScript_1AA587:: @ 81AA587 trainerbattle_single TRAINER_ROCKER_LUCA, Text_185547, Text_18559B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA5AE msgbox Text_1855A6, MSGBOX_AUTOCLOSE end @@ -963,7 +963,7 @@ EventScript_1AA5AE:: @ 81AA5AE Route12_EventScript_1AA5C5:: @ 81AA5C5 trainerbattle_single TRAINER_CAMPER_JUSTIN, Text_1854B9, Text_1854ED specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA5EC msgbox Text_1854F2, MSGBOX_AUTOCLOSE end @@ -976,7 +976,7 @@ EventScript_1AA5EC:: @ 81AA5EC Route12_EventScript_1AA603:: @ 81AA603 trainerbattle_double TRAINER_YOUNG_COUPLE_GIA_JES, Text_1857C5, Text_1857F1, Text_185842 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA62E msgbox Text_18581F, MSGBOX_AUTOCLOSE end @@ -989,7 +989,7 @@ EventScript_1AA62E:: @ 81AA62E Route12_EventScript_1AA649:: @ 81AA649 trainerbattle_double TRAINER_YOUNG_COUPLE_GIA_JES, Text_1858A6, Text_1858D0, Text_185908 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA674 msgbox Text_1858E2, MSGBOX_AUTOCLOSE end @@ -1002,7 +1002,7 @@ EventScript_1AA674:: @ 81AA674 Route13_EventScript_1AA68F:: @ 81AA68F trainerbattle_single TRAINER_BIKER_JARED, Text_185D05, Text_185D1D specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA6B6 msgbox Text_185D33, MSGBOX_AUTOCLOSE end @@ -1015,7 +1015,7 @@ EventScript_1AA6B6:: @ 81AA6B6 Route13_EventScript_1AA6CD:: @ 81AA6CD trainerbattle_single TRAINER_BEAUTY_LOLA, Text_185BFC, Text_185C1F specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA6F4 msgbox Text_185C35, MSGBOX_AUTOCLOSE end @@ -1028,7 +1028,7 @@ EventScript_1AA6F4:: @ 81AA6F4 Route13_EventScript_1AA70B:: @ 81AA70B trainerbattle_single TRAINER_BEAUTY_SHEILA, Text_185C69, Text_185C95 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA732 msgbox Text_185CA8, MSGBOX_AUTOCLOSE end @@ -1041,7 +1041,7 @@ EventScript_1AA732:: @ 81AA732 Route13_EventScript_1AA749:: @ 81AA749 trainerbattle_single TRAINER_BIRD_KEEPER_SEBASTIAN, Text_185955, Text_18597E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA770 msgbox Text_1859A2, MSGBOX_AUTOCLOSE end @@ -1054,7 +1054,7 @@ EventScript_1AA770:: @ 81AA770 Route13_EventScript_1AA787:: @ 81AA787 trainerbattle_single TRAINER_BIRD_KEEPER_PERRY, Text_185B8F, Text_185BCA specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA7AE msgbox Text_185BDB, MSGBOX_AUTOCLOSE end @@ -1067,7 +1067,7 @@ EventScript_1AA7AE:: @ 81AA7AE Route13_EventScript_1AA7C5:: @ 81AA7C5 trainerbattle_single TRAINER_BIRD_KEEPER_ROBERT, Text_185D3D, Text_185D7B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA7EC msgbox Text_185D89, MSGBOX_AUTOCLOSE end @@ -1080,7 +1080,7 @@ EventScript_1AA7EC:: @ 81AA7EC Route13_EventScript_1AA803:: @ 81AA803 trainerbattle_single TRAINER_PICNICKER_ALMA, Text_185B12, Text_185B48 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA82A msgbox Text_185B67, MSGBOX_AUTOCLOSE end @@ -1093,7 +1093,7 @@ EventScript_1AA82A:: @ 81AA82A Route13_EventScript_1AA841:: @ 81AA841 trainerbattle_single TRAINER_PICNICKER_SUSIE, Text_1859CF, Text_1859EC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA868 msgbox Text_1859F9, MSGBOX_AUTOCLOSE end @@ -1106,7 +1106,7 @@ EventScript_1AA868:: @ 81AA868 Route13_EventScript_1AA87F:: @ 81AA87F trainerbattle_single TRAINER_PICNICKER_VALERIE, Text_185A37, Text_185A56 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA8A6 msgbox Text_185A62, MSGBOX_AUTOCLOSE end @@ -1119,7 +1119,7 @@ EventScript_1AA8A6:: @ 81AA8A6 Route13_EventScript_1AA8BD:: @ 81AA8BD trainerbattle_single TRAINER_PICNICKER_GWEN, Text_185A91, Text_185AC1 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA8E4 msgbox Text_185ADE, MSGBOX_AUTOCLOSE end @@ -1132,7 +1132,7 @@ EventScript_1AA8E4:: @ 81AA8E4 Route14_EventScript_1AA8FB:: @ 81AA8FB trainerbattle_single TRAINER_BIKER_MALIK, Text_186344, Text_186362 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA922 msgbox Text_18636E, MSGBOX_AUTOCLOSE end @@ -1145,7 +1145,7 @@ EventScript_1AA922:: @ 81AA922 Route14_EventScript_1AA939:: @ 81AA939 trainerbattle_single TRAINER_BIKER_LUKAS, Text_1861F7, Text_186223 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA960 msgbox Text_186239, MSGBOX_AUTOCLOSE end @@ -1158,7 +1158,7 @@ EventScript_1AA960:: @ 81AA960 Route14_EventScript_1AA977:: @ 81AA977 trainerbattle_single TRAINER_BIKER_ISAAC, Text_186263, Text_186291 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA99E msgbox Text_18629D, MSGBOX_AUTOCLOSE end @@ -1171,7 +1171,7 @@ EventScript_1AA99E:: @ 81AA99E Route14_EventScript_1AA9B5:: @ 81AA9B5 trainerbattle_single TRAINER_BIKER_GERALD, Text_1862BD, Text_1862EF specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA9DC msgbox Text_1862F8, MSGBOX_AUTOCLOSE end @@ -1184,7 +1184,7 @@ EventScript_1AA9DC:: @ 81AA9DC Route14_EventScript_1AA9F3:: @ 81AA9F3 trainerbattle_single TRAINER_BIRD_KEEPER_DONALD, Text_1860D9, Text_18610A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAA1A msgbox Text_18611D, MSGBOX_AUTOCLOSE end @@ -1197,7 +1197,7 @@ EventScript_1AAA1A:: @ 81AAA1A Route14_EventScript_1AAA31:: @ 81AAA31 trainerbattle_single TRAINER_BIRD_KEEPER_BENNY, Text_18618E, Text_1861B3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAA58 msgbox Text_1861BE, MSGBOX_AUTOCLOSE end @@ -1210,7 +1210,7 @@ EventScript_1AAA58:: @ 81AAA58 Route14_EventScript_1AAA6F:: @ 81AAA6F trainerbattle_single TRAINER_BIRD_KEEPER_CARTER, Text_185E4D, Text_185E81 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAA96 msgbox Text_185E9C, MSGBOX_AUTOCLOSE end @@ -1223,7 +1223,7 @@ EventScript_1AAA96:: @ 81AAA96 Route14_EventScript_1AAAAD:: @ 81AAAAD trainerbattle_single TRAINER_BIRD_KEEPER_MITCH, Text_185EDF, Text_185F0B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAAD4 msgbox Text_185F1A, MSGBOX_AUTOCLOSE end @@ -1236,7 +1236,7 @@ EventScript_1AAAD4:: @ 81AAAD4 Route14_EventScript_1AAAEB:: @ 81AAAEB trainerbattle_single TRAINER_BIRD_KEEPER_BECK, Text_185F46, Text_185FAE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAB12 msgbox Text_185FBB, MSGBOX_AUTOCLOSE end @@ -1249,7 +1249,7 @@ EventScript_1AAB12:: @ 81AAB12 Route14_EventScript_1AAB29:: @ 81AAB29 trainerbattle_single TRAINER_BIRD_KEEPER_MARLON, Text_186021, Text_18607C specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAB50 msgbox Text_186091, MSGBOX_AUTOCLOSE end @@ -1262,7 +1262,7 @@ EventScript_1AAB50:: @ 81AAB50 Route14_EventScript_1AAB67:: @ 81AAB67 trainerbattle_double TRAINER_TWINS_KIRI_JAN, Text_1863B7, Text_1863EA, Text_18642E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAB92 msgbox Text_18640D, MSGBOX_AUTOCLOSE end @@ -1275,7 +1275,7 @@ EventScript_1AAB92:: @ 81AAB92 Route14_EventScript_1AABAD:: @ 81AABAD trainerbattle_double TRAINER_TWINS_KIRI_JAN, Text_18645B, Text_186487, Text_1864D3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AABD8 msgbox Text_18649C, MSGBOX_AUTOCLOSE end @@ -1288,7 +1288,7 @@ EventScript_1AABD8:: @ 81AABD8 Route15_EventScript_1AABF3:: @ 81AABF3 trainerbattle_single TRAINER_BIKER_ERNEST, Text_1868B6, Text_1868E8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAC1A msgbox Text_1868F1, MSGBOX_AUTOCLOSE end @@ -1301,7 +1301,7 @@ EventScript_1AAC1A:: @ 81AAC1A Route15_EventScript_1AAC31:: @ 81AAC31 trainerbattle_single TRAINER_BIKER_ALEX, Text_186936, Text_186968 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAC58 msgbox Text_18697C, MSGBOX_AUTOCLOSE end @@ -1314,7 +1314,7 @@ EventScript_1AAC58:: @ 81AAC58 Route15_EventScript_1AAC6F:: @ 81AAC6F trainerbattle_single TRAINER_BEAUTY_GRACE, Text_18678B, Text_1867C1 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAC96 msgbox Text_1867DA, MSGBOX_AUTOCLOSE end @@ -1327,7 +1327,7 @@ EventScript_1AAC96:: @ 81AAC96 Route15_EventScript_1AACAD:: @ 81AACAD trainerbattle_single TRAINER_BEAUTY_OLIVIA, Text_18680C, Text_186841 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AACD4 msgbox Text_18686F, MSGBOX_AUTOCLOSE end @@ -1340,7 +1340,7 @@ EventScript_1AACD4:: @ 81AACD4 Route15_EventScript_1AACEB:: @ 81AACEB trainerbattle_single TRAINER_BIRD_KEEPER_EDWIN, Text_18664F, Text_18667A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAD12 msgbox Text_18668D, MSGBOX_AUTOCLOSE end @@ -1353,7 +1353,7 @@ EventScript_1AAD12:: @ 81AAD12 Route15_EventScript_1AAD29:: @ 81AAD29 trainerbattle_single TRAINER_BIRD_KEEPER_CHESTER, Text_1866D1, Text_186707 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAD50 msgbox Text_18671A, MSGBOX_AUTOCLOSE end @@ -1366,7 +1366,7 @@ EventScript_1AAD50:: @ 81AAD50 Route15_EventScript_1AAD67:: @ 81AAD67 trainerbattle_single TRAINER_PICNICKER_YAZMIN, Text_186A22, Text_186A40 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAD8E msgbox Text_186A55, MSGBOX_AUTOCLOSE end @@ -1379,7 +1379,7 @@ EventScript_1AAD8E:: @ 81AAD8E Route15_EventScript_1AADA5:: @ 81AADA5 trainerbattle_single TRAINER_PICNICKER_KINDRA, Text_18650B, Text_186549 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AADCC msgbox Text_18655A, MSGBOX_AUTOCLOSE end @@ -1392,7 +1392,7 @@ EventScript_1AADCC:: @ 81AADCC Route15_EventScript_1AADE3:: @ 81AADE3 trainerbattle_single TRAINER_PICNICKER_BECKY, Text_1865D3, Text_186612 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAE0A msgbox Text_18661D, MSGBOX_AUTOCLOSE end @@ -1405,7 +1405,7 @@ EventScript_1AAE0A:: @ 81AAE0A Route15_EventScript_1AAE21:: @ 81AAE21 trainerbattle_single TRAINER_PICNICKER_CELIA, Text_1869BA, Text_1869E6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAE48 msgbox Text_1869F4, MSGBOX_AUTOCLOSE end @@ -1418,7 +1418,7 @@ EventScript_1AAE48:: @ 81AAE48 Route15_EventScript_1AAE5F:: @ 81AAE5F trainerbattle_double TRAINER_CRUSH_KIN_RON_MYA, Text_186A95, Text_186ACB, Text_186B46 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAE8A msgbox Text_186B0A, MSGBOX_AUTOCLOSE end @@ -1431,7 +1431,7 @@ EventScript_1AAE8A:: @ 81AAE8A Route15_EventScript_1AAEA5:: @ 81AAEA5 trainerbattle_double TRAINER_CRUSH_KIN_RON_MYA, Text_186B89, Text_186BB1, Text_186BFE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAED0 msgbox Text_186BD2, MSGBOX_AUTOCLOSE end @@ -1444,7 +1444,7 @@ EventScript_1AAED0:: @ 81AAED0 Route16_EventScript_1AAEEB:: @ 81AAEEB trainerbattle_single TRAINER_BIKER_LAO, Text_186C4D, Text_186C5F specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAF12 msgbox Text_186C75, MSGBOX_AUTOCLOSE end @@ -1457,7 +1457,7 @@ EventScript_1AAF12:: @ 81AAF12 Route16_EventScript_1AAF29:: @ 81AAF29 trainerbattle_single TRAINER_BIKER_HIDEO, Text_186D39, Text_186D52 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAF50 msgbox Text_186D5A, MSGBOX_AUTOCLOSE end @@ -1470,7 +1470,7 @@ EventScript_1AAF50:: @ 81AAF50 Route16_EventScript_1AAF67:: @ 81AAF67 trainerbattle_single TRAINER_BIKER_RUBEN, Text_186E86, Text_186EB4 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAF8E msgbox Text_186EC7, MSGBOX_AUTOCLOSE end @@ -1483,7 +1483,7 @@ EventScript_1AAF8E:: @ 81AAF8E Route16_EventScript_1AAFA5:: @ 81AAFA5 trainerbattle_single TRAINER_CUE_BALL_KOJI, Text_186CA2, Text_186CBB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAFCC msgbox Text_186CC5, MSGBOX_AUTOCLOSE end @@ -1496,7 +1496,7 @@ EventScript_1AAFCC:: @ 81AAFCC Route16_EventScript_1AAFE3:: @ 81AAFE3 trainerbattle_single TRAINER_CUE_BALL_LUKE, Text_186CE5, Text_186D06 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB00A msgbox Text_186D16, MSGBOX_AUTOCLOSE end @@ -1509,7 +1509,7 @@ EventScript_1AB00A:: @ 81AB00A Route16_EventScript_1AB021:: @ 81AB021 trainerbattle_single TRAINER_CUE_BALL_CAMRON, Text_186DD9, Text_186E0D specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB048 msgbox Text_186E1C, MSGBOX_AUTOCLOSE end @@ -1522,7 +1522,7 @@ EventScript_1AB048:: @ 81AB048 Route16_EventScript_1AB05F:: @ 81AB05F trainerbattle_double TRAINER_YOUNG_COUPLE_LEA_JED, Text_186FBD, Text_186FFA, Text_187057 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB08A msgbox Text_187027, MSGBOX_AUTOCLOSE end @@ -1535,7 +1535,7 @@ EventScript_1AB08A:: @ 81AB08A Route16_EventScript_1AB0A5:: @ 81AB0A5 trainerbattle_double TRAINER_YOUNG_COUPLE_LEA_JED, Text_187097, Text_1870CC, Text_187120 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB0D0 msgbox Text_1870F9, MSGBOX_AUTOCLOSE end @@ -1548,7 +1548,7 @@ EventScript_1AB0D0:: @ 81AB0D0 Route17_EventScript_1AB0EB:: @ 81AB0EB trainerbattle_single TRAINER_BIKER_BILLY, Text_1872BD, Text_1872E3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB112 msgbox Text_1872EB, MSGBOX_AUTOCLOSE end @@ -1561,7 +1561,7 @@ EventScript_1AB112:: @ 81AB112 Route17_EventScript_1AB129:: @ 81AB129 trainerbattle_single TRAINER_BIKER_NIKOLAS, Text_18730A, Text_187325 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB150 msgbox Text_187333, MSGBOX_AUTOCLOSE end @@ -1574,7 +1574,7 @@ EventScript_1AB150:: @ 81AB150 Route17_EventScript_1AB167:: @ 81AB167 trainerbattle_single TRAINER_BIKER_JAXON, Text_187456, Text_187472 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB18E msgbox Text_187479, MSGBOX_AUTOCLOSE end @@ -1587,7 +1587,7 @@ EventScript_1AB18E:: @ 81AB18E Route17_EventScript_1AB1A5:: @ 81AB1A5 trainerbattle_single TRAINER_BIKER_WILLIAM, Text_18749B, Text_1874B6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB1CC msgbox Text_1874C9, MSGBOX_AUTOCLOSE end @@ -1600,7 +1600,7 @@ EventScript_1AB1CC:: @ 81AB1CC Route17_EventScript_1AB1E3:: @ 81AB1E3 trainerbattle_single TRAINER_CUE_BALL_RAUL, Text_18717E, Text_1871AE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB20A msgbox Text_1871BA, MSGBOX_AUTOCLOSE end @@ -1613,7 +1613,7 @@ EventScript_1AB20A:: @ 81AB20A Route17_EventScript_1AB221:: @ 81AB221 trainerbattle_single TRAINER_CUE_BALL_ISAIAH, Text_187228, Text_187254 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB248 msgbox Text_18725A, MSGBOX_AUTOCLOSE end @@ -1626,7 +1626,7 @@ EventScript_1AB248:: @ 81AB248 Route17_EventScript_1AB25F:: @ 81AB25F trainerbattle_single TRAINER_CUE_BALL_ZEEK, Text_187362, Text_187395 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB286 msgbox Text_18739F, MSGBOX_AUTOCLOSE end @@ -1639,7 +1639,7 @@ EventScript_1AB286:: @ 81AB286 Route17_EventScript_1AB29D:: @ 81AB29D trainerbattle_single TRAINER_CUE_BALL_JAMAL, Text_1873D1, Text_1873EB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB2C4 msgbox Text_1873FF, MSGBOX_AUTOCLOSE end @@ -1652,7 +1652,7 @@ EventScript_1AB2C4:: @ 81AB2C4 Route17_EventScript_1AB2DB:: @ 81AB2DB trainerbattle_single TRAINER_CUE_BALL_COREY, Text_18741D, Text_187429 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB302 msgbox Text_187432, MSGBOX_AUTOCLOSE end @@ -1665,7 +1665,7 @@ EventScript_1AB302:: @ 81AB302 Route17_EventScript_1AB319:: @ 81AB319 trainerbattle_single TRAINER_BIKER_VIRGIL, Text_18727D, Text_187295 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB340 msgbox Text_1872A5, MSGBOX_AUTOCLOSE end @@ -1678,7 +1678,7 @@ EventScript_1AB340:: @ 81AB340 Route18_EventScript_1AB357:: @ 81AB357 trainerbattle_single TRAINER_BIRD_KEEPER_WILTON, Text_187640, Text_187672 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB37E msgbox Text_187677, MSGBOX_AUTOCLOSE end @@ -1691,7 +1691,7 @@ EventScript_1AB37E:: @ 81AB37E Route18_EventScript_1AB395:: @ 81AB395 trainerbattle_single TRAINER_BIRD_KEEPER_RAMIRO, Text_18768C, Text_1876B3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB3BC msgbox Text_1876C5, MSGBOX_AUTOCLOSE end @@ -1704,7 +1704,7 @@ EventScript_1AB3BC:: @ 81AB3BC Route18_EventScript_1AB3D3:: @ 81AB3D3 trainerbattle_single TRAINER_BIRD_KEEPER_JACOB, Text_187704, Text_187726 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB3FA msgbox Text_18772C, MSGBOX_AUTOCLOSE end @@ -1717,7 +1717,7 @@ EventScript_1AB3FA:: @ 81AB3FA Route19_EventScript_1AB411:: @ 81AB411 trainerbattle_single TRAINER_SWIMMER_MALE_RICHARD, Text_1877A3, Text_1877DF specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB438 msgbox Text_1877EE, MSGBOX_AUTOCLOSE end @@ -1730,7 +1730,7 @@ EventScript_1AB438:: @ 81AB438 Route19_EventScript_1AB44F:: @ 81AB44F trainerbattle_single TRAINER_SWIMMER_MALE_REECE, Text_187811, Text_18783E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB476 msgbox Text_187852, MSGBOX_AUTOCLOSE end @@ -1743,7 +1743,7 @@ EventScript_1AB476:: @ 81AB476 Route19_EventScript_1AB48D:: @ 81AB48D trainerbattle_single TRAINER_SWIMMER_MALE_MATTHEW, Text_187884, Text_1878A5 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB4B4 msgbox Text_1878B1, MSGBOX_AUTOCLOSE end @@ -1756,7 +1756,7 @@ EventScript_1AB4B4:: @ 81AB4B4 Route19_EventScript_1AB4CB:: @ 81AB4CB trainerbattle_single TRAINER_SWIMMER_MALE_DOUGLAS, Text_1878DD, Text_1878F8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB4F2 msgbox Text_1878FE, MSGBOX_AUTOCLOSE end @@ -1769,7 +1769,7 @@ EventScript_1AB4F2:: @ 81AB4F2 Route19_EventScript_1AB509:: @ 81AB509 trainerbattle_single TRAINER_SWIMMER_MALE_DAVID, Text_187925, Text_187955 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB530 msgbox Text_18795B, MSGBOX_AUTOCLOSE end @@ -1782,7 +1782,7 @@ EventScript_1AB530:: @ 81AB530 Route19_EventScript_1AB547:: @ 81AB547 trainerbattle_single TRAINER_SWIMMER_MALE_TONY, Text_187985, Text_1879C3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB56E msgbox Text_1879D3, MSGBOX_AUTOCLOSE end @@ -1795,7 +1795,7 @@ EventScript_1AB56E:: @ 81AB56E Route19_EventScript_1AB585:: @ 81AB585 trainerbattle_single TRAINER_SWIMMER_MALE_AXLE, Text_187AFA, Text_187B25 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB5AC msgbox Text_187B35, MSGBOX_AUTOCLOSE end @@ -1808,7 +1808,7 @@ EventScript_1AB5AC:: @ 81AB5AC Route19_EventScript_1AB5C3:: @ 81AB5C3 trainerbattle_single TRAINER_SWIMMER_FEMALE_ANYA, Text_187A11, Text_187A44 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB5EA msgbox Text_187A50, MSGBOX_AUTOCLOSE end @@ -1821,7 +1821,7 @@ EventScript_1AB5EA:: @ 81AB5EA Route19_EventScript_1AB601:: @ 81AB601 trainerbattle_single TRAINER_SWIMMER_FEMALE_ALICE, Text_187A9E, Text_187AC1 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB628 msgbox Text_187ACA, MSGBOX_AUTOCLOSE end @@ -1834,7 +1834,7 @@ EventScript_1AB628:: @ 81AB628 Route19_EventScript_1AB63F:: @ 81AB63F trainerbattle_single TRAINER_SWIMMER_FEMALE_CONNIE, Text_187B5D, Text_187B85 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB666 msgbox Text_187B94, MSGBOX_AUTOCLOSE end @@ -1847,7 +1847,7 @@ EventScript_1AB666:: @ 81AB666 Route19_EventScript_1AB67D:: @ 81AB67D trainerbattle_double TRAINER_SIS_AND_BRO_LIA_LUC, Text_187C32, Text_187C6F, Text_187CF2 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB6A8 msgbox Text_187C9E, MSGBOX_AUTOCLOSE end @@ -1860,7 +1860,7 @@ EventScript_1AB6A8:: @ 81AB6A8 Route19_EventScript_1AB6C3:: @ 81AB6C3 trainerbattle_double TRAINER_SIS_AND_BRO_LIA_LUC, Text_187D45, Text_187D7E, Text_187DE8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB6EE msgbox Text_187DAD, MSGBOX_AUTOCLOSE end @@ -1873,7 +1873,7 @@ EventScript_1AB6EE:: @ 81AB6EE Route20_EventScript_1AB709:: @ 81AB709 trainerbattle_single TRAINER_SWIMMER_MALE_BARRY, Text_187E40, Text_187E7B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB730 msgbox Text_187E83, MSGBOX_AUTOCLOSE end @@ -1886,7 +1886,7 @@ EventScript_1AB730:: @ 81AB730 Route20_EventScript_1AB747:: @ 81AB747 trainerbattle_single TRAINER_SWIMMER_MALE_DEAN, Text_187FDB, Text_187FF7 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB76E msgbox Text_187FFE, MSGBOX_AUTOCLOSE end @@ -1899,7 +1899,7 @@ EventScript_1AB76E:: @ 81AB76E Route20_EventScript_1AB785:: @ 81AB785 trainerbattle_single TRAINER_SWIMMER_MALE_DARRIN, Text_18802E, Text_18805C specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB7AC msgbox Text_18806D, MSGBOX_AUTOCLOSE end @@ -1912,7 +1912,7 @@ EventScript_1AB7AC:: @ 81AB7AC Route20_EventScript_1AB7C3:: @ 81AB7C3 trainerbattle_single TRAINER_SWIMMER_FEMALE_TIFFANY, Text_187F24, Text_187F5A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB7EA msgbox Text_187F61, MSGBOX_AUTOCLOSE end @@ -1925,7 +1925,7 @@ EventScript_1AB7EA:: @ 81AB7EA Route20_EventScript_1AB801:: @ 81AB801 trainerbattle_single TRAINER_SWIMMER_FEMALE_NORA, Text_1880F8, Text_188119 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB828 msgbox Text_188139, MSGBOX_AUTOCLOSE end @@ -1938,7 +1938,7 @@ EventScript_1AB828:: @ 81AB828 Route20_EventScript_1AB83F:: @ 81AB83F trainerbattle_single TRAINER_SWIMMER_FEMALE_MELISSA, Text_188218, Text_18825C specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB866 msgbox Text_18827B, MSGBOX_AUTOCLOSE end @@ -1951,7 +1951,7 @@ EventScript_1AB866:: @ 81AB866 Route20_EventScript_1AB87D:: @ 81AB87D trainerbattle_single TRAINER_SWIMMER_FEMALE_SHIRLEY, Text_187EBB, Text_187EED specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB8A4 msgbox Text_187EF6, MSGBOX_AUTOCLOSE end @@ -1964,7 +1964,7 @@ EventScript_1AB8A4:: @ 81AB8A4 Route20_EventScript_1AB8BB:: @ 81AB8BB trainerbattle_single TRAINER_BIRD_KEEPER_ROGER, Text_18808E, Text_1880AB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB8E2 msgbox Text_1880C8, MSGBOX_AUTOCLOSE end @@ -1977,7 +1977,7 @@ EventScript_1AB8E2:: @ 81AB8E2 Route20_EventScript_1AB8F9:: @ 81AB8F9 trainerbattle_single TRAINER_PICNICKER_MISSY, Text_188165, Text_1881A3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB920 msgbox Text_1881B8, MSGBOX_AUTOCLOSE end @@ -1990,7 +1990,7 @@ EventScript_1AB920:: @ 81AB920 Route20_EventScript_1AB937:: @ 81AB937 trainerbattle_single TRAINER_PICNICKER_IRENE, Text_187F78, Text_187F92 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB95E msgbox Text_187FA3, MSGBOX_AUTOCLOSE end @@ -2003,7 +2003,7 @@ EventScript_1AB95E:: @ 81AB95E Route21_North_EventScript_1AB975:: @ 81AB975 trainerbattle_single TRAINER_FISHERMAN_RONALD, Text_18835A, Text_188383 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB99C msgbox Text_188389, MSGBOX_AUTOCLOSE end @@ -2016,7 +2016,7 @@ EventScript_1AB99C:: @ 81AB99C Route21_South_EventScript_1AB9B3:: @ 81AB9B3 trainerbattle_single TRAINER_FISHERMAN_CLAUDE, Text_1885D8, Text_1885F8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB9DA msgbox Text_188632, MSGBOX_AUTOCLOSE end @@ -2029,7 +2029,7 @@ EventScript_1AB9DA:: @ 81AB9DA Route21_North_EventScript_1AB9F1:: @ 81AB9F1 trainerbattle_single TRAINER_FISHERMAN_WADE, Text_1883C6, Text_1883E9 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABA18 msgbox Text_18841D, MSGBOX_AUTOCLOSE end @@ -2042,7 +2042,7 @@ EventScript_1ABA18:: @ 81ABA18 Route21_South_EventScript_1ABA2F:: @ 81ABA2F trainerbattle_single TRAINER_FISHERMAN_NOLAN, Text_18868C, Text_1886AE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABA56 msgbox Text_1886C5, MSGBOX_AUTOCLOSE end @@ -2055,7 +2055,7 @@ EventScript_1ABA56:: @ 81ABA56 Route21_North_EventScript_1ABA6D:: @ 81ABA6D trainerbattle_single TRAINER_SWIMMER_MALE_SPENCER, Text_18843C, Text_18845F specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABA94 msgbox Text_188465, MSGBOX_AUTOCLOSE end @@ -2068,7 +2068,7 @@ EventScript_1ABA94:: @ 81ABA94 Route21_South_EventScript_1ABAAB:: @ 81ABAAB trainerbattle_single TRAINER_SWIMMER_MALE_JACK, Text_1884D4, Text_1884F0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABAD2 msgbox Text_1884FF, MSGBOX_AUTOCLOSE end @@ -2081,7 +2081,7 @@ EventScript_1ABAD2:: @ 81ABAD2 Route21_South_EventScript_1ABAE9:: @ 81ABAE9 trainerbattle_single TRAINER_SWIMMER_MALE_JEROME, Text_18851F, Text_188543 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABB10 msgbox Text_188555, MSGBOX_AUTOCLOSE end @@ -2094,7 +2094,7 @@ EventScript_1ABB10:: @ 81ABB10 Route21_South_EventScript_1ABB27:: @ 81ABB27 trainerbattle_single TRAINER_SWIMMER_MALE_ROLAND, Text_188592, Text_1885B2 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABB4E msgbox Text_1885BF, MSGBOX_AUTOCLOSE end @@ -2107,7 +2107,7 @@ EventScript_1ABB4E:: @ 81ABB4E Route21_North_EventScript_1ABB65:: @ 81ABB65 trainerbattle_double TRAINER_SIS_AND_BRO_LIL_IAN, Text_1886E2, Text_188712, Text_18875E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABB90 msgbox Text_188734, MSGBOX_AUTOCLOSE end @@ -2120,7 +2120,7 @@ EventScript_1ABB90:: @ 81ABB90 Route21_North_EventScript_1ABBAB:: @ 81ABBAB trainerbattle_double TRAINER_SIS_AND_BRO_LIL_IAN, Text_1887B4, Text_1887F1, Text_188850 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABBD6 msgbox Text_188812, MSGBOX_AUTOCLOSE end @@ -2133,7 +2133,7 @@ EventScript_1ABBD6:: @ 81ABBD6 OneIsland_KindleRoad_EventScript_1ABBF1:: @ 81ABBF1 trainerbattle_single TRAINER_SWIMMER_FEMALE_MARIA, Text_18961F, Text_18964D specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABC18 msgbox Text_189657, MSGBOX_AUTOCLOSE end @@ -2146,7 +2146,7 @@ EventScript_1ABC18:: @ 81ABC18 OneIsland_KindleRoad_EventScript_1ABC2F:: @ 81ABC2F trainerbattle_single TRAINER_SWIMMER_FEMALE_ABIGAIL, Text_18968C, Text_1896AC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABC56 msgbox Text_1896C1, MSGBOX_AUTOCLOSE end @@ -2159,7 +2159,7 @@ EventScript_1ABC56:: @ 81ABC56 OneIsland_KindleRoad_EventScript_1ABC6D:: @ 81ABC6D trainerbattle_single TRAINER_SWIMMER_MALE_FINN, Text_1896F9, Text_189728 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABC94 msgbox Text_189740, MSGBOX_AUTOCLOSE end @@ -2172,7 +2172,7 @@ EventScript_1ABC94:: @ 81ABC94 OneIsland_KindleRoad_EventScript_1ABCAB:: @ 81ABCAB trainerbattle_single TRAINER_SWIMMER_MALE_GARRETT, Text_189767, Text_1897A4 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABCD2 msgbox Text_1897C5, MSGBOX_AUTOCLOSE end @@ -2185,7 +2185,7 @@ EventScript_1ABCD2:: @ 81ABCD2 OneIsland_KindleRoad_EventScript_1ABCE9:: @ 81ABCE9 trainerbattle_single TRAINER_FISHERMAN_TOMMY, Text_1897FF, Text_189833 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABD10 msgbox Text_18984B, MSGBOX_AUTOCLOSE end @@ -2198,7 +2198,7 @@ EventScript_1ABD10:: @ 81ABD10 OneIsland_KindleRoad_EventScript_1ABD27:: @ 81ABD27 trainerbattle_single TRAINER_CRUSH_GIRL_SHARON, Text_189883, Text_1898AB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABD4E msgbox Text_1898C4, MSGBOX_AUTOCLOSE end @@ -2211,7 +2211,7 @@ EventScript_1ABD4E:: @ 81ABD4E OneIsland_KindleRoad_EventScript_1ABD65:: @ 81ABD65 trainerbattle_single TRAINER_CRUSH_GIRL_TANYA, Text_1898F0, Text_18991B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABD8C msgbox Text_18992C, MSGBOX_AUTOCLOSE end @@ -2224,7 +2224,7 @@ EventScript_1ABD8C:: @ 81ABD8C OneIsland_KindleRoad_EventScript_1ABDA3:: @ 81ABDA3 trainerbattle_single TRAINER_BLACK_BELT_SHEA, Text_189950, Text_18998C specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABDCA msgbox Text_189998, MSGBOX_AUTOCLOSE end @@ -2237,7 +2237,7 @@ EventScript_1ABDCA:: @ 81ABDCA OneIsland_KindleRoad_EventScript_1ABDE1:: @ 81ABDE1 trainerbattle_single TRAINER_BLACK_BELT_HUGH, Text_1899CE, Text_189A0A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABE08 msgbox Text_189A13, MSGBOX_AUTOCLOSE end @@ -2250,7 +2250,7 @@ EventScript_1ABE08:: @ 81ABE08 OneIsland_KindleRoad_EventScript_1ABE1F:: @ 81ABE1F trainerbattle_single TRAINER_CAMPER_BRYCE, Text_189A53, Text_189A92 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABE46 msgbox Text_189A9F, MSGBOX_AUTOCLOSE end @@ -2263,7 +2263,7 @@ EventScript_1ABE46:: @ 81ABE46 OneIsland_KindleRoad_EventScript_1ABE5D:: @ 81ABE5D trainerbattle_single TRAINER_PICNICKER_CLAIRE, Text_189ACB, Text_189B0B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABE84 msgbox Text_189B24, MSGBOX_AUTOCLOSE end @@ -2276,7 +2276,7 @@ EventScript_1ABE84:: @ 81ABE84 OneIsland_KindleRoad_EventScript_1ABE9B:: @ 81ABE9B trainerbattle_double TRAINER_CRUSH_KIN_MIK_KIA, Text_189B4D, Text_189B84, Text_189BDE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABEC6 msgbox Text_189BA3, MSGBOX_AUTOCLOSE end @@ -2289,7 +2289,7 @@ EventScript_1ABEC6:: @ 81ABEC6 OneIsland_KindleRoad_EventScript_1ABEE1:: @ 81ABEE1 trainerbattle_double TRAINER_CRUSH_KIN_MIK_KIA, Text_189C33, Text_189C62, Text_189CAB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABF0C msgbox Text_189C7E, MSGBOX_AUTOCLOSE end @@ -2302,7 +2302,7 @@ EventScript_1ABF0C:: @ 81ABF0C OneIsland_TreasureBeach_EventScript_1ABF27:: @ 81ABF27 trainerbattle_single TRAINER_SWIMMER_FEMALE_AMARA, Text_189D5A, Text_189D8B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABF4E msgbox Text_189DA3, MSGBOX_AUTOCLOSE end @@ -2315,7 +2315,7 @@ EventScript_1ABF4E:: @ 81ABF4E ThreeIsland_BondBridge_EventScript_1ABF65:: @ 81ABF65 trainerbattle_single TRAINER_AROMA_LADY_NIKKI, Text_189E42, Text_189E72 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABF8C msgbox Text_189E9E, MSGBOX_AUTOCLOSE end @@ -2328,7 +2328,7 @@ EventScript_1ABF8C:: @ 81ABF8C ThreeIsland_BondBridge_EventScript_1ABFA3:: @ 81ABFA3 trainerbattle_single TRAINER_AROMA_LADY_VIOLET, Text_189ED4, Text_189EFA specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABFCA msgbox Text_189F21, MSGBOX_AUTOCLOSE end @@ -2341,7 +2341,7 @@ EventScript_1ABFCA:: @ 81ABFCA ThreeIsland_BondBridge_EventScript_1ABFE1:: @ 81ABFE1 trainerbattle_single TRAINER_TUBER_AMIRA, Text_189F63, Text_189F9A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC008 msgbox Text_189FA8, MSGBOX_AUTOCLOSE end @@ -2354,7 +2354,7 @@ EventScript_1AC008:: @ 81AC008 ThreeIsland_BondBridge_EventScript_1AC01F:: @ 81AC01F trainerbattle_single TRAINER_TUBER_ALEXIS, Text_189FDB, Text_189FEE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC046 msgbox Text_18A000, MSGBOX_AUTOCLOSE end @@ -2367,7 +2367,7 @@ EventScript_1AC046:: @ 81AC046 ThreeIsland_BondBridge_EventScript_1AC05D:: @ 81AC05D trainerbattle_single TRAINER_SWIMMER_FEMALE_TISHA, Text_18A01F, Text_18A053 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC084 msgbox Text_18A082, MSGBOX_AUTOCLOSE end @@ -2380,7 +2380,7 @@ EventScript_1AC084:: @ 81AC084 ThreeIsland_BondBridge_EventScript_1AC09B:: @ 81AC09B trainerbattle_double TRAINER_TWINS_JOY_MEG, Text_18A0C4, Text_18A0F7, Text_18A138 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC0C6 msgbox Text_18A106, MSGBOX_AUTOCLOSE end @@ -2393,7 +2393,7 @@ EventScript_1AC0C6:: @ 81AC0C6 ThreeIsland_BondBridge_EventScript_1AC0E1:: @ 81AC0E1 trainerbattle_double TRAINER_TWINS_JOY_MEG, Text_18A179, Text_18A1A3, Text_18A1CD specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC10C msgbox Text_18A1B2, MSGBOX_AUTOCLOSE end @@ -2406,7 +2406,7 @@ EventScript_1AC10C:: @ 81AC10C FiveIsland_ResortGorgeous_EventScript_1AC127:: @ 81AC127 trainerbattle_single TRAINER_PAINTER_DAISY, Text_18A3E2, Text_18A40E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC14E msgbox Text_18A430, MSGBOX_AUTOCLOSE end @@ -2419,7 +2419,7 @@ EventScript_1AC14E:: @ 81AC14E FiveIsland_ResortGorgeous_EventScript_1AC165:: @ 81AC165 trainerbattle_single TRAINER_PAINTER_CELINA, Text_18A461, Text_18A49E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC18C msgbox Text_18A4C6, MSGBOX_AUTOCLOSE end @@ -2432,7 +2432,7 @@ EventScript_1AC18C:: @ 81AC18C FiveIsland_ResortGorgeous_EventScript_1AC1A3:: @ 81AC1A3 trainerbattle_single TRAINER_PAINTER_RAYNA, Text_18A50E, Text_18A535 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC1CA msgbox Text_18A555, MSGBOX_AUTOCLOSE end @@ -2445,7 +2445,7 @@ EventScript_1AC1CA:: @ 81AC1CA FiveIsland_ResortGorgeous_EventScript_1AC1E1:: @ 81AC1E1 trainerbattle_single TRAINER_LADY_JACKI, Text_18A5B9, Text_18A5EE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC208 msgbox Text_18A601, MSGBOX_AUTOCLOSE end @@ -2458,7 +2458,7 @@ EventScript_1AC208:: @ 81AC208 FiveIsland_ResortGorgeous_EventScript_1AC21F:: @ 81AC21F trainerbattle_single TRAINER_LADY_GILLIAN, Text_18A645, Text_18A67F specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC246 msgbox Text_18A699, MSGBOX_AUTOCLOSE end @@ -2471,7 +2471,7 @@ EventScript_1AC246:: @ 81AC246 FiveIsland_ResortGorgeous_EventScript_1AC25D:: @ 81AC25D trainerbattle_single TRAINER_YOUNGSTER_DESTIN, Text_18A6DA, Text_18A6FE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC284 msgbox Text_18A715, MSGBOX_AUTOCLOSE end @@ -2484,7 +2484,7 @@ EventScript_1AC284:: @ 81AC284 FiveIsland_ResortGorgeous_EventScript_1AC29B:: @ 81AC29B trainerbattle_single TRAINER_SWIMMER_MALE_TOBY, Text_18A74A, Text_18A786 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC2C2 msgbox Text_18A7AC, MSGBOX_AUTOCLOSE end @@ -2497,7 +2497,7 @@ EventScript_1AC2C2:: @ 81AC2C2 FiveIsland_WaterLabyrinth_EventScript_1AC2D9:: @ 81AC2D9 trainerbattle_single TRAINER_PKMN_BREEDER_ALIZE, Text_18AAD5, Text_18AB0B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC300 msgbox Text_18AB37, MSGBOX_AUTOCLOSE end @@ -2510,7 +2510,7 @@ EventScript_1AC300:: @ 81AC300 FiveIsland_MemorialPillar_EventScript_1AC317:: @ 81AC317 trainerbattle_single TRAINER_BIRD_KEEPER_MILO, Text_18AE50, Text_18AEA8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC33E msgbox Text_18AEB6, MSGBOX_AUTOCLOSE end @@ -2523,7 +2523,7 @@ EventScript_1AC33E:: @ 81AC33E FiveIsland_MemorialPillar_EventScript_1AC355:: @ 81AC355 trainerbattle_single TRAINER_BIRD_KEEPER_CHAZ, Text_18AEDC, Text_18AF39 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC37C msgbox Text_18AF45, MSGBOX_AUTOCLOSE end @@ -2536,7 +2536,7 @@ EventScript_1AC37C:: @ 81AC37C FiveIsland_MemorialPillar_EventScript_1AC393:: @ 81AC393 trainerbattle_single TRAINER_BIRD_KEEPER_HAROLD, Text_18AF72, Text_18AFCC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC3BA msgbox Text_18AFF2, MSGBOX_AUTOCLOSE end @@ -2549,7 +2549,7 @@ EventScript_1AC3BA:: @ 81AC3BA SixIsland_OutcastIsland_EventScript_1AC3D1:: @ 81AC3D1 trainerbattle_single TRAINER_FISHERMAN_TYLOR, Text_18B400, Text_18B43B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC3F8 msgbox Text_18B451, MSGBOX_AUTOCLOSE end @@ -2562,7 +2562,7 @@ EventScript_1AC3F8:: @ 81AC3F8 SixIsland_OutcastIsland_EventScript_1AC40F:: @ 81AC40F trainerbattle_single TRAINER_SWIMMER_MALE_MYMO, Text_18B48F, Text_18B4C5 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC436 msgbox Text_18B4D1, MSGBOX_AUTOCLOSE end @@ -2575,7 +2575,7 @@ EventScript_1AC436:: @ 81AC436 SixIsland_OutcastIsland_EventScript_1AC44D:: @ 81AC44D trainerbattle_single TRAINER_SWIMMER_FEMALE_NICOLE, Text_18B4FA, Text_18B539 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC474 msgbox Text_18B573, MSGBOX_AUTOCLOSE end @@ -2588,7 +2588,7 @@ EventScript_1AC474:: @ 81AC474 SixIsland_OutcastIsland_EventScript_1AC48B:: @ 81AC48B trainerbattle_double TRAINER_SIS_AND_BRO_AVA_GEB, Text_18B5C8, Text_18B5F4, Text_18B660 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC4B6 msgbox Text_18B62E, MSGBOX_AUTOCLOSE end @@ -2601,7 +2601,7 @@ EventScript_1AC4B6:: @ 81AC4B6 SixIsland_OutcastIsland_EventScript_1AC4D1:: @ 81AC4D1 trainerbattle_double TRAINER_SIS_AND_BRO_AVA_GEB, Text_18B6C1, Text_18B6EF, Text_18B762 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC4FC msgbox Text_18B720, MSGBOX_AUTOCLOSE end @@ -2614,7 +2614,7 @@ EventScript_1AC4FC:: @ 81AC4FC SixIsland_GreenPath_EventScript_1AC517:: @ 81AC517 trainerbattle_single TRAINER_PSYCHIC_JACLYN, Text_18B7B0, Text_18B7F0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC53E msgbox Text_18B7FD, MSGBOX_AUTOCLOSE end @@ -2627,7 +2627,7 @@ EventScript_1AC53E:: @ 81AC53E SixIsland_WaterPath_EventScript_1AC555:: @ 81AC555 trainerbattle_single TRAINER_AROMA_LADY_ROSE, Text_18B896, Text_18B8C8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC57C msgbox Text_18B8F7, MSGBOX_AUTOCLOSE end @@ -2640,7 +2640,7 @@ EventScript_1AC57C:: @ 81AC57C SixIsland_WaterPath_EventScript_1AC593:: @ 81AC593 trainerbattle_single TRAINER_JUGGLER_EDWARD, Text_18B959, Text_18B988 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC5BA msgbox Text_18B9A5, MSGBOX_AUTOCLOSE end @@ -2653,7 +2653,7 @@ EventScript_1AC5BA:: @ 81AC5BA SixIsland_WaterPath_EventScript_1AC5D1:: @ 81AC5D1 trainerbattle_single TRAINER_SWIMMER_MALE_SAMIR, Text_18B9EC, Text_18BA47 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC5F8 msgbox Text_18BA57, MSGBOX_AUTOCLOSE end @@ -2666,7 +2666,7 @@ EventScript_1AC5F8:: @ 81AC5F8 SixIsland_WaterPath_EventScript_1AC60F:: @ 81AC60F trainerbattle_single TRAINER_SWIMMER_FEMALE_DENISE, Text_18BA86, Text_18BAC0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC636 msgbox Text_18BAE0, MSGBOX_AUTOCLOSE end @@ -2679,7 +2679,7 @@ EventScript_1AC636:: @ 81AC636 SixIsland_WaterPath_EventScript_1AC64D:: @ 81AC64D trainerbattle_double TRAINER_TWINS_MIU_MIA, Text_18BBBA, Text_18BBE2, Text_18BC24 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC678 msgbox Text_18BBF6, MSGBOX_AUTOCLOSE end @@ -2692,7 +2692,7 @@ EventScript_1AC678:: @ 81AC678 SixIsland_WaterPath_EventScript_1AC693:: @ 81AC693 trainerbattle_double TRAINER_TWINS_MIU_MIA, Text_18BC5A, Text_18BC84, Text_18BCCF specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC6BE msgbox Text_18BCAE, MSGBOX_AUTOCLOSE end @@ -2705,7 +2705,7 @@ EventScript_1AC6BE:: @ 81AC6BE SixIsland_WaterPath_EventScript_1AC6D9:: @ 81AC6D9 trainerbattle_single TRAINER_HIKER_EARL, Text_18BB2D, Text_18BB62 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC700 msgbox Text_18BB8B, MSGBOX_AUTOCLOSE end @@ -2718,7 +2718,7 @@ EventScript_1AC700:: @ 81AC700 SixIsland_RuinValley_EventScript_1AC717:: @ 81AC717 trainerbattle_single TRAINER_RUIN_MANIAC_STANLY, Text_18BE5D, Text_18BE9B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC73E msgbox Text_18BEA0, MSGBOX_AUTOCLOSE end @@ -2731,7 +2731,7 @@ EventScript_1AC73E:: @ 81AC73E SixIsland_RuinValley_EventScript_1AC755:: @ 81AC755 trainerbattle_single TRAINER_RUIN_MANIAC_FOSTER, Text_18BF05, Text_18BF33 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC77C msgbox Text_18BF6C, MSGBOX_AUTOCLOSE end @@ -2744,7 +2744,7 @@ EventScript_1AC77C:: @ 81AC77C SixIsland_RuinValley_EventScript_1AC793:: @ 81AC793 trainerbattle_single TRAINER_RUIN_MANIAC_LARRY, Text_18BFC5, Text_18C03B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC7BA msgbox Text_18C04C, MSGBOX_AUTOCLOSE end @@ -2757,7 +2757,7 @@ EventScript_1AC7BA:: @ 81AC7BA SixIsland_RuinValley_EventScript_1AC7D1:: @ 81AC7D1 trainerbattle_single TRAINER_HIKER_DARYL, Text_18C09C, Text_18C0BB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC7F8 msgbox Text_18C0EA, MSGBOX_AUTOCLOSE end @@ -2770,7 +2770,7 @@ EventScript_1AC7F8:: @ 81AC7F8 SixIsland_RuinValley_EventScript_1AC80F:: @ 81AC80F trainerbattle_single TRAINER_POKEMANIAC_HECTOR, Text_18C10A, Text_18C140 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC836 msgbox Text_18C17A, MSGBOX_AUTOCLOSE end @@ -2783,7 +2783,7 @@ EventScript_1AC836:: @ 81AC836 SevenIsland_TrainerTower_EventScript_1AC84D:: @ 81AC84D trainerbattle_single TRAINER_PSYCHIC_DARIO, Text_18C1ED, Text_18C205 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC874 msgbox Text_18C20E, MSGBOX_AUTOCLOSE end @@ -2796,7 +2796,7 @@ EventScript_1AC874:: @ 81AC874 SevenIsland_TrainerTower_EventScript_1AC88B:: @ 81AC88B trainerbattle_single TRAINER_PSYCHIC_RODETTE, Text_18C283, Text_18C2BC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC8B2 msgbox Text_18C2D5, MSGBOX_AUTOCLOSE end @@ -2809,7 +2809,7 @@ EventScript_1AC8B2:: @ 81AC8B2 SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9:: @ 81AC8C9 trainerbattle_single TRAINER_AROMA_LADY_MIAH, Text_18C3BC, Text_18C3E7 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC8F0 msgbox Text_18C3FF, MSGBOX_AUTOCLOSE end @@ -2822,7 +2822,7 @@ EventScript_1AC8F0:: @ 81AC8F0 SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907:: @ 81AC907 trainerbattle_double TRAINER_YOUNG_COUPLE_EVE_JON, Text_18C632, Text_18C662, Text_18C6AB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC932 msgbox Text_18C683, MSGBOX_AUTOCLOSE end @@ -2835,7 +2835,7 @@ EventScript_1AC932:: @ 81AC932 SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D:: @ 81AC94D trainerbattle_double TRAINER_YOUNG_COUPLE_EVE_JON, Text_18C700, Text_18C73B, Text_18C7BD specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC978 msgbox Text_18C773, MSGBOX_AUTOCLOSE end @@ -2848,7 +2848,7 @@ EventScript_1AC978:: @ 81AC978 SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993:: @ 81AC993 trainerbattle_single TRAINER_JUGGLER_MASON, Text_18C44B, Text_18C473 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC9BA msgbox Text_18C4BA, MSGBOX_AUTOCLOSE end @@ -2861,7 +2861,7 @@ EventScript_1AC9BA:: @ 81AC9BA SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1:: @ 81AC9D1 trainerbattle_single TRAINER_PKMN_RANGER_NICOLAS, Text_18C500, Text_18C543 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC9F8 msgbox Text_18C54B, MSGBOX_AUTOCLOSE end @@ -2874,7 +2874,7 @@ EventScript_1AC9F8:: @ 81AC9F8 SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F:: @ 81ACA0F trainerbattle_single TRAINER_PKMN_RANGER_MADELINE, Text_18C5AA, Text_18C5CD specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACA36 msgbox Text_18C5F5, MSGBOX_AUTOCLOSE end @@ -2887,7 +2887,7 @@ EventScript_1ACA36:: @ 81ACA36 SevenIsland_SevaultCanyon_EventScript_1ACA4D:: @ 81ACA4D trainerbattle_single TRAINER_CRUSH_GIRL_CYNDY, Text_18C887, Text_18C8A6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACA74 msgbox Text_18C8C2, MSGBOX_AUTOCLOSE end @@ -2900,7 +2900,7 @@ EventScript_1ACA74:: @ 81ACA74 SevenIsland_SevaultCanyon_EventScript_1ACA8B:: @ 81ACA8B trainerbattle_single TRAINER_TAMER_EVAN, Text_18C8FD, Text_18C980 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACAB2 msgbox Text_18C999, MSGBOX_AUTOCLOSE end @@ -2913,7 +2913,7 @@ EventScript_1ACAB2:: @ 81ACAB2 SevenIsland_SevaultCanyon_EventScript_1ACAC9:: @ 81ACAC9 trainerbattle_single TRAINER_PKMN_RANGER_JACKSON, Text_18CA2F, Text_18CA6F specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACAF0 msgbox Text_18CA9C, MSGBOX_AUTOCLOSE end @@ -2926,7 +2926,7 @@ EventScript_1ACAF0:: @ 81ACAF0 SevenIsland_SevaultCanyon_EventScript_1ACB07:: @ 81ACB07 trainerbattle_single TRAINER_PKMN_RANGER_KATELYN, Text_18CB16, Text_18CB3E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACB2E msgbox Text_18CB6C, MSGBOX_AUTOCLOSE end @@ -2939,7 +2939,7 @@ EventScript_1ACB2E:: @ 81ACB2E SevenIsland_SevaultCanyon_EventScript_1ACB45:: @ 81ACB45 trainerbattle_single TRAINER_COOLTRAINER_LEROY, Text_18CBB4, Text_18CBE0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACB6C msgbox Text_18CC09, MSGBOX_AUTOCLOSE end @@ -2952,7 +2952,7 @@ EventScript_1ACB6C:: @ 81ACB6C SevenIsland_SevaultCanyon_EventScript_1ACB83:: @ 81ACB83 trainerbattle_single TRAINER_COOLTRAINER_MICHELLE, Text_18CC4F, Text_18CCAE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACBAA msgbox Text_18CCEA, MSGBOX_AUTOCLOSE end @@ -2965,7 +2965,7 @@ EventScript_1ACBAA:: @ 81ACBAA SevenIsland_SevaultCanyon_EventScript_1ACBC1:: @ 81ACBC1 trainerbattle_double TRAINER_COOL_COUPLE_LEX_NYA, Text_18CD49, Text_18CD75, Text_18CDE2 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACBEC msgbox Text_18CD9C, MSGBOX_AUTOCLOSE end @@ -2978,7 +2978,7 @@ EventScript_1ACBEC:: @ 81ACBEC SevenIsland_SevaultCanyon_EventScript_1ACC07:: @ 81ACC07 trainerbattle_double TRAINER_COOL_COUPLE_LEX_NYA, Text_18CE20, Text_18CE5A, Text_18CEF4 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACC32 msgbox Text_18CE78, MSGBOX_AUTOCLOSE end @@ -2991,7 +2991,7 @@ EventScript_1ACC32:: @ 81ACC32 SevenIsland_TanobyRuins_EventScript_1ACC4D:: @ 81ACC4D trainerbattle_single TRAINER_RUIN_MANIAC_BRANDON, Text_18CFFB, Text_18D02A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACC74 msgbox Text_18D061, MSGBOX_AUTOCLOSE end @@ -3004,7 +3004,7 @@ EventScript_1ACC74:: @ 81ACC74 SevenIsland_TanobyRuins_EventScript_1ACC8B:: @ 81ACC8B trainerbattle_single TRAINER_RUIN_MANIAC_BENJAMIN, Text_18D0D9, Text_18D108 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACCB2 msgbox Text_18D125, MSGBOX_AUTOCLOSE end @@ -3017,7 +3017,7 @@ EventScript_1ACCB2:: @ 81ACCB2 SevenIsland_TanobyRuins_EventScript_1ACCC9:: @ 81ACCC9 trainerbattle_single TRAINER_PAINTER_EDNA, Text_18D18F, Text_18D1B5 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACCF0 msgbox Text_18D1E3, MSGBOX_AUTOCLOSE end @@ -3030,7 +3030,7 @@ EventScript_1ACCF0:: @ 81ACCF0 SevenIsland_TanobyRuins_EventScript_1ACD07:: @ 81ACD07 trainerbattle_single TRAINER_GENTLEMAN_CLIFFORD, Text_18D22F, Text_18D26D specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACD2E msgbox Text_18D284, MSGBOX_AUTOCLOSE end diff --git a/data/text/trainers.inc b/data/text/trainers.inc index 21a96a964..a4184c58e 100644 --- a/data/text/trainers.inc +++ b/data/text/trainers.inc @@ -13,156 +13,156 @@ gUnknown_81C1429:: @ 81C1429 .string "to be ready for battle.\p" .string "Let's wait till later.{PAUSE_UNTIL_PRESS}$" -Text_1C147A:: @ 81C147A +Route3_Text_ColtonRematchIntro:: @ 81C147A .string "Hey!\n" .string "I saw you in VIRIDIAN FOREST!$" -Text_1C149D:: @ 81C149D +Route3_Text_BenRematchIntro:: @ 81C149D .string "Hi! I like shorts!\n" .string "They're comfy and easy to wear!\p" .string "You should be wearing shorts, too!$" -Text_1C14F3:: @ 81C14F3 +Route3_Text_JaniceRematchIntro:: @ 81C14F3 .string "Excuse me!\n" .string "You keep looking at me, don't you?$" -Text_1C1521:: @ 81C1521 +Route3_Text_GregRematchIntro:: @ 81C1521 .string "You're a TRAINER, aren't you?\n" .string "Let's get with it right away!$" -Text_1C155D:: @ 81C155D +Route3_Text_SallyRematchIntro:: @ 81C155D .string "That look you give me…\n" .string "It intrigues me so!$" -Text_1C1588:: @ 81C1588 +Route3_Text_CalvinRematchIntro:: @ 81C1588 .string "Hey! What's wrong with you?\n" .string "You're still not wearing shorts!$" -Text_1C15C5:: @ 81C15C5 +Route3_Text_JamesRematchIntro:: @ 81C15C5 .string "I'll battle you with the POKéMON\n" .string "I started raising.$" -Text_1C15F9:: @ 81C15F9 +Route3_Text_RobinRematchIntro:: @ 81C15F9 .string "Eek!\n" .string "Did you push me?$" -Text_1C160F:: @ 81C160F +Route4_Text_CrissyRematchIntro:: @ 81C160F .string "I always catch mushroom POKéMON\n" .string "on MT. MOON.$" -Text_1C163C:: @ 81C163C +Route6_Text_RickyRematchIntro:: @ 81C163C .string "Oh! You're that nosy kid who\n" .string "eavesdropped on us!$" -Text_1C166D:: @ 81C166D +Route6_Text_NancyRematchIntro:: @ 81C166D .string "Excuse me! Didn't I tell you that\n" .string "this is a private conversation?\p" .string "You shouldn't be listening in,\n" .string "you uncouth person!$" -Text_1C16E2:: @ 81C16E2 +Route6_Text_KeigoRematchIntro:: @ 81C16E2 .string "I'm trying to find something good\n" .string "that's not a BUG POKéMON, but…$" -Text_1C1723:: @ 81C1723 +Route6_Text_JeffRematchIntro:: @ 81C1723 .string "Huh?\n" .string "You want to go with me again?$" -Text_1C1746:: @ 81C1746 +Route6_Text_IsabelleRematchIntro:: @ 81C1746 .string "Me?\n" .string "Well, okay. I'll play this once.$" -Text_1C176B:: @ 81C176B +Route6_Text_ElijahRematchIntro:: @ 81C176B .string "Hey, long time!\n" .string "Have you gotten better?$" -Text_1C1793:: @ 81C1793 +Route8_Text_AidanRematchIntro:: @ 81C1793 .string "You are good at POKéMON, but how\n" .string "is your chemistry grade?$" -Text_1C17CD:: @ 81C17CD +Route8_Text_StanRematchIntro:: @ 81C17CD .string "All right!\n" .string "Let's play another game!$" -Text_1C17F1:: @ 81C17F1 +Route8_Text_GlennRematchIntro:: @ 81C17F1 .string "You need strategy to win at\n" .string "battling.\p" .string "Are you following my advice?$" -Text_1C1834:: @ 81C1834 +Route8_Text_PaigeRematchIntro:: @ 81C1834 .string "I've collected many NIDORAN.\n" .string "I don't want them to evolve, but…$" -Text_1C1873:: @ 81C1873 +Route8_Text_LeslieRematchIntro:: @ 81C1873 .string "School is fun, but I still think\n" .string "POKéMON are fun, too.$" -Text_1C18AA:: @ 81C18AA +Route8_Text_AndreaRematchIntro:: @ 81C18AA .string "MEOWTH and PERSIAN are so cute,\n" .string "meow, meow, meow!$" -Text_1C18DC:: @ 81C18DC +Route8_Text_MeganRematchIntro:: @ 81C18DC .string "We may look silly standing here\n" .string "like this, but I can still battle.$" -Text_1C191F:: @ 81C191F +Route8_Text_RichRematchIntro:: @ 81C191F .string "I'm a rambling, gaming dude!\n" .string "I'm on a winning streak!$" -Text_1C1955:: @ 81C1955 +Route8_Text_JuliaRematchIntro:: @ 81C1955 .string "What's a cute, round, and fluffy\n" .string "POKéMON?\p" .string "You already know, don't you?$" -Text_1C199C:: @ 81C199C +Route8_Text_RicardoRematchIntro:: @ 81C199C .string "My bike's still acting up, man.$" -Text_1C19BC:: @ 81C19BC +Route8_Text_JarenRematchIntro:: @ 81C19BC .string "Okay, kid!\n" .string "Don't expect mercy this time!$" -Text_1C19E5:: @ 81C19E5 +Route8_Text_EliRematchIntro:: @ 81C19E5 .string "ELI: Our twin power became even\n" .string "better!$" -Text_1C1A0D:: @ 81C1A0D +Route8_Text_AnneRematchIntro:: @ 81C1A0D .string "ANNE: Our twin power powered up!$" -Text_1C1A2E:: @ 81C1A2E +Route9_Text_AliciaRematchIntro:: @ 81C1A2E .string "We're to battle again?\n" .string "This time, you're mine!$" -Text_1C1A5D:: @ 81C1A5D +Route9_Text_ChrisRematchIntro:: @ 81C1A5D .string "I haven't forgotten you were with\n" .string "those good-looking POKéMON.$" -Text_1C1A9B:: @ 81C1A9B +Route9_Text_DrewRematchIntro:: @ 81C1A9B .string "I'm taking ROCK TUNNEL to go to\n" .string "LAVENDER…\p" .string "But I keep getting stopped by\n" .string "everyone along the way…$" -Text_1C1AFB:: @ 81C1AFB +Route9_Text_CaitlinRematchIntro:: @ 81C1AFB .string "Don't you dare patronize me today!\n" .string "We're playing for keeps!$" -Text_1C1B37:: @ 81C1B37 +Route9_Text_JeremyRematchIntro:: @ 81C1B37 .string "Bwahaha!\n" .string "Great! I was bored again, eh!$" -Text_1C1B5E:: @ 81C1B5E +Route9_Text_BriceRematchIntro:: @ 81C1B5E .string "Hahaha!\n" .string "A little toughie, as always!$" -Text_1C1B83:: @ 81C1B83 +Route9_Text_BrentRematchIntro:: @ 81C1B83 .string "I got up early every day to train\n" .string "my POKéMON from cocoons!$" -Text_1C1BBE:: @ 81C1BBE +Route9_Text_AlanRematchIntro:: @ 81C1BBE .string "Hahahaha!\n" .string "I'll win this time!$" -Text_1C1BDC:: @ 81C1BDC +Route9_Text_ConnerRematchIntro:: @ 81C1BDC .string "Go win, my super BUG POKéMON!$" Text_1C1BFA:: @ 81C1BFA -- cgit v1.2.3 From 1cfeae9ffa11bb86a214721bb264f26ca8cb7d5a Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 30 Jan 2020 16:46:37 -0500 Subject: Document Routes 10-14 scripts --- data/maps/Route10/map.json | 18 +- data/maps/Route10/scripts.inc | 14 +- data/maps/Route10/text.inc | 42 +- data/maps/Route10_PokemonCenter_1F/map.json | 10 +- data/maps/Route10_PokemonCenter_1F/scripts.inc | 42 +- data/maps/Route10_PokemonCenter_1F/text.inc | 14 +- data/maps/Route11/map.json | 22 +- data/maps/Route11/scripts.inc | 4 +- data/maps/Route11/text.inc | 62 +- data/maps/Route11_EastEntrance_1F/map.json | 4 +- data/maps/Route11_EastEntrance_1F/scripts.inc | 8 +- data/maps/Route11_EastEntrance_1F/text.inc | 7 +- data/maps/Route11_EastEntrance_2F/map.json | 8 +- data/maps/Route11_EastEntrance_2F/scripts.inc | 58 +- data/maps/Route11_EastEntrance_2F/text.inc | 14 +- data/maps/Route12/map.json | 18 +- data/maps/Route12/text.inc | 75 +- data/maps/Route12_FishingHouse/map.json | 4 +- data/maps/Route12_FishingHouse/scripts.inc | 90 +- data/maps/Route12_FishingHouse/text.inc | 30 +- data/maps/Route12_NorthEntrance_1F/map.json | 2 +- data/maps/Route12_NorthEntrance_1F/scripts.inc | 4 +- data/maps/Route12_NorthEntrance_1F/text.inc | 2 +- data/maps/Route12_NorthEntrance_2F/map.json | 6 +- data/maps/Route12_NorthEntrance_2F/scripts.inc | 38 +- data/maps/Route12_NorthEntrance_2F/text.inc | 15 +- data/maps/Route13/map.json | 26 +- data/maps/Route13/scripts.inc | 12 +- data/maps/Route13/text.inc | 100 +-- data/maps/Route14/map.json | 26 +- data/maps/Route14/scripts.inc | 4 +- data/maps/Route14/text.inc | 92 +- data/maps/Route15/text.inc | 63 +- data/maps/Route16/text.inc | 66 +- data/maps/Route17/text.inc | 34 - data/maps/Route19/text.inc | 35 + data/maps/Route20/text.inc | 41 +- data/maps/Route21_North/text.inc | 6 - data/scripts/trainers.inc | 1126 ++++++++++++------------ data/text/trainers.inc | 94 +- 40 files changed, 1168 insertions(+), 1168 deletions(-) (limited to 'data') diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index fef96485a..a7f896695 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route10_EventScript_1A9FE5", + "script": "Route10_EventScript_Carol", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route10_EventScript_1AA09F", + "script": "Route10_EventScript_Clark", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route10_EventScript_1AA061", + "script": "Route10_EventScript_Herman", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route10_EventScript_1AA0DD", + "script": "Route10_EventScript_Trent", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route10_EventScript_1AA023", + "script": "Route10_EventScript_Mark", "flag": "0" }, { @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route10_EventScript_1A9FA7", + "script": "Route10_EventScript_Heidi", "flag": "0" }, { @@ -199,21 +199,21 @@ "x": 15, "y": 59, "elevation": 0, - "script": "Route10_EventScript_167FE4" + "script": "Route10_EventScript_SouthRockTunnelSign" }, { "type": "bg_event_type_0", "x": 6, "y": 42, "elevation": 0, - "script": "Route10_EventScript_167FED" + "script": "Route10_EventScript_PowerPlantSign" }, { "type": "bg_event_type_0", "x": 7, "y": 21, "elevation": 0, - "script": "Route10_EventScript_167FDB" + "script": "Route10_EventScript_NorthRockTunnelSign" }, { "type": "hidden_item", diff --git a/data/maps/Route10/scripts.inc b/data/maps/Route10/scripts.inc index 7fb5d64cd..93694dc8a 100644 --- a/data/maps/Route10/scripts.inc +++ b/data/maps/Route10/scripts.inc @@ -1,17 +1,17 @@ Route10_MapScripts:: @ 8167FD9 .byte 0 -Route10_EventScript_167FDA:: @ 8167FDA +Route10_EventScript_Unused:: @ 8167FDA end -Route10_EventScript_167FDB:: @ 8167FDB - msgbox gUnknown_8184EC5, MSGBOX_SIGN +Route10_EventScript_NorthRockTunnelSign:: @ 8167FDB + msgbox Route10_Text_RockTunnelDetourToLavender, MSGBOX_SIGN end -Route10_EventScript_167FE4:: @ 8167FE4 - msgbox gUnknown_8184EE9, MSGBOX_SIGN +Route10_EventScript_SouthRockTunnelSign:: @ 8167FE4 + msgbox Route10_Text_RockTunnel, MSGBOX_SIGN end -Route10_EventScript_167FED:: @ 8167FED - msgbox gUnknown_8184EF5, MSGBOX_SIGN +Route10_EventScript_PowerPlantSign:: @ 8167FED + msgbox Route10_Text_PowerPlant, MSGBOX_SIGN end diff --git a/data/maps/Route10/text.inc b/data/maps/Route10/text.inc index af45c8923..5a2d48efb 100644 --- a/data/maps/Route10/text.inc +++ b/data/maps/Route10/text.inc @@ -1,86 +1,86 @@ -Text_184B8A:: @ 8184B8A +Route10_Text_MarkIntro:: @ 8184B8A .string "Wow, you came all the way here?\n" .string "Maybe you're a POKéMANIAC, too?\l" .string "Want to see my collection?$" -Text_184BE5:: @ 8184BE5 +Route10_Text_MarkDefeat:: @ 8184BE5 .string "Humph.\n" .string "I'm not angry!$" -Text_184BFB:: @ 8184BFB +Route10_Text_MarkPostBattle:: @ 8184BFB .string "I have more rare POKéMON at home!$" -Text_184C1D:: @ 8184C1D +Route10_Text_ClarkIntro:: @ 8184C1D .string "Ha-hahah-ah-ha!$" -Text_184C2D:: @ 8184C2D +Route10_Text_ClarkDefeat:: @ 8184C2D .string "Ha-haha!\n" .string "Not laughing!\l" .string "Ha-hay fever! Haha-ha-choo!$" -Text_184C60:: @ 8184C60 +Route10_Text_ClarkPostBattle:: @ 8184C60 .string "Haha-ha-choo!\n" .string "Ha-choo!\l" .string "Snort! Snivel!$" -Text_184C86:: @ 8184C86 +Route10_Text_HermanIntro:: @ 8184C86 .string "Hi, kid!\n" .string "Want to see my POKéMON?$" -Text_184CA7:: @ 8184CA7 +Route10_Text_HermanDefeat:: @ 8184CA7 .string "Oh, no!\n" .string "My POKéMON!$" -Text_184CBB:: @ 8184CBB +Route10_Text_HermanPostBattle:: @ 8184CBB .string "I don't like you.\n" .string "I don't like anyone better than me!$" -Text_184CF1:: @ 8184CF1 +Route10_Text_HeidiIntro:: @ 8184CF1 .string "I've been out at a POKéMON GYM\n" .string "a few times.\p" .string "…But I always lose.$" -Text_184D31:: @ 8184D31 +Route10_Text_HeidiDefeat:: @ 8184D31 .string "Ohh!\n" .string "After all my training!$" -Text_184D4D:: @ 8184D4D +Route10_Text_HeidiPostBattle:: @ 8184D4D .string "I noticed some POKéMANIACS\n" .string "prowling around.\p" .string "Can you imagine? Them?\n" .string "Up here in the mountains?$" -Text_184DAA:: @ 8184DAA +Route10_Text_TrentIntro:: @ 8184DAA .string "Ah!\n" .string "This mountain air is delicious!$" -Text_184DCE:: @ 8184DCE +Route10_Text_TrentDefeat:: @ 8184DCE .string "That cleared my head!$" -Text_184DE4:: @ 8184DE4 +Route10_Text_TrentPostBattle:: @ 8184DE4 .string "I feel bloated on mountain air!$" -Text_184E04:: @ 8184E04 +Route10_Text_CarolIntro:: @ 8184E04 .string "I'm feeling a bit faint.\n" .string "I haven't hiked in some time.$" -Text_184E3B:: @ 8184E3B +Route10_Text_CarolDefeat:: @ 8184E3B .string "I'm too tired.\n" .string "I wasn't up for it.$" -Text_184E5E:: @ 8184E5E +Route10_Text_CarolPostBattle:: @ 8184E5E .string "The POKéMON here in the mountains\n" .string "are so chunky…\p" .string "I wish there were pink POKéMON\n" .string "with a floral pattern!$" -gUnknown_8184EC5:: @ 8184EC5 +Route10_Text_RockTunnelDetourToLavender:: @ 8184EC5 .string "ROCK TUNNEL\n" .string "Detour to LAVENDER TOWN$" -gUnknown_8184EE9:: @ 8184EE9 +Route10_Text_RockTunnel:: @ 8184EE9 .string "ROCK TUNNEL$" -gUnknown_8184EF5:: @ 8184EF5 +Route10_Text_PowerPlant:: @ 8184EF5 .string "POWER PLANT$" diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json index dc1543ef0..d089e5544 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_PokemonCenter_1F_EventScript_16FC41", + "script": "Route10_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_PokemonCenter_1F_EventScript_16FC53", + "script": "Route10_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_PokemonCenter_1F_EventScript_16FC4A", + "script": "Route10_PokemonCenter_1F_EventScript_FatMan", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_PokemonCenter_1F_EventScript_16FC5C", + "script": "Route10_PokemonCenter_1F_EventScript_Youngster", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_PokemonCenter_1F_EventScript_16FC65", + "script": "Route10_PokemonCenter_1F_EventScript_Aide", "flag": "0" } ], diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 56e0b448e..a4d477a4b 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -1,3 +1,5 @@ +.equ REQUIRED_OWNED_MONS, 20 + Route10_PokemonCenter_1F_MapScripts:: @ 816FC2F map_script MAP_SCRIPT_ON_TRANSITION, Route10_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume @@ -8,55 +10,55 @@ Route10_PokemonCenter_1F_OnTransition:: @ 816FC3A setrespawn SPAWN_ROUTE10 end -Route10_PokemonCenter_1F_EventScript_16FC41:: @ 816FC41 +Route10_PokemonCenter_1F_EventScript_Nurse:: @ 816FC41 lock faceplayer call EventScript_PkmnCenterNurse release end -Route10_PokemonCenter_1F_EventScript_16FC4A:: @ 816FC4A - msgbox gUnknown_819E59D, MSGBOX_NPC +Route10_PokemonCenter_1F_EventScript_FatMan:: @ 816FC4A + msgbox Route10_PokemonCenter_1F_Text_NuggetUselessSoldFor5000, MSGBOX_NPC end -Route10_PokemonCenter_1F_EventScript_16FC53:: @ 816FC53 - msgbox gUnknown_819E523, MSGBOX_NPC +Route10_PokemonCenter_1F_EventScript_Gentleman:: @ 816FC53 + msgbox Route10_PokemonCenter_1F_Text_EveryTypeStrongerThanOthers, MSGBOX_NPC end -Route10_PokemonCenter_1F_EventScript_16FC5C:: @ 816FC5C - msgbox gUnknown_819E5D2, MSGBOX_NPC +Route10_PokemonCenter_1F_EventScript_Youngster:: @ 816FC5C + msgbox Route10_PokemonCenter_1F_Text_HeardGhostsHauntLavender, MSGBOX_NPC end -Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 +Route10_PokemonCenter_1F_EventScript_Aide:: @ 816FC65 lock faceplayer - call EventScript_16FCF1 - goto_if_set FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE, EventScript_16FCE7 - msgbox gUnknown_819E5FB, MSGBOX_YESNO + call Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo + goto_if_set FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE, Route10_PokemonCenter_1F_EventScript_AlreadyGotEverstone + msgbox Route10_PokemonCenter_1F_Text_GiveEverstoneIfCaught20Mons, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq Aide_EventScript_DeclineCheckMons setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 - call EventScript_16FCF1 - compare VAR_0x8006, 20 + call Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo + compare VAR_0x8006, REQUIRED_OWNED_MONS goto_if_lt Aide_EventScript_HaventCaughtEnough - msgbox gUnknown_819E733 + msgbox Route10_PokemonCenter_1F_Text_GreatHereYouGo checkitemspace ITEM_EVERSTONE, 1 compare VAR_RESULT, FALSE goto_if_eq Aide_EventScript_NoRoomForItem - giveitem_msg gUnknown_819E786, ITEM_EVERSTONE + giveitem_msg Route10_PokemonCenter_1F_Text_ReceivedEverstoneFromAide, ITEM_EVERSTONE setflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE - msgbox gUnknown_819E7AF + msgbox Route10_PokemonCenter_1F_Text_ExplainEverstone release end -EventScript_16FCE7:: @ 816FCE7 - msgbox gUnknown_819E7AF +Route10_PokemonCenter_1F_EventScript_AlreadyGotEverstone:: @ 816FCE7 + msgbox Route10_PokemonCenter_1F_Text_ExplainEverstone release end -EventScript_16FCF1:: @ 816FCF1 - getnumberstring 0, 20 +Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo:: @ 816FCF1 + getnumberstring 0, REQUIRED_OWNED_MONS getitemname 1, ITEM_EVERSTONE return diff --git a/data/maps/Route10_PokemonCenter_1F/text.inc b/data/maps/Route10_PokemonCenter_1F/text.inc index 3360854fe..7c63407ae 100644 --- a/data/maps/Route10_PokemonCenter_1F/text.inc +++ b/data/maps/Route10_PokemonCenter_1F/text.inc @@ -1,18 +1,18 @@ -gUnknown_819E523:: @ 819E523 +Route10_PokemonCenter_1F_Text_EveryTypeStrongerThanOthers:: @ 819E523 .string "The types of POKéMON match up\n" .string "differently with each other.\p" .string "Every type is stronger than some\n" .string "types and weaker than others.$" -gUnknown_819E59D:: @ 819E59D +Route10_PokemonCenter_1F_Text_NuggetUselessSoldFor5000:: @ 819E59D .string "A NUGGET is totally useless.\n" .string "So I sold it for ¥5000.$" -gUnknown_819E5D2:: @ 819E5D2 +Route10_PokemonCenter_1F_Text_HeardGhostsHauntLavender:: @ 819E5D2 .string "I heard that ghosts haunt\n" .string "LAVENDER TOWN.$" -gUnknown_819E5FB:: @ 819E5FB +Route10_PokemonCenter_1F_Text_GiveEverstoneIfCaught20Mons:: @ 819E5FB .string "Oh… {PLAYER}!\n" .string "I've been looking for you!\p" .string "It's me, one of the ever-present\n" @@ -26,17 +26,17 @@ gUnknown_819E5FB:: @ 819E5FB .string "Have you gathered data on at least\n" .string "twenty kinds of POKéMON?$" -gUnknown_819E733:: @ 819E733 +Route10_PokemonCenter_1F_Text_GreatHereYouGo:: @ 819E733 .string "Great! You have caught or owned\n" .string "{STR_VAR_3} kinds of POKéMON!\p" .string "Congratulations!\n" .string "Here you go!$" -gUnknown_819E786:: @ 819E786 +Route10_PokemonCenter_1F_Text_ReceivedEverstoneFromAide:: @ 819E786 .string "{PLAYER} received the EVERSTONE\n" .string "from the AIDE.$" -gUnknown_819E7AF:: @ 819E7AF +Route10_PokemonCenter_1F_Text_ExplainEverstone:: @ 819E7AF .string "Making POKéMON evolve certainly\n" .string "can add to the POKéDEX.\p" .string "However, at times, you may not\n" diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json index 7cdaa105b..eeab00960 100644 --- a/data/maps/Route11/map.json +++ b/data/maps/Route11/map.json @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route11_EventScript_1A9B0D", + "script": "Route11_EventScript_Eddie", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route11_EventScript_1A9C81", + "script": "Route11_EventScript_Hugo", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route11_EventScript_1A9B4B", + "script": "Route11_EventScript_Dillon", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 4, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route11_EventScript_1A9BC7", + "script": "Route11_EventScript_Dave", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route11_EventScript_1A9CBF", + "script": "Route11_EventScript_Jasper", "flag": "0" }, { @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route11_EventScript_1A9D3B", + "script": "Route11_EventScript_Darian", "flag": "0" }, { @@ -112,7 +112,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route11_EventScript_1A9C05", + "script": "Route11_EventScript_Braxton", "flag": "0" }, { @@ -125,7 +125,7 @@ "movement_range_y": 4, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route11_EventScript_1A9B89", + "script": "Route11_EventScript_Yasu", "flag": "0" }, { @@ -138,7 +138,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route11_EventScript_1A9CFD", + "script": "Route11_EventScript_Dirk", "flag": "0" }, { @@ -151,7 +151,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "Route11_EventScript_1A9C43", + "script": "Route11_EventScript_Bernie", "flag": "0" }, { @@ -224,7 +224,7 @@ "x": 3, "y": 7, "elevation": 3, - "script": "Route11_EventScript_167FF7" + "script": "Route11_EventScript_DiglettsCaveSign" }, { "type": "hidden_item", diff --git a/data/maps/Route11/scripts.inc b/data/maps/Route11/scripts.inc index 11f052030..821b8256f 100644 --- a/data/maps/Route11/scripts.inc +++ b/data/maps/Route11/scripts.inc @@ -1,6 +1,6 @@ Route11_MapScripts:: @ 8167FF6 .byte 0 -Route11_EventScript_167FF7:: @ 8167FF7 - msgbox gUnknown_8185308, MSGBOX_SIGN +Route11_EventScript_DiglettsCaveSign:: @ 8167FF7 + msgbox Route11_Text_DiglettsCave, MSGBOX_SIGN end diff --git a/data/maps/Route11/text.inc b/data/maps/Route11/text.inc index 19515d010..2f7c7fc6d 100644 --- a/data/maps/Route11/text.inc +++ b/data/maps/Route11/text.inc @@ -1,113 +1,113 @@ -Text_184F01:: @ 8184F01 +Route11_Text_HugoIntro:: @ 8184F01 .string "Win, lose, or draw!$" -Text_184F15:: @ 8184F15 +Route11_Text_HugoDefeat:: @ 8184F15 .string "Atcha!\n" .string "Didn't go my way!$" -Text_184F2E:: @ 8184F2E +Route11_Text_HugoPostBattle:: @ 8184F2E .string "POKéMON is life!\n" .string "And to live is to play games!$" -Text_184F5D:: @ 8184F5D +Route11_Text_JasperIntro:: @ 8184F5D .string "Competition!\n" .string "I can't get enough!$" -Text_184F7E:: @ 8184F7E +Route11_Text_JasperDefeat:: @ 8184F7E .string "I had a chance!$" -Text_184F8E:: @ 8184F8E +Route11_Text_JasperPostBattle:: @ 8184F8E .string "You can't be a coward in the world\n" .string "of POKéMON!$" -Text_184FBD:: @ 8184FBD +Route11_Text_EddieIntro:: @ 8184FBD .string "Let's go, but don't cheat!$" -Text_184FD8:: @ 8184FD8 +Route11_Text_EddieDefeat:: @ 8184FD8 .string "Huh?\n" .string "That's not right!$" -Text_184FEF:: @ 8184FEF +Route11_Text_EddiePostBattle:: @ 8184FEF .string "I did my best.\n" .string "I have no regrets.$" -Text_185011:: @ 8185011 +Route11_Text_BraxtonIntro:: @ 8185011 .string "Careful!\n" .string "I'm laying down some cables!$" -Text_185037:: @ 8185037 +Route11_Text_BraxtonDefeat:: @ 8185037 .string "That was electric!$" -Text_18504A:: @ 818504A +Route11_Text_BraxtonPostBattle:: @ 818504A .string "Spread the word to save energy!$" -Text_18506A:: @ 818506A +Route11_Text_DillonIntro:: @ 818506A .string "I just became a TRAINER.\n" .string "But, I think I can win.$" -Text_18509B:: @ 818509B +Route11_Text_DillonDefeat:: @ 818509B .string "My POKéMON couldn't win…\n" .string "Haven't they grown enough?$" -Text_1850CF:: @ 81850CF +Route11_Text_DillonPostBattle:: @ 81850CF .string "What now?\n" .string "Leave me alone!$" -Text_1850E9:: @ 81850E9 +Route11_Text_DirkIntro:: @ 81850E9 .string "Fwahaha!\n" .string "I have never lost!$" -Text_185105:: @ 8185105 +Route11_Text_DirkDefeat:: @ 8185105 .string "My first loss!$" -Text_185114:: @ 8185114 +Route11_Text_DirkPostBattle:: @ 8185114 .string "You were just lucky, that's all.$" -Text_185135:: @ 8185135 +Route11_Text_DarianIntro:: @ 8185135 .string "I have never won before…$" -Text_18514E:: @ 818514E +Route11_Text_DarianDefeat:: @ 818514E .string "I saw this coming…$" -Text_185161:: @ 8185161 +Route11_Text_DarianPostBattle:: @ 8185161 .string "I was unlucky, as always.$" -Text_18517B:: @ 818517B +Route11_Text_YasuIntro:: @ 818517B .string "I'm the best in my class.\n" .string "I train every morning.$" -Text_1851AC:: @ 81851AC +Route11_Text_YasuDefeat:: @ 81851AC .string "Darn!\n" .string "My POKéMON need to be stronger!$" -Text_1851D2:: @ 81851D2 +Route11_Text_YasuPostBattle:: @ 81851D2 .string "There's a fat POKéMON that comes\n" .string "down from the mountains.\p" .string "I bet it'd be strong if you can\n" .string "catch it.$" -Text_185236:: @ 8185236 +Route11_Text_BernieIntro:: @ 8185236 .string "Watch out for live wires!$" -Text_185250:: @ 8185250 +Route11_Text_BernieDefeat:: @ 8185250 .string "Whoa!\n" .string "You spark plug!$" -Text_185266:: @ 8185266 +Route11_Text_BerniePostBattle:: @ 8185266 .string "Well, better get back to work.$" -Text_185285:: @ 8185285 +Route11_Text_DaveIntro:: @ 8185285 .string "I raised my POKéMON carefully.\n" .string "They should be ready by now!$" -Text_1852C1:: @ 81852C1 +Route11_Text_DaveDefeat:: @ 81852C1 .string "Bye-bye!\n" .string "Thank you, and good-bye!$" -Text_1852E3:: @ 81852E3 +Route11_Text_DavePostBattle:: @ 81852E3 .string "Tch…\n" .string "I better go find stronger ones!$" -gUnknown_8185308:: @ 8185308 +Route11_Text_DiglettsCave:: @ 8185308 .string "DIGLETT'S CAVE$" diff --git a/data/maps/Route11_EastEntrance_1F/map.json b/data/maps/Route11_EastEntrance_1F/map.json index 21d3b454f..bce3d1114 100644 --- a/data/maps/Route11_EastEntrance_1F/map.json +++ b/data/maps/Route11_EastEntrance_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route11_EastEntrance_1F_EventScript_16FD22", + "script": "Route11_EastEntrance_1F_EventScript_TopGuard", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route11_EastEntrance_1F_EventScript_16FD2B", + "script": "Route11_EastEntrance_1F_EventScript_BottomGuard", "flag": "0" } ], diff --git a/data/maps/Route11_EastEntrance_1F/scripts.inc b/data/maps/Route11_EastEntrance_1F/scripts.inc index 0a2f2cb75..e8097b62a 100644 --- a/data/maps/Route11_EastEntrance_1F/scripts.inc +++ b/data/maps/Route11_EastEntrance_1F/scripts.inc @@ -1,10 +1,10 @@ Route11_EastEntrance_1F_MapScripts:: @ 816FD21 .byte 0 -Route11_EastEntrance_1F_EventScript_16FD22:: @ 816FD22 - msgbox gUnknown_819E8A6, MSGBOX_NPC +Route11_EastEntrance_1F_EventScript_TopGuard:: @ 816FD22 + msgbox Route11_EastEntrance_1F_Text_ManInLavenderRatesNames, MSGBOX_NPC end -Route11_EastEntrance_1F_EventScript_16FD2B:: @ 816FD2B - msgbox gUnknown_819E97B, MSGBOX_NPC +Route11_EastEntrance_1F_EventScript_BottomGuard:: @ 816FD2B + msgbox Route11_EastEntrance_1F_Text_RockTunnelToReachLavender, MSGBOX_NPC end diff --git a/data/maps/Route11_EastEntrance_1F/text.inc b/data/maps/Route11_EastEntrance_1F/text.inc index 335e7e3e9..de5965bcf 100644 --- a/data/maps/Route11_EastEntrance_1F/text.inc +++ b/data/maps/Route11_EastEntrance_1F/text.inc @@ -1,8 +1,9 @@ -Text_19E890:: @ 819E890 +@ Unclear where this is originally from +Route11_EastEntrance_1F_Text_BagIsFull:: @ 819E890 .string "{PLAYER}{KUN}の　バッグ\n" .string "いっぱい　みたい　だね$" -gUnknown_819E8A6:: @ 819E8A6 +Route11_EastEntrance_1F_Text_ManInLavenderRatesNames:: @ 819E8A6 .string "Don't you think it's hard to think\n" .string "up good names for POKéMON?\p" .string "Especially if you've caught a\n" @@ -12,7 +13,7 @@ gUnknown_819E8A6:: @ 819E8A6 .string "He can even help you rename your\n" .string "POKéMON, too.$" -gUnknown_819E97B:: @ 819E97B +Route11_EastEntrance_1F_Text_RockTunnelToReachLavender:: @ 819E97B .string "If you're aiming to reach LAVENDER\n" .string "TOWN, take ROCK TUNNEL.\p" .string "You can get to ROCK TUNNEL from\n" diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json index d7c8f1f5b..b384b9655 100644 --- a/data/maps/Route11_EastEntrance_2F/map.json +++ b/data/maps/Route11_EastEntrance_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route11_EastEntrance_2F_EventScript_16FD5C", + "script": "Route11_EastEntrance_2F_EventScript_Turner", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route11_EastEntrance_2F_EventScript_16FDD8", + "script": "Route11_EastEntrance_2F_EventScript_Aide", "flag": "0" } ], @@ -56,14 +56,14 @@ "x": 4, "y": 1, "elevation": 0, - "script": "Route11_EastEntrance_2F_EventScript_16FD35" + "script": "Route11_EastEntrance_2F_EventScript_LeftBinoculars" }, { "type": "bg_event_type_0", "x": 8, "y": 1, "elevation": 0, - "script": "Route11_EastEntrance_2F_EventScript_16FD53" + "script": "Route11_EastEntrance_2F_EventScript_RightBinoculars" } ] } diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index 91a6d20bd..b8b6be3e7 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -1,89 +1,91 @@ +.equ REQUIRED_CAUGHT_MONS, 30 + Route11_EastEntrance_2F_MapScripts:: @ 816FD34 .byte 0 -Route11_EastEntrance_2F_EventScript_16FD35:: @ 816FD35 +Route11_EastEntrance_2F_EventScript_LeftBinoculars:: @ 816FD35 lockall - goto_if_set FLAG_WOKE_UP_ROUTE_12_SNORLAX, EventScript_16FD49 - msgbox gUnknown_819EC8A + goto_if_set FLAG_WOKE_UP_ROUTE_12_SNORLAX, Route11_EastEntrance_2F_EventScript_LeftBinocularsSnorlaxGone + msgbox Route11_EastEntrance_2F_Text_BigMonAsleepOnRoad releaseall end -EventScript_16FD49:: @ 816FD49 - msgbox gUnknown_819ECD9 +Route11_EastEntrance_2F_EventScript_LeftBinocularsSnorlaxGone:: @ 816FD49 + msgbox Route11_EastEntrance_2F_Text_WhatABreathtakingView releaseall end -Route11_EastEntrance_2F_EventScript_16FD53:: @ 816FD53 - msgbox gUnknown_819ED1F, MSGBOX_SIGN +Route11_EastEntrance_2F_EventScript_RightBinoculars:: @ 816FD53 + msgbox Route11_EastEntrance_2F_Text_RockTunnelGoodRouteToLavender, MSGBOX_SIGN end -Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C +Route11_EastEntrance_2F_EventScript_Turner:: @ 816FD5C lock faceplayer setvar VAR_0x8008, INGAME_TRADE_NIDORINOA call EventScript_GetInGameTradeSpeciesInfo - goto_if_set FLAG_DID_NINA_TRADE, EventScript_16FDCE + goto_if_set FLAG_DID_NINA_TRADE, Route11_EastEntrance_2F_EventScript_AlreadyTraded msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16FDB6 + goto_if_eq Route11_EastEntrance_2F_EventScript_DeclineTrade call EventScript_ChooseMonForInGameTrade compare VAR_0x8004, PARTY_SIZE - goto_if_ge EventScript_16FDB6 + goto_if_ge Route11_EastEntrance_2F_EventScript_DeclineTrade call EventScript_GetInGameTradeSpecies compare VAR_RESULT, VAR_0x8009 - goto_if_ne EventScript_16FDC0 + goto_if_ne Route11_EastEntrance_2F_EventScript_NotRequestedMon call EventScript_DoInGameTrade msgbox Trade_Text_HeyThanks setflag FLAG_DID_NINA_TRADE release end -EventScript_16FDB6:: @ 816FDB6 +Route11_EastEntrance_2F_EventScript_DeclineTrade:: @ 816FDB6 msgbox Trade_Text_AwwOhWell release end -EventScript_16FDC0:: @ 816FDC0 +Route11_EastEntrance_2F_EventScript_NotRequestedMon:: @ 816FDC0 getspeciesname 0, VAR_0x8009 msgbox Trade_Text_WhatThatsNoMon release end -EventScript_16FDCE:: @ 816FDCE +Route11_EastEntrance_2F_EventScript_AlreadyTraded:: @ 816FDCE msgbox Trade_Text_IsntMyOldMonGreat release end -Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 +Route11_EastEntrance_2F_EventScript_Aide:: @ 816FDD8 lock faceplayer - call EventScript_16FE64 - goto_if_set FLAG_GOT_ITEMFINDER, EventScript_16FE5A - msgbox gUnknown_819E9E5, MSGBOX_YESNO + call Route11_EastEntrance_2F_EventScript_GetAideRequestInfo + goto_if_set FLAG_GOT_ITEMFINDER, Route11_EastEntrance_2F_EventScript_AlreadyGotItemfinder + msgbox Route11_EastEntrance_2F_Text_GiveItemfinderIfCaught30, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq Aide_EventScript_DeclineCheckMons setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 - call EventScript_16FE64 - compare VAR_0x8006, 30 + call Route11_EastEntrance_2F_EventScript_GetAideRequestInfo + compare VAR_0x8006, REQUIRED_CAUGHT_MONS goto_if_lt Aide_EventScript_HaventCaughtEnough - msgbox gUnknown_819EAE4 + msgbox Route11_EastEntrance_2F_Text_GreatHereYouGo checkitemspace ITEM_ITEMFINDER, 1 compare VAR_RESULT, FALSE goto_if_eq Aide_EventScript_NoRoomForItem - giveitem_msg gUnknown_819EB37, ITEM_ITEMFINDER + giveitem_msg Route11_EastEntrance_2F_Text_ReceivedItemfinderFromAide, ITEM_ITEMFINDER setflag FLAG_GOT_ITEMFINDER - msgbox gUnknown_819EB59 + msgbox Route11_EastEntrance_2F_Text_ExplainItemfinder release end -EventScript_16FE5A:: @ 816FE5A - msgbox gUnknown_819EB59 +Route11_EastEntrance_2F_EventScript_AlreadyGotItemfinder:: @ 816FE5A + msgbox Route11_EastEntrance_2F_Text_ExplainItemfinder release end -EventScript_16FE64:: @ 816FE64 - getnumberstring 0, 30 +Route11_EastEntrance_2F_EventScript_GetAideRequestInfo:: @ 816FE64 + getnumberstring 0, REQUIRED_CAUGHT_MONS getitemname 1, ITEM_ITEMFINDER return diff --git a/data/maps/Route11_EastEntrance_2F/text.inc b/data/maps/Route11_EastEntrance_2F/text.inc index aa693a495..66e871199 100644 --- a/data/maps/Route11_EastEntrance_2F/text.inc +++ b/data/maps/Route11_EastEntrance_2F/text.inc @@ -1,4 +1,4 @@ -gUnknown_819E9E5:: @ 819E9E5 +Route11_EastEntrance_2F_Text_GiveItemfinderIfCaught30:: @ 819E9E5 .string "Hi! Remember me?\n" .string "I'm one of PROF. OAK's AIDES.\p" .string "If your POKéDEX has complete data\n" @@ -10,17 +10,17 @@ gUnknown_819E9E5:: @ 819E9E5 .string "Have you gathered data on at least\n" .string "{STR_VAR_1} kinds of POKéMON?$" -gUnknown_819EAE4:: @ 819EAE4 +Route11_EastEntrance_2F_Text_GreatHereYouGo:: @ 819EAE4 .string "Great! You have caught or owned\n" .string "{STR_VAR_3} kinds of POKéMON!\p" .string "Congratulations!\n" .string "Here you go!$" -gUnknown_819EB37:: @ 819EB37 +Route11_EastEntrance_2F_Text_ReceivedItemfinderFromAide:: @ 819EB37 .string "{PLAYER} received the {STR_VAR_2}\n" .string "from the AIDE.$" -gUnknown_819EB59:: @ 819EB59 +Route11_EastEntrance_2F_Text_ExplainItemfinder:: @ 819EB59 .string "There are items on the ground that\n" .string "may be hidden from view.\p" .string "Use the ITEMFINDER to detect any\n" @@ -32,17 +32,17 @@ gUnknown_819EB59:: @ 819EB59 .string "Use it to get your bearings, then\n" .string "search the suspect area by hand.$" -gUnknown_819EC8A:: @ 819EC8A +Route11_EastEntrance_2F_Text_BigMonAsleepOnRoad:: @ 819EC8A .string "Let's see what the binoculars have\n" .string "to show…\p" .string "A big POKéMON is asleep on a road!$" -gUnknown_819ECD9:: @ 819ECD9 +Route11_EastEntrance_2F_Text_WhatABreathtakingView:: @ 819ECD9 .string "Let's see what the binoculars have\n" .string "to show…\p" .string "What a breathtaking view!$" -gUnknown_819ED1F:: @ 819ED1F +Route11_EastEntrance_2F_Text_RockTunnelGoodRouteToLavender:: @ 819ED1F .string "Let's see what the binoculars have\n" .string "to show…\p" .string "To get to LAVENDER TOWN from\n" diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index 09e49160b..9eae7ca01 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -39,7 +39,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route12_EventScript_1AA451", + "script": "Route12_EventScript_Ned", "flag": "0" }, { @@ -52,7 +52,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route12_EventScript_1AA48F", + "script": "Route12_EventScript_Chip", "flag": "0" }, { @@ -65,7 +65,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route12_EventScript_1AA4CD", + "script": "Route12_EventScript_Hank", "flag": "0" }, { @@ -78,7 +78,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route12_EventScript_1AA50B", + "script": "Route12_EventScript_Elliot", "flag": "0" }, { @@ -104,7 +104,7 @@ "movement_range_y": 4, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route12_EventScript_1AA587", + "script": "Route12_EventScript_Luca", "flag": "0" }, { @@ -117,7 +117,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route12_EventScript_1AA5C5", + "script": "Route12_EventScript_Justin", "flag": "0" }, { @@ -130,7 +130,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route12_EventScript_1AA549", + "script": "Route12_EventScript_Andrew", "flag": "0" }, { @@ -182,7 +182,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "Route12_EventScript_1AA649", + "script": "Route12_EventScript_Gia", "flag": "0" }, { @@ -195,7 +195,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "Route12_EventScript_1AA603", + "script": "Route12_EventScript_Jes", "flag": "0" }, { diff --git a/data/maps/Route12/text.inc b/data/maps/Route12/text.inc index 06371bf5c..9c984cc47 100644 --- a/data/maps/Route12/text.inc +++ b/data/maps/Route12/text.inc @@ -17,87 +17,87 @@ Text_WantToUsePokeFlute:: @ 81853CC Text_PlayedPokeFlute:: @ 81853E8 .string "{PLAYER} played the POKé FLUTE.$" -Text_185402:: @ 8185402 +Route12_Text_NedIntro:: @ 8185402 .string "Yeah!\n" .string "I got a bite here!$" -Text_18541B:: @ 818541B +Route12_Text_NedDefeat:: @ 818541B .string "Tch!\n" .string "Just a small fry…$" -Text_185432:: @ 8185432 +Route12_Text_NedPostBattle:: @ 8185432 .string "Hang on!\n" .string "My line's snagged!$" -Text_18544E:: @ 818544E +Route12_Text_ChipIntro:: @ 818544E .string "Be patient.\n" .string "Fishing is a waiting game.$" -Text_185475:: @ 8185475 +Route12_Text_ChipDefeat:: @ 8185475 .string "That one got away!$" -Text_185488:: @ 8185488 +Route12_Text_ChipPostBattle:: @ 8185488 .string "With a better ROD, I could catch\n" .string "better POKéMON…$" -Text_1854B9:: @ 81854B9 +Route12_Text_JustinIntro:: @ 81854B9 .string "I'm searching for a MOON STONE.\n" .string "Have you found one?$" -Text_1854ED:: @ 81854ED +Route12_Text_JustinDefeat:: @ 81854ED .string "Oww!$" -Text_1854F2:: @ 81854F2 +Route12_Text_JustinPostBattle:: @ 81854F2 .string "I could have made my POKéMON\n" .string "evolve with a MOON STONE.\p" .string "I would have won then, I bet.$" -Text_185547:: @ 8185547 +Route12_Text_LucaIntro:: @ 8185547 .string "Electricity is my specialty.\p" .string "I don't know a thing about POKéMON\n" .string "of the sea, though.$" -Text_18559B:: @ 818559B +Route12_Text_LucaDefeat:: @ 818559B .string "Unplugged!$" -Text_1855A6:: @ 81855A6 +Route12_Text_LucaPostBattle:: @ 81855A6 .string "Water conducts electricity, so you\n" .string "should zap sea POKéMON.$" -Text_1855E1:: @ 81855E1 +Route12_Text_HankIntro:: @ 81855E1 .string "The FISHING FOOL versus POKéMON\n" .string "KID!$" -Text_185606:: @ 8185606 +Route12_Text_HankDefeat:: @ 8185606 .string "Touch too much!$" -Text_185616:: @ 8185616 +Route12_Text_HankPostBattle:: @ 8185616 .string "I guess you get to be good at\n" .string "what you like.\p" .string "Well, you beat me at POKéMON,\n" .string "but you can't top me at fishing.$" -Text_185682:: @ 8185682 +Route12_Text_ElliotIntro:: @ 8185682 .string "I love fishing, don't get me wrong.\p" .string "But it'd be best if I also had more\n" .string "work.$" -Text_1856D0:: @ 81856D0 +Route12_Text_ElliotDefeat:: @ 81856D0 .string "It's not easy…$" -Text_1856DF:: @ 81856DF +Route12_Text_ElliotPostBattle:: @ 81856DF .string "It's all right.\n" .string "Losing doesn't bug me anymore.$" -Text_18570E:: @ 818570E +Route12_Text_AndrewIntro:: @ 818570E .string "What's catching?\p" .string "You never know what you could\n" .string "catch!$" -Text_185744:: @ 8185744 +Route12_Text_AndrewDefeat:: @ 8185744 .string "Lost it!$" -Text_18574D:: @ 818574D +Route12_Text_AndrewPostBattle:: @ 818574D .string "What, MAGIKARP?\p" .string "I catch them all the time, sure.\n" .string "But, boy are they wimpy.$" @@ -109,3 +109,36 @@ Route12_Text_RouteSign:: @ 8185797 Route12_Text_SportfishingArea:: @ 81857B3 .string "SPORTFISHING AREA$" +Route12_Text_JesIntro:: @ 81857C5 + .string "JES: If I win, I'm going to\n" + .string "propose to GIA.$" + +Route12_Text_JesDefeat:: @ 81857F1 + .string "JES: Oh, please, why couldn't you\n" + .string "let us win?$" + +Route12_Text_JesPostBattle:: @ 818581F + .string "JES: Oh, GIA, forgive me,\n" + .string "my love!$" + +Route12_Text_JesNotEnoughMons:: @ 8185842 + .string "JES: GIA and I, we'll be\n" + .string "together forever.\p" + .string "We won't battle unless you have\n" + .string "two POKéMON of your own.$" + +Route12_Text_GiaIntro:: @ 81858A6 + .string "GIA: Hey, JES…\p" + .string "If we win, I'll marry you!$" + +Route12_Text_GiaDefeat:: @ 81858D0 + .string "GIA: Oh, but why?$" + +Route12_Text_GiaPostBattle:: @ 81858E2 + .string "GIA: JES, you silly!\n" + .string "You ruined this!$" + +Route12_Text_GiaNotEnoughMons:: @ 8185908 + .string "GIA: I can't bear to battle\n" + .string "without my JES!\p" + .string "Don't you have one more POKéMON?$" diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json index fabd77a97..9000a0de5 100644 --- a/data/maps/Route12_FishingHouse/map.json +++ b/data/maps/Route12_FishingHouse/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route12_FishingHouse_EventScript_16FF0C", + "script": "Route12_FishingHouse_EventScript_FishingGuruBrother", "flag": "0" } ], @@ -57,7 +57,7 @@ "x": 9, "y": 1, "elevation": 0, - "script": "Route12_FishingHouse_EventScript_170067" + "script": "Route12_FishingHouse_EventScript_MagikarpRecordSign" } ] } diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index e1cd920d7..4b8386a86 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -1,110 +1,110 @@ Route12_FishingHouse_MapScripts:: @ 816FF0B .byte 0 -Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C +Route12_FishingHouse_EventScript_FishingGuruBrother:: @ 816FF0C lock faceplayer - goto_if_set FLAG_GOT_SUPER_ROD, EventScript_16FF7F - msgbox gUnknown_819EFE0, MSGBOX_YESNO + goto_if_set FLAG_GOT_SUPER_ROD, Route12_FishingHouse_EventScript_CheckMagikarpRecord + msgbox Route12_FishingHouse_Text_DoYouLikeToFish, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_16FF34 - msgbox gUnknown_819F1FA + goto_if_eq Route12_FishingHouse_EventScript_GiveSuperRod + msgbox Route12_FishingHouse_Text_OhThatsDisappointing release end -EventScript_16FF34:: @ 816FF34 +Route12_FishingHouse_EventScript_GiveSuperRod:: @ 816FF34 checkitemspace ITEM_SUPER_ROD, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16FF75 + goto_if_eq Route12_FishingHouse_EventScript_NoRoomForSuperRod additem ITEM_SUPER_ROD - msgbox gUnknown_819F05B - msgreceiveditem gUnknown_819F0B2, ITEM_SUPER_ROD + msgbox Route12_FishingHouse_Text_TakeThisAndFish + msgreceiveditem Route12_FishingHouse_Text_ReceivedSuperRod, ITEM_SUPER_ROD setflag FLAG_GOT_SUPER_ROD - msgbox gUnknown_819F0EB + msgbox Route12_FishingHouse_Text_IfYouCatchBigMagikarpShowMe release end -EventScript_16FF75:: @ 816FF75 - msgbox gUnknown_819F494 +Route12_FishingHouse_EventScript_NoRoomForSuperRod:: @ 816FF75 + msgbox Route12_FishingHouse_Text_NoRoomForGift release end -EventScript_16FF7F:: @ 816FF7F +Route12_FishingHouse_EventScript_CheckMagikarpRecord:: @ 816FF7F goto_if_questlog EventScript_ReleaseEnd special sub_8112364 setvar VAR_0x8004, SPECIES_MAGIKARP specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies - compare VAR_RESULT, 0 - goto_if_eq EventScript_16FFF5 + compare VAR_RESULT, FALSE + goto_if_eq Route12_FishingHouse_EventScript_NoMagikarpInParty special GetMagikarpSizeRecordInfo - msgbox gUnknown_819F2DB + msgbox Route12_FishingHouse_Text_OhMagikarpAllowMeToSee special Special_ChooseMonFromParty waitstate copyvar VAR_RESULT, VAR_0x8004 - compare VAR_RESULT, 6 - goto_if_ge EventScript_16FFFF + compare VAR_RESULT, PARTY_SIZE + goto_if_ge Route12_FishingHouse_EventScript_CancelShowMon special CompareMagikarpSize compare VAR_RESULT, 1 - goto_if_eq EventScript_170001 + goto_if_eq Route12_FishingHouse_EventScript_NotMagikarp compare VAR_RESULT, 2 - goto_if_eq EventScript_17000B + goto_if_eq Route12_FishingHouse_EventScript_NotRecordMagikarp compare VAR_RESULT, 3 - goto_if_eq EventScript_170031 + goto_if_eq Route12_FishingHouse_EventScript_NewRecordMagikarp compare VAR_RESULT, 4 - goto_if_eq EventScript_17001E + goto_if_eq Route12_FishingHouse_EventScript_TieRecordMagikarp release end -EventScript_16FFF5:: @ 816FFF5 - msgbox gUnknown_819F217 +Route12_FishingHouse_EventScript_NoMagikarpInParty:: @ 816FFF5 + msgbox Route12_FishingHouse_Text_TryFishingBringMeMagikarp release end -EventScript_16FFFF:: @ 816FFFF +Route12_FishingHouse_EventScript_CancelShowMon:: @ 816FFFF release end -EventScript_170001:: @ 8170001 - msgbox gUnknown_819F468 +Route12_FishingHouse_EventScript_NotMagikarp:: @ 8170001 + msgbox Route12_FishingHouse_Text_DoesntLookLikeMagikarp release end -EventScript_17000B:: @ 817000B - goto_if_unset FLAG_GOT_RECORD_SETTING_MAGIKARP, EventScript_170031 - msgbox gUnknown_819F40A +Route12_FishingHouse_EventScript_NotRecordMagikarp:: @ 817000B + goto_if_unset FLAG_GOT_RECORD_SETTING_MAGIKARP, Route12_FishingHouse_EventScript_NewRecordMagikarp + msgbox Route12_FishingHouse_Text_HmmXInchesDoesntMeasureUp release end -EventScript_17001E:: @ 817001E - goto_if_unset FLAG_GOT_RECORD_SETTING_MAGIKARP, EventScript_170031 - msgbox gUnknown_819F3CB +Route12_FishingHouse_EventScript_TieRecordMagikarp:: @ 817001E + goto_if_unset FLAG_GOT_RECORD_SETTING_MAGIKARP, Route12_FishingHouse_EventScript_NewRecordMagikarp + msgbox Route12_FishingHouse_Text_HuhXInchesSameSizeAsLast release end -EventScript_170031:: @ 8170031 +Route12_FishingHouse_EventScript_NewRecordMagikarp:: @ 8170031 setflag FLAG_GOT_RECORD_SETTING_MAGIKARP - msgbox gUnknown_819F31B + msgbox Route12_FishingHouse_Text_WhoaXInchesTakeThis giveitem ITEM_NET_BALL - compare VAR_RESULT, 0 - goto_if_eq EventScript_17005D - msgbox gUnknown_819F395 + compare VAR_RESULT, FALSE + goto_if_eq Route12_FishingHouse_EventScript_NoRoomForNetBall + msgbox Route12_FishingHouse_Text_LookForwardToGreaterRecords release end -EventScript_17005D:: @ 817005D - msgbox gUnknown_819F494 +Route12_FishingHouse_EventScript_NoRoomForNetBall:: @ 817005D + msgbox Route12_FishingHouse_Text_NoRoomForGift release end -Route12_FishingHouse_EventScript_170067:: @ 8170067 +Route12_FishingHouse_EventScript_MagikarpRecordSign:: @ 8170067 lockall - goto_if_set FLAG_GOT_RECORD_SETTING_MAGIKARP, EventScript_17007B - msgbox gUnknown_819F50C + goto_if_set FLAG_GOT_RECORD_SETTING_MAGIKARP, Route12_FishingHouse_EventScript_MagikarpRecordSignRecordSet + msgbox Route12_FishingHouse_Text_BlankChartOfSomeSort releaseall end -EventScript_17007B:: @ 817007B +Route12_FishingHouse_EventScript_MagikarpRecordSignRecordSet:: @ 817007B special GetMagikarpSizeRecordInfo - msgbox gUnknown_819F4CF + msgbox Route12_FishingHouse_Text_MostGiganticMagikarpXInches releaseall end diff --git a/data/maps/Route12_FishingHouse/text.inc b/data/maps/Route12_FishingHouse/text.inc index 4f1f3f1fd..efe9b62a6 100644 --- a/data/maps/Route12_FishingHouse/text.inc +++ b/data/maps/Route12_FishingHouse/text.inc @@ -1,20 +1,20 @@ -gUnknown_819EFE0:: @ 819EFE0 +Route12_FishingHouse_Text_DoYouLikeToFish:: @ 819EFE0 .string "I'm the FISHING GURU's younger\n" .string "brother.\p" .string "I simply looove fishing!\n" .string "I can't bear to go without.\p" .string "Tell me, do you like to fish?$" -gUnknown_819F05B:: @ 819F05B +Route12_FishingHouse_Text_TakeThisAndFish:: @ 819F05B .string "Grand! I like your style.\n" .string "I think we can be friends.\p" .string "Take this and fish, young friend!$" -gUnknown_819F0B2:: @ 819F0B2 +Route12_FishingHouse_Text_ReceivedSuperRod:: @ 819F0B2 .string "{PLAYER} received a SUPER ROD from\n" .string "the FISHING GURU's brother.$" -gUnknown_819F0EB:: @ 819F0EB +Route12_FishingHouse_Text_IfYouCatchBigMagikarpShowMe:: @ 819F0EB .string "Fishing is a way of life!\n" .string "It is like the finest poetry.\p" .string "From the seas to rivers, go out\n" @@ -25,11 +25,11 @@ gUnknown_819F0EB:: @ 819F0EB .string "As much as I love to fish, I also\n" .string "love seeing gigantic MAGIKARP.$" -gUnknown_819F1FA:: @ 819F1FA +Route12_FishingHouse_Text_OhThatsDisappointing:: @ 819F1FA .string "Oh…\n" .string "That's so disappointing…$" -gUnknown_819F217:: @ 819F217 +Route12_FishingHouse_Text_TryFishingBringMeMagikarp:: @ 819F217 .string "Hello there, {PLAYER}!\n" .string "Have you been fishing?\p" .string "Try fishing with the SUPER ROD in\n" @@ -39,12 +39,12 @@ gUnknown_819F217:: @ 819F217 .string "Oh, and don't forget to bring me\n" .string "gigantic MAGIKARP.$" -gUnknown_819F2DB:: @ 819F2DB +Route12_FishingHouse_Text_OhMagikarpAllowMeToSee:: @ 819F2DB .string "Oh? {PLAYER}?\n" .string "Why, if it isn't a MAGIKARP!\p" .string "Allow me to see it, quick!$" -gUnknown_819F31B:: @ 819F31B +Route12_FishingHouse_Text_WhoaXInchesTakeThis:: @ 819F31B .string "… … …Whoa!\n" .string "{STR_VAR_2} inches!\p" .string "You have a rare appreciation for\n" @@ -52,37 +52,37 @@ gUnknown_819F31B:: @ 819F31B .string "You must take this.\n" .string "I insist!$" -gUnknown_819F395:: @ 819F395 +Route12_FishingHouse_Text_LookForwardToGreaterRecords:: @ 819F395 .string "I'll look forward to seeing greater\n" .string "records from you!$" -gUnknown_819F3CB:: @ 819F3CB +Route12_FishingHouse_Text_HuhXInchesSameSizeAsLast:: @ 819F3CB .string "Huh?\n" .string "{STR_VAR_2} inches?\p" .string "This is the same size as the one\n" .string "I saw before.$" -gUnknown_819F40A:: @ 819F40A +Route12_FishingHouse_Text_HmmXInchesDoesntMeasureUp:: @ 819F40A .string "Hmm…\n" .string "This one is {STR_VAR_2} inches long.\p" .string "It doesn't measure up to the\n" .string "{STR_VAR_3}-inch one you brought before.$" -gUnknown_819F468:: @ 819F468 +Route12_FishingHouse_Text_DoesntLookLikeMagikarp:: @ 819F468 .string "Uh… That doesn't look much like\n" .string "a MAGIKARP.$" -gUnknown_819F494:: @ 819F494 +Route12_FishingHouse_Text_NoRoomForGift:: @ 819F494 .string "Oh, no!\p" .string "I had a gift for you, but you have\n" .string "no room for it.$" -gUnknown_819F4CF:: @ 819F4CF +Route12_FishingHouse_Text_MostGiganticMagikarpXInches:: @ 819F4CF .string "The most gigantic MAGIKARP\n" .string "I have ever witnessed…\p" .string "{STR_VAR_3} inches!$" -gUnknown_819F50C:: @ 819F50C +Route12_FishingHouse_Text_BlankChartOfSomeSort:: @ 819F50C .string "It's a blank chart of some sort.\p" .string "It has spaces for writing in\n" .string "records of some kind.$" diff --git a/data/maps/Route12_NorthEntrance_1F/map.json b/data/maps/Route12_NorthEntrance_1F/map.json index d06875648..834559791 100644 --- a/data/maps/Route12_NorthEntrance_1F/map.json +++ b/data/maps/Route12_NorthEntrance_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route12_NorthEntrance_1F_EventScript_16FE6E", + "script": "Route12_NorthEntrance_1F_EventScript_Guard", "flag": "0" } ], diff --git a/data/maps/Route12_NorthEntrance_1F/scripts.inc b/data/maps/Route12_NorthEntrance_1F/scripts.inc index 990d5f793..a2aa84b00 100644 --- a/data/maps/Route12_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_1F/scripts.inc @@ -1,6 +1,6 @@ Route12_NorthEntrance_1F_MapScripts:: @ 816FE6D .byte 0 -Route12_NorthEntrance_1F_EventScript_16FE6E:: @ 816FE6E - msgbox gUnknown_819EDA7, MSGBOX_NPC +Route12_NorthEntrance_1F_EventScript_Guard:: @ 816FE6E + msgbox Route12_NorthEntrance_1F_Text_LookoutSpotUpstairs, MSGBOX_NPC end diff --git a/data/maps/Route12_NorthEntrance_1F/text.inc b/data/maps/Route12_NorthEntrance_1F/text.inc index 32f34428f..34dc041f8 100644 --- a/data/maps/Route12_NorthEntrance_1F/text.inc +++ b/data/maps/Route12_NorthEntrance_1F/text.inc @@ -1,4 +1,4 @@ -gUnknown_819EDA7:: @ 819EDA7 +Route12_NorthEntrance_1F_Text_LookoutSpotUpstairs:: @ 819EDA7 .string "There's a lookout spot upstairs.\n" .string "The view is magnificent.$" diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json index f2cf37890..042658121 100644 --- a/data/maps/Route12_NorthEntrance_2F/map.json +++ b/data/maps/Route12_NorthEntrance_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route12_NorthEntrance_2F_EventScript_16FE8A", + "script": "Route12_NorthEntrance_2F_EventScript_Lass", "flag": "0" } ], @@ -43,14 +43,14 @@ "x": 4, "y": 1, "elevation": 0, - "script": "Route12_NorthEntrance_2F_EventScript_16FE78" + "script": "Route12_NorthEntrance_2F_EventScript_LeftBinoculars" }, { "type": "bg_event_type_0", "x": 8, "y": 1, "elevation": 0, - "script": "Route12_NorthEntrance_2F_EventScript_16FE81" + "script": "Route12_NorthEntrance_2F_EventScript_RightBinoculars" } ] } diff --git a/data/maps/Route12_NorthEntrance_2F/scripts.inc b/data/maps/Route12_NorthEntrance_2F/scripts.inc index b9fee6dda..a85398238 100644 --- a/data/maps/Route12_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_2F/scripts.inc @@ -1,46 +1,46 @@ Route12_NorthEntrance_2F_MapScripts:: @ 816FE77 .byte 0 -Route12_NorthEntrance_2F_EventScript_16FE78:: @ 816FE78 - msgbox gUnknown_819EF5D, MSGBOX_SIGN +Route12_NorthEntrance_2F_EventScript_LeftBinoculars:: @ 816FE78 + msgbox Route12_NorthEntrance_2F_Text_TheresManFishing, MSGBOX_SIGN end -Route12_NorthEntrance_2F_EventScript_16FE81:: @ 816FE81 - msgbox gUnknown_819EFA0, MSGBOX_SIGN +Route12_NorthEntrance_2F_EventScript_RightBinoculars:: @ 816FE81 + msgbox Route12_NorthEntrance_2F_Text_ItsPokemonTower, MSGBOX_SIGN end -Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A +Route12_NorthEntrance_2F_EventScript_Lass:: @ 816FE8A lock faceplayer - goto_if_set FLAG_GOT_TM27, EventScript_16FF01 + goto_if_set FLAG_GOT_TM27, Route12_NorthEntrance_2F_EventScript_ExplainTM27 checkplayergender compare VAR_RESULT, MALE - call_if_eq EventScript_16FEE5 + call_if_eq Route12_NorthEntrance_2F_EventScript_TakeTMMale compare VAR_RESULT, FEMALE - call_if_eq EventScript_16FEEE + call_if_eq Route12_NorthEntrance_2F_EventScript_TakeTMFemale checkitemspace ITEM_TM27, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16FEF7 - giveitem_msg gUnknown_819EE9F, ITEM_TM27 - msgbox gUnknown_819EEC6 + goto_if_eq Route12_NorthEntrance_2F_EventScript_NoRoomForTM27 + giveitem_msg Route12_NorthEntrance_2F_Text_ReceivedTM27FromLittleGirl, ITEM_TM27 + msgbox Route12_NorthEntrance_2F_Text_ExplainTM27 setflag FLAG_GOT_TM27 release end -EventScript_16FEE5:: @ 816FEE5 - msgbox gUnknown_819EDE1 +Route12_NorthEntrance_2F_EventScript_TakeTMMale:: @ 816FEE5 + msgbox Route12_NorthEntrance_2F_Text_TakeTMDontNeedAnymoreMale return -EventScript_16FEEE:: @ 816FEEE - msgbox gUnknown_819EE40 +Route12_NorthEntrance_2F_EventScript_TakeTMFemale:: @ 816FEEE + msgbox Route12_NorthEntrance_2F_Text_TakeTMDontNeedAnymoreFemale return -EventScript_16FEF7:: @ 816FEF7 - msgbox gUnknown_819EF3F +Route12_NorthEntrance_2F_EventScript_NoRoomForTM27:: @ 816FEF7 + msgbox Route12_NorthEntrance_2F_Text_DontHaveRoomForThis release end -EventScript_16FF01:: @ 816FF01 - msgbox gUnknown_819EEC6 +Route12_NorthEntrance_2F_EventScript_ExplainTM27:: @ 816FF01 + msgbox Route12_NorthEntrance_2F_Text_ExplainTM27 release end diff --git a/data/maps/Route12_NorthEntrance_2F/text.inc b/data/maps/Route12_NorthEntrance_2F/text.inc index df2ac596b..6e525d6e4 100644 --- a/data/maps/Route12_NorthEntrance_2F/text.inc +++ b/data/maps/Route12_NorthEntrance_2F/text.inc @@ -1,34 +1,35 @@ -gUnknown_819EDE1:: @ 819EDE1 +@ Male and female text identical, differ (presumably) in JP +Route12_NorthEntrance_2F_Text_TakeTMDontNeedAnymoreMale:: @ 819EDE1 .string "My POKéMON's ashes are stored in\n" .string "POKéMON TOWER.\p" .string "You can have this TM.\n" .string "I don't need it anymore…$" -gUnknown_819EE40:: @ 819EE40 +Route12_NorthEntrance_2F_Text_TakeTMDontNeedAnymoreFemale:: @ 819EE40 .string "My POKéMON's ashes are stored in\n" .string "POKéMON TOWER.\p" .string "You can have this TM.\n" .string "I don't need it anymore…$" -gUnknown_819EE9F:: @ 819EE9F +Route12_NorthEntrance_2F_Text_ReceivedTM27FromLittleGirl:: @ 819EE9F .string "{PLAYER} received TM27\n" .string "from the little girl.$" -gUnknown_819EEC6:: @ 819EEC6 +Route12_NorthEntrance_2F_Text_ExplainTM27:: @ 819EEC6 .string "TM27 is a move called RETURN…\p" .string "If you treat your POKéMON good,\n" .string "it will return your love by working\l" .string "its hardest in battle.$" -gUnknown_819EF3F:: @ 819EF3F +Route12_NorthEntrance_2F_Text_DontHaveRoomForThis:: @ 819EF3F .string "You don't have room for this.$" -gUnknown_819EF5D:: @ 819EF5D +Route12_NorthEntrance_2F_Text_TheresManFishing:: @ 819EF5D .string "Let's see what the binoculars have\n" .string "to show…\p" .string "There's a man fishing!$" -gUnknown_819EFA0:: @ 819EFA0 +Route12_NorthEntrance_2F_Text_ItsPokemonTower:: @ 819EFA0 .string "Let's see what the binoculars have\n" .string "to show…\p" .string "It's POKéMON TOWER!$" diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index 2e9f47d52..b7b92937f 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route13_EventScript_1AA803", + "script": "Route13_EventScript_Alma", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route13_EventScript_1AA749", + "script": "Route13_EventScript_Sebastian", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route13_EventScript_1AA841", + "script": "Route13_EventScript_Susie", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route13_EventScript_1AA70B", + "script": "Route13_EventScript_Sheila", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route13_EventScript_1AA6CD", + "script": "Route13_EventScript_Lola", "flag": "0" }, { @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route13_EventScript_1AA87F", + "script": "Route13_EventScript_Valerie", "flag": "0" }, { @@ -112,7 +112,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route13_EventScript_1AA8BD", + "script": "Route13_EventScript_Gwen", "flag": "0" }, { @@ -125,7 +125,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route13_EventScript_1AA7C5", + "script": "Route13_EventScript_Robert", "flag": "0" }, { @@ -138,7 +138,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route13_EventScript_1AA787", + "script": "Route13_EventScript_Perry", "flag": "0" }, { @@ -151,7 +151,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route13_EventScript_1AA68F", + "script": "Route13_EventScript_Jared", "flag": "0" }, { @@ -176,21 +176,21 @@ "x": 41, "y": 12, "elevation": 0, - "script": "Route13_EventScript_1680C8" + "script": "Route13_EventScript_RouteSign" }, { "type": "bg_event_type_0", "x": 37, "y": 6, "elevation": 0, - "script": "Route13_EventScript_1680BF" + "script": "Route13_EventScript_TrainerTips2" }, { "type": "bg_event_type_0", "x": 21, "y": 14, "elevation": 0, - "script": "Route13_EventScript_1680B6" + "script": "Route13_EventScript_TrainerTips1" }, { "type": "hidden_item", diff --git a/data/maps/Route13/scripts.inc b/data/maps/Route13/scripts.inc index 6524d5dd6..9cedaa23f 100644 --- a/data/maps/Route13/scripts.inc +++ b/data/maps/Route13/scripts.inc @@ -1,14 +1,14 @@ Route13_MapScripts:: @ 81680B5 .byte 0 -Route13_EventScript_1680B6:: @ 81680B6 - msgbox gUnknown_8185DB7, MSGBOX_SIGN +Route13_EventScript_TrainerTips1:: @ 81680B6 + msgbox Route13_Text_LookToLeftOfThatPost, MSGBOX_SIGN end -Route13_EventScript_1680BF:: @ 81680BF - msgbox gUnknown_8185DEF, MSGBOX_SIGN +Route13_EventScript_TrainerTips2:: @ 81680BF + msgbox Route13_Text_SelectToSwitchItems, MSGBOX_SIGN end -Route13_EventScript_1680C8:: @ 81680C8 - msgbox gUnknown_8185E2C, MSGBOX_SIGN +Route13_EventScript_RouteSign:: @ 81680C8 + msgbox Route13_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route13/text.inc b/data/maps/Route13/text.inc index 1b570d424..edf58209c 100644 --- a/data/maps/Route13/text.inc +++ b/data/maps/Route13/text.inc @@ -1,162 +1,128 @@ -Text_1857C5:: @ 81857C5 - .string "JES: If I win, I'm going to\n" - .string "propose to GIA.$" - -Text_1857F1:: @ 81857F1 - .string "JES: Oh, please, why couldn't you\n" - .string "let us win?$" - -Text_18581F:: @ 818581F - .string "JES: Oh, GIA, forgive me,\n" - .string "my love!$" - -Text_185842:: @ 8185842 - .string "JES: GIA and I, we'll be\n" - .string "together forever.\p" - .string "We won't battle unless you have\n" - .string "two POKéMON of your own.$" - -Text_1858A6:: @ 81858A6 - .string "GIA: Hey, JES…\p" - .string "If we win, I'll marry you!$" - -Text_1858D0:: @ 81858D0 - .string "GIA: Oh, but why?$" - -Text_1858E2:: @ 81858E2 - .string "GIA: JES, you silly!\n" - .string "You ruined this!$" - -Text_185908:: @ 8185908 - .string "GIA: I can't bear to battle\n" - .string "without my JES!\p" - .string "Don't you have one more POKéMON?$" - -Text_185955:: @ 8185955 +Route13_Text_SebastianIntro:: @ 8185955 .string "My bird POKéMON want to battle\n" .string "with you!$" -Text_18597E:: @ 818597E +Route13_Text_SebastianDefeat:: @ 818597E .string "My PIDGEY and PIDGEOTTO combo\n" .string "lost?$" -Text_1859A2:: @ 81859A2 +Route13_Text_SebastianPostBattle:: @ 81859A2 .string "My POKéMON look happy even though\n" .string "they lost.$" -Text_1859CF:: @ 81859CF +Route13_Text_SusieIntro:: @ 81859CF .string "I'm told I'm good for a kid.$" -Text_1859EC:: @ 81859EC +Route13_Text_SusieDefeat:: @ 81859EC .string "Ohh!\n" .string "I lost!$" -Text_1859F9:: @ 81859F9 +Route13_Text_SusiePostBattle:: @ 81859F9 .string "I want to become a good TRAINER.\n" .string "I'll train hard, just watch.$" -Text_185A37:: @ 8185A37 +Route13_Text_ValerieIntro:: @ 8185A37 .string "Wow!\n" .string "Your BADGES are too cool!$" -Text_185A56:: @ 8185A56 +Route13_Text_ValerieDefeat:: @ 8185A56 .string "Not enough!$" -Text_185A62:: @ 8185A62 +Route13_Text_ValeriePostBattle:: @ 8185A62 .string "You got those BADGES from GYM\n" .string "LEADERS. I know!$" -Text_185A91:: @ 8185A91 +Route13_Text_GwenIntro:: @ 8185A91 .string "My cute POKéMON wish to make your\n" .string "acquaintance.$" -Text_185AC1:: @ 8185AC1 +Route13_Text_GwenDefeat:: @ 8185AC1 .string "Good going!\n" .string "You totally won!$" -Text_185ADE:: @ 8185ADE +Route13_Text_GwenPostBattle:: @ 8185ADE .string "You have to make POKéMON battle\n" .string "to toughen them up.$" -Text_185B12:: @ 8185B12 +Route13_Text_AlmaIntro:: @ 8185B12 .string "I found CARBOS in a cave once\n" .string "while I was spelunking.$" -Text_185B48:: @ 8185B48 +Route13_Text_AlmaDefeat:: @ 8185B48 .string "Oh, too bad!\n" .string "I just messed up!$" -Text_185B67:: @ 8185B67 +Route13_Text_AlmaPostBattle:: @ 8185B67 .string "CARBOS boosted the SPEED of my\n" .string "POKéMON.$" -Text_185B8F:: @ 8185B8F +Route13_Text_PerryIntro:: @ 8185B8F .string "I'm not going to lose.\n" .string "Not when the wind's blowing my way!$" -Text_185BCA:: @ 8185BCA +Route13_Text_PerryDefeat:: @ 8185BCA .string "The wind turned!$" -Text_185BDB:: @ 8185BDB +Route13_Text_PerryPostBattle:: @ 8185BDB .string "I'm beat.\n" .string "I guess I'll FLY home.$" -Text_185BFC:: @ 8185BFC +Route13_Text_LolaIntro:: @ 8185BFC .string "Sure, I'll play with you, sweetie.$" -Text_185C1F:: @ 8185C1F +Route13_Text_LolaDefeat:: @ 8185C1F .string "Oh!\n" .string "You little beast!$" -Text_185C35:: @ 8185C35 +Route13_Text_LolaPostBattle:: @ 8185C35 .string "I wonder which is stronger, male or\n" .string "female POKéMON?$" -Text_185C69:: @ 8185C69 +Route13_Text_SheilaIntro:: @ 8185C69 .string "Do you want to battle some\n" .string "POKéMON with me?$" -Text_185C95:: @ 8185C95 +Route13_Text_SheilaDefeat:: @ 8185C95 .string "It's over already?$" -Text_185CA8:: @ 8185CA8 +Route13_Text_SheilaPostBattle:: @ 8185CA8 .string "I don't know anything about\n" .string "POKéMON actually.\p" .string "The ones I use… I picked them\n" .string "for their looks!$" -Text_185D05:: @ 8185D05 +Route13_Text_JaredIntro:: @ 8185D05 .string "What're you lookin' at?$" -Text_185D1D:: @ 8185D1D +Route13_Text_JaredDefeat:: @ 8185D1D .string "Dang!\n" .string "Stripped gears!$" -Text_185D33:: @ 8185D33 +Route13_Text_JaredPostBattle:: @ 8185D33 .string "Get lost!$" -Text_185D3D:: @ 8185D3D +Route13_Text_RobertIntro:: @ 8185D3D .string "I always go with bird POKéMON.\n" .string "I've dedicated myself to them.$" -Text_185D7B:: @ 8185D7B +Route13_Text_RobertDefeat:: @ 8185D7B .string "Out of power!$" -Text_185D89:: @ 8185D89 +Route13_Text_RobertPostBattle:: @ 8185D89 .string "I wish I could fly like PIDGEY and\n" .string "PIDGEOTTO…$" -gUnknown_8185DB7:: @ 8185DB7 +Route13_Text_LookToLeftOfThatPost:: @ 8185DB7 .string "TRAINER TIPS\p" .string "Look, look!\n" .string "Look to the left of that post!$" -gUnknown_8185DEF:: @ 8185DEF +Route13_Text_SelectToSwitchItems:: @ 8185DEF .string "TRAINER TIPS\p" .string "Use SELECT to switch items in the\n" .string "ITEMS window.$" -gUnknown_8185E2C:: @ 8185E2C +Route13_Text_RouteSign:: @ 8185E2C .string "ROUTE 13\n" .string "North to SILENCE BRIDGE$" diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index cf88cbf8a..dd49ec12e 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route14_EventScript_1AA9B5", + "script": "Route14_EventScript_Gerald", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 2, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route14_EventScript_1AA9F3", + "script": "Route14_EventScript_Donald", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route14_EventScript_1AAAEB", + "script": "Route14_EventScript_Beck", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route14_EventScript_1AAB29", + "script": "Route14_EventScript_Marlon", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route14_EventScript_1AA977", + "script": "Route14_EventScript_Isaac", "flag": "0" }, { @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route14_EventScript_1AA8FB", + "script": "Route14_EventScript_Malik", "flag": "0" }, { @@ -112,7 +112,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route14_EventScript_1AAAAD", + "script": "Route14_EventScript_Mitch", "flag": "0" }, { @@ -125,7 +125,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route14_EventScript_1AAA6F", + "script": "Route14_EventScript_Carter", "flag": "0" }, { @@ -138,7 +138,7 @@ "movement_range_y": 6, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route14_EventScript_1AA939", + "script": "Route14_EventScript_Lukas", "flag": "0" }, { @@ -151,7 +151,7 @@ "movement_range_y": 2, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route14_EventScript_1AAA31", + "script": "Route14_EventScript_Benny", "flag": "0" }, { @@ -203,7 +203,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route14_EventScript_1AABAD", + "script": "Route14_EventScript_Jan", "flag": "0" }, { @@ -216,7 +216,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route14_EventScript_1AAB67", + "script": "Route14_EventScript_Kiri", "flag": "0" } ], @@ -228,7 +228,7 @@ "x": 17, "y": 12, "elevation": 0, - "script": "Route14_EventScript_1680D2" + "script": "Route14_EventScript_RouteSign" }, { "type": "hidden_item", diff --git a/data/maps/Route14/scripts.inc b/data/maps/Route14/scripts.inc index 551940250..46e3774ee 100644 --- a/data/maps/Route14/scripts.inc +++ b/data/maps/Route14/scripts.inc @@ -1,6 +1,6 @@ Route14_MapScripts:: @ 81680D1 .byte 0 -Route14_EventScript_1680D2:: @ 81680D2 - msgbox gUnknown_8186399, MSGBOX_SIGN +Route14_EventScript_RouteSign:: @ 81680D2 + msgbox Route14_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route14/text.inc b/data/maps/Route14/text.inc index 37008ab3b..320c250ee 100644 --- a/data/maps/Route14/text.inc +++ b/data/maps/Route14/text.inc @@ -1,126 +1,156 @@ -Text_185E4D:: @ 8185E4D +Route14_Text_CarterIntro:: @ 8185E4D .string "You need to use TMs to teach good\n" .string "moves to POKéMON.$" -Text_185E81:: @ 8185E81 +Route14_Text_CarterDefeat:: @ 8185E81 .string "Not good enough quite yet.$" -Text_185E9C:: @ 8185E9C +Route14_Text_CarterPostBattle:: @ 8185E9C .string "You have some HMs, right? POKéMON\n" .string "can't forget those moves easily.$" -Text_185EDF:: @ 8185EDF +Route14_Text_MitchIntro:: @ 8185EDF .string "My bird POKéMON should be ready\n" .string "for battle.$" -Text_185F0B:: @ 8185F0B +Route14_Text_MitchDefeat:: @ 8185F0B .string "Not ready yet!$" -Text_185F1A:: @ 8185F1A +Route14_Text_MitchPostBattle:: @ 8185F1A .string "My bird POKéMON need to learn\n" .string "better moves.$" -Text_185F46:: @ 8185F46 +Route14_Text_BeckIntro:: @ 8185F46 .string "They have TMs on sale at the\n" .string "CELADON DEPT. STORE.\p" .string "TMs aren't really rare, but not\n" .string "many people have HMs.$" -Text_185FAE:: @ 8185FAE +Route14_Text_BeckDefeat:: @ 8185FAE .string "Aww, bummer!$" -Text_185FBB:: @ 8185FBB +Route14_Text_BeckPostBattle:: @ 8185FBB .string "Try teaching POKéMON a move that's\n" .string "the same type as it.\p" .string "That apparently boosts the power\n" .string "of the move.$" -Text_186021:: @ 8186021 +Route14_Text_MarlonIntro:: @ 8186021 .string "Have you taught your bird POKéMON\n" .string "how to FLY?\p" .string "You'll be able to soar with it into\n" .string "the sky!$" -Text_18607C:: @ 818607C +Route14_Text_MarlonDefeat:: @ 818607C .string "Shot down in flames!$" -Text_186091:: @ 8186091 +Route14_Text_MarlonPostBattle:: @ 8186091 .string "Bird POKéMON are my one true love.\n" .string "I don't want to raise anything else.$" -Text_1860D9:: @ 81860D9 +Route14_Text_DonaldIntro:: @ 81860D9 .string "Have you heard the legend of the\n" .string "winged mirages?$" -Text_18610A:: @ 818610A +Route14_Text_DonaldDefeat:: @ 818610A .string "Why?\n" .string "Why'd I lose?$" -Text_18611D:: @ 818611D +Route14_Text_DonaldPostBattle:: @ 818611D .string "Well, the winged mirages are the\n" .string "legendary bird POKéMON.\p" .string "There are three of them: ARTICUNO,\n" .string "ZAPDOS, and MOLTRES.$" -Text_18618E:: @ 818618E +Route14_Text_BennyIntro:: @ 818618E .string "I'm not into it, but okay.\n" .string "Let's go!$" -Text_1861B3:: @ 81861B3 +Route14_Text_BennyDefeat:: @ 81861B3 .string "I knew it!$" -Text_1861BE:: @ 81861BE +Route14_Text_BennyPostBattle:: @ 81861BE .string "Winning, losing… It's insignificant\n" .string "under this huge sky.$" -Text_1861F7:: @ 81861F7 +Route14_Text_LukasIntro:: @ 81861F7 .string "C'mon, c'mon.\n" .string "Let's go, let's go, let's go!$" -Text_186223:: @ 8186223 +Route14_Text_LukasDefeat:: @ 8186223 .string "Arrg!\n" .string "Lost! Get lost!$" -Text_186239:: @ 8186239 +Route14_Text_LukasPostBattle:: @ 8186239 .string "What, what, what?\n" .string "What do you want still?$" -Text_186263:: @ 8186263 +Route14_Text_IsaacIntro:: @ 8186263 .string "I need to burn some time.\n" .string "Shut up and battle.$" -Text_186291:: @ 8186291 +Route14_Text_IsaacDefeat:: @ 8186291 .string "What?\n" .string "You!?$" -Text_18629D:: @ 818629D +Route14_Text_IsaacPostBattle:: @ 818629D .string "Raising POKéMON is a drag, man.$" -Text_1862BD:: @ 81862BD +Route14_Text_GeraldIntro:: @ 81862BD .string "We ride out here because of the\n" .string "wide-open spaces.$" -Text_1862EF:: @ 81862EF +Route14_Text_GeraldDefeat:: @ 81862EF .string "Wipeout!$" -Text_1862F8:: @ 81862F8 +Route14_Text_GeraldPostBattle:: @ 81862F8 .string "It's cool you made your POKéMON so\n" .string "strong.\p" .string "Might is right!\n" .string "And you know it!$" -Text_186344:: @ 8186344 +Route14_Text_MalikIntro:: @ 8186344 .string "POKéMON battle?\n" .string "Cool! Rumble!$" -Text_186362:: @ 8186362 +Route14_Text_MalikDefeat:: @ 8186362 .string "Blown away!$" -Text_18636E:: @ 818636E +Route14_Text_MalikPostBattle:: @ 818636E .string "You know who'd win, you and me\n" .string "one-on-one!$" -gUnknown_8186399:: @ 8186399 +Route14_Text_RouteSign:: @ 8186399 .string "ROUTE 14\n" .string "West to FUCHSIA CITY$" +Route14_Text_KiriIntro:: @ 81863B7 + .string "KIRI: JAN, let's try really,\n" + .string "really hard together.$" + +Route14_Text_KiriDefeat:: @ 81863EA + .string "KIRI: Whimper…\n" + .string "We lost, didn't we?$" + +Route14_Text_KiriPostBattle:: @ 818640D + .string "KIRI: Did we lose because of me?$" + +Route14_Text_KiriNotEnoughMons:: @ 818642E + .string "KIRI: We can battle if you have\n" + .string "two POKéMON.$" + +Route14_Text_JanIntro:: @ 818645B + .string "JAN: KIRI, here we go!\n" + .string "We have to try hard!$" + +Route14_Text_JanDefeat:: @ 8186487 + .string "JAN: Eeeeh!\n" + .string "No fair!$" + +Route14_Text_JanPostBattle:: @ 818649C + .string "JAN: KIRI, don't cry!\n" + .string "We'll just try harder next time.$" + +Route14_Text_JanNotEnoughMons:: @ 81864D3 + .string "JAN: You want to battle?\n" + .string "You don't have enough POKéMON.$" diff --git a/data/maps/Route15/text.inc b/data/maps/Route15/text.inc index 34e3a0c60..33c60e7dc 100644 --- a/data/maps/Route15/text.inc +++ b/data/maps/Route15/text.inc @@ -1,34 +1,3 @@ -Text_1863B7:: @ 81863B7 - .string "KIRI: JAN, let's try really,\n" - .string "really hard together.$" - -Text_1863EA:: @ 81863EA - .string "KIRI: Whimper…\n" - .string "We lost, didn't we?$" - -Text_18640D:: @ 818640D - .string "KIRI: Did we lose because of me?$" - -Text_18642E:: @ 818642E - .string "KIRI: We can battle if you have\n" - .string "two POKéMON.$" - -Text_18645B:: @ 818645B - .string "JAN: KIRI, here we go!\n" - .string "We have to try hard!$" - -Text_186487:: @ 8186487 - .string "JAN: Eeeeh!\n" - .string "No fair!$" - -Text_18649C:: @ 818649C - .string "JAN: KIRI, don't cry!\n" - .string "We'll just try harder next time.$" - -Text_1864D3:: @ 81864D3 - .string "JAN: You want to battle?\n" - .string "You don't have enough POKéMON.$" - Text_18650B:: @ 818650B .string "I just got some POKéMON in trades.\n" .string "Can I try them out on you?$" @@ -151,3 +120,35 @@ gUnknown_8186A77:: @ 8186A77 .string "ROUTE 15\n" .string "West to FUCHSIA CITY$" +Text_186A95:: @ 8186A95 + .string "MYA: You're perfect.\n" + .string "Help me train my little brother?$" + +Text_186ACB:: @ 8186ACB + .string "MYA: RON, you have to focus!\n" + .string "Concentrate on what you're doing!$" + +Text_186B0A:: @ 8186B0A + .string "MYA: Okay, we'll turn it up.\n" + .string "I'll add to our training menu!$" + +Text_186B46:: @ 8186B46 + .string "MYA: Do you want to challenge us?\n" + .string "You'll need two POKéMON, though.$" + +Text_186B89:: @ 8186B89 + .string "RON: My sister gets scary when we\n" + .string "lose.$" + +Text_186BB1:: @ 8186BB1 + .string "RON: Oh, no, no…\n" + .string "Sis, I'm sorry!$" + +Text_186BD2:: @ 8186BD2 + .string "RON: Oh, bleah…\n" + .string "I wish I had a nice sister…$" + +Text_186BFE:: @ 8186BFE + .string "RON: Did you want to battle with\n" + .string "my sister and me?\p" + .string "You need two POKéMON, then.$" diff --git a/data/maps/Route16/text.inc b/data/maps/Route16/text.inc index 289b80db9..5131934b1 100644 --- a/data/maps/Route16/text.inc +++ b/data/maps/Route16/text.inc @@ -1,36 +1,3 @@ -Text_186A95:: @ 8186A95 - .string "MYA: You're perfect.\n" - .string "Help me train my little brother?$" - -Text_186ACB:: @ 8186ACB - .string "MYA: RON, you have to focus!\n" - .string "Concentrate on what you're doing!$" - -Text_186B0A:: @ 8186B0A - .string "MYA: Okay, we'll turn it up.\n" - .string "I'll add to our training menu!$" - -Text_186B46:: @ 8186B46 - .string "MYA: Do you want to challenge us?\n" - .string "You'll need two POKéMON, though.$" - -Text_186B89:: @ 8186B89 - .string "RON: My sister gets scary when we\n" - .string "lose.$" - -Text_186BB1:: @ 8186BB1 - .string "RON: Oh, no, no…\n" - .string "Sis, I'm sorry!$" - -Text_186BD2:: @ 8186BD2 - .string "RON: Oh, bleah…\n" - .string "I wish I had a nice sister…$" - -Text_186BFE:: @ 8186BFE - .string "RON: Did you want to battle with\n" - .string "my sister and me?\p" - .string "You need two POKéMON, then.$" - Text_186C4D:: @ 8186C4D .string "What do you want?$" @@ -111,3 +78,36 @@ Route16_Text_RouteSign:: @ 8186F98 .string "ROUTE 16\n" .string "CELADON CITY - FUCHSIA CITY$" +Text_186FBD:: @ 8186FBD + .string "JED: Our love knows no bounds.\n" + .string "We're in love and we show it!$" + +Text_186FFA:: @ 8186FFA + .string "JED: Oh, no!\n" + .string "My love has seen me as a loser!$" + +Text_187027:: @ 8187027 + .string "JED: Listen, LEA.\n" + .string "You need to focus less on me.$" + +Text_187057:: @ 8187057 + .string "JED: You have just one POKéMON?\n" + .string "Is there no love in your heart?$" + +Text_187097:: @ 8187097 + .string "LEA: Sometimes, the intensity of\n" + .string "our love scares me.$" + +Text_1870CC:: @ 81870CC + .string "LEA: Ohh! But JED looks cool\n" + .string "even in a loss!$" + +Text_1870F9:: @ 81870F9 + .string "LEA: Ehehe, I'm sorry.\n" + .string "JED is so cool.$" + +Text_187120:: @ 8187120 + .string "LEA: Oh, you don't have two\n" + .string "POKéMON with you?\p" + .string "Doesn't it feel lonely for you or\n" + .string "your POKéMON?$" diff --git a/data/maps/Route17/text.inc b/data/maps/Route17/text.inc index 6627d5cd0..eff5f0726 100644 --- a/data/maps/Route17/text.inc +++ b/data/maps/Route17/text.inc @@ -1,37 +1,3 @@ -Text_186FBD:: @ 8186FBD - .string "JED: Our love knows no bounds.\n" - .string "We're in love and we show it!$" - -Text_186FFA:: @ 8186FFA - .string "JED: Oh, no!\n" - .string "My love has seen me as a loser!$" - -Text_187027:: @ 8187027 - .string "JED: Listen, LEA.\n" - .string "You need to focus less on me.$" - -Text_187057:: @ 8187057 - .string "JED: You have just one POKéMON?\n" - .string "Is there no love in your heart?$" - -Text_187097:: @ 8187097 - .string "LEA: Sometimes, the intensity of\n" - .string "our love scares me.$" - -Text_1870CC:: @ 81870CC - .string "LEA: Ohh! But JED looks cool\n" - .string "even in a loss!$" - -Text_1870F9:: @ 81870F9 - .string "LEA: Ehehe, I'm sorry.\n" - .string "JED is so cool.$" - -Text_187120:: @ 8187120 - .string "LEA: Oh, you don't have two\n" - .string "POKéMON with you?\p" - .string "Doesn't it feel lonely for you or\n" - .string "your POKéMON?$" - Text_18717E:: @ 818717E .string "There's no getting rich quick in\n" .string "battling kids.$" diff --git a/data/maps/Route19/text.inc b/data/maps/Route19/text.inc index a76ff89d7..7d399f364 100644 --- a/data/maps/Route19/text.inc +++ b/data/maps/Route19/text.inc @@ -117,3 +117,38 @@ gUnknown_8187C06:: @ 8187C06 .string "SEA ROUTE 19\n" .string "FUCHSIA CITY - SEAFOAM ISLANDS$" +Text_187C32:: @ 8187C32 + .string "LIA: I'm looking after my brother.\n" + .string "He just became a TRAINER.$" + +Text_187C6F:: @ 8187C6F + .string "LIA: That's no way to treat my\n" + .string "little brother!$" + +Text_187C9E:: @ 8187C9E + .string "LIA: Do you have a younger\n" + .string "brother?\p" + .string "I hope you're teaching him all\n" + .string "sorts of things.$" + +Text_187CF2:: @ 8187CF2 + .string "LIA: I want to battle together\n" + .string "with my little brother.\p" + .string "Don't you have two POKéMON?$" + +Text_187D45:: @ 8187D45 + .string "LUC: My big sis taught me how\n" + .string "to swim and train POKéMON.$" + +Text_187D7E:: @ 8187D7E + .string "LUC: Oh, wow!\n" + .string "Someone tougher than my big sis!$" + +Text_187DAD:: @ 8187DAD + .string "LUC: My big sis is strong and nice.\n" + .string "I think she's awesome!$" + +Text_187DE8:: @ 8187DE8 + .string "LUC: I don't want to if I can't\n" + .string "battle you with my big sis.\p" + .string "Don't you have two POKéMON?$" diff --git a/data/maps/Route20/text.inc b/data/maps/Route20/text.inc index 070575cc7..3abceaeba 100644 --- a/data/maps/Route20/text.inc +++ b/data/maps/Route20/text.inc @@ -1,39 +1,3 @@ -Text_187C32:: @ 8187C32 - .string "LIA: I'm looking after my brother.\n" - .string "He just became a TRAINER.$" - -Text_187C6F:: @ 8187C6F - .string "LIA: That's no way to treat my\n" - .string "little brother!$" - -Text_187C9E:: @ 8187C9E - .string "LIA: Do you have a younger\n" - .string "brother?\p" - .string "I hope you're teaching him all\n" - .string "sorts of things.$" - -Text_187CF2:: @ 8187CF2 - .string "LIA: I want to battle together\n" - .string "with my little brother.\p" - .string "Don't you have two POKéMON?$" - -Text_187D45:: @ 8187D45 - .string "LUC: My big sis taught me how\n" - .string "to swim and train POKéMON.$" - -Text_187D7E:: @ 8187D7E - .string "LUC: Oh, wow!\n" - .string "Someone tougher than my big sis!$" - -Text_187DAD:: @ 8187DAD - .string "LUC: My big sis is strong and nice.\n" - .string "I think she's awesome!$" - -Text_187DE8:: @ 8187DE8 - .string "LUC: I don't want to if I can't\n" - .string "battle you with my big sis.\p" - .string "Don't you have two POKéMON?$" - Text_187E40:: @ 8187E40 .string "The water is shallow here.\n" .string "There are many people swimming.$" @@ -149,3 +113,8 @@ Text_18827B:: @ 818827B gUnknown_81882D1:: @ 81882D1 .string "SEAFOAM ISLANDS$" +Text_1882E1:: @ 81882E1 + .string "Strong TRAINERS and WATER POKéMON\n" + .string "are common sights in these parts.\p" + .string "They say that MISTY of the\n" + .string "CERULEAN GYM trains here.$" diff --git a/data/maps/Route21_North/text.inc b/data/maps/Route21_North/text.inc index e8fc3223a..ad1ec12d3 100644 --- a/data/maps/Route21_North/text.inc +++ b/data/maps/Route21_North/text.inc @@ -1,9 +1,3 @@ -Text_1882E1:: @ 81882E1 - .string "Strong TRAINERS and WATER POKéMON\n" - .string "are common sights in these parts.\p" - .string "They say that MISTY of the\n" - .string "CERULEAN GYM trains here.$" - Text_18835A:: @ 818835A .string "You want to know if the fish are\n" .string "biting?$" diff --git a/data/scripts/trainers.inc b/data/scripts/trainers.inc index d08364a6a..7723ecc89 100644 --- a/data/scripts/trainers.inc +++ b/data/scripts/trainers.inc @@ -1,7 +1,7 @@ Route3_EventScript_1A93C9:: @ 81A93C9 trainerbattle_single TRAINER_YOUNGSTER_BEN, Text_183560, Text_1835A0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A93F0 msgbox Text_1835B4, MSGBOX_AUTOCLOSE end @@ -14,7 +14,7 @@ EventScript_1A93F0:: @ 81A93F0 Route3_EventScript_1A9407:: @ 81A9407 trainerbattle_single TRAINER_YOUNGSTER_CALVIN, Text_183786, Text_1837BD specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A942E msgbox Text_1837CF, MSGBOX_AUTOCLOSE end @@ -27,7 +27,7 @@ EventScript_1A942E:: @ 81A942E Route3_EventScript_1A9445:: @ 81A9445 trainerbattle_single TRAINER_BUG_CATCHER_COLTON, Text_1834E6, Text_183509 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A946C msgbox Text_18351C, MSGBOX_AUTOCLOSE end @@ -40,7 +40,7 @@ EventScript_1A946C:: @ 81A946C Route3_EventScript_1A9483:: @ 81A9483 trainerbattle_single TRAINER_BUG_CATCHER_GREG, Text_183682, Text_1836B3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A94AA msgbox Text_1836D9, MSGBOX_AUTOCLOSE end @@ -53,7 +53,7 @@ EventScript_1A94AA:: @ 81A94AA Route3_EventScript_1A94C1:: @ 81A94C1 trainerbattle_single TRAINER_BUG_CATCHER_JAMES, Text_183807, Text_183837 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A94E8 msgbox Text_183849, MSGBOX_AUTOCLOSE end @@ -66,7 +66,7 @@ EventScript_1A94E8:: @ 81A94E8 Route3_EventScript_1A94FF:: @ 81A94FF trainerbattle_single TRAINER_LASS_JANICE, Text_183616, Text_18363F specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9526 msgbox Text_18364C, MSGBOX_AUTOCLOSE end @@ -79,7 +79,7 @@ EventScript_1A9526:: @ 81A9526 Route3_EventScript_1A953D:: @ 81A953D trainerbattle_single TRAINER_LASS_SALLY, Text_18371B, Text_183746 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9564 msgbox Text_18374F, MSGBOX_AUTOCLOSE end @@ -92,7 +92,7 @@ EventScript_1A9564:: @ 81A9564 Route3_EventScript_1A957B:: @ 81A957B trainerbattle_single TRAINER_LASS_ROBIN, Text_18387A, Text_183891 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A95A2 msgbox Text_18389C, MSGBOX_AUTOCLOSE end @@ -105,7 +105,7 @@ EventScript_1A95A2:: @ 81A95A2 Route4_EventScript_1A95B9:: @ 81A95B9 trainerbattle_single TRAINER_LASS_CRISSY, Text_183906, Text_183938 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A95E0 msgbox Text_183957, MSGBOX_AUTOCLOSE end @@ -118,7 +118,7 @@ EventScript_1A95E0:: @ 81A95E0 Route24_EventScript_1A95F7:: @ 81A95F7 trainerbattle_single TRAINER_YOUNGSTER_TIMMY, Text_188F76, Text_188F95 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A961E msgbox Text_188FA7, MSGBOX_AUTOCLOSE end @@ -131,7 +131,7 @@ EventScript_1A961E:: @ 81A961E Route24_EventScript_1A9635:: @ 81A9635 trainerbattle_single TRAINER_BUG_CATCHER_CALE, Text_18901B, Text_18908C specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A965C msgbox Text_18909E, MSGBOX_AUTOCLOSE end @@ -144,7 +144,7 @@ EventScript_1A965C:: @ 81A965C Route24_EventScript_1A9673:: @ 81A9673 trainerbattle_single TRAINER_LASS_RELI, Text_188F2C, Text_188F46 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A969A msgbox Text_188F53, MSGBOX_AUTOCLOSE end @@ -157,7 +157,7 @@ EventScript_1A969A:: @ 81A969A Route24_EventScript_1A96B1:: @ 81A96B1 trainerbattle_single TRAINER_LASS_ALI, Text_188FC9, Text_188FE7 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A96D8 msgbox Text_188FF9, MSGBOX_AUTOCLOSE end @@ -170,7 +170,7 @@ EventScript_1A96D8:: @ 81A96D8 Route24_EventScript_1A96EF:: @ 81A96EF trainerbattle_single TRAINER_CAMPER_SHANE, Text_188E74, Text_188E94 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9716 msgbox Text_188EA3, MSGBOX_AUTOCLOSE end @@ -183,7 +183,7 @@ EventScript_1A9716:: @ 81A9716 Route24_EventScript_1A972D:: @ 81A972D trainerbattle_single TRAINER_CAMPER_ETHAN, Text_188ED9, Text_188EFA specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9754 msgbox Text_188F0A, MSGBOX_AUTOCLOSE end @@ -196,7 +196,7 @@ EventScript_1A9754:: @ 81A9754 Route25_EventScript_1A976B:: @ 81A976B trainerbattle_single TRAINER_YOUNGSTER_JOEY, Text_1890C0, Text_1890E6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9792 msgbox Text_1890F5, MSGBOX_AUTOCLOSE end @@ -209,7 +209,7 @@ EventScript_1A9792:: @ 81A9792 Route25_EventScript_1A97A9:: @ 81A97A9 trainerbattle_single TRAINER_YOUNGSTER_DAN, Text_189165, Text_1891A6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A97D0 msgbox Text_1891B3, MSGBOX_AUTOCLOSE end @@ -222,7 +222,7 @@ EventScript_1A97D0:: @ 81A97D0 Route25_EventScript_1A97E7:: @ 81A97E7 trainerbattle_single TRAINER_YOUNGSTER_CHAD, Text_1892A9, Text_1892D9 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A980E msgbox Text_1892EF, MSGBOX_AUTOCLOSE end @@ -235,7 +235,7 @@ EventScript_1A980E:: @ 81A980E Route25_EventScript_1A9825:: @ 81A9825 trainerbattle_single TRAINER_PICNICKER_KELSEY, Text_189247, Text_189261 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A984C msgbox Text_189281, MSGBOX_AUTOCLOSE end @@ -248,7 +248,7 @@ EventScript_1A984C:: @ 81A984C Route25_EventScript_1A9863:: @ 81A9863 trainerbattle_single TRAINER_LASS_HALEY, Text_189333, Text_189364 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A988A msgbox Text_189378, MSGBOX_AUTOCLOSE end @@ -261,7 +261,7 @@ EventScript_1A988A:: @ 81A988A Route25_EventScript_1A98A1:: @ 81A98A1 trainerbattle_single TRAINER_HIKER_FRANKLIN, Text_1893A7, Text_1893EA specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A98C8 msgbox Text_1893FB, MSGBOX_AUTOCLOSE end @@ -274,7 +274,7 @@ EventScript_1A98C8:: @ 81A98C8 Route25_EventScript_1A98DF:: @ 81A98DF trainerbattle_single TRAINER_HIKER_NOB, Text_189423, Text_189459 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9906 msgbox Text_18947E, MSGBOX_AUTOCLOSE end @@ -287,7 +287,7 @@ EventScript_1A9906:: @ 81A9906 Route25_EventScript_1A991D:: @ 81A991D trainerbattle_single TRAINER_HIKER_WAYNE, Text_1894DE, Text_18950A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9944 msgbox Text_18951C, MSGBOX_AUTOCLOSE end @@ -300,7 +300,7 @@ EventScript_1A9944:: @ 81A9944 Route25_EventScript_1A995B:: @ 81A995B trainerbattle_single TRAINER_CAMPER_FLINT, Text_1891EB, Text_189212 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9982 msgbox Text_18921D, MSGBOX_AUTOCLOSE end @@ -313,7 +313,7 @@ EventScript_1A9982:: @ 81A9982 Route6_EventScript_1A9999:: @ 81A9999 trainerbattle_single TRAINER_BUG_CATCHER_KEIGO, Text_183E9F, Text_183EC0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A99C0 msgbox Text_183ED4, MSGBOX_AUTOCLOSE end @@ -326,7 +326,7 @@ EventScript_1A99C0:: @ 81A99C0 Route6_EventScript_1A99D7:: @ 81A99D7 trainerbattle_single TRAINER_BUG_CATCHER_ELIJAH, Text_183FF0, Text_18401A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A99FE msgbox Text_18402B, MSGBOX_AUTOCLOSE end @@ -339,7 +339,7 @@ EventScript_1A99FE:: @ 81A99FE Route6_EventScript_1A9A15:: @ 81A9A15 trainerbattle_single TRAINER_CAMPER_RICKY, Text_183E04, Text_183E2A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9A3C msgbox Text_183E3C, MSGBOX_AUTOCLOSE end @@ -352,7 +352,7 @@ EventScript_1A9A3C:: @ 81A9A3C Route6_EventScript_1A9A53:: @ 81A9A53 trainerbattle_single TRAINER_CAMPER_JEFF, Text_183F07, Text_183F24 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9A7A msgbox Text_183F51, MSGBOX_AUTOCLOSE end @@ -365,7 +365,7 @@ EventScript_1A9A7A:: @ 81A9A7A Route6_EventScript_1A9A91:: @ 81A9A91 trainerbattle_single TRAINER_PICNICKER_NANCY, Text_183E4E, Text_183E79 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9AB8 msgbox Text_183E8D, MSGBOX_AUTOCLOSE end @@ -378,7 +378,7 @@ EventScript_1A9AB8:: @ 81A9AB8 Route6_EventScript_1A9ACF:: @ 81A9ACF trainerbattle_single TRAINER_PICNICKER_ISABELLE, Text_183F90, Text_183FAB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9AF6 msgbox Text_183FC4, MSGBOX_AUTOCLOSE end @@ -388,140 +388,140 @@ EventScript_1A9AF6:: @ 81A9AF6 msgbox Text_183FC4, MSGBOX_AUTOCLOSE end -Route11_EventScript_1A9B0D:: @ 81A9B0D - trainerbattle_single TRAINER_YOUNGSTER_EDDIE, Text_184FBD, Text_184FD8 +Route11_EventScript_Eddie:: @ 81A9B0D + trainerbattle_single TRAINER_YOUNGSTER_EDDIE, Route11_Text_EddieIntro, Route11_Text_EddieDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A9B34 - msgbox Text_184FEF, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route11_EventScript_EddieRematch + msgbox Route11_Text_EddiePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9B34:: @ 81A9B34 - trainerbattle_rematch TRAINER_YOUNGSTER_EDDIE, Text_1C1DB5, Text_184FD8 - msgbox Text_184FEF, MSGBOX_AUTOCLOSE +Route11_EventScript_EddieRematch:: @ 81A9B34 + trainerbattle_rematch TRAINER_YOUNGSTER_EDDIE, Route11_Text_EddieRematchIntro, Route11_Text_EddieDefeat + msgbox Route11_Text_EddiePostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_1A9B4B:: @ 81A9B4B - trainerbattle_single TRAINER_YOUNGSTER_DILLON, Text_18506A, Text_18509B +Route11_EventScript_Dillon:: @ 81A9B4B + trainerbattle_single TRAINER_YOUNGSTER_DILLON, Route11_Text_DillonIntro, Route11_Text_DillonDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A9B72 - msgbox Text_1850CF, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route11_EventScript_DillonRematch + msgbox Route11_Text_DillonPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9B72:: @ 81A9B72 - trainerbattle_rematch TRAINER_YOUNGSTER_DILLON, Text_1C1E1F, Text_18509B - msgbox Text_1850CF, MSGBOX_AUTOCLOSE +Route11_EventScript_DillonRematch:: @ 81A9B72 + trainerbattle_rematch TRAINER_YOUNGSTER_DILLON, Route11_Text_DillonRematchIntro, Route11_Text_DillonDefeat + msgbox Route11_Text_DillonPostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_1A9B89:: @ 81A9B89 - trainerbattle_single TRAINER_YOUNGSTER_YASU, Text_18517B, Text_1851AC +Route11_EventScript_Yasu:: @ 81A9B89 + trainerbattle_single TRAINER_YOUNGSTER_YASU, Route11_Text_YasuIntro, Route11_Text_YasuDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A9BB0 - msgbox Text_1851D2, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route11_EventScript_YasuRematch + msgbox Route11_Text_YasuPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9BB0:: @ 81A9BB0 - trainerbattle_rematch TRAINER_YOUNGSTER_YASU, Text_1C1EE2, Text_1851AC - msgbox Text_1851D2, MSGBOX_AUTOCLOSE +Route11_EventScript_YasuRematch:: @ 81A9BB0 + trainerbattle_rematch TRAINER_YOUNGSTER_YASU, Route11_Text_YasuRematchIntro, Route11_Text_YasuDefeat + msgbox Route11_Text_YasuPostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_1A9BC7:: @ 81A9BC7 - trainerbattle_single TRAINER_YOUNGSTER_DAVE, Text_185285, Text_1852C1 +Route11_EventScript_Dave:: @ 81A9BC7 + trainerbattle_single TRAINER_YOUNGSTER_DAVE, Route11_Text_DaveIntro, Route11_Text_DaveDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A9BEE - msgbox Text_1852E3, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route11_EventScript_DaveRematch + msgbox Route11_Text_DavePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9BEE:: @ 81A9BEE - trainerbattle_rematch TRAINER_YOUNGSTER_DAVE, Text_1C1F40, Text_1852C1 - msgbox Text_1852E3, MSGBOX_AUTOCLOSE +Route11_EventScript_DaveRematch:: @ 81A9BEE + trainerbattle_rematch TRAINER_YOUNGSTER_DAVE, Route11_Text_DaveRematchIntro, Route11_Text_DaveDefeat + msgbox Route11_Text_DavePostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_1A9C05:: @ 81A9C05 - trainerbattle_single TRAINER_ENGINEER_BRAXTON, Text_185011, Text_185037 +Route11_EventScript_Braxton:: @ 81A9C05 + trainerbattle_single TRAINER_ENGINEER_BRAXTON, Route11_Text_BraxtonIntro, Route11_Text_BraxtonDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A9C2C - msgbox Text_18504A, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route11_EventScript_BraxtonRematch + msgbox Route11_Text_BraxtonPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9C2C:: @ 81A9C2C - trainerbattle_rematch TRAINER_ENGINEER_BRAXTON, Text_1C1DE1, Text_185037 - msgbox Text_18504A, MSGBOX_AUTOCLOSE +Route11_EventScript_BraxtonRematch:: @ 81A9C2C + trainerbattle_rematch TRAINER_ENGINEER_BRAXTON, Route11_Text_BraxtonRematchIntro, Route11_Text_BraxtonDefeat + msgbox Route11_Text_BraxtonPostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_1A9C43:: @ 81A9C43 - trainerbattle_single TRAINER_ENGINEER_BERNIE, Text_185236, Text_185250 +Route11_EventScript_Bernie:: @ 81A9C43 + trainerbattle_single TRAINER_ENGINEER_BERNIE, Route11_Text_BernieIntro, Route11_Text_BernieDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A9C6A - msgbox Text_185266, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route11_EventScript_BernieRematch + msgbox Route11_Text_BerniePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9C6A:: @ 81A9C6A - trainerbattle_rematch TRAINER_ENGINEER_BERNIE, Text_1C1F1D, Text_185250 - msgbox Text_185266, MSGBOX_AUTOCLOSE +Route11_EventScript_BernieRematch:: @ 81A9C6A + trainerbattle_rematch TRAINER_ENGINEER_BERNIE, Route11_Text_BernieRematchIntro, Route11_Text_BernieDefeat + msgbox Route11_Text_BerniePostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_1A9C81:: @ 81A9C81 - trainerbattle_single TRAINER_GAMER_HUGO, Text_184F01, Text_184F15 +Route11_EventScript_Hugo:: @ 81A9C81 + trainerbattle_single TRAINER_GAMER_HUGO, Route11_Text_HugoIntro, Route11_Text_HugoDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A9CA8 - msgbox Text_184F2E, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route11_EventScript_HugoRematch + msgbox Route11_Text_HugoPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9CA8:: @ 81A9CA8 - trainerbattle_rematch TRAINER_GAMER_HUGO, Text_1C1D50, Text_184F15 - msgbox Text_184F2E, MSGBOX_AUTOCLOSE +Route11_EventScript_HugoRematch:: @ 81A9CA8 + trainerbattle_rematch TRAINER_GAMER_HUGO, Route11_Text_HugoRematchIntro, Route11_Text_HugoDefeat + msgbox Route11_Text_HugoPostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_1A9CBF:: @ 81A9CBF - trainerbattle_single TRAINER_GAMER_JASPER, Text_184F5D, Text_184F7E +Route11_EventScript_Jasper:: @ 81A9CBF + trainerbattle_single TRAINER_GAMER_JASPER, Route11_Text_JasperIntro, Route11_Text_JasperDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A9CE6 - msgbox Text_184F8E, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route11_EventScript_JasperRematch + msgbox Route11_Text_JasperPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9CE6:: @ 81A9CE6 - trainerbattle_rematch TRAINER_GAMER_JASPER, Text_1C1D79, Text_184F7E - msgbox Text_184F8E, MSGBOX_AUTOCLOSE +Route11_EventScript_JasperRematch:: @ 81A9CE6 + trainerbattle_rematch TRAINER_GAMER_JASPER, Route11_Text_JasperRematchIntro, Route11_Text_JasperDefeat + msgbox Route11_Text_JasperPostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_1A9CFD:: @ 81A9CFD - trainerbattle_single TRAINER_GAMER_DIRK, Text_1850E9, Text_185105 +Route11_EventScript_Dirk:: @ 81A9CFD + trainerbattle_single TRAINER_GAMER_DIRK, Route11_Text_DirkIntro, Route11_Text_DirkDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A9D24 - msgbox Text_185114, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route11_EventScript_DirkRematch + msgbox Route11_Text_DirkPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9D24:: @ 81A9D24 - trainerbattle_rematch TRAINER_GAMER_DIRK, Text_1C1E57, Text_185105 - msgbox Text_185114, MSGBOX_AUTOCLOSE +Route11_EventScript_DirkRematch:: @ 81A9D24 + trainerbattle_rematch TRAINER_GAMER_DIRK, Route11_Text_DirkRematchIntro, Route11_Text_DirkDefeat + msgbox Route11_Text_DirkPostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_1A9D3B:: @ 81A9D3B - trainerbattle_single TRAINER_GAMER_DARIAN, Text_185135, Text_18514E +Route11_EventScript_Darian:: @ 81A9D3B + trainerbattle_single TRAINER_GAMER_DARIAN, Route11_Text_DarianIntro, Route11_Text_DarianDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A9D62 - msgbox Text_185161, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route11_EventScript_DarianRematch + msgbox Route11_Text_DarianPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9D62:: @ 81A9D62 - trainerbattle_rematch TRAINER_GAMER_DARIAN, Text_1C1E9F, Text_18514E - msgbox Text_185161, MSGBOX_AUTOCLOSE +Route11_EventScript_DarianRematch:: @ 81A9D62 + trainerbattle_rematch TRAINER_GAMER_DARIAN, Route11_Text_DarianRematchIntro, Route11_Text_DarianDefeat + msgbox Route11_Text_DarianPostBattle, MSGBOX_AUTOCLOSE end Route9_EventScript_1A9D79:: @ 81A9D79 trainerbattle_single TRAINER_BUG_CATCHER_BRENT, Text_184A2F, Text_184A6A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9DA0 msgbox Text_184A8C, MSGBOX_AUTOCLOSE end @@ -534,7 +534,7 @@ EventScript_1A9DA0:: @ 81A9DA0 Route9_EventScript_1A9DB7:: @ 81A9DB7 trainerbattle_single TRAINER_BUG_CATCHER_CONNER, Text_184B18, Text_184B32 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9DDE msgbox Text_184B3B, MSGBOX_AUTOCLOSE end @@ -547,7 +547,7 @@ EventScript_1A9DDE:: @ 81A9DDE Route9_EventScript_1A9DF5:: @ 81A9DF5 trainerbattle_single TRAINER_CAMPER_CHRIS, Text_184844, Text_18487E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9E1C msgbox Text_184890, MSGBOX_AUTOCLOSE end @@ -560,7 +560,7 @@ EventScript_1A9E1C:: @ 81A9E1C Route9_EventScript_1A9E33:: @ 81A9E33 trainerbattle_single TRAINER_CAMPER_DREW, Text_18489E, Text_1848CC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9E5A msgbox Text_1848DE, MSGBOX_AUTOCLOSE end @@ -573,7 +573,7 @@ EventScript_1A9E5A:: @ 81A9E5A Route9_EventScript_1A9E71:: @ 81A9E71 trainerbattle_single TRAINER_PICNICKER_ALICIA, Text_1847B7, Text_1847DF specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9E98 msgbox Text_1847F0, MSGBOX_AUTOCLOSE end @@ -586,7 +586,7 @@ EventScript_1A9E98:: @ 81A9E98 Route9_EventScript_1A9EAF:: @ 81A9EAF trainerbattle_single TRAINER_PICNICKER_CAITLIN, Text_1848FF, Text_18491C specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9ED6 msgbox Text_184931, MSGBOX_AUTOCLOSE end @@ -599,7 +599,7 @@ EventScript_1A9ED6:: @ 81A9ED6 Route9_EventScript_1A9EED:: @ 81A9EED trainerbattle_single TRAINER_HIKER_ALAN, Text_184ABE, Text_184AD5 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9F14 msgbox Text_184AF1, MSGBOX_AUTOCLOSE end @@ -612,7 +612,7 @@ EventScript_1A9F14:: @ 81A9F14 Route9_EventScript_1A9F2B:: @ 81A9F2B trainerbattle_single TRAINER_HIKER_BRICE, Text_1849DF, Text_184A04 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9F52 msgbox Text_184A11, MSGBOX_AUTOCLOSE end @@ -625,7 +625,7 @@ EventScript_1A9F52:: @ 81A9F52 Route9_EventScript_1A9F69:: @ 81A9F69 trainerbattle_single TRAINER_HIKER_JEREMY, Text_18495E, Text_18497F specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9F90 msgbox Text_1849B0, MSGBOX_AUTOCLOSE end @@ -635,88 +635,88 @@ EventScript_1A9F90:: @ 81A9F90 msgbox Text_1849B0, MSGBOX_AUTOCLOSE end -Route10_EventScript_1A9FA7:: @ 81A9FA7 - trainerbattle_single TRAINER_PICNICKER_HEIDI, Text_184CF1, Text_184D31 +Route10_EventScript_Heidi:: @ 81A9FA7 + trainerbattle_single TRAINER_PICNICKER_HEIDI, Route10_Text_HeidiIntro, Route10_Text_HeidiDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A9FCE - msgbox Text_184D4D, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route10_EventScript_HeidiRematch + msgbox Route10_Text_HeidiPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9FCE:: @ 81A9FCE - trainerbattle_rematch TRAINER_PICNICKER_HEIDI, Text_1C1C9A, Text_184D31 - msgbox Text_184D4D, MSGBOX_AUTOCLOSE +Route10_EventScript_HeidiRematch:: @ 81A9FCE + trainerbattle_rematch TRAINER_PICNICKER_HEIDI, Route10_Text_HeidiRematchIntro, Route10_Text_HeidiDefeat + msgbox Route10_Text_HeidiPostBattle, MSGBOX_AUTOCLOSE end -Route10_EventScript_1A9FE5:: @ 81A9FE5 - trainerbattle_single TRAINER_PICNICKER_CAROL, Text_184E04, Text_184E3B +Route10_EventScript_Carol:: @ 81A9FE5 + trainerbattle_single TRAINER_PICNICKER_CAROL, Route10_Text_CarolIntro, Route10_Text_CarolDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA00C - msgbox Text_184E5E, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route10_EventScript_CarolRematch + msgbox Route10_Text_CarolPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA00C:: @ 81AA00C - trainerbattle_rematch TRAINER_PICNICKER_CAROL, Text_1C1D14, Text_184E3B - msgbox Text_184E5E, MSGBOX_AUTOCLOSE +Route10_EventScript_CarolRematch:: @ 81AA00C + trainerbattle_rematch TRAINER_PICNICKER_CAROL, Route10_Text_CarolRematchIntro, Route10_Text_CarolDefeat + msgbox Route10_Text_CarolPostBattle, MSGBOX_AUTOCLOSE end -Route10_EventScript_1AA023:: @ 81AA023 - trainerbattle_single TRAINER_POKEMANIAC_MARK, Text_184B8A, Text_184BE5 +Route10_EventScript_Mark:: @ 81AA023 + trainerbattle_single TRAINER_POKEMANIAC_MARK, Route10_Text_MarkIntro, Route10_Text_MarkDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA04A - msgbox Text_184BFB, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route10_EventScript_MarkRematch + msgbox Route10_Text_MarkPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA04A:: @ 81AA04A - trainerbattle_rematch TRAINER_POKEMANIAC_MARK, Text_1C1BFA, Text_184BE5 - msgbox Text_184BFB, MSGBOX_AUTOCLOSE +Route10_EventScript_MarkRematch:: @ 81AA04A + trainerbattle_rematch TRAINER_POKEMANIAC_MARK, Route10_Text_MarkRematchIntro, Route10_Text_MarkDefeat + msgbox Route10_Text_MarkPostBattle, MSGBOX_AUTOCLOSE end -Route10_EventScript_1AA061:: @ 81AA061 - trainerbattle_single TRAINER_POKEMANIAC_HERMAN, Text_184C86, Text_184CA7 +Route10_EventScript_Herman:: @ 81AA061 + trainerbattle_single TRAINER_POKEMANIAC_HERMAN, Route10_Text_HermanIntro, Route10_Text_HermanDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA088 - msgbox Text_184CBB, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route10_EventScript_HermanRematch + msgbox Route10_Text_HermanPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA088:: @ 81AA088 - trainerbattle_rematch TRAINER_POKEMANIAC_HERMAN, Text_1C1C76, Text_184CA7 - msgbox Text_184CBB, MSGBOX_AUTOCLOSE +Route10_EventScript_HermanRematch:: @ 81AA088 + trainerbattle_rematch TRAINER_POKEMANIAC_HERMAN, Route10_Text_HermanRematchIntro, Route10_Text_HermanDefeat + msgbox Route10_Text_HermanPostBattle, MSGBOX_AUTOCLOSE end -Route10_EventScript_1AA09F:: @ 81AA09F - trainerbattle_single TRAINER_HIKER_CLARK, Text_184C1D, Text_184C2D +Route10_EventScript_Clark:: @ 81AA09F + trainerbattle_single TRAINER_HIKER_CLARK, Route10_Text_ClarkIntro, Route10_Text_ClarkDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA0C6 - msgbox Text_184C60, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route10_EventScript_ClarkRematch + msgbox Route10_Text_ClarkPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA0C6:: @ 81AA0C6 - trainerbattle_rematch TRAINER_HIKER_CLARK, Text_1C1C4F, Text_184C2D - msgbox Text_184C60, MSGBOX_AUTOCLOSE +Route10_EventScript_ClarkRematch:: @ 81AA0C6 + trainerbattle_rematch TRAINER_HIKER_CLARK, Route10_Text_ClarkRematchIntro, Route10_Text_ClarkDefeat + msgbox Route10_Text_ClarkPostBattle, MSGBOX_AUTOCLOSE end -Route10_EventScript_1AA0DD:: @ 81AA0DD - trainerbattle_single TRAINER_HIKER_TRENT, Text_184DAA, Text_184DCE +Route10_EventScript_Trent:: @ 81AA0DD + trainerbattle_single TRAINER_HIKER_TRENT, Route10_Text_TrentIntro, Route10_Text_TrentDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA104 - msgbox Text_184DE4, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route10_EventScript_TrentRematch + msgbox Route10_Text_TrentPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA104:: @ 81AA104 - trainerbattle_rematch TRAINER_HIKER_TRENT, Text_1C1CD3, Text_184DCE - msgbox Text_184DE4, MSGBOX_AUTOCLOSE +Route10_EventScript_TrentRematch:: @ 81AA104 + trainerbattle_rematch TRAINER_HIKER_TRENT, Route10_Text_TrentRematchIntro, Route10_Text_TrentDefeat + msgbox Route10_Text_TrentPostBattle, MSGBOX_AUTOCLOSE end Route8_EventScript_1AA11B:: @ 81AA11B trainerbattle_single TRAINER_LASS_PAIGE, Text_1841ED, Text_184210 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA142 msgbox Text_18421B, MSGBOX_AUTOCLOSE end @@ -729,7 +729,7 @@ EventScript_1AA142:: @ 81AA142 Route8_EventScript_1AA159:: @ 81AA159 trainerbattle_single TRAINER_LASS_ANDREA, Text_184321, Text_184346 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA180 msgbox Text_184350, MSGBOX_AUTOCLOSE end @@ -742,7 +742,7 @@ EventScript_1AA180:: @ 81AA180 Route8_EventScript_1AA197:: @ 81AA197 trainerbattle_single TRAINER_LASS_MEGAN, Text_18437A, Text_1843A6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA1BE msgbox Text_1843D2, MSGBOX_AUTOCLOSE end @@ -755,7 +755,7 @@ EventScript_1AA1BE:: @ 81AA1BE Route8_EventScript_1AA1D5:: @ 81AA1D5 trainerbattle_single TRAINER_LASS_JULIA, Text_1844AC, Text_1844D6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA1FC msgbox Text_1844FD, MSGBOX_AUTOCLOSE end @@ -768,7 +768,7 @@ EventScript_1AA1FC:: @ 81AA1FC Route8_EventScript_1AA213:: @ 81AA213 trainerbattle_single TRAINER_SUPER_NERD_AIDAN, Text_1840C5, Text_184100 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA23A msgbox Text_18410E, MSGBOX_AUTOCLOSE end @@ -781,7 +781,7 @@ EventScript_1AA23A:: @ 81AA23A Route8_EventScript_1AA251:: @ 81AA251 trainerbattle_single TRAINER_SUPER_NERD_GLENN, Text_18417C, Text_1841B6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA278 msgbox Text_1841C8, MSGBOX_AUTOCLOSE end @@ -794,7 +794,7 @@ EventScript_1AA278:: @ 81AA278 Route8_EventScript_1AA28F:: @ 81AA28F trainerbattle_single TRAINER_SUPER_NERD_LESLIE, Text_184257, Text_18427A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA2B6 msgbox Text_1842B3, MSGBOX_AUTOCLOSE end @@ -807,7 +807,7 @@ EventScript_1AA2B6:: @ 81AA2B6 Route8_EventScript_1AA2CD:: @ 81AA2CD trainerbattle_single TRAINER_GAMER_STAN, Text_18412F, Text_18414D specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA2F4 msgbox Text_184162, MSGBOX_AUTOCLOSE end @@ -820,7 +820,7 @@ EventScript_1AA2F4:: @ 81AA2F4 Route8_EventScript_1AA30B:: @ 81AA30B trainerbattle_single TRAINER_GAMER_RICH, Text_184432, Text_18444F specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA332 msgbox Text_184466, MSGBOX_AUTOCLOSE end @@ -833,7 +833,7 @@ EventScript_1AA332:: @ 81AA332 Route8_EventScript_1AA349:: @ 81AA349 trainerbattle_double TRAINER_TWINS_ELI_ANNE, Text_1845A4, Text_1845D0, Text_184616 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA374 msgbox Text_1845F2, MSGBOX_AUTOCLOSE end @@ -846,7 +846,7 @@ EventScript_1AA374:: @ 81AA374 Route8_EventScript_1AA38F:: @ 81AA38F trainerbattle_double TRAINER_TWINS_ELI_ANNE, Text_18464A, Text_184675, Text_1846AF specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA3BA msgbox Text_18468B, MSGBOX_AUTOCLOSE end @@ -859,7 +859,7 @@ EventScript_1AA3BA:: @ 81AA3BA Route8_EventScript_1AA3D5:: @ 81AA3D5 trainerbattle_single TRAINER_BIKER_RICARDO, Text_1846E2, Text_1846FC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA3FC msgbox Text_184719, MSGBOX_AUTOCLOSE end @@ -872,7 +872,7 @@ EventScript_1AA3FC:: @ 81AA3FC Route8_EventScript_1AA413:: @ 81AA413 trainerbattle_single TRAINER_BIKER_JAREN, Text_184742, Text_184767 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA43A msgbox Text_18477A, MSGBOX_AUTOCLOSE end @@ -882,413 +882,413 @@ EventScript_1AA43A:: @ 81AA43A msgbox Text_18477A, MSGBOX_AUTOCLOSE end -Route12_EventScript_1AA451:: @ 81AA451 - trainerbattle_single TRAINER_FISHERMAN_NED, Text_185402, Text_18541B +Route12_EventScript_Ned:: @ 81AA451 + trainerbattle_single TRAINER_FISHERMAN_NED, Route12_Text_NedIntro, Route12_Text_NedDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA478 - msgbox Text_185432, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route12_EventScript_NedRematch + msgbox Route12_Text_NedPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA478:: @ 81AA478 - trainerbattle_rematch TRAINER_FISHERMAN_NED, Text_1C1F9D, Text_18541B - msgbox Text_185432, MSGBOX_AUTOCLOSE +Route12_EventScript_NedRematch:: @ 81AA478 + trainerbattle_rematch TRAINER_FISHERMAN_NED, Route12_Text_NedRematchIntro, Route12_Text_NedDefeat + msgbox Route12_Text_NedPostBattle, MSGBOX_AUTOCLOSE end -Route12_EventScript_1AA48F:: @ 81AA48F - trainerbattle_single TRAINER_FISHERMAN_CHIP, Text_18544E, Text_185475 +Route12_EventScript_Chip:: @ 81AA48F + trainerbattle_single TRAINER_FISHERMAN_CHIP, Route12_Text_ChipIntro, Route12_Text_ChipDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA4B6 - msgbox Text_185488, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route12_EventScript_ChipRematch + msgbox Route12_Text_ChipPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA4B6:: @ 81AA4B6 - trainerbattle_rematch TRAINER_FISHERMAN_CHIP, Text_1C1FD8, Text_185475 - msgbox Text_185488, MSGBOX_AUTOCLOSE +Route12_EventScript_ChipRematch:: @ 81AA4B6 + trainerbattle_rematch TRAINER_FISHERMAN_CHIP, Route12_Text_ChipRematchIntro, Route12_Text_ChipDefeat + msgbox Route12_Text_ChipPostBattle, MSGBOX_AUTOCLOSE end -Route12_EventScript_1AA4CD:: @ 81AA4CD - trainerbattle_single TRAINER_FISHERMAN_HANK, Text_1855E1, Text_185606 +Route12_EventScript_Hank:: @ 81AA4CD + trainerbattle_single TRAINER_FISHERMAN_HANK, Route12_Text_HankIntro, Route12_Text_HankDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA4F4 - msgbox Text_185616, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route12_EventScript_HankRematch + msgbox Route12_Text_HankPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA4F4:: @ 81AA4F4 - trainerbattle_rematch TRAINER_FISHERMAN_HANK, Text_1C209C, Text_185606 - msgbox Text_185616, MSGBOX_AUTOCLOSE +Route12_EventScript_HankRematch:: @ 81AA4F4 + trainerbattle_rematch TRAINER_FISHERMAN_HANK, Route12_Text_HankRematchIntro, Route12_Text_HankDefeat + msgbox Route12_Text_HankPostBattle, MSGBOX_AUTOCLOSE end -Route12_EventScript_1AA50B:: @ 81AA50B - trainerbattle_single TRAINER_FISHERMAN_ELLIOT, Text_185682, Text_1856D0 +Route12_EventScript_Elliot:: @ 81AA50B + trainerbattle_single TRAINER_FISHERMAN_ELLIOT, Route12_Text_ElliotIntro, Route12_Text_ElliotDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA532 - msgbox Text_1856DF, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route12_EventScript_ElliotRematch + msgbox Route12_Text_ElliotPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA532:: @ 81AA532 - trainerbattle_rematch TRAINER_FISHERMAN_ELLIOT, Text_1C20D4, Text_1856D0 - msgbox Text_1856DF, MSGBOX_AUTOCLOSE +Route12_EventScript_ElliotRematch:: @ 81AA532 + trainerbattle_rematch TRAINER_FISHERMAN_ELLIOT, Route12_Text_ElliotRematchIntro, Route12_Text_ElliotDefeat + msgbox Route12_Text_ElliotPostBattle, MSGBOX_AUTOCLOSE end -Route12_EventScript_1AA549:: @ 81AA549 - trainerbattle_single TRAINER_FISHERMAN_ANDREW, Text_18570E, Text_185744 +Route12_EventScript_Andrew:: @ 81AA549 + trainerbattle_single TRAINER_FISHERMAN_ANDREW, Route12_Text_AndrewIntro, Route12_Text_AndrewDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA570 - msgbox Text_18574D, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route12_EventScript_AndrewRematch + msgbox Route12_Text_AndrewPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA570:: @ 81AA570 - trainerbattle_rematch TRAINER_FISHERMAN_ANDREW, Text_1C2134, Text_185744 - msgbox Text_18574D, MSGBOX_AUTOCLOSE +Route12_EventScript_AndrewRematch:: @ 81AA570 + trainerbattle_rematch TRAINER_FISHERMAN_ANDREW, Route12_Text_AndrewRematchIntro, Route12_Text_AndrewDefeat + msgbox Route12_Text_AndrewPostBattle, MSGBOX_AUTOCLOSE end -Route12_EventScript_1AA587:: @ 81AA587 - trainerbattle_single TRAINER_ROCKER_LUCA, Text_185547, Text_18559B +Route12_EventScript_Luca:: @ 81AA587 + trainerbattle_single TRAINER_ROCKER_LUCA, Route12_Text_LucaIntro, Route12_Text_LucaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA5AE - msgbox Text_1855A6, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route12_EventScript_LucaRematch + msgbox Route12_Text_LucaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA5AE:: @ 81AA5AE - trainerbattle_rematch TRAINER_ROCKER_LUCA, Text_1C203B, Text_18559B - msgbox Text_1855A6, MSGBOX_AUTOCLOSE +Route12_EventScript_LucaRematch:: @ 81AA5AE + trainerbattle_rematch TRAINER_ROCKER_LUCA, Route12_Text_LucaRematchIntro, Route12_Text_LucaDefeat + msgbox Route12_Text_LucaPostBattle, MSGBOX_AUTOCLOSE end -Route12_EventScript_1AA5C5:: @ 81AA5C5 - trainerbattle_single TRAINER_CAMPER_JUSTIN, Text_1854B9, Text_1854ED +Route12_EventScript_Justin:: @ 81AA5C5 + trainerbattle_single TRAINER_CAMPER_JUSTIN, Route12_Text_JustinIntro, Route12_Text_JustinDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA5EC - msgbox Text_1854F2, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route12_EventScript_JustinRematch + msgbox Route12_Text_JustinPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA5EC:: @ 81AA5EC - trainerbattle_rematch TRAINER_CAMPER_JUSTIN, Text_1C2008, Text_1854ED - msgbox Text_1854F2, MSGBOX_AUTOCLOSE +Route12_EventScript_JustinRematch:: @ 81AA5EC + trainerbattle_rematch TRAINER_CAMPER_JUSTIN, Route12_Text_JustinRematchIntro, Route12_Text_JustinDefeat + msgbox Route12_Text_JustinPostBattle, MSGBOX_AUTOCLOSE end -Route12_EventScript_1AA603:: @ 81AA603 - trainerbattle_double TRAINER_YOUNG_COUPLE_GIA_JES, Text_1857C5, Text_1857F1, Text_185842 +Route12_EventScript_Jes:: @ 81AA603 + trainerbattle_double TRAINER_YOUNG_COUPLE_GIA_JES, Route12_Text_JesIntro, Route12_Text_JesDefeat, Route12_Text_JesNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA62E - msgbox Text_18581F, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route12_EventScript_JesRematch + msgbox Route12_Text_JesPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA62E:: @ 81AA62E - trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_GIA_JES, Text_1C216B, Text_1857F1, Text_185842 - msgbox Text_18581F, MSGBOX_AUTOCLOSE +Route12_EventScript_JesRematch:: @ 81AA62E + trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_GIA_JES, Route12_Text_JesRematchIntro, Route12_Text_JesDefeat, Route12_Text_JesNotEnoughMons + msgbox Route12_Text_JesPostBattle, MSGBOX_AUTOCLOSE end -Route12_EventScript_1AA649:: @ 81AA649 - trainerbattle_double TRAINER_YOUNG_COUPLE_GIA_JES, Text_1858A6, Text_1858D0, Text_185908 +Route12_EventScript_Gia:: @ 81AA649 + trainerbattle_double TRAINER_YOUNG_COUPLE_GIA_JES, Route12_Text_GiaIntro, Route12_Text_GiaDefeat, Route12_Text_GiaNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA674 - msgbox Text_1858E2, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route12_EventScript_GiaRematch + msgbox Route12_Text_GiaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA674:: @ 81AA674 - trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_GIA_JES, Text_1C219B, Text_1858D0, Text_185908 - msgbox Text_1858E2, MSGBOX_AUTOCLOSE +Route12_EventScript_GiaRematch:: @ 81AA674 + trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_GIA_JES, Route12_Text_GiaRematchIntro, Route12_Text_GiaDefeat, Route12_Text_GiaNotEnoughMons + msgbox Route12_Text_GiaPostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_1AA68F:: @ 81AA68F - trainerbattle_single TRAINER_BIKER_JARED, Text_185D05, Text_185D1D +Route13_EventScript_Jared:: @ 81AA68F + trainerbattle_single TRAINER_BIKER_JARED, Route13_Text_JaredIntro, Route13_Text_JaredDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA6B6 - msgbox Text_185D33, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route13_EventScript_JaredRematch + msgbox Route13_Text_JaredPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA6B6:: @ 81AA6B6 - trainerbattle_rematch TRAINER_BIKER_JARED, Text_1C236B, Text_185D1D - msgbox Text_185D33, MSGBOX_AUTOCLOSE +Route13_EventScript_JaredRematch:: @ 81AA6B6 + trainerbattle_rematch TRAINER_BIKER_JARED, Route13_Text_JaredRematchIntro, Route13_Text_JaredDefeat + msgbox Route13_Text_JaredPostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_1AA6CD:: @ 81AA6CD - trainerbattle_single TRAINER_BEAUTY_LOLA, Text_185BFC, Text_185C1F +Route13_EventScript_Lola:: @ 81AA6CD + trainerbattle_single TRAINER_BEAUTY_LOLA, Route13_Text_LolaIntro, Route13_Text_LolaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA6F4 - msgbox Text_185C35, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route13_EventScript_LolaRematch + msgbox Route13_Text_LolaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA6F4:: @ 81AA6F4 - trainerbattle_rematch TRAINER_BEAUTY_LOLA, Text_1C2306, Text_185C1F - msgbox Text_185C35, MSGBOX_AUTOCLOSE +Route13_EventScript_LolaRematch:: @ 81AA6F4 + trainerbattle_rematch TRAINER_BEAUTY_LOLA, Route13_Text_LolaRematchIntro, Route13_Text_LolaDefeat + msgbox Route13_Text_LolaPostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_1AA70B:: @ 81AA70B - trainerbattle_single TRAINER_BEAUTY_SHEILA, Text_185C69, Text_185C95 +Route13_EventScript_Sheila:: @ 81AA70B + trainerbattle_single TRAINER_BEAUTY_SHEILA, Route13_Text_SheilaIntro, Route13_Text_SheilaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA732 - msgbox Text_185CA8, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route13_EventScript_SheilaRematch + msgbox Route13_Text_SheilaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA732:: @ 81AA732 - trainerbattle_rematch TRAINER_BEAUTY_SHEILA, Text_1C2340, Text_185C95 - msgbox Text_185CA8, MSGBOX_AUTOCLOSE +Route13_EventScript_SheilaRematch:: @ 81AA732 + trainerbattle_rematch TRAINER_BEAUTY_SHEILA, Route13_Text_SheilaRematchIntro, Route13_Text_SheilaDefeat + msgbox Route13_Text_SheilaPostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_1AA749:: @ 81AA749 - trainerbattle_single TRAINER_BIRD_KEEPER_SEBASTIAN, Text_185955, Text_18597E +Route13_EventScript_Sebastian:: @ 81AA749 + trainerbattle_single TRAINER_BIRD_KEEPER_SEBASTIAN, Route13_Text_SebastianIntro, Route13_Text_SebastianDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA770 - msgbox Text_1859A2, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route13_EventScript_SebastianRematch + msgbox Route13_Text_SebastianPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA770:: @ 81AA770 - trainerbattle_rematch TRAINER_BIRD_KEEPER_SEBASTIAN, Text_1C21EE, Text_18597E - msgbox Text_1859A2, MSGBOX_AUTOCLOSE +Route13_EventScript_SebastianRematch:: @ 81AA770 + trainerbattle_rematch TRAINER_BIRD_KEEPER_SEBASTIAN, Route13_Text_SebastianRematchIntro, Route13_Text_SebastianDefeat + msgbox Route13_Text_SebastianPostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_1AA787:: @ 81AA787 - trainerbattle_single TRAINER_BIRD_KEEPER_PERRY, Text_185B8F, Text_185BCA +Route13_EventScript_Perry:: @ 81AA787 + trainerbattle_single TRAINER_BIRD_KEEPER_PERRY, Route13_Text_PerryIntro, Route13_Text_PerryDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA7AE - msgbox Text_185BDB, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route13_EventScript_PerryRematch + msgbox Route13_Text_PerryPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA7AE:: @ 81AA7AE - trainerbattle_rematch TRAINER_BIRD_KEEPER_PERRY, Text_1C22CA, Text_185BCA - msgbox Text_185BDB, MSGBOX_AUTOCLOSE +Route13_EventScript_PerryRematch:: @ 81AA7AE + trainerbattle_rematch TRAINER_BIRD_KEEPER_PERRY, Route13_Text_PerryRematchIntro, Route13_Text_PerryDefeat + msgbox Route13_Text_PerryPostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_1AA7C5:: @ 81AA7C5 - trainerbattle_single TRAINER_BIRD_KEEPER_ROBERT, Text_185D3D, Text_185D7B +Route13_EventScript_Robert:: @ 81AA7C5 + trainerbattle_single TRAINER_BIRD_KEEPER_ROBERT, Route13_Text_RobertIntro, Route13_Text_RobertDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA7EC - msgbox Text_185D89, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route13_EventScript_RobertRematch + msgbox Route13_Text_RobertPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA7EC:: @ 81AA7EC - trainerbattle_rematch TRAINER_BIRD_KEEPER_ROBERT, Text_1C2383, Text_185D7B - msgbox Text_185D89, MSGBOX_AUTOCLOSE +Route13_EventScript_RobertRematch:: @ 81AA7EC + trainerbattle_rematch TRAINER_BIRD_KEEPER_ROBERT, Route13_Text_RobertRematchIntro, Route13_Text_RobertDefeat + msgbox Route13_Text_RobertPostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_1AA803:: @ 81AA803 - trainerbattle_single TRAINER_PICNICKER_ALMA, Text_185B12, Text_185B48 +Route13_EventScript_Alma:: @ 81AA803 + trainerbattle_single TRAINER_PICNICKER_ALMA, Route13_Text_AlmaIntro, Route13_Text_AlmaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA82A - msgbox Text_185B67, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route13_EventScript_AlmaRematch + msgbox Route13_Text_AlmaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA82A:: @ 81AA82A - trainerbattle_rematch TRAINER_PICNICKER_ALMA, Text_1C2299, Text_185B48 - msgbox Text_185B67, MSGBOX_AUTOCLOSE +Route13_EventScript_AlmaRematch:: @ 81AA82A + trainerbattle_rematch TRAINER_PICNICKER_ALMA, Route13_Text_AlmaRematchIntro, Route13_Text_AlmaDefeat + msgbox Route13_Text_AlmaPostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_1AA841:: @ 81AA841 - trainerbattle_single TRAINER_PICNICKER_SUSIE, Text_1859CF, Text_1859EC +Route13_EventScript_Susie:: @ 81AA841 + trainerbattle_single TRAINER_PICNICKER_SUSIE, Route13_Text_SusieIntro, Route13_Text_SusieDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA868 - msgbox Text_1859F9, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route13_EventScript_SusieRematch + msgbox Route13_Text_SusiePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA868:: @ 81AA868 - trainerbattle_rematch TRAINER_PICNICKER_SUSIE, Text_1C220C, Text_1859EC - msgbox Text_1859F9, MSGBOX_AUTOCLOSE +Route13_EventScript_SusieRematch:: @ 81AA868 + trainerbattle_rematch TRAINER_PICNICKER_SUSIE, Route13_Text_SusieRematchIntro, Route13_Text_SusieDefeat + msgbox Route13_Text_SusiePostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_1AA87F:: @ 81AA87F - trainerbattle_single TRAINER_PICNICKER_VALERIE, Text_185A37, Text_185A56 +Route13_EventScript_Valerie:: @ 81AA87F + trainerbattle_single TRAINER_PICNICKER_VALERIE, Route13_Text_ValerieIntro, Route13_Text_ValerieDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA8A6 - msgbox Text_185A62, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route13_EventScript_ValerieRematch + msgbox Route13_Text_ValeriePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA8A6:: @ 81AA8A6 - trainerbattle_rematch TRAINER_PICNICKER_VALERIE, Text_1C223C, Text_185A56 - msgbox Text_185A62, MSGBOX_AUTOCLOSE +Route13_EventScript_ValerieRematch:: @ 81AA8A6 + trainerbattle_rematch TRAINER_PICNICKER_VALERIE, Route13_Text_ValerieRematchIntro, Route13_Text_ValerieDefeat + msgbox Route13_Text_ValeriePostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_1AA8BD:: @ 81AA8BD - trainerbattle_single TRAINER_PICNICKER_GWEN, Text_185A91, Text_185AC1 +Route13_EventScript_Gwen:: @ 81AA8BD + trainerbattle_single TRAINER_PICNICKER_GWEN, Route13_Text_GwenIntro, Route13_Text_GwenDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA8E4 - msgbox Text_185ADE, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route13_EventScript_GwenRematch + msgbox Route13_Text_GwenPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA8E4:: @ 81AA8E4 - trainerbattle_rematch TRAINER_PICNICKER_GWEN, Text_1C225B, Text_185AC1 - msgbox Text_185ADE, MSGBOX_AUTOCLOSE +Route13_EventScript_GwenRematch:: @ 81AA8E4 + trainerbattle_rematch TRAINER_PICNICKER_GWEN, Route13_Text_GwenRematchIntro, Route13_Text_GwenDefeat + msgbox Route13_Text_GwenPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_1AA8FB:: @ 81AA8FB - trainerbattle_single TRAINER_BIKER_MALIK, Text_186344, Text_186362 +Route14_EventScript_Malik:: @ 81AA8FB + trainerbattle_single TRAINER_BIKER_MALIK, Route14_Text_MalikIntro, Route14_Text_MalikDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA922 - msgbox Text_18636E, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route14_EventScript_MalikRematch + msgbox Route14_Text_MalikPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA922:: @ 81AA922 - trainerbattle_rematch TRAINER_BIKER_MALIK, Text_1C25D6, Text_186362 - msgbox Text_18636E, MSGBOX_AUTOCLOSE +Route14_EventScript_MalikRematch:: @ 81AA922 + trainerbattle_rematch TRAINER_BIKER_MALIK, Route14_Text_MalikRematchIntro, Route14_Text_MalikDefeat + msgbox Route14_Text_MalikPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_1AA939:: @ 81AA939 - trainerbattle_single TRAINER_BIKER_LUKAS, Text_1861F7, Text_186223 +Route14_EventScript_Lukas:: @ 81AA939 + trainerbattle_single TRAINER_BIKER_LUKAS, Route14_Text_LukasIntro, Route14_Text_LukasDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA960 - msgbox Text_186239, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route14_EventScript_LukasRematch + msgbox Route14_Text_LukasPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA960:: @ 81AA960 - trainerbattle_rematch TRAINER_BIKER_LUKAS, Text_1C2531, Text_186223 - msgbox Text_186239, MSGBOX_AUTOCLOSE +Route14_EventScript_LukasRematch:: @ 81AA960 + trainerbattle_rematch TRAINER_BIKER_LUKAS, Route14_Text_LukasRematchIntro, Route14_Text_LukasDefeat + msgbox Route14_Text_LukasPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_1AA977:: @ 81AA977 - trainerbattle_single TRAINER_BIKER_ISAAC, Text_186263, Text_186291 +Route14_EventScript_Isaac:: @ 81AA977 + trainerbattle_single TRAINER_BIKER_ISAAC, Route14_Text_IsaacIntro, Route14_Text_IsaacDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA99E - msgbox Text_18629D, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route14_EventScript_IsaacRematch + msgbox Route14_Text_IsaacPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA99E:: @ 81AA99E - trainerbattle_rematch TRAINER_BIKER_ISAAC, Text_1C2572, Text_186291 - msgbox Text_18629D, MSGBOX_AUTOCLOSE +Route14_EventScript_IsaacRematch:: @ 81AA99E + trainerbattle_rematch TRAINER_BIKER_ISAAC, Route14_Text_IsaacRematchIntro, Route14_Text_IsaacDefeat + msgbox Route14_Text_IsaacPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_1AA9B5:: @ 81AA9B5 - trainerbattle_single TRAINER_BIKER_GERALD, Text_1862BD, Text_1862EF +Route14_EventScript_Gerald:: @ 81AA9B5 + trainerbattle_single TRAINER_BIKER_GERALD, Route14_Text_GeraldIntro, Route14_Text_GeraldDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AA9DC - msgbox Text_1862F8, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route14_EventScript_GeraldRematch + msgbox Route14_Text_GeraldPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AA9DC:: @ 81AA9DC - trainerbattle_rematch TRAINER_BIKER_GERALD, Text_1C259E, Text_1862EF - msgbox Text_1862F8, MSGBOX_AUTOCLOSE +Route14_EventScript_GeraldRematch:: @ 81AA9DC + trainerbattle_rematch TRAINER_BIKER_GERALD, Route14_Text_GeraldRematchIntro, Route14_Text_GeraldDefeat + msgbox Route14_Text_GeraldPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_1AA9F3:: @ 81AA9F3 - trainerbattle_single TRAINER_BIRD_KEEPER_DONALD, Text_1860D9, Text_18610A +Route14_EventScript_Donald:: @ 81AA9F3 + trainerbattle_single TRAINER_BIRD_KEEPER_DONALD, Route14_Text_DonaldIntro, Route14_Text_DonaldDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AAA1A - msgbox Text_18611D, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route14_EventScript_DonaldRematch + msgbox Route14_Text_DonaldPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAA1A:: @ 81AAA1A - trainerbattle_rematch TRAINER_BIRD_KEEPER_DONALD, Text_1C24CB, Text_18610A - msgbox Text_18611D, MSGBOX_AUTOCLOSE +Route14_EventScript_DonaldRematch:: @ 81AAA1A + trainerbattle_rematch TRAINER_BIRD_KEEPER_DONALD, Route14_Text_DonaldRematchIntro, Route14_Text_DonaldDefeat + msgbox Route14_Text_DonaldPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_1AAA31:: @ 81AAA31 - trainerbattle_single TRAINER_BIRD_KEEPER_BENNY, Text_18618E, Text_1861B3 +Route14_EventScript_Benny:: @ 81AAA31 + trainerbattle_single TRAINER_BIRD_KEEPER_BENNY, Route14_Text_BennyIntro, Route14_Text_BennyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AAA58 - msgbox Text_1861BE, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route14_EventScript_BennyRematch + msgbox Route14_Text_BennyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAA58:: @ 81AAA58 - trainerbattle_rematch TRAINER_BIRD_KEEPER_BENNY, Text_1C2505, Text_1861B3 - msgbox Text_1861BE, MSGBOX_AUTOCLOSE +Route14_EventScript_BennyRematch:: @ 81AAA58 + trainerbattle_rematch TRAINER_BIRD_KEEPER_BENNY, Route14_Text_BennyRematchIntro, Route14_Text_BennyDefeat + msgbox Route14_Text_BennyPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_1AAA6F:: @ 81AAA6F - trainerbattle_single TRAINER_BIRD_KEEPER_CARTER, Text_185E4D, Text_185E81 +Route14_EventScript_Carter:: @ 81AAA6F + trainerbattle_single TRAINER_BIRD_KEEPER_CARTER, Route14_Text_CarterIntro, Route14_Text_CarterDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AAA96 - msgbox Text_185E9C, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route14_EventScript_CarterRematch + msgbox Route14_Text_CarterPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAA96:: @ 81AAA96 - trainerbattle_rematch TRAINER_BIRD_KEEPER_CARTER, Text_1C23C1, Text_185E81 - msgbox Text_185E9C, MSGBOX_AUTOCLOSE +Route14_EventScript_CarterRematch:: @ 81AAA96 + trainerbattle_rematch TRAINER_BIRD_KEEPER_CARTER, Route14_Text_CarterRematchIntro, Route14_Text_CarterDefeat + msgbox Route14_Text_CarterPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_1AAAAD:: @ 81AAAAD - trainerbattle_single TRAINER_BIRD_KEEPER_MITCH, Text_185EDF, Text_185F0B +Route14_EventScript_Mitch:: @ 81AAAAD + trainerbattle_single TRAINER_BIRD_KEEPER_MITCH, Route14_Text_MitchIntro, Route14_Text_MitchDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AAAD4 - msgbox Text_185F1A, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route14_EventScript_MitchRematch + msgbox Route14_Text_MitchPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAAD4:: @ 81AAAD4 - trainerbattle_rematch TRAINER_BIRD_KEEPER_MITCH, Text_1C23EF, Text_185F0B - msgbox Text_185F1A, MSGBOX_AUTOCLOSE +Route14_EventScript_MitchRematch:: @ 81AAAD4 + trainerbattle_rematch TRAINER_BIRD_KEEPER_MITCH, Route14_Text_MitchRematchIntro, Route14_Text_MitchDefeat + msgbox Route14_Text_MitchPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_1AAAEB:: @ 81AAAEB - trainerbattle_single TRAINER_BIRD_KEEPER_BECK, Text_185F46, Text_185FAE +Route14_EventScript_Beck:: @ 81AAAEB + trainerbattle_single TRAINER_BIRD_KEEPER_BECK, Route14_Text_BeckIntro, Route14_Text_BeckDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AAB12 - msgbox Text_185FBB, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route14_EventScript_BeckRematch + msgbox Route14_Text_BeckPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAB12:: @ 81AAB12 - trainerbattle_rematch TRAINER_BIRD_KEEPER_BECK, Text_1C2425, Text_185FAE - msgbox Text_185FBB, MSGBOX_AUTOCLOSE +Route14_EventScript_BeckRematch:: @ 81AAB12 + trainerbattle_rematch TRAINER_BIRD_KEEPER_BECK, Route14_Text_BeckRematchIntro, Route14_Text_BeckDefeat + msgbox Route14_Text_BeckPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_1AAB29:: @ 81AAB29 - trainerbattle_single TRAINER_BIRD_KEEPER_MARLON, Text_186021, Text_18607C +Route14_EventScript_Marlon:: @ 81AAB29 + trainerbattle_single TRAINER_BIRD_KEEPER_MARLON, Route14_Text_MarlonIntro, Route14_Text_MarlonDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AAB50 - msgbox Text_186091, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route14_EventScript_MarlonRematch + msgbox Route14_Text_MarlonPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAB50:: @ 81AAB50 - trainerbattle_rematch TRAINER_BIRD_KEEPER_MARLON, Text_1C2461, Text_18607C - msgbox Text_186091, MSGBOX_AUTOCLOSE +Route14_EventScript_MarlonRematch:: @ 81AAB50 + trainerbattle_rematch TRAINER_BIRD_KEEPER_MARLON, Route14_Text_MarlonRematchIntro, Route14_Text_MarlonDefeat + msgbox Route14_Text_MarlonPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_1AAB67:: @ 81AAB67 - trainerbattle_double TRAINER_TWINS_KIRI_JAN, Text_1863B7, Text_1863EA, Text_18642E +Route14_EventScript_Kiri:: @ 81AAB67 + trainerbattle_double TRAINER_TWINS_KIRI_JAN, Route14_Text_KiriIntro, Route14_Text_KiriDefeat, Route14_Text_KiriNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AAB92 - msgbox Text_18640D, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route14_EventScript_KiriRematch + msgbox Route14_Text_KiriPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAB92:: @ 81AAB92 - trainerbattle_rematch_double TRAINER_TWINS_KIRI_JAN, Text_1C25FB, Text_1863EA, Text_18642E - msgbox Text_18640D, MSGBOX_AUTOCLOSE +Route14_EventScript_KiriRematch:: @ 81AAB92 + trainerbattle_rematch_double TRAINER_TWINS_KIRI_JAN, Route14_Text_KiriRematchIntro, Route14_Text_KiriDefeat, Route14_Text_KiriNotEnoughMons + msgbox Route14_Text_KiriPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_1AABAD:: @ 81AABAD - trainerbattle_double TRAINER_TWINS_KIRI_JAN, Text_18645B, Text_186487, Text_1864D3 +Route14_EventScript_Jan:: @ 81AABAD + trainerbattle_double TRAINER_TWINS_KIRI_JAN, Route14_Text_JanIntro, Route14_Text_JanDefeat, Route14_Text_JanNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1AABD8 - msgbox Text_18649C, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route14_EventScript_JanRematch + msgbox Route14_Text_JanPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AABD8:: @ 81AABD8 - trainerbattle_rematch_double TRAINER_TWINS_KIRI_JAN, Text_1C261B, Text_186487, Text_1864D3 - msgbox Text_18649C, MSGBOX_AUTOCLOSE +Route14_EventScript_JanRematch:: @ 81AABD8 + trainerbattle_rematch_double TRAINER_TWINS_KIRI_JAN, Route14_Text_JanRematchIntro, Route14_Text_JanDefeat, Route14_Text_JanNotEnoughMons + msgbox Route14_Text_JanPostBattle, MSGBOX_AUTOCLOSE end Route15_EventScript_1AABF3:: @ 81AABF3 trainerbattle_single TRAINER_BIKER_ERNEST, Text_1868B6, Text_1868E8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAC1A msgbox Text_1868F1, MSGBOX_AUTOCLOSE end @@ -1301,7 +1301,7 @@ EventScript_1AAC1A:: @ 81AAC1A Route15_EventScript_1AAC31:: @ 81AAC31 trainerbattle_single TRAINER_BIKER_ALEX, Text_186936, Text_186968 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAC58 msgbox Text_18697C, MSGBOX_AUTOCLOSE end @@ -1314,7 +1314,7 @@ EventScript_1AAC58:: @ 81AAC58 Route15_EventScript_1AAC6F:: @ 81AAC6F trainerbattle_single TRAINER_BEAUTY_GRACE, Text_18678B, Text_1867C1 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAC96 msgbox Text_1867DA, MSGBOX_AUTOCLOSE end @@ -1327,7 +1327,7 @@ EventScript_1AAC96:: @ 81AAC96 Route15_EventScript_1AACAD:: @ 81AACAD trainerbattle_single TRAINER_BEAUTY_OLIVIA, Text_18680C, Text_186841 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AACD4 msgbox Text_18686F, MSGBOX_AUTOCLOSE end @@ -1340,7 +1340,7 @@ EventScript_1AACD4:: @ 81AACD4 Route15_EventScript_1AACEB:: @ 81AACEB trainerbattle_single TRAINER_BIRD_KEEPER_EDWIN, Text_18664F, Text_18667A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAD12 msgbox Text_18668D, MSGBOX_AUTOCLOSE end @@ -1353,7 +1353,7 @@ EventScript_1AAD12:: @ 81AAD12 Route15_EventScript_1AAD29:: @ 81AAD29 trainerbattle_single TRAINER_BIRD_KEEPER_CHESTER, Text_1866D1, Text_186707 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAD50 msgbox Text_18671A, MSGBOX_AUTOCLOSE end @@ -1366,7 +1366,7 @@ EventScript_1AAD50:: @ 81AAD50 Route15_EventScript_1AAD67:: @ 81AAD67 trainerbattle_single TRAINER_PICNICKER_YAZMIN, Text_186A22, Text_186A40 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAD8E msgbox Text_186A55, MSGBOX_AUTOCLOSE end @@ -1379,7 +1379,7 @@ EventScript_1AAD8E:: @ 81AAD8E Route15_EventScript_1AADA5:: @ 81AADA5 trainerbattle_single TRAINER_PICNICKER_KINDRA, Text_18650B, Text_186549 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AADCC msgbox Text_18655A, MSGBOX_AUTOCLOSE end @@ -1392,7 +1392,7 @@ EventScript_1AADCC:: @ 81AADCC Route15_EventScript_1AADE3:: @ 81AADE3 trainerbattle_single TRAINER_PICNICKER_BECKY, Text_1865D3, Text_186612 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAE0A msgbox Text_18661D, MSGBOX_AUTOCLOSE end @@ -1405,7 +1405,7 @@ EventScript_1AAE0A:: @ 81AAE0A Route15_EventScript_1AAE21:: @ 81AAE21 trainerbattle_single TRAINER_PICNICKER_CELIA, Text_1869BA, Text_1869E6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAE48 msgbox Text_1869F4, MSGBOX_AUTOCLOSE end @@ -1418,7 +1418,7 @@ EventScript_1AAE48:: @ 81AAE48 Route15_EventScript_1AAE5F:: @ 81AAE5F trainerbattle_double TRAINER_CRUSH_KIN_RON_MYA, Text_186A95, Text_186ACB, Text_186B46 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAE8A msgbox Text_186B0A, MSGBOX_AUTOCLOSE end @@ -1431,7 +1431,7 @@ EventScript_1AAE8A:: @ 81AAE8A Route15_EventScript_1AAEA5:: @ 81AAEA5 trainerbattle_double TRAINER_CRUSH_KIN_RON_MYA, Text_186B89, Text_186BB1, Text_186BFE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAED0 msgbox Text_186BD2, MSGBOX_AUTOCLOSE end @@ -1444,7 +1444,7 @@ EventScript_1AAED0:: @ 81AAED0 Route16_EventScript_1AAEEB:: @ 81AAEEB trainerbattle_single TRAINER_BIKER_LAO, Text_186C4D, Text_186C5F specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAF12 msgbox Text_186C75, MSGBOX_AUTOCLOSE end @@ -1457,7 +1457,7 @@ EventScript_1AAF12:: @ 81AAF12 Route16_EventScript_1AAF29:: @ 81AAF29 trainerbattle_single TRAINER_BIKER_HIDEO, Text_186D39, Text_186D52 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAF50 msgbox Text_186D5A, MSGBOX_AUTOCLOSE end @@ -1470,7 +1470,7 @@ EventScript_1AAF50:: @ 81AAF50 Route16_EventScript_1AAF67:: @ 81AAF67 trainerbattle_single TRAINER_BIKER_RUBEN, Text_186E86, Text_186EB4 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAF8E msgbox Text_186EC7, MSGBOX_AUTOCLOSE end @@ -1483,7 +1483,7 @@ EventScript_1AAF8E:: @ 81AAF8E Route16_EventScript_1AAFA5:: @ 81AAFA5 trainerbattle_single TRAINER_CUE_BALL_KOJI, Text_186CA2, Text_186CBB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAFCC msgbox Text_186CC5, MSGBOX_AUTOCLOSE end @@ -1496,7 +1496,7 @@ EventScript_1AAFCC:: @ 81AAFCC Route16_EventScript_1AAFE3:: @ 81AAFE3 trainerbattle_single TRAINER_CUE_BALL_LUKE, Text_186CE5, Text_186D06 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB00A msgbox Text_186D16, MSGBOX_AUTOCLOSE end @@ -1509,7 +1509,7 @@ EventScript_1AB00A:: @ 81AB00A Route16_EventScript_1AB021:: @ 81AB021 trainerbattle_single TRAINER_CUE_BALL_CAMRON, Text_186DD9, Text_186E0D specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB048 msgbox Text_186E1C, MSGBOX_AUTOCLOSE end @@ -1522,7 +1522,7 @@ EventScript_1AB048:: @ 81AB048 Route16_EventScript_1AB05F:: @ 81AB05F trainerbattle_double TRAINER_YOUNG_COUPLE_LEA_JED, Text_186FBD, Text_186FFA, Text_187057 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB08A msgbox Text_187027, MSGBOX_AUTOCLOSE end @@ -1535,7 +1535,7 @@ EventScript_1AB08A:: @ 81AB08A Route16_EventScript_1AB0A5:: @ 81AB0A5 trainerbattle_double TRAINER_YOUNG_COUPLE_LEA_JED, Text_187097, Text_1870CC, Text_187120 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB0D0 msgbox Text_1870F9, MSGBOX_AUTOCLOSE end @@ -1548,7 +1548,7 @@ EventScript_1AB0D0:: @ 81AB0D0 Route17_EventScript_1AB0EB:: @ 81AB0EB trainerbattle_single TRAINER_BIKER_BILLY, Text_1872BD, Text_1872E3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB112 msgbox Text_1872EB, MSGBOX_AUTOCLOSE end @@ -1561,7 +1561,7 @@ EventScript_1AB112:: @ 81AB112 Route17_EventScript_1AB129:: @ 81AB129 trainerbattle_single TRAINER_BIKER_NIKOLAS, Text_18730A, Text_187325 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB150 msgbox Text_187333, MSGBOX_AUTOCLOSE end @@ -1574,7 +1574,7 @@ EventScript_1AB150:: @ 81AB150 Route17_EventScript_1AB167:: @ 81AB167 trainerbattle_single TRAINER_BIKER_JAXON, Text_187456, Text_187472 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB18E msgbox Text_187479, MSGBOX_AUTOCLOSE end @@ -1587,7 +1587,7 @@ EventScript_1AB18E:: @ 81AB18E Route17_EventScript_1AB1A5:: @ 81AB1A5 trainerbattle_single TRAINER_BIKER_WILLIAM, Text_18749B, Text_1874B6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB1CC msgbox Text_1874C9, MSGBOX_AUTOCLOSE end @@ -1600,7 +1600,7 @@ EventScript_1AB1CC:: @ 81AB1CC Route17_EventScript_1AB1E3:: @ 81AB1E3 trainerbattle_single TRAINER_CUE_BALL_RAUL, Text_18717E, Text_1871AE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB20A msgbox Text_1871BA, MSGBOX_AUTOCLOSE end @@ -1613,7 +1613,7 @@ EventScript_1AB20A:: @ 81AB20A Route17_EventScript_1AB221:: @ 81AB221 trainerbattle_single TRAINER_CUE_BALL_ISAIAH, Text_187228, Text_187254 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB248 msgbox Text_18725A, MSGBOX_AUTOCLOSE end @@ -1626,7 +1626,7 @@ EventScript_1AB248:: @ 81AB248 Route17_EventScript_1AB25F:: @ 81AB25F trainerbattle_single TRAINER_CUE_BALL_ZEEK, Text_187362, Text_187395 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB286 msgbox Text_18739F, MSGBOX_AUTOCLOSE end @@ -1639,7 +1639,7 @@ EventScript_1AB286:: @ 81AB286 Route17_EventScript_1AB29D:: @ 81AB29D trainerbattle_single TRAINER_CUE_BALL_JAMAL, Text_1873D1, Text_1873EB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB2C4 msgbox Text_1873FF, MSGBOX_AUTOCLOSE end @@ -1652,7 +1652,7 @@ EventScript_1AB2C4:: @ 81AB2C4 Route17_EventScript_1AB2DB:: @ 81AB2DB trainerbattle_single TRAINER_CUE_BALL_COREY, Text_18741D, Text_187429 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB302 msgbox Text_187432, MSGBOX_AUTOCLOSE end @@ -1665,7 +1665,7 @@ EventScript_1AB302:: @ 81AB302 Route17_EventScript_1AB319:: @ 81AB319 trainerbattle_single TRAINER_BIKER_VIRGIL, Text_18727D, Text_187295 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB340 msgbox Text_1872A5, MSGBOX_AUTOCLOSE end @@ -1678,7 +1678,7 @@ EventScript_1AB340:: @ 81AB340 Route18_EventScript_1AB357:: @ 81AB357 trainerbattle_single TRAINER_BIRD_KEEPER_WILTON, Text_187640, Text_187672 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB37E msgbox Text_187677, MSGBOX_AUTOCLOSE end @@ -1691,7 +1691,7 @@ EventScript_1AB37E:: @ 81AB37E Route18_EventScript_1AB395:: @ 81AB395 trainerbattle_single TRAINER_BIRD_KEEPER_RAMIRO, Text_18768C, Text_1876B3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB3BC msgbox Text_1876C5, MSGBOX_AUTOCLOSE end @@ -1704,7 +1704,7 @@ EventScript_1AB3BC:: @ 81AB3BC Route18_EventScript_1AB3D3:: @ 81AB3D3 trainerbattle_single TRAINER_BIRD_KEEPER_JACOB, Text_187704, Text_187726 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB3FA msgbox Text_18772C, MSGBOX_AUTOCLOSE end @@ -1717,7 +1717,7 @@ EventScript_1AB3FA:: @ 81AB3FA Route19_EventScript_1AB411:: @ 81AB411 trainerbattle_single TRAINER_SWIMMER_MALE_RICHARD, Text_1877A3, Text_1877DF specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB438 msgbox Text_1877EE, MSGBOX_AUTOCLOSE end @@ -1730,7 +1730,7 @@ EventScript_1AB438:: @ 81AB438 Route19_EventScript_1AB44F:: @ 81AB44F trainerbattle_single TRAINER_SWIMMER_MALE_REECE, Text_187811, Text_18783E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB476 msgbox Text_187852, MSGBOX_AUTOCLOSE end @@ -1743,7 +1743,7 @@ EventScript_1AB476:: @ 81AB476 Route19_EventScript_1AB48D:: @ 81AB48D trainerbattle_single TRAINER_SWIMMER_MALE_MATTHEW, Text_187884, Text_1878A5 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB4B4 msgbox Text_1878B1, MSGBOX_AUTOCLOSE end @@ -1756,7 +1756,7 @@ EventScript_1AB4B4:: @ 81AB4B4 Route19_EventScript_1AB4CB:: @ 81AB4CB trainerbattle_single TRAINER_SWIMMER_MALE_DOUGLAS, Text_1878DD, Text_1878F8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB4F2 msgbox Text_1878FE, MSGBOX_AUTOCLOSE end @@ -1769,7 +1769,7 @@ EventScript_1AB4F2:: @ 81AB4F2 Route19_EventScript_1AB509:: @ 81AB509 trainerbattle_single TRAINER_SWIMMER_MALE_DAVID, Text_187925, Text_187955 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB530 msgbox Text_18795B, MSGBOX_AUTOCLOSE end @@ -1782,7 +1782,7 @@ EventScript_1AB530:: @ 81AB530 Route19_EventScript_1AB547:: @ 81AB547 trainerbattle_single TRAINER_SWIMMER_MALE_TONY, Text_187985, Text_1879C3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB56E msgbox Text_1879D3, MSGBOX_AUTOCLOSE end @@ -1795,7 +1795,7 @@ EventScript_1AB56E:: @ 81AB56E Route19_EventScript_1AB585:: @ 81AB585 trainerbattle_single TRAINER_SWIMMER_MALE_AXLE, Text_187AFA, Text_187B25 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB5AC msgbox Text_187B35, MSGBOX_AUTOCLOSE end @@ -1808,7 +1808,7 @@ EventScript_1AB5AC:: @ 81AB5AC Route19_EventScript_1AB5C3:: @ 81AB5C3 trainerbattle_single TRAINER_SWIMMER_FEMALE_ANYA, Text_187A11, Text_187A44 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB5EA msgbox Text_187A50, MSGBOX_AUTOCLOSE end @@ -1821,7 +1821,7 @@ EventScript_1AB5EA:: @ 81AB5EA Route19_EventScript_1AB601:: @ 81AB601 trainerbattle_single TRAINER_SWIMMER_FEMALE_ALICE, Text_187A9E, Text_187AC1 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB628 msgbox Text_187ACA, MSGBOX_AUTOCLOSE end @@ -1834,7 +1834,7 @@ EventScript_1AB628:: @ 81AB628 Route19_EventScript_1AB63F:: @ 81AB63F trainerbattle_single TRAINER_SWIMMER_FEMALE_CONNIE, Text_187B5D, Text_187B85 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB666 msgbox Text_187B94, MSGBOX_AUTOCLOSE end @@ -1847,7 +1847,7 @@ EventScript_1AB666:: @ 81AB666 Route19_EventScript_1AB67D:: @ 81AB67D trainerbattle_double TRAINER_SIS_AND_BRO_LIA_LUC, Text_187C32, Text_187C6F, Text_187CF2 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB6A8 msgbox Text_187C9E, MSGBOX_AUTOCLOSE end @@ -1860,7 +1860,7 @@ EventScript_1AB6A8:: @ 81AB6A8 Route19_EventScript_1AB6C3:: @ 81AB6C3 trainerbattle_double TRAINER_SIS_AND_BRO_LIA_LUC, Text_187D45, Text_187D7E, Text_187DE8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB6EE msgbox Text_187DAD, MSGBOX_AUTOCLOSE end @@ -1873,7 +1873,7 @@ EventScript_1AB6EE:: @ 81AB6EE Route20_EventScript_1AB709:: @ 81AB709 trainerbattle_single TRAINER_SWIMMER_MALE_BARRY, Text_187E40, Text_187E7B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB730 msgbox Text_187E83, MSGBOX_AUTOCLOSE end @@ -1886,7 +1886,7 @@ EventScript_1AB730:: @ 81AB730 Route20_EventScript_1AB747:: @ 81AB747 trainerbattle_single TRAINER_SWIMMER_MALE_DEAN, Text_187FDB, Text_187FF7 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB76E msgbox Text_187FFE, MSGBOX_AUTOCLOSE end @@ -1899,7 +1899,7 @@ EventScript_1AB76E:: @ 81AB76E Route20_EventScript_1AB785:: @ 81AB785 trainerbattle_single TRAINER_SWIMMER_MALE_DARRIN, Text_18802E, Text_18805C specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB7AC msgbox Text_18806D, MSGBOX_AUTOCLOSE end @@ -1912,7 +1912,7 @@ EventScript_1AB7AC:: @ 81AB7AC Route20_EventScript_1AB7C3:: @ 81AB7C3 trainerbattle_single TRAINER_SWIMMER_FEMALE_TIFFANY, Text_187F24, Text_187F5A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB7EA msgbox Text_187F61, MSGBOX_AUTOCLOSE end @@ -1925,7 +1925,7 @@ EventScript_1AB7EA:: @ 81AB7EA Route20_EventScript_1AB801:: @ 81AB801 trainerbattle_single TRAINER_SWIMMER_FEMALE_NORA, Text_1880F8, Text_188119 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB828 msgbox Text_188139, MSGBOX_AUTOCLOSE end @@ -1938,7 +1938,7 @@ EventScript_1AB828:: @ 81AB828 Route20_EventScript_1AB83F:: @ 81AB83F trainerbattle_single TRAINER_SWIMMER_FEMALE_MELISSA, Text_188218, Text_18825C specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB866 msgbox Text_18827B, MSGBOX_AUTOCLOSE end @@ -1951,7 +1951,7 @@ EventScript_1AB866:: @ 81AB866 Route20_EventScript_1AB87D:: @ 81AB87D trainerbattle_single TRAINER_SWIMMER_FEMALE_SHIRLEY, Text_187EBB, Text_187EED specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB8A4 msgbox Text_187EF6, MSGBOX_AUTOCLOSE end @@ -1964,7 +1964,7 @@ EventScript_1AB8A4:: @ 81AB8A4 Route20_EventScript_1AB8BB:: @ 81AB8BB trainerbattle_single TRAINER_BIRD_KEEPER_ROGER, Text_18808E, Text_1880AB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB8E2 msgbox Text_1880C8, MSGBOX_AUTOCLOSE end @@ -1977,7 +1977,7 @@ EventScript_1AB8E2:: @ 81AB8E2 Route20_EventScript_1AB8F9:: @ 81AB8F9 trainerbattle_single TRAINER_PICNICKER_MISSY, Text_188165, Text_1881A3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB920 msgbox Text_1881B8, MSGBOX_AUTOCLOSE end @@ -1990,7 +1990,7 @@ EventScript_1AB920:: @ 81AB920 Route20_EventScript_1AB937:: @ 81AB937 trainerbattle_single TRAINER_PICNICKER_IRENE, Text_187F78, Text_187F92 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB95E msgbox Text_187FA3, MSGBOX_AUTOCLOSE end @@ -2003,7 +2003,7 @@ EventScript_1AB95E:: @ 81AB95E Route21_North_EventScript_1AB975:: @ 81AB975 trainerbattle_single TRAINER_FISHERMAN_RONALD, Text_18835A, Text_188383 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB99C msgbox Text_188389, MSGBOX_AUTOCLOSE end @@ -2016,7 +2016,7 @@ EventScript_1AB99C:: @ 81AB99C Route21_South_EventScript_1AB9B3:: @ 81AB9B3 trainerbattle_single TRAINER_FISHERMAN_CLAUDE, Text_1885D8, Text_1885F8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB9DA msgbox Text_188632, MSGBOX_AUTOCLOSE end @@ -2029,7 +2029,7 @@ EventScript_1AB9DA:: @ 81AB9DA Route21_North_EventScript_1AB9F1:: @ 81AB9F1 trainerbattle_single TRAINER_FISHERMAN_WADE, Text_1883C6, Text_1883E9 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABA18 msgbox Text_18841D, MSGBOX_AUTOCLOSE end @@ -2042,7 +2042,7 @@ EventScript_1ABA18:: @ 81ABA18 Route21_South_EventScript_1ABA2F:: @ 81ABA2F trainerbattle_single TRAINER_FISHERMAN_NOLAN, Text_18868C, Text_1886AE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABA56 msgbox Text_1886C5, MSGBOX_AUTOCLOSE end @@ -2055,7 +2055,7 @@ EventScript_1ABA56:: @ 81ABA56 Route21_North_EventScript_1ABA6D:: @ 81ABA6D trainerbattle_single TRAINER_SWIMMER_MALE_SPENCER, Text_18843C, Text_18845F specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABA94 msgbox Text_188465, MSGBOX_AUTOCLOSE end @@ -2068,7 +2068,7 @@ EventScript_1ABA94:: @ 81ABA94 Route21_South_EventScript_1ABAAB:: @ 81ABAAB trainerbattle_single TRAINER_SWIMMER_MALE_JACK, Text_1884D4, Text_1884F0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABAD2 msgbox Text_1884FF, MSGBOX_AUTOCLOSE end @@ -2081,7 +2081,7 @@ EventScript_1ABAD2:: @ 81ABAD2 Route21_South_EventScript_1ABAE9:: @ 81ABAE9 trainerbattle_single TRAINER_SWIMMER_MALE_JEROME, Text_18851F, Text_188543 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABB10 msgbox Text_188555, MSGBOX_AUTOCLOSE end @@ -2094,7 +2094,7 @@ EventScript_1ABB10:: @ 81ABB10 Route21_South_EventScript_1ABB27:: @ 81ABB27 trainerbattle_single TRAINER_SWIMMER_MALE_ROLAND, Text_188592, Text_1885B2 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABB4E msgbox Text_1885BF, MSGBOX_AUTOCLOSE end @@ -2107,7 +2107,7 @@ EventScript_1ABB4E:: @ 81ABB4E Route21_North_EventScript_1ABB65:: @ 81ABB65 trainerbattle_double TRAINER_SIS_AND_BRO_LIL_IAN, Text_1886E2, Text_188712, Text_18875E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABB90 msgbox Text_188734, MSGBOX_AUTOCLOSE end @@ -2120,7 +2120,7 @@ EventScript_1ABB90:: @ 81ABB90 Route21_North_EventScript_1ABBAB:: @ 81ABBAB trainerbattle_double TRAINER_SIS_AND_BRO_LIL_IAN, Text_1887B4, Text_1887F1, Text_188850 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABBD6 msgbox Text_188812, MSGBOX_AUTOCLOSE end @@ -2133,7 +2133,7 @@ EventScript_1ABBD6:: @ 81ABBD6 OneIsland_KindleRoad_EventScript_1ABBF1:: @ 81ABBF1 trainerbattle_single TRAINER_SWIMMER_FEMALE_MARIA, Text_18961F, Text_18964D specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABC18 msgbox Text_189657, MSGBOX_AUTOCLOSE end @@ -2146,7 +2146,7 @@ EventScript_1ABC18:: @ 81ABC18 OneIsland_KindleRoad_EventScript_1ABC2F:: @ 81ABC2F trainerbattle_single TRAINER_SWIMMER_FEMALE_ABIGAIL, Text_18968C, Text_1896AC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABC56 msgbox Text_1896C1, MSGBOX_AUTOCLOSE end @@ -2159,7 +2159,7 @@ EventScript_1ABC56:: @ 81ABC56 OneIsland_KindleRoad_EventScript_1ABC6D:: @ 81ABC6D trainerbattle_single TRAINER_SWIMMER_MALE_FINN, Text_1896F9, Text_189728 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABC94 msgbox Text_189740, MSGBOX_AUTOCLOSE end @@ -2172,7 +2172,7 @@ EventScript_1ABC94:: @ 81ABC94 OneIsland_KindleRoad_EventScript_1ABCAB:: @ 81ABCAB trainerbattle_single TRAINER_SWIMMER_MALE_GARRETT, Text_189767, Text_1897A4 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABCD2 msgbox Text_1897C5, MSGBOX_AUTOCLOSE end @@ -2185,7 +2185,7 @@ EventScript_1ABCD2:: @ 81ABCD2 OneIsland_KindleRoad_EventScript_1ABCE9:: @ 81ABCE9 trainerbattle_single TRAINER_FISHERMAN_TOMMY, Text_1897FF, Text_189833 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABD10 msgbox Text_18984B, MSGBOX_AUTOCLOSE end @@ -2198,7 +2198,7 @@ EventScript_1ABD10:: @ 81ABD10 OneIsland_KindleRoad_EventScript_1ABD27:: @ 81ABD27 trainerbattle_single TRAINER_CRUSH_GIRL_SHARON, Text_189883, Text_1898AB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABD4E msgbox Text_1898C4, MSGBOX_AUTOCLOSE end @@ -2211,7 +2211,7 @@ EventScript_1ABD4E:: @ 81ABD4E OneIsland_KindleRoad_EventScript_1ABD65:: @ 81ABD65 trainerbattle_single TRAINER_CRUSH_GIRL_TANYA, Text_1898F0, Text_18991B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABD8C msgbox Text_18992C, MSGBOX_AUTOCLOSE end @@ -2224,7 +2224,7 @@ EventScript_1ABD8C:: @ 81ABD8C OneIsland_KindleRoad_EventScript_1ABDA3:: @ 81ABDA3 trainerbattle_single TRAINER_BLACK_BELT_SHEA, Text_189950, Text_18998C specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABDCA msgbox Text_189998, MSGBOX_AUTOCLOSE end @@ -2237,7 +2237,7 @@ EventScript_1ABDCA:: @ 81ABDCA OneIsland_KindleRoad_EventScript_1ABDE1:: @ 81ABDE1 trainerbattle_single TRAINER_BLACK_BELT_HUGH, Text_1899CE, Text_189A0A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABE08 msgbox Text_189A13, MSGBOX_AUTOCLOSE end @@ -2250,7 +2250,7 @@ EventScript_1ABE08:: @ 81ABE08 OneIsland_KindleRoad_EventScript_1ABE1F:: @ 81ABE1F trainerbattle_single TRAINER_CAMPER_BRYCE, Text_189A53, Text_189A92 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABE46 msgbox Text_189A9F, MSGBOX_AUTOCLOSE end @@ -2263,7 +2263,7 @@ EventScript_1ABE46:: @ 81ABE46 OneIsland_KindleRoad_EventScript_1ABE5D:: @ 81ABE5D trainerbattle_single TRAINER_PICNICKER_CLAIRE, Text_189ACB, Text_189B0B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABE84 msgbox Text_189B24, MSGBOX_AUTOCLOSE end @@ -2276,7 +2276,7 @@ EventScript_1ABE84:: @ 81ABE84 OneIsland_KindleRoad_EventScript_1ABE9B:: @ 81ABE9B trainerbattle_double TRAINER_CRUSH_KIN_MIK_KIA, Text_189B4D, Text_189B84, Text_189BDE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABEC6 msgbox Text_189BA3, MSGBOX_AUTOCLOSE end @@ -2289,7 +2289,7 @@ EventScript_1ABEC6:: @ 81ABEC6 OneIsland_KindleRoad_EventScript_1ABEE1:: @ 81ABEE1 trainerbattle_double TRAINER_CRUSH_KIN_MIK_KIA, Text_189C33, Text_189C62, Text_189CAB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABF0C msgbox Text_189C7E, MSGBOX_AUTOCLOSE end @@ -2302,7 +2302,7 @@ EventScript_1ABF0C:: @ 81ABF0C OneIsland_TreasureBeach_EventScript_1ABF27:: @ 81ABF27 trainerbattle_single TRAINER_SWIMMER_FEMALE_AMARA, Text_189D5A, Text_189D8B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABF4E msgbox Text_189DA3, MSGBOX_AUTOCLOSE end @@ -2315,7 +2315,7 @@ EventScript_1ABF4E:: @ 81ABF4E ThreeIsland_BondBridge_EventScript_1ABF65:: @ 81ABF65 trainerbattle_single TRAINER_AROMA_LADY_NIKKI, Text_189E42, Text_189E72 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABF8C msgbox Text_189E9E, MSGBOX_AUTOCLOSE end @@ -2328,7 +2328,7 @@ EventScript_1ABF8C:: @ 81ABF8C ThreeIsland_BondBridge_EventScript_1ABFA3:: @ 81ABFA3 trainerbattle_single TRAINER_AROMA_LADY_VIOLET, Text_189ED4, Text_189EFA specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABFCA msgbox Text_189F21, MSGBOX_AUTOCLOSE end @@ -2341,7 +2341,7 @@ EventScript_1ABFCA:: @ 81ABFCA ThreeIsland_BondBridge_EventScript_1ABFE1:: @ 81ABFE1 trainerbattle_single TRAINER_TUBER_AMIRA, Text_189F63, Text_189F9A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC008 msgbox Text_189FA8, MSGBOX_AUTOCLOSE end @@ -2354,7 +2354,7 @@ EventScript_1AC008:: @ 81AC008 ThreeIsland_BondBridge_EventScript_1AC01F:: @ 81AC01F trainerbattle_single TRAINER_TUBER_ALEXIS, Text_189FDB, Text_189FEE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC046 msgbox Text_18A000, MSGBOX_AUTOCLOSE end @@ -2367,7 +2367,7 @@ EventScript_1AC046:: @ 81AC046 ThreeIsland_BondBridge_EventScript_1AC05D:: @ 81AC05D trainerbattle_single TRAINER_SWIMMER_FEMALE_TISHA, Text_18A01F, Text_18A053 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC084 msgbox Text_18A082, MSGBOX_AUTOCLOSE end @@ -2380,7 +2380,7 @@ EventScript_1AC084:: @ 81AC084 ThreeIsland_BondBridge_EventScript_1AC09B:: @ 81AC09B trainerbattle_double TRAINER_TWINS_JOY_MEG, Text_18A0C4, Text_18A0F7, Text_18A138 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC0C6 msgbox Text_18A106, MSGBOX_AUTOCLOSE end @@ -2393,7 +2393,7 @@ EventScript_1AC0C6:: @ 81AC0C6 ThreeIsland_BondBridge_EventScript_1AC0E1:: @ 81AC0E1 trainerbattle_double TRAINER_TWINS_JOY_MEG, Text_18A179, Text_18A1A3, Text_18A1CD specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC10C msgbox Text_18A1B2, MSGBOX_AUTOCLOSE end @@ -2406,7 +2406,7 @@ EventScript_1AC10C:: @ 81AC10C FiveIsland_ResortGorgeous_EventScript_1AC127:: @ 81AC127 trainerbattle_single TRAINER_PAINTER_DAISY, Text_18A3E2, Text_18A40E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC14E msgbox Text_18A430, MSGBOX_AUTOCLOSE end @@ -2419,7 +2419,7 @@ EventScript_1AC14E:: @ 81AC14E FiveIsland_ResortGorgeous_EventScript_1AC165:: @ 81AC165 trainerbattle_single TRAINER_PAINTER_CELINA, Text_18A461, Text_18A49E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC18C msgbox Text_18A4C6, MSGBOX_AUTOCLOSE end @@ -2432,7 +2432,7 @@ EventScript_1AC18C:: @ 81AC18C FiveIsland_ResortGorgeous_EventScript_1AC1A3:: @ 81AC1A3 trainerbattle_single TRAINER_PAINTER_RAYNA, Text_18A50E, Text_18A535 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC1CA msgbox Text_18A555, MSGBOX_AUTOCLOSE end @@ -2445,7 +2445,7 @@ EventScript_1AC1CA:: @ 81AC1CA FiveIsland_ResortGorgeous_EventScript_1AC1E1:: @ 81AC1E1 trainerbattle_single TRAINER_LADY_JACKI, Text_18A5B9, Text_18A5EE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC208 msgbox Text_18A601, MSGBOX_AUTOCLOSE end @@ -2458,7 +2458,7 @@ EventScript_1AC208:: @ 81AC208 FiveIsland_ResortGorgeous_EventScript_1AC21F:: @ 81AC21F trainerbattle_single TRAINER_LADY_GILLIAN, Text_18A645, Text_18A67F specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC246 msgbox Text_18A699, MSGBOX_AUTOCLOSE end @@ -2471,7 +2471,7 @@ EventScript_1AC246:: @ 81AC246 FiveIsland_ResortGorgeous_EventScript_1AC25D:: @ 81AC25D trainerbattle_single TRAINER_YOUNGSTER_DESTIN, Text_18A6DA, Text_18A6FE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC284 msgbox Text_18A715, MSGBOX_AUTOCLOSE end @@ -2484,7 +2484,7 @@ EventScript_1AC284:: @ 81AC284 FiveIsland_ResortGorgeous_EventScript_1AC29B:: @ 81AC29B trainerbattle_single TRAINER_SWIMMER_MALE_TOBY, Text_18A74A, Text_18A786 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC2C2 msgbox Text_18A7AC, MSGBOX_AUTOCLOSE end @@ -2497,7 +2497,7 @@ EventScript_1AC2C2:: @ 81AC2C2 FiveIsland_WaterLabyrinth_EventScript_1AC2D9:: @ 81AC2D9 trainerbattle_single TRAINER_PKMN_BREEDER_ALIZE, Text_18AAD5, Text_18AB0B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC300 msgbox Text_18AB37, MSGBOX_AUTOCLOSE end @@ -2510,7 +2510,7 @@ EventScript_1AC300:: @ 81AC300 FiveIsland_MemorialPillar_EventScript_1AC317:: @ 81AC317 trainerbattle_single TRAINER_BIRD_KEEPER_MILO, Text_18AE50, Text_18AEA8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC33E msgbox Text_18AEB6, MSGBOX_AUTOCLOSE end @@ -2523,7 +2523,7 @@ EventScript_1AC33E:: @ 81AC33E FiveIsland_MemorialPillar_EventScript_1AC355:: @ 81AC355 trainerbattle_single TRAINER_BIRD_KEEPER_CHAZ, Text_18AEDC, Text_18AF39 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC37C msgbox Text_18AF45, MSGBOX_AUTOCLOSE end @@ -2536,7 +2536,7 @@ EventScript_1AC37C:: @ 81AC37C FiveIsland_MemorialPillar_EventScript_1AC393:: @ 81AC393 trainerbattle_single TRAINER_BIRD_KEEPER_HAROLD, Text_18AF72, Text_18AFCC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC3BA msgbox Text_18AFF2, MSGBOX_AUTOCLOSE end @@ -2549,7 +2549,7 @@ EventScript_1AC3BA:: @ 81AC3BA SixIsland_OutcastIsland_EventScript_1AC3D1:: @ 81AC3D1 trainerbattle_single TRAINER_FISHERMAN_TYLOR, Text_18B400, Text_18B43B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC3F8 msgbox Text_18B451, MSGBOX_AUTOCLOSE end @@ -2562,7 +2562,7 @@ EventScript_1AC3F8:: @ 81AC3F8 SixIsland_OutcastIsland_EventScript_1AC40F:: @ 81AC40F trainerbattle_single TRAINER_SWIMMER_MALE_MYMO, Text_18B48F, Text_18B4C5 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC436 msgbox Text_18B4D1, MSGBOX_AUTOCLOSE end @@ -2575,7 +2575,7 @@ EventScript_1AC436:: @ 81AC436 SixIsland_OutcastIsland_EventScript_1AC44D:: @ 81AC44D trainerbattle_single TRAINER_SWIMMER_FEMALE_NICOLE, Text_18B4FA, Text_18B539 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC474 msgbox Text_18B573, MSGBOX_AUTOCLOSE end @@ -2588,7 +2588,7 @@ EventScript_1AC474:: @ 81AC474 SixIsland_OutcastIsland_EventScript_1AC48B:: @ 81AC48B trainerbattle_double TRAINER_SIS_AND_BRO_AVA_GEB, Text_18B5C8, Text_18B5F4, Text_18B660 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC4B6 msgbox Text_18B62E, MSGBOX_AUTOCLOSE end @@ -2601,7 +2601,7 @@ EventScript_1AC4B6:: @ 81AC4B6 SixIsland_OutcastIsland_EventScript_1AC4D1:: @ 81AC4D1 trainerbattle_double TRAINER_SIS_AND_BRO_AVA_GEB, Text_18B6C1, Text_18B6EF, Text_18B762 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC4FC msgbox Text_18B720, MSGBOX_AUTOCLOSE end @@ -2614,7 +2614,7 @@ EventScript_1AC4FC:: @ 81AC4FC SixIsland_GreenPath_EventScript_1AC517:: @ 81AC517 trainerbattle_single TRAINER_PSYCHIC_JACLYN, Text_18B7B0, Text_18B7F0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC53E msgbox Text_18B7FD, MSGBOX_AUTOCLOSE end @@ -2627,7 +2627,7 @@ EventScript_1AC53E:: @ 81AC53E SixIsland_WaterPath_EventScript_1AC555:: @ 81AC555 trainerbattle_single TRAINER_AROMA_LADY_ROSE, Text_18B896, Text_18B8C8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC57C msgbox Text_18B8F7, MSGBOX_AUTOCLOSE end @@ -2640,7 +2640,7 @@ EventScript_1AC57C:: @ 81AC57C SixIsland_WaterPath_EventScript_1AC593:: @ 81AC593 trainerbattle_single TRAINER_JUGGLER_EDWARD, Text_18B959, Text_18B988 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC5BA msgbox Text_18B9A5, MSGBOX_AUTOCLOSE end @@ -2653,7 +2653,7 @@ EventScript_1AC5BA:: @ 81AC5BA SixIsland_WaterPath_EventScript_1AC5D1:: @ 81AC5D1 trainerbattle_single TRAINER_SWIMMER_MALE_SAMIR, Text_18B9EC, Text_18BA47 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC5F8 msgbox Text_18BA57, MSGBOX_AUTOCLOSE end @@ -2666,7 +2666,7 @@ EventScript_1AC5F8:: @ 81AC5F8 SixIsland_WaterPath_EventScript_1AC60F:: @ 81AC60F trainerbattle_single TRAINER_SWIMMER_FEMALE_DENISE, Text_18BA86, Text_18BAC0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC636 msgbox Text_18BAE0, MSGBOX_AUTOCLOSE end @@ -2679,7 +2679,7 @@ EventScript_1AC636:: @ 81AC636 SixIsland_WaterPath_EventScript_1AC64D:: @ 81AC64D trainerbattle_double TRAINER_TWINS_MIU_MIA, Text_18BBBA, Text_18BBE2, Text_18BC24 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC678 msgbox Text_18BBF6, MSGBOX_AUTOCLOSE end @@ -2692,7 +2692,7 @@ EventScript_1AC678:: @ 81AC678 SixIsland_WaterPath_EventScript_1AC693:: @ 81AC693 trainerbattle_double TRAINER_TWINS_MIU_MIA, Text_18BC5A, Text_18BC84, Text_18BCCF specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC6BE msgbox Text_18BCAE, MSGBOX_AUTOCLOSE end @@ -2705,7 +2705,7 @@ EventScript_1AC6BE:: @ 81AC6BE SixIsland_WaterPath_EventScript_1AC6D9:: @ 81AC6D9 trainerbattle_single TRAINER_HIKER_EARL, Text_18BB2D, Text_18BB62 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC700 msgbox Text_18BB8B, MSGBOX_AUTOCLOSE end @@ -2718,7 +2718,7 @@ EventScript_1AC700:: @ 81AC700 SixIsland_RuinValley_EventScript_1AC717:: @ 81AC717 trainerbattle_single TRAINER_RUIN_MANIAC_STANLY, Text_18BE5D, Text_18BE9B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC73E msgbox Text_18BEA0, MSGBOX_AUTOCLOSE end @@ -2731,7 +2731,7 @@ EventScript_1AC73E:: @ 81AC73E SixIsland_RuinValley_EventScript_1AC755:: @ 81AC755 trainerbattle_single TRAINER_RUIN_MANIAC_FOSTER, Text_18BF05, Text_18BF33 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC77C msgbox Text_18BF6C, MSGBOX_AUTOCLOSE end @@ -2744,7 +2744,7 @@ EventScript_1AC77C:: @ 81AC77C SixIsland_RuinValley_EventScript_1AC793:: @ 81AC793 trainerbattle_single TRAINER_RUIN_MANIAC_LARRY, Text_18BFC5, Text_18C03B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC7BA msgbox Text_18C04C, MSGBOX_AUTOCLOSE end @@ -2757,7 +2757,7 @@ EventScript_1AC7BA:: @ 81AC7BA SixIsland_RuinValley_EventScript_1AC7D1:: @ 81AC7D1 trainerbattle_single TRAINER_HIKER_DARYL, Text_18C09C, Text_18C0BB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC7F8 msgbox Text_18C0EA, MSGBOX_AUTOCLOSE end @@ -2770,7 +2770,7 @@ EventScript_1AC7F8:: @ 81AC7F8 SixIsland_RuinValley_EventScript_1AC80F:: @ 81AC80F trainerbattle_single TRAINER_POKEMANIAC_HECTOR, Text_18C10A, Text_18C140 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC836 msgbox Text_18C17A, MSGBOX_AUTOCLOSE end @@ -2783,7 +2783,7 @@ EventScript_1AC836:: @ 81AC836 SevenIsland_TrainerTower_EventScript_1AC84D:: @ 81AC84D trainerbattle_single TRAINER_PSYCHIC_DARIO, Text_18C1ED, Text_18C205 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC874 msgbox Text_18C20E, MSGBOX_AUTOCLOSE end @@ -2796,7 +2796,7 @@ EventScript_1AC874:: @ 81AC874 SevenIsland_TrainerTower_EventScript_1AC88B:: @ 81AC88B trainerbattle_single TRAINER_PSYCHIC_RODETTE, Text_18C283, Text_18C2BC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC8B2 msgbox Text_18C2D5, MSGBOX_AUTOCLOSE end @@ -2809,7 +2809,7 @@ EventScript_1AC8B2:: @ 81AC8B2 SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9:: @ 81AC8C9 trainerbattle_single TRAINER_AROMA_LADY_MIAH, Text_18C3BC, Text_18C3E7 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC8F0 msgbox Text_18C3FF, MSGBOX_AUTOCLOSE end @@ -2822,7 +2822,7 @@ EventScript_1AC8F0:: @ 81AC8F0 SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907:: @ 81AC907 trainerbattle_double TRAINER_YOUNG_COUPLE_EVE_JON, Text_18C632, Text_18C662, Text_18C6AB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC932 msgbox Text_18C683, MSGBOX_AUTOCLOSE end @@ -2835,7 +2835,7 @@ EventScript_1AC932:: @ 81AC932 SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D:: @ 81AC94D trainerbattle_double TRAINER_YOUNG_COUPLE_EVE_JON, Text_18C700, Text_18C73B, Text_18C7BD specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC978 msgbox Text_18C773, MSGBOX_AUTOCLOSE end @@ -2848,7 +2848,7 @@ EventScript_1AC978:: @ 81AC978 SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993:: @ 81AC993 trainerbattle_single TRAINER_JUGGLER_MASON, Text_18C44B, Text_18C473 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC9BA msgbox Text_18C4BA, MSGBOX_AUTOCLOSE end @@ -2861,7 +2861,7 @@ EventScript_1AC9BA:: @ 81AC9BA SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1:: @ 81AC9D1 trainerbattle_single TRAINER_PKMN_RANGER_NICOLAS, Text_18C500, Text_18C543 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC9F8 msgbox Text_18C54B, MSGBOX_AUTOCLOSE end @@ -2874,7 +2874,7 @@ EventScript_1AC9F8:: @ 81AC9F8 SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F:: @ 81ACA0F trainerbattle_single TRAINER_PKMN_RANGER_MADELINE, Text_18C5AA, Text_18C5CD specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACA36 msgbox Text_18C5F5, MSGBOX_AUTOCLOSE end @@ -2887,7 +2887,7 @@ EventScript_1ACA36:: @ 81ACA36 SevenIsland_SevaultCanyon_EventScript_1ACA4D:: @ 81ACA4D trainerbattle_single TRAINER_CRUSH_GIRL_CYNDY, Text_18C887, Text_18C8A6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACA74 msgbox Text_18C8C2, MSGBOX_AUTOCLOSE end @@ -2900,7 +2900,7 @@ EventScript_1ACA74:: @ 81ACA74 SevenIsland_SevaultCanyon_EventScript_1ACA8B:: @ 81ACA8B trainerbattle_single TRAINER_TAMER_EVAN, Text_18C8FD, Text_18C980 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACAB2 msgbox Text_18C999, MSGBOX_AUTOCLOSE end @@ -2913,7 +2913,7 @@ EventScript_1ACAB2:: @ 81ACAB2 SevenIsland_SevaultCanyon_EventScript_1ACAC9:: @ 81ACAC9 trainerbattle_single TRAINER_PKMN_RANGER_JACKSON, Text_18CA2F, Text_18CA6F specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACAF0 msgbox Text_18CA9C, MSGBOX_AUTOCLOSE end @@ -2926,7 +2926,7 @@ EventScript_1ACAF0:: @ 81ACAF0 SevenIsland_SevaultCanyon_EventScript_1ACB07:: @ 81ACB07 trainerbattle_single TRAINER_PKMN_RANGER_KATELYN, Text_18CB16, Text_18CB3E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACB2E msgbox Text_18CB6C, MSGBOX_AUTOCLOSE end @@ -2939,7 +2939,7 @@ EventScript_1ACB2E:: @ 81ACB2E SevenIsland_SevaultCanyon_EventScript_1ACB45:: @ 81ACB45 trainerbattle_single TRAINER_COOLTRAINER_LEROY, Text_18CBB4, Text_18CBE0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACB6C msgbox Text_18CC09, MSGBOX_AUTOCLOSE end @@ -2952,7 +2952,7 @@ EventScript_1ACB6C:: @ 81ACB6C SevenIsland_SevaultCanyon_EventScript_1ACB83:: @ 81ACB83 trainerbattle_single TRAINER_COOLTRAINER_MICHELLE, Text_18CC4F, Text_18CCAE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACBAA msgbox Text_18CCEA, MSGBOX_AUTOCLOSE end @@ -2965,7 +2965,7 @@ EventScript_1ACBAA:: @ 81ACBAA SevenIsland_SevaultCanyon_EventScript_1ACBC1:: @ 81ACBC1 trainerbattle_double TRAINER_COOL_COUPLE_LEX_NYA, Text_18CD49, Text_18CD75, Text_18CDE2 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACBEC msgbox Text_18CD9C, MSGBOX_AUTOCLOSE end @@ -2978,7 +2978,7 @@ EventScript_1ACBEC:: @ 81ACBEC SevenIsland_SevaultCanyon_EventScript_1ACC07:: @ 81ACC07 trainerbattle_double TRAINER_COOL_COUPLE_LEX_NYA, Text_18CE20, Text_18CE5A, Text_18CEF4 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACC32 msgbox Text_18CE78, MSGBOX_AUTOCLOSE end @@ -2991,7 +2991,7 @@ EventScript_1ACC32:: @ 81ACC32 SevenIsland_TanobyRuins_EventScript_1ACC4D:: @ 81ACC4D trainerbattle_single TRAINER_RUIN_MANIAC_BRANDON, Text_18CFFB, Text_18D02A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACC74 msgbox Text_18D061, MSGBOX_AUTOCLOSE end @@ -3004,7 +3004,7 @@ EventScript_1ACC74:: @ 81ACC74 SevenIsland_TanobyRuins_EventScript_1ACC8B:: @ 81ACC8B trainerbattle_single TRAINER_RUIN_MANIAC_BENJAMIN, Text_18D0D9, Text_18D108 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACCB2 msgbox Text_18D125, MSGBOX_AUTOCLOSE end @@ -3017,7 +3017,7 @@ EventScript_1ACCB2:: @ 81ACCB2 SevenIsland_TanobyRuins_EventScript_1ACCC9:: @ 81ACCC9 trainerbattle_single TRAINER_PAINTER_EDNA, Text_18D18F, Text_18D1B5 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACCF0 msgbox Text_18D1E3, MSGBOX_AUTOCLOSE end @@ -3030,7 +3030,7 @@ EventScript_1ACCF0:: @ 81ACCF0 SevenIsland_TanobyRuins_EventScript_1ACD07:: @ 81ACD07 trainerbattle_single TRAINER_GENTLEMAN_CLIFFORD, Text_18D22F, Text_18D26D specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACD2E msgbox Text_18D284, MSGBOX_AUTOCLOSE end diff --git a/data/text/trainers.inc b/data/text/trainers.inc index 21a96a964..c73077c3b 100644 --- a/data/text/trainers.inc +++ b/data/text/trainers.inc @@ -165,205 +165,205 @@ Text_1C1BBE:: @ 81C1BBE Text_1C1BDC:: @ 81C1BDC .string "Go win, my super BUG POKéMON!$" -Text_1C1BFA:: @ 81C1BFA +Route10_Text_MarkRematchIntro:: @ 81C1BFA .string "Wow, you came here again?\n" .string "Maybe you're a POKéMANIAC, too?\l" .string "Want to see my collection?$" -Text_1C1C4F:: @ 81C1C4F +Route10_Text_ClarkRematchIntro:: @ 81C1C4F .string "Ha-hahah-ah-ha!\n" .string "I can't stop sneezing!$" -Text_1C1C76:: @ 81C1C76 +Route10_Text_HermanRematchIntro:: @ 81C1C76 .string "Hi, kid!\n" .string "Did I show you my POKéMON?$" -Text_1C1C9A:: @ 81C1C9A +Route10_Text_HeidiRematchIntro:: @ 81C1C9A .string "I went out to a POKéMON GYM again.\p" .string "…But I lost as usual.$" -Text_1C1CD3:: @ 81C1CD3 +Route10_Text_TrentRematchIntro:: @ 81C1CD3 .string "Ah!\n" .string "This mountain air is delicious!\l" .string "It's so good, I can't leave!$" -Text_1C1D14:: @ 81C1D14 +Route10_Text_CarolRematchIntro:: @ 81C1D14 .string "My head is starting to spin.\n" .string "I've been hiking for too long…$" -Text_1C1D50:: @ 81C1D50 +Route11_Text_HugoRematchIntro:: @ 81C1D50 .string "Win, lose, or draw!\n" .string "Now for our rematch!$" -Text_1C1D79:: @ 81C1D79 +Route11_Text_JasperRematchIntro:: @ 81C1D79 .string "Competing is the ultimate thrill.\n" .string "I still can't get enough!$" -Text_1C1DB5:: @ 81C1DB5 +Route11_Text_EddieRematchIntro:: @ 81C1DB5 .string "You know, right?\n" .string "Let's go, but don't cheat!$" -Text_1C1DE1:: @ 81C1DE1 +Route11_Text_BraxtonRematchIntro:: @ 81C1DE1 .string "Hi, there!\p" .string "But be careful!\n" .string "I'm still laying down some cables!$" -Text_1C1E1F:: @ 81C1E1F +Route11_Text_DillonRematchIntro:: @ 81C1E1F .string "I became a TRAINER a while ago.\n" .string "But, I think I can win.$" -Text_1C1E57:: @ 81C1E57 +Route11_Text_DirkRematchIntro:: @ 81C1E57 .string "Fwahaha!\n" .string "I have never lost!\p" .string "…And if I did, I've forgotten all\n" .string "about it!$" -Text_1C1E9F:: @ 81C1E9F +Route11_Text_DarianRematchIntro:: @ 81C1E9F .string "I have never won before…\p" .string "Perhaps I am destined to remain\n" .string "that way…$" -Text_1C1EE2:: @ 81C1EE2 +Route11_Text_YasuRematchIntro:: @ 81C1EE2 .string "I'm the best in my class.\n" .string "I train every morning and night!$" -Text_1C1F1D:: @ 81C1F1D +Route11_Text_BernieRematchIntro:: @ 81C1F1D .string "Keep your eyes out for live wires!$" -Text_1C1F40:: @ 81C1F40 +Route11_Text_DaveRematchIntro:: @ 81C1F40 .string "I raised my POKéMON carefully.\n" .string "They should be ready by now.\l" .string "This time, they should win, too.$" -Text_1C1F9D:: @ 81C1F9D +Route12_Text_NedRematchIntro:: @ 81C1F9D .string "Yeah!\n" .string "I got a bite, here!\l" .string "Th-this might be the real thing!$" -Text_1C1FD8:: @ 81C1FD8 +Route12_Text_ChipRematchIntro:: @ 81C1FD8 .string "You're finally here.\n" .string "Fishing is a waiting game.$" -Text_1C2008:: @ 81C2008 +Route12_Text_JustinRematchIntro:: @ 81C2008 .string "Still can't find a MOON STONE…\n" .string "Have you found one?$" -Text_1C203B:: @ 81C203B +Route12_Text_LucaRematchIntro:: @ 81C203B .string "Electricity has always been my\n" .string "specialty.\p" .string "I don't know a thing about POKéMON\n" .string "of the sea, though.$" -Text_1C209C:: @ 81C209C +Route12_Text_HankRematchIntro:: @ 81C209C .string "The FISHING FOOL vs. POKéMON KID!\n" .string "Another round, fight!$" -Text_1C20D4:: @ 81C20D4 +Route12_Text_ElliotRematchIntro:: @ 81C20D4 .string "I love fishing, don't get me wrong.\n" .string "But, I wish I had more work…\l" .string "…It's hard to give up fishing!$" -Text_1C2134:: @ 81C2134 +Route12_Text_AndrewRematchIntro:: @ 81C2134 .string "What's catching?\p" .string "You'll never know unless you beat\n" .string "me!$" -Text_1C216B:: @ 81C216B +Route12_Text_JesRematchIntro:: @ 81C216B .string "JES: I'll win here today and\n" .string "propose to my GIA.$" -Text_1C219B:: @ 81C219B +Route12_Text_GiaRematchIntro:: @ 81C219B .string "GIA: Hey, JES…\n" .string "I've been waiting a long time now.\p" .string "If we win today, I'll marry you!$" -Text_1C21EE:: @ 81C21EE +Route13_Text_SebastianRematchIntro:: @ 81C21EE .string "My bird POKéMON remember you!$" -Text_1C220C:: @ 81C220C +Route13_Text_SusieRematchIntro:: @ 81C220C .string "I want to be the best TRAINER \n" .string "while I'm a kid!$" -Text_1C223C:: @ 81C223C +Route13_Text_ValerieRematchIntro:: @ 81C223C .string "Wow!\n" .string "You got more cool BADGES!$" -Text_1C225B:: @ 81C225B +Route13_Text_GwenRematchIntro:: @ 81C225B .string "My cutely grown POKéMON wish to\n" .string "become reacquainted with you.$" -Text_1C2299:: @ 81C2299 +Route13_Text_AlmaRematchIntro:: @ 81C2299 .string "I cleaned out my savings and\n" .string "bought more CARBOS.$" -Text_1C22CA:: @ 81C22CA +Route13_Text_PerryRematchIntro:: @ 81C22CA .string "I'm not going to lose this time.\n" .string "The wind's blowing my way!$" -Text_1C2306:: @ 81C2306 +Route13_Text_LolaRematchIntro:: @ 81C2306 .string "Oh, you're back?\p" .string "Sure, I'll play again with you,\n" .string "sweetie.$" -Text_1C2340:: @ 81C2340 +Route13_Text_SheilaRematchIntro:: @ 81C2340 .string "Can't you forget that you battled\n" .string "with me?$" -Text_1C236B:: @ 81C236B +Route13_Text_JaredRematchIntro:: @ 81C236B .string "What're you starin' at?$" -Text_1C2383:: @ 81C2383 +Route13_Text_RobertRematchIntro:: @ 81C2383 .string "I always go with bird POKéMON.\n" .string "I've dedicated myself to them.$" -Text_1C23C1:: @ 81C23C1 +Route14_Text_CarterRematchIntro:: @ 81C23C1 .string "I used TMs to teach good moves\n" .string "to my POKéMON.$" -Text_1C23EF:: @ 81C23EF +Route14_Text_MitchRematchIntro:: @ 81C23EF .string "My bird POKéMON should be ready\n" .string "for battle this time.$" -Text_1C2425:: @ 81C2425 +Route14_Text_BeckRematchIntro:: @ 81C2425 .string "Are you using TMs on POKéMON?\n" .string "Just holding them is useless.$" -Text_1C2461:: @ 81C2461 +Route14_Text_MarlonRematchIntro:: @ 81C2461 .string "Have you taught your bird POKéMON\n" .string "how to FLY?\p" .string "You'll be able to soar with it into\n" .string "the sky! Give it a try.$" -Text_1C24CB:: @ 81C24CB +Route14_Text_DonaldRematchIntro:: @ 81C24CB .string "The legend of the winged mirages…\n" .string "You've heard it, right?$" -Text_1C2505:: @ 81C2505 +Route14_Text_BennyRematchIntro:: @ 81C2505 .string "I'm really not into it, but okay.\n" .string "Let's go!$" -Text_1C2531:: @ 81C2531 +Route14_Text_LukasRematchIntro:: @ 81C2531 .string "Hey!\n" .string "I remember you!\p" .string "C'mon, c'mon.\n" .string "Let's go, let's go, let's go!$" -Text_1C2572:: @ 81C2572 +Route14_Text_IsaacRematchIntro:: @ 81C2572 .string "You're here again, huh?\n" .string "Shut up and battle.$" -Text_1C259E:: @ 81C259E +Route14_Text_GeraldRematchIntro:: @ 81C259E .string "We've been riding here because of\n" .string "the wide-open spaces.$" -Text_1C25D6:: @ 81C25D6 +Route14_Text_MalikRematchIntro:: @ 81C25D6 .string "POKéMON battle, right?\n" .string "Cool! Rumble!$" -Text_1C25FB:: @ 81C25FB +Route14_Text_KiriRematchIntro:: @ 81C25FB .string "KIRI: JAN, I hope we win today.$" -Text_1C261B:: @ 81C261B +Route14_Text_JanRematchIntro:: @ 81C261B .string "JAN: KIRI, here we go!\n" .string "Let's win for sure this time!$" -- cgit v1.2.3 From 4ab216f309fe2db2cd2abfa775fa235f59178791 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 31 Jan 2020 14:57:57 -0500 Subject: Rename generic building tilesets, SAFFRON_CITY_CLASSIC --- data/event_scripts.s | 2 +- data/graphics.s | 42 +++++++-------- data/layouts/SaffronCity_Classic/border.bin | Bin 8 -> 0 bytes data/layouts/SaffronCity_Classic/map.bin | Bin 3840 -> 0 bytes data/layouts/SaffronCity_Connection/border.bin | Bin 0 -> 8 bytes data/layouts/SaffronCity_Connection/map.bin | Bin 0 -> 3840 bytes data/layouts/layouts.json | 58 ++++++++++----------- data/maps/Route5/map.json | 2 +- data/maps/Route6/map.json | 2 +- data/maps/Route7/map.json | 2 +- data/maps/Route8/map.json | 2 +- data/maps/SaffronCity_Classic/map.json | 40 -------------- data/maps/SaffronCity_Classic/scripts.inc | 2 - data/maps/SaffronCity_Connection/map.json | 40 ++++++++++++++ data/maps/SaffronCity_Connection/scripts.inc | 2 + data/maps/map_groups.json | 4 +- data/tilesets/graphics.inc | 42 +++++++-------- data/tilesets/headers.inc | 20 +++---- data/tilesets/metatiles.inc | 16 +++--- .../secondary/building1/metatile_attributes.bin | Bin 96 -> 0 bytes data/tilesets/secondary/building1/metatiles.bin | Bin 384 -> 0 bytes data/tilesets/secondary/building1/palettes/0.pal | 19 ------- data/tilesets/secondary/building1/palettes/1.pal | 19 ------- data/tilesets/secondary/building1/palettes/10.pal | 19 ------- data/tilesets/secondary/building1/palettes/11.pal | 19 ------- data/tilesets/secondary/building1/palettes/12.pal | 19 ------- data/tilesets/secondary/building1/palettes/13.pal | 19 ------- data/tilesets/secondary/building1/palettes/14.pal | 19 ------- data/tilesets/secondary/building1/palettes/15.pal | 19 ------- data/tilesets/secondary/building1/palettes/2.pal | 19 ------- data/tilesets/secondary/building1/palettes/3.pal | 19 ------- data/tilesets/secondary/building1/palettes/4.pal | 19 ------- data/tilesets/secondary/building1/palettes/5.pal | 19 ------- data/tilesets/secondary/building1/palettes/6.pal | 19 ------- data/tilesets/secondary/building1/palettes/7.pal | 19 ------- data/tilesets/secondary/building1/palettes/8.pal | 19 ------- data/tilesets/secondary/building1/palettes/9.pal | 19 ------- data/tilesets/secondary/building1/tiles.png | Bin 748 -> 0 bytes .../secondary/building2/metatile_attributes.bin | Bin 736 -> 0 bytes data/tilesets/secondary/building2/metatiles.bin | Bin 2944 -> 0 bytes data/tilesets/secondary/building2/palettes/0.pal | 19 ------- data/tilesets/secondary/building2/palettes/1.pal | 19 ------- data/tilesets/secondary/building2/palettes/10.pal | 19 ------- data/tilesets/secondary/building2/palettes/11.pal | 19 ------- data/tilesets/secondary/building2/palettes/12.pal | 19 ------- data/tilesets/secondary/building2/palettes/13.pal | 19 ------- data/tilesets/secondary/building2/palettes/14.pal | 19 ------- data/tilesets/secondary/building2/palettes/15.pal | 19 ------- data/tilesets/secondary/building2/palettes/2.pal | 19 ------- data/tilesets/secondary/building2/palettes/3.pal | 19 ------- data/tilesets/secondary/building2/palettes/4.pal | 19 ------- data/tilesets/secondary/building2/palettes/5.pal | 19 ------- data/tilesets/secondary/building2/palettes/6.pal | 19 ------- data/tilesets/secondary/building2/palettes/7.pal | 19 ------- data/tilesets/secondary/building2/palettes/8.pal | 19 ------- data/tilesets/secondary/building2/palettes/9.pal | 19 ------- data/tilesets/secondary/building2/tiles.png | Bin 1407 -> 0 bytes .../generic_building1/metatile_attributes.bin | Bin 0 -> 96 bytes .../secondary/generic_building1/metatiles.bin | Bin 0 -> 384 bytes .../secondary/generic_building1/palettes/0.pal | 19 +++++++ .../secondary/generic_building1/palettes/1.pal | 19 +++++++ .../secondary/generic_building1/palettes/10.pal | 19 +++++++ .../secondary/generic_building1/palettes/11.pal | 19 +++++++ .../secondary/generic_building1/palettes/12.pal | 19 +++++++ .../secondary/generic_building1/palettes/13.pal | 19 +++++++ .../secondary/generic_building1/palettes/14.pal | 19 +++++++ .../secondary/generic_building1/palettes/15.pal | 19 +++++++ .../secondary/generic_building1/palettes/2.pal | 19 +++++++ .../secondary/generic_building1/palettes/3.pal | 19 +++++++ .../secondary/generic_building1/palettes/4.pal | 19 +++++++ .../secondary/generic_building1/palettes/5.pal | 19 +++++++ .../secondary/generic_building1/palettes/6.pal | 19 +++++++ .../secondary/generic_building1/palettes/7.pal | 19 +++++++ .../secondary/generic_building1/palettes/8.pal | 19 +++++++ .../secondary/generic_building1/palettes/9.pal | 19 +++++++ .../tilesets/secondary/generic_building1/tiles.png | Bin 0 -> 748 bytes .../generic_building2/metatile_attributes.bin | Bin 0 -> 736 bytes .../secondary/generic_building2/metatiles.bin | Bin 0 -> 2944 bytes .../secondary/generic_building2/palettes/0.pal | 19 +++++++ .../secondary/generic_building2/palettes/1.pal | 19 +++++++ .../secondary/generic_building2/palettes/10.pal | 19 +++++++ .../secondary/generic_building2/palettes/11.pal | 19 +++++++ .../secondary/generic_building2/palettes/12.pal | 19 +++++++ .../secondary/generic_building2/palettes/13.pal | 19 +++++++ .../secondary/generic_building2/palettes/14.pal | 19 +++++++ .../secondary/generic_building2/palettes/15.pal | 19 +++++++ .../secondary/generic_building2/palettes/2.pal | 19 +++++++ .../secondary/generic_building2/palettes/3.pal | 19 +++++++ .../secondary/generic_building2/palettes/4.pal | 19 +++++++ .../secondary/generic_building2/palettes/5.pal | 19 +++++++ .../secondary/generic_building2/palettes/6.pal | 19 +++++++ .../secondary/generic_building2/palettes/7.pal | 19 +++++++ .../secondary/generic_building2/palettes/8.pal | 19 +++++++ .../secondary/generic_building2/palettes/9.pal | 19 +++++++ .../tilesets/secondary/generic_building2/tiles.png | Bin 0 -> 1407 bytes 95 files changed, 746 insertions(+), 746 deletions(-) delete mode 100644 data/layouts/SaffronCity_Classic/border.bin delete mode 100644 data/layouts/SaffronCity_Classic/map.bin create mode 100644 data/layouts/SaffronCity_Connection/border.bin create mode 100644 data/layouts/SaffronCity_Connection/map.bin delete mode 100644 data/maps/SaffronCity_Classic/map.json delete mode 100644 data/maps/SaffronCity_Classic/scripts.inc create mode 100644 data/maps/SaffronCity_Connection/map.json create mode 100644 data/maps/SaffronCity_Connection/scripts.inc delete mode 100644 data/tilesets/secondary/building1/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/building1/metatiles.bin delete mode 100644 data/tilesets/secondary/building1/palettes/0.pal delete mode 100644 data/tilesets/secondary/building1/palettes/1.pal delete mode 100644 data/tilesets/secondary/building1/palettes/10.pal delete mode 100644 data/tilesets/secondary/building1/palettes/11.pal delete mode 100644 data/tilesets/secondary/building1/palettes/12.pal delete mode 100644 data/tilesets/secondary/building1/palettes/13.pal delete mode 100644 data/tilesets/secondary/building1/palettes/14.pal delete mode 100644 data/tilesets/secondary/building1/palettes/15.pal delete mode 100644 data/tilesets/secondary/building1/palettes/2.pal delete mode 100644 data/tilesets/secondary/building1/palettes/3.pal delete mode 100644 data/tilesets/secondary/building1/palettes/4.pal delete mode 100644 data/tilesets/secondary/building1/palettes/5.pal delete mode 100644 data/tilesets/secondary/building1/palettes/6.pal delete mode 100644 data/tilesets/secondary/building1/palettes/7.pal delete mode 100644 data/tilesets/secondary/building1/palettes/8.pal delete mode 100644 data/tilesets/secondary/building1/palettes/9.pal delete mode 100644 data/tilesets/secondary/building1/tiles.png delete mode 100644 data/tilesets/secondary/building2/metatile_attributes.bin delete mode 100644 data/tilesets/secondary/building2/metatiles.bin delete mode 100644 data/tilesets/secondary/building2/palettes/0.pal delete mode 100644 data/tilesets/secondary/building2/palettes/1.pal delete mode 100644 data/tilesets/secondary/building2/palettes/10.pal delete mode 100644 data/tilesets/secondary/building2/palettes/11.pal delete mode 100644 data/tilesets/secondary/building2/palettes/12.pal delete mode 100644 data/tilesets/secondary/building2/palettes/13.pal delete mode 100644 data/tilesets/secondary/building2/palettes/14.pal delete mode 100644 data/tilesets/secondary/building2/palettes/15.pal delete mode 100644 data/tilesets/secondary/building2/palettes/2.pal delete mode 100644 data/tilesets/secondary/building2/palettes/3.pal delete mode 100644 data/tilesets/secondary/building2/palettes/4.pal delete mode 100644 data/tilesets/secondary/building2/palettes/5.pal delete mode 100644 data/tilesets/secondary/building2/palettes/6.pal delete mode 100644 data/tilesets/secondary/building2/palettes/7.pal delete mode 100644 data/tilesets/secondary/building2/palettes/8.pal delete mode 100644 data/tilesets/secondary/building2/palettes/9.pal delete mode 100644 data/tilesets/secondary/building2/tiles.png create mode 100644 data/tilesets/secondary/generic_building1/metatile_attributes.bin create mode 100644 data/tilesets/secondary/generic_building1/metatiles.bin create mode 100644 data/tilesets/secondary/generic_building1/palettes/0.pal create mode 100644 data/tilesets/secondary/generic_building1/palettes/1.pal create mode 100644 data/tilesets/secondary/generic_building1/palettes/10.pal create mode 100644 data/tilesets/secondary/generic_building1/palettes/11.pal create mode 100644 data/tilesets/secondary/generic_building1/palettes/12.pal create mode 100644 data/tilesets/secondary/generic_building1/palettes/13.pal create mode 100644 data/tilesets/secondary/generic_building1/palettes/14.pal create mode 100644 data/tilesets/secondary/generic_building1/palettes/15.pal create mode 100644 data/tilesets/secondary/generic_building1/palettes/2.pal create mode 100644 data/tilesets/secondary/generic_building1/palettes/3.pal create mode 100644 data/tilesets/secondary/generic_building1/palettes/4.pal create mode 100644 data/tilesets/secondary/generic_building1/palettes/5.pal create mode 100644 data/tilesets/secondary/generic_building1/palettes/6.pal create mode 100644 data/tilesets/secondary/generic_building1/palettes/7.pal create mode 100644 data/tilesets/secondary/generic_building1/palettes/8.pal create mode 100644 data/tilesets/secondary/generic_building1/palettes/9.pal create mode 100644 data/tilesets/secondary/generic_building1/tiles.png create mode 100644 data/tilesets/secondary/generic_building2/metatile_attributes.bin create mode 100644 data/tilesets/secondary/generic_building2/metatiles.bin create mode 100644 data/tilesets/secondary/generic_building2/palettes/0.pal create mode 100644 data/tilesets/secondary/generic_building2/palettes/1.pal create mode 100644 data/tilesets/secondary/generic_building2/palettes/10.pal create mode 100644 data/tilesets/secondary/generic_building2/palettes/11.pal create mode 100644 data/tilesets/secondary/generic_building2/palettes/12.pal create mode 100644 data/tilesets/secondary/generic_building2/palettes/13.pal create mode 100644 data/tilesets/secondary/generic_building2/palettes/14.pal create mode 100644 data/tilesets/secondary/generic_building2/palettes/15.pal create mode 100644 data/tilesets/secondary/generic_building2/palettes/2.pal create mode 100644 data/tilesets/secondary/generic_building2/palettes/3.pal create mode 100644 data/tilesets/secondary/generic_building2/palettes/4.pal create mode 100644 data/tilesets/secondary/generic_building2/palettes/5.pal create mode 100644 data/tilesets/secondary/generic_building2/palettes/6.pal create mode 100644 data/tilesets/secondary/generic_building2/palettes/7.pal create mode 100644 data/tilesets/secondary/generic_building2/palettes/8.pal create mode 100644 data/tilesets/secondary/generic_building2/palettes/9.pal create mode 100644 data/tilesets/secondary/generic_building2/tiles.png (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 294685a35..8855eeb6e 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -278,7 +278,7 @@ gStdScriptsEnd:: .include "data/maps/CinnabarIsland/scripts.inc" .include "data/maps/IndigoPlateau_Exterior/scripts.inc" .include "data/maps/SaffronCity/scripts.inc" - .include "data/maps/SaffronCity_Classic/scripts.inc" + .include "data/maps/SaffronCity_Connection/scripts.inc" .include "data/maps/OneIsland/scripts.inc" .include "data/maps/TwoIsland/scripts.inc" .include "data/maps/ThreeIsland/scripts.inc" diff --git a/data/graphics.s b/data/graphics.s index d10266442..3ae4f8e8a 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -16463,27 +16463,27 @@ gBerryFixWindow_Tilemap:: @ 8EA9588 .incbin "graphics/berry_fix/window.bin.lz" .align 2 -gTilesetPalettes_Building1:: @ 8EA97F4 - .incbin "data/tilesets/secondary/building1/palettes/0.gbapal" - .incbin "data/tilesets/secondary/building1/palettes/1.gbapal" - .incbin "data/tilesets/secondary/building1/palettes/2.gbapal" - .incbin "data/tilesets/secondary/building1/palettes/3.gbapal" - .incbin "data/tilesets/secondary/building1/palettes/4.gbapal" - .incbin "data/tilesets/secondary/building1/palettes/5.gbapal" - .incbin "data/tilesets/secondary/building1/palettes/6.gbapal" - .incbin "data/tilesets/secondary/building1/palettes/7.gbapal" - .incbin "data/tilesets/secondary/building1/palettes/8.gbapal" - .incbin "data/tilesets/secondary/building1/palettes/9.gbapal" - .incbin "data/tilesets/secondary/building1/palettes/10.gbapal" - .incbin "data/tilesets/secondary/building1/palettes/11.gbapal" - .incbin "data/tilesets/secondary/building1/palettes/12.gbapal" - .incbin "data/tilesets/secondary/building1/palettes/13.gbapal" - .incbin "data/tilesets/secondary/building1/palettes/14.gbapal" - .incbin "data/tilesets/secondary/building1/palettes/15.gbapal" - - .align 2 -gTilesetTiles_Building1:: @ 8EA99F4 - .incbin "data/tilesets/secondary/building1/tiles.4bpp.lz" +gTilesetPalettes_GenericBuilding1:: @ 8EA97F4 + .incbin "data/tilesets/secondary/generic_building1/palettes/0.gbapal" + .incbin "data/tilesets/secondary/generic_building1/palettes/1.gbapal" + .incbin "data/tilesets/secondary/generic_building1/palettes/2.gbapal" + .incbin "data/tilesets/secondary/generic_building1/palettes/3.gbapal" + .incbin "data/tilesets/secondary/generic_building1/palettes/4.gbapal" + .incbin "data/tilesets/secondary/generic_building1/palettes/5.gbapal" + .incbin "data/tilesets/secondary/generic_building1/palettes/6.gbapal" + .incbin "data/tilesets/secondary/generic_building1/palettes/7.gbapal" + .incbin "data/tilesets/secondary/generic_building1/palettes/8.gbapal" + .incbin "data/tilesets/secondary/generic_building1/palettes/9.gbapal" + .incbin "data/tilesets/secondary/generic_building1/palettes/10.gbapal" + .incbin "data/tilesets/secondary/generic_building1/palettes/11.gbapal" + .incbin "data/tilesets/secondary/generic_building1/palettes/12.gbapal" + .incbin "data/tilesets/secondary/generic_building1/palettes/13.gbapal" + .incbin "data/tilesets/secondary/generic_building1/palettes/14.gbapal" + .incbin "data/tilesets/secondary/generic_building1/palettes/15.gbapal" + + .align 2 +gTilesetTiles_GenericBuilding1:: @ 8EA99F4 + .incbin "data/tilesets/secondary/generic_building1/tiles.4bpp.lz" .align 2 gTilesetPalettes_DepartmentStore:: @ 8EA9D88 diff --git a/data/layouts/SaffronCity_Classic/border.bin b/data/layouts/SaffronCity_Classic/border.bin deleted file mode 100644 index a701312cf..000000000 Binary files a/data/layouts/SaffronCity_Classic/border.bin and /dev/null differ diff --git a/data/layouts/SaffronCity_Classic/map.bin b/data/layouts/SaffronCity_Classic/map.bin deleted file mode 100644 index dd7aea1cf..000000000 Binary files a/data/layouts/SaffronCity_Classic/map.bin and /dev/null differ diff --git a/data/layouts/SaffronCity_Connection/border.bin b/data/layouts/SaffronCity_Connection/border.bin new file mode 100644 index 000000000..a701312cf Binary files /dev/null and b/data/layouts/SaffronCity_Connection/border.bin differ diff --git a/data/layouts/SaffronCity_Connection/map.bin b/data/layouts/SaffronCity_Connection/map.bin new file mode 100644 index 000000000..dd7aea1cf Binary files /dev/null and b/data/layouts/SaffronCity_Connection/map.bin differ diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index 32bed0f52..1ca2575ed 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -9,7 +9,7 @@ "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", - "secondary_tileset": "gTileset_Building1", + "secondary_tileset": "gTileset_GenericBuilding1", "border_filepath": "data/layouts/PalletTown_PlayersHouse_1F/border.bin", "blockdata_filepath": "data/layouts/PalletTown_PlayersHouse_1F/map.bin" }, @@ -21,7 +21,7 @@ "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", - "secondary_tileset": "gTileset_Building1", + "secondary_tileset": "gTileset_GenericBuilding1", "border_filepath": "data/layouts/PalletTown_PlayersHouse_2F/border.bin", "blockdata_filepath": "data/layouts/PalletTown_PlayersHouse_2F/map.bin" }, @@ -33,7 +33,7 @@ "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", - "secondary_tileset": "gTileset_Building2", + "secondary_tileset": "gTileset_GenericBuilding2", "border_filepath": "data/layouts/PalletTown_GarysHouse/border.bin", "blockdata_filepath": "data/layouts/PalletTown_GarysHouse/map.bin" }, @@ -45,7 +45,7 @@ "border_width": 0, "border_height": 0, "primary_tileset": "gTileset_Building", - "secondary_tileset": "gTileset_Building1", + "secondary_tileset": "gTileset_GenericBuilding1", "border_filepath": "data/layouts/LittlerootTown_MaysHouse_2F/border.bin", "blockdata_filepath": "data/layouts/LittlerootTown_MaysHouse_2F/map.bin" }, @@ -69,7 +69,7 @@ "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", - "secondary_tileset": "gTileset_Building1", + "secondary_tileset": "gTileset_GenericBuilding1", "border_filepath": "data/layouts/House1/border.bin", "blockdata_filepath": "data/layouts/House1/map.bin" }, @@ -81,7 +81,7 @@ "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", - "secondary_tileset": "gTileset_Building2", + "secondary_tileset": "gTileset_GenericBuilding2", "border_filepath": "data/layouts/House2/border.bin", "blockdata_filepath": "data/layouts/House2/map.bin" }, @@ -129,7 +129,7 @@ "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", - "secondary_tileset": "gTileset_Building2", + "secondary_tileset": "gTileset_GenericBuilding2", "border_filepath": "data/layouts/House3/border.bin", "blockdata_filepath": "data/layouts/House3/map.bin" }, @@ -153,7 +153,7 @@ "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", - "secondary_tileset": "gTileset_Building2", + "secondary_tileset": "gTileset_GenericBuilding2", "border_filepath": "data/layouts/House4/border.bin", "blockdata_filepath": "data/layouts/House4/map.bin" }, @@ -249,7 +249,7 @@ "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", - "secondary_tileset": "gTileset_Building1", + "secondary_tileset": "gTileset_GenericBuilding1", "border_filepath": "data/layouts/House5/border.bin", "blockdata_filepath": "data/layouts/House5/map.bin" }, @@ -859,16 +859,16 @@ "blockdata_filepath": "data/layouts/IndigoPlateau_Exterior/map.bin" }, { - "id": "LAYOUT_SAFFRON_CITY_CLASSIC", - "name": "SaffronCity_Classic_Layout", + "id": "LAYOUT_SAFFRON_CITY_CONNECTION", + "name": "SaffronCity_Connection_Layout", "width": 48, "height": 40, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_SaffronCity", - "border_filepath": "data/layouts/SaffronCity_Classic/border.bin", - "blockdata_filepath": "data/layouts/SaffronCity_Classic/map.bin" + "border_filepath": "data/layouts/SaffronCity_Connection/border.bin", + "blockdata_filepath": "data/layouts/SaffronCity_Connection/map.bin" }, { "id": "LAYOUT_ROUTE1", @@ -1874,7 +1874,7 @@ "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", - "secondary_tileset": "gTileset_Building2", + "secondary_tileset": "gTileset_GenericBuilding2", "border_filepath": "data/layouts/UndergroundPath_Entrance/border.bin", "blockdata_filepath": "data/layouts/UndergroundPath_Entrance/map.bin" }, @@ -1911,7 +1911,7 @@ "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", - "secondary_tileset": "gTileset_Building2", + "secondary_tileset": "gTileset_GenericBuilding2", "border_filepath": "data/layouts/Route12_NorthEntrance_1F/border.bin", "blockdata_filepath": "data/layouts/Route12_NorthEntrance_1F/map.bin" }, @@ -1995,7 +1995,7 @@ "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", - "secondary_tileset": "gTileset_Building2", + "secondary_tileset": "gTileset_GenericBuilding2", "border_filepath": "data/layouts/CeruleanCity_House1/border.bin", "blockdata_filepath": "data/layouts/CeruleanCity_House1/map.bin" }, @@ -2295,7 +2295,7 @@ "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", - "secondary_tileset": "gTileset_Building2", + "secondary_tileset": "gTileset_GenericBuilding2", "border_filepath": "data/layouts/SaffronCity_NorthSouthEntrance/border.bin", "blockdata_filepath": "data/layouts/SaffronCity_NorthSouthEntrance/map.bin" }, @@ -2307,7 +2307,7 @@ "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", - "secondary_tileset": "gTileset_Building2", + "secondary_tileset": "gTileset_GenericBuilding2", "border_filepath": "data/layouts/SaffronCity_EastWestEntrance/border.bin", "blockdata_filepath": "data/layouts/SaffronCity_EastWestEntrance/map.bin" }, @@ -2439,7 +2439,7 @@ "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", - "secondary_tileset": "gTileset_Building2", + "secondary_tileset": "gTileset_GenericBuilding2", "border_filepath": "data/layouts/Entrance_2F/border.bin", "blockdata_filepath": "data/layouts/Entrance_2F/map.bin" }, @@ -2451,7 +2451,7 @@ "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", - "secondary_tileset": "gTileset_Building2", + "secondary_tileset": "gTileset_GenericBuilding2", "border_filepath": "data/layouts/Route2_Entrance/border.bin", "blockdata_filepath": "data/layouts/Route2_Entrance/map.bin" }, @@ -2463,7 +2463,7 @@ "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", - "secondary_tileset": "gTileset_Building2", + "secondary_tileset": "gTileset_GenericBuilding2", "border_filepath": "data/layouts/Route22_NorthEntrance/border.bin", "blockdata_filepath": "data/layouts/Route22_NorthEntrance/map.bin" }, @@ -2475,7 +2475,7 @@ "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", - "secondary_tileset": "gTileset_Building2", + "secondary_tileset": "gTileset_GenericBuilding2", "border_filepath": "data/layouts/Route16_NorthEntrance_1F/border.bin", "blockdata_filepath": "data/layouts/Route16_NorthEntrance_1F/map.bin" }, @@ -2487,7 +2487,7 @@ "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", - "secondary_tileset": "gTileset_Building2", + "secondary_tileset": "gTileset_GenericBuilding2", "border_filepath": "data/layouts/Entrance_1F/border.bin", "blockdata_filepath": "data/layouts/Entrance_1F/map.bin" }, @@ -2511,7 +2511,7 @@ "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", - "secondary_tileset": "gTileset_Building1", + "secondary_tileset": "gTileset_GenericBuilding1", "border_filepath": "data/layouts/SaffronCity_House1_1F/border.bin", "blockdata_filepath": "data/layouts/SaffronCity_House1_1F/map.bin" }, @@ -2523,7 +2523,7 @@ "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", - "secondary_tileset": "gTileset_Building1", + "secondary_tileset": "gTileset_GenericBuilding1", "border_filepath": "data/layouts/SaffronCity_House1_2F/border.bin", "blockdata_filepath": "data/layouts/SaffronCity_House1_2F/map.bin" }, @@ -2967,7 +2967,7 @@ "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", - "secondary_tileset": "gTileset_Building2", + "secondary_tileset": "gTileset_GenericBuilding2", "border_filepath": "data/layouts/SevenIsland_House_Room1_DoorOpen/border.bin", "blockdata_filepath": "data/layouts/SevenIsland_House_Room1_DoorOpen/map.bin" }, @@ -2979,7 +2979,7 @@ "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", - "secondary_tileset": "gTileset_Building2", + "secondary_tileset": "gTileset_GenericBuilding2", "border_filepath": "data/layouts/SevenIsland_House_Room2/border.bin", "blockdata_filepath": "data/layouts/SevenIsland_House_Room2/map.bin" }, @@ -3111,7 +3111,7 @@ "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", - "secondary_tileset": "gTileset_Building2", + "secondary_tileset": "gTileset_GenericBuilding2", "border_filepath": "data/layouts/ViridianCity_House1/border.bin", "blockdata_filepath": "data/layouts/ViridianCity_House1/map.bin" }, @@ -3495,7 +3495,7 @@ "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", - "secondary_tileset": "gTileset_Building2", + "secondary_tileset": "gTileset_GenericBuilding2", "border_filepath": "data/layouts/CeruleanCity_House5/border.bin", "blockdata_filepath": "data/layouts/CeruleanCity_House5/map.bin" }, diff --git a/data/maps/Route5/map.json b/data/maps/Route5/map.json index 8b047231e..28b739341 100644 --- a/data/maps/Route5/map.json +++ b/data/maps/Route5/map.json @@ -18,7 +18,7 @@ "direction": "up" }, { - "map": "MAP_SAFFRON_CITY_CLASSIC", + "map": "MAP_SAFFRON_CITY_CONNECTION", "offset": 0, "direction": "down" } diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index f67590481..a6016c5fa 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_CLASSIC", + "map": "MAP_SAFFRON_CITY_CONNECTION", "offset": 0, "direction": "up" }, diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index e30bc8149..2c5a9717c 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -18,7 +18,7 @@ "direction": "left" }, { - "map": "MAP_SAFFRON_CITY_CLASSIC", + "map": "MAP_SAFFRON_CITY_CONNECTION", "offset": -10, "direction": "right" } diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index 7ed8e635d..f16933a2e 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_CLASSIC", + "map": "MAP_SAFFRON_CITY_CONNECTION", "offset": -10, "direction": "left" }, diff --git a/data/maps/SaffronCity_Classic/map.json b/data/maps/SaffronCity_Classic/map.json deleted file mode 100644 index 0a5614975..000000000 --- a/data/maps/SaffronCity_Classic/map.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "id": "MAP_SAFFRON_CITY_CLASSIC", - "name": "SaffronCity_Classic", - "layout": "LAYOUT_SAFFRON_CITY_CLASSIC", - "music": "MUS_NIBI", - "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 deleted file mode 100644 index 26470756d..000000000 --- a/data/maps/SaffronCity_Classic/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -SaffronCity_Classic_MapScripts:: @ 8167483 - .byte 0 diff --git a/data/maps/SaffronCity_Connection/map.json b/data/maps/SaffronCity_Connection/map.json new file mode 100644 index 000000000..718007c43 --- /dev/null +++ b/data/maps/SaffronCity_Connection/map.json @@ -0,0 +1,40 @@ +{ + "id": "MAP_SAFFRON_CITY_CONNECTION", + "name": "SaffronCity_Connection", + "layout": "LAYOUT_SAFFRON_CITY_CONNECTION", + "music": "MUS_NIBI", + "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_Connection/scripts.inc b/data/maps/SaffronCity_Connection/scripts.inc new file mode 100644 index 000000000..94f49eb2d --- /dev/null +++ b/data/maps/SaffronCity_Connection/scripts.inc @@ -0,0 +1,2 @@ +SaffronCity_Connection_MapScripts:: @ 8167483 + .byte 0 diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 27213f55e..7c1094bbb 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -250,7 +250,7 @@ "CinnabarIsland", "IndigoPlateau_Exterior", "SaffronCity", - "SaffronCity_Classic", + "SaffronCity_Connection", "OneIsland", "TwoIsland", "ThreeIsland", @@ -567,7 +567,7 @@ "CinnabarIsland", "IndigoPlateau_Exterior", "SaffronCity", - "SaffronCity_Classic", + "SaffronCity_Connection", "OneIsland", "TwoIsland", "ThreeIsland", diff --git a/data/tilesets/graphics.inc b/data/tilesets/graphics.inc index f9f06f42e..6fc9a48f6 100644 --- a/data/tilesets/graphics.inc +++ b/data/tilesets/graphics.inc @@ -896,27 +896,27 @@ gTilesetPalettes_CeruleanCave:: @ 828E3A4 .incbin "data/tilesets/secondary/cerulean_cave/palettes/15.gbapal" .align 2 -gTilesetTiles_Building2:: @ 828E5A4 - .incbin "data/tilesets/secondary/building2/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_Building2:: @ 828EC70 - .incbin "data/tilesets/secondary/building2/palettes/0.gbapal" - .incbin "data/tilesets/secondary/building2/palettes/1.gbapal" - .incbin "data/tilesets/secondary/building2/palettes/2.gbapal" - .incbin "data/tilesets/secondary/building2/palettes/3.gbapal" - .incbin "data/tilesets/secondary/building2/palettes/4.gbapal" - .incbin "data/tilesets/secondary/building2/palettes/5.gbapal" - .incbin "data/tilesets/secondary/building2/palettes/6.gbapal" - .incbin "data/tilesets/secondary/building2/palettes/7.gbapal" - .incbin "data/tilesets/secondary/building2/palettes/8.gbapal" - .incbin "data/tilesets/secondary/building2/palettes/9.gbapal" - .incbin "data/tilesets/secondary/building2/palettes/10.gbapal" - .incbin "data/tilesets/secondary/building2/palettes/11.gbapal" - .incbin "data/tilesets/secondary/building2/palettes/12.gbapal" - .incbin "data/tilesets/secondary/building2/palettes/13.gbapal" - .incbin "data/tilesets/secondary/building2/palettes/14.gbapal" - .incbin "data/tilesets/secondary/building2/palettes/15.gbapal" +gTilesetTiles_GenericBuilding2:: @ 828E5A4 + .incbin "data/tilesets/secondary/generic_building2/tiles.4bpp.lz" + + .align 2 +gTilesetPalettes_GenericBuilding2:: @ 828EC70 + .incbin "data/tilesets/secondary/generic_building2/palettes/0.gbapal" + .incbin "data/tilesets/secondary/generic_building2/palettes/1.gbapal" + .incbin "data/tilesets/secondary/generic_building2/palettes/2.gbapal" + .incbin "data/tilesets/secondary/generic_building2/palettes/3.gbapal" + .incbin "data/tilesets/secondary/generic_building2/palettes/4.gbapal" + .incbin "data/tilesets/secondary/generic_building2/palettes/5.gbapal" + .incbin "data/tilesets/secondary/generic_building2/palettes/6.gbapal" + .incbin "data/tilesets/secondary/generic_building2/palettes/7.gbapal" + .incbin "data/tilesets/secondary/generic_building2/palettes/8.gbapal" + .incbin "data/tilesets/secondary/generic_building2/palettes/9.gbapal" + .incbin "data/tilesets/secondary/generic_building2/palettes/10.gbapal" + .incbin "data/tilesets/secondary/generic_building2/palettes/11.gbapal" + .incbin "data/tilesets/secondary/generic_building2/palettes/12.gbapal" + .incbin "data/tilesets/secondary/generic_building2/palettes/13.gbapal" + .incbin "data/tilesets/secondary/generic_building2/palettes/14.gbapal" + .incbin "data/tilesets/secondary/generic_building2/palettes/15.gbapal" .align 2 gTilesetTiles_PowerPlant:: @ 828EE70 diff --git a/data/tilesets/headers.inc b/data/tilesets/headers.inc index d108ed3a3..cac3cf82f 100644 --- a/data/tilesets/headers.inc +++ b/data/tilesets/headers.inc @@ -220,15 +220,15 @@ gTileset_BikeShop:: .4byte gMetatileAttributes_BikeShop .align 2 -gTileset_Building1:: +gTileset_GenericBuilding1:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_Building1 - .4byte gTilesetPalettes_Building1 - .4byte gMetatiles_Building1 + .4byte gTilesetTiles_GenericBuilding1 + .4byte gTilesetPalettes_GenericBuilding1 + .4byte gMetatiles_GenericBuilding1 .4byte 0x0 - .4byte gMetatileAttributes_Building1 + .4byte gMetatileAttributes_GenericBuilding1 .align 2 gTileset_Lab:: @@ -462,15 +462,15 @@ gTileset_DepartmentStore:: .4byte gMetatileAttributes_DepartmentStore .align 2 -gTileset_Building2:: +gTileset_GenericBuilding2:: .byte TRUE @ is compressed .byte TRUE @ is secondary .2byte 0 @ padding - .4byte gTilesetTiles_Building2 - .4byte gTilesetPalettes_Building2 - .4byte gMetatiles_Building2 + .4byte gTilesetTiles_GenericBuilding2 + .4byte gTilesetPalettes_GenericBuilding2 + .4byte gMetatiles_GenericBuilding2 .4byte 0x0 - .4byte gMetatileAttributes_Building2 + .4byte gMetatileAttributes_GenericBuilding2 .align 2 gTileset_PowerPlant:: diff --git a/data/tilesets/metatiles.inc b/data/tilesets/metatiles.inc index d98bc1583..7475f8117 100644 --- a/data/tilesets/metatiles.inc +++ b/data/tilesets/metatiles.inc @@ -207,12 +207,12 @@ gMetatileAttributes_PokemonCenter:: @ 82B4A50 .incbin "data/tilesets/secondary/pokemon_center/metatile_attributes.bin" .align 1 -gMetatiles_Building1:: @ 82B4E4C - .incbin "data/tilesets/secondary/building1/metatiles.bin" +gMetatiles_GenericBuilding1:: @ 82B4E4C + .incbin "data/tilesets/secondary/generic_building1/metatiles.bin" .align 1 -gMetatileAttributes_Building1:: @ 82B4FCC - .incbin "data/tilesets/secondary/building1/metatile_attributes.bin" +gMetatileAttributes_GenericBuilding1:: @ 82B4FCC + .incbin "data/tilesets/secondary/generic_building1/metatile_attributes.bin" .align 1 gMetatiles_Cave:: @ 82B502C @@ -319,12 +319,12 @@ gMetatileAttributes_DepartmentStore:: @ 82BEB3C .incbin "data/tilesets/secondary/department_store/metatile_attributes.bin" .align 1 -gMetatiles_Building2:: @ 82BEF14 - .incbin "data/tilesets/secondary/building2/metatiles.bin" +gMetatiles_GenericBuilding2:: @ 82BEF14 + .incbin "data/tilesets/secondary/generic_building2/metatiles.bin" .align 1 -gMetatileAttributes_Building2:: @ 82BFA94 - .incbin "data/tilesets/secondary/building2/metatile_attributes.bin" +gMetatileAttributes_GenericBuilding2:: @ 82BFA94 + .incbin "data/tilesets/secondary/generic_building2/metatile_attributes.bin" .align 1 gMetatiles_PowerPlant:: @ 82BFD74 diff --git a/data/tilesets/secondary/building1/metatile_attributes.bin b/data/tilesets/secondary/building1/metatile_attributes.bin deleted file mode 100644 index be95e451c..000000000 Binary files a/data/tilesets/secondary/building1/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/building1/metatiles.bin b/data/tilesets/secondary/building1/metatiles.bin deleted file mode 100644 index 806d040ce..000000000 Binary files a/data/tilesets/secondary/building1/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/building1/palettes/0.pal b/data/tilesets/secondary/building1/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/building1/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/building1/palettes/1.pal b/data/tilesets/secondary/building1/palettes/1.pal deleted file mode 100644 index 69f3f0b9e..000000000 --- a/data/tilesets/secondary/building1/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -180 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -238 246 238 diff --git a/data/tilesets/secondary/building1/palettes/10.pal b/data/tilesets/secondary/building1/palettes/10.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/building1/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/building1/palettes/11.pal b/data/tilesets/secondary/building1/palettes/11.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/building1/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/building1/palettes/12.pal b/data/tilesets/secondary/building1/palettes/12.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/building1/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/building1/palettes/13.pal b/data/tilesets/secondary/building1/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/building1/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/building1/palettes/14.pal b/data/tilesets/secondary/building1/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/building1/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/building1/palettes/15.pal b/data/tilesets/secondary/building1/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/building1/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/building1/palettes/2.pal b/data/tilesets/secondary/building1/palettes/2.pal deleted file mode 100644 index c8ee236d7..000000000 --- a/data/tilesets/secondary/building1/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -255 0 255 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/building1/palettes/3.pal b/data/tilesets/secondary/building1/palettes/3.pal deleted file mode 100644 index b17dbb054..000000000 --- a/data/tilesets/secondary/building1/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -164 164 164 -180 189 189 -255 255 255 -238 246 238 -213 230 222 -197 205 197 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/building1/palettes/4.pal b/data/tilesets/secondary/building1/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/building1/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/building1/palettes/5.pal b/data/tilesets/secondary/building1/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/building1/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/building1/palettes/6.pal b/data/tilesets/secondary/building1/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/building1/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/building1/palettes/7.pal b/data/tilesets/secondary/building1/palettes/7.pal deleted file mode 100644 index c1e7c3d5c..000000000 --- a/data/tilesets/secondary/building1/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 diff --git a/data/tilesets/secondary/building1/palettes/8.pal b/data/tilesets/secondary/building1/palettes/8.pal deleted file mode 100644 index 18480092b..000000000 --- a/data/tilesets/secondary/building1/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -139 222 156 -82 82 106 -115 123 131 -98 90 65 -139 123 82 -197 172 90 -230 230 238 -205 115 74 -238 172 82 -238 213 82 -131 189 57 -164 222 82 -156 139 172 -205 172 222 -213 205 230 -246 255 255 diff --git a/data/tilesets/secondary/building1/palettes/9.pal b/data/tilesets/secondary/building1/palettes/9.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/building1/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/building1/tiles.png b/data/tilesets/secondary/building1/tiles.png deleted file mode 100644 index 191287197..000000000 Binary files a/data/tilesets/secondary/building1/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/building2/metatile_attributes.bin b/data/tilesets/secondary/building2/metatile_attributes.bin deleted file mode 100644 index 18d7517d9..000000000 Binary files a/data/tilesets/secondary/building2/metatile_attributes.bin and /dev/null differ diff --git a/data/tilesets/secondary/building2/metatiles.bin b/data/tilesets/secondary/building2/metatiles.bin deleted file mode 100644 index 0943dc7af..000000000 Binary files a/data/tilesets/secondary/building2/metatiles.bin and /dev/null differ diff --git a/data/tilesets/secondary/building2/palettes/0.pal b/data/tilesets/secondary/building2/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/building2/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/building2/palettes/1.pal b/data/tilesets/secondary/building2/palettes/1.pal deleted file mode 100644 index d99adafff..000000000 --- a/data/tilesets/secondary/building2/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/building2/palettes/10.pal b/data/tilesets/secondary/building2/palettes/10.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/building2/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/building2/palettes/11.pal b/data/tilesets/secondary/building2/palettes/11.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/building2/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/building2/palettes/12.pal b/data/tilesets/secondary/building2/palettes/12.pal deleted file mode 100644 index 2903bb074..000000000 --- a/data/tilesets/secondary/building2/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -131 131 131 -180 180 164 -255 255 255 -189 164 82 -222 197 106 -230 222 156 -123 197 189 -156 222 213 -213 255 246 -255 0 255 -255 0 255 -213 131 65 -222 230 222 -246 238 189 diff --git a/data/tilesets/secondary/building2/palettes/13.pal b/data/tilesets/secondary/building2/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/building2/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/building2/palettes/14.pal b/data/tilesets/secondary/building2/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/building2/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/building2/palettes/15.pal b/data/tilesets/secondary/building2/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/building2/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/building2/palettes/2.pal b/data/tilesets/secondary/building2/palettes/2.pal deleted file mode 100644 index cc3a9457d..000000000 --- a/data/tilesets/secondary/building2/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/building2/palettes/3.pal b/data/tilesets/secondary/building2/palettes/3.pal deleted file mode 100644 index 7ec794ae5..000000000 --- a/data/tilesets/secondary/building2/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/building2/palettes/4.pal b/data/tilesets/secondary/building2/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/building2/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/building2/palettes/5.pal b/data/tilesets/secondary/building2/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/building2/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/building2/palettes/6.pal b/data/tilesets/secondary/building2/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/building2/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/building2/palettes/7.pal b/data/tilesets/secondary/building2/palettes/7.pal deleted file mode 100644 index c62a40b0d..000000000 --- a/data/tilesets/secondary/building2/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -148 172 139 -180 197 164 -213 222 197 -238 255 213 -115 156 180 -197 222 238 -123 197 189 -156 222 213 -213 255 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/building2/palettes/8.pal b/data/tilesets/secondary/building2/palettes/8.pal deleted file mode 100644 index 8c66b4998..000000000 --- a/data/tilesets/secondary/building2/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -230 222 156 -189 98 74 -230 156 98 -213 205 156 -115 156 180 -246 238 189 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/building2/palettes/9.pal b/data/tilesets/secondary/building2/palettes/9.pal deleted file mode 100644 index 25d5d7019..000000000 --- a/data/tilesets/secondary/building2/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -156 213 255 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -0 0 0 diff --git a/data/tilesets/secondary/building2/tiles.png b/data/tilesets/secondary/building2/tiles.png deleted file mode 100644 index ca6e21f03..000000000 Binary files a/data/tilesets/secondary/building2/tiles.png and /dev/null differ diff --git a/data/tilesets/secondary/generic_building1/metatile_attributes.bin b/data/tilesets/secondary/generic_building1/metatile_attributes.bin new file mode 100644 index 000000000..be95e451c Binary files /dev/null and b/data/tilesets/secondary/generic_building1/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/generic_building1/metatiles.bin b/data/tilesets/secondary/generic_building1/metatiles.bin new file mode 100644 index 000000000..806d040ce Binary files /dev/null and b/data/tilesets/secondary/generic_building1/metatiles.bin differ diff --git a/data/tilesets/secondary/generic_building1/palettes/0.pal b/data/tilesets/secondary/generic_building1/palettes/0.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/generic_building1/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/generic_building1/palettes/1.pal b/data/tilesets/secondary/generic_building1/palettes/1.pal new file mode 100644 index 000000000..69f3f0b9e --- /dev/null +++ b/data/tilesets/secondary/generic_building1/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +180 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +238 246 238 diff --git a/data/tilesets/secondary/generic_building1/palettes/10.pal b/data/tilesets/secondary/generic_building1/palettes/10.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/generic_building1/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/generic_building1/palettes/11.pal b/data/tilesets/secondary/generic_building1/palettes/11.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/generic_building1/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/generic_building1/palettes/12.pal b/data/tilesets/secondary/generic_building1/palettes/12.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/generic_building1/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/generic_building1/palettes/13.pal b/data/tilesets/secondary/generic_building1/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/generic_building1/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/generic_building1/palettes/14.pal b/data/tilesets/secondary/generic_building1/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/generic_building1/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/generic_building1/palettes/15.pal b/data/tilesets/secondary/generic_building1/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/generic_building1/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/generic_building1/palettes/2.pal b/data/tilesets/secondary/generic_building1/palettes/2.pal new file mode 100644 index 000000000..c8ee236d7 --- /dev/null +++ b/data/tilesets/secondary/generic_building1/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +255 0 255 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/generic_building1/palettes/3.pal b/data/tilesets/secondary/generic_building1/palettes/3.pal new file mode 100644 index 000000000..b17dbb054 --- /dev/null +++ b/data/tilesets/secondary/generic_building1/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +164 164 164 +180 189 189 +255 255 255 +238 246 238 +213 230 222 +197 205 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/generic_building1/palettes/4.pal b/data/tilesets/secondary/generic_building1/palettes/4.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/generic_building1/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/generic_building1/palettes/5.pal b/data/tilesets/secondary/generic_building1/palettes/5.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/generic_building1/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/generic_building1/palettes/6.pal b/data/tilesets/secondary/generic_building1/palettes/6.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/generic_building1/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/generic_building1/palettes/7.pal b/data/tilesets/secondary/generic_building1/palettes/7.pal new file mode 100644 index 000000000..c1e7c3d5c --- /dev/null +++ b/data/tilesets/secondary/generic_building1/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 diff --git a/data/tilesets/secondary/generic_building1/palettes/8.pal b/data/tilesets/secondary/generic_building1/palettes/8.pal new file mode 100644 index 000000000..18480092b --- /dev/null +++ b/data/tilesets/secondary/generic_building1/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 222 156 +82 82 106 +115 123 131 +98 90 65 +139 123 82 +197 172 90 +230 230 238 +205 115 74 +238 172 82 +238 213 82 +131 189 57 +164 222 82 +156 139 172 +205 172 222 +213 205 230 +246 255 255 diff --git a/data/tilesets/secondary/generic_building1/palettes/9.pal b/data/tilesets/secondary/generic_building1/palettes/9.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/generic_building1/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/generic_building1/tiles.png b/data/tilesets/secondary/generic_building1/tiles.png new file mode 100644 index 000000000..191287197 Binary files /dev/null and b/data/tilesets/secondary/generic_building1/tiles.png differ diff --git a/data/tilesets/secondary/generic_building2/metatile_attributes.bin b/data/tilesets/secondary/generic_building2/metatile_attributes.bin new file mode 100644 index 000000000..18d7517d9 Binary files /dev/null and b/data/tilesets/secondary/generic_building2/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/generic_building2/metatiles.bin b/data/tilesets/secondary/generic_building2/metatiles.bin new file mode 100644 index 000000000..0943dc7af Binary files /dev/null and b/data/tilesets/secondary/generic_building2/metatiles.bin differ diff --git a/data/tilesets/secondary/generic_building2/palettes/0.pal b/data/tilesets/secondary/generic_building2/palettes/0.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/generic_building2/palettes/0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/generic_building2/palettes/1.pal b/data/tilesets/secondary/generic_building2/palettes/1.pal new file mode 100644 index 000000000..d99adafff --- /dev/null +++ b/data/tilesets/secondary/generic_building2/palettes/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/generic_building2/palettes/10.pal b/data/tilesets/secondary/generic_building2/palettes/10.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/generic_building2/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/generic_building2/palettes/11.pal b/data/tilesets/secondary/generic_building2/palettes/11.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/generic_building2/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/generic_building2/palettes/12.pal b/data/tilesets/secondary/generic_building2/palettes/12.pal new file mode 100644 index 000000000..2903bb074 --- /dev/null +++ b/data/tilesets/secondary/generic_building2/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +131 131 131 +180 180 164 +255 255 255 +189 164 82 +222 197 106 +230 222 156 +123 197 189 +156 222 213 +213 255 246 +255 0 255 +255 0 255 +213 131 65 +222 230 222 +246 238 189 diff --git a/data/tilesets/secondary/generic_building2/palettes/13.pal b/data/tilesets/secondary/generic_building2/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/generic_building2/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/generic_building2/palettes/14.pal b/data/tilesets/secondary/generic_building2/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/generic_building2/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/generic_building2/palettes/15.pal b/data/tilesets/secondary/generic_building2/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/generic_building2/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/generic_building2/palettes/2.pal b/data/tilesets/secondary/generic_building2/palettes/2.pal new file mode 100644 index 000000000..cc3a9457d --- /dev/null +++ b/data/tilesets/secondary/generic_building2/palettes/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/generic_building2/palettes/3.pal b/data/tilesets/secondary/generic_building2/palettes/3.pal new file mode 100644 index 000000000..7ec794ae5 --- /dev/null +++ b/data/tilesets/secondary/generic_building2/palettes/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/generic_building2/palettes/4.pal b/data/tilesets/secondary/generic_building2/palettes/4.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/generic_building2/palettes/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/generic_building2/palettes/5.pal b/data/tilesets/secondary/generic_building2/palettes/5.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/generic_building2/palettes/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/generic_building2/palettes/6.pal b/data/tilesets/secondary/generic_building2/palettes/6.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/generic_building2/palettes/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/generic_building2/palettes/7.pal b/data/tilesets/secondary/generic_building2/palettes/7.pal new file mode 100644 index 000000000..c62a40b0d --- /dev/null +++ b/data/tilesets/secondary/generic_building2/palettes/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +148 172 139 +180 197 164 +213 222 197 +238 255 213 +115 156 180 +197 222 238 +123 197 189 +156 222 213 +213 255 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/generic_building2/palettes/8.pal b/data/tilesets/secondary/generic_building2/palettes/8.pal new file mode 100644 index 000000000..8c66b4998 --- /dev/null +++ b/data/tilesets/secondary/generic_building2/palettes/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +230 222 156 +189 98 74 +230 156 98 +213 205 156 +115 156 180 +246 238 189 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/generic_building2/palettes/9.pal b/data/tilesets/secondary/generic_building2/palettes/9.pal new file mode 100644 index 000000000..25d5d7019 --- /dev/null +++ b/data/tilesets/secondary/generic_building2/palettes/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +156 213 255 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +0 0 0 diff --git a/data/tilesets/secondary/generic_building2/tiles.png b/data/tilesets/secondary/generic_building2/tiles.png new file mode 100644 index 000000000..ca6e21f03 Binary files /dev/null and b/data/tilesets/secondary/generic_building2/tiles.png differ -- cgit v1.2.3 From 708fa70823f81cb9b2dffd93bf5f00842ddb4d72 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 1 Feb 2020 21:39:02 -0500 Subject: event_object_80688E4 --- data/event_object_80688E4.s | 97 --------------------------------------------- 1 file changed, 97 deletions(-) delete mode 100644 data/event_object_80688E4.s (limited to 'data') diff --git a/data/event_object_80688E4.s b/data/event_object_80688E4.s deleted file mode 100644 index 8d1917825..000000000 --- a/data/event_object_80688E4.s +++ /dev/null @@ -1,97 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - .section .rodata - .align 2 - -gUnknown_83A710C:: - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - -gUnknown_83A714C:: - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - -gUnknown_83A716C:: - .4byte double_little_steps - .4byte triple_little_steps - .4byte triple_little_steps - .4byte double_little_steps - .4byte triple_little_steps - .4byte triple_little_steps - -gUnknown_83A7184:: - .4byte quad_little_steps - .4byte quad_little_steps - .4byte quad_little_steps - .4byte quad_little_steps - -gUnknown_83A7194:: - .4byte oct_little_steps - .4byte oct_little_steps - -gUnknown_83A719C:: @ 83A719C - .4byte gUnknown_83A710C - .4byte gUnknown_83A714C - .4byte gUnknown_83A716C - .4byte gUnknown_83A7184 - .4byte gUnknown_83A7194 - -gUnknown_83A71B0:: @ 83A71B0 - .2byte 0x0010, 0x0008, 0x0006, 0x0004, 0x0002 - -gUnknown_83A71BA:: - .byte 0xfc, 0xfa, 0xf8, 0xf6, 0xf5, 0xf4, 0xf4, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xfa, 0xfc, 0x00, 0x00 - -gUnknown_83A71CA:: - .byte 0x00, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xfa, 0xfa, 0xfb, 0xfb, 0xfc, 0xfd, 0xfe, 0x00, 0x00, 0x00 - -gUnknown_83A71DA:: - .byte 0xfe, 0xfc, 0xfa, 0xf8, 0xf7, 0xf6, 0xf6, 0xf6, 0xf7, 0xf8, 0xfa, 0xfb, 0xfd, 0xfe, 0x00, 0x00 - - .align 2 -gUnknown_83A71EC:: @ 83A71EC - .4byte gUnknown_83A71BA - .4byte gUnknown_83A71CA - .4byte gUnknown_83A71DA - - .align 1 -gUnknown_83A71F8:: @ 83A71F8 - .2byte 0x10, 0x10, 0x20 - -gUnknown_83A71FE:: @ 83A71FE - .byte 0, 0, 1 - - .align 1 -gUnknown_83A7202:: @ 83A7202 - .2byte 0x20, 0x20, 0x40 - -gUnknown_83A7208:: @ 83A7208 - .byte 1, 1, 2 - - .align 2 -gUnknown_83A720C:: @ 83A720C - abspath "evobjmv.c" - - .align 2 -gUnknown_83A7240:: @ 83A7240 - .asciz "0" -- cgit v1.2.3 From 7bd0a83d359beafc69a1a63cb51b11e98186a292 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 Feb 2020 16:41:25 -0500 Subject: I'm so original with these commit names --- data/event_scripts.s | 9 +++++---- data/scripts/mystery_event_club.inc | 2 +- data/specials.inc | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index e28093686..31446116f 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -30,6 +30,7 @@ #include "constants/trade.h" #include "constants/quest_log.h" #include "constants/daycare.h" +#include "constants/easy_chat.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .set FALSE, 0 @@ -1170,9 +1171,9 @@ EventScript_ResetEliteFour:: @ 81A6551 .include "data/scripts/pc.inc" @ DoEasyChatScreen? -EventScript_1A6AC0:: @ 81A6AC0 +Common_ShowEasyChatScreen:: @ 81A6AC0 fadescreen FADE_TO_BLACK - special sub_80FEE44 + special ShowEasyChatScreen fadescreen FADE_FROM_BLACK return @@ -1332,8 +1333,8 @@ gUnknown_81A7702:: @ 81A7702 msgbox Text_FillOutQuestionnaire, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq EventScript_1A778A - setvar VAR_0x8004, 14 - call EventScript_1A6AC0 + setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE + call Common_ShowEasyChatScreen lock faceplayer specialvar VAR_0x8008, Special_GetMartClerkObjectId diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index d47a2d06c..bfc9fbbbd 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -101,7 +101,7 @@ EventScript_GaveSpecialProfile: @ 81BEF3F EventScript_GiveProfile: @ 81BEF5A setvar VAR_0x8004, 0 - call EventScript_1A6AC0 + call Common_ShowEasyChatScreen lock faceplayer compare VAR_0x8004, 0 diff --git a/data/specials.inc b/data/specials.inc index 39ce252a4..d31d4e4d0 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -103,7 +103,7 @@ gSpecials:: @ 815FD60 def_special sub_8081128 def_special Field_AskSaveTheGame def_special nullsub_56 - def_special sub_80FEE44 + def_special ShowEasyChatScreen def_special Special_BufferEasyChatMessage def_special nullsub_75 def_special nullsub_75 -- cgit v1.2.3 From e0d25c32898b1284297159a5d1c1c6422a040150 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 Feb 2020 20:09:14 -0500 Subject: Document wireless_communication_status_screen --- data/scripts/cable_club.inc | 2 +- data/specials.inc | 2 +- data/strings.s | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'data') diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index c75ebdcfd..c174eaf41 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -1149,7 +1149,7 @@ CableClub_EventScript_81BBFD8:: @ 81BBFD8 goto_if_eq CableClub_EventScript_AdapterNotConnected special HelpSystem_Disable fadescreen FADE_TO_BLACK - special sub_814F1D4 + special Special_WirelessCommunicationScreen waitstate msgbox CableClub_Text_ParticipantsStepUpToCounter special HelpSystem_Enable diff --git a/data/specials.inc b/data/specials.inc index d31d4e4d0..96064fec3 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -374,7 +374,7 @@ gSpecials:: @ 815FD60 def_special TryBecomeLinkLeader def_special TryJoinLinkGroup def_special UnionRoomSpecial - def_special sub_814F1D4 + def_special Special_WirelessCommunicationScreen def_special EnableNationalPokedex def_special sub_80699E0 def_special sub_80699BC diff --git a/data/strings.s b/data/strings.s index 5cff90fcd..6ad1cfb0c 100644 --- a/data/strings.s +++ b/data/strings.s @@ -4498,19 +4498,19 @@ gUnknown_841E243:: @ 841E243 gUnknown_841E244:: @ 841E244 .string "$" -gUnknown_841E245:: @ 841E245 +gText_WirelessCommunicationStatus:: @ 841E245 .string "Wireless Communication Status$" -gUnknown_841E263:: @ 841E263 +gText_PeopleTrading:: @ 841E263 .string "People trading:$" -gUnknown_841E273:: @ 841E273 +gText_PeopleBattling:: @ 841E273 .string "People battling:$" -gUnknown_841E284:: @ 841E284 +gText_PeopleInUnionRoom:: @ 841E284 .string "People in the UNION ROOM:$" -gUnknown_841E29E:: @ 841E29E +gText_PeopleCommunicating:: @ 841E29E .string "People communicating:$" gUnknown_841E2B4:: @ 841E2B4 -- cgit v1.2.3 From 4770fac9eb9696236fa998554a353f1f140a1ed4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 4 Feb 2020 14:16:45 -0500 Subject: More mevent documentation --- data/strings.s | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'data') diff --git a/data/strings.s b/data/strings.s index 6ad1cfb0c..f595170ff 100644 --- a/data/strings.s +++ b/data/strings.s @@ -4230,51 +4230,51 @@ gJPText_MysteryGift:: @ 841DE50 gJPText_DecideStop:: @ 841DE51 .string "$" -gUnknown_841DE52:: @ 841DE52 +gJPText_ReceiveMysteryGiftWithEReader:: @ 841DE52 .string "$" -gUnknown_841DE53:: @ 841DE53 +gJPText_SelectConnectFromEReaderMenu:: @ 841DE53 .string "$" -gUnknown_841DE54:: @ 841DE54 +gJPText_SelectConnectWithGBA:: @ 841DE54 .string "$" -gUnknown_841DE55:: @ 841DE55 +gJPText_SelectConnectAndPressA:: @ 841DE55 .string "カ-ドeリ-ダ-{PLUS}の ‘つうしん'を\n" .string "えらんで Aボタンを おしてください$" -gUnknown_841DE7C:: @ 841DE7C +gJPText_LinkIsIncorrect:: @ 841DE7C .string "$" -gUnknown_841DE7D:: @ 841DE7D +gJPText_CardReadingHasBeenHalted:: @ 841DE7D .string "$" -gUnknown_841DE7E:: @ 841DE7E +gJPText_UnableConnectWithEReader:: @ 841DE7E .string "カ-ドeリ-ダ-{PLUS}と\n" .string "つうしん できません$" -gUnknown_841DE95:: @ 841DE95 +gJPText_Connecting:: @ 841DE95 .string "$" -gUnknown_841DE96:: @ 841DE96 +gJPText_ConnectionErrorCheckLink:: @ 841DE96 .string "$" -gUnknown_841DE97:: @ 841DE97 +gJPText_ConnectionErrorTryAgain:: @ 841DE97 .string "$" -gUnknown_841DE98:: @ 841DE98 +gJPText_AllowEReaderToLoadCard:: @ 841DE98 .string "$" -gUnknown_841DE99:: @ 841DE99 +gJPText_ConnectionComplete:: @ 841DE99 .string "$" -gUnknown_841DE9A:: @ 841DE9A +gJPText_NewTrainerHasComeToSevii:: @ 841DE9A .string "$" -gUnknown_841DE9B:: @ 841DE9B +gJPText_PleaseWaitAMoment:: @ 841DE9B .string "$" -gUnknown_841DE9C:: @ 841DE9C +gJPText_WriteErrorUnableToSaveData:: @ 841DE9C .string "$" gText_CommErrorCheckConnections:: @ 841DE9D -- cgit v1.2.3 From 354d837d6f680b44b7824e95a1363b387717807a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 11 Feb 2020 10:49:36 -0500 Subject: document digit_obj_util --- data/berry_crush.s | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) (limited to 'data') diff --git a/data/berry_crush.s b/data/berry_crush.s index cc7ae23fd..417347801 100644 --- a/data/berry_crush.s +++ b/data/berry_crush.s @@ -339,22 +339,28 @@ gUnknown_846F458:: @ 846F458 gUnknown_846F470:: @ 846F470 spr_template 5, 5, gOamData_AffineDouble_ObjNormal_32x32, gUnknown_846F404, NULL, gUnknown_846F408, SpriteCallbackDummy -gUnknown_846F488:: @ 846F488 struct UnkStruct3? perhaps not - .byte 9, 2, 8 +gUnknown_846F488:: @ 846F488 DigitObjUtilTemplate + @ strConvMode, shape, size, priority + .byte 1 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 9 + .byte 2, 8 @ ndigits, width .align 2 - .2byte 0x9c, 0x00 - .4byte gUnknown_846F2F8 + 0x18 - .4byte gUnknown_846F320 + 0x10 - .byte 8, 2, 8 + .2byte 0x9c, 0x00 @ x, y + .4byte gUnknown_846F2F8 + 0x18 @ spriteSheet + .4byte gUnknown_846F320 + 0x10 @ spritePalette + @ strConvMode, shape, size, priority + .byte 0 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 8 + .byte 2, 8 @ ndigits, width .align 2 - .2byte 0xb4, 0x00 - .4byte gUnknown_846F2F8 + 0x18 - .4byte gUnknown_846F320 + 0x10 - .byte 8, 2, 8 + .2byte 0xb4, 0x00 @ x, y + .4byte gUnknown_846F2F8 + 0x18 @ spriteSheet + .4byte gUnknown_846F320 + 0x10 @ spritePalette + @ strConvMode, shape, size, priority + .byte 0 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 8 + .byte 2, 8 @ ndigits, width .align 2 - .2byte 0xcc, 0x00 - .4byte gUnknown_846F2F8 + 0x18 - .4byte gUnknown_846F320 + 0x10 + .2byte 0xcc, 0x00 @ x, y + .4byte gUnknown_846F2F8 + 0x18 @ spriteSheet + .4byte gUnknown_846F320 + 0x10 @ spritePalette gUnknown_846F4B8:: @ 846F4B8 .4byte gUnknown_841D034 -- cgit v1.2.3 From 32dc21b634c74c2287b94289fdfe08499c626302 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 11 Feb 2020 16:56:09 -0500 Subject: Remove defunct macros and move trainer tower pointers and dummy header --- data/data_8479668.s | 42 ----------------------------------------- data/trainer_tower/trainers.inc | 40 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 42 deletions(-) (limited to 'data') diff --git a/data/data_8479668.s b/data/data_8479668.s index 393a5cc44..6d8a22898 100644 --- a/data/data_8479668.s +++ b/data/data_8479668.s @@ -174,52 +174,10 @@ gText_UnionRoomChatKeyboard_Emoji9:: gText_UnionRoomChatKeyboard_Emoji10:: .string "{EXTRA 210}{EXTRA 208}ょ: $" - // trainer_tower (again?) - @ 847ABAC .align 2 .include "data/trainer_tower/trainers.inc" - .align 2 -gUnknown_84827AC:: @ 84827AC - .byte 0x08, 0x01 - .align 2 - .4byte 0 - -gUnknown_84827B4:: @ 84827B4 - .4byte gUnknown_847F16C - .4byte gUnknown_847D26C - .4byte gUnknown_84808AC - .4byte gUnknown_847ABAC - .4byte gUnknown_847CAAC - .4byte gUnknown_847E9AC - .4byte gUnknown_847AF8C - .4byte gUnknown_847CE8C - .4byte gUnknown_847DA2C - .4byte gUnknown_847BF0C - .4byte gUnknown_847D64C - .4byte gUnknown_847DE0C - .4byte gUnknown_847B74C - .4byte gUnknown_847BB2C - .4byte gUnknown_848182C - .4byte gUnknown_847F92C - .4byte gUnknown_847C2EC - .4byte gUnknown_847C6CC - .4byte gUnknown_847E5CC - .4byte gUnknown_84804CC - .4byte gUnknown_84823CC - .4byte gUnknown_8481FEC - .4byte gUnknown_84800EC - .4byte gUnknown_847E1EC - .4byte gUnknown_847ED8C - .4byte gUnknown_848106C - .4byte gUnknown_8480C8C - .4byte gUnknown_847F92C - .4byte gUnknown_847F54C - .4byte gUnknown_847E1EC - .4byte gUnknown_847D64C - .4byte gUnknown_847C6CC - .include "data/text/move_descriptions.inc" .align 2, 0 diff --git a/data/trainer_tower/trainers.inc b/data/trainer_tower/trainers.inc index 5f9b0f49b..645a8a27e 100644 --- a/data/trainer_tower/trainers.inc +++ b/data/trainer_tower/trainers.inc @@ -5111,3 +5111,43 @@ gUnknown_84823CC:: .byte 255 @ friendship .byte 0x80, 0x6b, 0x01 + + .align 2 +gUnknown_84827AC:: @ 84827AC + .byte 0x08, 0x01 + .2byte 0 + .4byte 0 + +gUnknown_84827B4:: @ 84827B4 + .4byte gUnknown_847F16C + .4byte gUnknown_847D26C + .4byte gUnknown_84808AC + .4byte gUnknown_847ABAC + .4byte gUnknown_847CAAC + .4byte gUnknown_847E9AC + .4byte gUnknown_847AF8C + .4byte gUnknown_847CE8C + .4byte gUnknown_847DA2C + .4byte gUnknown_847BF0C + .4byte gUnknown_847D64C + .4byte gUnknown_847DE0C + .4byte gUnknown_847B74C + .4byte gUnknown_847BB2C + .4byte gUnknown_848182C + .4byte gUnknown_847F92C + .4byte gUnknown_847C2EC + .4byte gUnknown_847C6CC + .4byte gUnknown_847E5CC + .4byte gUnknown_84804CC + .4byte gUnknown_84823CC + .4byte gUnknown_8481FEC + .4byte gUnknown_84800EC + .4byte gUnknown_847E1EC + .4byte gUnknown_847ED8C + .4byte gUnknown_848106C + .4byte gUnknown_8480C8C + .4byte gUnknown_847F92C + .4byte gUnknown_847F54C + .4byte gUnknown_847E1EC + .4byte gUnknown_847D64C + .4byte gUnknown_847C6CC -- cgit v1.2.3 From b3167d579b903badfd0be67c02d30bdd71fd9ef6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 15 Feb 2020 14:49:27 -0500 Subject: use uroom size/count macros; travis reverts back to agbcc master --- data/event_scripts.s | 1 - 1 file changed, 1 deletion(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 31446116f..2681f52c9 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1170,7 +1170,6 @@ EventScript_ResetEliteFour:: @ 81A6551 .include "data/scripts/obtain_item.inc" .include "data/scripts/pc.inc" -@ DoEasyChatScreen? Common_ShowEasyChatScreen:: @ 81A6AC0 fadescreen FADE_TO_BLACK special ShowEasyChatScreen -- cgit v1.2.3 From 4643330fdd2f458a4f714eb7ae1a586d2d24da37 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 18 Feb 2020 14:08:29 -0500 Subject: Name allow_cycling, floor_number header properties --- data/maps/BattleColosseum_2P/map.json | 2 +- data/maps/BattleColosseum_4P/map.json | 2 +- data/maps/BirthIsland_Exterior/map.json | 2 +- data/maps/BirthIsland_Harbor/map.json | 2 +- data/maps/CeladonCity/map.json | 2 +- data/maps/CeladonCity_Condominiums_1F/map.json | 2 +- data/maps/CeladonCity_Condominiums_2F/map.json | 2 +- data/maps/CeladonCity_Condominiums_3F/map.json | 2 +- data/maps/CeladonCity_Condominiums_Roof/map.json | 2 +- data/maps/CeladonCity_Condominiums_RoofRoom/map.json | 2 +- data/maps/CeladonCity_DepartmentStore_1F/map.json | 2 +- data/maps/CeladonCity_DepartmentStore_2F/map.json | 2 +- data/maps/CeladonCity_DepartmentStore_3F/map.json | 2 +- data/maps/CeladonCity_DepartmentStore_4F/map.json | 2 +- data/maps/CeladonCity_DepartmentStore_5F/map.json | 2 +- data/maps/CeladonCity_DepartmentStore_Elevator/map.json | 2 +- data/maps/CeladonCity_DepartmentStore_Roof/map.json | 2 +- data/maps/CeladonCity_GameCorner/map.json | 2 +- data/maps/CeladonCity_GameCorner_PrizeRoom/map.json | 2 +- data/maps/CeladonCity_Gym/map.json | 2 +- data/maps/CeladonCity_Hotel/map.json | 2 +- data/maps/CeladonCity_House1/map.json | 2 +- data/maps/CeladonCity_PokemonCenter_1F/map.json | 2 +- data/maps/CeladonCity_PokemonCenter_2F/map.json | 2 +- data/maps/CeladonCity_Restaurant/map.json | 2 +- data/maps/CeruleanCave_1F/map.json | 2 +- data/maps/CeruleanCave_2F/map.json | 2 +- data/maps/CeruleanCave_B1F/map.json | 2 +- data/maps/CeruleanCity/map.json | 2 +- data/maps/CeruleanCity_BikeShop/map.json | 2 +- data/maps/CeruleanCity_Gym/map.json | 2 +- data/maps/CeruleanCity_House1/map.json | 2 +- data/maps/CeruleanCity_House2/map.json | 2 +- data/maps/CeruleanCity_House3/map.json | 2 +- data/maps/CeruleanCity_House4/map.json | 2 +- data/maps/CeruleanCity_House5/map.json | 2 +- data/maps/CeruleanCity_Mart/map.json | 2 +- data/maps/CeruleanCity_PokemonCenter_1F/map.json | 2 +- data/maps/CeruleanCity_PokemonCenter_2F/map.json | 2 +- data/maps/CinnabarIsland/map.json | 2 +- data/maps/CinnabarIsland_Gym/map.json | 2 +- data/maps/CinnabarIsland_Mart/map.json | 2 +- data/maps/CinnabarIsland_PokemonCenter_1F/map.json | 2 +- data/maps/CinnabarIsland_PokemonCenter_2F/map.json | 2 +- data/maps/CinnabarIsland_PokemonLab_Entrance/map.json | 2 +- data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json | 2 +- data/maps/CinnabarIsland_PokemonLab_Lounge/map.json | 2 +- data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json | 2 +- data/maps/DiglettsCave_B1F/map.json | 2 +- data/maps/DiglettsCave_NorthEntrance/map.json | 2 +- data/maps/DiglettsCave_SouthEntrance/map.json | 2 +- data/maps/FiveIsland/map.json | 2 +- data/maps/FiveIsland_Harbor/map.json | 2 +- data/maps/FiveIsland_House1/map.json | 2 +- data/maps/FiveIsland_House2/map.json | 2 +- data/maps/FiveIsland_LostCave_Entrance/map.json | 2 +- data/maps/FiveIsland_LostCave_Room1/map.json | 2 +- data/maps/FiveIsland_LostCave_Room10/map.json | 2 +- data/maps/FiveIsland_LostCave_Room11/map.json | 2 +- data/maps/FiveIsland_LostCave_Room12/map.json | 2 +- data/maps/FiveIsland_LostCave_Room13/map.json | 2 +- data/maps/FiveIsland_LostCave_Room14/map.json | 2 +- data/maps/FiveIsland_LostCave_Room2/map.json | 2 +- data/maps/FiveIsland_LostCave_Room3/map.json | 2 +- data/maps/FiveIsland_LostCave_Room4/map.json | 2 +- data/maps/FiveIsland_LostCave_Room5/map.json | 2 +- data/maps/FiveIsland_LostCave_Room6/map.json | 2 +- data/maps/FiveIsland_LostCave_Room7/map.json | 2 +- data/maps/FiveIsland_LostCave_Room8/map.json | 2 +- data/maps/FiveIsland_LostCave_Room9/map.json | 2 +- data/maps/FiveIsland_Meadow/map.json | 2 +- data/maps/FiveIsland_MemorialPillar/map.json | 2 +- data/maps/FiveIsland_PokemonCenter_1F/map.json | 2 +- data/maps/FiveIsland_PokemonCenter_2F/map.json | 2 +- data/maps/FiveIsland_ResortGorgeous/map.json | 2 +- data/maps/FiveIsland_ResortGorgeous_House/map.json | 2 +- data/maps/FiveIsland_RocketWarehouse/map.json | 2 +- data/maps/FiveIsland_WaterLabyrinth/map.json | 2 +- data/maps/FourIsland/map.json | 2 +- data/maps/FourIsland_Harbor/map.json | 2 +- data/maps/FourIsland_House1/map.json | 2 +- data/maps/FourIsland_House2/map.json | 2 +- data/maps/FourIsland_IcefallCave_1F/map.json | 2 +- data/maps/FourIsland_IcefallCave_B1F/map.json | 2 +- data/maps/FourIsland_IcefallCave_Back/map.json | 2 +- data/maps/FourIsland_IcefallCave_Entrance/map.json | 2 +- data/maps/FourIsland_LoreleisHouse/map.json | 2 +- data/maps/FourIsland_Mart/map.json | 2 +- data/maps/FourIsland_PokemonCenter_1F/map.json | 2 +- data/maps/FourIsland_PokemonCenter_2F/map.json | 2 +- data/maps/FourIsland_PokemonDayCare/map.json | 2 +- data/maps/FuchsiaCity/map.json | 2 +- data/maps/FuchsiaCity_Gym/map.json | 2 +- data/maps/FuchsiaCity_House1/map.json | 2 +- data/maps/FuchsiaCity_House2/map.json | 2 +- data/maps/FuchsiaCity_House3/map.json | 2 +- data/maps/FuchsiaCity_Mart/map.json | 2 +- data/maps/FuchsiaCity_PokemonCenter_1F/map.json | 2 +- data/maps/FuchsiaCity_PokemonCenter_2F/map.json | 2 +- data/maps/FuchsiaCity_SafariZone_Entrance/map.json | 2 +- data/maps/FuchsiaCity_SafariZone_Office/map.json | 2 +- data/maps/FuchsiaCity_WardensHouse/map.json | 2 +- data/maps/IndigoPlateau_Exterior/map.json | 2 +- data/maps/IndigoPlateau_PokemonCenter_1F/map.json | 2 +- data/maps/IndigoPlateau_PokemonCenter_2F/map.json | 2 +- data/maps/LavenderTown/map.json | 2 +- data/maps/LavenderTown_House1/map.json | 2 +- data/maps/LavenderTown_House2/map.json | 2 +- data/maps/LavenderTown_Mart/map.json | 2 +- data/maps/LavenderTown_PokemonCenter_1F/map.json | 2 +- data/maps/LavenderTown_PokemonCenter_2F/map.json | 2 +- data/maps/LavenderTown_VolunteerPokemonHouse/map.json | 2 +- data/maps/MtEmber_Exterior/map.json | 2 +- data/maps/MtEmber_RubyPath_1F/map.json | 2 +- data/maps/MtEmber_RubyPath_B1F/map.json | 2 +- data/maps/MtEmber_RubyPath_B1F_Stairs/map.json | 2 +- data/maps/MtEmber_RubyPath_B2F/map.json | 2 +- data/maps/MtEmber_RubyPath_B2F_Stairs/map.json | 2 +- data/maps/MtEmber_RubyPath_B3F/map.json | 2 +- data/maps/MtEmber_RubyPath_B4F/map.json | 2 +- data/maps/MtEmber_RubyPath_B5F/map.json | 2 +- data/maps/MtEmber_Summit/map.json | 2 +- data/maps/MtEmber_SummitPath_1F/map.json | 2 +- data/maps/MtEmber_SummitPath_2F/map.json | 2 +- data/maps/MtEmber_SummitPath_3F/map.json | 2 +- data/maps/MtMoon_1F/map.json | 2 +- data/maps/MtMoon_B1F/map.json | 2 +- data/maps/MtMoon_B2F/map.json | 2 +- data/maps/NavelRock_1F/map.json | 2 +- data/maps/NavelRock_B1F/map.json | 2 +- data/maps/NavelRock_Base/map.json | 2 +- data/maps/NavelRock_BasePath_B10F/map.json | 2 +- data/maps/NavelRock_BasePath_B11F/map.json | 2 +- data/maps/NavelRock_BasePath_B1F/map.json | 2 +- data/maps/NavelRock_BasePath_B2F/map.json | 2 +- data/maps/NavelRock_BasePath_B3F/map.json | 2 +- data/maps/NavelRock_BasePath_B4F/map.json | 2 +- data/maps/NavelRock_BasePath_B5F/map.json | 2 +- data/maps/NavelRock_BasePath_B6F/map.json | 2 +- data/maps/NavelRock_BasePath_B7F/map.json | 2 +- data/maps/NavelRock_BasePath_B8F/map.json | 2 +- data/maps/NavelRock_BasePath_B9F/map.json | 2 +- data/maps/NavelRock_Exterior/map.json | 2 +- data/maps/NavelRock_Fork/map.json | 2 +- data/maps/NavelRock_Harbor/map.json | 2 +- data/maps/NavelRock_Summit/map.json | 2 +- data/maps/NavelRock_SummitPath_2F/map.json | 2 +- data/maps/NavelRock_SummitPath_3F/map.json | 2 +- data/maps/NavelRock_SummitPath_4F/map.json | 2 +- data/maps/NavelRock_SummitPath_5F/map.json | 2 +- data/maps/OneIsland/map.json | 2 +- data/maps/OneIsland_Harbor/map.json | 2 +- data/maps/OneIsland_House1/map.json | 2 +- data/maps/OneIsland_House2/map.json | 2 +- data/maps/OneIsland_KindleRoad/map.json | 2 +- data/maps/OneIsland_KindleRoad_EmberSpa/map.json | 2 +- data/maps/OneIsland_PokemonCenter_1F/map.json | 2 +- data/maps/OneIsland_PokemonCenter_2F/map.json | 2 +- data/maps/OneIsland_TreasureBeach/map.json | 2 +- data/maps/PalletTown/map.json | 2 +- data/maps/PalletTown_GarysHouse/map.json | 2 +- data/maps/PalletTown_PlayersHouse_1F/map.json | 2 +- data/maps/PalletTown_PlayersHouse_2F/map.json | 2 +- data/maps/PalletTown_ProfessorOaksLab/map.json | 2 +- data/maps/PewterCity/map.json | 2 +- data/maps/PewterCity_Gym/map.json | 2 +- data/maps/PewterCity_House1/map.json | 2 +- data/maps/PewterCity_House2/map.json | 2 +- data/maps/PewterCity_Mart/map.json | 2 +- data/maps/PewterCity_Museum_1F/map.json | 2 +- data/maps/PewterCity_Museum_2F/map.json | 2 +- data/maps/PewterCity_PokemonCenter_1F/map.json | 2 +- data/maps/PewterCity_PokemonCenter_2F/map.json | 2 +- data/maps/PokemonLeague_AgathasRoom/map.json | 2 +- data/maps/PokemonLeague_BrunosRoom/map.json | 2 +- data/maps/PokemonLeague_ChampionsRoom/map.json | 2 +- data/maps/PokemonLeague_HallOfFame/map.json | 2 +- data/maps/PokemonLeague_LancesRoom/map.json | 2 +- data/maps/PokemonLeague_LoreleisRoom/map.json | 2 +- data/maps/PokemonMansion_1F/map.json | 2 +- data/maps/PokemonMansion_2F/map.json | 2 +- data/maps/PokemonMansion_3F/map.json | 2 +- data/maps/PokemonMansion_B1F/map.json | 2 +- data/maps/PokemonTower_1F/map.json | 2 +- data/maps/PokemonTower_2F/map.json | 2 +- data/maps/PokemonTower_3F/map.json | 2 +- data/maps/PokemonTower_4F/map.json | 2 +- data/maps/PokemonTower_5F/map.json | 2 +- data/maps/PokemonTower_6F/map.json | 2 +- data/maps/PokemonTower_7F/map.json | 2 +- data/maps/PowerPlant/map.json | 2 +- data/maps/Prototype_SeviiIsle_6/map.json | 2 +- data/maps/Prototype_SeviiIsle_7/map.json | 2 +- data/maps/Prototype_SeviiIsle_8/map.json | 2 +- data/maps/Prototype_SeviiIsle_9/map.json | 2 +- data/maps/RecordCenter/map.json | 2 +- data/maps/RockTunnel_1F/map.json | 2 +- data/maps/RockTunnel_B1F/map.json | 2 +- data/maps/RocketHideout_B1F/map.json | 2 +- data/maps/RocketHideout_B2F/map.json | 2 +- data/maps/RocketHideout_B3F/map.json | 2 +- data/maps/RocketHideout_B4F/map.json | 2 +- data/maps/RocketHideout_Elevator/map.json | 2 +- data/maps/Route1/map.json | 2 +- data/maps/Route10/map.json | 2 +- data/maps/Route10_PokemonCenter_1F/map.json | 2 +- data/maps/Route10_PokemonCenter_2F/map.json | 2 +- data/maps/Route11/map.json | 2 +- data/maps/Route11_EastEntrance_1F/map.json | 2 +- data/maps/Route11_EastEntrance_2F/map.json | 2 +- data/maps/Route12/map.json | 2 +- data/maps/Route12_FishingHouse/map.json | 2 +- data/maps/Route12_NorthEntrance_1F/map.json | 2 +- data/maps/Route12_NorthEntrance_2F/map.json | 2 +- data/maps/Route13/map.json | 2 +- data/maps/Route14/map.json | 2 +- data/maps/Route15/map.json | 2 +- data/maps/Route15_WestEntrance_1F/map.json | 2 +- data/maps/Route15_WestEntrance_2F/map.json | 2 +- data/maps/Route16/map.json | 2 +- data/maps/Route16_House/map.json | 2 +- data/maps/Route16_NorthEntrance_1F/map.json | 2 +- data/maps/Route16_NorthEntrance_2F/map.json | 2 +- data/maps/Route17/map.json | 2 +- data/maps/Route18/map.json | 2 +- data/maps/Route18_EastEntrance_1F/map.json | 2 +- data/maps/Route18_EastEntrance_2F/map.json | 2 +- data/maps/Route19/map.json | 2 +- data/maps/Route2/map.json | 2 +- data/maps/Route20/map.json | 2 +- data/maps/Route21_North/map.json | 2 +- data/maps/Route21_South/map.json | 2 +- data/maps/Route22/map.json | 2 +- data/maps/Route22_NorthEntrance/map.json | 2 +- data/maps/Route23/map.json | 2 +- data/maps/Route24/map.json | 2 +- data/maps/Route25/map.json | 2 +- data/maps/Route25_SeaCottage/map.json | 2 +- data/maps/Route2_EastBuilding/map.json | 2 +- data/maps/Route2_House/map.json | 2 +- data/maps/Route2_ViridianForest_NorthEntrance/map.json | 2 +- data/maps/Route2_ViridianForest_SouthEntrance/map.json | 2 +- data/maps/Route3/map.json | 2 +- data/maps/Route4/map.json | 2 +- data/maps/Route4_PokemonCenter_1F/map.json | 2 +- data/maps/Route4_PokemonCenter_2F/map.json | 2 +- data/maps/Route5/map.json | 2 +- data/maps/Route5_PokemonDayCare/map.json | 2 +- data/maps/Route5_SouthEntrance/map.json | 2 +- data/maps/Route6/map.json | 2 +- data/maps/Route6_NorthEntrance/map.json | 2 +- data/maps/Route7/map.json | 2 +- data/maps/Route7_EastEntrance/map.json | 2 +- data/maps/Route8/map.json | 2 +- data/maps/Route8_WestEntrance/map.json | 2 +- data/maps/Route9/map.json | 2 +- data/maps/SSAnne_1F_Corridor/map.json | 2 +- data/maps/SSAnne_1F_Room1/map.json | 2 +- data/maps/SSAnne_1F_Room2/map.json | 2 +- data/maps/SSAnne_1F_Room3/map.json | 2 +- data/maps/SSAnne_1F_Room4/map.json | 2 +- data/maps/SSAnne_1F_Room5/map.json | 2 +- data/maps/SSAnne_1F_Room6/map.json | 2 +- data/maps/SSAnne_1F_Room7/map.json | 2 +- data/maps/SSAnne_2F_Corridor/map.json | 2 +- data/maps/SSAnne_2F_Room1/map.json | 2 +- data/maps/SSAnne_2F_Room2/map.json | 2 +- data/maps/SSAnne_2F_Room3/map.json | 2 +- data/maps/SSAnne_2F_Room4/map.json | 2 +- data/maps/SSAnne_2F_Room5/map.json | 2 +- data/maps/SSAnne_2F_Room6/map.json | 2 +- data/maps/SSAnne_3F_Corridor/map.json | 2 +- data/maps/SSAnne_B1F_Corridor/map.json | 2 +- data/maps/SSAnne_B1F_Room1/map.json | 2 +- data/maps/SSAnne_B1F_Room2/map.json | 2 +- data/maps/SSAnne_B1F_Room3/map.json | 2 +- data/maps/SSAnne_B1F_Room4/map.json | 2 +- data/maps/SSAnne_B1F_Room5/map.json | 2 +- data/maps/SSAnne_CaptainsOffice/map.json | 2 +- data/maps/SSAnne_Deck/map.json | 2 +- data/maps/SSAnne_Exterior/map.json | 2 +- data/maps/SSAnne_Kitchen/map.json | 2 +- data/maps/SafariZone_Center/map.json | 2 +- data/maps/SafariZone_Center_RestHouse/map.json | 2 +- data/maps/SafariZone_East/map.json | 2 +- data/maps/SafariZone_East_RestHouse/map.json | 2 +- data/maps/SafariZone_North/map.json | 2 +- data/maps/SafariZone_North_RestHouse/map.json | 2 +- data/maps/SafariZone_SecretHouse/map.json | 2 +- data/maps/SafariZone_West/map.json | 2 +- data/maps/SafariZone_West_RestHouse/map.json | 2 +- data/maps/SaffronCity/map.json | 2 +- data/maps/SaffronCity_Connection/map.json | 2 +- data/maps/SaffronCity_CopycatsHouse_1F/map.json | 2 +- data/maps/SaffronCity_CopycatsHouse_2F/map.json | 2 +- data/maps/SaffronCity_Dojo/map.json | 2 +- data/maps/SaffronCity_Gym/map.json | 2 +- data/maps/SaffronCity_House/map.json | 2 +- data/maps/SaffronCity_Mart/map.json | 2 +- data/maps/SaffronCity_MrPsychicsHouse/map.json | 2 +- data/maps/SaffronCity_PokemonCenter_1F/map.json | 2 +- data/maps/SaffronCity_PokemonCenter_2F/map.json | 2 +- data/maps/SaffronCity_PokemonTrainerFanClub/map.json | 2 +- data/maps/SeafoamIslands_1F/map.json | 2 +- data/maps/SeafoamIslands_B1F/map.json | 2 +- data/maps/SeafoamIslands_B2F/map.json | 2 +- data/maps/SeafoamIslands_B3F/map.json | 2 +- data/maps/SeafoamIslands_B4F/map.json | 2 +- data/maps/SevenIsland/map.json | 2 +- data/maps/SevenIsland_Harbor/map.json | 2 +- data/maps/SevenIsland_House_Room1/map.json | 2 +- data/maps/SevenIsland_House_Room2/map.json | 2 +- data/maps/SevenIsland_Mart/map.json | 2 +- data/maps/SevenIsland_PokemonCenter_1F/map.json | 2 +- data/maps/SevenIsland_PokemonCenter_2F/map.json | 2 +- data/maps/SevenIsland_SevaultCanyon/map.json | 2 +- data/maps/SevenIsland_SevaultCanyon_Entrance/map.json | 2 +- data/maps/SevenIsland_SevaultCanyon_House/map.json | 2 +- data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json | 2 +- data/maps/SevenIsland_TanobyRuins/map.json | 2 +- data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json | 2 +- data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json | 2 +- data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json | 2 +- data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json | 2 +- data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json | 2 +- data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json | 2 +- data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json | 2 +- data/maps/SevenIsland_TrainerTower/map.json | 2 +- data/maps/SilphCo_10F/map.json | 2 +- data/maps/SilphCo_11F/map.json | 2 +- data/maps/SilphCo_1F/map.json | 2 +- data/maps/SilphCo_2F/map.json | 2 +- data/maps/SilphCo_3F/map.json | 2 +- data/maps/SilphCo_4F/map.json | 2 +- data/maps/SilphCo_5F/map.json | 2 +- data/maps/SilphCo_6F/map.json | 2 +- data/maps/SilphCo_7F/map.json | 2 +- data/maps/SilphCo_8F/map.json | 2 +- data/maps/SilphCo_9F/map.json | 2 +- data/maps/SilphCo_Elevator/map.json | 2 +- data/maps/SixIsland/map.json | 2 +- data/maps/SixIsland_AlteringCave/map.json | 2 +- data/maps/SixIsland_DottedHole_1F/map.json | 2 +- data/maps/SixIsland_DottedHole_B1F/map.json | 2 +- data/maps/SixIsland_DottedHole_B2F/map.json | 2 +- data/maps/SixIsland_DottedHole_B3F/map.json | 2 +- data/maps/SixIsland_DottedHole_B4F/map.json | 2 +- data/maps/SixIsland_DottedHole_SapphireRoom/map.json | 2 +- data/maps/SixIsland_GreenPath/map.json | 2 +- data/maps/SixIsland_Harbor/map.json | 2 +- data/maps/SixIsland_House/map.json | 2 +- data/maps/SixIsland_Mart/map.json | 2 +- data/maps/SixIsland_OutcastIsland/map.json | 2 +- data/maps/SixIsland_PatternBush/map.json | 2 +- data/maps/SixIsland_PokemonCenter_1F/map.json | 2 +- data/maps/SixIsland_PokemonCenter_2F/map.json | 2 +- data/maps/SixIsland_RuinValley/map.json | 2 +- data/maps/SixIsland_WaterPath/map.json | 2 +- data/maps/SixIsland_WaterPath_House1/map.json | 2 +- data/maps/SixIsland_WaterPath_House2/map.json | 2 +- data/maps/ThreeIsland/map.json | 2 +- data/maps/ThreeIsland_BerryForest/map.json | 2 +- data/maps/ThreeIsland_BondBridge/map.json | 2 +- data/maps/ThreeIsland_DunsparceTunnel/map.json | 2 +- data/maps/ThreeIsland_Harbor/map.json | 2 +- data/maps/ThreeIsland_House1/map.json | 2 +- data/maps/ThreeIsland_House2/map.json | 2 +- data/maps/ThreeIsland_House3/map.json | 2 +- data/maps/ThreeIsland_House4/map.json | 2 +- data/maps/ThreeIsland_House5/map.json | 2 +- data/maps/ThreeIsland_Mart/map.json | 2 +- data/maps/ThreeIsland_PokemonCenter_1F/map.json | 2 +- data/maps/ThreeIsland_PokemonCenter_2F/map.json | 2 +- data/maps/ThreeIsland_Port/map.json | 2 +- data/maps/TradeCenter/map.json | 2 +- data/maps/TrainerTower_1F/map.json | 2 +- data/maps/TrainerTower_2F/map.json | 2 +- data/maps/TrainerTower_3F/map.json | 2 +- data/maps/TrainerTower_4F/map.json | 2 +- data/maps/TrainerTower_5F/map.json | 2 +- data/maps/TrainerTower_6F/map.json | 2 +- data/maps/TrainerTower_7F/map.json | 2 +- data/maps/TrainerTower_8F/map.json | 2 +- data/maps/TrainerTower_Elevator/map.json | 2 +- data/maps/TrainerTower_Lobby/map.json | 2 +- data/maps/TrainerTower_Roof/map.json | 2 +- data/maps/TwoIsland/map.json | 2 +- data/maps/TwoIsland_CapeBrink/map.json | 2 +- data/maps/TwoIsland_CapeBrink_House/map.json | 2 +- data/maps/TwoIsland_Harbor/map.json | 2 +- data/maps/TwoIsland_House/map.json | 2 +- data/maps/TwoIsland_JoyfulGameCorner/map.json | 2 +- data/maps/TwoIsland_PokemonCenter_1F/map.json | 2 +- data/maps/TwoIsland_PokemonCenter_2F/map.json | 2 +- data/maps/UndergroundPath_EastEntrance/map.json | 2 +- data/maps/UndergroundPath_EastWestTunnel/map.json | 2 +- data/maps/UndergroundPath_NorthEntrance/map.json | 2 +- data/maps/UndergroundPath_NorthSouthTunnel/map.json | 2 +- data/maps/UndergroundPath_SouthEntrance/map.json | 2 +- data/maps/UndergroundPath_WestEntrance/map.json | 2 +- data/maps/UnionRoom/map.json | 2 +- data/maps/UnknownMap_18_01/map.json | 2 +- data/maps/UnusedHouse_27_00/map.json | 2 +- data/maps/UnusedHouse_29_00/map.json | 2 +- data/maps/UnusedHouse_31_05/map.json | 2 +- data/maps/VermilionCity/map.json | 2 +- data/maps/VermilionCity_Gym/map.json | 2 +- data/maps/VermilionCity_House1/map.json | 2 +- data/maps/VermilionCity_House2/map.json | 2 +- data/maps/VermilionCity_House3/map.json | 2 +- data/maps/VermilionCity_Mart/map.json | 2 +- data/maps/VermilionCity_PokemonCenter_1F/map.json | 2 +- data/maps/VermilionCity_PokemonCenter_2F/map.json | 2 +- data/maps/VermilionCity_PokemonFanClub/map.json | 2 +- data/maps/VictoryRoad_1F/map.json | 2 +- data/maps/VictoryRoad_2F/map.json | 2 +- data/maps/VictoryRoad_3F/map.json | 2 +- data/maps/ViridianCity/map.json | 2 +- data/maps/ViridianCity_Gym/map.json | 2 +- data/maps/ViridianCity_House1/map.json | 2 +- data/maps/ViridianCity_House2/map.json | 2 +- data/maps/ViridianCity_Mart/map.json | 2 +- data/maps/ViridianCity_PokemonCenter_1F/map.json | 2 +- data/maps/ViridianCity_PokemonCenter_2F/map.json | 2 +- data/maps/ViridianForest/map.json | 2 +- 425 files changed, 425 insertions(+), 425 deletions(-) (limited to 'data') diff --git a/data/maps/BattleColosseum_2P/map.json b/data/maps/BattleColosseum_2P/map.json index bd1e8ca3e..adcec66c1 100644 --- a/data/maps/BattleColosseum_2P/map.json +++ b/data/maps/BattleColosseum_2P/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_8", diff --git a/data/maps/BattleColosseum_4P/map.json b/data/maps/BattleColosseum_4P/map.json index 53bdf260b..84de8f7ec 100644 --- a/data/maps/BattleColosseum_4P/map.json +++ b/data/maps/BattleColosseum_4P/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_8", diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index 79a032876..95a19a2f7 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_3", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index bab2d1b5e..fbfe2548b 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index 706d9fa35..67f10b4f2 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json index bcb4f815c..8a78e1d5a 100644 --- a/data/maps/CeladonCity_Condominiums_1F/map.json +++ b/data/maps/CeladonCity_Condominiums_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json index 10e5eb1c6..3ae42d4bb 100644 --- a/data/maps/CeladonCity_Condominiums_2F/map.json +++ b/data/maps/CeladonCity_Condominiums_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json index 4a1fb023c..17cc2945f 100644 --- a/data/maps/CeladonCity_Condominiums_3F/map.json +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeladonCity_Condominiums_Roof/map.json b/data/maps/CeladonCity_Condominiums_Roof/map.json index c929b62fc..40fad3fbf 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/map.json +++ b/data/maps/CeladonCity_Condominiums_Roof/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index d229e7fdd..59d5bf8e3 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json index d4e20b168..57f62042e 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 4, "elevator_flag": 1, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json index e4e6f2f29..8e02d7bc2 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 4, "elevator_flag": 2, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json index 37132845e..5504b6317 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 4, "elevator_flag": 3, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json index d1130b058..a054356ef 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 4, "elevator_flag": 4, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json index b90f5f8e9..f1b4a7a05 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 4, "elevator_flag": 5, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json index 5fe6f9885..fb8385d87 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json index 17077ebbd..fabde43d9 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 4, "elevator_flag": 127, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json index 79ba87c7f..b0501fadf 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json index 99a1a54d4..16416e6ab 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json index f0a86b8e5..3d231b278 100644 --- a/data/maps/CeladonCity_Gym/map.json +++ b/data/maps/CeladonCity_Gym/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_1", diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json index 80b4df1cd..c63c83406 100644 --- a/data/maps/CeladonCity_Hotel/map.json +++ b/data/maps/CeladonCity_Hotel/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json index 0fccecd67..56fe430a9 100644 --- a/data/maps/CeladonCity_House1/map.json +++ b/data/maps/CeladonCity_House1/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json index c37be2dc6..98b528adb 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json index 7a4c45752..119861d83 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json index dafc84778..2bc8aa976 100644 --- a/data/maps/CeladonCity_Restaurant/map.json +++ b/data/maps/CeladonCity_Restaurant/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json index eb95b5c79..da6a808f9 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json index 2ce780fdd..641aaf25c 100644 --- a/data/maps/CeruleanCave_2F/map.json +++ b/data/maps/CeruleanCave_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json index 0df4d1d5f..c96198ec1 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index ca6baa21d..993848de8 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeruleanCity_BikeShop/map.json b/data/maps/CeruleanCity_BikeShop/map.json index 8f9d6b910..39e0302c1 100644 --- a/data/maps/CeruleanCity_BikeShop/map.json +++ b/data/maps/CeruleanCity_BikeShop/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeruleanCity_Gym/map.json b/data/maps/CeruleanCity_Gym/map.json index c0ab52b0b..a777d32ce 100644 --- a/data/maps/CeruleanCity_Gym/map.json +++ b/data/maps/CeruleanCity_Gym/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_1", diff --git a/data/maps/CeruleanCity_House1/map.json b/data/maps/CeruleanCity_House1/map.json index 55ba65768..b7c8786dd 100644 --- a/data/maps/CeruleanCity_House1/map.json +++ b/data/maps/CeruleanCity_House1/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeruleanCity_House2/map.json b/data/maps/CeruleanCity_House2/map.json index 221a6f398..cfd9f5326 100644 --- a/data/maps/CeruleanCity_House2/map.json +++ b/data/maps/CeruleanCity_House2/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeruleanCity_House3/map.json b/data/maps/CeruleanCity_House3/map.json index 084221bb7..08922ed56 100644 --- a/data/maps/CeruleanCity_House3/map.json +++ b/data/maps/CeruleanCity_House3/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeruleanCity_House4/map.json b/data/maps/CeruleanCity_House4/map.json index 97740781c..a8d776090 100644 --- a/data/maps/CeruleanCity_House4/map.json +++ b/data/maps/CeruleanCity_House4/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeruleanCity_House5/map.json b/data/maps/CeruleanCity_House5/map.json index d637a7345..bb7cc575c 100644 --- a/data/maps/CeruleanCity_House5/map.json +++ b/data/maps/CeruleanCity_House5/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeruleanCity_Mart/map.json b/data/maps/CeruleanCity_Mart/map.json index 61c6c717f..e1470e33d 100644 --- a/data/maps/CeruleanCity_Mart/map.json +++ b/data/maps/CeruleanCity_Mart/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json index d98a66f1d..4242b21cc 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json index 1ba1ae547..0b08a9deb 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index 823a4ce95..cb55b8bd9 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json index 05ba07431..51e5fbbc4 100644 --- a/data/maps/CinnabarIsland_Gym/map.json +++ b/data/maps/CinnabarIsland_Gym/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_1", diff --git a/data/maps/CinnabarIsland_Mart/map.json b/data/maps/CinnabarIsland_Mart/map.json index 7970cf732..10bd39a94 100644 --- a/data/maps/CinnabarIsland_Mart/map.json +++ b/data/maps/CinnabarIsland_Mart/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json index 5cc12ab94..2a6c363c2 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json index 8ba56684a..3e4c10119 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json index 20aa48378..f006806be 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json index 2189361a9..153e8fa60 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json index 5761ffe0c..af945ec08 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json index 1464d0db7..89e27ffa5 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/DiglettsCave_B1F/map.json b/data/maps/DiglettsCave_B1F/map.json index 0b5479841..9a434881b 100644 --- a/data/maps/DiglettsCave_B1F/map.json +++ b/data/maps/DiglettsCave_B1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/DiglettsCave_NorthEntrance/map.json b/data/maps/DiglettsCave_NorthEntrance/map.json index fa87e6f8a..2b75524eb 100644 --- a/data/maps/DiglettsCave_NorthEntrance/map.json +++ b/data/maps/DiglettsCave_NorthEntrance/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/DiglettsCave_SouthEntrance/map.json b/data/maps/DiglettsCave_SouthEntrance/map.json index 64f78c4bc..6c184aaae 100644 --- a/data/maps/DiglettsCave_SouthEntrance/map.json +++ b/data/maps/DiglettsCave_SouthEntrance/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index 04fec1512..0327c2ca5 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FiveIsland_Harbor/map.json b/data/maps/FiveIsland_Harbor/map.json index 0e528b645..6c355ea01 100644 --- a/data/maps/FiveIsland_Harbor/map.json +++ b/data/maps/FiveIsland_Harbor/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FiveIsland_House1/map.json b/data/maps/FiveIsland_House1/map.json index d458cf042..1ceffe634 100644 --- a/data/maps/FiveIsland_House1/map.json +++ b/data/maps/FiveIsland_House1/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FiveIsland_House2/map.json b/data/maps/FiveIsland_House2/map.json index 4b12a73c5..d6583a95a 100644 --- a/data/maps/FiveIsland_House2/map.json +++ b/data/maps/FiveIsland_House2/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FiveIsland_LostCave_Entrance/map.json b/data/maps/FiveIsland_LostCave_Entrance/map.json index 4d044b6de..ddf31269e 100644 --- a/data/maps/FiveIsland_LostCave_Entrance/map.json +++ b/data/maps/FiveIsland_LostCave_Entrance/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FiveIsland_LostCave_Room1/map.json b/data/maps/FiveIsland_LostCave_Room1/map.json index 22da4145b..f5b5b5028 100644 --- a/data/maps/FiveIsland_LostCave_Room1/map.json +++ b/data/maps/FiveIsland_LostCave_Room1/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json index 2cf3514e1..c18eb1575 100644 --- a/data/maps/FiveIsland_LostCave_Room10/map.json +++ b/data/maps/FiveIsland_LostCave_Room10/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json index c06c279eb..61a8d299a 100644 --- a/data/maps/FiveIsland_LostCave_Room11/map.json +++ b/data/maps/FiveIsland_LostCave_Room11/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json index 0131d8a66..c78893f97 100644 --- a/data/maps/FiveIsland_LostCave_Room12/map.json +++ b/data/maps/FiveIsland_LostCave_Room12/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json index 02f11435c..535e93c60 100644 --- a/data/maps/FiveIsland_LostCave_Room13/map.json +++ b/data/maps/FiveIsland_LostCave_Room13/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json index bc0d6f5cd..b0687536b 100644 --- a/data/maps/FiveIsland_LostCave_Room14/map.json +++ b/data/maps/FiveIsland_LostCave_Room14/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FiveIsland_LostCave_Room2/map.json b/data/maps/FiveIsland_LostCave_Room2/map.json index 25a7996e6..63162da4c 100644 --- a/data/maps/FiveIsland_LostCave_Room2/map.json +++ b/data/maps/FiveIsland_LostCave_Room2/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FiveIsland_LostCave_Room3/map.json b/data/maps/FiveIsland_LostCave_Room3/map.json index 885c75d45..1baaf3265 100644 --- a/data/maps/FiveIsland_LostCave_Room3/map.json +++ b/data/maps/FiveIsland_LostCave_Room3/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FiveIsland_LostCave_Room4/map.json b/data/maps/FiveIsland_LostCave_Room4/map.json index ac63bc97c..4b92aecee 100644 --- a/data/maps/FiveIsland_LostCave_Room4/map.json +++ b/data/maps/FiveIsland_LostCave_Room4/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FiveIsland_LostCave_Room5/map.json b/data/maps/FiveIsland_LostCave_Room5/map.json index ee295239d..7c0c93143 100644 --- a/data/maps/FiveIsland_LostCave_Room5/map.json +++ b/data/maps/FiveIsland_LostCave_Room5/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FiveIsland_LostCave_Room6/map.json b/data/maps/FiveIsland_LostCave_Room6/map.json index cd6663ce8..bc77539d0 100644 --- a/data/maps/FiveIsland_LostCave_Room6/map.json +++ b/data/maps/FiveIsland_LostCave_Room6/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FiveIsland_LostCave_Room7/map.json b/data/maps/FiveIsland_LostCave_Room7/map.json index 144f2099b..eff927cac 100644 --- a/data/maps/FiveIsland_LostCave_Room7/map.json +++ b/data/maps/FiveIsland_LostCave_Room7/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FiveIsland_LostCave_Room8/map.json b/data/maps/FiveIsland_LostCave_Room8/map.json index 270a99c8f..68b753ad7 100644 --- a/data/maps/FiveIsland_LostCave_Room8/map.json +++ b/data/maps/FiveIsland_LostCave_Room8/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FiveIsland_LostCave_Room9/map.json b/data/maps/FiveIsland_LostCave_Room9/map.json index ee2945b8d..4235dd244 100644 --- a/data/maps/FiveIsland_LostCave_Room9/map.json +++ b/data/maps/FiveIsland_LostCave_Room9/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index 4c7e900d3..14f56ca59 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json index 7390a3997..02989723d 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json index 9e48279b1..ca55ee03b 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json index 804ba796f..079d0d4eb 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json index 41929c967..371cfecd6 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json index 473b522b8..0063d721f 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index 58ca4c535..de0e8ba9b 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 5, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_3", diff --git a/data/maps/FiveIsland_WaterLabyrinth/map.json b/data/maps/FiveIsland_WaterLabyrinth/map.json index 899a7e92e..f4106828b 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/map.json +++ b/data/maps/FiveIsland_WaterLabyrinth/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index 0a8842419..1875aa79e 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json index b0188aedd..e9ccc8c22 100644 --- a/data/maps/FourIsland_Harbor/map.json +++ b/data/maps/FourIsland_Harbor/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json index 902c65f23..7e4ff600e 100644 --- a/data/maps/FourIsland_House1/map.json +++ b/data/maps/FourIsland_House1/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json index 330c8ea8a..205f42823 100644 --- a/data/maps/FourIsland_House2/map.json +++ b/data/maps/FourIsland_House2/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json index 5928013dc..efbb07579 100644 --- a/data/maps/FourIsland_IcefallCave_1F/map.json +++ b/data/maps/FourIsland_IcefallCave_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json index dd1d81a2d..533b8e8a5 100644 --- a/data/maps/FourIsland_IcefallCave_B1F/map.json +++ b/data/maps/FourIsland_IcefallCave_B1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json index 32ca627ba..e2b01a555 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FourIsland_IcefallCave_Entrance/map.json b/data/maps/FourIsland_IcefallCave_Entrance/map.json index 3315c36b5..df469714f 100644 --- a/data/maps/FourIsland_IcefallCave_Entrance/map.json +++ b/data/maps/FourIsland_IcefallCave_Entrance/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json index eb022af3b..53f06909c 100644 --- a/data/maps/FourIsland_LoreleisHouse/map.json +++ b/data/maps/FourIsland_LoreleisHouse/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json index c5e589e61..986506f99 100644 --- a/data/maps/FourIsland_Mart/map.json +++ b/data/maps/FourIsland_Mart/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json index b3427d8b1..24a35ae99 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/map.json +++ b/data/maps/FourIsland_PokemonCenter_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json index 2e201dafc..0e5c61f94 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/map.json +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FourIsland_PokemonDayCare/map.json b/data/maps/FourIsland_PokemonDayCare/map.json index 38520cc63..cb92d329c 100644 --- a/data/maps/FourIsland_PokemonDayCare/map.json +++ b/data/maps/FourIsland_PokemonDayCare/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index 710940882..3ff6b705c 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FuchsiaCity_Gym/map.json b/data/maps/FuchsiaCity_Gym/map.json index 9054b5df0..077b3860b 100644 --- a/data/maps/FuchsiaCity_Gym/map.json +++ b/data/maps/FuchsiaCity_Gym/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_1", diff --git a/data/maps/FuchsiaCity_House1/map.json b/data/maps/FuchsiaCity_House1/map.json index dea412ed2..5e6c48b20 100644 --- a/data/maps/FuchsiaCity_House1/map.json +++ b/data/maps/FuchsiaCity_House1/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FuchsiaCity_House2/map.json b/data/maps/FuchsiaCity_House2/map.json index ff4c45b1c..8fdbf0b32 100644 --- a/data/maps/FuchsiaCity_House2/map.json +++ b/data/maps/FuchsiaCity_House2/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FuchsiaCity_House3/map.json b/data/maps/FuchsiaCity_House3/map.json index 688224b15..7ca79a72d 100644 --- a/data/maps/FuchsiaCity_House3/map.json +++ b/data/maps/FuchsiaCity_House3/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FuchsiaCity_Mart/map.json b/data/maps/FuchsiaCity_Mart/map.json index 43a38c753..8d2e938ff 100644 --- a/data/maps/FuchsiaCity_Mart/map.json +++ b/data/maps/FuchsiaCity_Mart/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json index 9cc66692f..1dd687ee8 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json index b1ba15c2f..1b0910dfd 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json index 04d51dae8..9368f3f68 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FuchsiaCity_SafariZone_Office/map.json b/data/maps/FuchsiaCity_SafariZone_Office/map.json index be1abfced..4211a93f3 100644 --- a/data/maps/FuchsiaCity_SafariZone_Office/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Office/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/FuchsiaCity_WardensHouse/map.json b/data/maps/FuchsiaCity_WardensHouse/map.json index 00f33363c..1212d2935 100644 --- a/data/maps/FuchsiaCity_WardensHouse/map.json +++ b/data/maps/FuchsiaCity_WardensHouse/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json index c5bb07e8d..fc22dbf43 100644 --- a/data/maps/IndigoPlateau_Exterior/map.json +++ b/data/maps/IndigoPlateau_Exterior/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json index e862a372e..8e7134c33 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_1", diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json index 1fb14c475..3ca74426e 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_1", diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json index f689e96d5..e24563114 100644 --- a/data/maps/LavenderTown/map.json +++ b/data/maps/LavenderTown/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/LavenderTown_House1/map.json b/data/maps/LavenderTown_House1/map.json index d065e65d6..43b012f64 100644 --- a/data/maps/LavenderTown_House1/map.json +++ b/data/maps/LavenderTown_House1/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/LavenderTown_House2/map.json b/data/maps/LavenderTown_House2/map.json index 3c08f68a8..372e38373 100644 --- a/data/maps/LavenderTown_House2/map.json +++ b/data/maps/LavenderTown_House2/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/LavenderTown_Mart/map.json b/data/maps/LavenderTown_Mart/map.json index f2603b3ad..399be32c0 100644 --- a/data/maps/LavenderTown_Mart/map.json +++ b/data/maps/LavenderTown_Mart/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json index 1889732e1..f608b2fb7 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json index 07faa3edd..6be792434 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json index 0a210a361..b1ddd2af6 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index 62681bf5c..9b8327133 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json index ef0279300..a4411c555 100644 --- a/data/maps/MtEmber_RubyPath_1F/map.json +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json index 0ad52b863..7b13396e0 100644 --- a/data/maps/MtEmber_RubyPath_B1F/map.json +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json index 0b5d948c5..67c6fa69d 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json index a0ef82ad6..5b9a5bbf9 100644 --- a/data/maps/MtEmber_RubyPath_B2F/map.json +++ b/data/maps/MtEmber_RubyPath_B2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json index e3c5ef182..fa11dd264 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index 386b21e43..5ea2b3e90 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/MtEmber_RubyPath_B4F/map.json b/data/maps/MtEmber_RubyPath_B4F/map.json index 23b6556f6..1864a201a 100644 --- a/data/maps/MtEmber_RubyPath_B4F/map.json +++ b/data/maps/MtEmber_RubyPath_B4F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json index e6279a72b..501a87f37 100644 --- a/data/maps/MtEmber_RubyPath_B5F/map.json +++ b/data/maps/MtEmber_RubyPath_B5F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json index 438ad09d0..9439fb3cd 100644 --- a/data/maps/MtEmber_Summit/map.json +++ b/data/maps/MtEmber_Summit/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/MtEmber_SummitPath_1F/map.json b/data/maps/MtEmber_SummitPath_1F/map.json index 7b06ec6ba..0c53d8f63 100644 --- a/data/maps/MtEmber_SummitPath_1F/map.json +++ b/data/maps/MtEmber_SummitPath_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json index 50f1e424d..ab06ed4f3 100644 --- a/data/maps/MtEmber_SummitPath_2F/map.json +++ b/data/maps/MtEmber_SummitPath_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/MtEmber_SummitPath_3F/map.json b/data/maps/MtEmber_SummitPath_3F/map.json index 3e1d8dc50..7184d63b1 100644 --- a/data/maps/MtEmber_SummitPath_3F/map.json +++ b/data/maps/MtEmber_SummitPath_3F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json index b12af5aae..b0a56c850 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/MtMoon_B1F/map.json b/data/maps/MtMoon_B1F/map.json index 8bb52bddf..ca4648bbd 100644 --- a/data/maps/MtMoon_B1F/map.json +++ b/data/maps/MtMoon_B1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index f3c51828c..f50e16428 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/NavelRock_1F/map.json b/data/maps/NavelRock_1F/map.json index 4f0bc37bc..f13cd661c 100644 --- a/data/maps/NavelRock_1F/map.json +++ b/data/maps/NavelRock_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/NavelRock_B1F/map.json b/data/maps/NavelRock_B1F/map.json index 4807cf865..a01383181 100644 --- a/data/maps/NavelRock_B1F/map.json +++ b/data/maps/NavelRock_B1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json index c655f9252..b3b526a0b 100644 --- a/data/maps/NavelRock_Base/map.json +++ b/data/maps/NavelRock_Base/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/NavelRock_BasePath_B10F/map.json b/data/maps/NavelRock_BasePath_B10F/map.json index 16c0363a8..e2c61a20b 100644 --- a/data/maps/NavelRock_BasePath_B10F/map.json +++ b/data/maps/NavelRock_BasePath_B10F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/NavelRock_BasePath_B11F/map.json b/data/maps/NavelRock_BasePath_B11F/map.json index 9530b8ca8..0c420b236 100644 --- a/data/maps/NavelRock_BasePath_B11F/map.json +++ b/data/maps/NavelRock_BasePath_B11F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/NavelRock_BasePath_B1F/map.json b/data/maps/NavelRock_BasePath_B1F/map.json index e2d8103eb..8a1d3692d 100644 --- a/data/maps/NavelRock_BasePath_B1F/map.json +++ b/data/maps/NavelRock_BasePath_B1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/NavelRock_BasePath_B2F/map.json b/data/maps/NavelRock_BasePath_B2F/map.json index df3200d16..1e5fe8c2b 100644 --- a/data/maps/NavelRock_BasePath_B2F/map.json +++ b/data/maps/NavelRock_BasePath_B2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/NavelRock_BasePath_B3F/map.json b/data/maps/NavelRock_BasePath_B3F/map.json index 65e25b3ec..4d8f50ab1 100644 --- a/data/maps/NavelRock_BasePath_B3F/map.json +++ b/data/maps/NavelRock_BasePath_B3F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/NavelRock_BasePath_B4F/map.json b/data/maps/NavelRock_BasePath_B4F/map.json index fd56529fb..c14e26d78 100644 --- a/data/maps/NavelRock_BasePath_B4F/map.json +++ b/data/maps/NavelRock_BasePath_B4F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/NavelRock_BasePath_B5F/map.json b/data/maps/NavelRock_BasePath_B5F/map.json index 2d6e8798c..aea31b4ef 100644 --- a/data/maps/NavelRock_BasePath_B5F/map.json +++ b/data/maps/NavelRock_BasePath_B5F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/NavelRock_BasePath_B6F/map.json b/data/maps/NavelRock_BasePath_B6F/map.json index 0f5e92ad9..4d85778b0 100644 --- a/data/maps/NavelRock_BasePath_B6F/map.json +++ b/data/maps/NavelRock_BasePath_B6F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/NavelRock_BasePath_B7F/map.json b/data/maps/NavelRock_BasePath_B7F/map.json index 1c2897d91..c496ed099 100644 --- a/data/maps/NavelRock_BasePath_B7F/map.json +++ b/data/maps/NavelRock_BasePath_B7F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/NavelRock_BasePath_B8F/map.json b/data/maps/NavelRock_BasePath_B8F/map.json index 1f3445dee..d15be2605 100644 --- a/data/maps/NavelRock_BasePath_B8F/map.json +++ b/data/maps/NavelRock_BasePath_B8F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/NavelRock_BasePath_B9F/map.json b/data/maps/NavelRock_BasePath_B9F/map.json index 9c6a50590..a9cfc8597 100644 --- a/data/maps/NavelRock_BasePath_B9F/map.json +++ b/data/maps/NavelRock_BasePath_B9F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/NavelRock_Exterior/map.json b/data/maps/NavelRock_Exterior/map.json index adaa0e703..ba3178fc1 100644 --- a/data/maps/NavelRock_Exterior/map.json +++ b/data/maps/NavelRock_Exterior/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/NavelRock_Fork/map.json b/data/maps/NavelRock_Fork/map.json index c7b72356c..22a252bc1 100644 --- a/data/maps/NavelRock_Fork/map.json +++ b/data/maps/NavelRock_Fork/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index 752411223..43f6c3f2b 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index ef624c9c0..c4c4fb39e 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_4", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/NavelRock_SummitPath_2F/map.json b/data/maps/NavelRock_SummitPath_2F/map.json index 7cdb412db..df824534d 100644 --- a/data/maps/NavelRock_SummitPath_2F/map.json +++ b/data/maps/NavelRock_SummitPath_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/NavelRock_SummitPath_3F/map.json b/data/maps/NavelRock_SummitPath_3F/map.json index 3d8db3367..aca6996c2 100644 --- a/data/maps/NavelRock_SummitPath_3F/map.json +++ b/data/maps/NavelRock_SummitPath_3F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/NavelRock_SummitPath_4F/map.json b/data/maps/NavelRock_SummitPath_4F/map.json index d83e5c97f..4bb155d87 100644 --- a/data/maps/NavelRock_SummitPath_4F/map.json +++ b/data/maps/NavelRock_SummitPath_4F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/NavelRock_SummitPath_5F/map.json b/data/maps/NavelRock_SummitPath_5F/map.json index 4db860493..756a4658f 100644 --- a/data/maps/NavelRock_SummitPath_5F/map.json +++ b/data/maps/NavelRock_SummitPath_5F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json index 638eb4ff8..25022cc73 100644 --- a/data/maps/OneIsland/map.json +++ b/data/maps/OneIsland/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/OneIsland_Harbor/map.json b/data/maps/OneIsland_Harbor/map.json index 2db30c3c5..346cf5452 100644 --- a/data/maps/OneIsland_Harbor/map.json +++ b/data/maps/OneIsland_Harbor/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/OneIsland_House1/map.json b/data/maps/OneIsland_House1/map.json index c7a147ca9..777edb35c 100644 --- a/data/maps/OneIsland_House1/map.json +++ b/data/maps/OneIsland_House1/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/OneIsland_House2/map.json b/data/maps/OneIsland_House2/map.json index 2da693dce..f8a528fde 100644 --- a/data/maps/OneIsland_House2/map.json +++ b/data/maps/OneIsland_House2/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index 719fae823..f3233ed5e 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json index 32531ae9c..f61b29e65 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index 2328175c2..2a6b93716 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json index 13ed2a385..2b44019a3 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/map.json +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/OneIsland_TreasureBeach/map.json b/data/maps/OneIsland_TreasureBeach/map.json index 46ddb26a6..8e2167fa5 100644 --- a/data/maps/OneIsland_TreasureBeach/map.json +++ b/data/maps/OneIsland_TreasureBeach/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 543751968..4f55c1987 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json index 51c7404ea..1b8fd9de7 100644 --- a/data/maps/PalletTown_GarysHouse/map.json +++ b/data/maps/PalletTown_GarysHouse/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json index e9e2158f4..838162cf8 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/map.json +++ b/data/maps/PalletTown_PlayersHouse_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/PalletTown_PlayersHouse_2F/map.json b/data/maps/PalletTown_PlayersHouse_2F/map.json index 61e354782..849e90288 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/map.json +++ b/data/maps/PalletTown_PlayersHouse_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index cda4b6407..1b2a393ef 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index 7222993be..d891a999a 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/PewterCity_Gym/map.json b/data/maps/PewterCity_Gym/map.json index 04870110f..434dd6fae 100644 --- a/data/maps/PewterCity_Gym/map.json +++ b/data/maps/PewterCity_Gym/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_1", diff --git a/data/maps/PewterCity_House1/map.json b/data/maps/PewterCity_House1/map.json index d1ec624c9..941cd1879 100644 --- a/data/maps/PewterCity_House1/map.json +++ b/data/maps/PewterCity_House1/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/PewterCity_House2/map.json b/data/maps/PewterCity_House2/map.json index 88ce44057..d57e03fa5 100644 --- a/data/maps/PewterCity_House2/map.json +++ b/data/maps/PewterCity_House2/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/PewterCity_Mart/map.json b/data/maps/PewterCity_Mart/map.json index f062c5bea..9e96b21bc 100644 --- a/data/maps/PewterCity_Mart/map.json +++ b/data/maps/PewterCity_Mart/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index 26df37224..876d8f229 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/PewterCity_Museum_2F/map.json b/data/maps/PewterCity_Museum_2F/map.json index 0139c1133..808d337a5 100644 --- a/data/maps/PewterCity_Museum_2F/map.json +++ b/data/maps/PewterCity_Museum_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json index 9de4e5b69..a4c2a2a29 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/map.json +++ b/data/maps/PewterCity_PokemonCenter_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json index 35c9e0f0e..e564c04e7 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/map.json +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/PokemonLeague_AgathasRoom/map.json b/data/maps/PokemonLeague_AgathasRoom/map.json index f71b81bf0..595768421 100644 --- a/data/maps/PokemonLeague_AgathasRoom/map.json +++ b/data/maps/PokemonLeague_AgathasRoom/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_6", diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json index a84a63e19..86ce41e57 100644 --- a/data/maps/PokemonLeague_BrunosRoom/map.json +++ b/data/maps/PokemonLeague_BrunosRoom/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_5", diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json index e0e261c1e..0889fb01a 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/map.json +++ b/data/maps/PokemonLeague_ChampionsRoom/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/PokemonLeague_HallOfFame/map.json b/data/maps/PokemonLeague_HallOfFame/map.json index 3775d94cb..d8b1dac30 100644 --- a/data/maps/PokemonLeague_HallOfFame/map.json +++ b/data/maps/PokemonLeague_HallOfFame/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json index 47f3651e5..61602e94a 100644 --- a/data/maps/PokemonLeague_LancesRoom/map.json +++ b/data/maps/PokemonLeague_LancesRoom/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_7", diff --git a/data/maps/PokemonLeague_LoreleisRoom/map.json b/data/maps/PokemonLeague_LoreleisRoom/map.json index f33c2a35b..b1382d651 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/map.json +++ b/data/maps/PokemonLeague_LoreleisRoom/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_4", diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json index 6ea519092..a7a9b76d0 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_3", diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json index a3a9c556e..c323ddef7 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_3", diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index 9c0423004..f665ed79c 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_3", diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index eea10cb2c..a6769834e 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_3", diff --git a/data/maps/PokemonTower_1F/map.json b/data/maps/PokemonTower_1F/map.json index 8824c0f00..001875787 100644 --- a/data/maps/PokemonTower_1F/map.json +++ b/data/maps/PokemonTower_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 5, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_2", diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json index d25fb4c30..e85c53ade 100644 --- a/data/maps/PokemonTower_2F/map.json +++ b/data/maps/PokemonTower_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 5, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_2", diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json index 0952ea0e2..4266b573b 100644 --- a/data/maps/PokemonTower_3F/map.json +++ b/data/maps/PokemonTower_3F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 5, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_2", diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json index 4e0a22b9f..25824c1c0 100644 --- a/data/maps/PokemonTower_4F/map.json +++ b/data/maps/PokemonTower_4F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 5, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_2", diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json index 08166799d..a21cd2ea5 100644 --- a/data/maps/PokemonTower_5F/map.json +++ b/data/maps/PokemonTower_5F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 5, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_2", diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json index 9a2ff3756..914d968d0 100644 --- a/data/maps/PokemonTower_6F/map.json +++ b/data/maps/PokemonTower_6F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 5, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_2", diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json index 9524a236b..fa4bed291 100644 --- a/data/maps/PokemonTower_7F/map.json +++ b/data/maps/PokemonTower_7F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 5, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_2", diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json index d7baadb41..bc5535da9 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_3", diff --git a/data/maps/Prototype_SeviiIsle_6/map.json b/data/maps/Prototype_SeviiIsle_6/map.json index 3cc89f9f0..03d466322 100644 --- a/data/maps/Prototype_SeviiIsle_6/map.json +++ b/data/maps/Prototype_SeviiIsle_6/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Prototype_SeviiIsle_7/map.json b/data/maps/Prototype_SeviiIsle_7/map.json index 67a37d7e7..ce498d3da 100644 --- a/data/maps/Prototype_SeviiIsle_7/map.json +++ b/data/maps/Prototype_SeviiIsle_7/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Prototype_SeviiIsle_8/map.json b/data/maps/Prototype_SeviiIsle_8/map.json index 0ed21e3f2..f2233b694 100644 --- a/data/maps/Prototype_SeviiIsle_8/map.json +++ b/data/maps/Prototype_SeviiIsle_8/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Prototype_SeviiIsle_9/map.json b/data/maps/Prototype_SeviiIsle_9/map.json index 1fa4c73c4..f816f272e 100644 --- a/data/maps/Prototype_SeviiIsle_9/map.json +++ b/data/maps/Prototype_SeviiIsle_9/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/RecordCenter/map.json b/data/maps/RecordCenter/map.json index 8587ec56a..eb47a008e 100644 --- a/data/maps/RecordCenter/map.json +++ b/data/maps/RecordCenter/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index 6dd117e8a..d45c91ee7 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": true, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index b680bf4a1..e057755af 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -7,7 +7,7 @@ "requires_flash": true, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json index 4314d758f..d917c02be 100644 --- a/data/maps/RocketHideout_B1F/map.json +++ b/data/maps/RocketHideout_B1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 7, "elevator_flag": -1, "battle_scene": "BATTLE_SCENE_3", diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json index 2c353b5c1..f40413ddb 100644 --- a/data/maps/RocketHideout_B2F/map.json +++ b/data/maps/RocketHideout_B2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 7, "elevator_flag": -2, "battle_scene": "BATTLE_SCENE_3", diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json index a4c1a7c72..f66f30516 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 7, "elevator_flag": -3, "battle_scene": "BATTLE_SCENE_3", diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index da6f7f569..7c7ff1550 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 7, "elevator_flag": -4, "battle_scene": "BATTLE_SCENE_3", diff --git a/data/maps/RocketHideout_Elevator/map.json b/data/maps/RocketHideout_Elevator/map.json index 307ef90df..b66e1f8da 100644 --- a/data/maps/RocketHideout_Elevator/map.json +++ b/data/maps/RocketHideout_Elevator/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_3", diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json index 1a2426066..58b0776eb 100644 --- a/data/maps/Route1/map.json +++ b/data/maps/Route1/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index fef96485a..b24d13635 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json index dc1543ef0..61430e9d4 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json index 41c497474..244f09b94 100644 --- a/data/maps/Route10_PokemonCenter_2F/map.json +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json index 7cdaa105b..a7c9afcb0 100644 --- a/data/maps/Route11/map.json +++ b/data/maps/Route11/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route11_EastEntrance_1F/map.json b/data/maps/Route11_EastEntrance_1F/map.json index 21d3b454f..deba28c8e 100644 --- a/data/maps/Route11_EastEntrance_1F/map.json +++ b/data/maps/Route11_EastEntrance_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 2, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json index d7c8f1f5b..ab1a90f04 100644 --- a/data/maps/Route11_EastEntrance_2F/map.json +++ b/data/maps/Route11_EastEntrance_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index 09e49160b..d6ded1f0b 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json index fabd77a97..837ca1464 100644 --- a/data/maps/Route12_FishingHouse/map.json +++ b/data/maps/Route12_FishingHouse/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route12_NorthEntrance_1F/map.json b/data/maps/Route12_NorthEntrance_1F/map.json index d06875648..1f3c08f42 100644 --- a/data/maps/Route12_NorthEntrance_1F/map.json +++ b/data/maps/Route12_NorthEntrance_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 2, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json index f2cf37890..45184c08b 100644 --- a/data/maps/Route12_NorthEntrance_2F/map.json +++ b/data/maps/Route12_NorthEntrance_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index 2e9f47d52..41df03be8 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index cf88cbf8a..329e5f20e 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index 12670bc16..4ce529c14 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json index a9d8b8244..77cb0557b 100644 --- a/data/maps/Route15_WestEntrance_1F/map.json +++ b/data/maps/Route15_WestEntrance_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 2, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json index 8a4510422..cff31d40a 100644 --- a/data/maps/Route15_WestEntrance_2F/map.json +++ b/data/maps/Route15_WestEntrance_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index bd32e6900..be6e3c181 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route16_House/map.json b/data/maps/Route16_House/map.json index 60c5f6598..455267cc7 100644 --- a/data/maps/Route16_House/map.json +++ b/data/maps/Route16_House/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json index af13722a7..d42f91a23 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 2, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json index 4dddd5b6d..1d2b21f51 100644 --- a/data/maps/Route16_NorthEntrance_2F/map.json +++ b/data/maps/Route16_NorthEntrance_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json index 57006827d..3232a1b7a 100644 --- a/data/maps/Route17/map.json +++ b/data/maps/Route17/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json index 5e89b3f8c..293ebf308 100644 --- a/data/maps/Route18/map.json +++ b/data/maps/Route18/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json index 673241e1b..9a2ea52b2 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 2, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json index 1865cfa7f..963679ead 100644 --- a/data/maps/Route18_EastEntrance_2F/map.json +++ b/data/maps/Route18_EastEntrance_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json index 308f98b54..45d190daa 100644 --- a/data/maps/Route19/map.json +++ b/data/maps/Route19/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index 86be51055..9f0cd3b5c 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json index 3ce14e08d..266f8e822 100644 --- a/data/maps/Route20/map.json +++ b/data/maps/Route20/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json index 2bc8bcad8..d5f6de8ea 100644 --- a/data/maps/Route21_North/map.json +++ b/data/maps/Route21_North/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json index 90da7a10b..e4d5dcfab 100644 --- a/data/maps/Route21_South/map.json +++ b/data/maps/Route21_South/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index e8695121f..0afb0c0e4 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route22_NorthEntrance/map.json b/data/maps/Route22_NorthEntrance/map.json index f8f624106..9ef20a624 100644 --- a/data/maps/Route22_NorthEntrance/map.json +++ b/data/maps/Route22_NorthEntrance/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json index 36bee2780..e3c0a22dd 100644 --- a/data/maps/Route23/map.json +++ b/data/maps/Route23/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index d87b68895..0f05ef069 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index d49d76361..6be0ef593 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json index 01cf8021f..141ea6f9c 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route2_EastBuilding/map.json b/data/maps/Route2_EastBuilding/map.json index e966962c6..c3d118d74 100644 --- a/data/maps/Route2_EastBuilding/map.json +++ b/data/maps/Route2_EastBuilding/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 2, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route2_House/map.json b/data/maps/Route2_House/map.json index 8f9785c33..4d4662f1b 100644 --- a/data/maps/Route2_House/map.json +++ b/data/maps/Route2_House/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/map.json b/data/maps/Route2_ViridianForest_NorthEntrance/map.json index 7f4225d23..8a6bcd1e8 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 2, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/map.json b/data/maps/Route2_ViridianForest_SouthEntrance/map.json index 4e0ad0164..746c68a37 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 2, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index f2ad40c5e..3c08fcd12 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index b992a7d89..b23845f01 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json index 29c7c514c..42049d5f8 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index e53504770..c3cbdc9a0 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route5/map.json b/data/maps/Route5/map.json index 28b739341..acff38485 100644 --- a/data/maps/Route5/map.json +++ b/data/maps/Route5/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route5_PokemonDayCare/map.json b/data/maps/Route5_PokemonDayCare/map.json index 52cbb04ea..c0ff75da9 100644 --- a/data/maps/Route5_PokemonDayCare/map.json +++ b/data/maps/Route5_PokemonDayCare/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json index e75bbbf85..b189bb464 100644 --- a/data/maps/Route5_SouthEntrance/map.json +++ b/data/maps/Route5_SouthEntrance/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 2, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index a6016c5fa..885a1a8ea 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json index d44503ee4..d9679ab12 100644 --- a/data/maps/Route6_NorthEntrance/map.json +++ b/data/maps/Route6_NorthEntrance/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 2, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index 2c5a9717c..b21d91530 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json index fbb8a163d..98771cf96 100644 --- a/data/maps/Route7_EastEntrance/map.json +++ b/data/maps/Route7_EastEntrance/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 2, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index f16933a2e..1a803e46f 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json index 3becdcbc2..a511ee8cd 100644 --- a/data/maps/Route8_WestEntrance/map.json +++ b/data/maps/Route8_WestEntrance/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 2, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index 24e5c3c4f..f35158171 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SSAnne_1F_Corridor/map.json b/data/maps/SSAnne_1F_Corridor/map.json index eab4e822a..699b0a342 100644 --- a/data/maps/SSAnne_1F_Corridor/map.json +++ b/data/maps/SSAnne_1F_Corridor/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SSAnne_1F_Room1/map.json b/data/maps/SSAnne_1F_Room1/map.json index 42c95079b..8d0fe53cb 100644 --- a/data/maps/SSAnne_1F_Room1/map.json +++ b/data/maps/SSAnne_1F_Room1/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json index 8a779f450..778414218 100644 --- a/data/maps/SSAnne_1F_Room2/map.json +++ b/data/maps/SSAnne_1F_Room2/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SSAnne_1F_Room3/map.json b/data/maps/SSAnne_1F_Room3/map.json index d610ee30a..798ab2ff1 100644 --- a/data/maps/SSAnne_1F_Room3/map.json +++ b/data/maps/SSAnne_1F_Room3/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SSAnne_1F_Room4/map.json b/data/maps/SSAnne_1F_Room4/map.json index 262a1a089..63d6672fc 100644 --- a/data/maps/SSAnne_1F_Room4/map.json +++ b/data/maps/SSAnne_1F_Room4/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SSAnne_1F_Room5/map.json b/data/maps/SSAnne_1F_Room5/map.json index 6cdd3d088..2598b5724 100644 --- a/data/maps/SSAnne_1F_Room5/map.json +++ b/data/maps/SSAnne_1F_Room5/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SSAnne_1F_Room6/map.json b/data/maps/SSAnne_1F_Room6/map.json index b9b25ff45..04a5d9401 100644 --- a/data/maps/SSAnne_1F_Room6/map.json +++ b/data/maps/SSAnne_1F_Room6/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SSAnne_1F_Room7/map.json b/data/maps/SSAnne_1F_Room7/map.json index 98496a947..3cd05e363 100644 --- a/data/maps/SSAnne_1F_Room7/map.json +++ b/data/maps/SSAnne_1F_Room7/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json index e3b506027..dabfe0c98 100644 --- a/data/maps/SSAnne_2F_Corridor/map.json +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SSAnne_2F_Room1/map.json b/data/maps/SSAnne_2F_Room1/map.json index 20e221a85..f74886d4d 100644 --- a/data/maps/SSAnne_2F_Room1/map.json +++ b/data/maps/SSAnne_2F_Room1/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json index df5cf4bc8..7c725b9f8 100644 --- a/data/maps/SSAnne_2F_Room2/map.json +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SSAnne_2F_Room3/map.json b/data/maps/SSAnne_2F_Room3/map.json index 8dbb1e408..0b2a20281 100644 --- a/data/maps/SSAnne_2F_Room3/map.json +++ b/data/maps/SSAnne_2F_Room3/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json index dca8226dd..48a46a128 100644 --- a/data/maps/SSAnne_2F_Room4/map.json +++ b/data/maps/SSAnne_2F_Room4/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SSAnne_2F_Room5/map.json b/data/maps/SSAnne_2F_Room5/map.json index 0821d13bd..e2f0638c5 100644 --- a/data/maps/SSAnne_2F_Room5/map.json +++ b/data/maps/SSAnne_2F_Room5/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SSAnne_2F_Room6/map.json b/data/maps/SSAnne_2F_Room6/map.json index 56b6e6201..e154b6ed9 100644 --- a/data/maps/SSAnne_2F_Room6/map.json +++ b/data/maps/SSAnne_2F_Room6/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SSAnne_3F_Corridor/map.json b/data/maps/SSAnne_3F_Corridor/map.json index 7c11905f1..81a723d70 100644 --- a/data/maps/SSAnne_3F_Corridor/map.json +++ b/data/maps/SSAnne_3F_Corridor/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SSAnne_B1F_Corridor/map.json b/data/maps/SSAnne_B1F_Corridor/map.json index c50752f50..d8d7e16cc 100644 --- a/data/maps/SSAnne_B1F_Corridor/map.json +++ b/data/maps/SSAnne_B1F_Corridor/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SSAnne_B1F_Room1/map.json b/data/maps/SSAnne_B1F_Room1/map.json index 4608e6c9a..e32428db6 100644 --- a/data/maps/SSAnne_B1F_Room1/map.json +++ b/data/maps/SSAnne_B1F_Room1/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json index 31c7d6eb7..834600362 100644 --- a/data/maps/SSAnne_B1F_Room2/map.json +++ b/data/maps/SSAnne_B1F_Room2/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json index 70237229c..13c4ccd6c 100644 --- a/data/maps/SSAnne_B1F_Room3/map.json +++ b/data/maps/SSAnne_B1F_Room3/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SSAnne_B1F_Room4/map.json b/data/maps/SSAnne_B1F_Room4/map.json index 8222e4dbc..a7511e37b 100644 --- a/data/maps/SSAnne_B1F_Room4/map.json +++ b/data/maps/SSAnne_B1F_Room4/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json index 5ed5383ea..0996d22df 100644 --- a/data/maps/SSAnne_B1F_Room5/map.json +++ b/data/maps/SSAnne_B1F_Room5/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json index 0f79b1014..32218c929 100644 --- a/data/maps/SSAnne_CaptainsOffice/map.json +++ b/data/maps/SSAnne_CaptainsOffice/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SSAnne_Deck/map.json b/data/maps/SSAnne_Deck/map.json index 617a770b3..808dfcab4 100644 --- a/data/maps/SSAnne_Deck/map.json +++ b/data/maps/SSAnne_Deck/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json index 12c466510..bdb13c3bf 100644 --- a/data/maps/SSAnne_Exterior/map.json +++ b/data/maps/SSAnne_Exterior/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index 579f9e9b0..ddc950401 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json index 4dfdda04d..5e42b55ae 100644 --- a/data/maps/SafariZone_Center/map.json +++ b/data/maps/SafariZone_Center/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SafariZone_Center_RestHouse/map.json b/data/maps/SafariZone_Center_RestHouse/map.json index fc4cbf67c..9e8545c9f 100644 --- a/data/maps/SafariZone_Center_RestHouse/map.json +++ b/data/maps/SafariZone_Center_RestHouse/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json index 5ba1d08dc..be15f3d78 100644 --- a/data/maps/SafariZone_East/map.json +++ b/data/maps/SafariZone_East/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SafariZone_East_RestHouse/map.json b/data/maps/SafariZone_East_RestHouse/map.json index d491771d0..ddf9f4ef1 100644 --- a/data/maps/SafariZone_East_RestHouse/map.json +++ b/data/maps/SafariZone_East_RestHouse/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index 79b4a1d2f..e3945eb61 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SafariZone_North_RestHouse/map.json b/data/maps/SafariZone_North_RestHouse/map.json index 48fc58755..99b62133e 100644 --- a/data/maps/SafariZone_North_RestHouse/map.json +++ b/data/maps/SafariZone_North_RestHouse/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SafariZone_SecretHouse/map.json b/data/maps/SafariZone_SecretHouse/map.json index df02367a4..e4a417566 100644 --- a/data/maps/SafariZone_SecretHouse/map.json +++ b/data/maps/SafariZone_SecretHouse/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json index cee77b0b3..65c7e7570 100644 --- a/data/maps/SafariZone_West/map.json +++ b/data/maps/SafariZone_West/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SafariZone_West_RestHouse/map.json b/data/maps/SafariZone_West_RestHouse/map.json index a387fe992..d23cbbbdc 100644 --- a/data/maps/SafariZone_West_RestHouse/map.json +++ b/data/maps/SafariZone_West_RestHouse/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index 83dc3497f..4b10013a1 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SaffronCity_Connection/map.json b/data/maps/SaffronCity_Connection/map.json index 718007c43..0b381c3b6 100644 --- a/data/maps/SaffronCity_Connection/map.json +++ b/data/maps/SaffronCity_Connection/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/map.json b/data/maps/SaffronCity_CopycatsHouse_1F/map.json index bb33e6ea3..91581a567 100644 --- a/data/maps/SaffronCity_CopycatsHouse_1F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/map.json b/data/maps/SaffronCity_CopycatsHouse_2F/map.json index ab920aa73..b66be68a0 100644 --- a/data/maps/SaffronCity_CopycatsHouse_2F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index 699ead653..12aae037e 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json index 0ebd439e5..d250f66db 100644 --- a/data/maps/SaffronCity_Gym/map.json +++ b/data/maps/SaffronCity_Gym/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 1, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_1", diff --git a/data/maps/SaffronCity_House/map.json b/data/maps/SaffronCity_House/map.json index 48b569e5e..0cfa013a9 100644 --- a/data/maps/SaffronCity_House/map.json +++ b/data/maps/SaffronCity_House/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json index ddce0c6d9..ad0321b41 100644 --- a/data/maps/SaffronCity_Mart/map.json +++ b/data/maps/SaffronCity_Mart/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SaffronCity_MrPsychicsHouse/map.json b/data/maps/SaffronCity_MrPsychicsHouse/map.json index f1d121850..ba2f7ca79 100644 --- a/data/maps/SaffronCity_MrPsychicsHouse/map.json +++ b/data/maps/SaffronCity_MrPsychicsHouse/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json index 1d28ff69a..76cc74a9d 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json index 62b084caf..db1049c84 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index f8f892dca..a631d4f6e 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json index 9006cac0a..fe7a1eb5e 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json index ed0f29ae1..4ef4f7cd8 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json index 3e6f5f257..dbb98e8d9 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json index e5c9cc7d1..60cd867eb 100644 --- a/data/maps/SeafoamIslands_B3F/map.json +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index 22a8851ac..9670a584e 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json index 8eab1efa3..2a0e2a756 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SevenIsland_Harbor/map.json b/data/maps/SevenIsland_Harbor/map.json index aad741634..1f32a8c99 100644 --- a/data/maps/SevenIsland_Harbor/map.json +++ b/data/maps/SevenIsland_Harbor/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json index 690fa63d8..04b463921 100644 --- a/data/maps/SevenIsland_House_Room1/map.json +++ b/data/maps/SevenIsland_House_Room1/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_1", diff --git a/data/maps/SevenIsland_House_Room2/map.json b/data/maps/SevenIsland_House_Room2/map.json index 678716dcc..6fbc93e83 100644 --- a/data/maps/SevenIsland_House_Room2/map.json +++ b/data/maps/SevenIsland_House_Room2/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_1", diff --git a/data/maps/SevenIsland_Mart/map.json b/data/maps/SevenIsland_Mart/map.json index b505a4a93..35b29be78 100644 --- a/data/maps/SevenIsland_Mart/map.json +++ b/data/maps/SevenIsland_Mart/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json index e620814b4..6d22011f8 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json index 0d08ea5d1..b71125efe 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index ccd0c8ddd..4898f2cbb 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json index 0bf40fca3..d74400889 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json index 864ce7c59..91762a1a6 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index 6c16bf0c0..bd8061b18 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_2", diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json index 3f50db9fe..8710d57c9 100644 --- a/data/maps/SevenIsland_TanobyRuins/map.json +++ b/data/maps/SevenIsland_TanobyRuins/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json index ddb7b332e..5c3f8fbae 100644 --- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_2", diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json index 72183cadb..f6316e55b 100644 --- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_2", diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json index 9685ccfe6..7a3ff5167 100644 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_2", diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json index ba84889d5..a1c4e1b38 100644 --- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_2", diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json index d21ec2792..d08d31d09 100644 --- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_2", diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json index fd2e1317c..5ccc39265 100644 --- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_2", diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json index c53a81f80..f97fba097 100644 --- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_2", diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json index 31a250297..48a369d2a 100644 --- a/data/maps/SevenIsland_TrainerTower/map.json +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index bebe3f71e..faf14cfde 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 7, "elevator_flag": 10, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index 19b187c08..9d842231f 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 7, "elevator_flag": 11, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json index b4e329490..a1b15142e 100644 --- a/data/maps/SilphCo_1F/map.json +++ b/data/maps/SilphCo_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 7, "elevator_flag": 1, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index 89439ba8a..fdc45f52e 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 7, "elevator_flag": 2, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index 42a1e6b72..573a79f4c 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 7, "elevator_flag": 3, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index 6473f3c5d..968c2179a 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 7, "elevator_flag": 4, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index 834d3c9eb..dbec3c08c 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 7, "elevator_flag": 5, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index f5e701cf2..b7664440e 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 7, "elevator_flag": 6, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index 994088fb0..d7fc5e642 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 7, "elevator_flag": 7, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index badb0553e..d843041f0 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 7, "elevator_flag": 8, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json index 92a229699..a2a4d29bb 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 7, "elevator_flag": 9, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SilphCo_Elevator/map.json b/data/maps/SilphCo_Elevator/map.json index 857d5c209..bcf756111 100644 --- a/data/maps/SilphCo_Elevator/map.json +++ b/data/maps/SilphCo_Elevator/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json index 9df09bc51..28ad8ecc8 100644 --- a/data/maps/SixIsland/map.json +++ b/data/maps/SixIsland/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SixIsland_AlteringCave/map.json b/data/maps/SixIsland_AlteringCave/map.json index b8141664e..ec29d465a 100644 --- a/data/maps/SixIsland_AlteringCave/map.json +++ b/data/maps/SixIsland_AlteringCave/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SixIsland_DottedHole_1F/map.json b/data/maps/SixIsland_DottedHole_1F/map.json index d83c3d58b..9a2a32ec1 100644 --- a/data/maps/SixIsland_DottedHole_1F/map.json +++ b/data/maps/SixIsland_DottedHole_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SixIsland_DottedHole_B1F/map.json b/data/maps/SixIsland_DottedHole_B1F/map.json index 9d264d645..2a7e3a40d 100644 --- a/data/maps/SixIsland_DottedHole_B1F/map.json +++ b/data/maps/SixIsland_DottedHole_B1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SixIsland_DottedHole_B2F/map.json b/data/maps/SixIsland_DottedHole_B2F/map.json index 0dd58ba70..49943fdda 100644 --- a/data/maps/SixIsland_DottedHole_B2F/map.json +++ b/data/maps/SixIsland_DottedHole_B2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SixIsland_DottedHole_B3F/map.json b/data/maps/SixIsland_DottedHole_B3F/map.json index df77a280c..047963b09 100644 --- a/data/maps/SixIsland_DottedHole_B3F/map.json +++ b/data/maps/SixIsland_DottedHole_B3F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SixIsland_DottedHole_B4F/map.json b/data/maps/SixIsland_DottedHole_B4F/map.json index 56e07628d..7f934b882 100644 --- a/data/maps/SixIsland_DottedHole_B4F/map.json +++ b/data/maps/SixIsland_DottedHole_B4F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json index 0acc6464e..6ac6834b6 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json index 40ddb539d..843427e53 100644 --- a/data/maps/SixIsland_GreenPath/map.json +++ b/data/maps/SixIsland_GreenPath/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SixIsland_Harbor/map.json b/data/maps/SixIsland_Harbor/map.json index 8b6059fb2..1c54eda76 100644 --- a/data/maps/SixIsland_Harbor/map.json +++ b/data/maps/SixIsland_Harbor/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SixIsland_House/map.json b/data/maps/SixIsland_House/map.json index ec39e8197..7d6d2680d 100644 --- a/data/maps/SixIsland_House/map.json +++ b/data/maps/SixIsland_House/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SixIsland_Mart/map.json b/data/maps/SixIsland_Mart/map.json index 54f2ec17c..0abc3ff8d 100644 --- a/data/maps/SixIsland_Mart/map.json +++ b/data/maps/SixIsland_Mart/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json index e8a0aff0b..9dd28875c 100644 --- a/data/maps/SixIsland_OutcastIsland/map.json +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json index ada89bce9..67ec77ee9 100644 --- a/data/maps/SixIsland_PatternBush/map.json +++ b/data/maps/SixIsland_PatternBush/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json index f3154e3fc..6a22d0f8f 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/map.json +++ b/data/maps/SixIsland_PokemonCenter_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json index f8088db9a..deb1ba0cb 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/map.json +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index 5e35f5a91..943cd8b08 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json index edd2ac240..74a4bc60e 100644 --- a/data/maps/SixIsland_WaterPath/map.json +++ b/data/maps/SixIsland_WaterPath/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SixIsland_WaterPath_House1/map.json b/data/maps/SixIsland_WaterPath_House1/map.json index 1405f0707..6eaa4ffbc 100644 --- a/data/maps/SixIsland_WaterPath_House1/map.json +++ b/data/maps/SixIsland_WaterPath_House1/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/SixIsland_WaterPath_House2/map.json b/data/maps/SixIsland_WaterPath_House2/map.json index 91221239f..deec51bce 100644 --- a/data/maps/SixIsland_WaterPath_House2/map.json +++ b/data/maps/SixIsland_WaterPath_House2/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index 2e758df5e..3e7963250 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index d3ba4d3c3..58644d541 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json index 993732967..3afff50a6 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json index 84f116348..8d5422fe6 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/map.json +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/ThreeIsland_Harbor/map.json b/data/maps/ThreeIsland_Harbor/map.json index e609a4011..50810f223 100644 --- a/data/maps/ThreeIsland_Harbor/map.json +++ b/data/maps/ThreeIsland_Harbor/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json index dfe2a6c9a..b28ea6cc7 100644 --- a/data/maps/ThreeIsland_House1/map.json +++ b/data/maps/ThreeIsland_House1/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/ThreeIsland_House2/map.json b/data/maps/ThreeIsland_House2/map.json index 41d291f8e..6884e186d 100644 --- a/data/maps/ThreeIsland_House2/map.json +++ b/data/maps/ThreeIsland_House2/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/ThreeIsland_House3/map.json b/data/maps/ThreeIsland_House3/map.json index b4adfbb86..601fa73ca 100644 --- a/data/maps/ThreeIsland_House3/map.json +++ b/data/maps/ThreeIsland_House3/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/ThreeIsland_House4/map.json b/data/maps/ThreeIsland_House4/map.json index dfd8bb1d9..a59e1ff5d 100644 --- a/data/maps/ThreeIsland_House4/map.json +++ b/data/maps/ThreeIsland_House4/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/ThreeIsland_House5/map.json b/data/maps/ThreeIsland_House5/map.json index 2e50fa9da..be849047f 100644 --- a/data/maps/ThreeIsland_House5/map.json +++ b/data/maps/ThreeIsland_House5/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/ThreeIsland_Mart/map.json b/data/maps/ThreeIsland_Mart/map.json index 6d66f0fe2..226828b19 100644 --- a/data/maps/ThreeIsland_Mart/map.json +++ b/data/maps/ThreeIsland_Mart/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json index ede9d59ab..e467d8eaf 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json index 84cea2d4f..df5ca161f 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json index 47aff8ea7..2377552b2 100644 --- a/data/maps/ThreeIsland_Port/map.json +++ b/data/maps/ThreeIsland_Port/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index 2ffdfab5c..98ce5c92e 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/TrainerTower_1F/map.json b/data/maps/TrainerTower_1F/map.json index 925dbdd69..9e52e5027 100644 --- a/data/maps/TrainerTower_1F/map.json +++ b/data/maps/TrainerTower_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 2, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/TrainerTower_2F/map.json b/data/maps/TrainerTower_2F/map.json index e2e2f4c97..14d116714 100644 --- a/data/maps/TrainerTower_2F/map.json +++ b/data/maps/TrainerTower_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 2, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/TrainerTower_3F/map.json b/data/maps/TrainerTower_3F/map.json index 8db22b61d..d9c18fb85 100644 --- a/data/maps/TrainerTower_3F/map.json +++ b/data/maps/TrainerTower_3F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 2, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/TrainerTower_4F/map.json b/data/maps/TrainerTower_4F/map.json index 32c868e91..d14739d6f 100644 --- a/data/maps/TrainerTower_4F/map.json +++ b/data/maps/TrainerTower_4F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 2, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/TrainerTower_5F/map.json b/data/maps/TrainerTower_5F/map.json index 7a32b597c..ab053a52a 100644 --- a/data/maps/TrainerTower_5F/map.json +++ b/data/maps/TrainerTower_5F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 2, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/TrainerTower_6F/map.json b/data/maps/TrainerTower_6F/map.json index 05491cf05..14de69d3b 100644 --- a/data/maps/TrainerTower_6F/map.json +++ b/data/maps/TrainerTower_6F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 2, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/TrainerTower_7F/map.json b/data/maps/TrainerTower_7F/map.json index 76f2a53f4..da4f8e4c5 100644 --- a/data/maps/TrainerTower_7F/map.json +++ b/data/maps/TrainerTower_7F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 2, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/TrainerTower_8F/map.json b/data/maps/TrainerTower_8F/map.json index 26cabfb06..9093fc91a 100644 --- a/data/maps/TrainerTower_8F/map.json +++ b/data/maps/TrainerTower_8F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 2, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/TrainerTower_Elevator/map.json b/data/maps/TrainerTower_Elevator/map.json index 7d004c2df..ded438b31 100644 --- a/data/maps/TrainerTower_Elevator/map.json +++ b/data/maps/TrainerTower_Elevator/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 2, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/TrainerTower_Lobby/map.json b/data/maps/TrainerTower_Lobby/map.json index 23e8456c0..808d19840 100644 --- a/data/maps/TrainerTower_Lobby/map.json +++ b/data/maps/TrainerTower_Lobby/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 2, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/TrainerTower_Roof/map.json b/data/maps/TrainerTower_Roof/map.json index c9a98a144..f3660c694 100644 --- a/data/maps/TrainerTower_Roof/map.json +++ b/data/maps/TrainerTower_Roof/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 2, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 556aa49da..0fc86bc84 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/TwoIsland_CapeBrink/map.json b/data/maps/TwoIsland_CapeBrink/map.json index a6a957d2c..ecb4707d3 100644 --- a/data/maps/TwoIsland_CapeBrink/map.json +++ b/data/maps/TwoIsland_CapeBrink/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json index 71a48a62b..fcdf43f48 100644 --- a/data/maps/TwoIsland_CapeBrink_House/map.json +++ b/data/maps/TwoIsland_CapeBrink_House/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/TwoIsland_Harbor/map.json b/data/maps/TwoIsland_Harbor/map.json index e4a7a2084..ef8a415a6 100644 --- a/data/maps/TwoIsland_Harbor/map.json +++ b/data/maps/TwoIsland_Harbor/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/TwoIsland_House/map.json b/data/maps/TwoIsland_House/map.json index 83f302e66..0bd6e4624 100644 --- a/data/maps/TwoIsland_House/map.json +++ b/data/maps/TwoIsland_House/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index 21435179e..da497f0f1 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json index d8abc60f9..15b241c4a 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json index 86ef55e25..ca726f1e4 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/UndergroundPath_EastEntrance/map.json b/data/maps/UndergroundPath_EastEntrance/map.json index 8a82619c0..2c06d06dd 100644 --- a/data/maps/UndergroundPath_EastEntrance/map.json +++ b/data/maps/UndergroundPath_EastEntrance/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/UndergroundPath_EastWestTunnel/map.json b/data/maps/UndergroundPath_EastWestTunnel/map.json index 6a4f5d9b4..b078aad43 100644 --- a/data/maps/UndergroundPath_EastWestTunnel/map.json +++ b/data/maps/UndergroundPath_EastWestTunnel/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/UndergroundPath_NorthEntrance/map.json b/data/maps/UndergroundPath_NorthEntrance/map.json index d5fbc5df9..2138ca2e3 100644 --- a/data/maps/UndergroundPath_NorthEntrance/map.json +++ b/data/maps/UndergroundPath_NorthEntrance/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/map.json b/data/maps/UndergroundPath_NorthSouthTunnel/map.json index 0f0482504..e4ea6461d 100644 --- a/data/maps/UndergroundPath_NorthSouthTunnel/map.json +++ b/data/maps/UndergroundPath_NorthSouthTunnel/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/UndergroundPath_SouthEntrance/map.json b/data/maps/UndergroundPath_SouthEntrance/map.json index 604e544cd..90215efc9 100644 --- a/data/maps/UndergroundPath_SouthEntrance/map.json +++ b/data/maps/UndergroundPath_SouthEntrance/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/UndergroundPath_WestEntrance/map.json b/data/maps/UndergroundPath_WestEntrance/map.json index 8e8d2f662..3c63eed27 100644 --- a/data/maps/UndergroundPath_WestEntrance/map.json +++ b/data/maps/UndergroundPath_WestEntrance/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json index 7427f28c3..a27c7a7b9 100644 --- a/data/maps/UnionRoom/map.json +++ b/data/maps/UnionRoom/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_8", diff --git a/data/maps/UnknownMap_18_01/map.json b/data/maps/UnknownMap_18_01/map.json index 7bb76e956..084ce2ad2 100644 --- a/data/maps/UnknownMap_18_01/map.json +++ b/data/maps/UnknownMap_18_01/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/UnusedHouse_27_00/map.json b/data/maps/UnusedHouse_27_00/map.json index 60ba28d54..db9e16065 100644 --- a/data/maps/UnusedHouse_27_00/map.json +++ b/data/maps/UnusedHouse_27_00/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/UnusedHouse_29_00/map.json b/data/maps/UnusedHouse_29_00/map.json index db312a5a9..033bb16f2 100644 --- a/data/maps/UnusedHouse_29_00/map.json +++ b/data/maps/UnusedHouse_29_00/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/UnusedHouse_31_05/map.json b/data/maps/UnusedHouse_31_05/map.json index 0bd404adb..a65ad03fb 100644 --- a/data/maps/UnusedHouse_31_05/map.json +++ b/data/maps/UnusedHouse_31_05/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index 0a5fe287a..586c7a0eb 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/VermilionCity_Gym/map.json b/data/maps/VermilionCity_Gym/map.json index 628d88070..3d6015592 100644 --- a/data/maps/VermilionCity_Gym/map.json +++ b/data/maps/VermilionCity_Gym/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_1", diff --git a/data/maps/VermilionCity_House1/map.json b/data/maps/VermilionCity_House1/map.json index 008e98610..b8486f537 100644 --- a/data/maps/VermilionCity_House1/map.json +++ b/data/maps/VermilionCity_House1/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/VermilionCity_House2/map.json b/data/maps/VermilionCity_House2/map.json index 3c40bf806..a2d7850a0 100644 --- a/data/maps/VermilionCity_House2/map.json +++ b/data/maps/VermilionCity_House2/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/VermilionCity_House3/map.json b/data/maps/VermilionCity_House3/map.json index 2f715b1e3..3ec89fcc2 100644 --- a/data/maps/VermilionCity_House3/map.json +++ b/data/maps/VermilionCity_House3/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/VermilionCity_Mart/map.json b/data/maps/VermilionCity_Mart/map.json index 3ef4658f1..91cc09731 100644 --- a/data/maps/VermilionCity_Mart/map.json +++ b/data/maps/VermilionCity_Mart/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json index b9837fca2..07752e909 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json index ff7c1be19..cd946a732 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json index c669797e7..f0dd18249 100644 --- a/data/maps/VermilionCity_PokemonFanClub/map.json +++ b/data/maps/VermilionCity_PokemonFanClub/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 9f5ddc540..38a8fa557 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index 33024c025..263b2561a 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index ffde167e7..4c92bffb1 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index a83f47f5a..ff3bd0506 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json index b4c9a93e4..4ac4c0b30 100644 --- a/data/maps/ViridianCity_Gym/map.json +++ b/data/maps/ViridianCity_Gym/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_1", diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House1/map.json index 167069bc6..ee3453e42 100644 --- a/data/maps/ViridianCity_House1/map.json +++ b/data/maps/ViridianCity_House1/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_House2/map.json index dc80606ec..030605a46 100644 --- a/data/maps/ViridianCity_House2/map.json +++ b/data/maps/ViridianCity_House2/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json index 5a4ae7bc0..2f56458d1 100644 --- a/data/maps/ViridianCity_Mart/map.json +++ b/data/maps/ViridianCity_Mart/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json index c531d4b59..2a6edb48c 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json index a552725f9..65a8307ba 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index 97f28ced9..17af05b03 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", -- cgit v1.2.3 From af6f99b9314f75150d9a5681c17ef5f95a9b1269 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 18 Feb 2020 14:50:24 -0500 Subject: Port pokemon_jump from emerald, 1 --- data/pokemon_jump.s | 122 ---------------------------------------------------- 1 file changed, 122 deletions(-) (limited to 'data') diff --git a/data/pokemon_jump.s b/data/pokemon_jump.s index 8f37f94e0..31a47d788 100644 --- a/data/pokemon_jump.s +++ b/data/pokemon_jump.s @@ -3,128 +3,6 @@ .section .rodata - .align 2 -gUnknown_846AFE8:: @ 846AFE8 - .incbin "graphics/misc/unk_846B008.gbapal" - -gUnknown_846B008:: @ 846B008 - .incbin "graphics/misc/unk_846B008.4bpp.lz" - -gUnknown_846B42C:: @ 846B42C - obj_tiles gUnknown_846B008, 0x0c00, 0x2000 - null_obj_tiles - -gUnknown_846B43C:: @ 846B43C - obj_pal gUnknown_846AFE8, 0x2000 - null_obj_pal - -gUnknown_846B44C:: @ 846B44C - obj_image_anim_frame 0x00, 0 - obj_image_anim_end - -gUnknown_846B454:: @ 846B454 - obj_image_anim_frame 0x10, 0 - obj_image_anim_end - -gUnknown_846B45C:: @ 846B45C - obj_image_anim_frame 0x20, 0 - obj_image_anim_end - -gUnknown_846B464:: @ 846B464 - obj_image_anim_frame 0x40, 0 - obj_image_anim_end - -gUnknown_846B46C:: @ 846B46C - obj_image_anim_frame 0x30, 0 - obj_image_anim_end - -gUnknown_846B474:: @ 846B474 - obj_image_anim_frame 0x50, 0 - obj_image_anim_end - -gUnknown_846B47C:: - .4byte gUnknown_846B44C - .4byte gUnknown_846B454 - .4byte gUnknown_846B45C - .4byte gUnknown_846B464 - .4byte gUnknown_846B46C - .4byte gUnknown_846B474 - -gUnknown_846B494:: @ 846B494 - spr_template 0x2000, 0x2000, gOamData_AffineOff_ObjNormal_32x32, gUnknown_846B47C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_846B4AC:: @ 846B4AC - @ This is a 2D array with one row. - @ Why this was done this way is beyond me. - @ The data that follow this row are not at all function pointers. - .4byte sub_81477C0, sub_814784C, sub_81479D4, sub_8147A34 - -gUnknown_846B4BC:: @ 846B4BC - .2byte 0x0001, 0x0002, 0x0004, 0x0001, 0x0007, 0x0000, 0x000a, 0x0001, 0x000b, 0x0001, 0x000d, 0x0001, 0x000e, 0x0001, 0x0013, 0x0001 - .2byte 0x0014, 0x0001, 0x0019, 0x0000, 0x001b, 0x0000, 0x001d, 0x0000, 0x0020, 0x0000, 0x0023, 0x0000, 0x0025, 0x0000, 0x0027, 0x0002 - .2byte 0x002b, 0x0002, 0x002e, 0x0001, 0x0034, 0x0000, 0x0036, 0x0002, 0x0038, 0x0001, 0x003a, 0x0001, 0x003c, 0x0002, 0x0045, 0x0002 - .2byte 0x005a, 0x0001, 0x0062, 0x0001, 0x0066, 0x0002, 0x0068, 0x0000, 0x0084, 0x0002, 0x0085, 0x0000, 0x008a, 0x0001, 0x008c, 0x0001 - .2byte 0x0098, 0x0002, 0x009b, 0x0001, 0x009e, 0x0000, 0x00a7, 0x0001, 0x00ac, 0x0000, 0x00ad, 0x0000, 0x00ae, 0x0002, 0x00af, 0x0002 - .2byte 0x00b3, 0x0000, 0x00b6, 0x0002, 0x00b7, 0x0002, 0x00bf, 0x0002, 0x00c2, 0x0002, 0x00cc, 0x0002, 0x00d1, 0x0000, 0x00d5, 0x0002 - .2byte 0x00d8, 0x0000, 0x00da, 0x0002, 0x00dc, 0x0000, 0x00e4, 0x0001, 0x00e7, 0x0000, 0x00e9, 0x0000, 0x00ec, 0x0001, 0x00ee, 0x0002 - .2byte 0x00ef, 0x0001, 0x00f0, 0x0001, 0x00f6, 0x0001, 0x0115, 0x0001, 0x0118, 0x0002, 0x011b, 0x0000, 0x011c, 0x0000, 0x011e, 0x0001 - .2byte 0x0120, 0x0000, 0x0121, 0x0000, 0x0122, 0x0001, 0x0123, 0x0002, 0x0125, 0x0002, 0x0127, 0x0002, 0x012a, 0x0001, 0x0188, 0x0000 - .2byte 0x0189, 0x0000, 0x0137, 0x0002, 0x0132, 0x0002, 0x012d, 0x0001, 0x0172, 0x0000, 0x015e, 0x0002, 0x013b, 0x0000, 0x0142, 0x0000 - .2byte 0x0163, 0x0000, 0x017e, 0x0001, 0x0164, 0x0002, 0x0151, 0x0001, 0x0161, 0x0001, 0x0162, 0x0001, 0x0182, 0x0000, 0x0183, 0x0000 - .2byte 0x016b, 0x0002, 0x016f, 0x0002, 0x0153, 0x0002, 0x0141, 0x0002, 0x015f, 0x0000, 0x014c, 0x0002, 0x0158, 0x0002, 0x0186, 0x0001 - .2byte 0x0168, 0x0000, 0x015a, 0x0000, 0x0175, 0x0001, 0x018b, 0x0001 - -gUnknown_846B64C:: @ 846B64C - .4byte sub_8148344 - .4byte sub_81483D0 - .4byte sub_8148464 - .4byte sub_81484D0 - .4byte sub_81485C8 - .4byte sub_81486C4 - .4byte sub_8148760 - .4byte sub_81487B4 - .4byte sub_814881C - -gUnknown_846B670:: @ 846B670 - .4byte sub_8148398 - .4byte sub_8148418 - .4byte sub_81484B0 - .4byte sub_814856C - .4byte sub_8148664 - .4byte sub_8148724 - .4byte sub_8148760 - .4byte sub_8148800 - .4byte sub_814881C - -gUnknown_846B694:: @ 846B694 - .2byte 0x001a, 0x001f, 0x0024, 0x0029, 0x002e, 0x0033, 0x0038, 0x003d - -gUnknown_846B6A4:: @ 846B6A4 - .2byte 0x0000, 0x0001, 0x0001, 0x0002 - -gUnknown_846B6AC:: @ 846B6AC - .2byte 0x0058, 0x005f, 0x00dd, 0x00fe - -gUnknown_846B6B4:: @ 846B6B4 - .byte 0xfd, 0xfa, 0xf8, 0xf6, 0xf3, 0xf1, 0xef, 0xed, 0xeb, 0xe9, 0xe7, 0xe5, 0xe4, 0xe3, 0xe2, 0xe2, 0xe2, 0xe4, 0xe5, 0xe6, 0xe7, 0xe9, 0xea, 0xec, 0xee, 0xef, 0xf1, 0xf3, 0xf5, 0xf8, 0xfa, 0xfc - .byte 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfd, 0xfa, 0xf7, 0xf5, 0xf2, 0xf0, 0xee, 0xec, 0xea, 0xe8, 0xe6, 0xe4, 0xe3, 0xe2, 0xe2, 0xe4 - .byte 0xe6, 0xe8, 0xea, 0xec, 0xee, 0xf0, 0xf2, 0xf5, 0xf7, 0xfa, 0xfc, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xfd, 0xfa, 0xf7, 0xf5, 0xf3, 0xf1, 0xef, 0xed, 0xeb, 0xe9, 0xe7, 0xe5, 0xe4, 0xe3, 0xe2, 0xe2, 0xe2, 0xe2, 0xe3, 0xe3, 0xe4, 0xe4, 0xe5, 0xe5, 0xe6, 0xe7, 0xe8, 0xea, 0xec, 0xee, 0xf0, 0xf2 - .byte 0xf4, 0xf5, 0xf7, 0xfa, 0xfc, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -gUnknown_846B744:: @ 846B744 - .4byte 0, 0, 50, 100, 200, 500 - -gUnknown_846B75C:: @ 846B75C - .2byte 0x008a, 0x008d, 0x008e, 0x008f, 0x0090, 0x0091, 0x0092, 0x0093 - -gUnknown_846B76C:: @ 846B76C - .4byte 5000, 1 - .4byte 8000, 2 - .4byte 12000, 3 - .4byte 16000, 4 - .4byte 20000, 5 - gUnknown_846B794:: @ 846B794 gbapal .incbin "graphics/link_games/unk_846B794.gbapal" -- cgit v1.2.3 From e94f9c148358f2e25e6ebbd58d39eb9ddd27f7c3 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 18 Feb 2020 14:52:42 -0500 Subject: Name allow_escaping, allow_running, show_map_name header properties --- data/maps/BattleColosseum_2P/map.json | 6 ++++-- data/maps/BattleColosseum_4P/map.json | 6 ++++-- data/maps/BirthIsland_Exterior/map.json | 6 ++++-- data/maps/BirthIsland_Harbor/map.json | 6 ++++-- data/maps/CeladonCity/map.json | 6 ++++-- data/maps/CeladonCity_Condominiums_1F/map.json | 6 ++++-- data/maps/CeladonCity_Condominiums_2F/map.json | 6 ++++-- data/maps/CeladonCity_Condominiums_3F/map.json | 6 ++++-- data/maps/CeladonCity_Condominiums_Roof/map.json | 6 ++++-- data/maps/CeladonCity_Condominiums_RoofRoom/map.json | 6 ++++-- data/maps/CeladonCity_DepartmentStore_1F/map.json | 6 ++++-- data/maps/CeladonCity_DepartmentStore_2F/map.json | 6 ++++-- data/maps/CeladonCity_DepartmentStore_3F/map.json | 6 ++++-- data/maps/CeladonCity_DepartmentStore_4F/map.json | 6 ++++-- data/maps/CeladonCity_DepartmentStore_5F/map.json | 6 ++++-- data/maps/CeladonCity_DepartmentStore_Elevator/map.json | 6 ++++-- data/maps/CeladonCity_DepartmentStore_Roof/map.json | 6 ++++-- data/maps/CeladonCity_GameCorner/map.json | 6 ++++-- data/maps/CeladonCity_GameCorner_PrizeRoom/map.json | 6 ++++-- data/maps/CeladonCity_Gym/map.json | 6 ++++-- data/maps/CeladonCity_Hotel/map.json | 6 ++++-- data/maps/CeladonCity_House1/map.json | 6 ++++-- data/maps/CeladonCity_PokemonCenter_1F/map.json | 6 ++++-- data/maps/CeladonCity_PokemonCenter_2F/map.json | 6 ++++-- data/maps/CeladonCity_Restaurant/map.json | 6 ++++-- data/maps/CeruleanCave_1F/map.json | 6 ++++-- data/maps/CeruleanCave_2F/map.json | 6 ++++-- data/maps/CeruleanCave_B1F/map.json | 6 ++++-- data/maps/CeruleanCity/map.json | 6 ++++-- data/maps/CeruleanCity_BikeShop/map.json | 6 ++++-- data/maps/CeruleanCity_Gym/map.json | 6 ++++-- data/maps/CeruleanCity_House1/map.json | 6 ++++-- data/maps/CeruleanCity_House2/map.json | 6 ++++-- data/maps/CeruleanCity_House3/map.json | 6 ++++-- data/maps/CeruleanCity_House4/map.json | 6 ++++-- data/maps/CeruleanCity_House5/map.json | 6 ++++-- data/maps/CeruleanCity_Mart/map.json | 6 ++++-- data/maps/CeruleanCity_PokemonCenter_1F/map.json | 6 ++++-- data/maps/CeruleanCity_PokemonCenter_2F/map.json | 6 ++++-- data/maps/CinnabarIsland/map.json | 6 ++++-- data/maps/CinnabarIsland_Gym/map.json | 6 ++++-- data/maps/CinnabarIsland_Mart/map.json | 6 ++++-- data/maps/CinnabarIsland_PokemonCenter_1F/map.json | 6 ++++-- data/maps/CinnabarIsland_PokemonCenter_2F/map.json | 6 ++++-- data/maps/CinnabarIsland_PokemonLab_Entrance/map.json | 6 ++++-- data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json | 6 ++++-- data/maps/CinnabarIsland_PokemonLab_Lounge/map.json | 6 ++++-- data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json | 6 ++++-- data/maps/DiglettsCave_B1F/map.json | 6 ++++-- data/maps/DiglettsCave_NorthEntrance/map.json | 6 ++++-- data/maps/DiglettsCave_SouthEntrance/map.json | 6 ++++-- data/maps/FiveIsland/map.json | 6 ++++-- data/maps/FiveIsland_Harbor/map.json | 6 ++++-- data/maps/FiveIsland_House1/map.json | 6 ++++-- data/maps/FiveIsland_House2/map.json | 6 ++++-- data/maps/FiveIsland_LostCave_Entrance/map.json | 6 ++++-- data/maps/FiveIsland_LostCave_Room1/map.json | 6 ++++-- data/maps/FiveIsland_LostCave_Room10/map.json | 6 ++++-- data/maps/FiveIsland_LostCave_Room11/map.json | 6 ++++-- data/maps/FiveIsland_LostCave_Room12/map.json | 6 ++++-- data/maps/FiveIsland_LostCave_Room13/map.json | 6 ++++-- data/maps/FiveIsland_LostCave_Room14/map.json | 6 ++++-- data/maps/FiveIsland_LostCave_Room2/map.json | 6 ++++-- data/maps/FiveIsland_LostCave_Room3/map.json | 6 ++++-- data/maps/FiveIsland_LostCave_Room4/map.json | 6 ++++-- data/maps/FiveIsland_LostCave_Room5/map.json | 6 ++++-- data/maps/FiveIsland_LostCave_Room6/map.json | 6 ++++-- data/maps/FiveIsland_LostCave_Room7/map.json | 6 ++++-- data/maps/FiveIsland_LostCave_Room8/map.json | 6 ++++-- data/maps/FiveIsland_LostCave_Room9/map.json | 6 ++++-- data/maps/FiveIsland_Meadow/map.json | 6 ++++-- data/maps/FiveIsland_MemorialPillar/map.json | 6 ++++-- data/maps/FiveIsland_PokemonCenter_1F/map.json | 6 ++++-- data/maps/FiveIsland_PokemonCenter_2F/map.json | 6 ++++-- data/maps/FiveIsland_ResortGorgeous/map.json | 6 ++++-- data/maps/FiveIsland_ResortGorgeous_House/map.json | 6 ++++-- data/maps/FiveIsland_RocketWarehouse/map.json | 6 ++++-- data/maps/FiveIsland_WaterLabyrinth/map.json | 6 ++++-- data/maps/FourIsland/map.json | 6 ++++-- data/maps/FourIsland_Harbor/map.json | 6 ++++-- data/maps/FourIsland_House1/map.json | 6 ++++-- data/maps/FourIsland_House2/map.json | 6 ++++-- data/maps/FourIsland_IcefallCave_1F/map.json | 6 ++++-- data/maps/FourIsland_IcefallCave_B1F/map.json | 6 ++++-- data/maps/FourIsland_IcefallCave_Back/map.json | 6 ++++-- data/maps/FourIsland_IcefallCave_Entrance/map.json | 6 ++++-- data/maps/FourIsland_LoreleisHouse/map.json | 6 ++++-- data/maps/FourIsland_Mart/map.json | 6 ++++-- data/maps/FourIsland_PokemonCenter_1F/map.json | 6 ++++-- data/maps/FourIsland_PokemonCenter_2F/map.json | 6 ++++-- data/maps/FourIsland_PokemonDayCare/map.json | 6 ++++-- data/maps/FuchsiaCity/map.json | 6 ++++-- data/maps/FuchsiaCity_Gym/map.json | 6 ++++-- data/maps/FuchsiaCity_House1/map.json | 6 ++++-- data/maps/FuchsiaCity_House2/map.json | 6 ++++-- data/maps/FuchsiaCity_House3/map.json | 6 ++++-- data/maps/FuchsiaCity_Mart/map.json | 6 ++++-- data/maps/FuchsiaCity_PokemonCenter_1F/map.json | 6 ++++-- data/maps/FuchsiaCity_PokemonCenter_2F/map.json | 6 ++++-- data/maps/FuchsiaCity_SafariZone_Entrance/map.json | 6 ++++-- data/maps/FuchsiaCity_SafariZone_Office/map.json | 6 ++++-- data/maps/FuchsiaCity_WardensHouse/map.json | 6 ++++-- data/maps/IndigoPlateau_Exterior/map.json | 6 ++++-- data/maps/IndigoPlateau_PokemonCenter_1F/map.json | 6 ++++-- data/maps/IndigoPlateau_PokemonCenter_2F/map.json | 6 ++++-- data/maps/LavenderTown/map.json | 6 ++++-- data/maps/LavenderTown_House1/map.json | 6 ++++-- data/maps/LavenderTown_House2/map.json | 6 ++++-- data/maps/LavenderTown_Mart/map.json | 6 ++++-- data/maps/LavenderTown_PokemonCenter_1F/map.json | 6 ++++-- data/maps/LavenderTown_PokemonCenter_2F/map.json | 6 ++++-- data/maps/LavenderTown_VolunteerPokemonHouse/map.json | 6 ++++-- data/maps/MtEmber_Exterior/map.json | 6 ++++-- data/maps/MtEmber_RubyPath_1F/map.json | 6 ++++-- data/maps/MtEmber_RubyPath_B1F/map.json | 6 ++++-- data/maps/MtEmber_RubyPath_B1F_Stairs/map.json | 6 ++++-- data/maps/MtEmber_RubyPath_B2F/map.json | 6 ++++-- data/maps/MtEmber_RubyPath_B2F_Stairs/map.json | 6 ++++-- data/maps/MtEmber_RubyPath_B3F/map.json | 6 ++++-- data/maps/MtEmber_RubyPath_B4F/map.json | 6 ++++-- data/maps/MtEmber_RubyPath_B5F/map.json | 6 ++++-- data/maps/MtEmber_Summit/map.json | 6 ++++-- data/maps/MtEmber_SummitPath_1F/map.json | 6 ++++-- data/maps/MtEmber_SummitPath_2F/map.json | 6 ++++-- data/maps/MtEmber_SummitPath_3F/map.json | 6 ++++-- data/maps/MtMoon_1F/map.json | 6 ++++-- data/maps/MtMoon_B1F/map.json | 6 ++++-- data/maps/MtMoon_B2F/map.json | 6 ++++-- data/maps/NavelRock_1F/map.json | 6 ++++-- data/maps/NavelRock_B1F/map.json | 6 ++++-- data/maps/NavelRock_Base/map.json | 6 ++++-- data/maps/NavelRock_BasePath_B10F/map.json | 6 ++++-- data/maps/NavelRock_BasePath_B11F/map.json | 6 ++++-- data/maps/NavelRock_BasePath_B1F/map.json | 6 ++++-- data/maps/NavelRock_BasePath_B2F/map.json | 6 ++++-- data/maps/NavelRock_BasePath_B3F/map.json | 6 ++++-- data/maps/NavelRock_BasePath_B4F/map.json | 6 ++++-- data/maps/NavelRock_BasePath_B5F/map.json | 6 ++++-- data/maps/NavelRock_BasePath_B6F/map.json | 6 ++++-- data/maps/NavelRock_BasePath_B7F/map.json | 6 ++++-- data/maps/NavelRock_BasePath_B8F/map.json | 6 ++++-- data/maps/NavelRock_BasePath_B9F/map.json | 6 ++++-- data/maps/NavelRock_Exterior/map.json | 6 ++++-- data/maps/NavelRock_Fork/map.json | 6 ++++-- data/maps/NavelRock_Harbor/map.json | 6 ++++-- data/maps/NavelRock_Summit/map.json | 6 ++++-- data/maps/NavelRock_SummitPath_2F/map.json | 6 ++++-- data/maps/NavelRock_SummitPath_3F/map.json | 6 ++++-- data/maps/NavelRock_SummitPath_4F/map.json | 6 ++++-- data/maps/NavelRock_SummitPath_5F/map.json | 6 ++++-- data/maps/OneIsland/map.json | 6 ++++-- data/maps/OneIsland_Harbor/map.json | 6 ++++-- data/maps/OneIsland_House1/map.json | 6 ++++-- data/maps/OneIsland_House2/map.json | 6 ++++-- data/maps/OneIsland_KindleRoad/map.json | 6 ++++-- data/maps/OneIsland_KindleRoad_EmberSpa/map.json | 6 ++++-- data/maps/OneIsland_PokemonCenter_1F/map.json | 6 ++++-- data/maps/OneIsland_PokemonCenter_2F/map.json | 6 ++++-- data/maps/OneIsland_TreasureBeach/map.json | 6 ++++-- data/maps/PalletTown/map.json | 6 ++++-- data/maps/PalletTown_GarysHouse/map.json | 6 ++++-- data/maps/PalletTown_PlayersHouse_1F/map.json | 6 ++++-- data/maps/PalletTown_PlayersHouse_2F/map.json | 6 ++++-- data/maps/PalletTown_ProfessorOaksLab/map.json | 6 ++++-- data/maps/PewterCity/map.json | 6 ++++-- data/maps/PewterCity_Gym/map.json | 6 ++++-- data/maps/PewterCity_House1/map.json | 6 ++++-- data/maps/PewterCity_House2/map.json | 6 ++++-- data/maps/PewterCity_Mart/map.json | 6 ++++-- data/maps/PewterCity_Museum_1F/map.json | 6 ++++-- data/maps/PewterCity_Museum_2F/map.json | 6 ++++-- data/maps/PewterCity_PokemonCenter_1F/map.json | 6 ++++-- data/maps/PewterCity_PokemonCenter_2F/map.json | 6 ++++-- data/maps/PokemonLeague_AgathasRoom/map.json | 6 ++++-- data/maps/PokemonLeague_BrunosRoom/map.json | 6 ++++-- data/maps/PokemonLeague_ChampionsRoom/map.json | 6 ++++-- data/maps/PokemonLeague_HallOfFame/map.json | 6 ++++-- data/maps/PokemonLeague_LancesRoom/map.json | 6 ++++-- data/maps/PokemonLeague_LoreleisRoom/map.json | 6 ++++-- data/maps/PokemonMansion_1F/map.json | 6 ++++-- data/maps/PokemonMansion_2F/map.json | 6 ++++-- data/maps/PokemonMansion_3F/map.json | 6 ++++-- data/maps/PokemonMansion_B1F/map.json | 6 ++++-- data/maps/PokemonTower_1F/map.json | 6 ++++-- data/maps/PokemonTower_2F/map.json | 6 ++++-- data/maps/PokemonTower_3F/map.json | 6 ++++-- data/maps/PokemonTower_4F/map.json | 6 ++++-- data/maps/PokemonTower_5F/map.json | 6 ++++-- data/maps/PokemonTower_6F/map.json | 6 ++++-- data/maps/PokemonTower_7F/map.json | 6 ++++-- data/maps/PowerPlant/map.json | 6 ++++-- data/maps/Prototype_SeviiIsle_6/map.json | 6 ++++-- data/maps/Prototype_SeviiIsle_7/map.json | 6 ++++-- data/maps/Prototype_SeviiIsle_8/map.json | 6 ++++-- data/maps/Prototype_SeviiIsle_9/map.json | 6 ++++-- data/maps/RecordCenter/map.json | 6 ++++-- data/maps/RockTunnel_1F/map.json | 6 ++++-- data/maps/RockTunnel_B1F/map.json | 6 ++++-- data/maps/RocketHideout_B1F/map.json | 6 ++++-- data/maps/RocketHideout_B2F/map.json | 6 ++++-- data/maps/RocketHideout_B3F/map.json | 6 ++++-- data/maps/RocketHideout_B4F/map.json | 6 ++++-- data/maps/RocketHideout_Elevator/map.json | 6 ++++-- data/maps/Route1/map.json | 6 ++++-- data/maps/Route10/map.json | 6 ++++-- data/maps/Route10_PokemonCenter_1F/map.json | 6 ++++-- data/maps/Route10_PokemonCenter_2F/map.json | 6 ++++-- data/maps/Route11/map.json | 6 ++++-- data/maps/Route11_EastEntrance_1F/map.json | 6 ++++-- data/maps/Route11_EastEntrance_2F/map.json | 6 ++++-- data/maps/Route12/map.json | 6 ++++-- data/maps/Route12_FishingHouse/map.json | 6 ++++-- data/maps/Route12_NorthEntrance_1F/map.json | 6 ++++-- data/maps/Route12_NorthEntrance_2F/map.json | 6 ++++-- data/maps/Route13/map.json | 6 ++++-- data/maps/Route14/map.json | 6 ++++-- data/maps/Route15/map.json | 6 ++++-- data/maps/Route15_WestEntrance_1F/map.json | 6 ++++-- data/maps/Route15_WestEntrance_2F/map.json | 6 ++++-- data/maps/Route16/map.json | 6 ++++-- data/maps/Route16_House/map.json | 6 ++++-- data/maps/Route16_NorthEntrance_1F/map.json | 6 ++++-- data/maps/Route16_NorthEntrance_2F/map.json | 6 ++++-- data/maps/Route17/map.json | 6 ++++-- data/maps/Route18/map.json | 6 ++++-- data/maps/Route18_EastEntrance_1F/map.json | 6 ++++-- data/maps/Route18_EastEntrance_2F/map.json | 6 ++++-- data/maps/Route19/map.json | 6 ++++-- data/maps/Route2/map.json | 6 ++++-- data/maps/Route20/map.json | 6 ++++-- data/maps/Route21_North/map.json | 6 ++++-- data/maps/Route21_South/map.json | 6 ++++-- data/maps/Route22/map.json | 6 ++++-- data/maps/Route22_NorthEntrance/map.json | 6 ++++-- data/maps/Route23/map.json | 6 ++++-- data/maps/Route24/map.json | 6 ++++-- data/maps/Route25/map.json | 6 ++++-- data/maps/Route25_SeaCottage/map.json | 6 ++++-- data/maps/Route2_EastBuilding/map.json | 6 ++++-- data/maps/Route2_House/map.json | 6 ++++-- data/maps/Route2_ViridianForest_NorthEntrance/map.json | 6 ++++-- data/maps/Route2_ViridianForest_SouthEntrance/map.json | 6 ++++-- data/maps/Route3/map.json | 6 ++++-- data/maps/Route4/map.json | 6 ++++-- data/maps/Route4_PokemonCenter_1F/map.json | 6 ++++-- data/maps/Route4_PokemonCenter_2F/map.json | 6 ++++-- data/maps/Route5/map.json | 6 ++++-- data/maps/Route5_PokemonDayCare/map.json | 6 ++++-- data/maps/Route5_SouthEntrance/map.json | 6 ++++-- data/maps/Route6/map.json | 6 ++++-- data/maps/Route6_NorthEntrance/map.json | 6 ++++-- data/maps/Route7/map.json | 6 ++++-- data/maps/Route7_EastEntrance/map.json | 6 ++++-- data/maps/Route8/map.json | 6 ++++-- data/maps/Route8_WestEntrance/map.json | 6 ++++-- data/maps/Route9/map.json | 6 ++++-- data/maps/SSAnne_1F_Corridor/map.json | 6 ++++-- data/maps/SSAnne_1F_Room1/map.json | 6 ++++-- data/maps/SSAnne_1F_Room2/map.json | 6 ++++-- data/maps/SSAnne_1F_Room3/map.json | 6 ++++-- data/maps/SSAnne_1F_Room4/map.json | 6 ++++-- data/maps/SSAnne_1F_Room5/map.json | 6 ++++-- data/maps/SSAnne_1F_Room6/map.json | 6 ++++-- data/maps/SSAnne_1F_Room7/map.json | 6 ++++-- data/maps/SSAnne_2F_Corridor/map.json | 6 ++++-- data/maps/SSAnne_2F_Room1/map.json | 6 ++++-- data/maps/SSAnne_2F_Room2/map.json | 6 ++++-- data/maps/SSAnne_2F_Room3/map.json | 6 ++++-- data/maps/SSAnne_2F_Room4/map.json | 6 ++++-- data/maps/SSAnne_2F_Room5/map.json | 6 ++++-- data/maps/SSAnne_2F_Room6/map.json | 6 ++++-- data/maps/SSAnne_3F_Corridor/map.json | 6 ++++-- data/maps/SSAnne_B1F_Corridor/map.json | 6 ++++-- data/maps/SSAnne_B1F_Room1/map.json | 6 ++++-- data/maps/SSAnne_B1F_Room2/map.json | 6 ++++-- data/maps/SSAnne_B1F_Room3/map.json | 6 ++++-- data/maps/SSAnne_B1F_Room4/map.json | 6 ++++-- data/maps/SSAnne_B1F_Room5/map.json | 6 ++++-- data/maps/SSAnne_CaptainsOffice/map.json | 6 ++++-- data/maps/SSAnne_Deck/map.json | 6 ++++-- data/maps/SSAnne_Exterior/map.json | 6 ++++-- data/maps/SSAnne_Kitchen/map.json | 6 ++++-- data/maps/SafariZone_Center/map.json | 6 ++++-- data/maps/SafariZone_Center_RestHouse/map.json | 6 ++++-- data/maps/SafariZone_East/map.json | 6 ++++-- data/maps/SafariZone_East_RestHouse/map.json | 6 ++++-- data/maps/SafariZone_North/map.json | 6 ++++-- data/maps/SafariZone_North_RestHouse/map.json | 6 ++++-- data/maps/SafariZone_SecretHouse/map.json | 6 ++++-- data/maps/SafariZone_West/map.json | 6 ++++-- data/maps/SafariZone_West_RestHouse/map.json | 6 ++++-- data/maps/SaffronCity/map.json | 6 ++++-- data/maps/SaffronCity_Connection/map.json | 6 ++++-- data/maps/SaffronCity_CopycatsHouse_1F/map.json | 6 ++++-- data/maps/SaffronCity_CopycatsHouse_2F/map.json | 6 ++++-- data/maps/SaffronCity_Dojo/map.json | 6 ++++-- data/maps/SaffronCity_Gym/map.json | 6 ++++-- data/maps/SaffronCity_House/map.json | 6 ++++-- data/maps/SaffronCity_Mart/map.json | 6 ++++-- data/maps/SaffronCity_MrPsychicsHouse/map.json | 6 ++++-- data/maps/SaffronCity_PokemonCenter_1F/map.json | 6 ++++-- data/maps/SaffronCity_PokemonCenter_2F/map.json | 6 ++++-- data/maps/SaffronCity_PokemonTrainerFanClub/map.json | 6 ++++-- data/maps/SeafoamIslands_1F/map.json | 6 ++++-- data/maps/SeafoamIslands_B1F/map.json | 6 ++++-- data/maps/SeafoamIslands_B2F/map.json | 6 ++++-- data/maps/SeafoamIslands_B3F/map.json | 6 ++++-- data/maps/SeafoamIslands_B4F/map.json | 6 ++++-- data/maps/SevenIsland/map.json | 6 ++++-- data/maps/SevenIsland_Harbor/map.json | 6 ++++-- data/maps/SevenIsland_House_Room1/map.json | 6 ++++-- data/maps/SevenIsland_House_Room2/map.json | 6 ++++-- data/maps/SevenIsland_Mart/map.json | 6 ++++-- data/maps/SevenIsland_PokemonCenter_1F/map.json | 6 ++++-- data/maps/SevenIsland_PokemonCenter_2F/map.json | 6 ++++-- data/maps/SevenIsland_SevaultCanyon/map.json | 6 ++++-- data/maps/SevenIsland_SevaultCanyon_Entrance/map.json | 6 ++++-- data/maps/SevenIsland_SevaultCanyon_House/map.json | 6 ++++-- data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json | 6 ++++-- data/maps/SevenIsland_TanobyRuins/map.json | 6 ++++-- data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json | 6 ++++-- data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json | 6 ++++-- data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json | 6 ++++-- data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json | 6 ++++-- data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json | 6 ++++-- data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json | 6 ++++-- data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json | 6 ++++-- data/maps/SevenIsland_TrainerTower/map.json | 6 ++++-- data/maps/SilphCo_10F/map.json | 6 ++++-- data/maps/SilphCo_11F/map.json | 6 ++++-- data/maps/SilphCo_1F/map.json | 6 ++++-- data/maps/SilphCo_2F/map.json | 6 ++++-- data/maps/SilphCo_3F/map.json | 6 ++++-- data/maps/SilphCo_4F/map.json | 6 ++++-- data/maps/SilphCo_5F/map.json | 6 ++++-- data/maps/SilphCo_6F/map.json | 6 ++++-- data/maps/SilphCo_7F/map.json | 6 ++++-- data/maps/SilphCo_8F/map.json | 6 ++++-- data/maps/SilphCo_9F/map.json | 6 ++++-- data/maps/SilphCo_Elevator/map.json | 6 ++++-- data/maps/SixIsland/map.json | 6 ++++-- data/maps/SixIsland_AlteringCave/map.json | 6 ++++-- data/maps/SixIsland_DottedHole_1F/map.json | 6 ++++-- data/maps/SixIsland_DottedHole_B1F/map.json | 6 ++++-- data/maps/SixIsland_DottedHole_B2F/map.json | 6 ++++-- data/maps/SixIsland_DottedHole_B3F/map.json | 6 ++++-- data/maps/SixIsland_DottedHole_B4F/map.json | 6 ++++-- data/maps/SixIsland_DottedHole_SapphireRoom/map.json | 6 ++++-- data/maps/SixIsland_GreenPath/map.json | 6 ++++-- data/maps/SixIsland_Harbor/map.json | 6 ++++-- data/maps/SixIsland_House/map.json | 6 ++++-- data/maps/SixIsland_Mart/map.json | 6 ++++-- data/maps/SixIsland_OutcastIsland/map.json | 6 ++++-- data/maps/SixIsland_PatternBush/map.json | 6 ++++-- data/maps/SixIsland_PokemonCenter_1F/map.json | 6 ++++-- data/maps/SixIsland_PokemonCenter_2F/map.json | 6 ++++-- data/maps/SixIsland_RuinValley/map.json | 6 ++++-- data/maps/SixIsland_WaterPath/map.json | 6 ++++-- data/maps/SixIsland_WaterPath_House1/map.json | 6 ++++-- data/maps/SixIsland_WaterPath_House2/map.json | 6 ++++-- data/maps/ThreeIsland/map.json | 6 ++++-- data/maps/ThreeIsland_BerryForest/map.json | 6 ++++-- data/maps/ThreeIsland_BondBridge/map.json | 6 ++++-- data/maps/ThreeIsland_DunsparceTunnel/map.json | 6 ++++-- data/maps/ThreeIsland_Harbor/map.json | 6 ++++-- data/maps/ThreeIsland_House1/map.json | 6 ++++-- data/maps/ThreeIsland_House2/map.json | 6 ++++-- data/maps/ThreeIsland_House3/map.json | 6 ++++-- data/maps/ThreeIsland_House4/map.json | 6 ++++-- data/maps/ThreeIsland_House5/map.json | 6 ++++-- data/maps/ThreeIsland_Mart/map.json | 6 ++++-- data/maps/ThreeIsland_PokemonCenter_1F/map.json | 6 ++++-- data/maps/ThreeIsland_PokemonCenter_2F/map.json | 6 ++++-- data/maps/ThreeIsland_Port/map.json | 6 ++++-- data/maps/TradeCenter/map.json | 6 ++++-- data/maps/TrainerTower_1F/map.json | 6 ++++-- data/maps/TrainerTower_2F/map.json | 6 ++++-- data/maps/TrainerTower_3F/map.json | 6 ++++-- data/maps/TrainerTower_4F/map.json | 6 ++++-- data/maps/TrainerTower_5F/map.json | 6 ++++-- data/maps/TrainerTower_6F/map.json | 6 ++++-- data/maps/TrainerTower_7F/map.json | 6 ++++-- data/maps/TrainerTower_8F/map.json | 6 ++++-- data/maps/TrainerTower_Elevator/map.json | 6 ++++-- data/maps/TrainerTower_Lobby/map.json | 6 ++++-- data/maps/TrainerTower_Roof/map.json | 6 ++++-- data/maps/TwoIsland/map.json | 6 ++++-- data/maps/TwoIsland_CapeBrink/map.json | 6 ++++-- data/maps/TwoIsland_CapeBrink_House/map.json | 6 ++++-- data/maps/TwoIsland_Harbor/map.json | 6 ++++-- data/maps/TwoIsland_House/map.json | 6 ++++-- data/maps/TwoIsland_JoyfulGameCorner/map.json | 6 ++++-- data/maps/TwoIsland_PokemonCenter_1F/map.json | 6 ++++-- data/maps/TwoIsland_PokemonCenter_2F/map.json | 6 ++++-- data/maps/UndergroundPath_EastEntrance/map.json | 6 ++++-- data/maps/UndergroundPath_EastWestTunnel/map.json | 6 ++++-- data/maps/UndergroundPath_NorthEntrance/map.json | 6 ++++-- data/maps/UndergroundPath_NorthSouthTunnel/map.json | 6 ++++-- data/maps/UndergroundPath_SouthEntrance/map.json | 6 ++++-- data/maps/UndergroundPath_WestEntrance/map.json | 6 ++++-- data/maps/UnionRoom/map.json | 6 ++++-- data/maps/UnknownMap_18_01/map.json | 6 ++++-- data/maps/UnusedHouse_27_00/map.json | 6 ++++-- data/maps/UnusedHouse_29_00/map.json | 6 ++++-- data/maps/UnusedHouse_31_05/map.json | 6 ++++-- data/maps/VermilionCity/map.json | 6 ++++-- data/maps/VermilionCity_Gym/map.json | 6 ++++-- data/maps/VermilionCity_House1/map.json | 6 ++++-- data/maps/VermilionCity_House2/map.json | 6 ++++-- data/maps/VermilionCity_House3/map.json | 6 ++++-- data/maps/VermilionCity_Mart/map.json | 6 ++++-- data/maps/VermilionCity_PokemonCenter_1F/map.json | 6 ++++-- data/maps/VermilionCity_PokemonCenter_2F/map.json | 6 ++++-- data/maps/VermilionCity_PokemonFanClub/map.json | 6 ++++-- data/maps/VictoryRoad_1F/map.json | 6 ++++-- data/maps/VictoryRoad_2F/map.json | 6 ++++-- data/maps/VictoryRoad_3F/map.json | 6 ++++-- data/maps/ViridianCity/map.json | 6 ++++-- data/maps/ViridianCity_Gym/map.json | 6 ++++-- data/maps/ViridianCity_House1/map.json | 6 ++++-- data/maps/ViridianCity_House2/map.json | 6 ++++-- data/maps/ViridianCity_Mart/map.json | 6 ++++-- data/maps/ViridianCity_PokemonCenter_1F/map.json | 6 ++++-- data/maps/ViridianCity_PokemonCenter_2F/map.json | 6 ++++-- data/maps/ViridianForest/map.json | 6 ++++-- 425 files changed, 1700 insertions(+), 850 deletions(-) (limited to 'data') diff --git a/data/maps/BattleColosseum_2P/map.json b/data/maps/BattleColosseum_2P/map.json index adcec66c1..b455a7799 100644 --- a/data/maps/BattleColosseum_2P/map.json +++ b/data/maps/BattleColosseum_2P/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_8", "connections": null, "object_events": [ diff --git a/data/maps/BattleColosseum_4P/map.json b/data/maps/BattleColosseum_4P/map.json index 84de8f7ec..34ddd8d58 100644 --- a/data/maps/BattleColosseum_4P/map.json +++ b/data/maps/BattleColosseum_4P/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_8", "connections": null, "object_events": [], diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index 95a19a2f7..427d71e79 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_3", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index fbfe2548b..8370d0264 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index 67f10b4f2..f3b316694 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json index 8a78e1d5a..1fbea392b 100644 --- a/data/maps/CeladonCity_Condominiums_1F/map.json +++ b/data/maps/CeladonCity_Condominiums_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json index 3ae42d4bb..eb8df96d2 100644 --- a/data/maps/CeladonCity_Condominiums_2F/map.json +++ b/data/maps/CeladonCity_Condominiums_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json index 17cc2945f..b78a2117f 100644 --- a/data/maps/CeladonCity_Condominiums_3F/map.json +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeladonCity_Condominiums_Roof/map.json b/data/maps/CeladonCity_Condominiums_Roof/map.json index 40fad3fbf..080f59ed4 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/map.json +++ b/data/maps/CeladonCity_Condominiums_Roof/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index 59d5bf8e3..fd4f99898 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json index 57f62042e..f619c66dd 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 4, - "elevator_flag": 1, + "allow_escaping": false, + "allow_running": false, + "show_map_name": true, + "floor_number": 1, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json index 8e02d7bc2..3de080f17 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 4, - "elevator_flag": 2, + "allow_escaping": false, + "allow_running": false, + "show_map_name": true, + "floor_number": 2, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json index 5504b6317..47d39bf09 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 4, - "elevator_flag": 3, + "allow_escaping": false, + "allow_running": false, + "show_map_name": true, + "floor_number": 3, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json index a054356ef..671d5b450 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 4, - "elevator_flag": 4, + "allow_escaping": false, + "allow_running": false, + "show_map_name": true, + "floor_number": 4, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json index f1b4a7a05..3390b6818 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 4, - "elevator_flag": 5, + "allow_escaping": false, + "allow_running": false, + "show_map_name": true, + "floor_number": 5, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json index fb8385d87..7da40ec98 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json index fabde43d9..ecadef2cc 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 4, - "elevator_flag": 127, + "allow_escaping": false, + "allow_running": false, + "show_map_name": true, + "floor_number": 127, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json index b0501fadf..01b5b7422 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json index 16416e6ab..606306978 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json index 3d231b278..0007c4847 100644 --- a/data/maps/CeladonCity_Gym/map.json +++ b/data/maps/CeladonCity_Gym/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_1", "connections": null, "object_events": [ diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json index c63c83406..ac08487df 100644 --- a/data/maps/CeladonCity_Hotel/map.json +++ b/data/maps/CeladonCity_Hotel/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json index 56fe430a9..48e444cdb 100644 --- a/data/maps/CeladonCity_House1/map.json +++ b/data/maps/CeladonCity_House1/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json index 98b528adb..225667b40 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json index 119861d83..7daf9fb09 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json index 2bc8aa976..50603778c 100644 --- a/data/maps/CeladonCity_Restaurant/map.json +++ b/data/maps/CeladonCity_Restaurant/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json index da6a808f9..af27c9466 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json index 641aaf25c..7c3881be1 100644 --- a/data/maps/CeruleanCave_2F/map.json +++ b/data/maps/CeruleanCave_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json index c96198ec1..8838be07b 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index 993848de8..0e6d47f3a 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/CeruleanCity_BikeShop/map.json b/data/maps/CeruleanCity_BikeShop/map.json index 39e0302c1..f280880cc 100644 --- a/data/maps/CeruleanCity_BikeShop/map.json +++ b/data/maps/CeruleanCity_BikeShop/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeruleanCity_Gym/map.json b/data/maps/CeruleanCity_Gym/map.json index a777d32ce..1c4ad61a3 100644 --- a/data/maps/CeruleanCity_Gym/map.json +++ b/data/maps/CeruleanCity_Gym/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_1", "connections": null, "object_events": [ diff --git a/data/maps/CeruleanCity_House1/map.json b/data/maps/CeruleanCity_House1/map.json index b7c8786dd..1f67451f0 100644 --- a/data/maps/CeruleanCity_House1/map.json +++ b/data/maps/CeruleanCity_House1/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeruleanCity_House2/map.json b/data/maps/CeruleanCity_House2/map.json index cfd9f5326..d2a4fb8a3 100644 --- a/data/maps/CeruleanCity_House2/map.json +++ b/data/maps/CeruleanCity_House2/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeruleanCity_House3/map.json b/data/maps/CeruleanCity_House3/map.json index 08922ed56..1eb28225c 100644 --- a/data/maps/CeruleanCity_House3/map.json +++ b/data/maps/CeruleanCity_House3/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeruleanCity_House4/map.json b/data/maps/CeruleanCity_House4/map.json index a8d776090..28de36729 100644 --- a/data/maps/CeruleanCity_House4/map.json +++ b/data/maps/CeruleanCity_House4/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeruleanCity_House5/map.json b/data/maps/CeruleanCity_House5/map.json index bb7cc575c..6b50087a7 100644 --- a/data/maps/CeruleanCity_House5/map.json +++ b/data/maps/CeruleanCity_House5/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeruleanCity_Mart/map.json b/data/maps/CeruleanCity_Mart/map.json index e1470e33d..bfa3baa0e 100644 --- a/data/maps/CeruleanCity_Mart/map.json +++ b/data/maps/CeruleanCity_Mart/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json index 4242b21cc..7a4947b16 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json index 0b08a9deb..b3e088f33 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index cb55b8bd9..3b784648a 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json index 51e5fbbc4..4dd966550 100644 --- a/data/maps/CinnabarIsland_Gym/map.json +++ b/data/maps/CinnabarIsland_Gym/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_1", "connections": null, "object_events": [ diff --git a/data/maps/CinnabarIsland_Mart/map.json b/data/maps/CinnabarIsland_Mart/map.json index 10bd39a94..590d50409 100644 --- a/data/maps/CinnabarIsland_Mart/map.json +++ b/data/maps/CinnabarIsland_Mart/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json index 2a6c363c2..472e9e0c5 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json index 3e4c10119..ae1dc7b64 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json index f006806be..85954ed9a 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json index 153e8fa60..9b9cb49db 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json index af945ec08..43a233c11 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json index 89e27ffa5..097039140 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/DiglettsCave_B1F/map.json b/data/maps/DiglettsCave_B1F/map.json index 9a434881b..abb8e4d0e 100644 --- a/data/maps/DiglettsCave_B1F/map.json +++ b/data/maps/DiglettsCave_B1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/DiglettsCave_NorthEntrance/map.json b/data/maps/DiglettsCave_NorthEntrance/map.json index 2b75524eb..a30676d5b 100644 --- a/data/maps/DiglettsCave_NorthEntrance/map.json +++ b/data/maps/DiglettsCave_NorthEntrance/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/DiglettsCave_SouthEntrance/map.json b/data/maps/DiglettsCave_SouthEntrance/map.json index 6c184aaae..a78a6f951 100644 --- a/data/maps/DiglettsCave_SouthEntrance/map.json +++ b/data/maps/DiglettsCave_SouthEntrance/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index 0327c2ca5..7f4c53c1f 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/FiveIsland_Harbor/map.json b/data/maps/FiveIsland_Harbor/map.json index 6c355ea01..6d3444755 100644 --- a/data/maps/FiveIsland_Harbor/map.json +++ b/data/maps/FiveIsland_Harbor/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FiveIsland_House1/map.json b/data/maps/FiveIsland_House1/map.json index 1ceffe634..82fc173f3 100644 --- a/data/maps/FiveIsland_House1/map.json +++ b/data/maps/FiveIsland_House1/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FiveIsland_House2/map.json b/data/maps/FiveIsland_House2/map.json index d6583a95a..97342c187 100644 --- a/data/maps/FiveIsland_House2/map.json +++ b/data/maps/FiveIsland_House2/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FiveIsland_LostCave_Entrance/map.json b/data/maps/FiveIsland_LostCave_Entrance/map.json index ddf31269e..69e844f7c 100644 --- a/data/maps/FiveIsland_LostCave_Entrance/map.json +++ b/data/maps/FiveIsland_LostCave_Entrance/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/FiveIsland_LostCave_Room1/map.json b/data/maps/FiveIsland_LostCave_Room1/map.json index f5b5b5028..3d68d5f6d 100644 --- a/data/maps/FiveIsland_LostCave_Room1/map.json +++ b/data/maps/FiveIsland_LostCave_Room1/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json index c18eb1575..fc14e997b 100644 --- a/data/maps/FiveIsland_LostCave_Room10/map.json +++ b/data/maps/FiveIsland_LostCave_Room10/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json index 61a8d299a..be166f1c6 100644 --- a/data/maps/FiveIsland_LostCave_Room11/map.json +++ b/data/maps/FiveIsland_LostCave_Room11/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json index c78893f97..90367bcb0 100644 --- a/data/maps/FiveIsland_LostCave_Room12/map.json +++ b/data/maps/FiveIsland_LostCave_Room12/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json index 535e93c60..a0200e532 100644 --- a/data/maps/FiveIsland_LostCave_Room13/map.json +++ b/data/maps/FiveIsland_LostCave_Room13/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json index b0687536b..0c4d6edb7 100644 --- a/data/maps/FiveIsland_LostCave_Room14/map.json +++ b/data/maps/FiveIsland_LostCave_Room14/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FiveIsland_LostCave_Room2/map.json b/data/maps/FiveIsland_LostCave_Room2/map.json index 63162da4c..2f4bef72e 100644 --- a/data/maps/FiveIsland_LostCave_Room2/map.json +++ b/data/maps/FiveIsland_LostCave_Room2/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/FiveIsland_LostCave_Room3/map.json b/data/maps/FiveIsland_LostCave_Room3/map.json index 1baaf3265..bb571ceb6 100644 --- a/data/maps/FiveIsland_LostCave_Room3/map.json +++ b/data/maps/FiveIsland_LostCave_Room3/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/FiveIsland_LostCave_Room4/map.json b/data/maps/FiveIsland_LostCave_Room4/map.json index 4b92aecee..3740070aa 100644 --- a/data/maps/FiveIsland_LostCave_Room4/map.json +++ b/data/maps/FiveIsland_LostCave_Room4/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FiveIsland_LostCave_Room5/map.json b/data/maps/FiveIsland_LostCave_Room5/map.json index 7c0c93143..40ee7ecdd 100644 --- a/data/maps/FiveIsland_LostCave_Room5/map.json +++ b/data/maps/FiveIsland_LostCave_Room5/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/FiveIsland_LostCave_Room6/map.json b/data/maps/FiveIsland_LostCave_Room6/map.json index bc77539d0..d9742e151 100644 --- a/data/maps/FiveIsland_LostCave_Room6/map.json +++ b/data/maps/FiveIsland_LostCave_Room6/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/FiveIsland_LostCave_Room7/map.json b/data/maps/FiveIsland_LostCave_Room7/map.json index eff927cac..f28f2c022 100644 --- a/data/maps/FiveIsland_LostCave_Room7/map.json +++ b/data/maps/FiveIsland_LostCave_Room7/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/FiveIsland_LostCave_Room8/map.json b/data/maps/FiveIsland_LostCave_Room8/map.json index 68b753ad7..836ec128a 100644 --- a/data/maps/FiveIsland_LostCave_Room8/map.json +++ b/data/maps/FiveIsland_LostCave_Room8/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/FiveIsland_LostCave_Room9/map.json b/data/maps/FiveIsland_LostCave_Room9/map.json index 4235dd244..3624b9a74 100644 --- a/data/maps/FiveIsland_LostCave_Room9/map.json +++ b/data/maps/FiveIsland_LostCave_Room9/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index 14f56ca59..d757c2961 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json index 02989723d..d53bbb174 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json index ca55ee03b..baea9f6b7 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json index 079d0d4eb..257e2ced0 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json index 371cfecd6..e408f0916 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json index 0063d721f..5ab4ff749 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index de0e8ba9b..ee97d08a9 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 5, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": false, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_3", "connections": null, "object_events": [ diff --git a/data/maps/FiveIsland_WaterLabyrinth/map.json b/data/maps/FiveIsland_WaterLabyrinth/map.json index f4106828b..2e0aa3389 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/map.json +++ b/data/maps/FiveIsland_WaterLabyrinth/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index 1875aa79e..304aec2ec 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json index e9ccc8c22..c7639dba4 100644 --- a/data/maps/FourIsland_Harbor/map.json +++ b/data/maps/FourIsland_Harbor/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json index 7e4ff600e..ddd2526d6 100644 --- a/data/maps/FourIsland_House1/map.json +++ b/data/maps/FourIsland_House1/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json index 205f42823..966ed42cc 100644 --- a/data/maps/FourIsland_House2/map.json +++ b/data/maps/FourIsland_House2/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json index efbb07579..f74cf52f7 100644 --- a/data/maps/FourIsland_IcefallCave_1F/map.json +++ b/data/maps/FourIsland_IcefallCave_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json index 533b8e8a5..7f5b9d9bc 100644 --- a/data/maps/FourIsland_IcefallCave_B1F/map.json +++ b/data/maps/FourIsland_IcefallCave_B1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json index e2b01a555..5abbcad40 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FourIsland_IcefallCave_Entrance/map.json b/data/maps/FourIsland_IcefallCave_Entrance/map.json index df469714f..73ccda724 100644 --- a/data/maps/FourIsland_IcefallCave_Entrance/map.json +++ b/data/maps/FourIsland_IcefallCave_Entrance/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json index 53f06909c..ad3d1506e 100644 --- a/data/maps/FourIsland_LoreleisHouse/map.json +++ b/data/maps/FourIsland_LoreleisHouse/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json index 986506f99..dceda6844 100644 --- a/data/maps/FourIsland_Mart/map.json +++ b/data/maps/FourIsland_Mart/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json index 24a35ae99..14e23287a 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/map.json +++ b/data/maps/FourIsland_PokemonCenter_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json index 0e5c61f94..d42af0c96 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/map.json +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FourIsland_PokemonDayCare/map.json b/data/maps/FourIsland_PokemonDayCare/map.json index cb92d329c..32106a6f8 100644 --- a/data/maps/FourIsland_PokemonDayCare/map.json +++ b/data/maps/FourIsland_PokemonDayCare/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index 3ff6b705c..435aa27ce 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/FuchsiaCity_Gym/map.json b/data/maps/FuchsiaCity_Gym/map.json index 077b3860b..24b366dc3 100644 --- a/data/maps/FuchsiaCity_Gym/map.json +++ b/data/maps/FuchsiaCity_Gym/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_1", "connections": null, "object_events": [ diff --git a/data/maps/FuchsiaCity_House1/map.json b/data/maps/FuchsiaCity_House1/map.json index 5e6c48b20..b2f6b3821 100644 --- a/data/maps/FuchsiaCity_House1/map.json +++ b/data/maps/FuchsiaCity_House1/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FuchsiaCity_House2/map.json b/data/maps/FuchsiaCity_House2/map.json index 8fdbf0b32..5cade9de3 100644 --- a/data/maps/FuchsiaCity_House2/map.json +++ b/data/maps/FuchsiaCity_House2/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FuchsiaCity_House3/map.json b/data/maps/FuchsiaCity_House3/map.json index 7ca79a72d..5232ad52c 100644 --- a/data/maps/FuchsiaCity_House3/map.json +++ b/data/maps/FuchsiaCity_House3/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FuchsiaCity_Mart/map.json b/data/maps/FuchsiaCity_Mart/map.json index 8d2e938ff..0f8ad923c 100644 --- a/data/maps/FuchsiaCity_Mart/map.json +++ b/data/maps/FuchsiaCity_Mart/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json index 1dd687ee8..669197f62 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json index 1b0910dfd..03f2ffdc9 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json index 9368f3f68..81bbbe0de 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FuchsiaCity_SafariZone_Office/map.json b/data/maps/FuchsiaCity_SafariZone_Office/map.json index 4211a93f3..a6b87f83f 100644 --- a/data/maps/FuchsiaCity_SafariZone_Office/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Office/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/FuchsiaCity_WardensHouse/map.json b/data/maps/FuchsiaCity_WardensHouse/map.json index 1212d2935..5d7a336a3 100644 --- a/data/maps/FuchsiaCity_WardensHouse/map.json +++ b/data/maps/FuchsiaCity_WardensHouse/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json index fc22dbf43..b04bf44f8 100644 --- a/data/maps/IndigoPlateau_Exterior/map.json +++ b/data/maps/IndigoPlateau_Exterior/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json index 8e7134c33..b80e849dc 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_1", "connections": null, "object_events": [ diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json index 3ca74426e..c921f749a 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_1", "connections": null, "object_events": [ diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json index e24563114..5487e46a6 100644 --- a/data/maps/LavenderTown/map.json +++ b/data/maps/LavenderTown/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/LavenderTown_House1/map.json b/data/maps/LavenderTown_House1/map.json index 43b012f64..8d08e5c62 100644 --- a/data/maps/LavenderTown_House1/map.json +++ b/data/maps/LavenderTown_House1/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/LavenderTown_House2/map.json b/data/maps/LavenderTown_House2/map.json index 372e38373..5dd921222 100644 --- a/data/maps/LavenderTown_House2/map.json +++ b/data/maps/LavenderTown_House2/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/LavenderTown_Mart/map.json b/data/maps/LavenderTown_Mart/map.json index 399be32c0..2f3d07c1f 100644 --- a/data/maps/LavenderTown_Mart/map.json +++ b/data/maps/LavenderTown_Mart/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json index f608b2fb7..93709d792 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json index 6be792434..e7f72076f 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json index b1ddd2af6..6c609ded5 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index 9b8327133..897bee57b 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json index a4411c555..9e7dd93d0 100644 --- a/data/maps/MtEmber_RubyPath_1F/map.json +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json index 7b13396e0..083ccb2cb 100644 --- a/data/maps/MtEmber_RubyPath_B1F/map.json +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json index 67c6fa69d..a7ad6ecd7 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json index 5b9a5bbf9..5f8c95c07 100644 --- a/data/maps/MtEmber_RubyPath_B2F/map.json +++ b/data/maps/MtEmber_RubyPath_B2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json index fa11dd264..f09272f7a 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index 5ea2b3e90..47c4ce93c 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/MtEmber_RubyPath_B4F/map.json b/data/maps/MtEmber_RubyPath_B4F/map.json index 1864a201a..0c25880d9 100644 --- a/data/maps/MtEmber_RubyPath_B4F/map.json +++ b/data/maps/MtEmber_RubyPath_B4F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json index 501a87f37..e29b372b7 100644 --- a/data/maps/MtEmber_RubyPath_B5F/map.json +++ b/data/maps/MtEmber_RubyPath_B5F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json index 9439fb3cd..ab7db2ca2 100644 --- a/data/maps/MtEmber_Summit/map.json +++ b/data/maps/MtEmber_Summit/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/MtEmber_SummitPath_1F/map.json b/data/maps/MtEmber_SummitPath_1F/map.json index 0c53d8f63..0beb133b9 100644 --- a/data/maps/MtEmber_SummitPath_1F/map.json +++ b/data/maps/MtEmber_SummitPath_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json index ab06ed4f3..e6da5a57d 100644 --- a/data/maps/MtEmber_SummitPath_2F/map.json +++ b/data/maps/MtEmber_SummitPath_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/MtEmber_SummitPath_3F/map.json b/data/maps/MtEmber_SummitPath_3F/map.json index 7184d63b1..c16b28dbf 100644 --- a/data/maps/MtEmber_SummitPath_3F/map.json +++ b/data/maps/MtEmber_SummitPath_3F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json index b0a56c850..85f7fbb78 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/MtMoon_B1F/map.json b/data/maps/MtMoon_B1F/map.json index ca4648bbd..f83691f36 100644 --- a/data/maps/MtMoon_B1F/map.json +++ b/data/maps/MtMoon_B1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index f50e16428..04f9e3ba7 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/NavelRock_1F/map.json b/data/maps/NavelRock_1F/map.json index f13cd661c..a6dfadacf 100644 --- a/data/maps/NavelRock_1F/map.json +++ b/data/maps/NavelRock_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/NavelRock_B1F/map.json b/data/maps/NavelRock_B1F/map.json index a01383181..ea5fe3e91 100644 --- a/data/maps/NavelRock_B1F/map.json +++ b/data/maps/NavelRock_B1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json index b3b526a0b..9fdc7d85c 100644 --- a/data/maps/NavelRock_Base/map.json +++ b/data/maps/NavelRock_Base/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/NavelRock_BasePath_B10F/map.json b/data/maps/NavelRock_BasePath_B10F/map.json index e2c61a20b..878c75c14 100644 --- a/data/maps/NavelRock_BasePath_B10F/map.json +++ b/data/maps/NavelRock_BasePath_B10F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/NavelRock_BasePath_B11F/map.json b/data/maps/NavelRock_BasePath_B11F/map.json index 0c420b236..523512c66 100644 --- a/data/maps/NavelRock_BasePath_B11F/map.json +++ b/data/maps/NavelRock_BasePath_B11F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/NavelRock_BasePath_B1F/map.json b/data/maps/NavelRock_BasePath_B1F/map.json index 8a1d3692d..5d3300afd 100644 --- a/data/maps/NavelRock_BasePath_B1F/map.json +++ b/data/maps/NavelRock_BasePath_B1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/NavelRock_BasePath_B2F/map.json b/data/maps/NavelRock_BasePath_B2F/map.json index 1e5fe8c2b..170ba3f54 100644 --- a/data/maps/NavelRock_BasePath_B2F/map.json +++ b/data/maps/NavelRock_BasePath_B2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/NavelRock_BasePath_B3F/map.json b/data/maps/NavelRock_BasePath_B3F/map.json index 4d8f50ab1..a63972f29 100644 --- a/data/maps/NavelRock_BasePath_B3F/map.json +++ b/data/maps/NavelRock_BasePath_B3F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/NavelRock_BasePath_B4F/map.json b/data/maps/NavelRock_BasePath_B4F/map.json index c14e26d78..8d8154d98 100644 --- a/data/maps/NavelRock_BasePath_B4F/map.json +++ b/data/maps/NavelRock_BasePath_B4F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/NavelRock_BasePath_B5F/map.json b/data/maps/NavelRock_BasePath_B5F/map.json index aea31b4ef..2b1ecc69c 100644 --- a/data/maps/NavelRock_BasePath_B5F/map.json +++ b/data/maps/NavelRock_BasePath_B5F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/NavelRock_BasePath_B6F/map.json b/data/maps/NavelRock_BasePath_B6F/map.json index 4d85778b0..a8c91baac 100644 --- a/data/maps/NavelRock_BasePath_B6F/map.json +++ b/data/maps/NavelRock_BasePath_B6F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/NavelRock_BasePath_B7F/map.json b/data/maps/NavelRock_BasePath_B7F/map.json index c496ed099..92cc0db51 100644 --- a/data/maps/NavelRock_BasePath_B7F/map.json +++ b/data/maps/NavelRock_BasePath_B7F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/NavelRock_BasePath_B8F/map.json b/data/maps/NavelRock_BasePath_B8F/map.json index d15be2605..2e7411dc1 100644 --- a/data/maps/NavelRock_BasePath_B8F/map.json +++ b/data/maps/NavelRock_BasePath_B8F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/NavelRock_BasePath_B9F/map.json b/data/maps/NavelRock_BasePath_B9F/map.json index a9cfc8597..509fa31a8 100644 --- a/data/maps/NavelRock_BasePath_B9F/map.json +++ b/data/maps/NavelRock_BasePath_B9F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/NavelRock_Exterior/map.json b/data/maps/NavelRock_Exterior/map.json index ba3178fc1..e289a9c2d 100644 --- a/data/maps/NavelRock_Exterior/map.json +++ b/data/maps/NavelRock_Exterior/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/NavelRock_Fork/map.json b/data/maps/NavelRock_Fork/map.json index 22a252bc1..8debab71d 100644 --- a/data/maps/NavelRock_Fork/map.json +++ b/data/maps/NavelRock_Fork/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index 43f6c3f2b..8977a044e 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index c4c4fb39e..f0c8f6e96 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_4", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/NavelRock_SummitPath_2F/map.json b/data/maps/NavelRock_SummitPath_2F/map.json index df824534d..aaa04a93b 100644 --- a/data/maps/NavelRock_SummitPath_2F/map.json +++ b/data/maps/NavelRock_SummitPath_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/NavelRock_SummitPath_3F/map.json b/data/maps/NavelRock_SummitPath_3F/map.json index aca6996c2..82ac96c65 100644 --- a/data/maps/NavelRock_SummitPath_3F/map.json +++ b/data/maps/NavelRock_SummitPath_3F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/NavelRock_SummitPath_4F/map.json b/data/maps/NavelRock_SummitPath_4F/map.json index 4bb155d87..c6de6d430 100644 --- a/data/maps/NavelRock_SummitPath_4F/map.json +++ b/data/maps/NavelRock_SummitPath_4F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/NavelRock_SummitPath_5F/map.json b/data/maps/NavelRock_SummitPath_5F/map.json index 756a4658f..b4ddeeb85 100644 --- a/data/maps/NavelRock_SummitPath_5F/map.json +++ b/data/maps/NavelRock_SummitPath_5F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json index 25022cc73..e734062aa 100644 --- a/data/maps/OneIsland/map.json +++ b/data/maps/OneIsland/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/OneIsland_Harbor/map.json b/data/maps/OneIsland_Harbor/map.json index 346cf5452..f426bcddb 100644 --- a/data/maps/OneIsland_Harbor/map.json +++ b/data/maps/OneIsland_Harbor/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/OneIsland_House1/map.json b/data/maps/OneIsland_House1/map.json index 777edb35c..21a84244c 100644 --- a/data/maps/OneIsland_House1/map.json +++ b/data/maps/OneIsland_House1/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/OneIsland_House2/map.json b/data/maps/OneIsland_House2/map.json index f8a528fde..6c7622320 100644 --- a/data/maps/OneIsland_House2/map.json +++ b/data/maps/OneIsland_House2/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index f3233ed5e..6c5261d87 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json index f61b29e65..56330cc18 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index 2a6b93716..6844a64f7 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json index 2b44019a3..34076f9c7 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/map.json +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/OneIsland_TreasureBeach/map.json b/data/maps/OneIsland_TreasureBeach/map.json index 8e2167fa5..b8bb2753d 100644 --- a/data/maps/OneIsland_TreasureBeach/map.json +++ b/data/maps/OneIsland_TreasureBeach/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 4f55c1987..ebb3452ed 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json index 1b8fd9de7..70912d327 100644 --- a/data/maps/PalletTown_GarysHouse/map.json +++ b/data/maps/PalletTown_GarysHouse/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json index 838162cf8..2bf43f757 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/map.json +++ b/data/maps/PalletTown_PlayersHouse_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/PalletTown_PlayersHouse_2F/map.json b/data/maps/PalletTown_PlayersHouse_2F/map.json index 849e90288..913e5edbb 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/map.json +++ b/data/maps/PalletTown_PlayersHouse_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index 1b2a393ef..2740a0b4a 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index d891a999a..5a2876338 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/PewterCity_Gym/map.json b/data/maps/PewterCity_Gym/map.json index 434dd6fae..7bf1745d3 100644 --- a/data/maps/PewterCity_Gym/map.json +++ b/data/maps/PewterCity_Gym/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_1", "connections": null, "object_events": [ diff --git a/data/maps/PewterCity_House1/map.json b/data/maps/PewterCity_House1/map.json index 941cd1879..6018bd0de 100644 --- a/data/maps/PewterCity_House1/map.json +++ b/data/maps/PewterCity_House1/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/PewterCity_House2/map.json b/data/maps/PewterCity_House2/map.json index d57e03fa5..4f94f6112 100644 --- a/data/maps/PewterCity_House2/map.json +++ b/data/maps/PewterCity_House2/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/PewterCity_Mart/map.json b/data/maps/PewterCity_Mart/map.json index 9e96b21bc..97d42e276 100644 --- a/data/maps/PewterCity_Mart/map.json +++ b/data/maps/PewterCity_Mart/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index 876d8f229..951aab31e 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/PewterCity_Museum_2F/map.json b/data/maps/PewterCity_Museum_2F/map.json index 808d337a5..540c5507c 100644 --- a/data/maps/PewterCity_Museum_2F/map.json +++ b/data/maps/PewterCity_Museum_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json index a4c2a2a29..70b06a013 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/map.json +++ b/data/maps/PewterCity_PokemonCenter_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json index e564c04e7..db2170831 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/map.json +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/PokemonLeague_AgathasRoom/map.json b/data/maps/PokemonLeague_AgathasRoom/map.json index 595768421..4ad8d6f26 100644 --- a/data/maps/PokemonLeague_AgathasRoom/map.json +++ b/data/maps/PokemonLeague_AgathasRoom/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_6", "connections": null, "object_events": [ diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json index 86ce41e57..2f96b33d3 100644 --- a/data/maps/PokemonLeague_BrunosRoom/map.json +++ b/data/maps/PokemonLeague_BrunosRoom/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_5", "connections": null, "object_events": [ diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json index 0889fb01a..944b3570a 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/map.json +++ b/data/maps/PokemonLeague_ChampionsRoom/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/PokemonLeague_HallOfFame/map.json b/data/maps/PokemonLeague_HallOfFame/map.json index d8b1dac30..0fc1e3d99 100644 --- a/data/maps/PokemonLeague_HallOfFame/map.json +++ b/data/maps/PokemonLeague_HallOfFame/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json index 61602e94a..9629713b3 100644 --- a/data/maps/PokemonLeague_LancesRoom/map.json +++ b/data/maps/PokemonLeague_LancesRoom/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_7", "connections": null, "object_events": [ diff --git a/data/maps/PokemonLeague_LoreleisRoom/map.json b/data/maps/PokemonLeague_LoreleisRoom/map.json index b1382d651..462583db1 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/map.json +++ b/data/maps/PokemonLeague_LoreleisRoom/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_4", "connections": null, "object_events": [ diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json index a7a9b76d0..ddb5037b1 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_3", "connections": null, "object_events": [ diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json index c323ddef7..b95531ca0 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_3", "connections": null, "object_events": [ diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index f665ed79c..ce8a30fa6 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_3", "connections": null, "object_events": [ diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index a6769834e..dd9a03404 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_3", "connections": null, "object_events": [ diff --git a/data/maps/PokemonTower_1F/map.json b/data/maps/PokemonTower_1F/map.json index 001875787..5b062c2e3 100644 --- a/data/maps/PokemonTower_1F/map.json +++ b/data/maps/PokemonTower_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 5, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": false, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_2", "connections": null, "object_events": [ diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json index e85c53ade..927497f78 100644 --- a/data/maps/PokemonTower_2F/map.json +++ b/data/maps/PokemonTower_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 5, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": false, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_2", "connections": null, "object_events": [ diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json index 4266b573b..738c33892 100644 --- a/data/maps/PokemonTower_3F/map.json +++ b/data/maps/PokemonTower_3F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 5, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": false, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_2", "connections": null, "object_events": [ diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json index 25824c1c0..45fd8df10 100644 --- a/data/maps/PokemonTower_4F/map.json +++ b/data/maps/PokemonTower_4F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 5, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": false, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_2", "connections": null, "object_events": [ diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json index a21cd2ea5..1d3fb711e 100644 --- a/data/maps/PokemonTower_5F/map.json +++ b/data/maps/PokemonTower_5F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 5, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": false, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_2", "connections": null, "object_events": [ diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json index 914d968d0..ec7a085a1 100644 --- a/data/maps/PokemonTower_6F/map.json +++ b/data/maps/PokemonTower_6F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 5, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": false, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_2", "connections": null, "object_events": [ diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json index fa4bed291..33a616f96 100644 --- a/data/maps/PokemonTower_7F/map.json +++ b/data/maps/PokemonTower_7F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 5, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": false, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_2", "connections": null, "object_events": [ diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json index bc5535da9..8deaf33ff 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_3", "connections": null, "object_events": [ diff --git a/data/maps/Prototype_SeviiIsle_6/map.json b/data/maps/Prototype_SeviiIsle_6/map.json index 03d466322..a2679346e 100644 --- a/data/maps/Prototype_SeviiIsle_6/map.json +++ b/data/maps/Prototype_SeviiIsle_6/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/Prototype_SeviiIsle_7/map.json b/data/maps/Prototype_SeviiIsle_7/map.json index ce498d3da..8a9e59a11 100644 --- a/data/maps/Prototype_SeviiIsle_7/map.json +++ b/data/maps/Prototype_SeviiIsle_7/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/Prototype_SeviiIsle_8/map.json b/data/maps/Prototype_SeviiIsle_8/map.json index f2233b694..0c19f8b14 100644 --- a/data/maps/Prototype_SeviiIsle_8/map.json +++ b/data/maps/Prototype_SeviiIsle_8/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/Prototype_SeviiIsle_9/map.json b/data/maps/Prototype_SeviiIsle_9/map.json index f816f272e..1c24e70f2 100644 --- a/data/maps/Prototype_SeviiIsle_9/map.json +++ b/data/maps/Prototype_SeviiIsle_9/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/RecordCenter/map.json b/data/maps/RecordCenter/map.json index eb47a008e..974b56f41 100644 --- a/data/maps/RecordCenter/map.json +++ b/data/maps/RecordCenter/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index d45c91ee7..af58ddebf 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index e057755af..99106f92c 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json index d917c02be..8e0c1406f 100644 --- a/data/maps/RocketHideout_B1F/map.json +++ b/data/maps/RocketHideout_B1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 7, - "elevator_flag": -1, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": -1, "battle_scene": "BATTLE_SCENE_3", "connections": null, "object_events": [ diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json index f40413ddb..1855f54f9 100644 --- a/data/maps/RocketHideout_B2F/map.json +++ b/data/maps/RocketHideout_B2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 7, - "elevator_flag": -2, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": -2, "battle_scene": "BATTLE_SCENE_3", "connections": null, "object_events": [ diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json index f66f30516..9ade4ac35 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 7, - "elevator_flag": -3, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": -3, "battle_scene": "BATTLE_SCENE_3", "connections": null, "object_events": [ diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index 7c7ff1550..3e4f05f9c 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 7, - "elevator_flag": -4, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": -4, "battle_scene": "BATTLE_SCENE_3", "connections": null, "object_events": [ diff --git a/data/maps/RocketHideout_Elevator/map.json b/data/maps/RocketHideout_Elevator/map.json index b66e1f8da..45a57249d 100644 --- a/data/maps/RocketHideout_Elevator/map.json +++ b/data/maps/RocketHideout_Elevator/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_3", "connections": null, "object_events": [], diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json index 58b0776eb..9b6547be6 100644 --- a/data/maps/Route1/map.json +++ b/data/maps/Route1/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index b24d13635..1c49d6240 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json index 61430e9d4..a9baaa56d 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json index 244f09b94..93dafeade 100644 --- a/data/maps/Route10_PokemonCenter_2F/map.json +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json index a7c9afcb0..b3720463a 100644 --- a/data/maps/Route11/map.json +++ b/data/maps/Route11/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/Route11_EastEntrance_1F/map.json b/data/maps/Route11_EastEntrance_1F/map.json index deba28c8e..0bf683d84 100644 --- a/data/maps/Route11_EastEntrance_1F/map.json +++ b/data/maps/Route11_EastEntrance_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": true, - "unknown_19": 2, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json index ab1a90f04..bd50c4d9e 100644 --- a/data/maps/Route11_EastEntrance_2F/map.json +++ b/data/maps/Route11_EastEntrance_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index d6ded1f0b..11790e23a 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json index 837ca1464..2e792d586 100644 --- a/data/maps/Route12_FishingHouse/map.json +++ b/data/maps/Route12_FishingHouse/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/Route12_NorthEntrance_1F/map.json b/data/maps/Route12_NorthEntrance_1F/map.json index 1f3c08f42..cb4996f5d 100644 --- a/data/maps/Route12_NorthEntrance_1F/map.json +++ b/data/maps/Route12_NorthEntrance_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": true, - "unknown_19": 2, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json index 45184c08b..379bb5db0 100644 --- a/data/maps/Route12_NorthEntrance_2F/map.json +++ b/data/maps/Route12_NorthEntrance_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index 41df03be8..52480bd5f 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index 329e5f20e..1e127e4bb 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index 4ce529c14..ad47154d5 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json index 77cb0557b..24d75ca24 100644 --- a/data/maps/Route15_WestEntrance_1F/map.json +++ b/data/maps/Route15_WestEntrance_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": true, - "unknown_19": 2, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json index cff31d40a..c1df344e2 100644 --- a/data/maps/Route15_WestEntrance_2F/map.json +++ b/data/maps/Route15_WestEntrance_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index be6e3c181..b6bb53b8f 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/Route16_House/map.json b/data/maps/Route16_House/map.json index 455267cc7..c22a6d47a 100644 --- a/data/maps/Route16_House/map.json +++ b/data/maps/Route16_House/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json index d42f91a23..25c134dd3 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": true, - "unknown_19": 2, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json index 1d2b21f51..f19dac4f4 100644 --- a/data/maps/Route16_NorthEntrance_2F/map.json +++ b/data/maps/Route16_NorthEntrance_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json index 3232a1b7a..4c9f1cb04 100644 --- a/data/maps/Route17/map.json +++ b/data/maps/Route17/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json index 293ebf308..d9bd47f15 100644 --- a/data/maps/Route18/map.json +++ b/data/maps/Route18/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json index 9a2ea52b2..6721a4be1 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": true, - "unknown_19": 2, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json index 963679ead..c341cd912 100644 --- a/data/maps/Route18_EastEntrance_2F/map.json +++ b/data/maps/Route18_EastEntrance_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json index 45d190daa..04cf3bbba 100644 --- a/data/maps/Route19/map.json +++ b/data/maps/Route19/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index 9f0cd3b5c..c32aed08e 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json index 266f8e822..872b24302 100644 --- a/data/maps/Route20/map.json +++ b/data/maps/Route20/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json index d5f6de8ea..0335c2f51 100644 --- a/data/maps/Route21_North/map.json +++ b/data/maps/Route21_North/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json index e4d5dcfab..e7af08d21 100644 --- a/data/maps/Route21_South/map.json +++ b/data/maps/Route21_South/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index 0afb0c0e4..298c43f2a 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/Route22_NorthEntrance/map.json b/data/maps/Route22_NorthEntrance/map.json index 9ef20a624..58cef00c2 100644 --- a/data/maps/Route22_NorthEntrance/map.json +++ b/data/maps/Route22_NorthEntrance/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json index e3c0a22dd..e61cf6357 100644 --- a/data/maps/Route23/map.json +++ b/data/maps/Route23/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index 0f05ef069..391b2b2c1 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index 6be0ef593..9e819f255 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json index 141ea6f9c..d5ae39619 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/Route2_EastBuilding/map.json b/data/maps/Route2_EastBuilding/map.json index c3d118d74..8d7f7a60c 100644 --- a/data/maps/Route2_EastBuilding/map.json +++ b/data/maps/Route2_EastBuilding/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": true, - "unknown_19": 2, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/Route2_House/map.json b/data/maps/Route2_House/map.json index 4d4662f1b..51202139e 100644 --- a/data/maps/Route2_House/map.json +++ b/data/maps/Route2_House/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/map.json b/data/maps/Route2_ViridianForest_NorthEntrance/map.json index 8a6bcd1e8..208b70876 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": true, - "unknown_19": 2, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/map.json b/data/maps/Route2_ViridianForest_SouthEntrance/map.json index 746c68a37..4b9d09d58 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": true, - "unknown_19": 2, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index 3c08fcd12..22f5835c4 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index b23845f01..4a2562932 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json index 42049d5f8..6667c65e6 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index c3cbdc9a0..6cb694eb1 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/Route5/map.json b/data/maps/Route5/map.json index acff38485..c33b3b0e2 100644 --- a/data/maps/Route5/map.json +++ b/data/maps/Route5/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/Route5_PokemonDayCare/map.json b/data/maps/Route5_PokemonDayCare/map.json index c0ff75da9..8d425132e 100644 --- a/data/maps/Route5_PokemonDayCare/map.json +++ b/data/maps/Route5_PokemonDayCare/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json index b189bb464..6a121c300 100644 --- a/data/maps/Route5_SouthEntrance/map.json +++ b/data/maps/Route5_SouthEntrance/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": true, - "unknown_19": 2, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index 885a1a8ea..994d86064 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json index d9679ab12..b5f0fa618 100644 --- a/data/maps/Route6_NorthEntrance/map.json +++ b/data/maps/Route6_NorthEntrance/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": true, - "unknown_19": 2, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index b21d91530..5c4d7a22f 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json index 98771cf96..153d408c0 100644 --- a/data/maps/Route7_EastEntrance/map.json +++ b/data/maps/Route7_EastEntrance/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": true, - "unknown_19": 2, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index 1a803e46f..3299bfab6 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json index a511ee8cd..0440e1eda 100644 --- a/data/maps/Route8_WestEntrance/map.json +++ b/data/maps/Route8_WestEntrance/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": true, - "unknown_19": 2, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index f35158171..296e10f4c 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/SSAnne_1F_Corridor/map.json b/data/maps/SSAnne_1F_Corridor/map.json index 699b0a342..10420902e 100644 --- a/data/maps/SSAnne_1F_Corridor/map.json +++ b/data/maps/SSAnne_1F_Corridor/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SSAnne_1F_Room1/map.json b/data/maps/SSAnne_1F_Room1/map.json index 8d0fe53cb..d9658a88e 100644 --- a/data/maps/SSAnne_1F_Room1/map.json +++ b/data/maps/SSAnne_1F_Room1/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json index 778414218..6fcb0ceef 100644 --- a/data/maps/SSAnne_1F_Room2/map.json +++ b/data/maps/SSAnne_1F_Room2/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SSAnne_1F_Room3/map.json b/data/maps/SSAnne_1F_Room3/map.json index 798ab2ff1..4642048b3 100644 --- a/data/maps/SSAnne_1F_Room3/map.json +++ b/data/maps/SSAnne_1F_Room3/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SSAnne_1F_Room4/map.json b/data/maps/SSAnne_1F_Room4/map.json index 63d6672fc..e77125c34 100644 --- a/data/maps/SSAnne_1F_Room4/map.json +++ b/data/maps/SSAnne_1F_Room4/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SSAnne_1F_Room5/map.json b/data/maps/SSAnne_1F_Room5/map.json index 2598b5724..590d8de8f 100644 --- a/data/maps/SSAnne_1F_Room5/map.json +++ b/data/maps/SSAnne_1F_Room5/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SSAnne_1F_Room6/map.json b/data/maps/SSAnne_1F_Room6/map.json index 04a5d9401..5bc9adb03 100644 --- a/data/maps/SSAnne_1F_Room6/map.json +++ b/data/maps/SSAnne_1F_Room6/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SSAnne_1F_Room7/map.json b/data/maps/SSAnne_1F_Room7/map.json index 3cd05e363..ee0ab8b1f 100644 --- a/data/maps/SSAnne_1F_Room7/map.json +++ b/data/maps/SSAnne_1F_Room7/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json index dabfe0c98..1e5dda37c 100644 --- a/data/maps/SSAnne_2F_Corridor/map.json +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SSAnne_2F_Room1/map.json b/data/maps/SSAnne_2F_Room1/map.json index f74886d4d..070d56bb3 100644 --- a/data/maps/SSAnne_2F_Room1/map.json +++ b/data/maps/SSAnne_2F_Room1/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json index 7c725b9f8..4f8ad260c 100644 --- a/data/maps/SSAnne_2F_Room2/map.json +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SSAnne_2F_Room3/map.json b/data/maps/SSAnne_2F_Room3/map.json index 0b2a20281..781065b46 100644 --- a/data/maps/SSAnne_2F_Room3/map.json +++ b/data/maps/SSAnne_2F_Room3/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json index 48a46a128..b085d84e2 100644 --- a/data/maps/SSAnne_2F_Room4/map.json +++ b/data/maps/SSAnne_2F_Room4/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SSAnne_2F_Room5/map.json b/data/maps/SSAnne_2F_Room5/map.json index e2f0638c5..ce08f94fa 100644 --- a/data/maps/SSAnne_2F_Room5/map.json +++ b/data/maps/SSAnne_2F_Room5/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SSAnne_2F_Room6/map.json b/data/maps/SSAnne_2F_Room6/map.json index e154b6ed9..9adc38ef4 100644 --- a/data/maps/SSAnne_2F_Room6/map.json +++ b/data/maps/SSAnne_2F_Room6/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SSAnne_3F_Corridor/map.json b/data/maps/SSAnne_3F_Corridor/map.json index 81a723d70..be49ce689 100644 --- a/data/maps/SSAnne_3F_Corridor/map.json +++ b/data/maps/SSAnne_3F_Corridor/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SSAnne_B1F_Corridor/map.json b/data/maps/SSAnne_B1F_Corridor/map.json index d8d7e16cc..5a536d185 100644 --- a/data/maps/SSAnne_B1F_Corridor/map.json +++ b/data/maps/SSAnne_B1F_Corridor/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/SSAnne_B1F_Room1/map.json b/data/maps/SSAnne_B1F_Room1/map.json index e32428db6..556fa324d 100644 --- a/data/maps/SSAnne_B1F_Room1/map.json +++ b/data/maps/SSAnne_B1F_Room1/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json index 834600362..af9c3af68 100644 --- a/data/maps/SSAnne_B1F_Room2/map.json +++ b/data/maps/SSAnne_B1F_Room2/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json index 13c4ccd6c..63d7e5b3c 100644 --- a/data/maps/SSAnne_B1F_Room3/map.json +++ b/data/maps/SSAnne_B1F_Room3/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SSAnne_B1F_Room4/map.json b/data/maps/SSAnne_B1F_Room4/map.json index a7511e37b..9a8ddec21 100644 --- a/data/maps/SSAnne_B1F_Room4/map.json +++ b/data/maps/SSAnne_B1F_Room4/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json index 0996d22df..035e29ceb 100644 --- a/data/maps/SSAnne_B1F_Room5/map.json +++ b/data/maps/SSAnne_B1F_Room5/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json index 32218c929..b56604054 100644 --- a/data/maps/SSAnne_CaptainsOffice/map.json +++ b/data/maps/SSAnne_CaptainsOffice/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SSAnne_Deck/map.json b/data/maps/SSAnne_Deck/map.json index 808dfcab4..6055a5da7 100644 --- a/data/maps/SSAnne_Deck/map.json +++ b/data/maps/SSAnne_Deck/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json index bdb13c3bf..5f7384d5f 100644 --- a/data/maps/SSAnne_Exterior/map.json +++ b/data/maps/SSAnne_Exterior/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index ddc950401..0d89a72ee 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json index 5e42b55ae..d14c2509d 100644 --- a/data/maps/SafariZone_Center/map.json +++ b/data/maps/SafariZone_Center/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SafariZone_Center_RestHouse/map.json b/data/maps/SafariZone_Center_RestHouse/map.json index 9e8545c9f..db3584eb8 100644 --- a/data/maps/SafariZone_Center_RestHouse/map.json +++ b/data/maps/SafariZone_Center_RestHouse/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json index be15f3d78..250d5baf5 100644 --- a/data/maps/SafariZone_East/map.json +++ b/data/maps/SafariZone_East/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SafariZone_East_RestHouse/map.json b/data/maps/SafariZone_East_RestHouse/map.json index ddf9f4ef1..61e33bbe7 100644 --- a/data/maps/SafariZone_East_RestHouse/map.json +++ b/data/maps/SafariZone_East_RestHouse/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index e3945eb61..eb1b47a60 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SafariZone_North_RestHouse/map.json b/data/maps/SafariZone_North_RestHouse/map.json index 99b62133e..d8a96baae 100644 --- a/data/maps/SafariZone_North_RestHouse/map.json +++ b/data/maps/SafariZone_North_RestHouse/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SafariZone_SecretHouse/map.json b/data/maps/SafariZone_SecretHouse/map.json index e4a417566..2cd3e44ed 100644 --- a/data/maps/SafariZone_SecretHouse/map.json +++ b/data/maps/SafariZone_SecretHouse/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json index 65c7e7570..4caefe6f3 100644 --- a/data/maps/SafariZone_West/map.json +++ b/data/maps/SafariZone_West/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SafariZone_West_RestHouse/map.json b/data/maps/SafariZone_West_RestHouse/map.json index d23cbbbdc..dd1a2b682 100644 --- a/data/maps/SafariZone_West_RestHouse/map.json +++ b/data/maps/SafariZone_West_RestHouse/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index 4b10013a1..baba42302 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/SaffronCity_Connection/map.json b/data/maps/SaffronCity_Connection/map.json index 0b381c3b6..410ddef6e 100644 --- a/data/maps/SaffronCity_Connection/map.json +++ b/data/maps/SaffronCity_Connection/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/map.json b/data/maps/SaffronCity_CopycatsHouse_1F/map.json index 91581a567..0a0075957 100644 --- a/data/maps/SaffronCity_CopycatsHouse_1F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/map.json b/data/maps/SaffronCity_CopycatsHouse_2F/map.json index b66be68a0..f4c37be81 100644 --- a/data/maps/SaffronCity_CopycatsHouse_2F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index 12aae037e..e4bebf06e 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json index d250f66db..a4f2f9c3e 100644 --- a/data/maps/SaffronCity_Gym/map.json +++ b/data/maps/SaffronCity_Gym/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 1, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_1", "connections": null, "object_events": [ diff --git a/data/maps/SaffronCity_House/map.json b/data/maps/SaffronCity_House/map.json index 0cfa013a9..c53825599 100644 --- a/data/maps/SaffronCity_House/map.json +++ b/data/maps/SaffronCity_House/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json index ad0321b41..7c4012ba0 100644 --- a/data/maps/SaffronCity_Mart/map.json +++ b/data/maps/SaffronCity_Mart/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SaffronCity_MrPsychicsHouse/map.json b/data/maps/SaffronCity_MrPsychicsHouse/map.json index ba2f7ca79..f32e7942c 100644 --- a/data/maps/SaffronCity_MrPsychicsHouse/map.json +++ b/data/maps/SaffronCity_MrPsychicsHouse/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json index 76cc74a9d..61abbdbf5 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json index db1049c84..c44c6a11c 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index a631d4f6e..65ce3b01c 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json index fe7a1eb5e..4311b6a02 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json index 4ef4f7cd8..60241ed55 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json index dbb98e8d9..3ac153ccf 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json index 60cd867eb..76960ee96 100644 --- a/data/maps/SeafoamIslands_B3F/map.json +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index 9670a584e..4d5ada91d 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json index 2a0e2a756..69799a0f9 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/SevenIsland_Harbor/map.json b/data/maps/SevenIsland_Harbor/map.json index 1f32a8c99..a621849d0 100644 --- a/data/maps/SevenIsland_Harbor/map.json +++ b/data/maps/SevenIsland_Harbor/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json index 04b463921..7a276372d 100644 --- a/data/maps/SevenIsland_House_Room1/map.json +++ b/data/maps/SevenIsland_House_Room1/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_1", "connections": null, "object_events": [ diff --git a/data/maps/SevenIsland_House_Room2/map.json b/data/maps/SevenIsland_House_Room2/map.json index 6fbc93e83..a451fdc41 100644 --- a/data/maps/SevenIsland_House_Room2/map.json +++ b/data/maps/SevenIsland_House_Room2/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_1", "connections": null, "object_events": [ diff --git a/data/maps/SevenIsland_Mart/map.json b/data/maps/SevenIsland_Mart/map.json index 35b29be78..de825eb58 100644 --- a/data/maps/SevenIsland_Mart/map.json +++ b/data/maps/SevenIsland_Mart/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json index 6d22011f8..11baa4ab9 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json index b71125efe..437ddcf8f 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index 4898f2cbb..810bb0ec1 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json index d74400889..4e592643a 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json index 91762a1a6..8cf0554f6 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index bd8061b18..d37ba83c3 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_2", "connections": null, "object_events": [ diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json index 8710d57c9..2bce9a89a 100644 --- a/data/maps/SevenIsland_TanobyRuins/map.json +++ b/data/maps/SevenIsland_TanobyRuins/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json index 5c3f8fbae..1a1a927e2 100644 --- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_2", "connections": null, "object_events": [], diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json index f6316e55b..6f4d729b4 100644 --- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_2", "connections": null, "object_events": [], diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json index 7a3ff5167..ddae2e9fb 100644 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_2", "connections": null, "object_events": [], diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json index a1c4e1b38..5166e20e5 100644 --- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_2", "connections": null, "object_events": [], diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json index d08d31d09..5a594dbd4 100644 --- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_2", "connections": null, "object_events": [], diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json index 5ccc39265..4aed32594 100644 --- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_2", "connections": null, "object_events": [], diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json index f97fba097..df8a6a08c 100644 --- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_2", "connections": null, "object_events": [], diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json index 48a369d2a..d10dab17d 100644 --- a/data/maps/SevenIsland_TrainerTower/map.json +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index faf14cfde..5ccfb6bea 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 7, - "elevator_flag": 10, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 10, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index 9d842231f..94de14328 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 7, - "elevator_flag": 11, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 11, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json index a1b15142e..000226509 100644 --- a/data/maps/SilphCo_1F/map.json +++ b/data/maps/SilphCo_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 7, - "elevator_flag": 1, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 1, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index fdc45f52e..745731e31 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 7, - "elevator_flag": 2, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 2, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index 573a79f4c..efd2812ff 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 7, - "elevator_flag": 3, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 3, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index 968c2179a..27ee89266 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 7, - "elevator_flag": 4, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 4, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index dbec3c08c..f7bfa7c40 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 7, - "elevator_flag": 5, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 5, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index b7664440e..02795de6f 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 7, - "elevator_flag": 6, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 6, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index d7fc5e642..8f568f0c8 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 7, - "elevator_flag": 7, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 7, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index d843041f0..c38706dab 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 7, - "elevator_flag": 8, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 8, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json index a2a4d29bb..b4692e8f6 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 7, - "elevator_flag": 9, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 9, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SilphCo_Elevator/map.json b/data/maps/SilphCo_Elevator/map.json index bcf756111..85e2a425b 100644 --- a/data/maps/SilphCo_Elevator/map.json +++ b/data/maps/SilphCo_Elevator/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json index 28ad8ecc8..7749f8336 100644 --- a/data/maps/SixIsland/map.json +++ b/data/maps/SixIsland/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/SixIsland_AlteringCave/map.json b/data/maps/SixIsland_AlteringCave/map.json index ec29d465a..28deb6f2f 100644 --- a/data/maps/SixIsland_AlteringCave/map.json +++ b/data/maps/SixIsland_AlteringCave/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/SixIsland_DottedHole_1F/map.json b/data/maps/SixIsland_DottedHole_1F/map.json index 9a2a32ec1..fcdf5e6dc 100644 --- a/data/maps/SixIsland_DottedHole_1F/map.json +++ b/data/maps/SixIsland_DottedHole_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/SixIsland_DottedHole_B1F/map.json b/data/maps/SixIsland_DottedHole_B1F/map.json index 2a7e3a40d..59d223c75 100644 --- a/data/maps/SixIsland_DottedHole_B1F/map.json +++ b/data/maps/SixIsland_DottedHole_B1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/SixIsland_DottedHole_B2F/map.json b/data/maps/SixIsland_DottedHole_B2F/map.json index 49943fdda..8a10c52ab 100644 --- a/data/maps/SixIsland_DottedHole_B2F/map.json +++ b/data/maps/SixIsland_DottedHole_B2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/SixIsland_DottedHole_B3F/map.json b/data/maps/SixIsland_DottedHole_B3F/map.json index 047963b09..fc9d57a70 100644 --- a/data/maps/SixIsland_DottedHole_B3F/map.json +++ b/data/maps/SixIsland_DottedHole_B3F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/SixIsland_DottedHole_B4F/map.json b/data/maps/SixIsland_DottedHole_B4F/map.json index 7f934b882..a34ef53c1 100644 --- a/data/maps/SixIsland_DottedHole_B4F/map.json +++ b/data/maps/SixIsland_DottedHole_B4F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json index 6ac6834b6..89f3d458c 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json index 843427e53..420587041 100644 --- a/data/maps/SixIsland_GreenPath/map.json +++ b/data/maps/SixIsland_GreenPath/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/SixIsland_Harbor/map.json b/data/maps/SixIsland_Harbor/map.json index 1c54eda76..6b503e36b 100644 --- a/data/maps/SixIsland_Harbor/map.json +++ b/data/maps/SixIsland_Harbor/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SixIsland_House/map.json b/data/maps/SixIsland_House/map.json index 7d6d2680d..c9d6d9b6f 100644 --- a/data/maps/SixIsland_House/map.json +++ b/data/maps/SixIsland_House/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SixIsland_Mart/map.json b/data/maps/SixIsland_Mart/map.json index 0abc3ff8d..d498e595d 100644 --- a/data/maps/SixIsland_Mart/map.json +++ b/data/maps/SixIsland_Mart/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json index 9dd28875c..5b5e29b24 100644 --- a/data/maps/SixIsland_OutcastIsland/map.json +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json index 67ec77ee9..519bdc193 100644 --- a/data/maps/SixIsland_PatternBush/map.json +++ b/data/maps/SixIsland_PatternBush/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json index 6a22d0f8f..f787e9432 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/map.json +++ b/data/maps/SixIsland_PokemonCenter_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json index deb1ba0cb..1e5661335 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/map.json +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index 943cd8b08..35a1378b6 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json index 74a4bc60e..581749333 100644 --- a/data/maps/SixIsland_WaterPath/map.json +++ b/data/maps/SixIsland_WaterPath/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/SixIsland_WaterPath_House1/map.json b/data/maps/SixIsland_WaterPath_House1/map.json index 6eaa4ffbc..6ba5981d2 100644 --- a/data/maps/SixIsland_WaterPath_House1/map.json +++ b/data/maps/SixIsland_WaterPath_House1/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/SixIsland_WaterPath_House2/map.json b/data/maps/SixIsland_WaterPath_House2/map.json index deec51bce..ddff9b49d 100644 --- a/data/maps/SixIsland_WaterPath_House2/map.json +++ b/data/maps/SixIsland_WaterPath_House2/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index 3e7963250..ac029a606 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index 58644d541..6176a650a 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json index 3afff50a6..8b8a3b264 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json index 8d5422fe6..f7688e70e 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/map.json +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/ThreeIsland_Harbor/map.json b/data/maps/ThreeIsland_Harbor/map.json index 50810f223..f00099f9e 100644 --- a/data/maps/ThreeIsland_Harbor/map.json +++ b/data/maps/ThreeIsland_Harbor/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json index b28ea6cc7..26f360ef0 100644 --- a/data/maps/ThreeIsland_House1/map.json +++ b/data/maps/ThreeIsland_House1/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/ThreeIsland_House2/map.json b/data/maps/ThreeIsland_House2/map.json index 6884e186d..185d1f8ae 100644 --- a/data/maps/ThreeIsland_House2/map.json +++ b/data/maps/ThreeIsland_House2/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/ThreeIsland_House3/map.json b/data/maps/ThreeIsland_House3/map.json index 601fa73ca..5268aff53 100644 --- a/data/maps/ThreeIsland_House3/map.json +++ b/data/maps/ThreeIsland_House3/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/ThreeIsland_House4/map.json b/data/maps/ThreeIsland_House4/map.json index a59e1ff5d..2dbe3ffd8 100644 --- a/data/maps/ThreeIsland_House4/map.json +++ b/data/maps/ThreeIsland_House4/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/ThreeIsland_House5/map.json b/data/maps/ThreeIsland_House5/map.json index be849047f..526d71de0 100644 --- a/data/maps/ThreeIsland_House5/map.json +++ b/data/maps/ThreeIsland_House5/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/ThreeIsland_Mart/map.json b/data/maps/ThreeIsland_Mart/map.json index 226828b19..00cff653c 100644 --- a/data/maps/ThreeIsland_Mart/map.json +++ b/data/maps/ThreeIsland_Mart/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json index e467d8eaf..7808db5e3 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json index df5ca161f..2bab8005d 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json index 2377552b2..87b83b24d 100644 --- a/data/maps/ThreeIsland_Port/map.json +++ b/data/maps/ThreeIsland_Port/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index 98ce5c92e..65d27cd22 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/TrainerTower_1F/map.json b/data/maps/TrainerTower_1F/map.json index 9e52e5027..05e050043 100644 --- a/data/maps/TrainerTower_1F/map.json +++ b/data/maps/TrainerTower_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 2, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/TrainerTower_2F/map.json b/data/maps/TrainerTower_2F/map.json index 14d116714..f845b3eb7 100644 --- a/data/maps/TrainerTower_2F/map.json +++ b/data/maps/TrainerTower_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 2, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/TrainerTower_3F/map.json b/data/maps/TrainerTower_3F/map.json index d9c18fb85..1cced00ea 100644 --- a/data/maps/TrainerTower_3F/map.json +++ b/data/maps/TrainerTower_3F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 2, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/TrainerTower_4F/map.json b/data/maps/TrainerTower_4F/map.json index d14739d6f..a1b103c38 100644 --- a/data/maps/TrainerTower_4F/map.json +++ b/data/maps/TrainerTower_4F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 2, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/TrainerTower_5F/map.json b/data/maps/TrainerTower_5F/map.json index ab053a52a..1def8933f 100644 --- a/data/maps/TrainerTower_5F/map.json +++ b/data/maps/TrainerTower_5F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 2, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/TrainerTower_6F/map.json b/data/maps/TrainerTower_6F/map.json index 14de69d3b..cb8924b0e 100644 --- a/data/maps/TrainerTower_6F/map.json +++ b/data/maps/TrainerTower_6F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 2, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/TrainerTower_7F/map.json b/data/maps/TrainerTower_7F/map.json index da4f8e4c5..3ad071b09 100644 --- a/data/maps/TrainerTower_7F/map.json +++ b/data/maps/TrainerTower_7F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 2, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/TrainerTower_8F/map.json b/data/maps/TrainerTower_8F/map.json index 9093fc91a..e65b193a4 100644 --- a/data/maps/TrainerTower_8F/map.json +++ b/data/maps/TrainerTower_8F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 2, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/TrainerTower_Elevator/map.json b/data/maps/TrainerTower_Elevator/map.json index ded438b31..9e9b8d732 100644 --- a/data/maps/TrainerTower_Elevator/map.json +++ b/data/maps/TrainerTower_Elevator/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 2, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/TrainerTower_Lobby/map.json b/data/maps/TrainerTower_Lobby/map.json index 808d19840..d00dcf2eb 100644 --- a/data/maps/TrainerTower_Lobby/map.json +++ b/data/maps/TrainerTower_Lobby/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 2, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/TrainerTower_Roof/map.json b/data/maps/TrainerTower_Roof/map.json index f3660c694..207b70b2d 100644 --- a/data/maps/TrainerTower_Roof/map.json +++ b/data/maps/TrainerTower_Roof/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 2, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 0fc86bc84..48381765e 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/TwoIsland_CapeBrink/map.json b/data/maps/TwoIsland_CapeBrink/map.json index ecb4707d3..3b569844d 100644 --- a/data/maps/TwoIsland_CapeBrink/map.json +++ b/data/maps/TwoIsland_CapeBrink/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json index fcdf43f48..42dc8e157 100644 --- a/data/maps/TwoIsland_CapeBrink_House/map.json +++ b/data/maps/TwoIsland_CapeBrink_House/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/TwoIsland_Harbor/map.json b/data/maps/TwoIsland_Harbor/map.json index ef8a415a6..38c9d8d64 100644 --- a/data/maps/TwoIsland_Harbor/map.json +++ b/data/maps/TwoIsland_Harbor/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/TwoIsland_House/map.json b/data/maps/TwoIsland_House/map.json index 0bd6e4624..978b1e9dd 100644 --- a/data/maps/TwoIsland_House/map.json +++ b/data/maps/TwoIsland_House/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index da497f0f1..25454f56a 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json index 15b241c4a..88c5f0b28 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json index ca726f1e4..bb8e12fbc 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/UndergroundPath_EastEntrance/map.json b/data/maps/UndergroundPath_EastEntrance/map.json index 2c06d06dd..87ef73ace 100644 --- a/data/maps/UndergroundPath_EastEntrance/map.json +++ b/data/maps/UndergroundPath_EastEntrance/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/UndergroundPath_EastWestTunnel/map.json b/data/maps/UndergroundPath_EastWestTunnel/map.json index b078aad43..a994ce48d 100644 --- a/data/maps/UndergroundPath_EastWestTunnel/map.json +++ b/data/maps/UndergroundPath_EastWestTunnel/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/UndergroundPath_NorthEntrance/map.json b/data/maps/UndergroundPath_NorthEntrance/map.json index 2138ca2e3..e87fb79bf 100644 --- a/data/maps/UndergroundPath_NorthEntrance/map.json +++ b/data/maps/UndergroundPath_NorthEntrance/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/map.json b/data/maps/UndergroundPath_NorthSouthTunnel/map.json index e4ea6461d..6299fa510 100644 --- a/data/maps/UndergroundPath_NorthSouthTunnel/map.json +++ b/data/maps/UndergroundPath_NorthSouthTunnel/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/UndergroundPath_SouthEntrance/map.json b/data/maps/UndergroundPath_SouthEntrance/map.json index 90215efc9..ae41077ef 100644 --- a/data/maps/UndergroundPath_SouthEntrance/map.json +++ b/data/maps/UndergroundPath_SouthEntrance/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/UndergroundPath_WestEntrance/map.json b/data/maps/UndergroundPath_WestEntrance/map.json index 3c63eed27..419281f0c 100644 --- a/data/maps/UndergroundPath_WestEntrance/map.json +++ b/data/maps/UndergroundPath_WestEntrance/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json index a27c7a7b9..2ceb57c4b 100644 --- a/data/maps/UnionRoom/map.json +++ b/data/maps/UnionRoom/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_8", "connections": null, "object_events": [ diff --git a/data/maps/UnknownMap_18_01/map.json b/data/maps/UnknownMap_18_01/map.json index 084ce2ad2..bf2b727ce 100644 --- a/data/maps/UnknownMap_18_01/map.json +++ b/data/maps/UnknownMap_18_01/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/UnusedHouse_27_00/map.json b/data/maps/UnusedHouse_27_00/map.json index db9e16065..e7eb73138 100644 --- a/data/maps/UnusedHouse_27_00/map.json +++ b/data/maps/UnusedHouse_27_00/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/UnusedHouse_29_00/map.json b/data/maps/UnusedHouse_29_00/map.json index 033bb16f2..9d08c5548 100644 --- a/data/maps/UnusedHouse_29_00/map.json +++ b/data/maps/UnusedHouse_29_00/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/UnusedHouse_31_05/map.json b/data/maps/UnusedHouse_31_05/map.json index a65ad03fb..71e855268 100644 --- a/data/maps/UnusedHouse_31_05/map.json +++ b/data/maps/UnusedHouse_31_05/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [], diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index 586c7a0eb..b8b323176 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/VermilionCity_Gym/map.json b/data/maps/VermilionCity_Gym/map.json index 3d6015592..f5d6d8f34 100644 --- a/data/maps/VermilionCity_Gym/map.json +++ b/data/maps/VermilionCity_Gym/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_1", "connections": null, "object_events": [ diff --git a/data/maps/VermilionCity_House1/map.json b/data/maps/VermilionCity_House1/map.json index b8486f537..d5e1e69c8 100644 --- a/data/maps/VermilionCity_House1/map.json +++ b/data/maps/VermilionCity_House1/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/VermilionCity_House2/map.json b/data/maps/VermilionCity_House2/map.json index a2d7850a0..0011bdbb0 100644 --- a/data/maps/VermilionCity_House2/map.json +++ b/data/maps/VermilionCity_House2/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/VermilionCity_House3/map.json b/data/maps/VermilionCity_House3/map.json index 3ec89fcc2..b71efa6ef 100644 --- a/data/maps/VermilionCity_House3/map.json +++ b/data/maps/VermilionCity_House3/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/VermilionCity_Mart/map.json b/data/maps/VermilionCity_Mart/map.json index 91cc09731..48a60d494 100644 --- a/data/maps/VermilionCity_Mart/map.json +++ b/data/maps/VermilionCity_Mart/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json index 07752e909..3f503dbe3 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json index cd946a732..bfc1daf2c 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json index f0dd18249..2859f4135 100644 --- a/data/maps/VermilionCity_PokemonFanClub/map.json +++ b/data/maps/VermilionCity_PokemonFanClub/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 38a8fa557..3c41fe580 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index 263b2561a..2731bc8f4 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index 4c92bffb1..906797fc5 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index ff3bd0506..d747d1e95 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json index 4ac4c0b30..95c15e143 100644 --- a/data/maps/ViridianCity_Gym/map.json +++ b/data/maps/ViridianCity_Gym/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_1", "connections": null, "object_events": [ diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House1/map.json index ee3453e42..c73f46675 100644 --- a/data/maps/ViridianCity_House1/map.json +++ b/data/maps/ViridianCity_House1/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_House2/map.json index 030605a46..fbce33a88 100644 --- a/data/maps/ViridianCity_House2/map.json +++ b/data/maps/ViridianCity_House2/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json index 2f56458d1..e8cafbabc 100644 --- a/data/maps/ViridianCity_Mart/map.json +++ b/data/maps/ViridianCity_Mart/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json index 2a6edb48c..62956275e 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json index 65a8307ba..6bef278a3 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index 17af05b03..ed5441d89 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ -- cgit v1.2.3 From f65e07fb1fac3b8092f8ec29c2c9b42fcb80fa60 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 18 Feb 2020 15:52:45 -0500 Subject: pokemon_jump_3,4 --- data/pokemon_jump.s | 143 ---------------------------------------------------- data/strings.s | 18 +++---- 2 files changed, 9 insertions(+), 152 deletions(-) (limited to 'data') diff --git a/data/pokemon_jump.s b/data/pokemon_jump.s index 31a47d788..432f16d0b 100644 --- a/data/pokemon_jump.s +++ b/data/pokemon_jump.s @@ -3,149 +3,6 @@ .section .rodata -gUnknown_846B794:: @ 846B794 gbapal - .incbin "graphics/link_games/unk_846B794.gbapal" - -gUnknown_846B7B4:: @ 846B7B4 gbapal - .incbin "graphics/link_games/unk_846B7B4.gbapal" - -gUnknown_846B7D4:: @ 846B7D4 4bpp.lz - .incbin "graphics/link_games/unk_846B7D4.4bpp.lz" - -gUnknown_846BA00:: @ 846BA00 bin.lz - .incbin "graphics/link_games/unk_846BA00.bin.lz" - -gUnknown_846BBB0:: @ 846BBB0 gbapal - .incbin "graphics/link_games/unk_846BBB0.gbapal" - -gUnknown_846BBD0:: @ 846BBD0 4bpp.lz - .incbin "graphics/link_games/unk_846BBD0.4bpp.lz" - -gUnknown_846C520:: @ 846C520 bin.lz - .incbin "graphics/link_games/unk_846C520.bin.lz" - -gUnknown_846C8D8:: @ 846C8D8 gbapal - .incbin "graphics/link_games/unk_846C8D8.gbapal" - -gUnknown_846C8F8:: @ 846C8F8 4bpp.lz - .incbin "graphics/link_games/unk_846C8F8.4bpp.lz" - -gUnknown_846D3A8:: @ 846D3A8 bin.lz - .incbin "graphics/link_games/unk_846D3A8.bin.lz" - -gUnknown_846D8D4:: @ 846D8D4 - .4byte 0x000001b0 - @ { - @ .bg = 0, - @ .charBaseIndex = 0, - @ .mapBaseIndex = 27, - @ .screenSize = 0, - @ .paletteMode = 0, - @ .priority = 0, - @ .baseTile = 0x0000 - @ } - .4byte 0x000025e6 - @ { - @ .bg = 2, - @ .charBaseIndex = 1, - @ .mapBaseIndex = 30, - @ .screenSize = 2, - @ .paletteMode = 0, - @ .priority = 2, - @ .baseTile = 0x0000 - @ } - .4byte 0x000016c9 - @ { - @ .bg = 1, - @ .charBaseIndex = 2, - @ .mapBaseIndex = 12, - @ .screenSize = 3, - @ .paletteMode = 0, - @ .priority = 1, - @ .baseTile = 0x0000 - @ } - .4byte 0x000031df - @ { - @ .bg = 3, - @ .charBaseIndex = 3, - @ .mapBaseIndex = 29, - @ .screenSize = 0, - @ .paletteMode = 0, - @ .priority = 3, - @ .baseTile = 0x0000 - @ } - -gUnknown_846D8E4:: @ 846D8E4 - .byte 0, 19, 0, 6, 2, 2 - .2byte 0x0013 - .byte 0, 8, 0, 6, 2, 2 - .2byte 0x001f - .byte 255, 0, 0, 0, 0, 0 - .2byte 0x0000 - -gUnknown_846D8FC:: @ 846D8FC - .4byte 0, sub_8149DC8 - .4byte 1, sub_8149F64 - .4byte 2, sub_8149FD0 - .4byte 3, sub_814A03C - .4byte 4, sub_814A0C8 - .4byte 5, sub_814A174 - .4byte 6, sub_814A218 - .4byte 7, sub_814A264 - .4byte 9, sub_814A3AC - .4byte 8, sub_814A308 - -gUnknown_846D94C:: @ 846D94C - .string "IES$" - -gUnknown_846D950:: @ 846D950 - .byte 0x00, 0x02, 0x03 - -gUnknown_846D953:: @ 846D953 - .byte 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 - -gUnknown_846D960:: @ 846D960 - obj_tiles gUnknown_8479688, 0, 800 - -gUnknown_846D968:: @ 846D968 - obj_pal gUnknown_8479668, 800 - -gUnknown_846D970:: - .2byte 0x0006, 0x0008, 0x0010, 0x0008 - -gUnknown_846D978:: - .2byte 0x0006, 0x0008, 0x000b, 0x0006, 0x0010, 0x0008 - -gUnknown_846D984:: - .2byte 0x0002, 0x0006, 0x0006, 0x0008, 0x0010, 0x0008, 0x0014, 0x0006 - -gUnknown_846D994:: - .2byte 0x0002, 0x0006, 0x0006, 0x0008, 0x000b, 0x0006, 0x0010, 0x0008, 0x0014, 0x0006 - -gUnknown_846D9A8:: @ 846D9A8 - .4byte gUnknown_846D970 - .4byte gUnknown_846D978 - .4byte gUnknown_846D984 - .4byte gUnknown_846D994 - -gUnknown_846D9B8:: - .2byte 0x0058, 0x0098 - -gUnknown_846D9BC:: - .2byte 0x0058, 0x0078, 0x0098 - -gUnknown_846D9C2:: - .2byte 0x0038, 0x0058, 0x0098, 0x00b8 - -gUnknown_846D9CA:: - .2byte 0x0038, 0x0058, 0x0078, 0x0098, 0x00b8 - -gUnknown_846D9D4:: @ 846D9D4 - .4byte gUnknown_846D9B8 - .4byte gUnknown_846D9BC - .4byte gUnknown_846D9C2 - .4byte gUnknown_846D9CA - gUnknown_846D9E4:: @ gbapal .incbin "graphics/link_games/unk_846D9E4.gbapal" diff --git a/data/strings.s b/data/strings.s index f595170ff..591c7c7f4 100644 --- a/data/strings.s +++ b/data/strings.s @@ -3289,10 +3289,10 @@ gString_Help:: @ 841CB49 gString_HelpSystem_ClearTo8:: @ 841CB4E .string "{CLEAR_TO 8}$" -gUnknown_841CB52:: @ 841CB52 +gText_SpacePoints2:: @ 841CB52 .string " points$" -gUnknown_841CB5A:: @ 841CB5A +gText_SpaceTimes3:: @ 841CB5A .string " time(s)$" gUnknown_841CB63:: @ 841CB63 @@ -3307,28 +3307,28 @@ gUnknown_841CB88:: gUnknown_841CB94:: .string "EXCELLENTS in a row:$" -gUnknown_841CBA9:: @ 841CBA9 +gText_AwesomeWonF701F700:: @ 841CBA9 .string "Awesome score! You've\n" .string "won {DYNAMIC 01} {DYNAMIC 00}!$" -gUnknown_841CBCA:: @ 841CBCA +gText_FilledStorageSpace2:: @ 841CBCA .string "There's no room left now.$" -gUnknown_841CBE4:: @ 841CBE4 +gText_CantHoldMore:: @ 841CBE4 .string "You can't hold any more!$" -gUnknown_841CBFD:: @ 841CBFD +gText_WantToPlayAgain2:: @ 841CBFD .string "Want to play again?$" -gUnknown_841CC11:: @ 841CC11 +gText_SomeoneDroppedOut2:: @ 841CC11 .string "Somebody dropped out.\n" .string "The link will be canceled.$" -gUnknown_841CC42:: @ 841CC42 +gText_SavingDontTurnOffPower:: @ 841CC42 .string "SAVING…\n" .string "DON'T TURN OFF THE POWER.$" -gUnknown_841CC64:: @ 841CC64 +gText_CommunicationStandby4:: @ 841CC64 .string "Communication standby…$" .string "SAVING...\n" -- cgit v1.2.3 From 729c224bf2421c30e64f2082f19907b5e66b8138 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 18 Feb 2020 16:16:03 -0500 Subject: Name battle scene and map type constants --- data/maps.s | 1 - data/maps/BattleColosseum_2P/map.json | 4 ++-- data/maps/BattleColosseum_4P/map.json | 4 ++-- data/maps/BirthIsland_Exterior/map.json | 4 ++-- data/maps/BirthIsland_Harbor/map.json | 4 ++-- data/maps/CeladonCity/map.json | 4 ++-- data/maps/CeladonCity_Condominiums_1F/map.json | 4 ++-- data/maps/CeladonCity_Condominiums_2F/map.json | 4 ++-- data/maps/CeladonCity_Condominiums_3F/map.json | 4 ++-- data/maps/CeladonCity_Condominiums_Roof/map.json | 4 ++-- data/maps/CeladonCity_Condominiums_RoofRoom/map.json | 4 ++-- data/maps/CeladonCity_DepartmentStore_1F/map.json | 4 ++-- data/maps/CeladonCity_DepartmentStore_2F/map.json | 4 ++-- data/maps/CeladonCity_DepartmentStore_3F/map.json | 4 ++-- data/maps/CeladonCity_DepartmentStore_4F/map.json | 4 ++-- data/maps/CeladonCity_DepartmentStore_5F/map.json | 4 ++-- data/maps/CeladonCity_DepartmentStore_Elevator/map.json | 4 ++-- data/maps/CeladonCity_DepartmentStore_Roof/map.json | 4 ++-- data/maps/CeladonCity_GameCorner/map.json | 4 ++-- data/maps/CeladonCity_GameCorner_PrizeRoom/map.json | 4 ++-- data/maps/CeladonCity_Gym/map.json | 4 ++-- data/maps/CeladonCity_Hotel/map.json | 4 ++-- data/maps/CeladonCity_House1/map.json | 4 ++-- data/maps/CeladonCity_PokemonCenter_1F/map.json | 4 ++-- data/maps/CeladonCity_PokemonCenter_2F/map.json | 4 ++-- data/maps/CeladonCity_Restaurant/map.json | 4 ++-- data/maps/CeruleanCave_1F/map.json | 4 ++-- data/maps/CeruleanCave_2F/map.json | 4 ++-- data/maps/CeruleanCave_B1F/map.json | 4 ++-- data/maps/CeruleanCity/map.json | 4 ++-- data/maps/CeruleanCity_BikeShop/map.json | 4 ++-- data/maps/CeruleanCity_Gym/map.json | 4 ++-- data/maps/CeruleanCity_House1/map.json | 4 ++-- data/maps/CeruleanCity_House2/map.json | 4 ++-- data/maps/CeruleanCity_House3/map.json | 4 ++-- data/maps/CeruleanCity_House4/map.json | 4 ++-- data/maps/CeruleanCity_House5/map.json | 4 ++-- data/maps/CeruleanCity_Mart/map.json | 4 ++-- data/maps/CeruleanCity_PokemonCenter_1F/map.json | 4 ++-- data/maps/CeruleanCity_PokemonCenter_2F/map.json | 4 ++-- data/maps/CinnabarIsland/map.json | 4 ++-- data/maps/CinnabarIsland_Gym/map.json | 4 ++-- data/maps/CinnabarIsland_Mart/map.json | 4 ++-- data/maps/CinnabarIsland_PokemonCenter_1F/map.json | 4 ++-- data/maps/CinnabarIsland_PokemonCenter_2F/map.json | 4 ++-- data/maps/CinnabarIsland_PokemonLab_Entrance/map.json | 4 ++-- data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json | 4 ++-- data/maps/CinnabarIsland_PokemonLab_Lounge/map.json | 4 ++-- data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json | 4 ++-- data/maps/DiglettsCave_B1F/map.json | 4 ++-- data/maps/DiglettsCave_NorthEntrance/map.json | 4 ++-- data/maps/DiglettsCave_SouthEntrance/map.json | 4 ++-- data/maps/FiveIsland/map.json | 4 ++-- data/maps/FiveIsland_Harbor/map.json | 4 ++-- data/maps/FiveIsland_House1/map.json | 4 ++-- data/maps/FiveIsland_House2/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Entrance/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Room1/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Room10/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Room11/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Room12/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Room13/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Room14/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Room2/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Room3/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Room4/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Room5/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Room6/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Room7/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Room8/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Room9/map.json | 4 ++-- data/maps/FiveIsland_Meadow/map.json | 4 ++-- data/maps/FiveIsland_MemorialPillar/map.json | 4 ++-- data/maps/FiveIsland_PokemonCenter_1F/map.json | 4 ++-- data/maps/FiveIsland_PokemonCenter_2F/map.json | 4 ++-- data/maps/FiveIsland_ResortGorgeous/map.json | 4 ++-- data/maps/FiveIsland_ResortGorgeous_House/map.json | 4 ++-- data/maps/FiveIsland_RocketWarehouse/map.json | 4 ++-- data/maps/FiveIsland_WaterLabyrinth/map.json | 4 ++-- data/maps/FourIsland/map.json | 4 ++-- data/maps/FourIsland_Harbor/map.json | 4 ++-- data/maps/FourIsland_House1/map.json | 4 ++-- data/maps/FourIsland_House2/map.json | 4 ++-- data/maps/FourIsland_IcefallCave_1F/map.json | 4 ++-- data/maps/FourIsland_IcefallCave_B1F/map.json | 4 ++-- data/maps/FourIsland_IcefallCave_Back/map.json | 4 ++-- data/maps/FourIsland_IcefallCave_Entrance/map.json | 4 ++-- data/maps/FourIsland_LoreleisHouse/map.json | 4 ++-- data/maps/FourIsland_Mart/map.json | 4 ++-- data/maps/FourIsland_PokemonCenter_1F/map.json | 4 ++-- data/maps/FourIsland_PokemonCenter_2F/map.json | 4 ++-- data/maps/FourIsland_PokemonDayCare/map.json | 4 ++-- data/maps/FuchsiaCity/map.json | 4 ++-- data/maps/FuchsiaCity_Gym/map.json | 4 ++-- data/maps/FuchsiaCity_House1/map.json | 4 ++-- data/maps/FuchsiaCity_House2/map.json | 4 ++-- data/maps/FuchsiaCity_House3/map.json | 4 ++-- data/maps/FuchsiaCity_Mart/map.json | 4 ++-- data/maps/FuchsiaCity_PokemonCenter_1F/map.json | 4 ++-- data/maps/FuchsiaCity_PokemonCenter_2F/map.json | 4 ++-- data/maps/FuchsiaCity_SafariZone_Entrance/map.json | 4 ++-- data/maps/FuchsiaCity_SafariZone_Office/map.json | 4 ++-- data/maps/FuchsiaCity_WardensHouse/map.json | 4 ++-- data/maps/IndigoPlateau_Exterior/map.json | 4 ++-- data/maps/IndigoPlateau_PokemonCenter_1F/map.json | 4 ++-- data/maps/IndigoPlateau_PokemonCenter_2F/map.json | 4 ++-- data/maps/LavenderTown/map.json | 4 ++-- data/maps/LavenderTown_House1/map.json | 4 ++-- data/maps/LavenderTown_House2/map.json | 4 ++-- data/maps/LavenderTown_Mart/map.json | 4 ++-- data/maps/LavenderTown_PokemonCenter_1F/map.json | 4 ++-- data/maps/LavenderTown_PokemonCenter_2F/map.json | 4 ++-- data/maps/LavenderTown_VolunteerPokemonHouse/map.json | 4 ++-- data/maps/MtEmber_Exterior/map.json | 4 ++-- data/maps/MtEmber_RubyPath_1F/map.json | 4 ++-- data/maps/MtEmber_RubyPath_B1F/map.json | 4 ++-- data/maps/MtEmber_RubyPath_B1F_Stairs/map.json | 4 ++-- data/maps/MtEmber_RubyPath_B2F/map.json | 4 ++-- data/maps/MtEmber_RubyPath_B2F_Stairs/map.json | 4 ++-- data/maps/MtEmber_RubyPath_B3F/map.json | 4 ++-- data/maps/MtEmber_RubyPath_B4F/map.json | 4 ++-- data/maps/MtEmber_RubyPath_B5F/map.json | 4 ++-- data/maps/MtEmber_Summit/map.json | 4 ++-- data/maps/MtEmber_SummitPath_1F/map.json | 4 ++-- data/maps/MtEmber_SummitPath_2F/map.json | 4 ++-- data/maps/MtEmber_SummitPath_3F/map.json | 4 ++-- data/maps/MtMoon_1F/map.json | 4 ++-- data/maps/MtMoon_B1F/map.json | 4 ++-- data/maps/MtMoon_B2F/map.json | 4 ++-- data/maps/NavelRock_1F/map.json | 4 ++-- data/maps/NavelRock_B1F/map.json | 4 ++-- data/maps/NavelRock_Base/map.json | 4 ++-- data/maps/NavelRock_BasePath_B10F/map.json | 4 ++-- data/maps/NavelRock_BasePath_B11F/map.json | 4 ++-- data/maps/NavelRock_BasePath_B1F/map.json | 4 ++-- data/maps/NavelRock_BasePath_B2F/map.json | 4 ++-- data/maps/NavelRock_BasePath_B3F/map.json | 4 ++-- data/maps/NavelRock_BasePath_B4F/map.json | 4 ++-- data/maps/NavelRock_BasePath_B5F/map.json | 4 ++-- data/maps/NavelRock_BasePath_B6F/map.json | 4 ++-- data/maps/NavelRock_BasePath_B7F/map.json | 4 ++-- data/maps/NavelRock_BasePath_B8F/map.json | 4 ++-- data/maps/NavelRock_BasePath_B9F/map.json | 4 ++-- data/maps/NavelRock_Exterior/map.json | 4 ++-- data/maps/NavelRock_Fork/map.json | 4 ++-- data/maps/NavelRock_Harbor/map.json | 4 ++-- data/maps/NavelRock_Summit/map.json | 4 ++-- data/maps/NavelRock_SummitPath_2F/map.json | 4 ++-- data/maps/NavelRock_SummitPath_3F/map.json | 4 ++-- data/maps/NavelRock_SummitPath_4F/map.json | 4 ++-- data/maps/NavelRock_SummitPath_5F/map.json | 4 ++-- data/maps/OneIsland/map.json | 4 ++-- data/maps/OneIsland_Harbor/map.json | 4 ++-- data/maps/OneIsland_House1/map.json | 4 ++-- data/maps/OneIsland_House2/map.json | 4 ++-- data/maps/OneIsland_KindleRoad/map.json | 4 ++-- data/maps/OneIsland_KindleRoad_EmberSpa/map.json | 4 ++-- data/maps/OneIsland_PokemonCenter_1F/map.json | 4 ++-- data/maps/OneIsland_PokemonCenter_2F/map.json | 4 ++-- data/maps/OneIsland_TreasureBeach/map.json | 4 ++-- data/maps/PalletTown/map.json | 4 ++-- data/maps/PalletTown_GarysHouse/map.json | 4 ++-- data/maps/PalletTown_PlayersHouse_1F/map.json | 4 ++-- data/maps/PalletTown_PlayersHouse_2F/map.json | 4 ++-- data/maps/PalletTown_ProfessorOaksLab/map.json | 4 ++-- data/maps/PewterCity/map.json | 4 ++-- data/maps/PewterCity_Gym/map.json | 4 ++-- data/maps/PewterCity_House1/map.json | 4 ++-- data/maps/PewterCity_House2/map.json | 4 ++-- data/maps/PewterCity_Mart/map.json | 4 ++-- data/maps/PewterCity_Museum_1F/map.json | 4 ++-- data/maps/PewterCity_Museum_2F/map.json | 4 ++-- data/maps/PewterCity_PokemonCenter_1F/map.json | 4 ++-- data/maps/PewterCity_PokemonCenter_2F/map.json | 4 ++-- data/maps/PokemonLeague_AgathasRoom/map.json | 4 ++-- data/maps/PokemonLeague_BrunosRoom/map.json | 4 ++-- data/maps/PokemonLeague_ChampionsRoom/map.json | 4 ++-- data/maps/PokemonLeague_HallOfFame/map.json | 4 ++-- data/maps/PokemonLeague_LancesRoom/map.json | 4 ++-- data/maps/PokemonLeague_LoreleisRoom/map.json | 4 ++-- data/maps/PokemonMansion_1F/map.json | 4 ++-- data/maps/PokemonMansion_2F/map.json | 4 ++-- data/maps/PokemonMansion_3F/map.json | 4 ++-- data/maps/PokemonMansion_B1F/map.json | 4 ++-- data/maps/PokemonTower_1F/map.json | 4 ++-- data/maps/PokemonTower_2F/map.json | 4 ++-- data/maps/PokemonTower_3F/map.json | 4 ++-- data/maps/PokemonTower_4F/map.json | 4 ++-- data/maps/PokemonTower_5F/map.json | 4 ++-- data/maps/PokemonTower_6F/map.json | 4 ++-- data/maps/PokemonTower_7F/map.json | 4 ++-- data/maps/PowerPlant/map.json | 4 ++-- data/maps/Prototype_SeviiIsle_6/map.json | 4 ++-- data/maps/Prototype_SeviiIsle_7/map.json | 4 ++-- data/maps/Prototype_SeviiIsle_8/map.json | 4 ++-- data/maps/Prototype_SeviiIsle_9/map.json | 4 ++-- data/maps/RecordCenter/map.json | 4 ++-- data/maps/RockTunnel_1F/map.json | 4 ++-- data/maps/RockTunnel_B1F/map.json | 4 ++-- data/maps/RocketHideout_B1F/map.json | 4 ++-- data/maps/RocketHideout_B2F/map.json | 4 ++-- data/maps/RocketHideout_B3F/map.json | 4 ++-- data/maps/RocketHideout_B4F/map.json | 4 ++-- data/maps/RocketHideout_Elevator/map.json | 4 ++-- data/maps/Route1/map.json | 4 ++-- data/maps/Route10/map.json | 4 ++-- data/maps/Route10_PokemonCenter_1F/map.json | 4 ++-- data/maps/Route10_PokemonCenter_2F/map.json | 4 ++-- data/maps/Route11/map.json | 4 ++-- data/maps/Route11_EastEntrance_1F/map.json | 4 ++-- data/maps/Route11_EastEntrance_2F/map.json | 4 ++-- data/maps/Route12/map.json | 4 ++-- data/maps/Route12_FishingHouse/map.json | 4 ++-- data/maps/Route12_NorthEntrance_1F/map.json | 4 ++-- data/maps/Route12_NorthEntrance_2F/map.json | 4 ++-- data/maps/Route13/map.json | 4 ++-- data/maps/Route14/map.json | 4 ++-- data/maps/Route15/map.json | 4 ++-- data/maps/Route15_WestEntrance_1F/map.json | 4 ++-- data/maps/Route15_WestEntrance_2F/map.json | 4 ++-- data/maps/Route16/map.json | 4 ++-- data/maps/Route16_House/map.json | 4 ++-- data/maps/Route16_NorthEntrance_1F/map.json | 4 ++-- data/maps/Route16_NorthEntrance_2F/map.json | 4 ++-- data/maps/Route17/map.json | 4 ++-- data/maps/Route18/map.json | 4 ++-- data/maps/Route18_EastEntrance_1F/map.json | 4 ++-- data/maps/Route18_EastEntrance_2F/map.json | 4 ++-- data/maps/Route19/map.json | 4 ++-- data/maps/Route2/map.json | 4 ++-- data/maps/Route20/map.json | 4 ++-- data/maps/Route21_North/map.json | 4 ++-- data/maps/Route21_South/map.json | 4 ++-- data/maps/Route22/map.json | 4 ++-- data/maps/Route22_NorthEntrance/map.json | 4 ++-- data/maps/Route23/map.json | 4 ++-- data/maps/Route24/map.json | 4 ++-- data/maps/Route25/map.json | 4 ++-- data/maps/Route25_SeaCottage/map.json | 4 ++-- data/maps/Route2_EastBuilding/map.json | 4 ++-- data/maps/Route2_House/map.json | 4 ++-- data/maps/Route2_ViridianForest_NorthEntrance/map.json | 4 ++-- data/maps/Route2_ViridianForest_SouthEntrance/map.json | 4 ++-- data/maps/Route3/map.json | 4 ++-- data/maps/Route4/map.json | 4 ++-- data/maps/Route4_PokemonCenter_1F/map.json | 4 ++-- data/maps/Route4_PokemonCenter_2F/map.json | 4 ++-- data/maps/Route5/map.json | 4 ++-- data/maps/Route5_PokemonDayCare/map.json | 4 ++-- data/maps/Route5_SouthEntrance/map.json | 4 ++-- data/maps/Route6/map.json | 4 ++-- data/maps/Route6_NorthEntrance/map.json | 4 ++-- data/maps/Route7/map.json | 4 ++-- data/maps/Route7_EastEntrance/map.json | 4 ++-- data/maps/Route8/map.json | 4 ++-- data/maps/Route8_WestEntrance/map.json | 4 ++-- data/maps/Route9/map.json | 4 ++-- data/maps/SSAnne_1F_Corridor/map.json | 4 ++-- data/maps/SSAnne_1F_Room1/map.json | 4 ++-- data/maps/SSAnne_1F_Room2/map.json | 4 ++-- data/maps/SSAnne_1F_Room3/map.json | 4 ++-- data/maps/SSAnne_1F_Room4/map.json | 4 ++-- data/maps/SSAnne_1F_Room5/map.json | 4 ++-- data/maps/SSAnne_1F_Room6/map.json | 4 ++-- data/maps/SSAnne_1F_Room7/map.json | 4 ++-- data/maps/SSAnne_2F_Corridor/map.json | 4 ++-- data/maps/SSAnne_2F_Room1/map.json | 4 ++-- data/maps/SSAnne_2F_Room2/map.json | 4 ++-- data/maps/SSAnne_2F_Room3/map.json | 4 ++-- data/maps/SSAnne_2F_Room4/map.json | 4 ++-- data/maps/SSAnne_2F_Room5/map.json | 4 ++-- data/maps/SSAnne_2F_Room6/map.json | 4 ++-- data/maps/SSAnne_3F_Corridor/map.json | 4 ++-- data/maps/SSAnne_B1F_Corridor/map.json | 4 ++-- data/maps/SSAnne_B1F_Room1/map.json | 4 ++-- data/maps/SSAnne_B1F_Room2/map.json | 4 ++-- data/maps/SSAnne_B1F_Room3/map.json | 4 ++-- data/maps/SSAnne_B1F_Room4/map.json | 4 ++-- data/maps/SSAnne_B1F_Room5/map.json | 4 ++-- data/maps/SSAnne_CaptainsOffice/map.json | 4 ++-- data/maps/SSAnne_Deck/map.json | 4 ++-- data/maps/SSAnne_Exterior/map.json | 4 ++-- data/maps/SSAnne_Kitchen/map.json | 4 ++-- data/maps/SafariZone_Center/map.json | 4 ++-- data/maps/SafariZone_Center_RestHouse/map.json | 4 ++-- data/maps/SafariZone_East/map.json | 4 ++-- data/maps/SafariZone_East_RestHouse/map.json | 4 ++-- data/maps/SafariZone_North/map.json | 4 ++-- data/maps/SafariZone_North_RestHouse/map.json | 4 ++-- data/maps/SafariZone_SecretHouse/map.json | 4 ++-- data/maps/SafariZone_West/map.json | 4 ++-- data/maps/SafariZone_West_RestHouse/map.json | 4 ++-- data/maps/SaffronCity/map.json | 4 ++-- data/maps/SaffronCity_Connection/map.json | 4 ++-- data/maps/SaffronCity_CopycatsHouse_1F/map.json | 4 ++-- data/maps/SaffronCity_CopycatsHouse_2F/map.json | 4 ++-- data/maps/SaffronCity_Dojo/map.json | 4 ++-- data/maps/SaffronCity_Gym/map.json | 4 ++-- data/maps/SaffronCity_House/map.json | 4 ++-- data/maps/SaffronCity_Mart/map.json | 4 ++-- data/maps/SaffronCity_MrPsychicsHouse/map.json | 4 ++-- data/maps/SaffronCity_PokemonCenter_1F/map.json | 4 ++-- data/maps/SaffronCity_PokemonCenter_2F/map.json | 4 ++-- data/maps/SaffronCity_PokemonTrainerFanClub/map.json | 4 ++-- data/maps/SeafoamIslands_1F/map.json | 4 ++-- data/maps/SeafoamIslands_B1F/map.json | 4 ++-- data/maps/SeafoamIslands_B2F/map.json | 4 ++-- data/maps/SeafoamIslands_B3F/map.json | 4 ++-- data/maps/SeafoamIslands_B4F/map.json | 4 ++-- data/maps/SevenIsland/map.json | 4 ++-- data/maps/SevenIsland_Harbor/map.json | 4 ++-- data/maps/SevenIsland_House_Room1/map.json | 4 ++-- data/maps/SevenIsland_House_Room2/map.json | 4 ++-- data/maps/SevenIsland_Mart/map.json | 4 ++-- data/maps/SevenIsland_PokemonCenter_1F/map.json | 4 ++-- data/maps/SevenIsland_PokemonCenter_2F/map.json | 4 ++-- data/maps/SevenIsland_SevaultCanyon/map.json | 4 ++-- data/maps/SevenIsland_SevaultCanyon_Entrance/map.json | 4 ++-- data/maps/SevenIsland_SevaultCanyon_House/map.json | 4 ++-- data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json | 4 ++-- data/maps/SevenIsland_TanobyRuins/map.json | 4 ++-- data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json | 4 ++-- data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json | 4 ++-- data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json | 4 ++-- data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json | 4 ++-- data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json | 4 ++-- data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json | 4 ++-- data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json | 4 ++-- data/maps/SevenIsland_TrainerTower/map.json | 4 ++-- data/maps/SilphCo_10F/map.json | 4 ++-- data/maps/SilphCo_11F/map.json | 4 ++-- data/maps/SilphCo_1F/map.json | 4 ++-- data/maps/SilphCo_2F/map.json | 4 ++-- data/maps/SilphCo_3F/map.json | 4 ++-- data/maps/SilphCo_4F/map.json | 4 ++-- data/maps/SilphCo_5F/map.json | 4 ++-- data/maps/SilphCo_6F/map.json | 4 ++-- data/maps/SilphCo_7F/map.json | 4 ++-- data/maps/SilphCo_8F/map.json | 4 ++-- data/maps/SilphCo_9F/map.json | 4 ++-- data/maps/SilphCo_Elevator/map.json | 4 ++-- data/maps/SixIsland/map.json | 4 ++-- data/maps/SixIsland_AlteringCave/map.json | 4 ++-- data/maps/SixIsland_DottedHole_1F/map.json | 4 ++-- data/maps/SixIsland_DottedHole_B1F/map.json | 4 ++-- data/maps/SixIsland_DottedHole_B2F/map.json | 4 ++-- data/maps/SixIsland_DottedHole_B3F/map.json | 4 ++-- data/maps/SixIsland_DottedHole_B4F/map.json | 4 ++-- data/maps/SixIsland_DottedHole_SapphireRoom/map.json | 4 ++-- data/maps/SixIsland_GreenPath/map.json | 4 ++-- data/maps/SixIsland_Harbor/map.json | 4 ++-- data/maps/SixIsland_House/map.json | 4 ++-- data/maps/SixIsland_Mart/map.json | 4 ++-- data/maps/SixIsland_OutcastIsland/map.json | 4 ++-- data/maps/SixIsland_PatternBush/map.json | 4 ++-- data/maps/SixIsland_PokemonCenter_1F/map.json | 4 ++-- data/maps/SixIsland_PokemonCenter_2F/map.json | 4 ++-- data/maps/SixIsland_RuinValley/map.json | 4 ++-- data/maps/SixIsland_WaterPath/map.json | 4 ++-- data/maps/SixIsland_WaterPath_House1/map.json | 4 ++-- data/maps/SixIsland_WaterPath_House2/map.json | 4 ++-- data/maps/ThreeIsland/map.json | 4 ++-- data/maps/ThreeIsland_BerryForest/map.json | 4 ++-- data/maps/ThreeIsland_BondBridge/map.json | 4 ++-- data/maps/ThreeIsland_DunsparceTunnel/map.json | 4 ++-- data/maps/ThreeIsland_Harbor/map.json | 4 ++-- data/maps/ThreeIsland_House1/map.json | 4 ++-- data/maps/ThreeIsland_House2/map.json | 4 ++-- data/maps/ThreeIsland_House3/map.json | 4 ++-- data/maps/ThreeIsland_House4/map.json | 4 ++-- data/maps/ThreeIsland_House5/map.json | 4 ++-- data/maps/ThreeIsland_Mart/map.json | 4 ++-- data/maps/ThreeIsland_PokemonCenter_1F/map.json | 4 ++-- data/maps/ThreeIsland_PokemonCenter_2F/map.json | 4 ++-- data/maps/ThreeIsland_Port/map.json | 4 ++-- data/maps/TradeCenter/map.json | 4 ++-- data/maps/TrainerTower_1F/map.json | 4 ++-- data/maps/TrainerTower_2F/map.json | 4 ++-- data/maps/TrainerTower_3F/map.json | 4 ++-- data/maps/TrainerTower_4F/map.json | 4 ++-- data/maps/TrainerTower_5F/map.json | 4 ++-- data/maps/TrainerTower_6F/map.json | 4 ++-- data/maps/TrainerTower_7F/map.json | 4 ++-- data/maps/TrainerTower_8F/map.json | 4 ++-- data/maps/TrainerTower_Elevator/map.json | 4 ++-- data/maps/TrainerTower_Lobby/map.json | 4 ++-- data/maps/TrainerTower_Roof/map.json | 4 ++-- data/maps/TwoIsland/map.json | 4 ++-- data/maps/TwoIsland_CapeBrink/map.json | 4 ++-- data/maps/TwoIsland_CapeBrink_House/map.json | 4 ++-- data/maps/TwoIsland_Harbor/map.json | 4 ++-- data/maps/TwoIsland_House/map.json | 4 ++-- data/maps/TwoIsland_JoyfulGameCorner/map.json | 4 ++-- data/maps/TwoIsland_PokemonCenter_1F/map.json | 4 ++-- data/maps/TwoIsland_PokemonCenter_2F/map.json | 4 ++-- data/maps/UndergroundPath_EastEntrance/map.json | 4 ++-- data/maps/UndergroundPath_EastWestTunnel/map.json | 4 ++-- data/maps/UndergroundPath_NorthEntrance/map.json | 4 ++-- data/maps/UndergroundPath_NorthSouthTunnel/map.json | 4 ++-- data/maps/UndergroundPath_SouthEntrance/map.json | 4 ++-- data/maps/UndergroundPath_WestEntrance/map.json | 4 ++-- data/maps/UnionRoom/map.json | 4 ++-- data/maps/UnknownMap_18_01/map.json | 4 ++-- data/maps/UnusedHouse_27_00/map.json | 4 ++-- data/maps/UnusedHouse_29_00/map.json | 4 ++-- data/maps/UnusedHouse_31_05/map.json | 4 ++-- data/maps/VermilionCity/map.json | 4 ++-- data/maps/VermilionCity_Gym/map.json | 4 ++-- data/maps/VermilionCity_House1/map.json | 4 ++-- data/maps/VermilionCity_House2/map.json | 4 ++-- data/maps/VermilionCity_House3/map.json | 4 ++-- data/maps/VermilionCity_Mart/map.json | 4 ++-- data/maps/VermilionCity_PokemonCenter_1F/map.json | 4 ++-- data/maps/VermilionCity_PokemonCenter_2F/map.json | 4 ++-- data/maps/VermilionCity_PokemonFanClub/map.json | 4 ++-- data/maps/VictoryRoad_1F/map.json | 4 ++-- data/maps/VictoryRoad_2F/map.json | 4 ++-- data/maps/VictoryRoad_3F/map.json | 4 ++-- data/maps/ViridianCity/map.json | 4 ++-- data/maps/ViridianCity_Gym/map.json | 4 ++-- data/maps/ViridianCity_House1/map.json | 4 ++-- data/maps/ViridianCity_House2/map.json | 4 ++-- data/maps/ViridianCity_Mart/map.json | 4 ++-- data/maps/ViridianCity_PokemonCenter_1F/map.json | 4 ++-- data/maps/ViridianCity_PokemonCenter_2F/map.json | 4 ++-- data/maps/ViridianForest/map.json | 4 ++-- 426 files changed, 850 insertions(+), 851 deletions(-) (limited to 'data') diff --git a/data/maps.s b/data/maps.s index a0ff008cd..1bf2350bb 100644 --- a/data/maps.s +++ b/data/maps.s @@ -1,5 +1,4 @@ #include "constants/layouts.h" -@#include "constants/map_types.h" #include "constants/maps.h" #include "constants/region_map.h" #include "constants/songs.h" diff --git a/data/maps/BattleColosseum_2P/map.json b/data/maps/BattleColosseum_2P/map.json index b455a7799..d9d80e7e9 100644 --- a/data/maps/BattleColosseum_2P/map.json +++ b/data/maps/BattleColosseum_2P/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_8", + "battle_scene": "MAP_BATTLE_SCENE_LINK", "connections": null, "object_events": [ { diff --git a/data/maps/BattleColosseum_4P/map.json b/data/maps/BattleColosseum_4P/map.json index 34ddd8d58..c36a5beca 100644 --- a/data/maps/BattleColosseum_4P/map.json +++ b/data/maps/BattleColosseum_4P/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_8", + "battle_scene": "MAP_BATTLE_SCENE_LINK", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index 427d71e79..5f8c86d9c 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_BIRTH_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index 8370d0264..dfc063ad9 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_BIRTH_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index f3b316694..7753d987f 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE16", diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json index 1fbea392b..264fd2aa6 100644 --- a/data/maps/CeladonCity_Condominiums_1F/map.json +++ b/data/maps/CeladonCity_Condominiums_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json index eb8df96d2..f2d2e8de6 100644 --- a/data/maps/CeladonCity_Condominiums_2F/map.json +++ b/data/maps/CeladonCity_Condominiums_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json index b78a2117f..89d78d255 100644 --- a/data/maps/CeladonCity_Condominiums_3F/map.json +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_Condominiums_Roof/map.json b/data/maps/CeladonCity_Condominiums_Roof/map.json index 080f59ed4..428acdf99 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/map.json +++ b/data/maps/CeladonCity_Condominiums_Roof/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index fd4f99898..4b7c69e3a 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json index f619c66dd..beb73045e 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": true, "floor_number": 1, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json index 3de080f17..31cf48f57 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": true, "floor_number": 2, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json index 47d39bf09..4948847ef 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": true, "floor_number": 3, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json index 671d5b450..298d207c2 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": true, "floor_number": 4, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json index 3390b6818..b2b31ef7f 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": true, "floor_number": 5, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json index 7da40ec98..2a1af1699 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json index ecadef2cc..861954bd3 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": true, "floor_number": 127, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json index 01b5b7422..1733a8f35 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json index 606306978..9dcaf101a 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json index 0007c4847..ac88b5869 100644 --- a/data/maps/CeladonCity_Gym/map.json +++ b/data/maps/CeladonCity_Gym/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_1", + "battle_scene": "MAP_BATTLE_SCENE_GYM", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json index ac08487df..964db9cab 100644 --- a/data/maps/CeladonCity_Hotel/map.json +++ b/data/maps/CeladonCity_Hotel/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json index 48e444cdb..37231d091 100644 --- a/data/maps/CeladonCity_House1/map.json +++ b/data/maps/CeladonCity_House1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json index 225667b40..58df64cf8 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json index 7daf9fb09..88dab9bec 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json index 50603778c..b84bbabd6 100644 --- a/data/maps/CeladonCity_Restaurant/map.json +++ b/data/maps/CeladonCity_Restaurant/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json index af27c9466..beadaeab9 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json index 7c3881be1..1390abd3d 100644 --- a/data/maps/CeruleanCave_2F/map.json +++ b/data/maps/CeruleanCave_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json index 8838be07b..7dccb782c 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index 0e6d47f3a..087f39320 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE24", diff --git a/data/maps/CeruleanCity_BikeShop/map.json b/data/maps/CeruleanCity_BikeShop/map.json index f280880cc..4bf7375b8 100644 --- a/data/maps/CeruleanCity_BikeShop/map.json +++ b/data/maps/CeruleanCity_BikeShop/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeruleanCity_Gym/map.json b/data/maps/CeruleanCity_Gym/map.json index 1c4ad61a3..afe882548 100644 --- a/data/maps/CeruleanCity_Gym/map.json +++ b/data/maps/CeruleanCity_Gym/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_1", + "battle_scene": "MAP_BATTLE_SCENE_GYM", "connections": null, "object_events": [ { diff --git a/data/maps/CeruleanCity_House1/map.json b/data/maps/CeruleanCity_House1/map.json index 1f67451f0..0b1d03a40 100644 --- a/data/maps/CeruleanCity_House1/map.json +++ b/data/maps/CeruleanCity_House1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeruleanCity_House2/map.json b/data/maps/CeruleanCity_House2/map.json index d2a4fb8a3..69d20876a 100644 --- a/data/maps/CeruleanCity_House2/map.json +++ b/data/maps/CeruleanCity_House2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeruleanCity_House3/map.json b/data/maps/CeruleanCity_House3/map.json index 1eb28225c..33095af54 100644 --- a/data/maps/CeruleanCity_House3/map.json +++ b/data/maps/CeruleanCity_House3/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeruleanCity_House4/map.json b/data/maps/CeruleanCity_House4/map.json index 28de36729..9c5a61b63 100644 --- a/data/maps/CeruleanCity_House4/map.json +++ b/data/maps/CeruleanCity_House4/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeruleanCity_House5/map.json b/data/maps/CeruleanCity_House5/map.json index 6b50087a7..eae14c1e4 100644 --- a/data/maps/CeruleanCity_House5/map.json +++ b/data/maps/CeruleanCity_House5/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeruleanCity_Mart/map.json b/data/maps/CeruleanCity_Mart/map.json index bfa3baa0e..e247e3cd4 100644 --- a/data/maps/CeruleanCity_Mart/map.json +++ b/data/maps/CeruleanCity_Mart/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json index 7a4947b16..dac0de4b5 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json index b3e088f33..7eb69e6a4 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index 3b784648a..0c8fe0ac6 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE21_SOUTH", diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json index 4dd966550..1afa900b9 100644 --- a/data/maps/CinnabarIsland_Gym/map.json +++ b/data/maps/CinnabarIsland_Gym/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_1", + "battle_scene": "MAP_BATTLE_SCENE_GYM", "connections": null, "object_events": [ { diff --git a/data/maps/CinnabarIsland_Mart/map.json b/data/maps/CinnabarIsland_Mart/map.json index 590d50409..a02302367 100644 --- a/data/maps/CinnabarIsland_Mart/map.json +++ b/data/maps/CinnabarIsland_Mart/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json index 472e9e0c5..06ecc5419 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json index ae1dc7b64..c4bcde4e4 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json index 85954ed9a..4f446c65e 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json index 9b9cb49db..cefc5bcc4 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json index 43a233c11..68d681613 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json index 097039140..54015fcc3 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/DiglettsCave_B1F/map.json b/data/maps/DiglettsCave_B1F/map.json index abb8e4d0e..13cdfac0a 100644 --- a/data/maps/DiglettsCave_B1F/map.json +++ b/data/maps/DiglettsCave_B1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_DIGLETTS_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/DiglettsCave_NorthEntrance/map.json b/data/maps/DiglettsCave_NorthEntrance/map.json index a30676d5b..4427d4d17 100644 --- a/data/maps/DiglettsCave_NorthEntrance/map.json +++ b/data/maps/DiglettsCave_NorthEntrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_DIGLETTS_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/DiglettsCave_SouthEntrance/map.json b/data/maps/DiglettsCave_SouthEntrance/map.json index a78a6f951..591a998e3 100644 --- a/data/maps/DiglettsCave_SouthEntrance/map.json +++ b/data/maps/DiglettsCave_SouthEntrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_DIGLETTS_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index 7f4c53c1f..46eb15806 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_FIVE_ISLAND_WATER_LABYRINTH", diff --git a/data/maps/FiveIsland_Harbor/map.json b/data/maps/FiveIsland_Harbor/map.json index 6d3444755..bfbcfd8f6 100644 --- a/data/maps/FiveIsland_Harbor/map.json +++ b/data/maps/FiveIsland_Harbor/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland_House1/map.json b/data/maps/FiveIsland_House1/map.json index 82fc173f3..8e8e974ba 100644 --- a/data/maps/FiveIsland_House1/map.json +++ b/data/maps/FiveIsland_House1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland_House2/map.json b/data/maps/FiveIsland_House2/map.json index 97342c187..a97c387d8 100644 --- a/data/maps/FiveIsland_House2/map.json +++ b/data/maps/FiveIsland_House2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland_LostCave_Entrance/map.json b/data/maps/FiveIsland_LostCave_Entrance/map.json index 69e844f7c..b257237bd 100644 --- a/data/maps/FiveIsland_LostCave_Entrance/map.json +++ b/data/maps/FiveIsland_LostCave_Entrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/FiveIsland_LostCave_Room1/map.json b/data/maps/FiveIsland_LostCave_Room1/map.json index 3d68d5f6d..fa79e4245 100644 --- a/data/maps/FiveIsland_LostCave_Room1/map.json +++ b/data/maps/FiveIsland_LostCave_Room1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json index fc14e997b..f1c963b0e 100644 --- a/data/maps/FiveIsland_LostCave_Room10/map.json +++ b/data/maps/FiveIsland_LostCave_Room10/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json index be166f1c6..50ecf922f 100644 --- a/data/maps/FiveIsland_LostCave_Room11/map.json +++ b/data/maps/FiveIsland_LostCave_Room11/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json index 90367bcb0..5a8fef3d2 100644 --- a/data/maps/FiveIsland_LostCave_Room12/map.json +++ b/data/maps/FiveIsland_LostCave_Room12/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json index a0200e532..fc2dd61bf 100644 --- a/data/maps/FiveIsland_LostCave_Room13/map.json +++ b/data/maps/FiveIsland_LostCave_Room13/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json index 0c4d6edb7..84cddd2ea 100644 --- a/data/maps/FiveIsland_LostCave_Room14/map.json +++ b/data/maps/FiveIsland_LostCave_Room14/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland_LostCave_Room2/map.json b/data/maps/FiveIsland_LostCave_Room2/map.json index 2f4bef72e..eaeabf81b 100644 --- a/data/maps/FiveIsland_LostCave_Room2/map.json +++ b/data/maps/FiveIsland_LostCave_Room2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/FiveIsland_LostCave_Room3/map.json b/data/maps/FiveIsland_LostCave_Room3/map.json index bb571ceb6..bcd56fec5 100644 --- a/data/maps/FiveIsland_LostCave_Room3/map.json +++ b/data/maps/FiveIsland_LostCave_Room3/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/FiveIsland_LostCave_Room4/map.json b/data/maps/FiveIsland_LostCave_Room4/map.json index 3740070aa..2035f850e 100644 --- a/data/maps/FiveIsland_LostCave_Room4/map.json +++ b/data/maps/FiveIsland_LostCave_Room4/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland_LostCave_Room5/map.json b/data/maps/FiveIsland_LostCave_Room5/map.json index 40ee7ecdd..94a33e0be 100644 --- a/data/maps/FiveIsland_LostCave_Room5/map.json +++ b/data/maps/FiveIsland_LostCave_Room5/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/FiveIsland_LostCave_Room6/map.json b/data/maps/FiveIsland_LostCave_Room6/map.json index d9742e151..1941530d6 100644 --- a/data/maps/FiveIsland_LostCave_Room6/map.json +++ b/data/maps/FiveIsland_LostCave_Room6/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/FiveIsland_LostCave_Room7/map.json b/data/maps/FiveIsland_LostCave_Room7/map.json index f28f2c022..459c54736 100644 --- a/data/maps/FiveIsland_LostCave_Room7/map.json +++ b/data/maps/FiveIsland_LostCave_Room7/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/FiveIsland_LostCave_Room8/map.json b/data/maps/FiveIsland_LostCave_Room8/map.json index 836ec128a..d0c0c0d87 100644 --- a/data/maps/FiveIsland_LostCave_Room8/map.json +++ b/data/maps/FiveIsland_LostCave_Room8/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/FiveIsland_LostCave_Room9/map.json b/data/maps/FiveIsland_LostCave_Room9/map.json index 3624b9a74..1669d671e 100644 --- a/data/maps/FiveIsland_LostCave_Room9/map.json +++ b/data/maps/FiveIsland_LostCave_Room9/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index d757c2961..ea727f86d 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FIVE_ISLE_MEADOW", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_FIVE_ISLAND", diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json index d53bbb174..68694d602 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MEMORIAL_PILLAR", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_FIVE_ISLAND_MEADOW", diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json index baea9f6b7..31986b11c 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json index 257e2ced0..975a71c51 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json index e408f0916..868b8cda7 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_RESORT_GORGEOUS", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_FIVE_ISLAND_WATER_LABYRINTH", diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json index 5ab4ff749..4ab961ce8 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_RESORT_GORGEOUS", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index ee97d08a9..96ff51d8c 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROCKET_WAREHOUSE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": false, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_3", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_2", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland_WaterLabyrinth/map.json b/data/maps/FiveIsland_WaterLabyrinth/map.json index 2e0aa3389..78bfa06b4 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/map.json +++ b/data/maps/FiveIsland_WaterLabyrinth/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_WATER_LABYRINTH", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_FIVE_ISLAND_RESORT_GORGEOUS", diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index 304aec2ec..9a31449a1 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json index c7639dba4..0c7760b98 100644 --- a/data/maps/FourIsland_Harbor/map.json +++ b/data/maps/FourIsland_Harbor/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json index ddd2526d6..55889c185 100644 --- a/data/maps/FourIsland_House1/map.json +++ b/data/maps/FourIsland_House1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json index 966ed42cc..b9ec87bc0 100644 --- a/data/maps/FourIsland_House2/map.json +++ b/data/maps/FourIsland_House2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json index f74cf52f7..7ecb022f9 100644 --- a/data/maps/FourIsland_IcefallCave_1F/map.json +++ b/data/maps/FourIsland_IcefallCave_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json index 7f5b9d9bc..c07a00e61 100644 --- a/data/maps/FourIsland_IcefallCave_B1F/map.json +++ b/data/maps/FourIsland_IcefallCave_B1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json index 5abbcad40..f542cbfd9 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FourIsland_IcefallCave_Entrance/map.json b/data/maps/FourIsland_IcefallCave_Entrance/map.json index 73ccda724..0dfe89452 100644 --- a/data/maps/FourIsland_IcefallCave_Entrance/map.json +++ b/data/maps/FourIsland_IcefallCave_Entrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json index ad3d1506e..0b447056c 100644 --- a/data/maps/FourIsland_LoreleisHouse/map.json +++ b/data/maps/FourIsland_LoreleisHouse/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json index dceda6844..901bcf22d 100644 --- a/data/maps/FourIsland_Mart/map.json +++ b/data/maps/FourIsland_Mart/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json index 14e23287a..f5a0751ae 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/map.json +++ b/data/maps/FourIsland_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json index d42af0c96..9818ab609 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/map.json +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FourIsland_PokemonDayCare/map.json b/data/maps/FourIsland_PokemonDayCare/map.json index 32106a6f8..3d380f53c 100644 --- a/data/maps/FourIsland_PokemonDayCare/map.json +++ b/data/maps/FourIsland_PokemonDayCare/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index 435aa27ce..5aeab97b9 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE19", diff --git a/data/maps/FuchsiaCity_Gym/map.json b/data/maps/FuchsiaCity_Gym/map.json index 24b366dc3..c07403503 100644 --- a/data/maps/FuchsiaCity_Gym/map.json +++ b/data/maps/FuchsiaCity_Gym/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_1", + "battle_scene": "MAP_BATTLE_SCENE_GYM", "connections": null, "object_events": [ { diff --git a/data/maps/FuchsiaCity_House1/map.json b/data/maps/FuchsiaCity_House1/map.json index b2f6b3821..a45861216 100644 --- a/data/maps/FuchsiaCity_House1/map.json +++ b/data/maps/FuchsiaCity_House1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FuchsiaCity_House2/map.json b/data/maps/FuchsiaCity_House2/map.json index 5cade9de3..b90a8e3cc 100644 --- a/data/maps/FuchsiaCity_House2/map.json +++ b/data/maps/FuchsiaCity_House2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FuchsiaCity_House3/map.json b/data/maps/FuchsiaCity_House3/map.json index 5232ad52c..8454ca7de 100644 --- a/data/maps/FuchsiaCity_House3/map.json +++ b/data/maps/FuchsiaCity_House3/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FuchsiaCity_Mart/map.json b/data/maps/FuchsiaCity_Mart/map.json index 0f8ad923c..6b8a28db2 100644 --- a/data/maps/FuchsiaCity_Mart/map.json +++ b/data/maps/FuchsiaCity_Mart/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json index 669197f62..7df358659 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json index 03f2ffdc9..c2a20fb9e 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json index 81bbbe0de..d10098769 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FuchsiaCity_SafariZone_Office/map.json b/data/maps/FuchsiaCity_SafariZone_Office/map.json index a6b87f83f..fc65b8308 100644 --- a/data/maps/FuchsiaCity_SafariZone_Office/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Office/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FuchsiaCity_WardensHouse/map.json b/data/maps/FuchsiaCity_WardensHouse/map.json index 5d7a336a3..f6333f402 100644 --- a/data/maps/FuchsiaCity_WardensHouse/map.json +++ b/data/maps/FuchsiaCity_WardensHouse/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json index b04bf44f8..70c8e240c 100644 --- a/data/maps/IndigoPlateau_Exterior/map.json +++ b/data/maps/IndigoPlateau_Exterior/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_INDIGO_PLATEAU", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE23", diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json index b80e849dc..ff5e1b0ca 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_INDIGO_PLATEAU", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_1", + "battle_scene": "MAP_BATTLE_SCENE_GYM", "connections": null, "object_events": [ { diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json index c921f749a..6eeb47d03 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_INDIGO_PLATEAU", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_1", + "battle_scene": "MAP_BATTLE_SCENE_GYM", "connections": null, "object_events": [ { diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json index 5487e46a6..c3e98f4e9 100644 --- a/data/maps/LavenderTown/map.json +++ b/data/maps/LavenderTown/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE10", diff --git a/data/maps/LavenderTown_House1/map.json b/data/maps/LavenderTown_House1/map.json index 8d08e5c62..23f767cad 100644 --- a/data/maps/LavenderTown_House1/map.json +++ b/data/maps/LavenderTown_House1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/LavenderTown_House2/map.json b/data/maps/LavenderTown_House2/map.json index 5dd921222..0318b07a8 100644 --- a/data/maps/LavenderTown_House2/map.json +++ b/data/maps/LavenderTown_House2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/LavenderTown_Mart/map.json b/data/maps/LavenderTown_Mart/map.json index 2f3d07c1f..44e4fdb2f 100644 --- a/data/maps/LavenderTown_Mart/map.json +++ b/data/maps/LavenderTown_Mart/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json index 93709d792..955d6f37c 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json index e7f72076f..0605f499a 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json index 6c609ded5..e292b44e4 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index 897bee57b..fcdf6edb2 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json index 9e7dd93d0..e0f972558 100644 --- a/data/maps/MtEmber_RubyPath_1F/map.json +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json index 083ccb2cb..46362d54e 100644 --- a/data/maps/MtEmber_RubyPath_B1F/map.json +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json index a7ad6ecd7..11ec64838 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json index 5f8c95c07..29d74a5a6 100644 --- a/data/maps/MtEmber_RubyPath_B2F/map.json +++ b/data/maps/MtEmber_RubyPath_B2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json index f09272f7a..47e9c1c87 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index 47c4ce93c..698499402 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/MtEmber_RubyPath_B4F/map.json b/data/maps/MtEmber_RubyPath_B4F/map.json index 0c25880d9..c10c21ff9 100644 --- a/data/maps/MtEmber_RubyPath_B4F/map.json +++ b/data/maps/MtEmber_RubyPath_B4F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json index e29b372b7..2d0964a1d 100644 --- a/data/maps/MtEmber_RubyPath_B5F/map.json +++ b/data/maps/MtEmber_RubyPath_B5F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json index ab7db2ca2..3545b5ba2 100644 --- a/data/maps/MtEmber_Summit/map.json +++ b/data/maps/MtEmber_Summit/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/MtEmber_SummitPath_1F/map.json b/data/maps/MtEmber_SummitPath_1F/map.json index 0beb133b9..77c89d7f2 100644 --- a/data/maps/MtEmber_SummitPath_1F/map.json +++ b/data/maps/MtEmber_SummitPath_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json index e6da5a57d..02496f3e9 100644 --- a/data/maps/MtEmber_SummitPath_2F/map.json +++ b/data/maps/MtEmber_SummitPath_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/MtEmber_SummitPath_3F/map.json b/data/maps/MtEmber_SummitPath_3F/map.json index c16b28dbf..330bc6fe5 100644 --- a/data/maps/MtEmber_SummitPath_3F/map.json +++ b/data/maps/MtEmber_SummitPath_3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json index 85f7fbb78..f5b829469 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_MOON", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/MtMoon_B1F/map.json b/data/maps/MtMoon_B1F/map.json index f83691f36..e330d5510 100644 --- a/data/maps/MtMoon_B1F/map.json +++ b/data/maps/MtMoon_B1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_MOON", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index 04f9e3ba7..f0a3ba3a9 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_MOON", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/NavelRock_1F/map.json b/data/maps/NavelRock_1F/map.json index a6dfadacf..703240141 100644 --- a/data/maps/NavelRock_1F/map.json +++ b/data/maps/NavelRock_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_B1F/map.json b/data/maps/NavelRock_B1F/map.json index ea5fe3e91..b1a6deada 100644 --- a/data/maps/NavelRock_B1F/map.json +++ b/data/maps/NavelRock_B1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json index 9fdc7d85c..98d1145fc 100644 --- a/data/maps/NavelRock_Base/map.json +++ b/data/maps/NavelRock_Base/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/NavelRock_BasePath_B10F/map.json b/data/maps/NavelRock_BasePath_B10F/map.json index 878c75c14..716ae04db 100644 --- a/data/maps/NavelRock_BasePath_B10F/map.json +++ b/data/maps/NavelRock_BasePath_B10F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_BasePath_B11F/map.json b/data/maps/NavelRock_BasePath_B11F/map.json index 523512c66..1b92ca1fc 100644 --- a/data/maps/NavelRock_BasePath_B11F/map.json +++ b/data/maps/NavelRock_BasePath_B11F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_BasePath_B1F/map.json b/data/maps/NavelRock_BasePath_B1F/map.json index 5d3300afd..624f800ee 100644 --- a/data/maps/NavelRock_BasePath_B1F/map.json +++ b/data/maps/NavelRock_BasePath_B1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_BasePath_B2F/map.json b/data/maps/NavelRock_BasePath_B2F/map.json index 170ba3f54..b6af50439 100644 --- a/data/maps/NavelRock_BasePath_B2F/map.json +++ b/data/maps/NavelRock_BasePath_B2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_BasePath_B3F/map.json b/data/maps/NavelRock_BasePath_B3F/map.json index a63972f29..22cc90c60 100644 --- a/data/maps/NavelRock_BasePath_B3F/map.json +++ b/data/maps/NavelRock_BasePath_B3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_BasePath_B4F/map.json b/data/maps/NavelRock_BasePath_B4F/map.json index 8d8154d98..33c4d41be 100644 --- a/data/maps/NavelRock_BasePath_B4F/map.json +++ b/data/maps/NavelRock_BasePath_B4F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_BasePath_B5F/map.json b/data/maps/NavelRock_BasePath_B5F/map.json index 2b1ecc69c..26cf212c6 100644 --- a/data/maps/NavelRock_BasePath_B5F/map.json +++ b/data/maps/NavelRock_BasePath_B5F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_BasePath_B6F/map.json b/data/maps/NavelRock_BasePath_B6F/map.json index a8c91baac..0d3ffdf8f 100644 --- a/data/maps/NavelRock_BasePath_B6F/map.json +++ b/data/maps/NavelRock_BasePath_B6F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_BasePath_B7F/map.json b/data/maps/NavelRock_BasePath_B7F/map.json index 92cc0db51..acfc1da43 100644 --- a/data/maps/NavelRock_BasePath_B7F/map.json +++ b/data/maps/NavelRock_BasePath_B7F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_BasePath_B8F/map.json b/data/maps/NavelRock_BasePath_B8F/map.json index 2e7411dc1..4756a0655 100644 --- a/data/maps/NavelRock_BasePath_B8F/map.json +++ b/data/maps/NavelRock_BasePath_B8F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_BasePath_B9F/map.json b/data/maps/NavelRock_BasePath_B9F/map.json index 509fa31a8..d033dd887 100644 --- a/data/maps/NavelRock_BasePath_B9F/map.json +++ b/data/maps/NavelRock_BasePath_B9F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_Exterior/map.json b/data/maps/NavelRock_Exterior/map.json index e289a9c2d..9b10f6d8c 100644 --- a/data/maps/NavelRock_Exterior/map.json +++ b/data/maps/NavelRock_Exterior/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_Fork/map.json b/data/maps/NavelRock_Fork/map.json index 8debab71d..ec9fec5df 100644 --- a/data/maps/NavelRock_Fork/map.json +++ b/data/maps/NavelRock_Fork/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index 8977a044e..796f67e5f 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index f0c8f6e96..3c2f599d5 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_SHADE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/NavelRock_SummitPath_2F/map.json b/data/maps/NavelRock_SummitPath_2F/map.json index aaa04a93b..d103d5f70 100644 --- a/data/maps/NavelRock_SummitPath_2F/map.json +++ b/data/maps/NavelRock_SummitPath_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_SummitPath_3F/map.json b/data/maps/NavelRock_SummitPath_3F/map.json index 82ac96c65..3a122a2d2 100644 --- a/data/maps/NavelRock_SummitPath_3F/map.json +++ b/data/maps/NavelRock_SummitPath_3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_SummitPath_4F/map.json b/data/maps/NavelRock_SummitPath_4F/map.json index c6de6d430..fa74a2c92 100644 --- a/data/maps/NavelRock_SummitPath_4F/map.json +++ b/data/maps/NavelRock_SummitPath_4F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_SummitPath_5F/map.json b/data/maps/NavelRock_SummitPath_5F/map.json index b4ddeeb85..25d3ba773 100644 --- a/data/maps/NavelRock_SummitPath_5F/map.json +++ b/data/maps/NavelRock_SummitPath_5F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json index e734062aa..06d8b7c6d 100644 --- a/data/maps/OneIsland/map.json +++ b/data/maps/OneIsland/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ONE_ISLAND_TREASURE_BEACH", diff --git a/data/maps/OneIsland_Harbor/map.json b/data/maps/OneIsland_Harbor/map.json index f426bcddb..a505aa5d0 100644 --- a/data/maps/OneIsland_Harbor/map.json +++ b/data/maps/OneIsland_Harbor/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/OneIsland_House1/map.json b/data/maps/OneIsland_House1/map.json index 21a84244c..8ef48b424 100644 --- a/data/maps/OneIsland_House1/map.json +++ b/data/maps/OneIsland_House1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/OneIsland_House2/map.json b/data/maps/OneIsland_House2/map.json index 6c7622320..bb9b1da3f 100644 --- a/data/maps/OneIsland_House2/map.json +++ b/data/maps/OneIsland_House2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index 6c5261d87..01e5b92e7 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_KINDLE_ROAD", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ONE_ISLAND", diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json index 56330cc18..0a50424cb 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_EMBER_SPA", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index 6844a64f7..07d68dfc1 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json index 34076f9c7..5b20f3609 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/map.json +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/OneIsland_TreasureBeach/map.json b/data/maps/OneIsland_TreasureBeach/map.json index b8bb2753d..2198e9b44 100644 --- a/data/maps/OneIsland_TreasureBeach/map.json +++ b/data/maps/OneIsland_TreasureBeach/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TREASURE_BEACH", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ONE_ISLAND", diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index ebb3452ed..58924be03 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE1", diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json index 70912d327..6b44f7eb3 100644 --- a/data/maps/PalletTown_GarysHouse/map.json +++ b/data/maps/PalletTown_GarysHouse/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json index 2bf43f757..414766d99 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/map.json +++ b/data/maps/PalletTown_PlayersHouse_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/PalletTown_PlayersHouse_2F/map.json b/data/maps/PalletTown_PlayersHouse_2F/map.json index 913e5edbb..67befec6c 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/map.json +++ b/data/maps/PalletTown_PlayersHouse_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index 2740a0b4a..31e6014cb 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index 5a2876338..fb235f0c5 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE2", diff --git a/data/maps/PewterCity_Gym/map.json b/data/maps/PewterCity_Gym/map.json index 7bf1745d3..45c972196 100644 --- a/data/maps/PewterCity_Gym/map.json +++ b/data/maps/PewterCity_Gym/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_1", + "battle_scene": "MAP_BATTLE_SCENE_GYM", "connections": null, "object_events": [ { diff --git a/data/maps/PewterCity_House1/map.json b/data/maps/PewterCity_House1/map.json index 6018bd0de..ca16f11a1 100644 --- a/data/maps/PewterCity_House1/map.json +++ b/data/maps/PewterCity_House1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/PewterCity_House2/map.json b/data/maps/PewterCity_House2/map.json index 4f94f6112..27fb0810c 100644 --- a/data/maps/PewterCity_House2/map.json +++ b/data/maps/PewterCity_House2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/PewterCity_Mart/map.json b/data/maps/PewterCity_Mart/map.json index 97d42e276..77983d9f3 100644 --- a/data/maps/PewterCity_Mart/map.json +++ b/data/maps/PewterCity_Mart/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index 951aab31e..ced7102e2 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/PewterCity_Museum_2F/map.json b/data/maps/PewterCity_Museum_2F/map.json index 540c5507c..c7e1c8d8d 100644 --- a/data/maps/PewterCity_Museum_2F/map.json +++ b/data/maps/PewterCity_Museum_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json index 70b06a013..e4858844c 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/map.json +++ b/data/maps/PewterCity_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json index db2170831..445b86eb3 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/map.json +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonLeague_AgathasRoom/map.json b/data/maps/PokemonLeague_AgathasRoom/map.json index 4ad8d6f26..68dd0db42 100644 --- a/data/maps/PokemonLeague_AgathasRoom/map.json +++ b/data/maps/PokemonLeague_AgathasRoom/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_6", + "battle_scene": "MAP_BATTLE_SCENE_AGATHA", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json index 2f96b33d3..6153f4808 100644 --- a/data/maps/PokemonLeague_BrunosRoom/map.json +++ b/data/maps/PokemonLeague_BrunosRoom/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_5", + "battle_scene": "MAP_BATTLE_SCENE_BRUNO", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json index 944b3570a..f8e9422c3 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/map.json +++ b/data/maps/PokemonLeague_ChampionsRoom/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonLeague_HallOfFame/map.json b/data/maps/PokemonLeague_HallOfFame/map.json index 0fc1e3d99..16c9d05ec 100644 --- a/data/maps/PokemonLeague_HallOfFame/map.json +++ b/data/maps/PokemonLeague_HallOfFame/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json index 9629713b3..332ed15b8 100644 --- a/data/maps/PokemonLeague_LancesRoom/map.json +++ b/data/maps/PokemonLeague_LancesRoom/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_7", + "battle_scene": "MAP_BATTLE_SCENE_LANCE", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonLeague_LoreleisRoom/map.json b/data/maps/PokemonLeague_LoreleisRoom/map.json index 462583db1..d308c7975 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/map.json +++ b/data/maps/PokemonLeague_LoreleisRoom/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_4", + "battle_scene": "MAP_BATTLE_SCENE_LORELEI", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json index ddb5037b1..da4e01f1e 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, "weather": "WEATHER_SHADE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_3", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_2", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json index b95531ca0..3701da351 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, "weather": "WEATHER_SHADE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_3", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_2", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index ce8a30fa6..e3d599d9f 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, "weather": "WEATHER_SHADE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_3", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_2", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index dd9a03404..c4a876461 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, "weather": "WEATHER_SHADE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_3", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_2", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonTower_1F/map.json b/data/maps/PokemonTower_1F/map.json index 5b062c2e3..0b6d23cd3 100644 --- a/data/maps/PokemonTower_1F/map.json +++ b/data/maps/PokemonTower_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": false, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json index 927497f78..0d9b51490 100644 --- a/data/maps/PokemonTower_2F/map.json +++ b/data/maps/PokemonTower_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": false, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json index 738c33892..8f234e935 100644 --- a/data/maps/PokemonTower_3F/map.json +++ b/data/maps/PokemonTower_3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": false, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json index 45fd8df10..47ee6cc43 100644 --- a/data/maps/PokemonTower_4F/map.json +++ b/data/maps/PokemonTower_4F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": false, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json index 1d3fb711e..a1f0fc109 100644 --- a/data/maps/PokemonTower_5F/map.json +++ b/data/maps/PokemonTower_5F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": false, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json index ec7a085a1..7ef95333a 100644 --- a/data/maps/PokemonTower_6F/map.json +++ b/data/maps/PokemonTower_6F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": false, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json index 33a616f96..e01c53116 100644 --- a/data/maps/PokemonTower_7F/map.json +++ b/data/maps/PokemonTower_7F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": false, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [ { diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json index 8deaf33ff..18099fc15 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POWER_PLANT", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_3", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_2", "connections": null, "object_events": [ { diff --git a/data/maps/Prototype_SeviiIsle_6/map.json b/data/maps/Prototype_SeviiIsle_6/map.json index a2679346e..761c204ce 100644 --- a/data/maps/Prototype_SeviiIsle_6/map.json +++ b/data/maps/Prototype_SeviiIsle_6/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEVII_ISLE_6", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_THREE_ISLAND", diff --git a/data/maps/Prototype_SeviiIsle_7/map.json b/data/maps/Prototype_SeviiIsle_7/map.json index 8a9e59a11..856883c02 100644 --- a/data/maps/Prototype_SeviiIsle_7/map.json +++ b/data/maps/Prototype_SeviiIsle_7/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEVII_ISLE_7", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_THREE_ISLAND", diff --git a/data/maps/Prototype_SeviiIsle_8/map.json b/data/maps/Prototype_SeviiIsle_8/map.json index 0c19f8b14..dd05d6d35 100644 --- a/data/maps/Prototype_SeviiIsle_8/map.json +++ b/data/maps/Prototype_SeviiIsle_8/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEVII_ISLE_8", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [], diff --git a/data/maps/Prototype_SeviiIsle_9/map.json b/data/maps/Prototype_SeviiIsle_9/map.json index 1c24e70f2..b03f3866c 100644 --- a/data/maps/Prototype_SeviiIsle_9/map.json +++ b/data/maps/Prototype_SeviiIsle_9/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEVII_ISLE_9", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [], diff --git a/data/maps/RecordCenter/map.json b/data/maps/RecordCenter/map.json index 974b56f41..0a1f10925 100644 --- a/data/maps/RecordCenter/map.json +++ b/data/maps/RecordCenter/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index af58ddebf..6bb68f578 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROCK_TUNNEL", "requires_flash": true, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index 99106f92c..bebd68148 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROCK_TUNNEL", "requires_flash": true, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json index 8e0c1406f..b80daf9d5 100644 --- a/data/maps/RocketHideout_B1F/map.json +++ b/data/maps/RocketHideout_B1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": -1, - "battle_scene": "BATTLE_SCENE_3", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_2", "connections": null, "object_events": [ { diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json index 1855f54f9..5daefa002 100644 --- a/data/maps/RocketHideout_B2F/map.json +++ b/data/maps/RocketHideout_B2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": -2, - "battle_scene": "BATTLE_SCENE_3", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_2", "connections": null, "object_events": [ { diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json index 9ade4ac35..984757f1e 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": -3, - "battle_scene": "BATTLE_SCENE_3", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_2", "connections": null, "object_events": [ { diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index 3e4f05f9c..bd38e3b71 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": -4, - "battle_scene": "BATTLE_SCENE_3", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_2", "connections": null, "object_events": [ { diff --git a/data/maps/RocketHideout_Elevator/map.json b/data/maps/RocketHideout_Elevator/map.json index 45a57249d..8e2d35889 100644 --- a/data/maps/RocketHideout_Elevator/map.json +++ b/data/maps/RocketHideout_Elevator/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_3", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_2", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json index 9b6547be6..d8af63766 100644 --- a/data/maps/Route1/map.json +++ b/data/maps/Route1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_1", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_VIRIDIAN_CITY", diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index 1c49d6240..655b754f8 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_10", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_LAVENDER_TOWN", diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json index a9baaa56d..3d4a72c7f 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_10", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json index 93dafeade..f9aae8494 100644 --- a/data/maps/Route10_PokemonCenter_2F/map.json +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_10", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json index b3720463a..2dfa99d41 100644 --- a/data/maps/Route11/map.json +++ b/data/maps/Route11/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_11", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_VERMILION_CITY", diff --git a/data/maps/Route11_EastEntrance_1F/map.json b/data/maps/Route11_EastEntrance_1F/map.json index 0bf683d84..558e82fa9 100644 --- a/data/maps/Route11_EastEntrance_1F/map.json +++ b/data/maps/Route11_EastEntrance_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_11", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json index bd50c4d9e..bae5a824f 100644 --- a/data/maps/Route11_EastEntrance_2F/map.json +++ b/data/maps/Route11_EastEntrance_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_11", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index 11790e23a..d11f613bf 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_LAVENDER_TOWN", diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json index 2e792d586..f0497dcdd 100644 --- a/data/maps/Route12_FishingHouse/map.json +++ b/data/maps/Route12_FishingHouse/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route12_NorthEntrance_1F/map.json b/data/maps/Route12_NorthEntrance_1F/map.json index cb4996f5d..d357e4dc3 100644 --- a/data/maps/Route12_NorthEntrance_1F/map.json +++ b/data/maps/Route12_NorthEntrance_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json index 379bb5db0..69fe7cc80 100644 --- a/data/maps/Route12_NorthEntrance_2F/map.json +++ b/data/maps/Route12_NorthEntrance_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index 52480bd5f..9a8df1757 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_13", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE12", diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index 1e127e4bb..a6e07e6bb 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_14", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE15", diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index ad47154d5..bc368ca01 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_15", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_FUCHSIA_CITY", diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json index 24d75ca24..0959512a2 100644 --- a/data/maps/Route15_WestEntrance_1F/map.json +++ b/data/maps/Route15_WestEntrance_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_15", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json index c1df344e2..1d21cd2b1 100644 --- a/data/maps/Route15_WestEntrance_2F/map.json +++ b/data/maps/Route15_WestEntrance_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_15", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index b6bb53b8f..0dd47cbc6 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE17", diff --git a/data/maps/Route16_House/map.json b/data/maps/Route16_House/map.json index c22a6d47a..dc0d416f4 100644 --- a/data/maps/Route16_House/map.json +++ b/data/maps/Route16_House/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json index 25c134dd3..b9425a4a6 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json index f19dac4f4..551fb5e7a 100644 --- a/data/maps/Route16_NorthEntrance_2F/map.json +++ b/data/maps/Route16_NorthEntrance_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json index 4c9f1cb04..1afe3a6bf 100644 --- a/data/maps/Route17/map.json +++ b/data/maps/Route17/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_17", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE16", diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json index d9bd47f15..6dd7673de 100644 --- a/data/maps/Route18/map.json +++ b/data/maps/Route18/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_18", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE17", diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json index 6721a4be1..741c391f7 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_18", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json index c341cd912..052fe0215 100644 --- a/data/maps/Route18_EastEntrance_2F/map.json +++ b/data/maps/Route18_EastEntrance_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_18", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json index 04cf3bbba..abb670524 100644 --- a/data/maps/Route19/map.json +++ b/data/maps/Route19/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_19", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_FUCHSIA_CITY", diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index c32aed08e..008be4a9f 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_PEWTER_CITY", diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json index 872b24302..e97d95544 100644 --- a/data/maps/Route20/map.json +++ b/data/maps/Route20/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_20", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_CINNABAR_ISLAND", diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json index 0335c2f51..06767be42 100644 --- a/data/maps/Route21_North/map.json +++ b/data/maps/Route21_North/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_21", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_PALLET_TOWN", diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json index e7af08d21..ef022d513 100644 --- a/data/maps/Route21_South/map.json +++ b/data/maps/Route21_South/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_21", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE21_NORTH", diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index 298c43f2a..41aedc6e0 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_22", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE23", diff --git a/data/maps/Route22_NorthEntrance/map.json b/data/maps/Route22_NorthEntrance/map.json index 58cef00c2..20414c25f 100644 --- a/data/maps/Route22_NorthEntrance/map.json +++ b/data/maps/Route22_NorthEntrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_22", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json index e61cf6357..145f20cf3 100644 --- a/data/maps/Route23/map.json +++ b/data/maps/Route23/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_23", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_INDIGO_PLATEAU_EXTERIOR", diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index 391b2b2c1..5fa15ddb3 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_24", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_CERULEAN_CITY", diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index 9e819f255..88d68ca07 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_25", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE24", diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json index d5ae39619..8e4ac79c6 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_25", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route2_EastBuilding/map.json b/data/maps/Route2_EastBuilding/map.json index 8d7f7a60c..613f1d207 100644 --- a/data/maps/Route2_EastBuilding/map.json +++ b/data/maps/Route2_EastBuilding/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route2_House/map.json b/data/maps/Route2_House/map.json index 51202139e..fdf66afb1 100644 --- a/data/maps/Route2_House/map.json +++ b/data/maps/Route2_House/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/map.json b/data/maps/Route2_ViridianForest_NorthEntrance/map.json index 208b70876..478b3045e 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/map.json b/data/maps/Route2_ViridianForest_SouthEntrance/map.json index 4b9d09d58..17e756798 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index 22f5835c4..af0de6644 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_3", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE4", diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index 4a2562932..7fcf32a5d 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_4", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE3", diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json index 6667c65e6..1ce7fbebb 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_4", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index 6cb694eb1..a71194174 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_4", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route5/map.json b/data/maps/Route5/map.json index c33b3b0e2..825ae6068 100644 --- a/data/maps/Route5/map.json +++ b/data/maps/Route5/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_5", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_CERULEAN_CITY", diff --git a/data/maps/Route5_PokemonDayCare/map.json b/data/maps/Route5_PokemonDayCare/map.json index 8d425132e..826c71624 100644 --- a/data/maps/Route5_PokemonDayCare/map.json +++ b/data/maps/Route5_PokemonDayCare/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_5", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json index 6a121c300..5896d1664 100644 --- a/data/maps/Route5_SouthEntrance/map.json +++ b/data/maps/Route5_SouthEntrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_5", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index 994d86064..e6c4c7cf2 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_6", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_SAFFRON_CITY_CONNECTION", diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json index b5f0fa618..40dd5c985 100644 --- a/data/maps/Route6_NorthEntrance/map.json +++ b/data/maps/Route6_NorthEntrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_6", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index 5c4d7a22f..d75cae2e4 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_7", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_CELADON_CITY", diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json index 153d408c0..a311c8eee 100644 --- a/data/maps/Route7_EastEntrance/map.json +++ b/data/maps/Route7_EastEntrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_7", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index 3299bfab6..22663b469 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_8", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_SAFFRON_CITY_CONNECTION", diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json index 0440e1eda..fc6c97792 100644 --- a/data/maps/Route8_WestEntrance/map.json +++ b/data/maps/Route8_WestEntrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_8", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index 296e10f4c..e67441c39 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_9", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_CERULEAN_CITY", diff --git a/data/maps/SSAnne_1F_Corridor/map.json b/data/maps/SSAnne_1F_Corridor/map.json index 10420902e..87d778a25 100644 --- a/data/maps/SSAnne_1F_Corridor/map.json +++ b/data/maps/SSAnne_1F_Corridor/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_1F_Room1/map.json b/data/maps/SSAnne_1F_Room1/map.json index d9658a88e..d018cc7a4 100644 --- a/data/maps/SSAnne_1F_Room1/map.json +++ b/data/maps/SSAnne_1F_Room1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json index 6fcb0ceef..765612f48 100644 --- a/data/maps/SSAnne_1F_Room2/map.json +++ b/data/maps/SSAnne_1F_Room2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_1F_Room3/map.json b/data/maps/SSAnne_1F_Room3/map.json index 4642048b3..e518ae50e 100644 --- a/data/maps/SSAnne_1F_Room3/map.json +++ b/data/maps/SSAnne_1F_Room3/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_1F_Room4/map.json b/data/maps/SSAnne_1F_Room4/map.json index e77125c34..c11aa16b5 100644 --- a/data/maps/SSAnne_1F_Room4/map.json +++ b/data/maps/SSAnne_1F_Room4/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_1F_Room5/map.json b/data/maps/SSAnne_1F_Room5/map.json index 590d8de8f..51935aea2 100644 --- a/data/maps/SSAnne_1F_Room5/map.json +++ b/data/maps/SSAnne_1F_Room5/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_1F_Room6/map.json b/data/maps/SSAnne_1F_Room6/map.json index 5bc9adb03..d6f0a1b44 100644 --- a/data/maps/SSAnne_1F_Room6/map.json +++ b/data/maps/SSAnne_1F_Room6/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_1F_Room7/map.json b/data/maps/SSAnne_1F_Room7/map.json index ee0ab8b1f..315d49099 100644 --- a/data/maps/SSAnne_1F_Room7/map.json +++ b/data/maps/SSAnne_1F_Room7/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json index 1e5dda37c..bb2df92ce 100644 --- a/data/maps/SSAnne_2F_Corridor/map.json +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_2F_Room1/map.json b/data/maps/SSAnne_2F_Room1/map.json index 070d56bb3..6fbbde902 100644 --- a/data/maps/SSAnne_2F_Room1/map.json +++ b/data/maps/SSAnne_2F_Room1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json index 4f8ad260c..1692afc23 100644 --- a/data/maps/SSAnne_2F_Room2/map.json +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_2F_Room3/map.json b/data/maps/SSAnne_2F_Room3/map.json index 781065b46..05ac70a4f 100644 --- a/data/maps/SSAnne_2F_Room3/map.json +++ b/data/maps/SSAnne_2F_Room3/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json index b085d84e2..116380880 100644 --- a/data/maps/SSAnne_2F_Room4/map.json +++ b/data/maps/SSAnne_2F_Room4/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_2F_Room5/map.json b/data/maps/SSAnne_2F_Room5/map.json index ce08f94fa..ca0c68072 100644 --- a/data/maps/SSAnne_2F_Room5/map.json +++ b/data/maps/SSAnne_2F_Room5/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_2F_Room6/map.json b/data/maps/SSAnne_2F_Room6/map.json index 9adc38ef4..fe00765ab 100644 --- a/data/maps/SSAnne_2F_Room6/map.json +++ b/data/maps/SSAnne_2F_Room6/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_3F_Corridor/map.json b/data/maps/SSAnne_3F_Corridor/map.json index be49ce689..fa9ad902a 100644 --- a/data/maps/SSAnne_3F_Corridor/map.json +++ b/data/maps/SSAnne_3F_Corridor/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_B1F_Corridor/map.json b/data/maps/SSAnne_B1F_Corridor/map.json index 5a536d185..86fe58592 100644 --- a/data/maps/SSAnne_B1F_Corridor/map.json +++ b/data/maps/SSAnne_B1F_Corridor/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SSAnne_B1F_Room1/map.json b/data/maps/SSAnne_B1F_Room1/map.json index 556fa324d..25286e3cc 100644 --- a/data/maps/SSAnne_B1F_Room1/map.json +++ b/data/maps/SSAnne_B1F_Room1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json index af9c3af68..bac380ea3 100644 --- a/data/maps/SSAnne_B1F_Room2/map.json +++ b/data/maps/SSAnne_B1F_Room2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json index 63d7e5b3c..e4fecec84 100644 --- a/data/maps/SSAnne_B1F_Room3/map.json +++ b/data/maps/SSAnne_B1F_Room3/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_B1F_Room4/map.json b/data/maps/SSAnne_B1F_Room4/map.json index 9a8ddec21..b72b8f2dd 100644 --- a/data/maps/SSAnne_B1F_Room4/map.json +++ b/data/maps/SSAnne_B1F_Room4/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json index 035e29ceb..9f258f534 100644 --- a/data/maps/SSAnne_B1F_Room5/map.json +++ b/data/maps/SSAnne_B1F_Room5/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json index b56604054..a87171f61 100644 --- a/data/maps/SSAnne_CaptainsOffice/map.json +++ b/data/maps/SSAnne_CaptainsOffice/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_Deck/map.json b/data/maps/SSAnne_Deck/map.json index 6055a5da7..be784748a 100644 --- a/data/maps/SSAnne_Deck/map.json +++ b/data/maps/SSAnne_Deck/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json index 5f7384d5f..c37b2ac5c 100644 --- a/data/maps/SSAnne_Exterior/map.json +++ b/data/maps/SSAnne_Exterior/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index 0d89a72ee..d97f89317 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json index d14c2509d..cc2bd0e60 100644 --- a/data/maps/SafariZone_Center/map.json +++ b/data/maps/SafariZone_Center/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SafariZone_Center_RestHouse/map.json b/data/maps/SafariZone_Center_RestHouse/map.json index db3584eb8..fd3453ef3 100644 --- a/data/maps/SafariZone_Center_RestHouse/map.json +++ b/data/maps/SafariZone_Center_RestHouse/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json index 250d5baf5..a7d35c6fa 100644 --- a/data/maps/SafariZone_East/map.json +++ b/data/maps/SafariZone_East/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SafariZone_East_RestHouse/map.json b/data/maps/SafariZone_East_RestHouse/map.json index 61e33bbe7..12e13fbaa 100644 --- a/data/maps/SafariZone_East_RestHouse/map.json +++ b/data/maps/SafariZone_East_RestHouse/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index eb1b47a60..a4a73f8e2 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SafariZone_North_RestHouse/map.json b/data/maps/SafariZone_North_RestHouse/map.json index d8a96baae..98ac35b33 100644 --- a/data/maps/SafariZone_North_RestHouse/map.json +++ b/data/maps/SafariZone_North_RestHouse/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SafariZone_SecretHouse/map.json b/data/maps/SafariZone_SecretHouse/map.json index 2cd3e44ed..cac992d41 100644 --- a/data/maps/SafariZone_SecretHouse/map.json +++ b/data/maps/SafariZone_SecretHouse/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json index 4caefe6f3..451f7e96d 100644 --- a/data/maps/SafariZone_West/map.json +++ b/data/maps/SafariZone_West/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SafariZone_West_RestHouse/map.json b/data/maps/SafariZone_West_RestHouse/map.json index dd1a2b682..4119d0714 100644 --- a/data/maps/SafariZone_West_RestHouse/map.json +++ b/data/maps/SafariZone_West_RestHouse/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index baba42302..bfd629e91 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE5", diff --git a/data/maps/SaffronCity_Connection/map.json b/data/maps/SaffronCity_Connection/map.json index 410ddef6e..30bcffa06 100644 --- a/data/maps/SaffronCity_Connection/map.json +++ b/data/maps/SaffronCity_Connection/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE5", diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/map.json b/data/maps/SaffronCity_CopycatsHouse_1F/map.json index 0a0075957..9ae377f7c 100644 --- a/data/maps/SaffronCity_CopycatsHouse_1F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/map.json b/data/maps/SaffronCity_CopycatsHouse_2F/map.json index f4c37be81..9460fd5ca 100644 --- a/data/maps/SaffronCity_CopycatsHouse_2F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index e4bebf06e..8f747efd5 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json index a4f2f9c3e..24dd19564 100644 --- a/data/maps/SaffronCity_Gym/map.json +++ b/data/maps/SaffronCity_Gym/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_1", + "battle_scene": "MAP_BATTLE_SCENE_GYM", "connections": null, "object_events": [ { diff --git a/data/maps/SaffronCity_House/map.json b/data/maps/SaffronCity_House/map.json index c53825599..df8e80208 100644 --- a/data/maps/SaffronCity_House/map.json +++ b/data/maps/SaffronCity_House/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json index 7c4012ba0..31374c459 100644 --- a/data/maps/SaffronCity_Mart/map.json +++ b/data/maps/SaffronCity_Mart/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SaffronCity_MrPsychicsHouse/map.json b/data/maps/SaffronCity_MrPsychicsHouse/map.json index f32e7942c..62047365a 100644 --- a/data/maps/SaffronCity_MrPsychicsHouse/map.json +++ b/data/maps/SaffronCity_MrPsychicsHouse/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json index 61abbdbf5..0744a0812 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json index c44c6a11c..aeb3b40b6 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index 65ce3b01c..764ae5897 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json index 4311b6a02..fd9c6ca25 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json index 60241ed55..528d46ae9 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json index 3ac153ccf..5c7219195 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json index 76960ee96..02f2224ff 100644 --- a/data/maps/SeafoamIslands_B3F/map.json +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index 4d5ada91d..eae9e0c51 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json index 69799a0f9..065d2935d 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_SEVEN_ISLAND_TRAINER_TOWER", diff --git a/data/maps/SevenIsland_Harbor/map.json b/data/maps/SevenIsland_Harbor/map.json index a621849d0..2a82fa1c1 100644 --- a/data/maps/SevenIsland_Harbor/map.json +++ b/data/maps/SevenIsland_Harbor/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json index 7a276372d..1251e6366 100644 --- a/data/maps/SevenIsland_House_Room1/map.json +++ b/data/maps/SevenIsland_House_Room1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_1", + "battle_scene": "MAP_BATTLE_SCENE_GYM", "connections": null, "object_events": [ { diff --git a/data/maps/SevenIsland_House_Room2/map.json b/data/maps/SevenIsland_House_Room2/map.json index a451fdc41..6309618e5 100644 --- a/data/maps/SevenIsland_House_Room2/map.json +++ b/data/maps/SevenIsland_House_Room2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_1", + "battle_scene": "MAP_BATTLE_SCENE_GYM", "connections": null, "object_events": [ { diff --git a/data/maps/SevenIsland_Mart/map.json b/data/maps/SevenIsland_Mart/map.json index de825eb58..8d1fcf724 100644 --- a/data/maps/SevenIsland_Mart/map.json +++ b/data/maps/SevenIsland_Mart/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json index 11baa4ab9..e1bb2ec18 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json index 437ddcf8f..e4249d7d5 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index 810bb0ec1..b051ac85d 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEVAULT_CANYON", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_SEVEN_ISLAND_TANOBY_RUINS", diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json index 4e592643a..f235bf795 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CANYON_ENTRANCE", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_SEVEN_ISLAND", diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json index 8cf0554f6..d58fdc0ce 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEVAULT_CANYON", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index d37ba83c3..fee7f725a 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TANOBY_KEY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [ { diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json index 2bce9a89a..9955ca74f 100644 --- a/data/maps/SevenIsland_TanobyRuins/map.json +++ b/data/maps/SevenIsland_TanobyRuins/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TANOBY_RUINS", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON", diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json index 1a1a927e2..6e8b55f18 100644 --- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_DILFORD_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json index 6f4d729b4..36ae546ee 100644 --- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LIPTOO_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json index ddae2e9fb..e7fc05f59 100644 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MONEAN_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json index 5166e20e5..c974e67a5 100644 --- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_RIXY_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json index 5a594dbd4..0a604bfdd 100644 --- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SCUFIB_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json index 4aed32594..c201caaf8 100644 --- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VIAPOIS_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json index df8a6a08c..e85de29ad 100644 --- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_WEEPTH_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json index d10dab17d..be28ff7b0 100644 --- a/data/maps/SevenIsland_TrainerTower/map.json +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_SEVEN_ISLAND", diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index 5ccfb6bea..df2883596 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 10, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index 94de14328..ad4efd4f0 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 11, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json index 000226509..68748ef13 100644 --- a/data/maps/SilphCo_1F/map.json +++ b/data/maps/SilphCo_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 1, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index 745731e31..249c2faea 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 2, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index efd2812ff..9a0439095 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 3, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index 27ee89266..63bdff97e 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 4, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index f7bfa7c40..c1890a062 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 5, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index 02795de6f..5c27ff76a 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 6, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index 8f568f0c8..ef3630954 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 7, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index c38706dab..db566d2dd 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 8, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json index b4692e8f6..f8bbd2b69 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 9, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SilphCo_Elevator/map.json b/data/maps/SilphCo_Elevator/map.json index 85e2a425b..446e891f2 100644 --- a/data/maps/SilphCo_Elevator/map.json +++ b/data/maps/SilphCo_Elevator/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json index 7749f8336..e26f7bf49 100644 --- a/data/maps/SixIsland/map.json +++ b/data/maps/SixIsland/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_SIX_ISLAND_WATER_PATH", diff --git a/data/maps/SixIsland_AlteringCave/map.json b/data/maps/SixIsland_AlteringCave/map.json index 28deb6f2f..124496895 100644 --- a/data/maps/SixIsland_AlteringCave/map.json +++ b/data/maps/SixIsland_AlteringCave/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ALTERING_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SixIsland_DottedHole_1F/map.json b/data/maps/SixIsland_DottedHole_1F/map.json index fcdf5e6dc..f581ee319 100644 --- a/data/maps/SixIsland_DottedHole_1F/map.json +++ b/data/maps/SixIsland_DottedHole_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SixIsland_DottedHole_B1F/map.json b/data/maps/SixIsland_DottedHole_B1F/map.json index 59d223c75..5f4ded240 100644 --- a/data/maps/SixIsland_DottedHole_B1F/map.json +++ b/data/maps/SixIsland_DottedHole_B1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SixIsland_DottedHole_B2F/map.json b/data/maps/SixIsland_DottedHole_B2F/map.json index 8a10c52ab..3106f7d83 100644 --- a/data/maps/SixIsland_DottedHole_B2F/map.json +++ b/data/maps/SixIsland_DottedHole_B2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SixIsland_DottedHole_B3F/map.json b/data/maps/SixIsland_DottedHole_B3F/map.json index fc9d57a70..300c46114 100644 --- a/data/maps/SixIsland_DottedHole_B3F/map.json +++ b/data/maps/SixIsland_DottedHole_B3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SixIsland_DottedHole_B4F/map.json b/data/maps/SixIsland_DottedHole_B4F/map.json index a34ef53c1..95e9c10b4 100644 --- a/data/maps/SixIsland_DottedHole_B4F/map.json +++ b/data/maps/SixIsland_DottedHole_B4F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json index 89f3d458c..19782a330 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json index 420587041..35d4cfb3f 100644 --- a/data/maps/SixIsland_GreenPath/map.json +++ b/data/maps/SixIsland_GreenPath/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_GREEN_PATH", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_SIX_ISLAND_OUTCAST_ISLAND", diff --git a/data/maps/SixIsland_Harbor/map.json b/data/maps/SixIsland_Harbor/map.json index 6b503e36b..feb7ada29 100644 --- a/data/maps/SixIsland_Harbor/map.json +++ b/data/maps/SixIsland_Harbor/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SixIsland_House/map.json b/data/maps/SixIsland_House/map.json index c9d6d9b6f..67f1d4f31 100644 --- a/data/maps/SixIsland_House/map.json +++ b/data/maps/SixIsland_House/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SixIsland_Mart/map.json b/data/maps/SixIsland_Mart/map.json index d498e595d..b366a1d17 100644 --- a/data/maps/SixIsland_Mart/map.json +++ b/data/maps/SixIsland_Mart/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json index 5b5e29b24..3498c7f3f 100644 --- a/data/maps/SixIsland_OutcastIsland/map.json +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_OUTCAST_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_SIX_ISLAND_GREEN_PATH", diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json index 519bdc193..8354730a5 100644 --- a/data/maps/SixIsland_PatternBush/map.json +++ b/data/maps/SixIsland_PatternBush/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PATTERN_BUSH", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json index f787e9432..2d14e64af 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/map.json +++ b/data/maps/SixIsland_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json index 1e5661335..ce44fdfd2 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/map.json +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index 35a1378b6..5020e7380 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_RUIN_VALLEY", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_SIX_ISLAND_WATER_PATH", diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json index 581749333..befdd7949 100644 --- a/data/maps/SixIsland_WaterPath/map.json +++ b/data/maps/SixIsland_WaterPath/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_WATER_PATH", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_SIX_ISLAND_GREEN_PATH", diff --git a/data/maps/SixIsland_WaterPath_House1/map.json b/data/maps/SixIsland_WaterPath_House1/map.json index 6ba5981d2..c65f54deb 100644 --- a/data/maps/SixIsland_WaterPath_House1/map.json +++ b/data/maps/SixIsland_WaterPath_House1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_WATER_PATH", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SixIsland_WaterPath_House2/map.json b/data/maps/SixIsland_WaterPath_House2/map.json index ddff9b49d..e53676524 100644 --- a/data/maps/SixIsland_WaterPath_House2/map.json +++ b/data/maps/SixIsland_WaterPath_House2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_WATER_PATH", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index ac029a606..f9ed4394b 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_THREE_ISLAND_PORT", diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index 6176a650a..ce8a868ef 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_BERRY_FOREST", "requires_flash": false, "weather": "WEATHER_SHADE", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json index 8b8a3b264..fa674ecd9 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_BOND_BRIDGE", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_THREE_ISLAND", diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json index f7688e70e..3570c9e17 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/map.json +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLE_PATH", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ThreeIsland_Harbor/map.json b/data/maps/ThreeIsland_Harbor/map.json index f00099f9e..7bd2aa8e5 100644 --- a/data/maps/ThreeIsland_Harbor/map.json +++ b/data/maps/ThreeIsland_Harbor/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLE_PORT", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json index 26f360ef0..7d7384735 100644 --- a/data/maps/ThreeIsland_House1/map.json +++ b/data/maps/ThreeIsland_House1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ThreeIsland_House2/map.json b/data/maps/ThreeIsland_House2/map.json index 185d1f8ae..2ba098fd0 100644 --- a/data/maps/ThreeIsland_House2/map.json +++ b/data/maps/ThreeIsland_House2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ThreeIsland_House3/map.json b/data/maps/ThreeIsland_House3/map.json index 5268aff53..0de23d4a8 100644 --- a/data/maps/ThreeIsland_House3/map.json +++ b/data/maps/ThreeIsland_House3/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ThreeIsland_House4/map.json b/data/maps/ThreeIsland_House4/map.json index 2dbe3ffd8..6a45fb357 100644 --- a/data/maps/ThreeIsland_House4/map.json +++ b/data/maps/ThreeIsland_House4/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ThreeIsland_House5/map.json b/data/maps/ThreeIsland_House5/map.json index 526d71de0..a774260f0 100644 --- a/data/maps/ThreeIsland_House5/map.json +++ b/data/maps/ThreeIsland_House5/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ThreeIsland_Mart/map.json b/data/maps/ThreeIsland_Mart/map.json index 00cff653c..7a89a37b1 100644 --- a/data/maps/ThreeIsland_Mart/map.json +++ b/data/maps/ThreeIsland_Mart/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json index 7808db5e3..070879098 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json index 2bab8005d..4941fe37a 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json index 87b83b24d..10469dc61 100644 --- a/data/maps/ThreeIsland_Port/map.json +++ b/data/maps/ThreeIsland_Port/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLE_PORT", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_THREE_ISLAND", diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index 65d27cd22..f4c54c987 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TrainerTower_1F/map.json b/data/maps/TrainerTower_1F/map.json index 05e050043..20d83f19f 100644 --- a/data/maps/TrainerTower_1F/map.json +++ b/data/maps/TrainerTower_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TrainerTower_2F/map.json b/data/maps/TrainerTower_2F/map.json index f845b3eb7..9d60b2650 100644 --- a/data/maps/TrainerTower_2F/map.json +++ b/data/maps/TrainerTower_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TrainerTower_3F/map.json b/data/maps/TrainerTower_3F/map.json index 1cced00ea..a53c516b8 100644 --- a/data/maps/TrainerTower_3F/map.json +++ b/data/maps/TrainerTower_3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TrainerTower_4F/map.json b/data/maps/TrainerTower_4F/map.json index a1b103c38..04378d0a4 100644 --- a/data/maps/TrainerTower_4F/map.json +++ b/data/maps/TrainerTower_4F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TrainerTower_5F/map.json b/data/maps/TrainerTower_5F/map.json index 1def8933f..569eaf978 100644 --- a/data/maps/TrainerTower_5F/map.json +++ b/data/maps/TrainerTower_5F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TrainerTower_6F/map.json b/data/maps/TrainerTower_6F/map.json index cb8924b0e..128bb457a 100644 --- a/data/maps/TrainerTower_6F/map.json +++ b/data/maps/TrainerTower_6F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TrainerTower_7F/map.json b/data/maps/TrainerTower_7F/map.json index 3ad071b09..62e1bbe84 100644 --- a/data/maps/TrainerTower_7F/map.json +++ b/data/maps/TrainerTower_7F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TrainerTower_8F/map.json b/data/maps/TrainerTower_8F/map.json index e65b193a4..125751b98 100644 --- a/data/maps/TrainerTower_8F/map.json +++ b/data/maps/TrainerTower_8F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TrainerTower_Elevator/map.json b/data/maps/TrainerTower_Elevator/map.json index 9e9b8d732..ce626e2cf 100644 --- a/data/maps/TrainerTower_Elevator/map.json +++ b/data/maps/TrainerTower_Elevator/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/TrainerTower_Lobby/map.json b/data/maps/TrainerTower_Lobby/map.json index d00dcf2eb..da2cdb07f 100644 --- a/data/maps/TrainerTower_Lobby/map.json +++ b/data/maps/TrainerTower_Lobby/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TrainerTower_Roof/map.json b/data/maps/TrainerTower_Roof/map.json index 207b70b2d..985f2f186 100644 --- a/data/maps/TrainerTower_Roof/map.json +++ b/data/maps/TrainerTower_Roof/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 48381765e..20dd0f53e 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_TWO_ISLAND_CAPE_BRINK", diff --git a/data/maps/TwoIsland_CapeBrink/map.json b/data/maps/TwoIsland_CapeBrink/map.json index 3b569844d..34a6766de 100644 --- a/data/maps/TwoIsland_CapeBrink/map.json +++ b/data/maps/TwoIsland_CapeBrink/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CAPE_BRINK", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_TWO_ISLAND", diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json index 42dc8e157..5de5be5fa 100644 --- a/data/maps/TwoIsland_CapeBrink_House/map.json +++ b/data/maps/TwoIsland_CapeBrink_House/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CAPE_BRINK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TwoIsland_Harbor/map.json b/data/maps/TwoIsland_Harbor/map.json index 38c9d8d64..694c644f3 100644 --- a/data/maps/TwoIsland_Harbor/map.json +++ b/data/maps/TwoIsland_Harbor/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TwoIsland_House/map.json b/data/maps/TwoIsland_House/map.json index 978b1e9dd..da5033107 100644 --- a/data/maps/TwoIsland_House/map.json +++ b/data/maps/TwoIsland_House/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index 25454f56a..f8c3e8446 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json index 88c5f0b28..96da34e0b 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json index bb8e12fbc..726bcfe11 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/UndergroundPath_EastEntrance/map.json b/data/maps/UndergroundPath_EastEntrance/map.json index 87ef73ace..eee3d31bf 100644 --- a/data/maps/UndergroundPath_EastEntrance/map.json +++ b/data/maps/UndergroundPath_EastEntrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/UndergroundPath_EastWestTunnel/map.json b/data/maps/UndergroundPath_EastWestTunnel/map.json index a994ce48d..7f53b384e 100644 --- a/data/maps/UndergroundPath_EastWestTunnel/map.json +++ b/data/maps/UndergroundPath_EastWestTunnel/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/UndergroundPath_NorthEntrance/map.json b/data/maps/UndergroundPath_NorthEntrance/map.json index e87fb79bf..6052b6192 100644 --- a/data/maps/UndergroundPath_NorthEntrance/map.json +++ b/data/maps/UndergroundPath_NorthEntrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_UNDERGROUND_PATH", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/map.json b/data/maps/UndergroundPath_NorthSouthTunnel/map.json index 6299fa510..35b7477b5 100644 --- a/data/maps/UndergroundPath_NorthSouthTunnel/map.json +++ b/data/maps/UndergroundPath_NorthSouthTunnel/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_UNDERGROUND_PATH", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/UndergroundPath_SouthEntrance/map.json b/data/maps/UndergroundPath_SouthEntrance/map.json index ae41077ef..ec8a01a32 100644 --- a/data/maps/UndergroundPath_SouthEntrance/map.json +++ b/data/maps/UndergroundPath_SouthEntrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_UNDERGROUND_PATH", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/UndergroundPath_WestEntrance/map.json b/data/maps/UndergroundPath_WestEntrance/map.json index 419281f0c..6fae45cf2 100644 --- a/data/maps/UndergroundPath_WestEntrance/map.json +++ b/data/maps/UndergroundPath_WestEntrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json index 2ceb57c4b..f46654c7b 100644 --- a/data/maps/UnionRoom/map.json +++ b/data/maps/UnionRoom/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_8", + "battle_scene": "MAP_BATTLE_SCENE_LINK", "connections": null, "object_events": [ { diff --git a/data/maps/UnknownMap_18_01/map.json b/data/maps/UnknownMap_18_01/map.json index bf2b727ce..a00f28f90 100644 --- a/data/maps/UnknownMap_18_01/map.json +++ b/data/maps/UnknownMap_18_01/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_6", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [], diff --git a/data/maps/UnusedHouse_27_00/map.json b/data/maps/UnusedHouse_27_00/map.json index e7eb73138..6d93604e4 100644 --- a/data/maps/UnusedHouse_27_00/map.json +++ b/data/maps/UnusedHouse_27_00/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_19", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [], diff --git a/data/maps/UnusedHouse_29_00/map.json b/data/maps/UnusedHouse_29_00/map.json index 9d08c5548..50dfe3d62 100644 --- a/data/maps/UnusedHouse_29_00/map.json +++ b/data/maps/UnusedHouse_29_00/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_23", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [], diff --git a/data/maps/UnusedHouse_31_05/map.json b/data/maps/UnusedHouse_31_05/map.json index 71e855268..21ec7325d 100644 --- a/data/maps/UnusedHouse_31_05/map.json +++ b/data/maps/UnusedHouse_31_05/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [], diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index b8b323176..faf8f70f5 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE6", diff --git a/data/maps/VermilionCity_Gym/map.json b/data/maps/VermilionCity_Gym/map.json index f5d6d8f34..4b0325bc1 100644 --- a/data/maps/VermilionCity_Gym/map.json +++ b/data/maps/VermilionCity_Gym/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_1", + "battle_scene": "MAP_BATTLE_SCENE_GYM", "connections": null, "object_events": [ { diff --git a/data/maps/VermilionCity_House1/map.json b/data/maps/VermilionCity_House1/map.json index d5e1e69c8..6ec3be3f9 100644 --- a/data/maps/VermilionCity_House1/map.json +++ b/data/maps/VermilionCity_House1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/VermilionCity_House2/map.json b/data/maps/VermilionCity_House2/map.json index 0011bdbb0..c22ef4744 100644 --- a/data/maps/VermilionCity_House2/map.json +++ b/data/maps/VermilionCity_House2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/VermilionCity_House3/map.json b/data/maps/VermilionCity_House3/map.json index b71efa6ef..fdbb6bd3e 100644 --- a/data/maps/VermilionCity_House3/map.json +++ b/data/maps/VermilionCity_House3/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/VermilionCity_Mart/map.json b/data/maps/VermilionCity_Mart/map.json index 48a60d494..dfff61410 100644 --- a/data/maps/VermilionCity_Mart/map.json +++ b/data/maps/VermilionCity_Mart/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json index 3f503dbe3..595761c4f 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json index bfc1daf2c..00e7ce529 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json index 2859f4135..521e0c99f 100644 --- a/data/maps/VermilionCity_PokemonFanClub/map.json +++ b/data/maps/VermilionCity_PokemonFanClub/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 3c41fe580..21d57ae5e 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index 2731bc8f4..764f448aa 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index 906797fc5..a5985e5fc 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index d747d1e95..d9895c6b0 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE2", diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json index 95c15e143..f1188d2c0 100644 --- a/data/maps/ViridianCity_Gym/map.json +++ b/data/maps/ViridianCity_Gym/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_1", + "battle_scene": "MAP_BATTLE_SCENE_GYM", "connections": null, "object_events": [ { diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House1/map.json index c73f46675..29f185b71 100644 --- a/data/maps/ViridianCity_House1/map.json +++ b/data/maps/ViridianCity_House1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_House2/map.json index fbce33a88..b5e65bbad 100644 --- a/data/maps/ViridianCity_House2/map.json +++ b/data/maps/ViridianCity_House2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json index e8cafbabc..7b3de99b6 100644 --- a/data/maps/ViridianCity_Mart/map.json +++ b/data/maps/ViridianCity_Mart/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json index 62956275e..780087d1b 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json index 6bef278a3..967493db5 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index ed5441d89..8a92127ae 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VIRIDIAN_FOREST", "requires_flash": false, "weather": "WEATHER_SHADE", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { -- cgit v1.2.3 From 5c530e133042af0dfb2341b0dcf18efc9a37aa95 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 18 Feb 2020 16:39:44 -0500 Subject: Finish porting pokemon_jump from Emerald --- data/pokemon_jump.s | 173 ---------------------------------------------------- data/strings.s | 8 +-- 2 files changed, 4 insertions(+), 177 deletions(-) delete mode 100644 data/pokemon_jump.s (limited to 'data') diff --git a/data/pokemon_jump.s b/data/pokemon_jump.s deleted file mode 100644 index 432f16d0b..000000000 --- a/data/pokemon_jump.s +++ /dev/null @@ -1,173 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_846D9E4:: @ gbapal - .incbin "graphics/link_games/unk_846D9E4.gbapal" - -gUnknown_846DA04:: @ gbapal - .incbin "graphics/link_games/unk_846DA04.gbapal" - -gUnknown_846DA24:: @ 4bpp.lz - .incbin "graphics/link_games/unk_846DA24.4bpp.lz" - -gUnknown_846DB44:: @ 4bpp.lz - .incbin "graphics/link_games/unk_846DB44.4bpp.lz" - -gUnknown_846DD18:: @ 4bpp.lz - .incbin "graphics/link_games/unk_846DD18.4bpp.lz" - -gUnknown_846DE48:: @ 4bpp.lz - .incbin "graphics/link_games/unk_846DE48.4bpp.lz" - -gUnknown_846DF44:: @ 4bpp.lz - .incbin "graphics/link_games/unk_846DF44.4bpp.lz" - -gUnknown_846E0B0:: @ 846E0B0 - obj_tiles gUnknown_846DA24, 0x0600, 5 - obj_tiles gUnknown_846DB44, 0x0c00, 6 - obj_tiles gUnknown_846DD18, 0x0600, 7 - obj_tiles gUnknown_846DE48, 0x0600, 8 - obj_tiles gUnknown_846DF44, 0x0200, 10 - -gUnknown_846E0D8:: @ 846E0D8 - obj_pal gUnknown_846D9E4, 5 - obj_pal gUnknown_846DA04, 6 - -gUnknown_846E0E8:: @ 846E0E8 - spr_template 0, 0, gUnknown_846E170, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_846E100:: @ 846E100 - .2byte 0x0060, 0x0060, 0x0060, 0x0072, 0x0078, 0x0078, 0x0078, 0x0072, 0x0060, 0x0060, 0x0046, 0x0050, 0x0060, 0x0072, 0x0078, 0x0080 - .2byte 0x0078, 0x0072, 0x0060, 0x0050, 0x0032, 0x0048, 0x0060, 0x0072, 0x0080, 0x0088, 0x0080, 0x0072, 0x0060, 0x0048, 0x002a, 0x0048 - .2byte 0x0060, 0x0072, 0x0080, 0x0088, 0x0080, 0x0072, 0x0060, 0x0048 - -gUnknown_846E150:: @ 846E150 - .2byte 0x0010, 0x0028, 0x0048, 0x0068, 0x0088, 0x00a8, 0x00c8, 0x00e0 - -gUnknown_846E160:: @ 846E160 - .4byte gUnknown_846E220 - .4byte gUnknown_846E238 - .4byte gUnknown_846E250 - .4byte gUnknown_846E268 - -gUnknown_846E170:: - .4byte 0xc0000000, 0x00000800 - -gUnknown_846E178:: - .4byte 0x80008000, 0x00000800 - -gUnknown_846E180:: - .4byte 0x80000000, 0x00000800 - -gUnknown_846E188:: - .4byte 0x80004000, 0x00000800 - -gUnknown_846E190:: - obj_image_anim_frame 0x0000, 1 - obj_image_anim_end - -gUnknown_846E198:: - obj_image_anim_frame 0x0008, 1 - obj_image_anim_end - -gUnknown_846E1A0:: - obj_image_anim_frame 0x0010, 1 - obj_image_anim_end - -gUnknown_846E1A8:: - obj_image_anim_frame 0x0018, 1 - obj_image_anim_end - -gUnknown_846E1B0:: - obj_image_anim_frame 0x0020, 1 - obj_image_anim_end - -gUnknown_846E1B8:: - obj_image_anim_frame 0x0028, 1 - obj_image_anim_end - -gUnknown_846E1C0:: - obj_image_anim_frame 0x0000, 1 - obj_image_anim_end - -gUnknown_846E1C8:: - obj_image_anim_frame 0x0010, 1 - obj_image_anim_end - -gUnknown_846E1D0:: - obj_image_anim_frame 0x0020, 1 - obj_image_anim_end - -gUnknown_846E1D8:: - obj_image_anim_frame 0x0030, 1 - obj_image_anim_end - -gUnknown_846E1E0:: - obj_image_anim_frame 0x0040, 1 - obj_image_anim_end - -gUnknown_846E1E8:: - obj_image_anim_frame 0x0050, 1 - obj_image_anim_end - -gUnknown_846E1F0:: - .4byte gUnknown_846E190 - .4byte gUnknown_846E198 - .4byte gUnknown_846E1A0 - .4byte gUnknown_846E1A8 - .4byte gUnknown_846E1B0 - .4byte gUnknown_846E1B8 - -gUnknown_846E208:: - .4byte gUnknown_846E1C0 - .4byte gUnknown_846E1C8 - .4byte gUnknown_846E1D0 - .4byte gUnknown_846E1D8 - .4byte gUnknown_846E1E0 - .4byte gUnknown_846E1E8 - -gUnknown_846E220:: - spr_template 5, 5, gUnknown_846E178, gUnknown_846E1F0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_846E238:: - spr_template 6, 5, gUnknown_846E180, gUnknown_846E208, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_846E250:: - spr_template 7, 5, gUnknown_846E188, gUnknown_846E1F0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_846E268:: - spr_template 8, 5, gUnknown_846E188, gUnknown_846E1F0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_846E280:: - .4byte 0x40000000, 0x00000400 - -gUnknown_846E288:: - obj_image_anim_frame 0x0000, 0 - obj_image_anim_end - -gUnknown_846E290:: - obj_image_anim_frame 0x0000, 4 - obj_image_anim_frame 0x0004, 4 - obj_image_anim_frame 0x0008, 4 - obj_image_anim_frame 0x000c, 4 - obj_image_anim_loop 1 - obj_image_anim_frame 0x0000, 4 - obj_image_anim_end - -gUnknown_846E2AC:: - .4byte gUnknown_846E288 - .4byte gUnknown_846E290 - -gUnknown_846E2B4:: @ 846E2B4 - spr_template 10, 5, gUnknown_846E280, gUnknown_846E2AC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_846E2CC:: @ 846E2CC - .byte 0, 1, 1, 28, 9, 15 - .2byte 0x0001 - -gUnknown_846E2D4:: @ 846E2D4 - .4byte gUnknown_841CB78 - .4byte gUnknown_841CB88 - .4byte gUnknown_841CB94 diff --git a/data/strings.s b/data/strings.s index 591c7c7f4..1d56d6be7 100644 --- a/data/strings.s +++ b/data/strings.s @@ -3295,16 +3295,16 @@ gText_SpacePoints2:: @ 841CB52 gText_SpaceTimes3:: @ 841CB5A .string " time(s)$" -gUnknown_841CB63:: @ 841CB63 +gText_PkmnJumpRecords:: @ 841CB63 .string "POKéMON JUMP RECORDS$" -gUnknown_841CB78:: +gText_JumpsInARow:: .string "Jumps in a row:$" -gUnknown_841CB88:: +gText_BestScore2:: .string "Best score:$" -gUnknown_841CB94:: +gText_ExcellentsInARow:: .string "EXCELLENTS in a row:$" gText_AwesomeWonF701F700:: @ 841CBA9 -- cgit v1.2.3 From 2a2db28e57e78eb8861997422f998378d91bf9dc Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 18 Feb 2020 18:13:31 -0500 Subject: Split connection field from graphics id in object events --- data/maps/CeladonCity/map.json | 5 +++-- data/maps/CeruleanCity/map.json | 3 ++- data/maps/FiveIsland/map.json | 3 ++- data/maps/Route15/map.json | 3 ++- data/maps/Route2/map.json | 3 ++- data/maps/Route21_North/map.json | 5 +++-- data/maps/Route4/map.json | 3 ++- data/maps/Route7/map.json | 5 +++-- data/maps/SevenIsland_SevaultCanyon_Entrance/map.json | 5 +++-- 9 files changed, 22 insertions(+), 13 deletions(-) (limited to 'data') diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index 7753d987f..70ddb25e8 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -183,8 +183,9 @@ "flag": "0" }, { - "graphics_id": "65375", - "x": 65529, + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "in_connection": 255, + "x": -7, "y": 21, "elevation": 7, "movement_type": "MOVEMENT_TYPE_NONE", diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index 087f39320..30e18ed78 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -154,7 +154,8 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "65375", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "in_connection": 255, "x": 50, "y": 18, "elevation": 10, diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index 46eb15806..4635c9d88 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -53,7 +53,8 @@ "flag": "0" }, { - "graphics_id": "65375", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "in_connection": 255, "x": 32, "y": 9, "elevation": 4, diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index bc368ca01..138e9c47b 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -196,7 +196,8 @@ "flag": "0" }, { - "graphics_id": "65375", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "in_connection": 255, "x": 73, "y": 7, "elevation": 13, diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index 008be4a9f..2c09a3474 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -105,7 +105,8 @@ "flag": "FLAG_HIDE_ROUTE2_PARALYZE_HEAL" }, { - "graphics_id": "65375", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "in_connection": 255, "x": 6, "y": 85, "elevation": 8, diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json index 06767be42..b86af1cbf 100644 --- a/data/maps/Route21_North/map.json +++ b/data/maps/Route21_North/map.json @@ -92,9 +92,10 @@ "flag": "0" }, { - "graphics_id": "65307", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "in_connection": 255, "x": 13, - "y": 65533, + "y": -3, "elevation": 2, "movement_type": "MOVEMENT_TYPE_NONE", "movement_range_x": 0, diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index 7fcf32a5d..cc47f14dc 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -105,7 +105,8 @@ "flag": "0" }, { - "graphics_id": "65321", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "in_connection": 255, "x": 109, "y": 3, "elevation": 12, diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index d75cae2e4..b5bfba23b 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -27,8 +27,9 @@ ], "object_events": [ { - "graphics_id": "65375", - "x": 65528, + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "in_connection": 255, + "x": -8, "y": 12, "elevation": 10, "movement_type": "MOVEMENT_TYPE_NONE", diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json index f235bf795..8616cc967 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -105,9 +105,10 @@ "flag": "0" }, { - "graphics_id": "65321", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "in_connection": 255, "x": 7, - "y": 65534, + "y": -2, "elevation": 1, "movement_type": "MOVEMENT_TYPE_NONE", "movement_range_x": 0, -- cgit v1.2.3 From 3e806419156cd1b57f8c6c1b215f836b467c723a Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 18 Feb 2020 19:52:37 -0500 Subject: in_connection to bool --- data/maps/CeladonCity/map.json | 2 +- data/maps/CeruleanCity/map.json | 2 +- data/maps/FiveIsland/map.json | 2 +- data/maps/Route15/map.json | 2 +- data/maps/Route2/map.json | 2 +- data/maps/Route21_North/map.json | 2 +- data/maps/Route4/map.json | 2 +- data/maps/Route7/map.json | 2 +- data/maps/SevenIsland_SevaultCanyon_Entrance/map.json | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'data') diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index 70ddb25e8..b9ed79113 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -184,7 +184,7 @@ }, { "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", - "in_connection": 255, + "in_connection": true, "x": -7, "y": 21, "elevation": 7, diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index 30e18ed78..25c2333e0 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -155,7 +155,7 @@ }, { "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", - "in_connection": 255, + "in_connection": true, "x": 50, "y": 18, "elevation": 10, diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index 4635c9d88..ae9611f97 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -54,7 +54,7 @@ }, { "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", - "in_connection": 255, + "in_connection": true, "x": 32, "y": 9, "elevation": 4, diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index 138e9c47b..fc65f0932 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -197,7 +197,7 @@ }, { "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", - "in_connection": 255, + "in_connection": true, "x": 73, "y": 7, "elevation": 13, diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index 2c09a3474..29563d779 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -106,7 +106,7 @@ }, { "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", - "in_connection": 255, + "in_connection": true, "x": 6, "y": 85, "elevation": 8, diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json index b86af1cbf..417ae692d 100644 --- a/data/maps/Route21_North/map.json +++ b/data/maps/Route21_North/map.json @@ -93,7 +93,7 @@ }, { "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", - "in_connection": 255, + "in_connection": true, "x": 13, "y": -3, "elevation": 2, diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index cc47f14dc..051a2ca50 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -106,7 +106,7 @@ }, { "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", - "in_connection": 255, + "in_connection": true, "x": 109, "y": 3, "elevation": 12, diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index b5bfba23b..1fcf4cc50 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -28,7 +28,7 @@ "object_events": [ { "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", - "in_connection": 255, + "in_connection": true, "x": -8, "y": 12, "elevation": 10, diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json index 8616cc967..3f164568a 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -106,7 +106,7 @@ }, { "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", - "in_connection": 255, + "in_connection": true, "x": 7, "y": -2, "elevation": 1, -- cgit v1.2.3 From 0125c1440e52404d53b4d91451cf03b625ba4634 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 19 Feb 2020 15:43:59 -0500 Subject: trainer_see through CheckPathBetweenTrainerAndPlayer --- data/trainer_see.s | 9 --------- 1 file changed, 9 deletions(-) (limited to 'data') diff --git a/data/trainer_see.s b/data/trainer_see.s index 3014d8ba0..13641f259 100644 --- a/data/trainer_see.s +++ b/data/trainer_see.s @@ -4,15 +4,6 @@ .section .rodata .align 2 -gUnknown_83C6AC8:: - .incbin "graphics/object_events/emoticons.4bpp" - -gUnknown_83C7248:: @ 83C7248 - .4byte IsTrainerInRangeSouth - .4byte IsTrainerInRangeNorth - .4byte IsTrainerInRangeWest - .4byte IsTrainerInRangeEast - gUnknown_83C7258:: @ 83C7258 .4byte sub_8081F34 .4byte sub_8081F38 -- cgit v1.2.3 From abc39d86f357903c62616cbe0384a5995b2b8db5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 20 Feb 2020 14:03:29 -0500 Subject: Decomp all trainer see funcs --- data/trainer_see.s | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'data') diff --git a/data/trainer_see.s b/data/trainer_see.s index 13641f259..f10a0b2c4 100644 --- a/data/trainer_see.s +++ b/data/trainer_see.s @@ -4,23 +4,6 @@ .section .rodata .align 2 -gUnknown_83C7258:: @ 83C7258 - .4byte sub_8081F34 - .4byte sub_8081F38 - .4byte sub_8081F90 - .4byte sub_8081FD0 - .4byte sub_808202C - .4byte sub_80820BC - .4byte sub_8082100 - .4byte sub_8082134 - .4byte sub_8082150 - .4byte sub_8082184 - .4byte sub_80821DC - .4byte sub_8082250 - .4byte sub_808226C - .4byte sub_80822CC - .4byte sub_808237C - gUnknown_83C7294:: @ 83C7294 .4byte sub_8082150 .4byte sub_8082184 -- cgit v1.2.3 From 93ee43a31a40af9e0db9e4d0866626af6990d29e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 20 Feb 2020 14:52:37 -0500 Subject: Finish trainer_see --- data/field_effect_scripts.s | 8 ++-- data/maps/CeladonCity_GameCorner/scripts.inc | 4 +- data/trainer_see.s | 71 ---------------------------- 3 files changed, 6 insertions(+), 77 deletions(-) delete mode 100644 data/trainer_see.s (limited to 'data') diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 98685da05..35f307e43 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -204,7 +204,7 @@ gFldEffScript_FlyIn:: @ 81D98BE end gFldEffScript_ExclamationMarkIcon2:: @ 81D98C4 - callnative sub_8082624 + callnative FldEff_QuestionMarkIcon end gFldEffScript_FeetInFlowingWater:: @ 81D98CA @@ -257,7 +257,7 @@ gFldEffScript_Pokeball:: @ 81D9920 end gFldEffScript_HeartIcon:: @ 81D992B - callnative sub_80825B4 + callnative FldEff_XIcon end gFldEffScript_Nop47:: @ 81D9931 @@ -322,7 +322,7 @@ gFldEffScript_UseTeleport:: @ 81D9986 end gFldEffScript_Unk40:: @ 81D998C - callnative sub_80825EC + callnative FldEff_SmileyFaceIcon end gFldEffScript_Unk41:: @ 81D9992 @@ -330,7 +330,7 @@ gFldEffScript_Unk41:: @ 81D9992 end gFldEffScript_Unk42:: @ 81D9998 - callnative sub_808257C + callnative FldEff_DoubleExclMarkIcon end gFldEffScript_Unk43:: @ 81D999E diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index c206f38b4..f44c2d29b 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -257,8 +257,8 @@ CeladonCity_GameCorner_EventScript_SlotMachine:: @ 816C96C setfieldeffectarg 0, 255 setfieldeffectarg 1, 10 setfieldeffectarg 2, 14 - dofieldeffect FLDEFF_UNK_40 - waitfieldeffect FLDEFF_UNK_40 @ Smile icon? + dofieldeffect FLDEFF_SMILEY_FACE_ICON + waitfieldeffect FLDEFF_SMILEY_FACE_ICON @ Smile icon? specialvar VAR_RESULT, Special_GetRandomSlotMachine playslotmachine VAR_RESULT releaseall diff --git a/data/trainer_see.s b/data/trainer_see.s deleted file mode 100644 index f10a0b2c4..000000000 --- a/data/trainer_see.s +++ /dev/null @@ -1,71 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnknown_83C7294:: @ 83C7294 - .4byte sub_8082150 - .4byte sub_8082184 - .4byte sub_80821DC - .4byte sub_8082250 - -gOamData_83C72A4:: - .4byte 0x40000000, 0x00000400 - -gSpriteImages_83C72AC:: - .4byte gUnknown_83C6AC8 + 0x000, 0x80 - .4byte gUnknown_83C6AC8 + 0x080, 0x80 - .4byte gUnknown_83C6AC8 + 0x100, 0x80 - .4byte gUnknown_83C6AC8 + 0x300, 0x80 - .4byte gUnknown_83C6AC8 + 0x380, 0x80 - .4byte gUnknown_83C6AC8 + 0x400, 0x80 - .4byte gUnknown_83C6AC8 + 0x180, 0x80 - .4byte gUnknown_83C6AC8 + 0x200, 0x80 - .4byte gUnknown_83C6AC8 + 0x280, 0x80 - .4byte gUnknown_83C6AC8 + 0x480, 0x80 - .4byte gUnknown_83C6AC8 + 0x500, 0x80 - .4byte gUnknown_83C6AC8 + 0x580, 0x80 - .4byte gUnknown_83C6AC8 + 0x600, 0x80 - .4byte gUnknown_83C6AC8 + 0x680, 0x80 - .4byte gUnknown_83C6AC8 + 0x700, 0x80 - -gAnimCmd_83C7324:: - obj_image_anim_frame 0x0000, 0x0004 - obj_image_anim_frame 0x0001, 0x0004 - obj_image_anim_frame 0x0002, 0x0034 - obj_image_anim_end - -gAnimCmd_83C7334:: - obj_image_anim_frame 0x0006, 0x0004 - obj_image_anim_frame 0x0007, 0x0004 - obj_image_anim_frame 0x0008, 0x0034 - obj_image_anim_end - -gAnimCmd_83C7344:: - obj_image_anim_frame 0x0003, 0x0004 - obj_image_anim_frame 0x0004, 0x0004 - obj_image_anim_frame 0x0005, 0x0034 - obj_image_anim_end - -gAnimCmd_83C7354:: - obj_image_anim_frame 0x0009, 0x0004 - obj_image_anim_frame 0x000a, 0x0004 - obj_image_anim_frame 0x000b, 0x0034 - obj_image_anim_end - -gAnimCmd_83C7364:: - obj_image_anim_frame 0x000c, 0x0004 - obj_image_anim_frame 0x000d, 0x0004 - obj_image_anim_frame 0x000e, 0x0034 - obj_image_anim_end - -gSpriteAnimTable_83C7374:: - .4byte gAnimCmd_83C7324 - .4byte gAnimCmd_83C7334 - .4byte gAnimCmd_83C7344 - .4byte gAnimCmd_83C7354 - .4byte gAnimCmd_83C7364 - -gUnknown_83C7388:: @ 83C7388 - spr_template 65535, 65535, gOamData_83C72A4, gSpriteAnimTable_83C7374, gSpriteImages_83C72AC, gDummySpriteAffineAnimTable, objc_exclamation_mark_probably -- cgit v1.2.3 From 14a599bbc2396087fb3a126b302a53f190b23e70 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 21 Feb 2020 09:02:06 -0500 Subject: Address review comments; name some methods in event_object_movement --- data/event_object_movement.s | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'data') diff --git a/data/event_object_movement.s b/data/event_object_movement.s index 9c4f0a7ca..b02c3de80 100644 --- a/data/event_object_movement.s +++ b/data/event_object_movement.s @@ -8164,8 +8164,7 @@ gUnknown_83A65A9:: @ 83A65A9 .byte 0x00 .byte 0x00 -@ gMovementActionFuncs -gUnknown_83A65BC:: @ 83A65BC +sMovementActionFuncs:: @ 83A65BC .4byte gUnknown_83A6864 .4byte gUnknown_83A686C .4byte gUnknown_83A6874 -- cgit v1.2.3 From 69d8833b31519208f04444d3393b68a393163aa3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 21 Feb 2020 13:41:18 -0500 Subject: Prelim names for mvmt actions; merge field_ground_effect into evobjmv --- data/event_object_movement.s | 2097 ++++++++++++++++++++++-------------------- data/field_effect_scripts.s | 4 +- data/field_ground_effect.s | 63 -- 3 files changed, 1089 insertions(+), 1075 deletions(-) delete mode 100644 data/field_ground_effect.s (limited to 'data') diff --git a/data/event_object_movement.s b/data/event_object_movement.s index b02c3de80..17adf3ef4 100644 --- a/data/event_object_movement.s +++ b/data/event_object_movement.s @@ -7668,17 +7668,19 @@ gUnknown_83A6404:: @ 83A6404 .4byte sub_80633F4 @ gFaceDirectionAnimNums ? +@ gFaceDirectionAnimNums? gUnknown_83A640C:: @ 83A640C - .byte 0x00 - .byte 0x00 - .byte 0x01 - .byte 0x02 - .byte 0x03 - .byte 0x00 - .byte 0x00 - .byte 0x01 - .byte 0x01 - + .byte 0x00 @ DIR_NONE + .byte 0x00 @ DIR_SOUTH + .byte 0x01 @ DIR_NORTH + .byte 0x02 @ DIR_WEST + .byte 0x03 @ DIR_EAST + .byte 0x00 @ DIR_SOUTHWEST + .byte 0x00 @ DIR_SOUTHEAST + .byte 0x01 @ DIR_NORTHWEST + .byte 0x01 @ DIR_NORTHEAST + +@ gMoveDirectionAnimNums? gUnknown_83A6415:: @ 83A6415 .byte 0x4 @ DIR_NONE .byte 0x4 @ DIR_SOUTH @@ -7690,6 +7692,7 @@ gUnknown_83A6415:: @ 83A6415 .byte 0x5 @ DIR_NORTHWEST .byte 0x5 @ DIR_NORTHEAST +@ gMoveDirectionFastAnimNums? gUnknown_83A641E:: @ 83A641E .byte 0x8 @ DIR_NONE .byte 0x8 @ DIR_SOUTH @@ -7701,6 +7704,7 @@ gUnknown_83A641E:: @ 83A641E .byte 0x9 @ DIR_NORTHWEST .byte 0x9 @ DIR_NORTHEAST +@ gMoveDirectionFasterAnimNums? gUnknown_83A6427:: @ 83A6427 .byte 0xC @ DIR_NONE .byte 0xC @ DIR_SOUTH @@ -7712,6 +7716,7 @@ gUnknown_83A6427:: @ 83A6427 .byte 0xD @ DIR_NORTHWEST .byte 0xD @ DIR_NORTHEAST +@ gMoveDirectionFastestAnimNums? gUnknown_83A6430:: @ 83A6430 .byte 0x10 @ DIR_NONE .byte 0x10 @ DIR_SOUTH @@ -7723,6 +7728,7 @@ gUnknown_83A6430:: @ 83A6430 .byte 0x11 @ DIR_NORTHWEST .byte 0x11 @ DIR_NORTHEAST +@ gJumpSpecialDirectionAnimNums? gUnknown_83A6439:: @ 83A6439 .byte 0x14 @ DIR_NONE .byte 0x14 @ DIR_SOUTH @@ -7734,6 +7740,7 @@ gUnknown_83A6439:: @ 83A6439 .byte 0x15 @ DIR_NORTHWEST .byte 0x15 @ DIR_NORTHEAST +@ gAcroWheelieDirectionAnimNums? gUnknown_83A6442:: @ 83A6442 .byte 0x14 @ DIR_NONE .byte 0x14 @ DIR_SOUTH @@ -7745,6 +7752,7 @@ gUnknown_83A6442:: @ 83A6442 .byte 0x15 @ DIR_NORTHWEST .byte 0x15 @ DIR_NORTHEAST +@ ??? gUnknown_83A644B:: @ 83A644B .byte 0x18 @ DIR_NONE .byte 0x18 @ DIR_SOUTH @@ -7756,6 +7764,7 @@ gUnknown_83A644B:: @ 83A644B .byte 0x19 @ DIR_NORTHWEST .byte 0x19 @ DIR_NORTHEAST +@ gAcroEndWheelieDirectionAnimNums? gUnknown_83A6454:: @ 83A6454 .byte 0x1C @ DIR_NONE .byte 0x1C @ DIR_SOUTH @@ -7767,6 +7776,7 @@ gUnknown_83A6454:: @ 83A6454 .byte 0x1D @ DIR_NORTHWEST .byte 0x1D @ DIR_NORTHEAST +@ gAcroUnusedActionDirectionAnimNums? gUnknown_83A645D:: @ 83A645D .byte 0x18 @ DIR_NONE .byte 0x18 @ DIR_SOUTH @@ -7778,6 +7788,7 @@ gUnknown_83A645D:: @ 83A645D .byte 0x1A @ DIR_NORTHWEST .byte 0x1B @ DIR_NORTHEAST +@ gAcroWheeliePedalDirectionAnimNums? gUnknown_83A6466:: @ 83A6466 .byte 0x20 @ DIR_NONE .byte 0x20 @ DIR_SOUTH @@ -7789,6 +7800,7 @@ gUnknown_83A6466:: @ 83A6466 .byte 0x21 @ DIR_NORTHWEST .byte 0x21 @ DIR_NORTHEAST +@ ??? gUnknown_83A646F:: @ 83A646F .byte 0x24 @ DIR_NONE .byte 0x24 @ DIR_SOUTH @@ -7800,6 +7812,7 @@ gUnknown_83A646F:: @ 83A646F .byte 0x25 @ DIR_NORTHWEST .byte 0x25 @ DIR_NORTHEAST +@ gFishingDirectionAnimNums? gUnknown_83A6478:: @ 83A6478 .byte 0x0 @ DIR_NONE .byte 0x0 @ DIR_SOUTH @@ -7811,6 +7824,7 @@ gUnknown_83A6478:: @ 83A6478 .byte 0x1 @ DIR_NORTHWEST .byte 0x1 @ DIR_NORTHEAST +@ gFishingNoCatchDirectionAnimNums? gUnknown_83A6481:: @ 83A6481 .byte 0x4 @ DIR_NONE .byte 0x4 @ DIR_SOUTH @@ -7822,6 +7836,7 @@ gUnknown_83A6481:: @ 83A6481 .byte 0x5 @ DIR_NORTHWEST .byte 0x5 @ DIR_NORTHEAST +@ gFishingBiteDirectionAnimNums? gUnknown_83A648A:: @ 83A648A .byte 0x8 @ DIR_NONE .byte 0x8 @ DIR_SOUTH @@ -7833,6 +7848,7 @@ gUnknown_83A648A:: @ 83A648A .byte 0x9 @ DIR_NORTHWEST .byte 0x9 @ DIR_NORTHEAST +@ gRunningDirectionAnimNums? gUnknown_83A6493:: @ 83A6493 .byte 0x14 @ DIR_NONE .byte 0x14 @ DIR_SOUTH @@ -7844,20 +7860,19 @@ gUnknown_83A6493:: @ 83A6493 .byte 0x15 @ DIR_NORTHWEST .byte 0x15 @ DIR_NORTHEAST +@ gTrainerFacingDirectionMovementTypes? gUnknown_83A649C:: @ 83A649C - .byte 0x08 - .byte 0x08 - .byte 0x07 - .byte 0x09 - .byte 0x0A - .byte 0x08 - .byte 0x08 - .byte 0x07 - .byte 0x07 - .byte 0x00 - .byte 0x00 - .byte 0x00 + .byte 0x08 @ DIR_NONE + .byte 0x08 @ DIR_SOUTH + .byte 0x07 @ DIR_NORTH + .byte 0x09 @ DIR_WEST + .byte 0x0A @ DIR_EAST + .byte 0x08 @ DIR_SOUTHWEST + .byte 0x08 @ DIR_SOUTHEAST + .byte 0x07 @ DIR_NORTHWEST + .byte 0x07 @ DIR_NORTHEAST + .align 2 gUnknown_83A64A8:: @ 83A64A8 .4byte MetatileBehavior_IsSouthBlocked .4byte MetatileBehavior_IsNorthBlocked @@ -8165,279 +8180,279 @@ gUnknown_83A65A9:: @ 83A65A9 .byte 0x00 sMovementActionFuncs:: @ 83A65BC - .4byte gUnknown_83A6864 - .4byte gUnknown_83A686C - .4byte gUnknown_83A6874 - .4byte gUnknown_83A687C - .4byte gUnknown_83A6A30 - .4byte gUnknown_83A6A38 - .4byte gUnknown_83A6A40 - .4byte gUnknown_83A6A48 - .4byte gUnknown_83A68C8 - .4byte gUnknown_83A68D4 - .4byte gUnknown_83A68E0 - .4byte gUnknown_83A68EC - .4byte gUnknown_83A6904 - .4byte gUnknown_83A68F8 - .4byte gUnknown_83A6910 - .4byte gUnknown_83A691C - .4byte gUnknown_83A6928 - .4byte gUnknown_83A6934 - .4byte gUnknown_83A6940 - .4byte gUnknown_83A694C - .4byte gUnknown_83A6964 - .4byte gUnknown_83A6970 - .4byte gUnknown_83A697C - .4byte gUnknown_83A6988 - .4byte gUnknown_83A6994 - .4byte gUnknown_83A69A0 - .4byte gUnknown_83A69AC - .4byte gUnknown_83A69B8 - .4byte gUnknown_83A69C4 - .4byte gUnknown_83A69D0 - .4byte gUnknown_83A69DC - .4byte gUnknown_83A69E8 - .4byte gUnknown_83A69F4 - .4byte gUnknown_83A6A50 - .4byte gUnknown_83A6A5C - .4byte gUnknown_83A6A68 - .4byte gUnknown_83A6A74 - .4byte gUnknown_83A6A80 - .4byte gUnknown_83A6A8C - .4byte gUnknown_83A6A98 - .4byte gUnknown_83A6AA4 - .4byte gUnknown_83A6AB0 - .4byte gUnknown_83A6ABC - .4byte gUnknown_83A6AC8 - .4byte gUnknown_83A6AD4 - .4byte gUnknown_83A6AE0 - .4byte gUnknown_83A6AEC - .4byte gUnknown_83A6AF8 - .4byte gUnknown_83A6B04 - .4byte gUnknown_83A6B10 - .4byte gUnknown_83A6B1C - .4byte gUnknown_83A6B28 - .4byte gUnknown_83A6B34 - .4byte gUnknown_83A6B40 - .4byte gUnknown_83A6B4C - .4byte gUnknown_83A6B58 - .4byte gUnknown_83A6B64 - .4byte gUnknown_83A6B70 - .4byte gUnknown_83A6B7C - .4byte gUnknown_83A6B88 - .4byte gUnknown_83A6B94 - .4byte gUnknown_83A6BA0 - .4byte gUnknown_83A6BAC - .4byte gUnknown_83A6BB8 - .4byte gUnknown_83A6BC4 - .4byte gUnknown_83A6BD0 - .4byte gUnknown_83A6BDC - .4byte gUnknown_83A6BE8 - .4byte gUnknown_83A6BF4 - .4byte gUnknown_83A6C00 - .4byte gUnknown_83A6C0C - .4byte gUnknown_83A6C18 - .4byte gUnknown_83A6C24 - .4byte gUnknown_83A6C30 - .4byte gUnknown_83A6C6C - .4byte gUnknown_83A6C74 - .4byte gUnknown_83A6C7C - .4byte gUnknown_83A6C84 - .4byte gUnknown_83A6C8C - .4byte gUnknown_83A6C98 - .4byte gUnknown_83A6CA4 - .4byte gUnknown_83A6CB0 - .4byte gUnknown_83A6CBC - .4byte gUnknown_83A6CC8 - .4byte gUnknown_83A6CD4 - .4byte gUnknown_83A6CE0 - .4byte gUnknown_83A6CEC - .4byte gUnknown_83A6CF8 - .4byte gUnknown_83A6D04 - .4byte gUnknown_83A6D10 - .4byte gUnknown_83A6D1C - .4byte gUnknown_83A6D24 - .4byte gUnknown_83A6D30 - .4byte gUnknown_83A6D38 - .4byte gUnknown_83A6D40 - .4byte gUnknown_83A6D48 - .4byte gUnknown_83A6D50 - .4byte gUnknown_83A6D58 - .4byte gUnknown_83A6D60 - .4byte gUnknown_83A6D68 - .4byte gUnknown_83A6D70 - .4byte gUnknown_83A6D78 - .4byte gUnknown_83A6D80 - .4byte gUnknown_83A6D88 - .4byte gUnknown_83A6D94 - .4byte gUnknown_83A6DA4 - .4byte gUnknown_83A6DB4 - .4byte gUnknown_83A6DBC - .4byte gUnknown_83A6DC4 - .4byte gUnknown_83A6DCC - .4byte gUnknown_83A6DD4 - .4byte gUnknown_83A6DE0 - .4byte gUnknown_83A6DEC - .4byte gUnknown_83A6DF4 - .4byte gUnknown_83A6DFC - .4byte gUnknown_83A6E04 - .4byte gUnknown_83A6E0C - .4byte gUnknown_83A6E18 - .4byte gUnknown_83A6E24 - .4byte gUnknown_83A6E30 - .4byte gUnknown_83A6E3C - .4byte gUnknown_83A6E48 - .4byte gUnknown_83A6E54 - .4byte gUnknown_83A6E60 - .4byte gUnknown_83A6E9C - .4byte gUnknown_83A6EA8 - .4byte gUnknown_83A6EB4 - .4byte gUnknown_83A6EC0 - .4byte gUnknown_83A6ECC - .4byte gUnknown_83A6ED8 - .4byte gUnknown_83A6EE4 - .4byte gUnknown_83A6EF0 - .4byte gUnknown_83A6EFC - .4byte gUnknown_83A6F08 - .4byte gUnknown_83A6F14 - .4byte gUnknown_83A6F20 - .4byte gUnknown_83A6F2C - .4byte gUnknown_83A6F38 - .4byte gUnknown_83A6F44 - .4byte gUnknown_83A6F50 - .4byte gUnknown_83A6F5C - .4byte gUnknown_83A6F68 - .4byte gUnknown_83A6F74 - .4byte gUnknown_83A6F80 - .4byte gUnknown_83A6F8C - .4byte gUnknown_83A6F98 - .4byte gUnknown_83A6FA4 - .4byte gUnknown_83A6FB0 - .4byte gUnknown_83A6FBC - .4byte gUnknown_83A6FC8 - .4byte gUnknown_83A6FD4 - .4byte gUnknown_83A6FE0 - .4byte gUnknown_83A6FEC - .4byte gUnknown_83A6FF4 - .4byte gUnknown_83A6FFC - .4byte gUnknown_83A6898 - .4byte gUnknown_83A68A4 - .4byte gUnknown_83A68B0 - .4byte gUnknown_83A68BC - .4byte gUnknown_83A7004 - .4byte gUnknown_83A6A00 - .4byte gUnknown_83A6A0C - .4byte gUnknown_83A6A18 - .4byte gUnknown_83A6A24 - .4byte gUnknown_83A700C - .4byte gUnknown_83A7018 - .4byte gUnknown_83A6C3C - .4byte gUnknown_83A6C48 - .4byte gUnknown_83A6C54 - .4byte gUnknown_83A6C60 - -gUnknown_83A6864:: @ 83A6864 - .4byte sub_8064638 - .4byte sub_8067934 - -gUnknown_83A686C:: @ 83A686C - .4byte sub_8064648 - .4byte sub_8067934 - -gUnknown_83A6874:: @ 83A6874 - .4byte sub_8064658 - .4byte sub_8067934 - -gUnknown_83A687C:: @ 83A687C - .4byte sub_8064668 - .4byte sub_8067934 + .4byte sMovementActionFuncs_x00 + .4byte sMovementActionFuncs_x01 + .4byte sMovementActionFuncs_x02 + .4byte sMovementActionFuncs_x03 + .4byte sMovementActionFuncs_x04 + .4byte sMovementActionFuncs_x05 + .4byte sMovementActionFuncs_x06 + .4byte sMovementActionFuncs_x07 + .4byte sMovementActionFuncs_x08 + .4byte sMovementActionFuncs_x09 + .4byte sMovementActionFuncs_x0A + .4byte sMovementActionFuncs_x0B + .4byte sMovementActionFuncs_x0C + .4byte sMovementActionFuncs_x0D + .4byte sMovementActionFuncs_x0E + .4byte sMovementActionFuncs_x0F + .4byte sMovementActionFuncs_x10 + .4byte sMovementActionFuncs_x11 + .4byte sMovementActionFuncs_x12 + .4byte sMovementActionFuncs_x13 + .4byte sMovementActionFuncs_x14 + .4byte sMovementActionFuncs_x15 + .4byte sMovementActionFuncs_x16 + .4byte sMovementActionFuncs_x17 + .4byte sMovementActionFuncs_x18 + .4byte sMovementActionFuncs_x19 + .4byte sMovementActionFuncs_x1A + .4byte sMovementActionFuncs_x1B + .4byte sMovementActionFuncs_x1C + .4byte sMovementActionFuncs_x1D + .4byte sMovementActionFuncs_x1E + .4byte sMovementActionFuncs_x1F + .4byte sMovementActionFuncs_x20 + .4byte sMovementActionFuncs_x21 + .4byte sMovementActionFuncs_x22 + .4byte sMovementActionFuncs_x23 + .4byte sMovementActionFuncs_x24 + .4byte sMovementActionFuncs_x25 + .4byte sMovementActionFuncs_x26 + .4byte sMovementActionFuncs_x27 + .4byte sMovementActionFuncs_x28 + .4byte sMovementActionFuncs_x29 + .4byte sMovementActionFuncs_x2A + .4byte sMovementActionFuncs_x2B + .4byte sMovementActionFuncs_x2C + .4byte sMovementActionFuncs_x2D + .4byte sMovementActionFuncs_x2E + .4byte sMovementActionFuncs_x2F + .4byte sMovementActionFuncs_x30 + .4byte sMovementActionFuncs_x31 + .4byte sMovementActionFuncs_x32 + .4byte sMovementActionFuncs_x33 + .4byte sMovementActionFuncs_x34 + .4byte sMovementActionFuncs_x35 + .4byte sMovementActionFuncs_x36 + .4byte sMovementActionFuncs_x37 + .4byte sMovementActionFuncs_x38 + .4byte sMovementActionFuncs_x39 + .4byte sMovementActionFuncs_x3A + .4byte sMovementActionFuncs_x3B + .4byte sMovementActionFuncs_x3C + .4byte sMovementActionFuncs_x3D + .4byte sMovementActionFuncs_x3E + .4byte sMovementActionFuncs_x3F + .4byte sMovementActionFuncs_x40 + .4byte sMovementActionFuncs_x41 + .4byte sMovementActionFuncs_x42 + .4byte sMovementActionFuncs_x43 + .4byte sMovementActionFuncs_x44 + .4byte sMovementActionFuncs_x45 + .4byte sMovementActionFuncs_x46 + .4byte sMovementActionFuncs_x47 + .4byte sMovementActionFuncs_x48 + .4byte sMovementActionFuncs_x49 + .4byte sMovementActionFuncs_x4A + .4byte sMovementActionFuncs_x4B + .4byte sMovementActionFuncs_x4C + .4byte sMovementActionFuncs_x4D + .4byte sMovementActionFuncs_x4E + .4byte sMovementActionFuncs_x4F + .4byte sMovementActionFuncs_x50 + .4byte sMovementActionFuncs_x51 + .4byte sMovementActionFuncs_x52 + .4byte sMovementActionFuncs_x53 + .4byte sMovementActionFuncs_x54 + .4byte sMovementActionFuncs_x55 + .4byte sMovementActionFuncs_x56 + .4byte sMovementActionFuncs_x57 + .4byte sMovementActionFuncs_x58 + .4byte sMovementActionFuncs_x59 + .4byte sMovementActionFuncs_x5A + .4byte sMovementActionFuncs_x5B + .4byte sMovementActionFuncs_x5C + .4byte sMovementActionFuncs_x5D + .4byte sMovementActionFuncs_x5E + .4byte sMovementActionFuncs_x5F + .4byte sMovementActionFuncs_x60 + .4byte sMovementActionFuncs_x61 + .4byte sMovementActionFuncs_x62 + .4byte sMovementActionFuncs_x63 + .4byte sMovementActionFuncs_x64 + .4byte sMovementActionFuncs_x65 + .4byte sMovementActionFuncs_x66 + .4byte sMovementActionFuncs_x67 + .4byte sMovementActionFuncs_x68 + .4byte sMovementActionFuncs_x69 + .4byte sMovementActionFuncs_x6A + .4byte sMovementActionFuncs_x6B + .4byte sMovementActionFuncs_x6C + .4byte sMovementActionFuncs_x6D + .4byte sMovementActionFuncs_x6E + .4byte sMovementActionFuncs_x6F + .4byte sMovementActionFuncs_x70 + .4byte sMovementActionFuncs_x71 + .4byte sMovementActionFuncs_x72 + .4byte sMovementActionFuncs_x73 + .4byte sMovementActionFuncs_x74 + .4byte sMovementActionFuncs_x75 + .4byte sMovementActionFuncs_x76 + .4byte sMovementActionFuncs_x77 + .4byte sMovementActionFuncs_x78 + .4byte sMovementActionFuncs_x79 + .4byte sMovementActionFuncs_x7A + .4byte sMovementActionFuncs_x7B + .4byte sMovementActionFuncs_x7C + .4byte sMovementActionFuncs_x7D + .4byte sMovementActionFuncs_x7E + .4byte sMovementActionFuncs_x7F + .4byte sMovementActionFuncs_x80 + .4byte sMovementActionFuncs_x81 + .4byte sMovementActionFuncs_x82 + .4byte sMovementActionFuncs_x83 + .4byte sMovementActionFuncs_x84 + .4byte sMovementActionFuncs_x85 + .4byte sMovementActionFuncs_x86 + .4byte sMovementActionFuncs_x87 + .4byte sMovementActionFuncs_x88 + .4byte sMovementActionFuncs_x89 + .4byte sMovementActionFuncs_x8A + .4byte sMovementActionFuncs_x8B + .4byte sMovementActionFuncs_x8C + .4byte sMovementActionFuncs_x8D + .4byte sMovementActionFuncs_x8E + .4byte sMovementActionFuncs_x8F + .4byte sMovementActionFuncs_x90 + .4byte sMovementActionFuncs_x91 + .4byte sMovementActionFuncs_x92 + .4byte sMovementActionFuncs_x93 + .4byte sMovementActionFuncs_x94 + .4byte sMovementActionFuncs_x95 + .4byte sMovementActionFuncs_x96 + .4byte sMovementActionFuncs_x97 + .4byte sMovementActionFuncs_x98 + .4byte sMovementActionFuncs_x99 + .4byte sMovementActionFuncs_x9A + .4byte sMovementActionFuncs_x9B + .4byte sMovementActionFuncs_x9C + .4byte sMovementActionFuncs_x9D + .4byte sMovementActionFuncs_x9E + .4byte sMovementActionFuncs_x9F + .4byte sMovementActionFuncs_xA0 + .4byte sMovementActionFuncs_xA1 + .4byte sMovementActionFuncs_xA2 + .4byte sMovementActionFuncs_xA3 + .4byte sMovementActionFuncs_xA4 + .4byte sMovementActionFuncs_xA5 + .4byte sMovementActionFuncs_xA6 + .4byte sMovementActionFuncs_xA7 + .4byte sMovementActionFuncs_xA8 + .4byte sMovementActionFuncs_xA9 + +sMovementActionFuncs_x00:: @ 83A6864 + .4byte MovementActionFunc_x00_0 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x01:: @ 83A686C + .4byte MovementActionFunc_x01_0 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x02:: @ 83A6874 + .4byte MovementActionFunc_x02_0 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x03:: @ 83A687C + .4byte MovementActionFunc_x03_0 + .4byte MovementActionFunc_x00_1 gUnknown_83A6884:: @ 83A6884 .4byte get_go_image_anim_num .4byte get_go_fast_image_anim_num .4byte get_go_fast_image_anim_num .4byte get_go_faster_image_anim_num - .4byte sub_8063470 - -gUnknown_83A6898:: @ 83A6898 - .4byte sub_8064968 - .4byte sub_8064988 - .4byte sub_8067934 - -gUnknown_83A68A4:: @ 83A68A4 - .4byte sub_80649A8 - .4byte sub_80649C8 - .4byte sub_8067934 - -gUnknown_83A68B0:: @ 83A68B0 - .4byte sub_80649E8 - .4byte sub_8064A08 - .4byte sub_8067934 - -gUnknown_83A68BC:: @ 83A68BC - .4byte sub_8064A28 - .4byte sub_8064A48 - .4byte sub_8067934 - -gUnknown_83A68C8:: @ 83A68C8 - .4byte sub_8064A68 - .4byte sub_8064A88 - .4byte sub_8067934 - -gUnknown_83A68D4:: @ 83A68D4 - .4byte sub_8064AA8 - .4byte sub_8064AC8 - .4byte sub_8067934 - -gUnknown_83A68E0:: @ 83A68E0 - .4byte sub_8064AE8 - .4byte sub_8064B08 - .4byte sub_8067934 - -gUnknown_83A68EC:: @ 83A68EC - .4byte sub_8064B28 - .4byte sub_8064B48 - .4byte sub_8067934 - -gUnknown_83A68F8:: @ 83A68F8 - .4byte sub_8064C3C - .4byte sub_8064C5C - .4byte sub_8067934 - -gUnknown_83A6904:: @ 83A6904 - .4byte sub_8064C7C - .4byte sub_8064C9C - .4byte sub_8067934 - -gUnknown_83A6910:: @ 83A6910 - .4byte sub_8064CBC - .4byte sub_8064CDC - .4byte sub_8067934 - -gUnknown_83A691C:: @ 83A691C - .4byte sub_8064CFC - .4byte sub_8064D1C - .4byte sub_8067934 - -gUnknown_83A6928:: @ 83A6928 - .4byte sub_8064D3C - .4byte sub_8064D5C - .4byte sub_8067934 - -gUnknown_83A6934:: @ 83A6934 - .4byte sub_8064D7C - .4byte sub_8064D9C - .4byte sub_8067934 - -gUnknown_83A6940:: @ 83A6940 - .4byte sub_8064DBC - .4byte sub_8064DDC - .4byte sub_8067934 - -gUnknown_83A694C:: @ 83A694C - .4byte sub_8064DFC - .4byte sub_8064E1C - .4byte sub_8067934 + .4byte MovementActionFunc_x03_4 + +sMovementActionFuncs_x9B:: @ 83A6898 + .4byte MovementActionFunc_x9B_0 + .4byte MovementActionFunc_x9B_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x9C:: @ 83A68A4 + .4byte MovementActionFunc_x9C_0 + .4byte MovementActionFunc_x9C_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x9D:: @ 83A68B0 + .4byte MovementActionFunc_x9D_0 + .4byte MovementActionFunc_x9D_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x9E:: @ 83A68BC + .4byte MovementActionFunc_x9E_0 + .4byte MovementActionFunc_x9E_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x08:: @ 83A68C8 + .4byte MovementActionFunc_x08_0 + .4byte MovementActionFunc_x08_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x09:: @ 83A68D4 + .4byte MovementActionFunc_x09_0 + .4byte MovementActionFunc_x09_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x0A:: @ 83A68E0 + .4byte MovementActionFunc_x0A_0 + .4byte MovementActionFunc_x0A_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x0B:: @ 83A68EC + .4byte MovementActionFunc_x0B_0 + .4byte MovementActionFunc_x0B_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x0D:: @ 83A68F8 + .4byte MovementActionFunc_x0D_0 + .4byte MovementActionFunc_x0D_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x0C:: @ 83A6904 + .4byte MovementActionFunc_x0C_0 + .4byte MovementActionFunc_x0C_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x0E:: @ 83A6910 + .4byte MovementActionFunc_x0E_0 + .4byte MovementActionFunc_x0E_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x0F:: @ 83A691C + .4byte MovementActionFunc_x0F_0 + .4byte MovementActionFunc_x0F_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x10:: @ 83A6928 + .4byte MovementActionFunc_x10_0 + .4byte MovementActionFunc_x10_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x11:: @ 83A6934 + .4byte MovementActionFunc_x11_0 + .4byte MovementActionFunc_x11_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x12:: @ 83A6940 + .4byte MovementActionFunc_x12_0 + .4byte MovementActionFunc_x12_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x13:: @ 83A694C + .4byte MovementActionFunc_x13_0 + .4byte MovementActionFunc_x13_1 + .4byte MovementActionFunc_x00_1 gUnknown_83A6958:: @ 83A6958 .2byte 0x0000 @@ -8449,734 +8464,796 @@ gUnknown_83A695E:: @ 83A695E .2byte 0x0000 .2byte 0x0001 -gUnknown_83A6964:: @ 83A6964 - .4byte sub_80650A8 - .4byte sub_80650D4 - .4byte sub_8067934 - -gUnknown_83A6970:: @ 83A6970 - .4byte sub_8065100 - .4byte sub_806512C - .4byte sub_8067934 - -gUnknown_83A697C:: @ 83A697C - .4byte sub_8065158 - .4byte sub_8065184 - .4byte sub_8067934 - -gUnknown_83A6988:: @ 83A6988 - .4byte sub_80651B0 - .4byte sub_80651DC - .4byte sub_8067934 - -gUnknown_83A6994:: @ 83A6994 - .4byte sub_806522C - .4byte sub_8065210 - .4byte sub_8067930 - -gUnknown_83A69A0:: @ 83A69A0 - .4byte sub_806524C - .4byte sub_8065210 - .4byte sub_8067930 - -gUnknown_83A69AC:: @ 83A69AC - .4byte sub_806526C - .4byte sub_8065210 - .4byte sub_8067930 - -gUnknown_83A69B8:: @ 83A69B8 - .4byte sub_806528C - .4byte sub_8065210 - .4byte sub_8067930 - -gUnknown_83A69C4:: @ 83A69C4 - .4byte sub_80652AC - .4byte sub_8065210 - .4byte sub_8067930 - -gUnknown_83A69D0:: @ 83A69D0 - .4byte sub_80652CC - .4byte sub_80652EC - .4byte sub_8067934 - -gUnknown_83A69DC:: @ 83A69DC - .4byte sub_806530C - .4byte sub_806532C - .4byte sub_8067934 - -gUnknown_83A69E8:: @ 83A69E8 - .4byte sub_806534C - .4byte sub_806536C - .4byte sub_8067934 - -gUnknown_83A69F4:: @ 83A69F4 - .4byte sub_806538C - .4byte sub_80653AC - .4byte sub_8067934 - -gUnknown_83A6A00:: @ 83A6A00 - .4byte sub_80653F8 - .4byte sub_8065438 - .4byte sub_8067930 - -gUnknown_83A6A0C:: @ 83A6A0C - .4byte sub_8065464 - .4byte sub_80654A4 - .4byte sub_8067930 - -gUnknown_83A6A18:: @ 83A6A18 - .4byte sub_80654D0 - .4byte sub_8065510 - .4byte sub_8067930 - -gUnknown_83A6A24:: @ 83A6A24 - .4byte sub_806553C - .4byte sub_806557C - .4byte sub_8067930 - -gUnknown_83A6A30:: @ 83A6A30 - .4byte sub_80655D4 - .4byte sub_8067930 - -gUnknown_83A6A38:: @ 83A6A38 - .4byte sub_8065610 - .4byte sub_8067930 - -gUnknown_83A6A40:: @ 83A6A40 - .4byte sub_806564C - .4byte sub_8067930 - -gUnknown_83A6A48:: @ 83A6A48 - .4byte sub_8065688 - .4byte sub_8067930 - -gUnknown_83A6A50:: @ 83A6A50 - .4byte sub_8065770 - .4byte sub_8065734 - .4byte sub_8067934 - -gUnknown_83A6A5C:: @ 83A6A5C - .4byte sub_80657A8 - .4byte sub_8065734 - .4byte sub_8067934 - -gUnknown_83A6A68:: @ 83A6A68 - .4byte sub_80657E0 - .4byte sub_8065734 - .4byte sub_8067934 - -gUnknown_83A6A74:: @ 83A6A74 - .4byte sub_8065818 - .4byte sub_8065734 - .4byte sub_8067934 - -gUnknown_83A6A80:: @ 83A6A80 - .4byte sub_8065850 - .4byte sub_806570C - .4byte sub_8067934 - -gUnknown_83A6A8C:: @ 83A6A8C - .4byte sub_8065888 - .4byte sub_806570C - .4byte sub_8067934 - -gUnknown_83A6A98:: @ 83A6A98 - .4byte sub_80658C0 - .4byte sub_806570C - .4byte sub_8067934 - -gUnknown_83A6AA4:: @ 83A6AA4 - .4byte sub_80658F8 - .4byte sub_806570C - .4byte sub_8067934 - -gUnknown_83A6AB0:: @ 83A6AB0 - .4byte sub_8065930 - .4byte sub_806570C - .4byte sub_8067934 - -gUnknown_83A6ABC:: @ 83A6ABC - .4byte sub_8065968 - .4byte sub_806570C - .4byte sub_8067934 - -gUnknown_83A6AC8:: @ 83A6AC8 - .4byte sub_80659A0 - .4byte sub_806570C - .4byte sub_8067934 - -gUnknown_83A6AD4:: @ 83A6AD4 - .4byte sub_80659D8 - .4byte sub_806570C - .4byte sub_8067934 - -gUnknown_83A6AE0:: @ 83A6AE0 - .4byte sub_8065A10 - .4byte sub_806570C - .4byte sub_8067934 - -gUnknown_83A6AEC:: @ 83A6AEC - .4byte sub_8065A48 - .4byte sub_806570C - .4byte sub_8067934 - -gUnknown_83A6AF8:: @ 83A6AF8 - .4byte sub_8065A80 - .4byte sub_806570C - .4byte sub_8067934 - -gUnknown_83A6B04:: @ 83A6B04 - .4byte sub_8065AB8 - .4byte sub_806570C - .4byte sub_8067934 - -gUnknown_83A6B10:: @ 83A6B10 - .4byte sub_8065AF0 - .4byte sub_8065B10 - .4byte sub_8067934 - -gUnknown_83A6B1C:: @ 83A6B1C - .4byte sub_8065B30 - .4byte sub_8065B50 - .4byte sub_8067934 - -gUnknown_83A6B28:: @ 83A6B28 - .4byte sub_8065B70 - .4byte sub_8065B90 - .4byte sub_8067934 - -gUnknown_83A6B34:: @ 83A6B34 - .4byte sub_8065BB0 - .4byte sub_8065BD0 - .4byte sub_8067934 - -gUnknown_83A6B40:: @ 83A6B40 - .4byte sub_8065BF0 - .4byte sub_8065C10 - .4byte sub_8067934 - -gUnknown_83A6B4C:: @ 83A6B4C - .4byte sub_8065C30 - .4byte sub_8065C50 - .4byte sub_8067934 - -gUnknown_83A6B58:: @ 83A6B58 - .4byte sub_8065C70 - .4byte sub_8065C90 - .4byte sub_8067934 - -gUnknown_83A6B64:: @ 83A6B64 - .4byte sub_8065CB0 - .4byte sub_8065CD0 - .4byte sub_8067934 - -gUnknown_83A6B70:: @ 83A6B70 - .4byte sub_8065CF0 - .4byte sub_8065D10 - .4byte sub_8067934 - -gUnknown_83A6B7C:: @ 83A6B7C - .4byte sub_8065D30 - .4byte sub_8065D50 - .4byte sub_8067934 - -gUnknown_83A6B88:: @ 83A6B88 - .4byte sub_8065D70 - .4byte sub_8065D90 - .4byte sub_8067934 - -gUnknown_83A6B94:: @ 83A6B94 - .4byte sub_8065DB0 - .4byte sub_8065DD0 - .4byte sub_8067934 - -gUnknown_83A6BA0:: @ 83A6BA0 +sMovementActionFuncs_x14:: @ 83A6964 + .4byte MovementActionFunc_x14_0 + .4byte MovementActionFunc_x14_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x15:: @ 83A6970 + .4byte MovementActionFunc_x15_0 + .4byte MovementActionFunc_x15_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x16:: @ 83A697C + .4byte MovementActionFunc_x16_0 + .4byte MovementActionFunc_x16_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x17:: @ 83A6988 + .4byte MovementActionFunc_x17_0 + .4byte MovementActionFunc_x17_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x18:: @ 83A6994 + .4byte MovementActionFunc_x18_0 + .4byte MovementActionFunc_x18_1 + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_x19:: @ 83A69A0 + .4byte MovementActionFunc_x19_0 + .4byte MovementActionFunc_x18_1 + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_x1A:: @ 83A69AC + .4byte MovementActionFunc_x1A_0 + .4byte MovementActionFunc_x18_1 + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_x1B:: @ 83A69B8 + .4byte MovementActionFunc_x1B_0 + .4byte MovementActionFunc_x18_1 + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_x1C:: @ 83A69C4 + .4byte MovementActionFunc_x1C_0 + .4byte MovementActionFunc_x18_1 + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_x1D:: @ 83A69D0 + .4byte MovementActionFunc_x1D_0 + .4byte MovementActionFunc_x1D_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x1E:: @ 83A69DC + .4byte MovementActionFunc_x1E_0 + .4byte MovementActionFunc_x1E_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x1F:: @ 83A69E8 + .4byte MovementActionFunc_x1F_0 + .4byte MovementActionFunc_x1F_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x20:: @ 83A69F4 + .4byte MovementActionFunc_x20_0 + .4byte MovementActionFunc_x20_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_xA0:: @ 83A6A00 + .4byte MovementActionFunc_xA0_0 + .4byte MovementActionFunc_xA0_1 + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_xA1:: @ 83A6A0C + .4byte MovementActionFunc_xA1_0 + .4byte MovementActionFunc_xA1_1 + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_xA2:: @ 83A6A18 + .4byte MovementActionFunc_xA2_0 + .4byte MovementActionFunc_xA2_1 + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_xA3:: @ 83A6A24 + .4byte MovementActionFunc_xA3_0 + .4byte MovementActionFunc_xA3_1 + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_x04:: @ 83A6A30 + .4byte MovementActionFunc_x04_0 + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_x05:: @ 83A6A38 + .4byte MovementActionFunc_x05_0 + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_x06:: @ 83A6A40 + .4byte MovementActionFunc_x06_0 + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_x07:: @ 83A6A48 + .4byte MovementActionFunc_x07_0 + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_x21:: @ 83A6A50 + .4byte MovementActionFunc_x21_0 + .4byte MovementActionFunc_x21_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x22:: @ 83A6A5C + .4byte MovementActionFunc_x22_0 + .4byte MovementActionFunc_x21_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x23:: @ 83A6A68 + .4byte MovementActionFunc_x23_0 + .4byte MovementActionFunc_x21_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x24:: @ 83A6A74 + .4byte MovementActionFunc_x24_0 + .4byte MovementActionFunc_x21_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x25:: @ 83A6A80 + .4byte MovementActionFunc_x25_0 + .4byte MovementActionFunc_x25_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x26:: @ 83A6A8C + .4byte MovementActionFunc_x26_0 + .4byte MovementActionFunc_x25_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x27:: @ 83A6A98 + .4byte MovementActionFunc_x27_0 + .4byte MovementActionFunc_x25_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x28:: @ 83A6AA4 + .4byte MovementActionFunc_x28_0 + .4byte MovementActionFunc_x25_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x29:: @ 83A6AB0 + .4byte MovementActionFunc_x29_0 + .4byte MovementActionFunc_x25_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x2A:: @ 83A6ABC + .4byte MovementActionFunc_x2A_0 + .4byte MovementActionFunc_x25_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x2B:: @ 83A6AC8 + .4byte MovementActionFunc_x2B_0 + .4byte MovementActionFunc_x25_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x2C:: @ 83A6AD4 + .4byte MovementActionFunc_x2C_0 + .4byte MovementActionFunc_x25_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x2D:: @ 83A6AE0 + .4byte MovementActionFunc_x2D_0 + .4byte MovementActionFunc_x25_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x2E:: @ 83A6AEC + .4byte MovementActionFunc_x2E_0 + .4byte MovementActionFunc_x25_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x2F:: @ 83A6AF8 + .4byte MovementActionFunc_x2F_0 + .4byte MovementActionFunc_x25_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x30:: @ 83A6B04 + .4byte MovementActionFunc_x30_0 + .4byte MovementActionFunc_x25_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x31:: @ 83A6B10 + .4byte MovementActionFunc_x31_0 + .4byte MovementActionFunc_x31_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x32:: @ 83A6B1C + .4byte MovementActionFunc_x32_0 + .4byte MovementActionFunc_x32_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x33:: @ 83A6B28 + .4byte MovementActionFunc_x33_0 + .4byte MovementActionFunc_x33_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x34:: @ 83A6B34 + .4byte MovementActionFunc_x34_0 + .4byte MovementActionFunc_x34_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x35:: @ 83A6B40 + .4byte MovementActionFunc_x35_0 + .4byte MovementActionFunc_x35_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x36:: @ 83A6B4C + .4byte MovementActionFunc_x36_0 + .4byte MovementActionFunc_x36_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x37:: @ 83A6B58 + .4byte MovementActionFunc_x37_0 + .4byte MovementActionFunc_x37_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x38:: @ 83A6B64 + .4byte MovementActionFunc_x38_0 + .4byte MovementActionFunc_x38_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x39:: @ 83A6B70 + .4byte MovementActionFunc_x39_0 + .4byte MovementActionFunc_x39_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x3A:: @ 83A6B7C + .4byte MovementActionFunc_x3A_0 + .4byte MovementActionFunc_x3A_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x3B:: @ 83A6B88 + .4byte MovementActionFunc_x3B_0 + .4byte MovementActionFunc_x3B_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x3C:: @ 83A6B94 + .4byte MovementActionFunc_x3C_0 + .4byte MovementActionFunc_x3C_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x3D:: @ 83A6BA0 .4byte do_run_south_anim - .4byte sub_8065E10 - .4byte sub_8067934 + .4byte MovementActionFunc_x3D_1 + .4byte MovementActionFunc_x00_1 -gUnknown_83A6BAC:: @ 83A6BAC +sMovementActionFuncs_x3E:: @ 83A6BAC .4byte do_run_north_anim - .4byte sub_8065E50 - .4byte sub_8067934 + .4byte MovementActionFunc_x3E_1 + .4byte MovementActionFunc_x00_1 -gUnknown_83A6BB8:: @ 83A6BB8 +sMovementActionFuncs_x3F:: @ 83A6BB8 .4byte do_run_west_anim - .4byte sub_8065E90 - .4byte sub_8067934 + .4byte MovementActionFunc_x3F_1 + .4byte MovementActionFunc_x00_1 -gUnknown_83A6BC4:: @ 83A6BC4 +sMovementActionFuncs_x40:: @ 83A6BC4 .4byte do_run_east_anim - .4byte sub_8065ED0 - .4byte sub_8067934 - -gUnknown_83A6BD0:: @ 83A6BD0 - .4byte sub_8065FC4 - .4byte sub_8065FE4 - .4byte sub_8067934 - -gUnknown_83A6BDC:: @ 83A6BDC - .4byte sub_8066004 - .4byte sub_8066024 - .4byte sub_8067934 - -gUnknown_83A6BE8:: @ 83A6BE8 - .4byte sub_8066044 - .4byte sub_8066064 - .4byte sub_8067934 - -gUnknown_83A6BF4:: @ 83A6BF4 - .4byte sub_8066084 - .4byte sub_80660A4 - .4byte sub_8067934 - -gUnknown_83A6C00:: @ 83A6C00 - .4byte sub_80660F0 - .4byte sub_8066108 - .4byte sub_8067934 - -gUnknown_83A6C0C:: @ 83A6C0C - .4byte sub_806615C - .4byte sub_806617C - .4byte sub_8067934 - -gUnknown_83A6C18:: @ 83A6C18 - .4byte sub_80661A4 - .4byte sub_80661C4 - .4byte sub_8067934 - -gUnknown_83A6C24:: @ 83A6C24 - .4byte sub_80661EC - .4byte sub_806620C - .4byte sub_8067934 - -gUnknown_83A6C30:: @ 83A6C30 - .4byte sub_8066234 - .4byte sub_8066254 - .4byte sub_8067934 - -gUnknown_83A6C3C:: @ 83A6C3C - .4byte sub_806627C - .4byte sub_806629C - .4byte sub_8067934 - -gUnknown_83A6C48:: @ 83A6C48 - .4byte sub_80662BC - .4byte sub_80662DC - .4byte sub_8067934 - -gUnknown_83A6C54:: @ 83A6C54 - .4byte sub_80662FC - .4byte sub_806631C - .4byte sub_8067934 - -gUnknown_83A6C60:: @ 83A6C60 - .4byte sub_806633C - .4byte sub_806635C - .4byte sub_8067934 - -gUnknown_83A6C6C:: @ 83A6C6C - .4byte sub_806637C - .4byte sub_8067934 - -gUnknown_83A6C74:: @ 83A6C74 - .4byte sub_80663D8 - .4byte sub_8067934 - -gUnknown_83A6C7C:: @ 83A6C7C - .4byte sub_806643C - .4byte sub_8067934 - -gUnknown_83A6C84:: @ 83A6C84 - .4byte sub_806644C - .4byte sub_8067934 - -gUnknown_83A6C8C:: @ 83A6C8C - .4byte sub_806645C - .4byte sub_8066488 - .4byte sub_8067934 - -gUnknown_83A6C98:: @ 83A6C98 - .4byte sub_80664B4 - .4byte sub_80664E0 - .4byte sub_8067934 - -gUnknown_83A6CA4:: @ 83A6CA4 - .4byte sub_806650C - .4byte sub_8066538 - .4byte sub_8067934 - -gUnknown_83A6CB0:: @ 83A6CB0 - .4byte sub_8066564 - .4byte sub_8066590 - .4byte sub_8067934 - -gUnknown_83A6CBC:: @ 83A6CBC - .4byte sub_80665BC - .4byte sub_80665E8 - .4byte sub_8067934 - -gUnknown_83A6CC8:: @ 83A6CC8 - .4byte sub_8066614 - .4byte sub_8066640 - .4byte sub_8067934 - -gUnknown_83A6CD4:: @ 83A6CD4 - .4byte sub_806666C - .4byte sub_8066698 - .4byte sub_8067934 - -gUnknown_83A6CE0:: @ 83A6CE0 - .4byte sub_80666C4 - .4byte sub_80666F0 - .4byte sub_8067934 - -gUnknown_83A6CEC:: @ 83A6CEC - .4byte sub_806671C - .4byte sub_8066748 - .4byte sub_8067934 - -gUnknown_83A6CF8:: @ 83A6CF8 - .4byte sub_8066774 - .4byte sub_80667A0 - .4byte sub_8067934 - -gUnknown_83A6D04:: @ 83A6D04 - .4byte sub_80667CC - .4byte sub_80667F8 - .4byte sub_8067934 - -gUnknown_83A6D10:: @ 83A6D10 - .4byte sub_8066824 - .4byte sub_8066850 - .4byte sub_8067934 - -gUnknown_83A6D1C:: @ 83A6D1C - .4byte sub_806687C - .4byte sub_8067934 - -gUnknown_83A6D24:: @ 83A6D24 - .4byte sub_8066894 - .4byte sub_8066108 - .4byte sub_8067934 - -gUnknown_83A6D30:: @ 83A6D30 - .4byte sub_80668A4 - .4byte sub_8067930 - -gUnknown_83A6D38:: @ 83A6D38 - .4byte sub_80668B4 - .4byte sub_8067930 - -gUnknown_83A6D40:: @ 83A6D40 - .4byte sub_80668C4 - .4byte sub_8067930 - -gUnknown_83A6D48:: @ 83A6D48 - .4byte sub_80668D4 - .4byte sub_8067930 - -gUnknown_83A6D50:: @ 83A6D50 - .4byte sub_8066900 - .4byte sub_8067930 - -gUnknown_83A6D58:: @ 83A6D58 - .4byte sub_8066910 - .4byte sub_8067930 - -gUnknown_83A6D60:: @ 83A6D60 + .4byte MovementActionFunc_x40_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x41:: @ 83A6BD0 + .4byte MovementActionFunc_x41_0 + .4byte MovementActionFunc_x41_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x42:: @ 83A6BDC + .4byte MovementActionFunc_x42_0 + .4byte MovementActionFunc_x42_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x43:: @ 83A6BE8 + .4byte MovementActionFunc_x43_0 + .4byte MovementActionFunc_x43_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x44:: @ 83A6BF4 + .4byte MovementActionFunc_x44_0 + .4byte MovementActionFunc_x44_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x45:: @ 83A6C00 + .4byte MovementActionFunc_x45_0 + .4byte MovementActionFunc_x45_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x46:: @ 83A6C0C + .4byte MovementActionFunc_x46_0 + .4byte MovementActionFunc_x46_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x47:: @ 83A6C18 + .4byte MovementActionFunc_x47_0 + .4byte MovementActionFunc_x47_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x48:: @ 83A6C24 + .4byte MovementActionFunc_x48_0 + .4byte MovementActionFunc_x48_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x49:: @ 83A6C30 + .4byte MovementActionFunc_x49_0 + .4byte MovementActionFunc_x49_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_xA6:: @ 83A6C3C + .4byte MovementActionFunc_xA6_0 + .4byte MovementActionFunc_xA6_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_xA7:: @ 83A6C48 + .4byte MovementActionFunc_xA7_0 + .4byte MovementActionFunc_xA7_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_xA8:: @ 83A6C54 + .4byte MovementActionFunc_xA8_0 + .4byte MovementActionFunc_xA8_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_xA9:: @ 83A6C60 + .4byte MovementActionFunc_xA9_0 + .4byte MovementActionFunc_xA9_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x4A:: @ 83A6C6C + .4byte MovementActionFunc_x4A_0 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x4B:: @ 83A6C74 + .4byte MovementActionFunc_x4B_0 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x4C:: @ 83A6C7C + .4byte MovementActionFunc_x4C_0 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x4D:: @ 83A6C84 + .4byte MovementActionFunc_x4D_0 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x4E:: @ 83A6C8C + .4byte MovementActionFunc_x4E_0 + .4byte MovementActionFunc_x4E_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x4F:: @ 83A6C98 + .4byte MovementActionFunc_x4F_0 + .4byte MovementActionFunc_x4F_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x50:: @ 83A6CA4 + .4byte MovementActionFunc_x50_0 + .4byte MovementActionFunc_x50_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x51:: @ 83A6CB0 + .4byte MovementActionFunc_x51_0 + .4byte MovementActionFunc_x51_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x52:: @ 83A6CBC + .4byte MovementActionFunc_x52_0 + .4byte MovementActionFunc_x52_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x53:: @ 83A6CC8 + .4byte MovementActionFunc_x53_0 + .4byte MovementActionFunc_x53_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x54:: @ 83A6CD4 + .4byte MovementActionFunc_x54_0 + .4byte MovementActionFunc_x54_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x55:: @ 83A6CE0 + .4byte MovementActionFunc_x55_0 + .4byte MovementActionFunc_x55_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x56:: @ 83A6CEC + .4byte MovementActionFunc_x56_0 + .4byte MovementActionFunc_x56_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x57:: @ 83A6CF8 + .4byte MovementActionFunc_x57_0 + .4byte MovementActionFunc_x57_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x58:: @ 83A6D04 + .4byte MovementActionFunc_x58_0 + .4byte MovementActionFunc_x58_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x59:: @ 83A6D10 + .4byte MovementActionFunc_x59_0 + .4byte MovementActionFunc_x59_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x5A:: @ 83A6D1C + .4byte MovementActionFunc_x5A_0 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x5B:: @ 83A6D24 + .4byte MovementActionFunc_x5B_0 + .4byte MovementActionFunc_x45_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x5C:: @ 83A6D30 + .4byte MovementActionFunc_x5C_0 + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_x5D:: @ 83A6D38 + .4byte MovementActionFunc_x5D_0 + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_x5E:: @ 83A6D40 + .4byte MovementActionFunc_x5E_0 + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_x5F:: @ 83A6D48 + .4byte MovementActionFunc_x5F_0 + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_x60:: @ 83A6D50 + .4byte MovementActionFunc_x60_0 + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_x61:: @ 83A6D58 + .4byte MovementActionFunc_x61_0 + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_x62:: @ 83A6D60 .4byte do_exclamation_mark_bubble_1 - .4byte sub_8067930 + .4byte MovementActionFunc_x18_2 -gUnknown_83A6D68:: @ 83A6D68 +sMovementActionFuncs_x63:: @ 83A6D68 .4byte do_exclamation_mark_bubble_2 - .4byte sub_8067930 - -gUnknown_83A6D70:: @ 83A6D70 - .4byte do_heart_bubble - .4byte sub_8067930 - -gUnknown_83A6D78:: @ 83A6D78 - .4byte sub_806698C - .4byte sub_8067930 - -gUnknown_83A6D80:: @ 83A6D80 - .4byte sub_80669B0 - .4byte sub_8067930 - -gUnknown_83A6D88:: @ 83A6D88 - .4byte sub_80669D4 - .4byte sub_8066A18 - .4byte sub_8067930 - -gUnknown_83A6D94:: @ 83A6D94 - .4byte sub_8066A38 - .4byte sub_8066A54 - .4byte sub_8066A78 - .4byte sub_8067930 - -gUnknown_83A6DA4:: @ 83A6DA4 - .4byte sub_8066AB4 - .4byte sub_8066AD0 - .4byte sub_8066AF4 - .4byte sub_8067930 - -gUnknown_83A6DB4:: @ 83A6DB4 - .4byte sub_8066B30 - .4byte sub_8067930 - -gUnknown_83A6DBC:: @ 83A6DBC - .4byte sub_8066B40 - .4byte sub_8067930 - -gUnknown_83A6DC4:: @ 83A6DC4 - .4byte sub_8066B50 - .4byte sub_8067930 - -gUnknown_83A6DCC:: @ 83A6DCC - .4byte sub_8066B80 - .4byte sub_8067930 - -gUnknown_83A6DD4:: @ 83A6DD4 - .4byte sub_8066BB0 - .4byte sub_8066BE4 - .4byte sub_8067934 - -gUnknown_83A6DE0:: @ 83A6DE0 - .4byte sub_8066C10 - .4byte sub_8066C44 - .4byte sub_8067934 - -gUnknown_83A6DEC:: @ 83A6DEC - .4byte sub_8066CB0 - .4byte sub_8067934 - -gUnknown_83A6DF4:: @ 83A6DF4 - .4byte sub_8066CC0 - .4byte sub_8067934 - -gUnknown_83A6DFC:: @ 83A6DFC - .4byte sub_8066CD0 - .4byte sub_8067934 - -gUnknown_83A6E04:: @ 83A6E04 - .4byte sub_8066CE0 - .4byte sub_8067934 - -gUnknown_83A6E0C:: @ 83A6E0C - .4byte sub_8066CF0 - .4byte sub_8066108 - .4byte sub_8067934 - -gUnknown_83A6E18:: @ 83A6E18 - .4byte sub_8066D14 - .4byte sub_8066108 - .4byte sub_8067934 - -gUnknown_83A6E24:: @ 83A6E24 - .4byte sub_8066D38 - .4byte sub_8066108 - .4byte sub_8067934 - -gUnknown_83A6E30:: @ 83A6E30 - .4byte sub_8066D5C - .4byte sub_8066108 - .4byte sub_8067934 - -gUnknown_83A6E3C:: @ 83A6E3C - .4byte sub_8066D80 - .4byte sub_8066108 - .4byte sub_8067934 - -gUnknown_83A6E48:: @ 83A6E48 - .4byte sub_8066DA4 - .4byte sub_8066108 - .4byte sub_8067934 - -gUnknown_83A6E54:: @ 83A6E54 - .4byte sub_8066DC8 - .4byte sub_8066108 - .4byte sub_8067934 - -gUnknown_83A6E60:: @ 83A6E60 - .4byte sub_8066DEC - .4byte sub_8066108 - .4byte sub_8067934 - .4byte sub_8066E10 - .4byte sub_8066108 - .4byte sub_8067934 - .4byte sub_8066E34 - .4byte sub_8066108 - .4byte sub_8067934 - .4byte sub_8066E58 - .4byte sub_8066108 - .4byte sub_8067934 - .4byte sub_8066E7C - .4byte sub_8066108 - .4byte sub_8067934 - -gUnknown_83A6E9C:: @ 83A6E9C - .4byte sub_8066EE4 - .4byte sub_8066F10 - .4byte sub_8067934 - -gUnknown_83A6EA8:: @ 83A6EA8 - .4byte sub_8066F3C - .4byte sub_8066F68 - .4byte sub_8067934 - -gUnknown_83A6EB4:: @ 83A6EB4 - .4byte sub_8066F94 - .4byte sub_8066FC0 - .4byte sub_8067934 - -gUnknown_83A6EC0:: @ 83A6EC0 - .4byte sub_8066FEC - .4byte sub_8067018 - .4byte sub_8067934 - -gUnknown_83A6ECC:: @ 83A6ECC - .4byte sub_8067044 - .4byte sub_8067070 - .4byte sub_8067934 - -gUnknown_83A6ED8:: @ 83A6ED8 - .4byte sub_806709C - .4byte sub_80670C8 - .4byte sub_8067934 - -gUnknown_83A6EE4:: @ 83A6EE4 - .4byte sub_80670F4 - .4byte sub_8067120 - .4byte sub_8067934 - -gUnknown_83A6EF0:: @ 83A6EF0 - .4byte sub_806714C - .4byte sub_8067178 - .4byte sub_8067934 - -gUnknown_83A6EFC:: @ 83A6EFC - .4byte sub_80671A4 - .4byte sub_80671D0 - .4byte sub_8067934 - -gUnknown_83A6F08:: @ 83A6F08 - .4byte sub_80671FC - .4byte sub_8067228 - .4byte sub_8067934 - -gUnknown_83A6F14:: @ 83A6F14 - .4byte sub_8067254 - .4byte sub_8067280 - .4byte sub_8067934 - -gUnknown_83A6F20:: @ 83A6F20 - .4byte sub_80672AC - .4byte sub_80672D8 - .4byte sub_8067934 - -gUnknown_83A6F2C:: @ 83A6F2C - .4byte sub_8067304 - .4byte sub_806570C - .4byte sub_8067934 - -gUnknown_83A6F38:: @ 83A6F38 - .4byte sub_806733C - .4byte sub_806570C - .4byte sub_8067934 - -gUnknown_83A6F44:: @ 83A6F44 - .4byte sub_8067374 - .4byte sub_806570C - .4byte sub_8067934 - -gUnknown_83A6F50:: @ 83A6F50 - .4byte sub_80673AC - .4byte sub_806570C - .4byte sub_8067934 - -gUnknown_83A6F5C:: @ 83A6F5C - .4byte sub_806741C - .4byte sub_806743C - .4byte sub_8067934 - -gUnknown_83A6F68:: @ 83A6F68 - .4byte sub_806745C - .4byte sub_806747C - .4byte sub_8067934 - -gUnknown_83A6F74:: @ 83A6F74 - .4byte sub_806749C - .4byte sub_80674BC - .4byte sub_8067934 - -gUnknown_83A6F80:: @ 83A6F80 - .4byte sub_80674DC - .4byte sub_80674FC - .4byte sub_8067934 - -gUnknown_83A6F8C:: @ 83A6F8C - .4byte sub_806754C - .4byte sub_806756C - .4byte sub_8067934 - -gUnknown_83A6F98:: @ 83A6F98 - .4byte sub_806758C - .4byte sub_80675AC - .4byte sub_8067934 - -gUnknown_83A6FA4:: @ 83A6FA4 - .4byte sub_80675CC - .4byte sub_80675EC - .4byte sub_8067934 - -gUnknown_83A6FB0:: @ 83A6FB0 - .4byte sub_806760C - .4byte sub_806762C - .4byte sub_8067934 - -gUnknown_83A6FBC:: @ 83A6FBC - .4byte sub_8067684 - .4byte sub_80676A4 - .4byte sub_8067934 - -gUnknown_83A6FC8:: @ 83A6FC8 - .4byte sub_80676C4 - .4byte sub_80676E4 - .4byte sub_8067934 - -gUnknown_83A6FD4:: @ 83A6FD4 - .4byte sub_8067704 - .4byte sub_8067724 - .4byte sub_8067934 - -gUnknown_83A6FE0:: @ 83A6FE0 - .4byte sub_8067744 - .4byte sub_8067764 - .4byte sub_8067934 - -gUnknown_83A6FEC:: @ 83A6FEC - .4byte sub_8067784 - .4byte sub_80677C0 - -gUnknown_83A6FF4:: @ 83A6FF4 - .4byte sub_8067784 - .4byte sub_80677CC - -gUnknown_83A6FFC:: @ 83A6FFC - .4byte sub_8067784 - .4byte sub_80678C0 - -gUnknown_83A7004:: @ 83A7004 - .4byte sub_80678F0 - .4byte sub_8067924 - -gUnknown_83A700C:: @ 83A700C - .4byte sub_8067944 - .4byte sub_8067954 - .4byte sub_80679A8 - -gUnknown_83A7018:: @ 83A7018 - .4byte sub_8067978 - .4byte sub_806798C - .4byte sub_80679A8 + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_x64:: @ 83A6D70 + .4byte do_x_bubble + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_x65:: @ 83A6D78 + .4byte do_double_excl_bubble + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_x66:: @ 83A6D80 + .4byte do_smile_bubble + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_x67:: @ 83A6D88 + .4byte MovementActionFunc_x67_0 + .4byte MovementActionFunc_x67_1 + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_x68:: @ 83A6D94 + .4byte MovementActionFunc_x68_0 + .4byte MovementActionFunc_x68_1 + .4byte MovementActionFunc_x68_2 + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_x69:: @ 83A6DA4 + .4byte MovementActionFunc_x69_0 + .4byte MovementActionFunc_x69_1 + .4byte MovementActionFunc_x69_2 + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_x6A:: @ 83A6DB4 + .4byte MovementActionFunc_x6A_0 + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_x6B:: @ 83A6DBC + .4byte MovementActionFunc_x6B_0 + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_x6C:: @ 83A6DC4 + .4byte MovementActionFunc_x6C_0 + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_x6D:: @ 83A6DCC + .4byte MovementActionFunc_x6D_0 + .4byte MovementActionFunc_x18_2 + +sMovementActionFuncs_x6E:: @ 83A6DD4 + .4byte MovementActionFunc_x6E_0 + .4byte MovementActionFunc_x6E_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x6F:: @ 83A6DE0 + .4byte MovementActionFunc_x6F_0 + .4byte MovementActionFunc_x6F_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x70:: @ 83A6DEC + .4byte MovementActionFunc_x70_0 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x71:: @ 83A6DF4 + .4byte MovementActionFunc_x71_0 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x72:: @ 83A6DFC + .4byte MovementActionFunc_x72_0 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x73:: @ 83A6E04 + .4byte MovementActionFunc_x73_0 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x74:: @ 83A6E0C + .4byte MovementActionFunc_x74_0 + .4byte MovementActionFunc_x45_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x75:: @ 83A6E18 + .4byte MovementActionFunc_x75_0 + .4byte MovementActionFunc_x45_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x76:: @ 83A6E24 + .4byte MovementActionFunc_x76_0 + .4byte MovementActionFunc_x45_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x77:: @ 83A6E30 + .4byte MovementActionFunc_x77_0 + .4byte MovementActionFunc_x45_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x78:: @ 83A6E3C + .4byte MovementActionFunc_x78_0 + .4byte MovementActionFunc_x45_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x79:: @ 83A6E48 + .4byte MovementActionFunc_x79_0 + .4byte MovementActionFunc_x45_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x7A:: @ 83A6E54 + .4byte MovementActionFunc_x7A_0 + .4byte MovementActionFunc_x45_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x7B:: @ 83A6E60 + .4byte MovementActionFunc_x7B_0 + .4byte MovementActionFunc_x45_1 + .4byte MovementActionFunc_x00_1 + .4byte MovementActionFunc_x7B_3 + .4byte MovementActionFunc_x45_1 + .4byte MovementActionFunc_x00_1 + .4byte MovementActionFunc_x7B_6 + .4byte MovementActionFunc_x45_1 + .4byte MovementActionFunc_x00_1 + .4byte MovementActionFunc_x7B_9 + .4byte MovementActionFunc_x45_1 + .4byte MovementActionFunc_x00_1 + .4byte MovementActionFunc_x7B_12 + .4byte MovementActionFunc_x45_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x7C:: @ 83A6E9C + .4byte MovementActionFunc_x7C_0 + .4byte MovementActionFunc_x7C_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x7D:: @ 83A6EA8 + .4byte MovementActionFunc_x7D_0 + .4byte MovementActionFunc_x7D_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x7E:: @ 83A6EB4 + .4byte MovementActionFunc_x7E_0 + .4byte MovementActionFunc_x7E_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x7F:: @ 83A6EC0 + .4byte MovementActionFunc_x7F_0 + .4byte MovementActionFunc_x7F_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x80:: @ 83A6ECC + .4byte MovementActionFunc_x80_0 + .4byte MovementActionFunc_x80_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x81:: @ 83A6ED8 + .4byte MovementActionFunc_x81_0 + .4byte MovementActionFunc_x81_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x82:: @ 83A6EE4 + .4byte MovementActionFunc_x82_0 + .4byte MovementActionFunc_x82_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x83:: @ 83A6EF0 + .4byte MovementActionFunc_x83_0 + .4byte MovementActionFunc_x83_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x84:: @ 83A6EFC + .4byte MovementActionFunc_x84_0 + .4byte MovementActionFunc_x84_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x85:: @ 83A6F08 + .4byte MovementActionFunc_x85_0 + .4byte MovementActionFunc_x85_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x86:: @ 83A6F14 + .4byte MovementActionFunc_x86_0 + .4byte MovementActionFunc_x86_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x87:: @ 83A6F20 + .4byte MovementActionFunc_x87_0 + .4byte MovementActionFunc_x87_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x88:: @ 83A6F2C + .4byte MovementActionFunc_x88_0 + .4byte MovementActionFunc_x25_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x89:: @ 83A6F38 + .4byte MovementActionFunc_x89_0 + .4byte MovementActionFunc_x25_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x8A:: @ 83A6F44 + .4byte MovementActionFunc_x8A_0 + .4byte MovementActionFunc_x25_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x8B:: @ 83A6F50 + .4byte MovementActionFunc_x8B_0 + .4byte MovementActionFunc_x25_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x8C:: @ 83A6F5C + .4byte MovementActionFunc_x8C_0 + .4byte MovementActionFunc_x8C_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x8D:: @ 83A6F68 + .4byte MovementActionFunc_x8D_0 + .4byte MovementActionFunc_x8D_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x8E:: @ 83A6F74 + .4byte MovementActionFunc_x8E_0 + .4byte MovementActionFunc_x8E_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x8F:: @ 83A6F80 + .4byte MovementActionFunc_x8F_0 + .4byte MovementActionFunc_x8F_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x90:: @ 83A6F8C + .4byte MovementActionFunc_x90_0 + .4byte MovementActionFunc_x90_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x91:: @ 83A6F98 + .4byte MovementActionFunc_x91_0 + .4byte MovementActionFunc_x91_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x92:: @ 83A6FA4 + .4byte MovementActionFunc_x92_0 + .4byte MovementActionFunc_x92_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x93:: @ 83A6FB0 + .4byte MovementActionFunc_x93_0 + .4byte MovementActionFunc_x93_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x94:: @ 83A6FBC + .4byte MovementActionFunc_x94_0 + .4byte MovementActionFunc_x94_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x95:: @ 83A6FC8 + .4byte MovementActionFunc_x95_0 + .4byte MovementActionFunc_x95_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x96:: @ 83A6FD4 + .4byte MovementActionFunc_x96_0 + .4byte MovementActionFunc_x96_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x97:: @ 83A6FE0 + .4byte MovementActionFunc_x97_0 + .4byte MovementActionFunc_x97_1 + .4byte MovementActionFunc_x00_1 + +sMovementActionFuncs_x98:: @ 83A6FEC + .4byte MovementActionFunc_x98_0 + .4byte MovementActionFunc_x98_1 + +sMovementActionFuncs_x99:: @ 83A6FF4 + .4byte MovementActionFunc_x98_0 + .4byte MovementActionFunc_x99_1 + +sMovementActionFuncs_x9A:: @ 83A6FFC + .4byte MovementActionFunc_x98_0 + .4byte MovementActionFunc_x9A_1 + +sMovementActionFuncs_x9F:: @ 83A7004 + .4byte MovementActionFunc_x9F_0 + .4byte MovementActionFunc_x9F_1 + +sMovementActionFuncs_xA4:: @ 83A700C + .4byte MovementActionFunc_xA4_0 + .4byte MovementActionFunc_xA4_1 + .4byte MovementActionFunc_xA4_2 + +sMovementActionFuncs_xA5:: @ 83A7018 + .4byte MovementActionFunc_xA5_0 + .4byte MovementActionFunc_xA5_1 + .4byte MovementActionFunc_xA4_2 + .align 2 +gUnknown_83A7024:: @ 83A7024 + .4byte 0x00000020, 0x00000010 + +gUnknown_83A702C:: @ 83A702C + .4byte MetatileBehavior_IsTallGrass_2 + .4byte MetatileBehavior_IsLongGrass + .4byte MetatileBehavior_IsPuddle + .4byte MetatileBehavior_IsSurfable + .4byte MetatileBehavior_IsWaterfallBottom + .4byte MetatileBehavior_UnusedReturnTrue + +gUnknown_83A7044:: @ 83A7044 + .4byte 0x00001000, 0x00002000, 0x00004000, 0x00008000, 0x00004000, 0x00010000 + +gUnknown_83A705C:: @ 83A705C + .4byte MetatileBehavior_IsJumpSouth + .4byte MetatileBehavior_IsJumpNorth + .4byte MetatileBehavior_IsJumpWest + .4byte MetatileBehavior_IsJumpEast + +gUnknown_83A706C:: @ 83A706C + .byte 0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73 + +gUnknown_83A707C:: @ 83A707C + .byte 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x02 + +gUnknown_83A708C:: @ 83A708C + .byte 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01 + +gUnknown_83A709C:: @ 83A709C + .4byte nullsub_26 + .4byte DoTracksGroundEffect_Footprints + .4byte DoTracksGroundEffect_BikeTireTracks + +gUnknown_83A70A8:: @ 83A70A8 + .byte 0x0d, 0x00, 0x18, 0x00 + +gUnknown_83A70AC:: @ 83A70AC + .byte 0x01, 0x02, 0x07, 0x08, 0x01, 0x02, 0x06, 0x05, 0x05, 0x08, 0x03, 0x04, 0x06, 0x07, 0x03, 0x04 + +gUnknown_83A70BC:: @ 83A70BC + .4byte GroundEffect_SpawnOnTallGrass + .4byte GroundEffect_StepOnTallGrass + .4byte GroundEffect_SpawnOnLongGrass + .4byte GroundEffect_StepOnLongGrass + .4byte GroundEffect_WaterReflection + .4byte GroundEffect_IceReflection + .4byte GroundEffect_FlowingWater + .4byte GroundEffect_SandTracks + .4byte GroundEffect_DeepSandTracks + .4byte GroundEffect_Ripple + .4byte GroundEffect_StepOnPuddle + .4byte GroundEffect_SandHeap + .4byte GroundEffect_JumpOnTallGrass + .4byte GroundEffect_JumpOnLongGrass + .4byte GroundEffect_JumpOnShallowWater + .4byte GroundEffect_JumpOnWater + .4byte GroundEffect_JumpLandingDust + .4byte GroundEffect_ShortGrass + .4byte GroundEffect_HotSprings + .4byte GroundEffect_Seaweed diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 35f307e43..159d8d01f 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -35,7 +35,7 @@ gUnknown_81D96AC:: @ 81D96AC .4byte gFldEffScript_NpcflyOut .4byte gFldEffScript_UseFly .4byte gFldEffScript_FlyIn - .4byte gFldEffScript_ExclamationMarkIcon2 + .4byte gFldEffScript_QuestionMarkIcon .4byte gFldEffScript_FeetInFlowingWater .4byte gFldEffScript_BikeTireTracks .4byte gFldEffScript_SandDisguise @@ -203,7 +203,7 @@ gFldEffScript_FlyIn:: @ 81D98BE callnative FldEff_FlyIn end -gFldEffScript_ExclamationMarkIcon2:: @ 81D98C4 +gFldEffScript_QuestionMarkIcon:: @ 81D98C4 callnative FldEff_QuestionMarkIcon end diff --git a/data/field_ground_effect.s b/data/field_ground_effect.s deleted file mode 100644 index c871b2d4b..000000000 --- a/data/field_ground_effect.s +++ /dev/null @@ -1,63 +0,0 @@ - .section .rodata - .align 2 -gUnknown_83A7024:: @ 83A7024 - .4byte 0x00000020, 0x00000010 - -gUnknown_83A702C:: @ 83A702C - .4byte MetatileBehavior_IsTallGrass_2 - .4byte MetatileBehavior_IsLongGrass - .4byte MetatileBehavior_IsPuddle - .4byte MetatileBehavior_IsSurfable - .4byte MetatileBehavior_IsWaterfallBottom - .4byte MetatileBehavior_UnusedReturnTrue - -gUnknown_83A7044:: @ 83A7044 - .4byte 0x00001000, 0x00002000, 0x00004000, 0x00008000, 0x00004000, 0x00010000 - -gUnknown_83A705C:: @ 83A705C - .4byte MetatileBehavior_IsJumpSouth - .4byte MetatileBehavior_IsJumpNorth - .4byte MetatileBehavior_IsJumpWest - .4byte MetatileBehavior_IsJumpEast - -gUnknown_83A706C:: @ 83A706C - .byte 0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73 - -gUnknown_83A707C:: @ 83A707C - .byte 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x02 - -gUnknown_83A708C:: @ 83A708C - .byte 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01 - -gUnknown_83A709C:: @ 83A709C - .4byte nullsub_26 - .4byte DoTracksGroundEffect_Footprints - .4byte DoTracksGroundEffect_BikeTireTracks - -gUnknown_83A70A8:: @ 83A70A8 - .byte 0x0d, 0x00, 0x18, 0x00 - -gUnknown_83A70AC:: @ 83A70AC - .byte 0x01, 0x02, 0x07, 0x08, 0x01, 0x02, 0x06, 0x05, 0x05, 0x08, 0x03, 0x04, 0x06, 0x07, 0x03, 0x04 - -gUnknown_83A70BC:: @ 83A70BC - .4byte GroundEffect_SpawnOnTallGrass - .4byte GroundEffect_StepOnTallGrass - .4byte GroundEffect_SpawnOnLongGrass - .4byte GroundEffect_StepOnLongGrass - .4byte GroundEffect_WaterReflection - .4byte GroundEffect_IceReflection - .4byte GroundEffect_FlowingWater - .4byte GroundEffect_SandTracks - .4byte GroundEffect_DeepSandTracks - .4byte GroundEffect_Ripple - .4byte GroundEffect_StepOnPuddle - .4byte GroundEffect_SandHeap - .4byte GroundEffect_JumpOnTallGrass - .4byte GroundEffect_JumpOnLongGrass - .4byte GroundEffect_JumpOnShallowWater - .4byte GroundEffect_JumpOnWater - .4byte GroundEffect_JumpLandingDust - .4byte GroundEffect_ShortGrass - .4byte GroundEffect_HotSprings - .4byte GroundEffect_Seaweed -- cgit v1.2.3 From 2ed0c4b1803336b5e419a42682c5197d9c36de32 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 21 Feb 2020 15:02:05 -0500 Subject: Remove outdated comment --- data/maps/CeladonCity_GameCorner/scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index f44c2d29b..9032cd053 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -258,7 +258,7 @@ CeladonCity_GameCorner_EventScript_SlotMachine:: @ 816C96C setfieldeffectarg 1, 10 setfieldeffectarg 2, 14 dofieldeffect FLDEFF_SMILEY_FACE_ICON - waitfieldeffect FLDEFF_SMILEY_FACE_ICON @ Smile icon? + waitfieldeffect FLDEFF_SMILEY_FACE_ICON specialvar VAR_RESULT, Special_GetRandomSlotMachine playslotmachine VAR_RESULT releaseall -- cgit v1.2.3 From 93b05b4e42346a501b3c3eb971b0c1ed8c8b38a2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 21 Feb 2020 16:13:35 -0500 Subject: Fix typo --- data/field_effect_scripts.s | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data') diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 159d8d01f..de50ed39d 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -2,7 +2,7 @@ .section script_data, "aw", %progbits .align 2 gUnknown_81D96AC:: @ 81D96AC - .4byte gFldEffScript_ExclamationMarkIcon1 + .4byte gFldEffScript_ExclamationMarkIcon .4byte gFldEffScript_UseCutOnGrass .4byte gFldEffScript_UseCutOnTree .4byte gFldEffScript_Shadow @@ -66,14 +66,14 @@ gUnknown_81D96AC:: @ 81D96AC .4byte gFldEffScript_PcturnOn .4byte gFldEffScript_HallOfFameRecord .4byte gFldEffScript_UseTeleport - .4byte gFldEffScript_Unk40 + .4byte gFldEffScript_SmileyFaceIcon .4byte gFldEffScript_Unk41 - .4byte gFldEffScript_Unk42 + .4byte gFldEffScript_DoubleExclMarkIcon .4byte gFldEffScript_Unk43 .4byte gFldEffScript_Unk44 .4byte gFldEffScript_Unk45 -gFldEffScript_ExclamationMarkIcon1:: @ 81D97C4 +gFldEffScript_ExclamationMarkIcon:: @ 81D97C4 callnative FldEff_ExclamationMarkIcon1 end @@ -321,7 +321,7 @@ gFldEffScript_UseTeleport:: @ 81D9986 callnative FldEff_UseTeleport end -gFldEffScript_Unk40:: @ 81D998C +gFldEffScript_SmileyFaceIcon:: @ 81D998C callnative FldEff_SmileyFaceIcon end @@ -329,7 +329,7 @@ gFldEffScript_Unk41:: @ 81D9992 callnative sub_8086BA8 end -gFldEffScript_Unk42:: @ 81D9998 +gFldEffScript_DoubleExclMarkIcon:: @ 81D9998 callnative FldEff_DoubleExclMarkIcon end -- cgit v1.2.3 From 7624b5e5c0d4d8290356dc897c2ea179c842d2b8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 21 Feb 2020 16:44:36 -0500 Subject: Fix typo; use constants in some data/field_player_avatar arrays --- data/field_player_avatar.s | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) (limited to 'data') diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s index d89daa03c..c209c8501 100644 --- a/data/field_player_avatar.s +++ b/data/field_player_avatar.s @@ -1,3 +1,4 @@ +#include "constants/object_events.h" .include "asm/macros.inc" .include "constants/constants.inc" .section .rodata @@ -36,11 +37,11 @@ gUnknown_835B820:: @ 835B820 .align 2 gUnknown_835B828:: @ 835B828 - .4byte MetatileBehavior_ReturnFalse_14 - .4byte MetatileBehavior_ReturnFalse_15 - .4byte MetatileBehavior_ReturnFalse_16 - .4byte MetatileBehavior_ReturnFalse_17 - .4byte MetatileBehavior_ReturnFalse_18 + .4byte MetatileBehavior_ReturnFalse_14 // Related to Acro Bike + .4byte MetatileBehavior_ReturnFalse_15 // Related to Acro Bike + .4byte MetatileBehavior_ReturnFalse_16 // Related to Acro Bike + .4byte MetatileBehavior_ReturnFalse_17 // Related to Acro Bike + .4byte MetatileBehavior_ReturnFalse_18 // Related to Acro Bike gUnknown_835B83C:: @ 835B83C .byte 0x09, 0x0a, 0x0b, 0x0c, 0x0d @@ -63,16 +64,30 @@ gUnknown_835B864:: @ 835B864 .4byte MetatileBehavior_IsEastArrowWarp gUnknown_835B874:: @ 835B874 - .byte 0x00, 0x07, 0x01, 0x08, 0x02, 0x09, 0x03, 0x0a, 0x04, 0x0b, 0x05, 0x0c + .byte OBJECT_EVENT_GFX_RED_NORMAL, OBJECT_EVENT_GFX_GREEN_NORMAL + .byte OBJECT_EVENT_GFX_RED_BIKE, OBJECT_EVENT_GFX_GREEN_BIKE + .byte OBJECT_EVENT_GFX_RED_SURF, OBJECT_EVENT_GFX_GREEN_SURF + .byte OBJECT_EVENT_GFX_RED_ITEM, OBJECT_EVENT_GFX_GREEN_ITEM + .byte OBJECT_EVENT_GFX_RED_FISH, OBJECT_EVENT_GFX_GREEN_FISH + .byte OBJECT_EVENT_GFX_RED_ITEM_COPY, OBJECT_EVENT_GFX_GREEN_ITEM_COPY gUnknown_835B880:: @ 835B880 - .byte 0x0e, 0x0f + .byte OBJECT_EVENT_GFX_RS_BRENDAN + .byte OBJECT_EVENT_GFX_RS_MAY gUnknown_835B882:: @ 835B882 - .byte 0x00, 0x01, 0x01, 0x02, 0x02, 0x08, 0x07, 0x01, 0x08, 0x02, 0x09, 0x08 + @ Male + .byte OBJECT_EVENT_GFX_RED_NORMAL, 0x01 + .byte OBJECT_EVENT_GFX_RED_BIKE, 0x02 + .byte OBJECT_EVENT_GFX_RED_SURF, 0x08 + @ Female + .byte OBJECT_EVENT_GFX_GREEN_NORMAL, 0x01 + .byte OBJECT_EVENT_GFX_GREEN_BIKE, 0x02 + .byte OBJECT_EVENT_GFX_GREEN_SURF, 0x08 gUnknown_835B88E:: @ 835B88E - .byte 0x06, 0x0d + .byte OBJECT_EVENT_GFX_RED_VS_SEEKER + .byte OBJECT_EVENT_GFX_GREEN_VS_SEEKER gUnknown_835B890:: @ 835B890 .4byte MetatileBehavior_IsSouthArrowWarp -- cgit v1.2.3 From f66d0dfce3e8642aa08838e843cb4846e9268e71 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 22 Feb 2020 11:08:23 -0500 Subject: Move graphics.s through pokemon to src --- data/graphics.s | 12423 +-------------------------------------------------- data/smokescreen.s | 4 +- 2 files changed, 72 insertions(+), 12355 deletions(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index 3ae4f8e8a..ae725879d 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -1,12288 +1,5 @@ .section gfx_data, "aw", %progbits - .align 2 -gBattleTextboxTiles:: @ 8D00000 - .incbin "graphics/battle_interface/window.4bpp.lz" - - .align 2 -gBattleTextboxPalette:: @ 8D004D8 - .incbin "graphics/battle_interface/window.gbapal.lz" - - .align 2 -gFile_graphics_interface_menu_map_tilemap:: @ 8D0051C - .incbin "graphics/interface/menu_map.bin.lz" - - .align 2 -gMonFrontPic_CircledQuestionMark:: @ 8D00748 - .incbin "graphics/pokemon/circled_question_mark/circled/front.4bpp.lz" - - .align 2 -gMonBackPic_CircledQuestionMark:: @ 8D0098C - .incbin "graphics/pokemon/circled_question_mark/circled/back.4bpp.lz" - - .align 2 -gMonPalette_CircledQuestionMark:: @ 8D00BD0 - .incbin "graphics/pokemon/circled_question_mark/circled/normal.gbapal.lz" - - .align 2 -gMonShinyPalette_CircledQuestionMark:: @ 8D00BE8 - .incbin "graphics/pokemon/circled_question_mark/circled/shiny.gbapal.lz" - - .align 2 -gFile_graphics_unused_old_charmap_sheet:: @ 8D00C00 - .incbin "graphics/unused/old_charmap.4bpp.lz" @from ruby - - .align 2 -gFile_graphics_unused_old_charmap_tilemap:: @ 8D013D8 - .incbin "graphics/unused/old_charmap.bin.lz" @from ruby - - .align 2 -gFile_graphics_unused_old_charmap_palette:: @ 8D01604 - .incbin "graphics/unused/old_charmap.gbapal.lz" @from ruby - - .align 2 -gFile_graphics_battle_anims_sprites_smokescreen_impact_sheet:: @ 8D0162C - .incbin "graphics/battle_anims/sprites/smokescreen_impact.4bpp.lz" - - .align 2 -gFile_graphics_battle_anims_sprites_smokescreen_impact_palette:: @ 8D0170C - .incbin "graphics/battle_anims/sprites/smokescreen_impact.gbapal.lz" - - .align 2 -gInterfaceGfx_PokeBall:: @ 8D01724 - .incbin "graphics/interface/ball/poke.4bpp.lz" - - .align 2 -gInterfacePal_PokeBall:: @ 8D017E0 - .incbin "graphics/interface/ball/poke.gbapal.lz" - - .align 2 -gInterfaceGfx_GreatBall:: @ 8D01800 - .incbin "graphics/interface/ball/great.4bpp.lz" - - .align 2 -gInterfacePal_GreatBall:: @ 8D018BC - .incbin "graphics/interface/ball/great.gbapal.lz" - - .align 2 -gInterfaceGfx_SafariBall:: @ 8D018E0 - .incbin "graphics/interface/ball/safari.4bpp.lz" - - .align 2 -gInterfacePal_SafariBall:: @ 8D019A4 - .incbin "graphics/interface/ball/safari.gbapal.lz" - - .align 2 -gInterfaceGfx_UltraBall:: @ 8D019C8 - .incbin "graphics/interface/ball/ultra.4bpp.lz" - - .align 2 -gInterfacePal_UltraBall:: @ 8D01A7C - .incbin "graphics/interface/ball/ultra.gbapal.lz" - - .align 2 -gInterfaceGfx_MasterBall:: @ 8D01A9C - .incbin "graphics/interface/ball/master.4bpp.lz" - - .align 2 -gInterfacePal_MasterBall:: @ 8D01B5C - .incbin "graphics/interface/ball/master.gbapal.lz" - - .align 2 -gInterfaceGfx_NetBall:: @ 8D01B80 - .incbin "graphics/interface/ball/net.4bpp.lz" - - .align 2 -gInterfacePal_NetBall:: @ 8D01C40 - .incbin "graphics/interface/ball/net.gbapal.lz" - - .align 2 -gInterfaceGfx_DiveBall:: @ 8D01C60 - .incbin "graphics/interface/ball/dive.4bpp.lz" - - .align 2 -gInterfacePal_DiveBall:: @ 8D01D74 - .incbin "graphics/interface/ball/dive.gbapal.lz" - - .align 2 -gInterfaceGfx_NestBall:: @ 8D01D9C - .incbin "graphics/interface/ball/nest.4bpp.lz" - - .align 2 -gInterfacePal_NestBall:: @ 8D01E60 - .incbin "graphics/interface/ball/nest.gbapal.lz" - - .align 2 -gInterfaceGfx_RepeatBall:: @ 8D01E84 - .incbin "graphics/interface/ball/repeat.4bpp.lz" - - .align 2 -gInterfacePal_RepeatBall:: @ 8D01F44 - .incbin "graphics/interface/ball/repeat.gbapal.lz" - - .align 2 -gInterfaceGfx_TimerBall:: @ 8D01F68 - .incbin "graphics/interface/ball/timer.4bpp.lz" - - .align 2 -gInterfacePal_TimerBall:: @ 8D02060 - .incbin "graphics/interface/ball/timer.gbapal.lz" - - .align 2 -gInterfaceGfx_LuxuryBall:: @ 8D02084 - .incbin "graphics/interface/ball/luxury.4bpp.lz" - - .align 2 -gInterfacePal_LuxuryBall:: @ 8D021B0 - .incbin "graphics/interface/ball/luxury.gbapal.lz" - - .align 2 -gInterfaceGfx_PremierBall:: @ 8D021D8 - .incbin "graphics/interface/ball/premier.4bpp.lz" - - .align 2 -gInterfacePal_PremierBall:: @ 8D022C8 - .incbin "graphics/interface/ball/premier.gbapal.lz" - - .align 2 -gOpenPokeballGfx:: @ 8D022E8 - .incbin "graphics/interface/ball_open.4bpp.lz" - - .align 2 -gBlankGfxCompressed:: @ 8D02364 - .incbin "graphics/interface/blank.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Bubble:: @ 8D02460 - .incbin "graphics/battle_anims/sprites/146.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Bone:: @ 8D02520 - .incbin "graphics/battle_anims/sprites/000.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_AirWave:: @ 8D025D0 - .incbin "graphics/battle_anims/sprites/003.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Orb:: @ 8D02644 - .incbin "graphics/battle_anims/sprites/004.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Sword:: @ 8D026F4 - .incbin "graphics/battle_anims/sprites/005.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Seed:: @ 8D027C8 - .incbin "graphics/battle_anims/sprites/006.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_RainDrops:: @ 8D02894 - .incbin "graphics/battle_anims/sprites/115.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_Bone:: @ 8D028B4 - .incbin "graphics/battle_anims/sprites/000.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_AirWave:: @ 8D028D8 - .incbin "graphics/battle_anims/sprites/003.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_Orb:: @ 8D02900 - .incbin "graphics/battle_anims/sprites/004.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_Sword:: @ 8D02914 - .incbin "graphics/battle_anims/sprites/005.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_Seed:: @ 8D0293C - .incbin "graphics/battle_anims/sprites/006.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Needle:: @ 8D02964 - .incbin "graphics/battle_anims/sprites/161.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Needle:: @ 8D0298C - .incbin "graphics/battle_anims/sprites/161.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Explosion6:: @ 8D029B4 - .incbin "graphics/battle_anims/sprites/007.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Explosion6:: @ 8D02B30 - .incbin "graphics/battle_anims/sprites/007.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_PinkOrb:: @ 8D02B50 - .incbin "graphics/battle_anims/sprites/008.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_PinkOrb:: @ 8D02B70 - .incbin "graphics/battle_anims/sprites/008.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_IceCube:: @ 8D02B8C - .incbin "graphics/battle_anims/sprites/010.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_IceCube:: @ 8D02BAC - .incbin "graphics/battle_anims/sprites/010.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Gust:: @ 8D02F8C - .incbin "graphics/battle_anims/sprites/009.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Gust:: @ 8D03274 - .incbin "graphics/battle_anims/sprites/009.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Spark2:: @ 8D03294 - .incbin "graphics/battle_anims/sprites/011.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Spark2:: @ 8D0330C - .incbin "graphics/battle_anims/sprites/011.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Orange:: @ 8D03334 - .incbin "graphics/battle_anims/sprites/012.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Orange:: @ 8D0339C - .incbin "graphics/battle_anims/sprites/012.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Spikes:: @ 8D033B4 - .incbin "graphics/battle_anims/sprites/152.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Spikes:: @ 8D033FC - .incbin "graphics/battle_anims/sprites/152.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_YellowBall:: @ 8D03420 - .incbin "graphics/battle_anims/sprites/013.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_YellowBall:: @ 8D03454 - .incbin "graphics/battle_anims/sprites/013.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_TiedBag:: @ 8D0346C - .incbin "graphics/battle_anims/sprites/015.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_TiedBag:: @ 8D034D8 - .incbin "graphics/battle_anims/sprites/015.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_BlackSmoke:: @ 8D03500 - .incbin "graphics/battle_anims/sprites/016.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_BlackSmoke:: @ 8D03570 - .incbin "graphics/battle_anims/sprites/016.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_BlackBall:: @ 8D03580 - .incbin "graphics/battle_anims/sprites/017.4bpp.lz" - - .align 2 -gFile_graphics_unknown_Unknown_8D035A0_sheet:: @ 8D035A0 - .incbin "graphics/unknown/unknown_D035A0.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Glass:: @ 8D035C4 - .incbin "graphics/battle_anims/sprites/019.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Glass:: @ 8D035E0 - .incbin "graphics/battle_anims/sprites/019.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_HornHit:: @ 8D036A0 - .incbin "graphics/battle_anims/sprites/020.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_HornHit:: @ 8D0376C - .incbin "graphics/battle_anims/sprites/020.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_BlueShards:: @ 8D03794 - .incbin "graphics/battle_anims/sprites/023.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_BlueShards:: @ 8D037BC - .incbin "graphics/battle_anims/sprites/023.4bpp.lz" - - .align 2 -gFile_graphics_unused_battle_anim_023_palette:: @ 8D038C4 - .incbin "graphics/unused/battle_anim_023.gbapal.lz" - - .align 2 -gFile_graphics_unused_music_notes_sheet:: @ 8D038EC - .incbin "graphics/unused/music_notes.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Hit:: @ 8D039E8 - .incbin "graphics/battle_anims/sprites/021.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Hit:: @ 8D03A10 - .incbin "graphics/battle_anims/sprites/021.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Hit2:: @ 8D03D48 - .incbin "graphics/battle_anims/sprites/022.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_WavingHand:: @ 8D03D70 - .incbin "graphics/battle_anims/sprites/025.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_WavingHand:: @ 8D03D98 - .incbin "graphics/battle_anims/sprites/025.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_ClosingEye:: @ 8D03E88 - .incbin "graphics/battle_anims/sprites/024.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_ClosingEye:: @ 8D03F54 - .incbin "graphics/battle_anims/sprites/024.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_BlueStar:: @ 8D03F68 - .incbin "graphics/battle_anims/sprites/031.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_BlueStar:: @ 8D04348 - .incbin "graphics/battle_anims/sprites/031.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_BubbleBurst:: @ 8D04368 - .incbin "graphics/battle_anims/sprites/032.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_BubbleBurst:: @ 8D04390 - .incbin "graphics/battle_anims/sprites/032.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_HitDuplicate:: @ 8D0447C - .incbin "graphics/battle_anims/sprites/026.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_HitDuplicate:: @ 8D047B4 - .incbin "graphics/battle_anims/sprites/026.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_Leer:: @ 8D047DC - .incbin "graphics/battle_anims/sprites/027.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Leer:: @ 8D04804 - .incbin "graphics/battle_anims/sprites/027.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_BlueBurst:: @ 8D04B00 - .incbin "graphics/battle_anims/sprites/028.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_BlueBurst:: @ 8D04B28 - .incbin "graphics/battle_anims/sprites/028.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_SmallEmber:: @ 8D04E78 - .incbin "graphics/battle_anims/sprites/029.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_SmallEmber:: @ 8D05130 - .incbin "graphics/battle_anims/sprites/029.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_GraySmoke:: @ 8D05158 - .incbin "graphics/battle_anims/sprites/030.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_GraySmoke:: @ 8D05518 - .incbin "graphics/battle_anims/sprites/030.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_Fire:: @ 8D0553C - .incbin "graphics/battle_anims/sprites/033.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Fire:: @ 8D05564 - .incbin "graphics/battle_anims/sprites/033.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_SpinningFire:: @ 8D05ED4 - .incbin "graphics/battle_anims/sprites/034.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_FirePlume:: @ 8D062A0 - .incbin "graphics/battle_anims/sprites/035.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Lightning2:: @ 8D06638 - .incbin "graphics/battle_anims/sprites/036.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Lightning2:: @ 8D06660 - .incbin "graphics/battle_anims/sprites/036.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Lightning:: @ 8D06A34 - .incbin "graphics/battle_anims/sprites/037.4bpp.lz" - - .align 2 -gFile_graphics_unknown_unknown_D06D80_sheet:: @ 8D06D80 - .incbin "graphics/unknown/unknown_D06D80.4bpp.lz" - - .align 2 -gFile_graphics_unknown_unknown_D06D80_palette:: @ 8D06DC4 - .incbin "graphics/unknown/unknown_D06D80.gbapal.lz" - - .align 2 -gFile_graphics_unknown_unknown_D06D80_2_palette:: @ 8D06DD8 - .incbin "graphics/unknown/unknown_D06D80_2.gbapal.lz" - - .align 2 -gFile_graphics_unused_obi1_sheet:: @ 8D06E0C - .incbin "graphics/unused/obi1.4bpp.lz" - - .align 2 -gFile_graphics_unused_obi_palpak1_palette:: @ 8D07170 - .incbin "graphics/unused/obi_palpak1.gbapal.lz" - - .align 2 -gFile_graphics_unused_old_pal4_palette:: @ 8D071B4 - .incbin "graphics/unused/old_pal4.gbapal.lz" - - .align 2 -gFile_graphics_unused_obi_palpak3_palette:: @ 8D071CC - .incbin "graphics/unused/obi_palpak3.gbapal.lz" - - .align 2 -gFile_graphics_unused_obi2_sheet:: @ 8D07224 - .incbin "graphics/unused/obi2.4bpp.lz" - - .align 2 -gFile_graphics_unused_old_battle_interface_tilemap:: @ 8D077EC - .incbin "graphics/unused/old_battle_interface_tilemap.bin.lz" - - .align 2 -gBattleAnimSpritePal_ClawSlash2:: @ 8D078FC - .incbin "graphics/battle_anims/sprites/038.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_ClawSlash:: @ 8D07924 - .incbin "graphics/battle_anims/sprites/039.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_ClawSlash2:: @ 8D0794C - .incbin "graphics/battle_anims/sprites/038.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_ClawSlash:: @ 8D07B70 - .incbin "graphics/battle_anims/sprites/039.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Scratch3:: @ 8D07E6C - .incbin "graphics/battle_anims/sprites/040.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Scratch2:: @ 8D08078 - .incbin "graphics/battle_anims/sprites/041.4bpp.lz" - - .align 2 -gFile_graphics_interface_party_menu_hpbar_sheet:: @ 8D08218 - .incbin "graphics/interface/party_menu_hpbar.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_BubbleBurst2:: @ 8D082AC - .incbin "graphics/battle_anims/sprites/042.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_BubbleBurst2:: @ 8D0857C - .incbin "graphics/battle_anims/sprites/042.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_IceChunk:: @ 8D085A4 - .incbin "graphics/battle_anims/sprites/043.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_IceChunk:: @ 8D089A4 - .incbin "graphics/battle_anims/sprites/043.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_Glass2:: @ 8D089CC - .incbin "graphics/battle_anims/sprites/044.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Glass2:: @ 8D089F4 - .incbin "graphics/battle_anims/sprites/044.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_PinkHeart2:: @ 8D08C60 - .incbin "graphics/battle_anims/sprites/045.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_PinkHeart2:: @ 8D08C88 - .incbin "graphics/battle_anims/sprites/045.4bpp.lz" - - .align 2 -gFile_graphics_battle_interface_unused_window_sheet:: @ 8D08EF4 - .incbin "graphics/battle_interface/unused_window.4bpp.lz" - - .align 2 -gFile_graphics_battle_interface_unused_window_palette:: @ 8D093B0 - .incbin "graphics/battle_interface/unused_window.gbapal.lz" - - .align 2 -gFile_graphics_interface_hp_numbers:: @ 8D093D8 - .incbin "graphics/interface/hp_numbers.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_SapDrip:: @ 8D095EC - .incbin "graphics/battle_anims/sprites/046.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_SapDrip:: @ 8D099CC - .incbin "graphics/battle_anims/sprites/046.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_SapDrip2:: @ 8D099EC - .incbin "graphics/battle_anims/sprites/047.gbapal.lz" - - .align 2 -gFile_graphics_battle_interface_unused_window2_sheet:: @ 8D09A10 - .incbin "graphics/battle_interface/unused_window2.4bpp.lz" - - .align 2 -gFile_graphics_battle_interface_unused_window2bar_sheet:: @ 8D09CAC - .incbin "graphics/battle_interface/unused_window2bar.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Sparkle1:: @ 8D09CD8 - .incbin "graphics/battle_anims/sprites/048.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Sparkle1:: @ 8D09F70 - .incbin "graphics/battle_anims/sprites/048.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_Sparkle2:: @ 8D09F98 - .incbin "graphics/battle_anims/sprites/049.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_HumanoidFoot:: @ 8D09FC0 - .incbin "graphics/battle_anims/sprites/050.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_HumanoidFoot:: @ 8D09FE4 - .incbin "graphics/battle_anims/sprites/050.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_MonsterFoot:: @ 8D0A084 - .incbin "graphics/battle_anims/sprites/051.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_HumanoidHand:: @ 8D0A130 - .incbin "graphics/battle_anims/sprites/052.4bpp.lz" - - .align 2 -gFile_graphics_unused_line_sketch_sheet:: @ 8D0A1FC - .incbin "graphics/unused/line_sketch.4bpp.lz" - - .align 2 -gFile_graphics_unused_line_sketch_palette:: @ 8D0A380 - .incbin "graphics/unused/line_sketch.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_YellowUnk:: @ 8D0A390 - .incbin "graphics/battle_anims/sprites/054.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_YellowUnk:: @ 8D0A3BC - .incbin "graphics/battle_anims/sprites/054.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_SlamHit:: @ 8D0A3D4 - .incbin "graphics/battle_anims/sprites/056.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_SlamHit:: @ 8D0A87C - .incbin "graphics/battle_anims/sprites/056.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_RedFist:: @ 8D0A8A4 - .incbin "graphics/battle_anims/sprites/055.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Ring:: @ 8D0A968 - .incbin "graphics/battle_anims/sprites/057.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Ring:: @ 8D0A9F0 - .incbin "graphics/battle_anims/sprites/057.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Rocks:: @ 8D0AA14 - .incbin "graphics/battle_anims/sprites/058.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Rocks:: @ 8D0AE7C - .incbin "graphics/battle_anims/sprites/058.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Z:: @ 8D0AEA4 - .incbin "graphics/battle_anims/sprites/059.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Z:: @ 8D0AF04 - .incbin "graphics/battle_anims/sprites/059.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_YellowUnk2:: @ 8D0AF20 - .incbin "graphics/battle_anims/sprites/060.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_YellowUnk2:: @ 8D0AF48 - .incbin "graphics/battle_anims/sprites/060.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_AirSlash:: @ 8D0AF64 - .incbin "graphics/battle_anims/sprites/061.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_AirSlash:: @ 8D0B014 - .incbin "graphics/battle_anims/sprites/061.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_SpinningGreenOrbs:: @ 8D0B034 - .incbin "graphics/battle_anims/sprites/062.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_SpinningGreenOrbs:: @ 8D0B404 - .incbin "graphics/battle_anims/sprites/062.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Leaf:: @ 8D0B42C - .incbin "graphics/battle_anims/sprites/063.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Leaf:: @ 8D0B5E8 - .incbin "graphics/battle_anims/sprites/063.gbapal.lz" - - .align 2 -gFile_graphics_unused_metronome_hand_small_sheet:: @ 8D0B610 - .incbin "graphics/unused/metronome_hand_small.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Clapping:: @ 8D0B680 - .incbin "graphics/battle_anims/sprites/091.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_PoisonPowder:: @ 8D0B6A4 - .incbin "graphics/battle_anims/sprites/065.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_PoisonPowder:: @ 8D0B7B8 - .incbin "graphics/battle_anims/sprites/065.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_BrownTriangle:: @ 8D0B7D8 - .incbin "graphics/battle_anims/sprites/066.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_BrownTriangle:: @ 8D0B824 - .incbin "graphics/battle_anims/sprites/066.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Sparkle3:: @ 8D0B84C - .incbin "graphics/battle_anims/sprites/070.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Sparkle3:: @ 8D0B8CC - .incbin "graphics/battle_anims/sprites/070.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Sparkle4:: @ 8D0B8F4 - .incbin "graphics/battle_anims/sprites/071.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_MusicNotes:: @ 8D0BB20 - .incbin "graphics/battle_anims/sprites/072.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_MusicNotes:: @ 8D0BBF0 - .incbin "graphics/battle_anims/sprites/072.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Duck:: @ 8D0BC08 - .incbin "graphics/battle_anims/sprites/073.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Duck:: @ 8D0BD24 - .incbin "graphics/battle_anims/sprites/073.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Alert:: @ 8D0BD44 - .incbin "graphics/battle_anims/sprites/075.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Alert:: @ 8D0BFC0 - .incbin "graphics/battle_anims/sprites/075.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Shock4:: @ 8D0BFE4 - .incbin "graphics/battle_anims/sprites/078.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Shock4:: @ 8D0C17C - .incbin "graphics/battle_anims/sprites/078.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Shock:: @ 8D0C1A4 - .incbin "graphics/battle_anims/sprites/079.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Bell2:: @ 8D0C5D4 - .incbin "graphics/battle_anims/sprites/080.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Bell2:: @ 8D0C938 - .incbin "graphics/battle_anims/sprites/080.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_PinkGlove:: @ 8D0C95C - .incbin "graphics/battle_anims/sprites/081.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_PinkGlove:: @ 8D0C9E0 - .incbin "graphics/battle_anims/sprites/081.gbapal.lz" - - .align 2 -gFile_graphics_unknown_unknown_D0CA04:: @ 8D0CA04 - .incbin "graphics/unknown/unknown_D0CA04.bin" - - .align 2 -gFile_graphics_unknown_unknown_D0CA28:: @ 8D0CA28 - .incbin "graphics/unknown/unknown_D0CA28.bin" - - .align 2 -gFile_graphics_unknown_unknown_D0CA4C:: @ 8D0CA4C - .incbin "graphics/unknown/unknown_D0CA4C.bin" - - .align 2 -gFile_graphics_unused_line_sketch_2_sheet:: @ 8D0CA70 - .incbin "graphics/unused/line_sketch_2.8bpp.lz" - - .align 2 -gFile_graphics_unknown_unknown_D0CAC8:: @ 8D0CAC8 - .incbin "graphics/unknown/unknown_D0CAC8.bin" - - .align 2 -gFile_graphics_unused_line_sketch_2_tilemap:: @ 8D0CAE8 - .incbin "graphics/unused/line_sketch_2.bin.lz" - - .align 2 -gBattleAnimSpriteGfx_BlueLines:: @ 8D0CB78 - .incbin "graphics/battle_anims/sprites/082.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_BlueLines:: @ 8D0CB9C - .incbin "graphics/battle_anims/sprites/082.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_Impact3:: @ 8D0CBB0 - .incbin "graphics/battle_anims/sprites/083.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_Impact2:: @ 8D0CBD8 - .incbin "graphics/battle_anims/sprites/084.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_Reticle:: @ 8D0CC00 - .incbin "graphics/battle_anims/sprites/085.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_Breath:: @ 8D0CC18 - .incbin "graphics/battle_anims/sprites/086.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_Snowball:: @ 8D0CC40 - .incbin "graphics/battle_anims/sprites/088.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_Vine:: @ 8D0CC5C - .incbin "graphics/battle_anims/sprites/089.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_Sword2:: @ 8D0CC84 - .incbin "graphics/battle_anims/sprites/090.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_RedTube:: @ 8D0CCA8 - .incbin "graphics/battle_anims/sprites/092.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_Amnesia:: @ 8D0CCC4 - .incbin "graphics/battle_anims/sprites/093.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_String2:: @ 8D0CCEC - .incbin "graphics/battle_anims/sprites/094.gbapal.lz" - - .align 2 -gFile_graphics_unknown_unknown_D0CD0C:: @ 8D0CD0C - .incbin "graphics/unknown/unknown_D0CD0C.bin.lz" - - .align 2 -gBattleAnimSpritePal_Pencil2:: @ 8D0CD2C - .incbin "graphics/battle_anims/sprites/095.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_Petal:: @ 8D0CD54 - .incbin "graphics/battle_anims/sprites/096.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_BentSpoon:: @ 8D0CD70 - .incbin "graphics/battle_anims/sprites/097.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_Coin:: @ 8D0CD98 - .incbin "graphics/battle_anims/sprites/100.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_CrackedEgg:: @ 8D0CDB4 - .incbin "graphics/battle_anims/sprites/101.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_FreshEgg:: @ 8D0CDDC - .incbin "graphics/battle_anims/sprites/103.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Impact3:: @ 8D0CE00 - .incbin "graphics/battle_anims/sprites/083.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Impact2:: @ 8D0D2A4 - .incbin "graphics/battle_anims/sprites/084.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Reticle:: @ 8D0D668 - .incbin "graphics/battle_anims/sprites/085.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Breath:: @ 8D0D720 - .incbin "graphics/battle_anims/sprites/086.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Snowball:: @ 8D0D890 - .incbin "graphics/battle_anims/sprites/088.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Vine:: @ 8D0D8E0 - .incbin "graphics/battle_anims/sprites/089.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Sword2:: @ 8D0DB54 - .incbin "graphics/battle_anims/sprites/090.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Clapping:: @ 8D0DBE4 - .incbin "graphics/battle_anims/sprites/091.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_RedTube:: @ 8D0DD18 - .incbin "graphics/battle_anims/sprites/092.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Amnesia:: @ 8D0DD94 - .incbin "graphics/battle_anims/sprites/093.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_String2:: @ 8D0E464 - .incbin "graphics/battle_anims/sprites/094.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Pencil2:: @ 8D0E608 - .incbin "graphics/battle_anims/sprites/095.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Petal:: @ 8D0E6B8 - .incbin "graphics/battle_anims/sprites/096.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_BentSpoon:: @ 8D0E828 - .incbin "graphics/battle_anims/sprites/097.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Web:: @ 8D0EA08 - .incbin "graphics/battle_anims/sprites/098.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Coin:: @ 8D0EB40 - .incbin "graphics/battle_anims/sprites/100.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_CrackedEgg:: @ 8D0EC40 - .incbin "graphics/battle_anims/sprites/101.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_HatchedEgg:: @ 8D0ED70 - .incbin "graphics/battle_anims/sprites/102.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_FreshEgg:: @ 8D0EF08 - .incbin "graphics/battle_anims/sprites/103.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Fangs:: @ 8D0EF74 - .incbin "graphics/battle_anims/sprites/104.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Fangs:: @ 8D0F134 - .incbin "graphics/battle_anims/sprites/104.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Explosion2:: @ 8D0F15C - .incbin "graphics/battle_anims/sprites/105.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Explosion2:: @ 8D0F6E0 - .incbin "graphics/battle_anims/sprites/105.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Explosion3:: @ 8D0F708 - .incbin "graphics/battle_anims/sprites/106.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_WaterDroplet:: @ 8D0F7F8 - .incbin "graphics/battle_anims/sprites/107.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_WaterDroplet:: @ 8D0FBA4 - .incbin "graphics/battle_anims/sprites/107.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_WaterDroplet2:: @ 8D0FBCC - .incbin "graphics/battle_anims/sprites/108.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Seed2:: @ 8D0FF50 - .incbin "graphics/battle_anims/sprites/109.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Seed2:: @ 8D0FF78 - .incbin "graphics/battle_anims/sprites/109.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Sprout:: @ 8D0FFA0 - .incbin "graphics/battle_anims/sprites/110.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_RedWand:: @ 8D10384 - .incbin "graphics/battle_anims/sprites/111.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_RedWand:: @ 8D103C8 - .incbin "graphics/battle_anims/sprites/111.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_PurpleGreenUnk:: @ 8D103EC - .incbin "graphics/battle_anims/sprites/112.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_PurpleGreenUnk:: @ 8D10714 - .incbin "graphics/battle_anims/sprites/112.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_WaterColumn:: @ 8D1073C - .incbin "graphics/battle_anims/sprites/113.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_WaterColumn:: @ 8D109A8 - .incbin "graphics/battle_anims/sprites/113.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_MudUnk:: @ 8D109D0 - .incbin "graphics/battle_anims/sprites/114.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_MudUnk:: @ 8D10AC4 - .incbin "graphics/battle_anims/sprites/114.gbapal.lz" - - .align 2 -gFile_graphics_unused_blue_frame_tilemap:: @ 8D10AEC - .incbin "graphics/unused/blue_frame.bin.lz" - - .align 2 -gFile_graphics_unused_redyellowgreen_frame_tilemap:: @ 8D10C04 - .incbin "graphics/unused/redyellowgreen_frame.bin.lz" - - .align 2 -gFile_graphics_unused_color_frames_sheet:: @ 8D11004 - .incbin "graphics/unused/color_frames.4bpp.lz" - - .align 2 -gFile_graphics_unused_color_frames_palette:: @ 8D115A4 - .incbin "graphics/unused/color_frames.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_RainDrops:: @ 8D115CC - .incbin "graphics/battle_anims/sprites/115.4bpp.lz" - - .align 2 -gFile_graphics_unused_water_splash_sheet:: @ 8D116FC - .incbin "graphics/unused/water_splash.8bpp.lz" - - .align 2 -gFile_graphics_unused_water_splash_tilemap:: @ 8D11884 - .incbin "graphics/unused/water_splash.bin.lz" - - .align 2 -gFile_graphics_unused_water_splash_palette:: @ 8D11964 - .incbin "graphics/unused/water_splash.gbapal.lz" - - .align 2 -gFile_graphics_unused_basic_frame_sheet:: @ 8D119C4 - .incbin "graphics/unused/basic_frame.4bpp.lz" - - .align 2 -gFile_graphics_unused_basic_frame_palette:: @ 8D11A50 - .incbin "graphics/unused/basic_frame.gbapal.lz" - - .align 2 -gFile_graphics_unused_basic_frame_tilemap:: @ 8D11A78 - .incbin "graphics/unused/basic_frame.bin.lz" - - .align 2 -gBattleInterface_BallStatusBarPal:: @ 8D11B84 - .incbin "graphics/battle_interface/ball_status_bar.gbapal" - -gBattleInterface_BallDisplayPal:: @ 8D11BA4 - .incbin "graphics/battle_interface/ball_display.gbapal" - -@ Originally an array? -gHealthboxElementsGfxTable:: @ 8D11BC4 - .incbin "graphics/battle_interface/hp_bar.4bpp" - -gHealthboxElementsGfxTable_ExpBar:: - .incbin "graphics/battle_interface/exp_bar.4bpp" - -gHealthboxElementsGfxTable_StatusPsn:: - .incbin "graphics/battle_interface/status_psn.4bpp" - -gHealthboxElementsGfxTable_StatusPar:: - .incbin "graphics/battle_interface/status_par.4bpp" - -gHealthboxElementsGfxTable_StatusSlp:: - .incbin "graphics/battle_interface/status_slp.4bpp" - -gHealthboxElementsGfxTable_StatusFrz:: - .incbin "graphics/battle_interface/status_frz.4bpp" - -gHealthboxElementsGfxTable_StatusBrn:: - .incbin "graphics/battle_interface/status_brn.4bpp" - -gHealthboxElementsGfxTable_Misc:: - .incbin "graphics/battle_interface/misc.4bpp" - -gHealthboxElementsGfxTable_HpBarAnim:: - .incbin "graphics/battle_interface/hp_bar_anim.4bpp" - -gHealthboxElementsGfxTable_MiscFrameEnd:: - .incbin "graphics/battle_interface/misc_frame_end.4bpp" - -gUnknown_8D12404:: - .incbin "graphics/battle_interface/ball_display.4bpp" - -gUnknown_8D12484:: - .incbin "graphics/battle_interface/ball_display_unused_extra.4bpp" - -gBattleInterfaceGfx_Status2:: - .incbin "graphics/battle_interface/status2.4bpp" - -gBattleInterfaceGfx_Status3:: - .incbin "graphics/battle_interface/status3.4bpp" - -gBattleInterfaceGfx_Status4:: - .incbin "graphics/battle_interface/status4.4bpp" - -gUnknown_8D12A44:: - .incbin "graphics/unknown/unknown_D12A44.4bpp" - -gUnknown_8D12A64:: - .incbin "graphics/unknown/unknown_D12A64.4bpp" - - .align 2 -gFile_graphics_battle_interface_unused_window3_sheet:: @ 8D12AC4 - .incbin "graphics/battle_interface/unused_window3.4bpp.lz" - - .align 2 -gFile_graphics_battle_interface_unused_window4_sheet:: @ 8D12C00 - .incbin "graphics/battle_interface/unused_window4.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_FurySwipes:: @ 8D12EB0 - .incbin "graphics/battle_anims/sprites/116.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_FurySwipes:: @ 8D1315C - .incbin "graphics/battle_anims/sprites/116.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Vine2:: @ 8D13184 - .incbin "graphics/battle_anims/sprites/117.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Vine2:: @ 8D133C0 - .incbin "graphics/battle_anims/sprites/117.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Teeth:: @ 8D133DC - .incbin "graphics/battle_anims/sprites/118.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Teeth:: @ 8D13574 - .incbin "graphics/battle_anims/sprites/118.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Bone2:: @ 8D13590 - .incbin "graphics/battle_anims/sprites/119.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Bone2:: @ 8D13820 - .incbin "graphics/battle_anims/sprites/119.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_WhiteBag:: @ 8D13848 - .incbin "graphics/battle_anims/sprites/120.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_WhiteBag:: @ 8D1393C - .incbin "graphics/battle_anims/sprites/120.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Unknown:: @ 8D13964 - .incbin "graphics/battle_anims/sprites/121.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Unknown:: @ 8D13990 - .incbin "graphics/battle_anims/sprites/121.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_PurpleCoral:: @ 8D139B4 - .incbin "graphics/battle_anims/sprites/122.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_PurpleCoral:: @ 8D13AB0 - .incbin "graphics/battle_anims/sprites/122.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_PurpleDroplet:: @ 8D13ACC - .incbin "graphics/battle_anims/sprites/123.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Shock2:: @ 8D13C08 - .incbin "graphics/battle_anims/sprites/124.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Shock2:: @ 8D13EA0 - .incbin "graphics/battle_anims/sprites/124.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_ClosingEye2:: @ 8D13EC8 - .incbin "graphics/battle_anims/sprites/125.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_ClosingEye2:: @ 8D13FB4 - .incbin "graphics/battle_anims/sprites/125.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_MetalBall:: @ 8D13FDC - .incbin "graphics/battle_anims/sprites/126.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_MetalBall:: @ 8D14044 - .incbin "graphics/battle_anims/sprites/126.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_MonsterDoll:: @ 8D14064 - .incbin "graphics/battle_anims/sprites/127.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_MonsterDoll:: @ 8D14204 - .incbin "graphics/battle_anims/sprites/127.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Whirlwind:: @ 8D14228 - .incbin "graphics/battle_anims/sprites/128.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Whirlwind:: @ 8D14494 - .incbin "graphics/battle_anims/sprites/128.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Whirlwind2:: @ 8D144B4 - .incbin "graphics/battle_anims/sprites/129.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Explosion4:: @ 8D14518 - .incbin "graphics/battle_anims/sprites/130.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Explosion4:: @ 8D148E8 - .incbin "graphics/battle_anims/sprites/130.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Explosion5:: @ 8D14910 - .incbin "graphics/battle_anims/sprites/131.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Tongue:: @ 8D14A80 - .incbin "graphics/battle_anims/sprites/132.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Tongue:: @ 8D14B80 - .incbin "graphics/battle_anims/sprites/132.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Smoke:: @ 8D14BA0 - .incbin "graphics/battle_anims/sprites/133.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Smoke:: @ 8D14C1C - .incbin "graphics/battle_anims/sprites/133.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Smoke2:: @ 8D14C44 - .incbin "graphics/battle_anims/sprites/134.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_BlueFlames:: @ 8D14D14 - .incbin "graphics/battle_anims/sprites/076.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_BlueFlames:: @ 8D14F50 - .incbin "graphics/battle_anims/sprites/076.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_BlueFlames2:: @ 8D14F78 - .incbin "graphics/battle_anims/sprites/077.4bpp.lz" - - .align 2 -gFile_graphics_unused_old_contest_sheet:: @ 8D1504C - .incbin "graphics/unused/old_contest.4bpp.lz" - - .align 2 -gFile_graphics_unused_old_contest_palette:: @ 8D15960 - .incbin "graphics/unused/old_contest.gbapal.lz" - - .align 2 -gFile_graphics_unused_old_contest_tilemap:: @ 8D15A64 - .incbin "graphics/unused/old_contest.bin.lz" - - .align 2 -gFile_graphics_unknown_unknown_D15BE8_tilemap:: @ 8D15BE8 - .incbin "graphics/unknown/unknown_D15BE8.bin.lz" - - .align 2 -gFile_graphics_unused_numbers_sheet:: @ 8D15EA8 - .incbin "graphics/unused/numbers.4bpp.lz" @from ruby - - .align 2 -gFile_graphics_unused_numbers_palette:: @ 8D15F98 - .incbin "graphics/unused/numbers.gbapal.lz" @from ruby - - .align 2 -gFile_graphics_unused_old_contest_2_sheet:: @ 8D15FB8 - .incbin "graphics/unused/old_contest_2.4bpp.lz" - - .align 2 -gFile_graphics_unused_old_contest_2_palette:: @ 8D16FC8 - .incbin "graphics/unused/old_contest_2.gbapal.lz" - - .align 2 -gFile_graphics_unused_old_contest_2_tilemap:: @ 8D170E0 - .incbin "graphics/unused/old_contest_2.bin.lz" - - .align 2 -gFile_graphics_unknown_unknown_D172A8_tilemap:: @ 8D172A8 - .incbin "graphics/unknown/unknown_D172A8.bin.lz" - - .align 2 -gFile_graphics_unknown_unknown_D17548_tilemap:: @ 8D17548 - .incbin "graphics/unknown/unknown_D17548.bin.lz" - - .align 2 -gFile_graphics_unknown_unknown_D17654_tilemap:: @ 8D17654 - .incbin "graphics/unknown/unknown_D17654.bin.lz" - - .align 2 -gFile_graphics_unknown_unknown_D17AB8_tilemap:: @ 8D17AB8 - .incbin "graphics/unknown/unknown_D17AB8.bin.lz" - - .align 2 -gContestMiscGfx:: @ 8D17BE8 - .incbin "graphics/contest/misc.4bpp.lz" @ huh? this is the JP one... - - .align 2 -gFile_graphics_contest_audience_sheet:: @ 8D18780 - .incbin "graphics/contest/audience.4bpp.lz" - - .align 2 -gFile_graphics_contest_faces_sheet:: @ 8D193DC - .incbin "graphics/contest/faces.4bpp.lz" - - .align 2 -gFile_graphics_contest_judge_symbols_sheet:: @ 8D194F8 - .incbin "graphics/contest/judge_symbols.4bpp.lz" - - .align 2 -gFile_graphics_contest_judge_symbols_palette:: @ 8D1969C - .incbin "graphics/contest/judge_symbols.gbapal.lz" - - .align 2 -gFile_graphics_contest_heart:: @ 8D196C4 - .incbin "graphics/contest/heart.4bpp" - - .align 2 -gFile_graphics_unknown_unknown_D196E4_sheet:: @ 8D196E4 - .incbin "graphics/unknown/unknown_D196E4.4bpp.lz" - - .align 2 -gFile_graphics_unknown_unknown_D196E4_palette:: @ 8D197D4 - .incbin "graphics/unknown/unknown_D196E4.gbapal.lz" - - .align 2 -gUnknown_8D197FC:: @ 8D197FC - .incbin "graphics/contest/misc_2.4bpp.lz" @ still in JP... - - .align 2 -gFile_graphics_contest_misc_2_tilemap_1_tilemap:: @ 8D1A064 - .incbin "graphics/contest/misc_2_tilemap_1.bin.lz" - - .align 2 -gFile_graphics_contest_misc_2_tilemap_2_tilemap:: @ 8D1A178 - .incbin "graphics/contest/misc_2_tilemap_2.bin.lz" - - .align 2 -gFile_graphics_contest_misc_2_tilemap_3_tilemap:: @ 8D1A2A4 - .incbin "graphics/contest/misc_2_tilemap_3.bin.lz" - - .align 2 -gFile_graphics_contest_misc_2_palette:: @ 8D1A42C - .incbin "graphics/contest/misc_2.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Impact:: @ 8D1A518 - .incbin "graphics/battle_anims/sprites/135.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Impact:: @ 8D1A5F0 - .incbin "graphics/battle_anims/sprites/135.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Particles:: @ 8D1A608 - .incbin "graphics/battle_anims/sprites/particles.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_CircleImpact:: @ 8D1A6B8 - .incbin "graphics/battle_anims/sprites/136.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_CircleImpact:: @ 8D1A6DC - .incbin "graphics/battle_anims/sprites/136.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Scratch:: @ 8D1A704 - .incbin "graphics/battle_anims/sprites/137.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_SharpTeeth:: @ 8D1A908 - .incbin "graphics/battle_anims/sprites/139.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_SharpTeeth:: @ 8D1AAF8 - .incbin "graphics/battle_anims/sprites/139.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Clamp:: @ 8D1AB18 - .incbin "graphics/battle_anims/sprites/145.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Cut:: @ 8D1ACB8 - .incbin "graphics/battle_anims/sprites/138.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_RainbowRings:: @ 8D1AE04 - .incbin "graphics/battle_anims/sprites/140.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_RainbowRings:: @ 8D1AE84 - .incbin "graphics/battle_anims/sprites/140.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_IceCrystals:: @ 8D1AEA4 - .incbin "graphics/battle_anims/sprites/141.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_IceCrystals:: @ 8D1AFAC - .incbin "graphics/battle_anims/sprites/141.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_IceSpikes:: @ 8D1AFCC - .incbin "graphics/battle_anims/sprites/142.4bpp.lz" - - .align 2 -gFile_graphics_unused_old_beatup_sheet:: @ 8D1B02C - .incbin "graphics/unused/old_beatup.4bpp.lz" - - .align 2 -gFile_graphics_unused_old_beatup_palette:: @ 8D1B0C8 - .incbin "graphics/unused/old_beatup.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Orbs:: @ 8D1B0E4 - .incbin "graphics/battle_anims/sprites/147.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Orbs:: @ 8D1B1F8 - .incbin "graphics/battle_anims/sprites/147.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_WaterOrb:: @ 8D1B220 - .incbin "graphics/battle_anims/sprites/149.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_WaterImpact:: @ 8D1B2F0 - .incbin "graphics/battle_anims/sprites/148.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_WaterImpact:: @ 8D1B3D4 - .incbin "graphics/battle_anims/sprites/148.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_BrownOrb:: @ 8D1B3F4 - .incbin "graphics/battle_anims/sprites/259.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_MudSand:: @ 8D1B414 - .incbin "graphics/battle_anims/sprites/074.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_MudSand:: @ 8D1B47C - .incbin "graphics/battle_anims/sprites/074.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_PoisonBubble:: @ 8D1B4A0 - .incbin "graphics/battle_anims/sprites/150.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_PoisonBubble:: @ 8D1B574 - .incbin "graphics/battle_anims/sprites/150.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_ToxicBubble:: @ 8D1B590 - .incbin "graphics/battle_anims/sprites/151.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_HornHit2:: @ 8D1B688 - .incbin "graphics/battle_anims/sprites/153.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_HornHit2:: @ 8D1B6F4 - .incbin "graphics/battle_anims/sprites/153.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_AirWave2:: @ 8D1B70C - .incbin "graphics/battle_anims/sprites/154.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_AirWave2:: @ 8D1B7B8 - .incbin "graphics/battle_anims/sprites/154.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_SmallBubbles:: @ 8D1B7D8 - .incbin "graphics/battle_anims/sprites/155.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_SmallBubbles:: @ 8D1B8A0 - .incbin "graphics/battle_anims/sprites/155.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_RoundShadow:: @ 8D1B8C0 - .incbin "graphics/battle_anims/sprites/156.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_RoundShadow:: @ 8D1BAD8 - .incbin "graphics/battle_anims/sprites/156.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Sunlight:: @ 8D1BB00 - .incbin "graphics/battle_anims/sprites/157.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Sunlight:: @ 8D1BB64 - .incbin "graphics/battle_anims/sprites/157.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Spore:: @ 8D1BB7C - .incbin "graphics/battle_anims/sprites/158.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Spore:: @ 8D1BC44 - .incbin "graphics/battle_anims/sprites/158.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Flower:: @ 8D1BC68 - .incbin "graphics/battle_anims/sprites/159.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Flower:: @ 8D1BCE4 - .incbin "graphics/battle_anims/sprites/159.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_RazorLeaf:: @ 8D1BD0C - .incbin "graphics/battle_anims/sprites/160.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_RazorLeaf:: @ 8D1BDB4 - .incbin "graphics/battle_anims/sprites/160.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_MistCloud:: @ 8D1BDDC - .incbin "graphics/battle_anims/sprites/144.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_MistCloud:: @ 8D1BE54 - .incbin "graphics/battle_anims/sprites/144.gbapal.lz" - - .align 2 -gFile_graphics_unknown_unknown_D1BE74_sheet:: @ 8D1BE74 - .incbin "graphics/unknown/unknown_D1BE74.4bpp.lz" - - .align 2 -gFile_graphics_unknown_unknown_D1BE74_palette:: @ 8D1BE9C - .incbin "graphics/unknown/unknown_D1BE74.gbapal.lz" - - .align 2 -gFile_graphics_unknown_unknown_D1BE74_tilemap:: @ 8D1BEB4 - .incbin "graphics/unknown/unknown_D1BE74.bin.lz" - - .align 2 -gBattleAnimSpriteGfx_WhirlwindLines:: @ 8D1BFB8 - .incbin "graphics/battle_anims/sprites/162.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_WhirlwindLines:: @ 8D1C03C - .incbin "graphics/battle_anims/sprites/162.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_GoldRing:: @ 8D1C05C - .incbin "graphics/battle_anims/sprites/163.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_GoldRing:: @ 8D1C0BC - .incbin "graphics/battle_anims/sprites/163.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_BlueRing2:: @ 8D1C0D4 - .incbin "graphics/battle_anims/sprites/288.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_PurpleRing:: @ 8D1C0EC - .incbin "graphics/battle_anims/sprites/164.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_BlueRing:: @ 8D1C104 - .incbin "graphics/battle_anims/sprites/165.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_GreenLightWall:: @ 8D1C11C - .incbin "graphics/battle_anims/sprites/166.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_GreenLightWall:: @ 8D1C428 - .incbin "graphics/battle_anims/sprites/166.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_BlueLightWall:: @ 8D1C448 - .incbin "graphics/battle_anims/sprites/167.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_RedLightWall:: @ 8D1C468 - .incbin "graphics/battle_anims/sprites/168.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_GrayLightWall:: @ 8D1C488 - .incbin "graphics/battle_anims/sprites/169.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_OrangeLightWall:: @ 8D1C4A8 - .incbin "graphics/battle_anims/sprites/170.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_BlackBall2:: @ 8D1C4C8 - .incbin "graphics/battle_anims/sprites/171.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_BlackBall2:: @ 8D1C514 - .incbin "graphics/battle_anims/sprites/171.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_PurpleGasCloud:: @ 8D1C53C - .incbin "graphics/battle_anims/sprites/172.gbapal.lz" - - .align 2 -gFile_graphics_contest_judge_sheet:: @ 8D1C55C - .incbin "graphics/contest/judge.4bpp.lz" - - .align 2 -gFile_graphics_contest_judge_palette:: @ 8D1C830 - .incbin "graphics/contest/judge.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Spark:: @ 8D1C858 - .incbin "graphics/battle_anims/sprites/001.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Spark:: @ 8D1C90C - .incbin "graphics/battle_anims/sprites/001.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_SparkH:: @ 8D1C934 - .incbin "graphics/battle_anims/sprites/173.4bpp.lz" - - .align 2 -gBattleAnimBgImage_Dark:: @ 8D1C9BC - .incbin "graphics/battle_anims/backgrounds/00.4bpp.lz" - - .align 2 -gBattleAnimBgPalette_Dark:: @ 8D1CFB4 - .incbin "graphics/battle_anims/backgrounds/00.gbapal.lz" - - .align 2 -gBattleAnimBgTilemap_Dark:: @ 8D1CFD4 - .incbin "graphics/battle_anims/backgrounds/00.bin.lz" - - .align 2 -gMetalShineGfx:: @ 8D1D224 - .incbin "graphics/battle_anims/masks/metal_shine.4bpp.lz" - - .align 2 -gMetalShinePalette:: @ 8D1D360 - .incbin "graphics/battle_anims/masks/metal_shine.gbapal.lz" - - .align 2 -gMetalShineTilemap:: @ 8D1D388 - .incbin "graphics/battle_anims/masks/metal_shine.bin.lz" - - .align 2 -gFile_graphics_unused_goosuto_sheet:: @ 8D1D4FC - .incbin "graphics/unused/goosuto.4bpp.lz" - - .align 2 -gFile_graphics_unused_goosuto_palette:: @ 8D1D60C - .incbin "graphics/unused/goosuto.gbapal.lz" - - .align 2 -gFile_graphics_unused_goosuto_tilemap:: @ 8D1D624 - .incbin "graphics/unused/goosuto.bin.lz" - - .align 2 -gBattleAnimSpriteGfx_YellowStar:: @ 8D1D774 - .incbin "graphics/battle_anims/sprites/174.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_YellowStar:: @ 8D1D814 - .incbin "graphics/battle_anims/sprites/174.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_LargeFreshEgg:: @ 8D1D83C - .incbin "graphics/battle_anims/sprites/175.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_LargeFreshEgg:: @ 8D1D8A0 - .incbin "graphics/battle_anims/sprites/175.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_ShadowBall:: @ 8D1D8C8 - .incbin "graphics/battle_anims/sprites/176.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_ShadowBall:: @ 8D1DA20 - .incbin "graphics/battle_anims/sprites/176.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Lick:: @ 8D1DA48 - .incbin "graphics/battle_anims/sprites/177.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Lick:: @ 8D1DB0C - .incbin "graphics/battle_anims/sprites/177.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_VoidLines:: @ 8D1DB24 - .incbin "graphics/battle_anims/sprites/178.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_VoidLines:: @ 8D1DC8C - .incbin "graphics/battle_anims/sprites/178.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_String:: @ 8D1DCB4 - .incbin "graphics/battle_anims/sprites/179.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_String:: @ 8D1DCDC - .incbin "graphics/battle_anims/sprites/179.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_WebThread:: @ 8D1DDB8 - .incbin "graphics/battle_anims/sprites/180.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_SpiderWeb:: @ 8D1DDD0 - .incbin "graphics/battle_anims/sprites/181.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Lightbulb:: @ 8D1E160 - .incbin "graphics/battle_anims/sprites/182.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Lightbulb:: @ 8D1E204 - .incbin "graphics/battle_anims/sprites/182.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Slash:: @ 8D1E22C - .incbin "graphics/battle_anims/sprites/183.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Slash:: @ 8D1E4A4 - .incbin "graphics/battle_anims/sprites/183.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_FocusEnergy:: @ 8D1E4CC - .incbin "graphics/battle_anims/sprites/184.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_FocusEnergy:: @ 8D1E620 - .incbin "graphics/battle_anims/sprites/184.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_SphereToCube:: @ 8D1E648 - .incbin "graphics/battle_anims/sprites/185.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_SphereToCube:: @ 8D1EA5C - .incbin "graphics/battle_anims/sprites/185.gbapal.lz" - - .align 2 -gBattleAnimBgImage_Psychic:: @ 8D1EA84 - .incbin "graphics/battle_anims/backgrounds/03.4bpp.lz" - - .align 2 -gBattleAnimBgPalette_Psychic:: @ 8D1EC54 - .incbin "graphics/battle_anims/backgrounds/03.gbapal.lz" - - .align 2 -gBattleAnimBgTilemap_Psychic:: @ 8D1EC78 - .incbin "graphics/battle_anims/backgrounds/03.bin.lz" - - .align 2 -gBattleAnimSpriteGfx_Eye:: @ 8D1ED40 - .incbin "graphics/battle_anims/sprites/187.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Eye:: @ 8D1EF30 - .incbin "graphics/battle_anims/sprites/187.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Tendrils:: @ 8D1EF50 - .incbin "graphics/battle_anims/sprites/186.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Tendrils:: @ 8D1F31C - .incbin "graphics/battle_anims/sprites/186.gbapal.lz" - - .align 2 -gHealthboxSinglesPlayerGfx:: @ 8D1F340 - .incbin "graphics/battle_interface/healthbox_singles_player.4bpp.lz" - - .align 2 -gHealthboxSinglesOpponentGfx:: @ 8D1F604 - .incbin "graphics/battle_interface/healthbox_singles_opponent.4bpp.lz" - - .align 2 -gHealthboxDoublesPlayerGfx:: @ 8D1F794 - .incbin "graphics/battle_interface/healthbox_doubles_player.4bpp.lz" - - .align 2 -gHealthboxDoublesOpponentGfx:: @ 8D1F928 - .incbin "graphics/battle_interface/healthbox_doubles_opponent.4bpp.lz" - - .align 2 -gHealthboxSafariGfx:: @ 8D1FABC - .incbin "graphics/battle_interface/healthbox_safari.4bpp.lz" - - .align 2 -gFile_graphics_unused_shadow_sheet:: @ 8D1FD34 - .incbin "graphics/unused/shadow.4bpp.lz" - - .align 2 -gFile_graphics_unused_shadow_palette:: @ 8D1FD94 - .incbin "graphics/unused/shadow.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_LockOn:: @ 8D1FDA8 - .incbin "graphics/battle_anims/sprites/014.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_LockOn:: @ 8D1FE3C - .incbin "graphics/battle_anims/sprites/014.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_OpeningEye:: @ 8D1FE58 - .incbin "graphics/battle_anims/sprites/190.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_OpeningEye:: @ 8D200B4 - .incbin "graphics/battle_anims/sprites/190.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_RoundWhiteHalo:: @ 8D200D8 - .incbin "graphics/battle_anims/sprites/191.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_RoundWhiteHalo:: @ 8D20344 - .incbin "graphics/battle_anims/sprites/191.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_TealAlert:: @ 8D2036C - .incbin "graphics/battle_anims/sprites/189.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_TealAlert:: @ 8D203F0 - .incbin "graphics/battle_anims/sprites/189.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_FangAttack:: @ 8D20410 - .incbin "graphics/battle_anims/sprites/192.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_FangAttack:: @ 8D20690 - .incbin "graphics/battle_anims/sprites/192.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_PurpleHandOutline:: @ 8D206B8 - .incbin "graphics/battle_anims/sprites/193.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_PurpleHandOutline:: @ 8D20814 - .incbin "graphics/battle_anims/sprites/193.gbapal.lz" - - .align 2 -gFile_graphics_battle_anims_masks_curse_sheet:: @ 8D2083C - .incbin "graphics/battle_anims/masks/curse.4bpp.lz" - - .align 2 -gFile_graphics_battle_anims_masks_curse_tilemap:: @ 8D20858 - .incbin "graphics/battle_anims/masks/curse.bin.lz" - - .align 2 -gBattleAnimSpriteGfx_Pencil:: @ 8D20958 - .incbin "graphics/battle_anims/sprites/002.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Pencil:: @ 8D20A3C - .incbin "graphics/battle_anims/sprites/002.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Spiral:: @ 8D20A64 - .incbin "graphics/battle_anims/sprites/196.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Spiral:: @ 8D20E08 - .incbin "graphics/battle_anims/sprites/196.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Moon:: @ 8D20E20 - .incbin "graphics/battle_anims/sprites/194.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Moon:: @ 8D21158 - .incbin "graphics/battle_anims/sprites/194.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_GreenSparkle:: @ 8D21180 - .incbin "graphics/battle_anims/sprites/195.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_GreenSparkle:: @ 8D21238 - .incbin "graphics/battle_anims/sprites/195.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_SnoreZ:: @ 8D21258 - .incbin "graphics/battle_anims/sprites/197.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_SnoreZ:: @ 8D213C8 - .incbin "graphics/battle_anims/sprites/197.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Explosion:: @ 8D213F0 - .incbin "graphics/battle_anims/sprites/198.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Explosion:: @ 8D217E0 - .incbin "graphics/battle_anims/sprites/198.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Nail:: @ 8D21808 - .incbin "graphics/battle_anims/sprites/199.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Nail:: @ 8D218D0 - .incbin "graphics/battle_anims/sprites/199.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_GhostlySpirit:: @ 8D218EC - .incbin "graphics/battle_anims/sprites/200.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_GhostlySpirit:: @ 8D21A2C - .incbin "graphics/battle_anims/sprites/200.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_WarmRock:: @ 8D21A48 - .incbin "graphics/battle_anims/sprites/201.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_WarmRock:: @ 8D220B8 - .incbin "graphics/battle_anims/sprites/201.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_PunchImpact:: @ 8D220E0 - .incbin "graphics/battle_anims/sprites/204.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_PunchImpact:: @ 8D22254 - .incbin "graphics/battle_anims/sprites/204.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_BreakingEgg:: @ 8D2227C - .incbin "graphics/battle_anims/sprites/202.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_BreakingEgg:: @ 8D223E4 - .incbin "graphics/battle_anims/sprites/202.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_ThinRing:: @ 8D22408 - .incbin "graphics/battle_anims/sprites/203.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_ThinRing:: @ 8D225B4 - .incbin "graphics/battle_anims/sprites/203.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_MusicNotes2:: @ 8D225D8 - .incbin "graphics/battle_anims/sprites/206.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_MusicNotes2:: @ 8D227E4 - .incbin "graphics/battle_anims/sprites/206.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Bell:: @ 8D22878 - .incbin "graphics/battle_anims/sprites/205.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Bell:: @ 8D22AAC - .incbin "graphics/battle_anims/sprites/205.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_SpeedDust:: @ 8D22AD0 - .incbin "graphics/battle_anims/sprites/207.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_SpeedDust:: @ 8D22B9C - .incbin "graphics/battle_anims/sprites/207.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_TornMetal:: @ 8D22BC0 - .incbin "graphics/battle_anims/sprites/208.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_ThoughtBubble:: @ 8D22FB0 - .incbin "graphics/battle_anims/sprites/209.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_ThoughtBubble:: @ 8D232B8 - .incbin "graphics/battle_anims/sprites/209.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Finger:: @ 8D232D8 - .incbin "graphics/battle_anims/sprites/064.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Finger:: @ 8D233C8 - .incbin "graphics/battle_anims/sprites/064.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_MagentaHeart:: @ 8D233EC - .incbin "graphics/battle_anims/sprites/210.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_PinkHeart:: @ 8D23454 - .incbin "graphics/battle_anims/sprites/219.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_MagentaHeart:: @ 8D23474 - .incbin "graphics/battle_anims/sprites/210.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_RedHeart:: @ 8D23494 - .incbin "graphics/battle_anims/sprites/216.gbapal.lz" - - .align 2 -gBattleAnimBg_AttractGfx:: @ 8D234B4 - .incbin "graphics/battle_anims/backgrounds/attract.4bpp.lz" - - .align 2 -gBattleAnimBg_AttractPal:: @ 8D23F24 - .incbin "graphics/battle_anims/backgrounds/attract.gbapal.lz" - - .align 2 -gBattleAnimBg_AttractTilemap:: @ 8D23F4C - .incbin "graphics/battle_anims/backgrounds/attract.bin.lz" - - .align 2 -gBattleAnimSpriteGfx_RedOrb:: @ 8D241C8 - .incbin "graphics/battle_anims/sprites/217.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_RedOrb:: @ 8D24230 - .incbin "graphics/battle_anims/sprites/217.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_CircleOfLight:: @ 8D24250 - .incbin "graphics/battle_anims/sprites/212.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_ElectricOrbs:: @ 8D24484 - .incbin "graphics/battle_anims/sprites/211.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Electricity:: @ 8D244D4 - .incbin "graphics/battle_anims/sprites/213.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_ElectricOrbs:: @ 8D24740 - .incbin "graphics/battle_anims/sprites/211.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Finger2:: @ 8D24764 - .incbin "graphics/battle_anims/sprites/214.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_MovementWaves:: @ 8D249F4 - .incbin "graphics/battle_anims/sprites/215.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_MovementWaves:: @ 8D24B80 - .incbin "graphics/battle_anims/sprites/215.gbapal.lz" - - .align 2 -gBattleAnim_ScaryFacePal:: @ 8D24BA4 - .incbin "graphics/battle_anims/backgrounds/scary_face.gbapal.lz" - - .align 2 -gBattleAnim_ScaryFaceGfx:: @ 8D24BCC - .incbin "graphics/battle_anims/backgrounds/scary_face.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_EyeSparkle:: @ 8D24DFC - .incbin "graphics/battle_anims/sprites/218.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_EyeSparkle:: @ 8D24E24 - .incbin "graphics/battle_anims/sprites/218.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Anger:: @ 8D24ED0 - .incbin "graphics/battle_anims/sprites/087.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Anger:: @ 8D24F28 - .incbin "graphics/battle_anims/sprites/087.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Conversion:: @ 8D24F50 - .incbin "graphics/battle_anims/sprites/018.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Conversion:: @ 8D24F8C - .incbin "graphics/battle_anims/sprites/018.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_Angel:: @ 8D24FA8 - .incbin "graphics/battle_anims/sprites/220.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Angel:: @ 8D24FD0 - .incbin "graphics/battle_anims/sprites/220.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Devil:: @ 8D250FC - .incbin "graphics/battle_anims/sprites/221.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Devil:: @ 8D2511C - .incbin "graphics/battle_anims/sprites/221.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Swipe:: @ 8D25380 - .incbin "graphics/battle_anims/sprites/222.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Swipe:: @ 8D2566C - .incbin "graphics/battle_anims/sprites/222.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_Roots:: @ 8D25694 - .incbin "graphics/battle_anims/sprites/223.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Roots:: @ 8D256B4 - .incbin "graphics/battle_anims/sprites/223.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_ItemBag:: @ 8D25948 - .incbin "graphics/battle_anims/sprites/224.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_ItemBag:: @ 8D25968 - .incbin "graphics/battle_anims/sprites/224.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_TriForceTriangle:: @ 8D25A64 - .incbin "graphics/battle_anims/sprites/230.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_TriForceTriangle:: @ 8D25A8C - .incbin "graphics/battle_anims/sprites/230.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_LetterZ:: @ 8D25CD0 - .incbin "graphics/battle_anims/sprites/228.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_LetterZ:: @ 8D25CF0 - .incbin "graphics/battle_anims/sprites/228.4bpp.lz" - - .align 2 -gBattleAnimBgPalette_Impact:: @ 8D25D98 - .incbin "graphics/battle_anims/backgrounds/04.gbapal.lz" - - .align 2 -gBattleAnimBgImage_Impact:: @ 8D25DC0 - .incbin "graphics/battle_anims/backgrounds/04.4bpp.lz" - - .align 2 -gBattleAnimBgTilemap_ImpactOpponent:: @ 8D26B2C - .incbin "graphics/battle_anims/backgrounds/04.bin.lz" - - .align 2 -gBattleAnimBgTilemap_ImpactPlayer:: @ 8D27028 - .incbin "graphics/battle_anims/backgrounds/05.bin.lz" - - .align 2 -gBattleAnimBgTilemap_ImpactContests:: @ 8D274F8 - .incbin "graphics/battle_anims/backgrounds/06.bin.lz" - - .align 2 -gBattleAnimSpriteGfx_JaggedMusicNote:: @ 8D27938 - .incbin "graphics/battle_anims/sprites/225.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_JaggedMusicNote:: @ 8D27ABC - .incbin "graphics/battle_anims/sprites/225.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Spotlight:: @ 8D27AE4 - .incbin "graphics/battle_anims/sprites/227.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Pokeball:: @ 8D27C2C - .incbin "graphics/battle_anims/sprites/226.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Pokeball:: @ 8D27CB8 - .incbin "graphics/battle_anims/sprites/226.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_RapidSpin:: @ 8D27CDC - .incbin "graphics/battle_anims/sprites/229.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_RapidSpin:: @ 8D27E98 - .incbin "graphics/battle_anims/sprites/229.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_MilkBottle:: @ 8D27EC0 - .incbin "graphics/battle_anims/sprites/099.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_MilkBottle:: @ 8D27FE0 - .incbin "graphics/battle_anims/sprites/099.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_WispFire:: @ 8D28008 - .incbin "graphics/battle_anims/sprites/232.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_WispOrb:: @ 8D28540 - .incbin "graphics/battle_anims/sprites/231.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_WispOrb:: @ 8D28568 - .incbin "graphics/battle_anims/sprites/231.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_GoldStars:: @ 8D28738 - .incbin "graphics/battle_anims/sprites/233.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_GoldStars:: @ 8D287BC - .incbin "graphics/battle_anims/sprites/233.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_EclipsingOrb:: @ 8D287E4 - .incbin "graphics/battle_anims/sprites/234.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_EclipsingOrb:: @ 8D289A4 - .incbin "graphics/battle_anims/sprites/234.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_PinkPetal:: @ 8D289C8 - .incbin "graphics/battle_anims/sprites/238.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_PinkPetal:: @ 8D28A30 - .incbin "graphics/battle_anims/sprites/238.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_GrayOrb:: @ 8D28A54 - .incbin "graphics/battle_anims/sprites/235.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_GrayOrb:: @ 8D28AA4 - .incbin "graphics/battle_anims/sprites/235.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_BlueOrb:: @ 8D28AC0 - .incbin "graphics/battle_anims/sprites/236.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_RedOrb2:: @ 8D28ADC - .incbin "graphics/battle_anims/sprites/237.gbapal.lz" - - .align 2 -gBattleAnimBgImage_Drill:: @ 8D28AF8 - .incbin "graphics/battle_anims/backgrounds/07.4bpp.lz" - - .align 2 -gBattleAnimBgPalette_Drill:: @ 8D28CA0 - .incbin "graphics/battle_anims/backgrounds/07.gbapal.lz" - - .align 2 -gBattleAnimBgPalette_Sky:: @ 8D28CC8 - .incbin "graphics/battle_anims/backgrounds/18.gbapal.lz" - - .align 2 -gBattleAnimBgTilemap_Drill:: @ 8D28CF0 - .incbin "graphics/battle_anims/backgrounds/07.bin.lz" - - .align 2 -gBattleAnimBgTilemap_DrillContests:: @ 8D28E80 - .incbin "graphics/battle_anims/backgrounds/08.bin.lz" - - .align 2 -gBattleAnimBgImage_Aurora:: @ 8D2900C - .incbin "graphics/battle_anims/backgrounds/20.4bpp.lz" - - .align 2 -gBattleAnimBgPalette_Aurora:: @ 8D29A34 - .incbin "graphics/battle_anims/backgrounds/20.gbapal.lz" - - .align 2 -gBattleAnimBgTilemap_Aurora:: @ 8D29A54 - .incbin "graphics/battle_anims/backgrounds/20.bin.lz" - - .align 2 -gBattleAnimBgTilemap_HighspeedOpponent:: @ 8D29C58 - .incbin "graphics/battle_anims/backgrounds/09.bin.lz" - - .align 2 -gBattleAnimBgPalette_Highspeed:: @ 8D29F50 - .incbin "graphics/battle_anims/backgrounds/09.gbapal.lz" - - .align 2 -gBattleAnimBgPalette_Bug:: @ 8D29F70 - .incbin "graphics/battle_anims/backgrounds/22.gbapal.lz" - - .align 2 -gBattleAnimBgImage_Highspeed:: @ 8D29F90 - .incbin "graphics/battle_anims/backgrounds/09.4bpp.lz" - - .align 2 -gBattleAnimBgTilemap_HighspeedPlayer:: @ 8D2A510 - .incbin "graphics/battle_anims/backgrounds/10.bin.lz" - - .align 2 -gBattleAnim_MorningSunGfx:: @ 8D2A808 - .incbin "graphics/battle_anims/masks/morning_sun.4bpp.lz" - - .align 2 -gBattleAnim_MorningSunPal:: @ 8D2A8A8 - .incbin "graphics/battle_anims/masks/morning_sun.gbapal.lz" - - .align 2 -gBattleAnim_MorningSunTilemap:: @ 8D2A8C0 - .incbin "graphics/battle_anims/masks/morning_sun.bin.lz" - - .align 2 -gBattleAnimBgTilemap_GuillotineOpponent:: @ 8D2A9DC - .incbin "graphics/battle_anims/backgrounds/12.bin.lz" - - .align 2 -gBattleAnimBgTilemap_GuillotinePlayer:: @ 8D2ACA4 - .incbin "graphics/battle_anims/backgrounds/13.bin.lz" - - .align 2 -gBattleAnimBgTilemap_GuillotineContests:: @ 8D2AFA0 - .incbin "graphics/battle_anims/backgrounds/14.bin.lz" - - .align 2 -gBattleAnimBgImage_Guillotine:: @ 8D2B230 - .incbin "graphics/battle_anims/backgrounds/12.4bpp.lz" - - .align 2 -gBattleAnimBgPalette_Guillotine:: @ 8D2BF98 - .incbin "graphics/battle_anims/backgrounds/12.gbapal.lz" - - .align 2 -gBattleAnimBgImage_Thunder:: @ 8D2BFB8 - .incbin "graphics/battle_anims/backgrounds/11.4bpp.lz" - - .align 2 -gBattleAnimBgPalette_Thunder:: @ 8D2C954 - .incbin "graphics/battle_anims/backgrounds/11.gbapal.lz" - - .align 2 -gBattleAnimBgTilemap_Thunder:: @ 8D2C97C - .incbin "graphics/battle_anims/backgrounds/11.bin.lz" - - .align 2 -gBattleAnimSpriteGfx_PainSplit:: @ 8D2CC74 - .incbin "graphics/battle_anims/sprites/239.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_PainSplit:: @ 8D2CD58 - .incbin "graphics/battle_anims/sprites/239.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_HandsAndFeet:: @ 8D2CD80 - .incbin "graphics/battle_anims/sprites/143.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_HandsAndFeet:: @ 8D2CFB0 - .incbin "graphics/battle_anims/sprites/143.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Confetti:: @ 8D2CFC8 - .incbin "graphics/battle_anims/sprites/240.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Confetti:: @ 8D2D068 - .incbin "graphics/battle_anims/sprites/240.gbapal.lz" - - .align 2 -gSubstituteDollPal:: @ 8D2D090 - .incbin "graphics/battle_anims/sprites/substitute.gbapal.lz" - - .align 2 -gSubstituteDollGfx:: @ 8D2D0B4 - .incbin "graphics/battle_anims/sprites/substitute.4bpp.lz" - - .align 2 -gSubstituteDollTilemap:: @ 8D2D2F4 - .incbin "graphics/battle_anims/sprites/substitute.bin.lz" - - .align 2 -gBattleAnimSpriteGfx_GreenStar:: @ 8D2D51C - .incbin "graphics/battle_anims/sprites/241.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_GreenStar:: @ 8D2D5E0 - .incbin "graphics/battle_anims/sprites/241.gbapal.lz" - - .align 2 -gFile_graphics_misc_confetti_sheet:: @ 8D2D5FC - .incbin "graphics/misc/confetti.4bpp.lz" - - .align 2 -gFile_graphics_misc_confetti_palette:: @ 8D2D71C - .incbin "graphics/misc/confetti.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_PinkCloud:: @ 8D2D744 - .incbin "graphics/battle_anims/sprites/242.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_PinkCloud:: @ 8D2D880 - .incbin "graphics/battle_anims/sprites/242.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_SweatDrop:: @ 8D2D8A4 - .incbin "graphics/battle_anims/sprites/243.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_SweatDrop:: @ 8D2D8CC - .incbin "graphics/battle_anims/sprites/243.gbapal.lz" - - .align 2 -gBattleStatMask_Gfx:: @ 8D2D8F4 - .incbin "graphics/battle_anims/masks/stat.4bpp.lz" - - .align 2 -gBattleStatMask1_Tilemap:: @ 8D2DB04 - .incbin "graphics/battle_anims/masks/stat_tilemap_1.bin.lz" - - .align 2 -gBattleStatMask2_Tilemap:: @ 8D2DC20 - .incbin "graphics/battle_anims/masks/stat_tilemap_2.bin.lz" - - .align 2 -gBattleStatMask1_Pal:: @ 8D2DD3C - .incbin "graphics/battle_anims/masks/stat1.gbapal.lz" - - .align 2 -gBattleStatMask2_Pal:: @ 8D2DD5C - .incbin "graphics/battle_anims/masks/stat2.gbapal.lz" - - .align 2 -gBattleStatMask3_Pal:: @ 8D2DD7C - .incbin "graphics/battle_anims/masks/stat3.gbapal.lz" - - .align 2 -gBattleStatMask4_Pal:: @ 8D2DD9C - .incbin "graphics/battle_anims/masks/stat4.gbapal.lz" - - .align 2 -gBattleStatMask5_Pal:: @ 8D2DDBC - .incbin "graphics/battle_anims/masks/stat5.gbapal.lz" - - .align 2 -gBattleStatMask6_Pal:: @ 8D2DDDC - .incbin "graphics/battle_anims/masks/stat6.gbapal.lz" - - .align 2 -gBattleStatMask7_Pal:: @ 8D2DDFC - .incbin "graphics/battle_anims/masks/stat7.gbapal.lz" - - .align 2 -gBattleStatMask8_Pal:: @ 8D2DE1C - .incbin "graphics/battle_anims/masks/stat8.gbapal.lz" - - .align 2 -gCureBubblesGfx:: @ 8D2DE3C - .incbin "graphics/battle_anims/masks/cure_bubbles.4bpp.lz" - - .align 2 -gCureBubblesPal:: @ 8D2DF78 - .incbin "graphics/battle_anims/masks/cure_bubbles.gbapal.lz" - - .align 2 -gCureBubblesTilemap:: @ 8D2DF98 - .incbin "graphics/battle_anims/masks/cure_bubbles.bin.lz" - - .align 2 -gBattleAnimSpritePal_PurpleScratch:: @ 8D2E0B4 - .incbin "graphics/battle_anims/sprites/245.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_PurpleScratch:: @ 8D2E0DC - .incbin "graphics/battle_anims/sprites/245.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_PurpleSwipe:: @ 8D2E280 - .incbin "graphics/battle_anims/sprites/246.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_GuardRing:: @ 8D2E728 - .incbin "graphics/battle_anims/sprites/244.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_GuardRing:: @ 8D2E804 - .incbin "graphics/battle_anims/sprites/244.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_TagHand:: @ 8D2E820 - .incbin "graphics/battle_anims/sprites/247.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_NoiseLine:: @ 8D2EA04 - .incbin "graphics/battle_anims/sprites/053.4bpp.lz" - - .align 2 -gUnknown_D2EC24_Gfx:: @ 8D2EC24 - .incbin "graphics/battle_anims/masks/unknown_D2EC24.4bpp.lz" - - .align 2 -gUnknown_D2EC24_Tilemap:: @ 8D2EC70 - .incbin "graphics/battle_anims/masks/unknown_D2EC24.bin.lz" - - .align 2 -gBattleAnimSpriteGfx_SmallRedEye:: @ 8D2ED78 - .incbin "graphics/battle_anims/sprites/248.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_SmallRedEye:: @ 8D2ED90 - .incbin "graphics/battle_anims/sprites/248.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_HollowOrb:: @ 8D2EDA8 - .incbin "graphics/battle_anims/sprites/249.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_HollowOrb:: @ 8D2EDF8 - .incbin "graphics/battle_anims/sprites/249.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_XSign:: @ 8D2EE18 - .incbin "graphics/battle_anims/sprites/250.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_BluegreenOrb:: @ 8D2F00C - .incbin "graphics/battle_anims/sprites/251.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_BluegreenOrb:: @ 8D2F070 - .incbin "graphics/battle_anims/sprites/251.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_PawPrint:: @ 8D2F088 - .incbin "graphics/battle_anims/sprites/252.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_PawPrint:: @ 8D2F1A0 - .incbin "graphics/battle_anims/sprites/252.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_PurpleFlame:: @ 8D2F1C4 - .incbin "graphics/battle_anims/sprites/253.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_PurpleFlame:: @ 8D2F3A0 - .incbin "graphics/battle_anims/sprites/253.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_RedBall:: @ 8D2F3C8 - .incbin "graphics/battle_anims/sprites/254.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_RedBall:: @ 8D2F500 - .incbin "graphics/battle_anims/sprites/254.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_SmellingsaltEffect:: @ 8D2F528 - .incbin "graphics/battle_anims/sprites/255.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_SmellingsaltEffect:: @ 8D2F5A0 - .incbin "graphics/battle_anims/sprites/255.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_MagnifyingGlass:: @ 8D2F5B4 - .incbin "graphics/battle_anims/sprites/258.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_MagnifyingGlass:: @ 8D2F69C - .incbin "graphics/battle_anims/sprites/258.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Meteor:: @ 8D2F6C4 - .incbin "graphics/battle_anims/sprites/256.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Meteor:: @ 8D2FA50 - .incbin "graphics/battle_anims/sprites/256.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_FlatRock:: @ 8D2FA78 - .incbin "graphics/battle_anims/sprites/257.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_FlatRock:: @ 8D2FB94 - .incbin "graphics/battle_anims/sprites/257.gbapal.lz" - - .align 2 -gUnknown_8D2FBB4:: @ 8D2FBB4 - .incbin "graphics/interface/unk_8D2FBB4.gbapal" - - .align 2 -gMonFrontPic_Bulbasaur:: @ 8D2FBD4 - .incbin "graphics/pokemon/bulbasaur/front.4bpp.lz" - - .align 2 -gMonPalette_Bulbasaur:: @ 8D2FE78 - .incbin "graphics/pokemon/bulbasaur/normal.gbapal.lz" - - .align 2 -gMonBackPic_Bulbasaur:: @ 8D2FEA0 - .incbin "graphics/pokemon/bulbasaur/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Bulbasaur:: @ 8D30164 - .incbin "graphics/pokemon/bulbasaur/shiny.gbapal.lz" - - .align 2 -gMonIcon_Bulbasaur:: @ 8D3018C - .incbin "graphics/pokemon/bulbasaur/icon.4bpp" - - .align 2 -gMonFootprint_Bulbasaur:: @ 8D3058C - .incbin "graphics/pokemon/bulbasaur/footprint.1bpp" - - .align 2 -gMonFrontPic_Ivysaur:: @ 8D305AC - .incbin "graphics/pokemon/ivysaur/front.4bpp.lz" - - .align 2 -gMonPalette_Ivysaur:: @ 8D308E8 - .incbin "graphics/pokemon/ivysaur/normal.gbapal.lz" - - .align 2 -gMonBackPic_Ivysaur:: @ 8D30910 - .incbin "graphics/pokemon/ivysaur/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Ivysaur:: @ 8D30C64 - .incbin "graphics/pokemon/ivysaur/shiny.gbapal.lz" - - .align 2 -gMonIcon_Ivysaur:: @ 8D30C8C - .incbin "graphics/pokemon/ivysaur/icon.4bpp" - - .align 2 -gMonFootprint_Ivysaur:: @ 8D3108C - .incbin "graphics/pokemon/ivysaur/footprint.1bpp" - - .align 2 -gMonFrontPic_Venusaur:: @ 8D310AC - .incbin "graphics/pokemon/venusaur/front.4bpp.lz" - - .align 2 -gMonPalette_Venusaur:: @ 8D315EC - .incbin "graphics/pokemon/venusaur/normal.gbapal.lz" - - .align 2 -gMonBackPic_Venusaur:: @ 8D31614 - .incbin "graphics/pokemon/venusaur/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Venusaur:: @ 8D31ADC - .incbin "graphics/pokemon/venusaur/shiny.gbapal.lz" - - .align 2 -gMonIcon_Venusaur:: @ 8D31B04 - .incbin "graphics/pokemon/venusaur/icon.4bpp" - - .align 2 -gMonFootprint_Venusaur:: @ 8D31F04 - .incbin "graphics/pokemon/venusaur/footprint.1bpp" - - .align 2 -gMonFrontPic_Charmander:: @ 8D31F24 - .incbin "graphics/pokemon/charmander/front.4bpp.lz" - - .align 2 -gMonPalette_Charmander:: @ 8D321C4 - .incbin "graphics/pokemon/charmander/normal.gbapal.lz" - - .align 2 -gMonBackPic_Charmander:: @ 8D321EC - .incbin "graphics/pokemon/charmander/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Charmander:: @ 8D32470 - .incbin "graphics/pokemon/charmander/shiny.gbapal.lz" - - .align 2 -gMonIcon_Charmander:: @ 8D32498 - .incbin "graphics/pokemon/charmander/icon.4bpp" - - .align 2 -gMonFootprint_Charmander:: @ 8D32898 - .incbin "graphics/pokemon/charmander/footprint.1bpp" - - .align 2 -gMonFrontPic_Charmeleon:: @ 8D328B8 - .incbin "graphics/pokemon/charmeleon/front.4bpp.lz" - - .align 2 -gMonPalette_Charmeleon:: @ 8D32C64 - .incbin "graphics/pokemon/charmeleon/normal.gbapal.lz" - - .align 2 -gMonBackPic_Charmeleon:: @ 8D32C8C - .incbin "graphics/pokemon/charmeleon/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Charmeleon:: @ 8D32F80 - .incbin "graphics/pokemon/charmeleon/shiny.gbapal.lz" - - .align 2 -gMonIcon_Charmeleon:: @ 8D32FA8 - .incbin "graphics/pokemon/charmeleon/icon.4bpp" - - .align 2 -gMonFootprint_Charmeleon:: @ 8D333A8 - .incbin "graphics/pokemon/charmeleon/footprint.1bpp" - - .align 2 -gMonFrontPic_Charizard:: @ 8D333C8 - .incbin "graphics/pokemon/charizard/front.4bpp.lz" - - .align 2 -gMonPalette_Charizard:: @ 8D338C4 - .incbin "graphics/pokemon/charizard/normal.gbapal.lz" - - .align 2 -gMonBackPic_Charizard:: @ 8D338EC - .incbin "graphics/pokemon/charizard/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Charizard:: @ 8D33CF8 - .incbin "graphics/pokemon/charizard/shiny.gbapal.lz" - - .align 2 -gMonIcon_Charizard:: @ 8D33D20 - .incbin "graphics/pokemon/charizard/icon.4bpp" - - .align 2 -gMonFootprint_Charizard:: @ 8D34120 - .incbin "graphics/pokemon/charizard/footprint.1bpp" - - .align 2 -gMonFrontPic_Squirtle:: @ 8D34140 - .incbin "graphics/pokemon/squirtle/front.4bpp.lz" - - .align 2 -gMonPalette_Squirtle:: @ 8D343DC - .incbin "graphics/pokemon/squirtle/normal.gbapal.lz" - - .align 2 -gMonBackPic_Squirtle:: @ 8D34404 - .incbin "graphics/pokemon/squirtle/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Squirtle:: @ 8D3468C - .incbin "graphics/pokemon/squirtle/shiny.gbapal.lz" - - .align 2 -gMonIcon_Squirtle:: @ 8D346B4 - .incbin "graphics/pokemon/squirtle/icon.4bpp" - - .align 2 -gMonFootprint_Squirtle:: @ 8D34AB4 - .incbin "graphics/pokemon/squirtle/footprint.1bpp" - - .align 2 -gMonFrontPic_Wartortle:: @ 8D34AD4 - .incbin "graphics/pokemon/wartortle/front.4bpp.lz" - - .align 2 -gMonPalette_Wartortle:: @ 8D34E80 - .incbin "graphics/pokemon/wartortle/normal.gbapal.lz" - - .align 2 -gMonBackPic_Wartortle:: @ 8D34EA8 - .incbin "graphics/pokemon/wartortle/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Wartortle:: @ 8D351F0 - .incbin "graphics/pokemon/wartortle/shiny.gbapal.lz" - - .align 2 -gMonIcon_Wartortle:: @ 8D35218 - .incbin "graphics/pokemon/wartortle/icon.4bpp" - - .align 2 -gMonFootprint_Wartortle:: @ 8D35618 - .incbin "graphics/pokemon/wartortle/footprint.1bpp" - - .align 2 -gMonFrontPic_Blastoise:: @ 8D35638 - .incbin "graphics/pokemon/blastoise/front.4bpp.lz" - - .align 2 -gMonPalette_Blastoise:: @ 8D35B3C - .incbin "graphics/pokemon/blastoise/normal.gbapal.lz" - - .align 2 -gMonBackPic_Blastoise:: @ 8D35B64 - .incbin "graphics/pokemon/blastoise/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Blastoise:: @ 8D35F78 - .incbin "graphics/pokemon/blastoise/shiny.gbapal.lz" - - .align 2 -gMonIcon_Blastoise:: @ 8D35FA0 - .incbin "graphics/pokemon/blastoise/icon.4bpp" - - .align 2 -gMonFootprint_Blastoise:: @ 8D363A0 - .incbin "graphics/pokemon/blastoise/footprint.1bpp" - - .align 2 -gMonFrontPic_Caterpie:: @ 8D363C0 - .incbin "graphics/pokemon/caterpie/front.4bpp.lz" - - .align 2 -gMonPalette_Caterpie:: @ 8D36618 - .incbin "graphics/pokemon/caterpie/normal.gbapal.lz" - - .align 2 -gMonBackPic_Caterpie:: @ 8D36640 - .incbin "graphics/pokemon/caterpie/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Caterpie:: @ 8D368C8 - .incbin "graphics/pokemon/caterpie/shiny.gbapal.lz" - - .align 2 -gMonIcon_Caterpie:: @ 8D368F0 - .incbin "graphics/pokemon/caterpie/icon.4bpp" - - .align 2 -gMonFootprint_Caterpie:: @ 8D36CF0 - .incbin "graphics/pokemon/caterpie/footprint.1bpp" - - .align 2 -gMonFrontPic_Metapod:: @ 8D36D10 - .incbin "graphics/pokemon/metapod/front.4bpp.lz" - - .align 2 -gMonPalette_Metapod:: @ 8D36F2C - .incbin "graphics/pokemon/metapod/normal.gbapal.lz" - - .align 2 -gMonBackPic_Metapod:: @ 8D36F4C - .incbin "graphics/pokemon/metapod/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Metapod:: @ 8D37168 - .incbin "graphics/pokemon/metapod/shiny.gbapal.lz" - - .align 2 -gMonIcon_Metapod:: @ 8D37188 - .incbin "graphics/pokemon/metapod/icon.4bpp" - - .align 2 -gMonFootprint_Metapod:: @ 8D37588 - .incbin "graphics/pokemon/metapod/footprint.1bpp" - - .align 2 -gMonFrontPic_Butterfree:: @ 8D375A8 - .incbin "graphics/pokemon/butterfree/front.4bpp.lz" - - .align 2 -gMonPalette_Butterfree:: @ 8D37920 - .incbin "graphics/pokemon/butterfree/normal.gbapal.lz" - - .align 2 -gMonBackPic_Butterfree:: @ 8D37948 - .incbin "graphics/pokemon/butterfree/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Butterfree:: @ 8D37D4C - .incbin "graphics/pokemon/butterfree/shiny.gbapal.lz" - - .align 2 -gMonIcon_Butterfree:: @ 8D37D74 - .incbin "graphics/pokemon/butterfree/icon.4bpp" - - .align 2 -gMonFootprint_Butterfree:: @ 8D38174 - .incbin "graphics/pokemon/butterfree/footprint.1bpp" - - .align 2 -gMonFrontPic_Weedle:: @ 8D38194 - .incbin "graphics/pokemon/weedle/front.4bpp.lz" - - .align 2 -gMonPalette_Weedle:: @ 8D383D0 - .incbin "graphics/pokemon/weedle/normal.gbapal.lz" - - .align 2 -gMonBackPic_Weedle:: @ 8D383F8 - .incbin "graphics/pokemon/weedle/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Weedle:: @ 8D38660 - .incbin "graphics/pokemon/weedle/shiny.gbapal.lz" - - .align 2 -gMonIcon_Weedle:: @ 8D38688 - .incbin "graphics/pokemon/weedle/icon.4bpp" - - .align 2 -gMonFootprint_Weedle:: @ 8D38A88 - .incbin "graphics/pokemon/weedle/footprint.1bpp" - - .align 2 -gMonFrontPic_Kakuna:: @ 8D38AA8 - .incbin "graphics/pokemon/kakuna/front.4bpp.lz" - - .align 2 -gMonPalette_Kakuna:: @ 8D38CE8 - .incbin "graphics/pokemon/kakuna/normal.gbapal.lz" - - .align 2 -gMonBackPic_Kakuna:: @ 8D38D0C - .incbin "graphics/pokemon/kakuna/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Kakuna:: @ 8D38F90 - .incbin "graphics/pokemon/kakuna/shiny.gbapal.lz" - - .align 2 -gMonIcon_Kakuna:: @ 8D38FB4 - .incbin "graphics/pokemon/kakuna/icon.4bpp" - - .align 2 -gMonFootprint_Kakuna:: @ 8D393B4 - .incbin "graphics/pokemon/kakuna/footprint.1bpp" - - .align 2 -gMonFrontPic_Beedrill:: @ 8D393D4 - .incbin "graphics/pokemon/beedrill/front.4bpp.lz" - - .align 2 -gMonPalette_Beedrill:: @ 8D397F4 - .incbin "graphics/pokemon/beedrill/normal.gbapal.lz" - - .align 2 -gMonBackPic_Beedrill:: @ 8D3981C - .incbin "graphics/pokemon/beedrill/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Beedrill:: @ 8D39B90 - .incbin "graphics/pokemon/beedrill/shiny.gbapal.lz" - - .align 2 -gMonIcon_Beedrill:: @ 8D39BB8 - .incbin "graphics/pokemon/beedrill/icon.4bpp" - - .align 2 -gMonFootprint_Beedrill:: @ 8D39FB8 - .incbin "graphics/pokemon/beedrill/footprint.1bpp" - - .align 2 -gMonFrontPic_Pidgey:: @ 8D39FD8 - .incbin "graphics/pokemon/pidgey/front.4bpp.lz" - - .align 2 -gMonPalette_Pidgey:: @ 8D3A250 - .incbin "graphics/pokemon/pidgey/normal.gbapal.lz" - - .align 2 -gMonBackPic_Pidgey:: @ 8D3A278 - .incbin "graphics/pokemon/pidgey/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Pidgey:: @ 8D3A5CC - .incbin "graphics/pokemon/pidgey/shiny.gbapal.lz" - - .align 2 -gMonIcon_Pidgey:: @ 8D3A5F4 - .incbin "graphics/pokemon/pidgey/icon.4bpp" - - .align 2 -gMonFootprint_Pidgey:: @ 8D3A9F4 - .incbin "graphics/pokemon/pidgey/footprint.1bpp" - - .align 2 -gMonFrontPic_Pidgeotto:: @ 8D3AA14 - .incbin "graphics/pokemon/pidgeotto/front.4bpp.lz" - - .align 2 -gMonPalette_Pidgeotto:: @ 8D3ADAC - .incbin "graphics/pokemon/pidgeotto/normal.gbapal.lz" - - .align 2 -gMonBackPic_Pidgeotto:: @ 8D3ADD4 - .incbin "graphics/pokemon/pidgeotto/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Pidgeotto:: @ 8D3B120 - .incbin "graphics/pokemon/pidgeotto/shiny.gbapal.lz" - - .align 2 -gMonIcon_Pidgeotto:: @ 8D3B148 - .incbin "graphics/pokemon/pidgeotto/icon.4bpp" - - .align 2 -gMonFootprint_Pidgeotto:: @ 8D3B548 - .incbin "graphics/pokemon/pidgeotto/footprint.1bpp" - - .align 2 -gMonFrontPic_Pidgeot:: @ 8D3B568 - .incbin "graphics/pokemon/pidgeot/front.4bpp.lz" - - .align 2 -gMonPalette_Pidgeot:: @ 8D3BA54 - .incbin "graphics/pokemon/pidgeot/normal.gbapal.lz" - - .align 2 -gMonBackPic_Pidgeot:: @ 8D3BA7C - .incbin "graphics/pokemon/pidgeot/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Pidgeot:: @ 8D3BE64 - .incbin "graphics/pokemon/pidgeot/shiny.gbapal.lz" - - .align 2 -gMonIcon_Pidgeot:: @ 8D3BE8C - .incbin "graphics/pokemon/pidgeot/icon.4bpp" - - .align 2 -gMonFootprint_Pidgeot:: @ 8D3C28C - .incbin "graphics/pokemon/pidgeot/footprint.1bpp" - - .align 2 -gMonFrontPic_Rattata:: @ 8D3C2AC - .incbin "graphics/pokemon/rattata/front.4bpp.lz" - - .align 2 -gMonPalette_Rattata:: @ 8D3C504 - .incbin "graphics/pokemon/rattata/normal.gbapal.lz" - - .align 2 -gMonBackPic_Rattata:: @ 8D3C52C - .incbin "graphics/pokemon/rattata/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Rattata:: @ 8D3C7E4 - .incbin "graphics/pokemon/rattata/shiny.gbapal.lz" - - .align 2 -gMonIcon_Rattata:: @ 8D3C80C - .incbin "graphics/pokemon/rattata/icon.4bpp" - - .align 2 -gMonFootprint_Rattata:: @ 8D3CC0C - .incbin "graphics/pokemon/rattata/footprint.1bpp" - - .align 2 -gMonFrontPic_Raticate:: @ 8D3CC2C - .incbin "graphics/pokemon/raticate/front.4bpp.lz" - - .align 2 -gMonPalette_Raticate:: @ 8D3CFBC - .incbin "graphics/pokemon/raticate/normal.gbapal.lz" - - .align 2 -gMonBackPic_Raticate:: @ 8D3CFE4 - .incbin "graphics/pokemon/raticate/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Raticate:: @ 8D3D2F4 - .incbin "graphics/pokemon/raticate/shiny.gbapal.lz" - - .align 2 -gMonIcon_Raticate:: @ 8D3D31C - .incbin "graphics/pokemon/raticate/icon.4bpp" - - .align 2 -gMonFootprint_Raticate:: @ 8D3D71C - .incbin "graphics/pokemon/raticate/footprint.1bpp" - - .align 2 -gMonFrontPic_Spearow:: @ 8D3D73C - .incbin "graphics/pokemon/spearow/front.4bpp.lz" - - .align 2 -gMonPalette_Spearow:: @ 8D3D9FC - .incbin "graphics/pokemon/spearow/normal.gbapal.lz" - - .align 2 -gMonBackPic_Spearow:: @ 8D3DA24 - .incbin "graphics/pokemon/spearow/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Spearow:: @ 8D3DD00 - .incbin "graphics/pokemon/spearow/shiny.gbapal.lz" - - .align 2 -gMonIcon_Spearow:: @ 8D3DD28 - .incbin "graphics/pokemon/spearow/icon.4bpp" - - .align 2 -gMonFootprint_Spearow:: @ 8D3E128 - .incbin "graphics/pokemon/spearow/footprint.1bpp" - - .align 2 -gMonFrontPic_Fearow:: @ 8D3E148 - .incbin "graphics/pokemon/fearow/front.4bpp.lz" - - .align 2 -gMonPalette_Fearow:: @ 8D3E604 - .incbin "graphics/pokemon/fearow/normal.gbapal.lz" - - .align 2 -gMonBackPic_Fearow:: @ 8D3E62C - .incbin "graphics/pokemon/fearow/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Fearow:: @ 8D3E924 - .incbin "graphics/pokemon/fearow/shiny.gbapal.lz" - - .align 2 -gMonIcon_Fearow:: @ 8D3E94C - .incbin "graphics/pokemon/fearow/icon.4bpp" - - .align 2 -gMonFootprint_Fearow:: @ 8D3ED4C - .incbin "graphics/pokemon/fearow/footprint.1bpp" - - .align 2 -gMonFrontPic_Ekans:: @ 8D3ED6C - .incbin "graphics/pokemon/ekans/front.4bpp.lz" - - .align 2 -gMonPalette_Ekans:: @ 8D3F034 - .incbin "graphics/pokemon/ekans/normal.gbapal.lz" - - .align 2 -gMonBackPic_Ekans:: @ 8D3F05C - .incbin "graphics/pokemon/ekans/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Ekans:: @ 8D3F34C - .incbin "graphics/pokemon/ekans/shiny.gbapal.lz" - - .align 2 -gMonIcon_Ekans:: @ 8D3F374 - .incbin "graphics/pokemon/ekans/icon.4bpp" - - .align 2 -gMonFootprint_Ekans:: @ 8D3F774 - .incbin "graphics/pokemon/ekans/footprint.1bpp" - - .align 2 -gMonFrontPic_Arbok:: @ 8D3F794 - .incbin "graphics/pokemon/arbok/front.4bpp.lz" - - .align 2 -gMonPalette_Arbok:: @ 8D3FC08 - .incbin "graphics/pokemon/arbok/normal.gbapal.lz" - - .align 2 -gMonBackPic_Arbok:: @ 8D3FC30 - .incbin "graphics/pokemon/arbok/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Arbok:: @ 8D3FEB8 - .incbin "graphics/pokemon/arbok/shiny.gbapal.lz" - - .align 2 -gMonIcon_Arbok:: @ 8D3FEE0 - .incbin "graphics/pokemon/arbok/icon.4bpp" - - .align 2 -gMonFootprint_Arbok:: @ 8D402E0 - .incbin "graphics/pokemon/arbok/footprint.1bpp" - - .align 2 -gMonFrontPic_Pikachu:: @ 8D40300 - .incbin "graphics/pokemon/pikachu/front.4bpp.lz" - - .align 2 -gMonPalette_Pikachu:: @ 8D405D0 - .incbin "graphics/pokemon/pikachu/normal.gbapal.lz" - - .align 2 -gMonBackPic_Pikachu:: @ 8D405F8 - .incbin "graphics/pokemon/pikachu/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Pikachu:: @ 8D408D0 - .incbin "graphics/pokemon/pikachu/shiny.gbapal.lz" - - .align 2 -gMonIcon_Pikachu:: @ 8D408F8 - .incbin "graphics/pokemon/pikachu/icon.4bpp" - - .align 2 -gMonFootprint_Pikachu:: @ 8D40CF8 - .incbin "graphics/pokemon/pikachu/footprint.1bpp" - - .align 2 -gMonFrontPic_Raichu:: @ 8D40D18 - .incbin "graphics/pokemon/raichu/front.4bpp.lz" - - .align 2 -gMonPalette_Raichu:: @ 8D41110 - .incbin "graphics/pokemon/raichu/normal.gbapal.lz" - - .align 2 -gMonBackPic_Raichu:: @ 8D41138 - .incbin "graphics/pokemon/raichu/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Raichu:: @ 8D41458 - .incbin "graphics/pokemon/raichu/shiny.gbapal.lz" - - .align 2 -gMonIcon_Raichu:: @ 8D41480 - .incbin "graphics/pokemon/raichu/icon.4bpp" - - .align 2 -gMonFootprint_Raichu:: @ 8D41880 - .incbin "graphics/pokemon/raichu/footprint.1bpp" - - .align 2 -gMonFrontPic_Sandshrew:: @ 8D418A0 - .incbin "graphics/pokemon/sandshrew/front.4bpp.lz" - - .align 2 -gMonPalette_Sandshrew:: @ 8D41B7C - .incbin "graphics/pokemon/sandshrew/normal.gbapal.lz" - - .align 2 -gMonBackPic_Sandshrew:: @ 8D41BA4 - .incbin "graphics/pokemon/sandshrew/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Sandshrew:: @ 8D41ECC - .incbin "graphics/pokemon/sandshrew/shiny.gbapal.lz" - - .align 2 -gMonIcon_Sandshrew:: @ 8D41EF4 - .incbin "graphics/pokemon/sandshrew/icon.4bpp" - - .align 2 -gMonFootprint_Sandshrew:: @ 8D422F4 - .incbin "graphics/pokemon/sandshrew/footprint.1bpp" - - .align 2 -gMonFrontPic_Sandslash:: @ 8D42314 - .incbin "graphics/pokemon/sandslash/front.4bpp.lz" - - .align 2 -gMonPalette_Sandslash:: @ 8D4272C - .incbin "graphics/pokemon/sandslash/normal.gbapal.lz" - - .align 2 -gMonBackPic_Sandslash:: @ 8D42754 - .incbin "graphics/pokemon/sandslash/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Sandslash:: @ 8D42B70 - .incbin "graphics/pokemon/sandslash/shiny.gbapal.lz" - - .align 2 -gMonIcon_Sandslash:: @ 8D42B98 - .incbin "graphics/pokemon/sandslash/icon.4bpp" - - .align 2 -gMonFootprint_Sandslash:: @ 8D42F98 - .incbin "graphics/pokemon/sandslash/footprint.1bpp" - - .align 2 -gMonFrontPic_NidoranF:: @ 8D42FB8 - .incbin "graphics/pokemon/nidoran_f/front.4bpp.lz" - - .align 2 -gMonPalette_NidoranF:: @ 8D4321C - .incbin "graphics/pokemon/nidoran_f/normal.gbapal.lz" - - .align 2 -gMonBackPic_NidoranF:: @ 8D43244 - .incbin "graphics/pokemon/nidoran_f/back.4bpp.lz" - - .align 2 -gMonShinyPalette_NidoranF:: @ 8D43524 - .incbin "graphics/pokemon/nidoran_f/shiny.gbapal.lz" - - .align 2 -gMonIcon_NidoranF:: @ 8D4354C - .incbin "graphics/pokemon/nidoran_f/icon.4bpp" - - .align 2 -gMonFootprint_NidoranF:: @ 8D4394C - .incbin "graphics/pokemon/nidoran_f/footprint.1bpp" - - .align 2 -gMonFrontPic_Nidorina:: @ 8D4396C - .incbin "graphics/pokemon/nidorina/front.4bpp.lz" - - .align 2 -gMonPalette_Nidorina:: @ 8D43C8C - .incbin "graphics/pokemon/nidorina/normal.gbapal.lz" - - .align 2 -gMonBackPic_Nidorina:: @ 8D43CB4 - .incbin "graphics/pokemon/nidorina/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Nidorina:: @ 8D44048 - .incbin "graphics/pokemon/nidorina/shiny.gbapal.lz" - - .align 2 -gMonIcon_Nidorina:: @ 8D44070 - .incbin "graphics/pokemon/nidorina/icon.4bpp" - - .align 2 -gMonFootprint_Nidorina:: @ 8D44470 - .incbin "graphics/pokemon/nidorina/footprint.1bpp" - - .align 2 -gMonFrontPic_Nidoqueen:: @ 8D44490 - .incbin "graphics/pokemon/nidoqueen/front.4bpp.lz" - - .align 2 -gMonPalette_Nidoqueen:: @ 8D448BC - .incbin "graphics/pokemon/nidoqueen/normal.gbapal.lz" - - .align 2 -gMonBackPic_Nidoqueen:: @ 8D448E4 - .incbin "graphics/pokemon/nidoqueen/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Nidoqueen:: @ 8D44CA8 - .incbin "graphics/pokemon/nidoqueen/shiny.gbapal.lz" - - .align 2 -gMonIcon_Nidoqueen:: @ 8D44CD0 - .incbin "graphics/pokemon/nidoqueen/icon.4bpp" - - .align 2 -gMonFootprint_Nidoqueen:: @ 8D450D0 - .incbin "graphics/pokemon/nidoqueen/footprint.1bpp" - - .align 2 -gMonFrontPic_NidoranM:: @ 8D450F0 - .incbin "graphics/pokemon/nidoran_m/front.4bpp.lz" - - .align 2 -gMonPalette_NidoranM:: @ 8D4537C - .incbin "graphics/pokemon/nidoran_m/normal.gbapal.lz" - - .align 2 -gMonBackPic_NidoranM:: @ 8D453A4 - .incbin "graphics/pokemon/nidoran_m/back.4bpp.lz" - - .align 2 -gMonShinyPalette_NidoranM:: @ 8D456D8 - .incbin "graphics/pokemon/nidoran_m/shiny.gbapal.lz" - - .align 2 -gMonIcon_NidoranM:: @ 8D45700 - .incbin "graphics/pokemon/nidoran_m/icon.4bpp" - - .align 2 -gMonFootprint_NidoranM:: @ 8D45B00 - .incbin "graphics/pokemon/nidoran_m/footprint.1bpp" - - .align 2 -gMonFrontPic_Nidorino:: @ 8D45B20 - .incbin "graphics/pokemon/nidorino/front.4bpp.lz" - - .align 2 -gMonPalette_Nidorino:: @ 8D45EA4 - .incbin "graphics/pokemon/nidorino/normal.gbapal.lz" - - .align 2 -gMonBackPic_Nidorino:: @ 8D45ECC - .incbin "graphics/pokemon/nidorino/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Nidorino:: @ 8D46288 - .incbin "graphics/pokemon/nidorino/shiny.gbapal.lz" - - .align 2 -gMonIcon_Nidorino:: @ 8D462B0 - .incbin "graphics/pokemon/nidorino/icon.4bpp" - - .align 2 -gMonFootprint_Nidorino:: @ 8D466B0 - .incbin "graphics/pokemon/nidorino/footprint.1bpp" - - .align 2 -gMonFrontPic_Nidoking:: @ 8D466D0 - .incbin "graphics/pokemon/nidoking/front.4bpp.lz" - - .align 2 -gMonPalette_Nidoking:: @ 8D46C0C - .incbin "graphics/pokemon/nidoking/normal.gbapal.lz" - - .align 2 -gMonBackPic_Nidoking:: @ 8D46C34 - .incbin "graphics/pokemon/nidoking/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Nidoking:: @ 8D47070 - .incbin "graphics/pokemon/nidoking/shiny.gbapal.lz" - - .align 2 -gMonIcon_Nidoking:: @ 8D47098 - .incbin "graphics/pokemon/nidoking/icon.4bpp" - - .align 2 -gMonFootprint_Nidoking:: @ 8D47498 - .incbin "graphics/pokemon/nidoking/footprint.1bpp" - - .align 2 -gMonFrontPic_Clefairy:: @ 8D474B8 - .incbin "graphics/pokemon/clefairy/front.4bpp.lz" - - .align 2 -gMonPalette_Clefairy:: @ 8D47754 - .incbin "graphics/pokemon/clefairy/normal.gbapal.lz" - - .align 2 -gMonBackPic_Clefairy:: @ 8D4777C - .incbin "graphics/pokemon/clefairy/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Clefairy:: @ 8D47A4C - .incbin "graphics/pokemon/clefairy/shiny.gbapal.lz" - - .align 2 -gMonIcon_Clefairy:: @ 8D47A74 - .incbin "graphics/pokemon/clefairy/icon.4bpp" - - .align 2 -gMonFootprint_Clefairy:: @ 8D47E74 - .incbin "graphics/pokemon/clefairy/footprint.1bpp" - - .align 2 -gMonFrontPic_Clefable:: @ 8D47E94 - .incbin "graphics/pokemon/clefable/front.4bpp.lz" - - .align 2 -gMonPalette_Clefable:: @ 8D481D4 - .incbin "graphics/pokemon/clefable/normal.gbapal.lz" - - .align 2 -gMonBackPic_Clefable:: @ 8D481FC - .incbin "graphics/pokemon/clefable/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Clefable:: @ 8D48534 - .incbin "graphics/pokemon/clefable/shiny.gbapal.lz" - - .align 2 -gMonIcon_Clefable:: @ 8D4855C - .incbin "graphics/pokemon/clefable/icon.4bpp" - - .align 2 -gMonFootprint_Clefable:: @ 8D4895C - .incbin "graphics/pokemon/clefable/footprint.1bpp" - - .align 2 -gMonFrontPic_Vulpix:: @ 8D4897C - .incbin "graphics/pokemon/vulpix/front.4bpp.lz" - - .align 2 -gMonPalette_Vulpix:: @ 8D48CA8 - .incbin "graphics/pokemon/vulpix/normal.gbapal.lz" - - .align 2 -gMonBackPic_Vulpix:: @ 8D48CD0 - .incbin "graphics/pokemon/vulpix/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Vulpix:: @ 8D48FD4 - .incbin "graphics/pokemon/vulpix/shiny.gbapal.lz" - - .align 2 -gMonIcon_Vulpix:: @ 8D48FFC - .incbin "graphics/pokemon/vulpix/icon.4bpp" - - .align 2 -gMonFootprint_Vulpix:: @ 8D493FC - .incbin "graphics/pokemon/vulpix/footprint.1bpp" - - .align 2 -gMonFrontPic_Ninetales:: @ 8D4941C - .incbin "graphics/pokemon/ninetales/front.4bpp.lz" - - .align 2 -gMonPalette_Ninetales:: @ 8D49870 - .incbin "graphics/pokemon/ninetales/normal.gbapal.lz" - - .align 2 -gMonBackPic_Ninetales:: @ 8D49894 - .incbin "graphics/pokemon/ninetales/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Ninetales:: @ 8D49C84 - .incbin "graphics/pokemon/ninetales/shiny.gbapal.lz" - - .align 2 -gMonIcon_Ninetales:: @ 8D49CA8 - .incbin "graphics/pokemon/ninetales/icon.4bpp" - - .align 2 -gMonFootprint_Ninetales:: @ 8D4A0A8 - .incbin "graphics/pokemon/ninetales/footprint.1bpp" - - .align 2 -gMonFrontPic_Jigglypuff:: @ 8D4A0C8 - .incbin "graphics/pokemon/jigglypuff/front.4bpp.lz" - - .align 2 -gMonPalette_Jigglypuff:: @ 8D4A34C - .incbin "graphics/pokemon/jigglypuff/normal.gbapal.lz" - - .align 2 -gMonBackPic_Jigglypuff:: @ 8D4A374 - .incbin "graphics/pokemon/jigglypuff/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Jigglypuff:: @ 8D4A5D0 - .incbin "graphics/pokemon/jigglypuff/shiny.gbapal.lz" - - .align 2 -gMonIcon_Jigglypuff:: @ 8D4A5F8 - .incbin "graphics/pokemon/jigglypuff/icon.4bpp" - - .align 2 -gMonFootprint_Jigglypuff:: @ 8D4A9F8 - .incbin "graphics/pokemon/jigglypuff/footprint.1bpp" - - .align 2 -gMonFrontPic_Wigglytuff:: @ 8D4AA18 - .incbin "graphics/pokemon/wigglytuff/front.4bpp.lz" - - .align 2 -gMonPalette_Wigglytuff:: @ 8D4AD8C - .incbin "graphics/pokemon/wigglytuff/normal.gbapal.lz" - - .align 2 -gMonBackPic_Wigglytuff:: @ 8D4ADB4 - .incbin "graphics/pokemon/wigglytuff/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Wigglytuff:: @ 8D4B04C - .incbin "graphics/pokemon/wigglytuff/shiny.gbapal.lz" - - .align 2 -gMonIcon_Wigglytuff:: @ 8D4B074 - .incbin "graphics/pokemon/wigglytuff/icon.4bpp" - - .align 2 -gMonFootprint_Wigglytuff:: @ 8D4B474 - .incbin "graphics/pokemon/wigglytuff/footprint.1bpp" - - .align 2 -gMonFrontPic_Zubat:: @ 8D4B494 - .incbin "graphics/pokemon/zubat/front.4bpp.lz" - - .align 2 -gMonPalette_Zubat:: @ 8D4B750 - .incbin "graphics/pokemon/zubat/normal.gbapal.lz" - - .align 2 -gMonBackPic_Zubat:: @ 8D4B778 - .incbin "graphics/pokemon/zubat/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Zubat:: @ 8D4BA34 - .incbin "graphics/pokemon/zubat/shiny.gbapal.lz" - - .align 2 -gMonIcon_Zubat:: @ 8D4BA5C - .incbin "graphics/pokemon/zubat/icon.4bpp" - - .align 2 -gMonFootprint_Zubat:: @ 8D4BE5C - .incbin "graphics/pokemon/zubat/footprint.1bpp" - - .align 2 -gMonFrontPic_Golbat:: @ 8D4BE7C - .incbin "graphics/pokemon/golbat/front.4bpp.lz" - - .align 2 -gMonPalette_Golbat:: @ 8D4C21C - .incbin "graphics/pokemon/golbat/normal.gbapal.lz" - - .align 2 -gMonBackPic_Golbat:: @ 8D4C244 - .incbin "graphics/pokemon/golbat/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Golbat:: @ 8D4C500 - .incbin "graphics/pokemon/golbat/shiny.gbapal.lz" - - .align 2 -gMonIcon_Golbat:: @ 8D4C528 - .incbin "graphics/pokemon/golbat/icon.4bpp" - - .align 2 -gMonFootprint_Golbat:: @ 8D4C928 - .incbin "graphics/pokemon/golbat/footprint.1bpp" - - .align 2 -gMonFrontPic_Oddish:: @ 8D4C948 - .incbin "graphics/pokemon/oddish/front.4bpp.lz" - - .align 2 -gMonPalette_Oddish:: @ 8D4CB88 - .incbin "graphics/pokemon/oddish/normal.gbapal.lz" - - .align 2 -gMonBackPic_Oddish:: @ 8D4CBB0 - .incbin "graphics/pokemon/oddish/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Oddish:: @ 8D4CE74 - .incbin "graphics/pokemon/oddish/shiny.gbapal.lz" - - .align 2 -gMonIcon_Oddish:: @ 8D4CE9C - .incbin "graphics/pokemon/oddish/icon.4bpp" - - .align 2 -gMonFootprint_Oddish:: @ 8D4D29C - .incbin "graphics/pokemon/oddish/footprint.1bpp" - - .align 2 -gMonFrontPic_Gloom:: @ 8D4D2BC - .incbin "graphics/pokemon/gloom/front.4bpp.lz" - - .align 2 -gMonPalette_Gloom:: @ 8D4D624 - .incbin "graphics/pokemon/gloom/normal.gbapal.lz" - - .align 2 -gMonBackPic_Gloom:: @ 8D4D64C - .incbin "graphics/pokemon/gloom/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Gloom:: @ 8D4D9CC - .incbin "graphics/pokemon/gloom/shiny.gbapal.lz" - - .align 2 -gMonIcon_Gloom:: @ 8D4D9F4 - .incbin "graphics/pokemon/gloom/icon.4bpp" - - .align 2 -gMonFootprint_Gloom:: @ 8D4DDF4 - .incbin "graphics/pokemon/gloom/footprint.1bpp" - - .align 2 -gMonFrontPic_Vileplume:: @ 8D4DE14 - .incbin "graphics/pokemon/vileplume/front.4bpp.lz" - - .align 2 -gMonPalette_Vileplume:: @ 8D4E168 - .incbin "graphics/pokemon/vileplume/normal.gbapal.lz" - - .align 2 -gMonBackPic_Vileplume:: @ 8D4E190 - .incbin "graphics/pokemon/vileplume/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Vileplume:: @ 8D4E5DC - .incbin "graphics/pokemon/vileplume/shiny.gbapal.lz" - - .align 2 -gMonIcon_Vileplume:: @ 8D4E604 - .incbin "graphics/pokemon/vileplume/icon.4bpp" - - .align 2 -gMonFootprint_Vileplume:: @ 8D4EA04 - .incbin "graphics/pokemon/vileplume/footprint.1bpp" - - .align 2 -gMonFrontPic_Paras:: @ 8D4EA24 - .incbin "graphics/pokemon/paras/front.4bpp.lz" - - .align 2 -gMonPalette_Paras:: @ 8D4EC90 - .incbin "graphics/pokemon/paras/normal.gbapal.lz" - - .align 2 -gMonBackPic_Paras:: @ 8D4ECB8 - .incbin "graphics/pokemon/paras/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Paras:: @ 8D4EF58 - .incbin "graphics/pokemon/paras/shiny.gbapal.lz" - - .align 2 -gMonIcon_Paras:: @ 8D4EF80 - .incbin "graphics/pokemon/paras/icon.4bpp" - - .align 2 -gMonFootprint_Paras:: @ 8D4F380 - .incbin "graphics/pokemon/paras/footprint.1bpp" - - .align 2 -gMonFrontPic_Parasect:: @ 8D4F3A0 - .incbin "graphics/pokemon/parasect/front.4bpp.lz" - - .align 2 -gMonPalette_Parasect:: @ 8D4F730 - .incbin "graphics/pokemon/parasect/normal.gbapal.lz" - - .align 2 -gMonBackPic_Parasect:: @ 8D4F758 - .incbin "graphics/pokemon/parasect/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Parasect:: @ 8D4FA54 - .incbin "graphics/pokemon/parasect/shiny.gbapal.lz" - - .align 2 -gMonIcon_Parasect:: @ 8D4FA7C - .incbin "graphics/pokemon/parasect/icon.4bpp" - - .align 2 -gMonFootprint_Parasect:: @ 8D4FE7C - .incbin "graphics/pokemon/parasect/footprint.1bpp" - - .align 2 -gMonFrontPic_Venonat:: @ 8D4FE9C - .incbin "graphics/pokemon/venonat/front.4bpp.lz" - - .align 2 -gMonPalette_Venonat:: @ 8D501BC - .incbin "graphics/pokemon/venonat/normal.gbapal.lz" - - .align 2 -gMonBackPic_Venonat:: @ 8D501E4 - .incbin "graphics/pokemon/venonat/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Venonat:: @ 8D50514 - .incbin "graphics/pokemon/venonat/shiny.gbapal.lz" - - .align 2 -gMonIcon_Venonat:: @ 8D5053C - .incbin "graphics/pokemon/venonat/icon.4bpp" - - .align 2 -gMonFootprint_Venonat:: @ 8D5093C - .incbin "graphics/pokemon/venonat/footprint.1bpp" - - .align 2 -gMonFrontPic_Venomoth:: @ 8D5095C - .incbin "graphics/pokemon/venomoth/front.4bpp.lz" - - .align 2 -gMonPalette_Venomoth:: @ 8D50D60 - .incbin "graphics/pokemon/venomoth/normal.gbapal.lz" - - .align 2 -gMonBackPic_Venomoth:: @ 8D50D88 - .incbin "graphics/pokemon/venomoth/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Venomoth:: @ 8D5112C - .incbin "graphics/pokemon/venomoth/shiny.gbapal.lz" - - .align 2 -gMonIcon_Venomoth:: @ 8D51154 - .incbin "graphics/pokemon/venomoth/icon.4bpp" - - .align 2 -gMonFootprint_Venomoth:: @ 8D51554 - .incbin "graphics/pokemon/venomoth/footprint.1bpp" - - .align 2 -gMonFrontPic_Diglett:: @ 8D51574 - .incbin "graphics/pokemon/diglett/front.4bpp.lz" - - .align 2 -gMonPalette_Diglett:: @ 8D51784 - .incbin "graphics/pokemon/diglett/normal.gbapal.lz" - - .align 2 -gMonBackPic_Diglett:: @ 8D517AC - .incbin "graphics/pokemon/diglett/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Diglett:: @ 8D519B8 - .incbin "graphics/pokemon/diglett/shiny.gbapal.lz" - - .align 2 -gMonIcon_Diglett:: @ 8D519E0 - .incbin "graphics/pokemon/diglett/icon.4bpp" - - .align 2 -gMonFootprint_Diglett:: @ 8D51DE0 - .incbin "graphics/pokemon/diglett/footprint.1bpp" - - .align 2 -gMonFrontPic_Dugtrio:: @ 8D51E00 - .incbin "graphics/pokemon/dugtrio/front.4bpp.lz" - - .align 2 -gMonPalette_Dugtrio:: @ 8D5212C - .incbin "graphics/pokemon/dugtrio/normal.gbapal.lz" - - .align 2 -gMonBackPic_Dugtrio:: @ 8D52154 - .incbin "graphics/pokemon/dugtrio/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Dugtrio:: @ 8D52400 - .incbin "graphics/pokemon/dugtrio/shiny.gbapal.lz" - - .align 2 -gMonIcon_Dugtrio:: @ 8D52428 - .incbin "graphics/pokemon/dugtrio/icon.4bpp" - - .align 2 -gMonFootprint_Dugtrio:: @ 8D52828 - .incbin "graphics/pokemon/dugtrio/footprint.1bpp" - - .align 2 -gMonFrontPic_Meowth:: @ 8D52848 - .incbin "graphics/pokemon/meowth/front.4bpp.lz" - - .align 2 -gMonPalette_Meowth:: @ 8D52B34 - .incbin "graphics/pokemon/meowth/normal.gbapal.lz" - - .align 2 -gMonBackPic_Meowth:: @ 8D52B5C - .incbin "graphics/pokemon/meowth/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Meowth:: @ 8D52E40 - .incbin "graphics/pokemon/meowth/shiny.gbapal.lz" - - .align 2 -gMonIcon_Meowth:: @ 8D52E68 - .incbin "graphics/pokemon/meowth/icon.4bpp" - - .align 2 -gMonFootprint_Meowth:: @ 8D53268 - .incbin "graphics/pokemon/meowth/footprint.1bpp" - - .align 2 -gMonFrontPic_Persian:: @ 8D53288 - .incbin "graphics/pokemon/persian/front.4bpp.lz" - - .align 2 -gMonPalette_Persian:: @ 8D53600 - .incbin "graphics/pokemon/persian/normal.gbapal.lz" - - .align 2 -gMonBackPic_Persian:: @ 8D53628 - .incbin "graphics/pokemon/persian/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Persian:: @ 8D53968 - .incbin "graphics/pokemon/persian/shiny.gbapal.lz" - - .align 2 -gMonIcon_Persian:: @ 8D53990 - .incbin "graphics/pokemon/persian/icon.4bpp" - - .align 2 -gMonFootprint_Persian:: @ 8D53D90 - .incbin "graphics/pokemon/persian/footprint.1bpp" - - .align 2 -gMonFrontPic_Psyduck:: @ 8D53DB0 - .incbin "graphics/pokemon/psyduck/front.4bpp.lz" - - .align 2 -gMonPalette_Psyduck:: @ 8D54094 - .incbin "graphics/pokemon/psyduck/normal.gbapal.lz" - - .align 2 -gMonBackPic_Psyduck:: @ 8D540BC - .incbin "graphics/pokemon/psyduck/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Psyduck:: @ 8D54358 - .incbin "graphics/pokemon/psyduck/shiny.gbapal.lz" - - .align 2 -gMonIcon_Psyduck:: @ 8D54380 - .incbin "graphics/pokemon/psyduck/icon.4bpp" - - .align 2 -gMonFootprint_Psyduck:: @ 8D54780 - .incbin "graphics/pokemon/psyduck/footprint.1bpp" - - .align 2 -gMonFrontPic_Golduck:: @ 8D547A0 - .incbin "graphics/pokemon/golduck/front.4bpp.lz" - - .align 2 -gMonPalette_Golduck:: @ 8D54B58 - .incbin "graphics/pokemon/golduck/normal.gbapal.lz" - - .align 2 -gMonBackPic_Golduck:: @ 8D54B80 - .incbin "graphics/pokemon/golduck/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Golduck:: @ 8D54EAC - .incbin "graphics/pokemon/golduck/shiny.gbapal.lz" - - .align 2 -gMonIcon_Golduck:: @ 8D54ED4 - .incbin "graphics/pokemon/golduck/icon.4bpp" - - .align 2 -gMonFootprint_Golduck:: @ 8D552D4 - .incbin "graphics/pokemon/golduck/footprint.1bpp" - - .align 2 -gMonFrontPic_Mankey:: @ 8D552F4 - .incbin "graphics/pokemon/mankey/front.4bpp.lz" - - .align 2 -gMonPalette_Mankey:: @ 8D555EC - .incbin "graphics/pokemon/mankey/normal.gbapal.lz" - - .align 2 -gMonBackPic_Mankey:: @ 8D55614 - .incbin "graphics/pokemon/mankey/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Mankey:: @ 8D5597C - .incbin "graphics/pokemon/mankey/shiny.gbapal.lz" - - .align 2 -gMonIcon_Mankey:: @ 8D559A4 - .incbin "graphics/pokemon/mankey/icon.4bpp" - - .align 2 -gMonFootprint_Mankey:: @ 8D55DA4 - .incbin "graphics/pokemon/mankey/footprint.1bpp" - - .align 2 -gMonFrontPic_Primeape:: @ 8D55DC4 - .incbin "graphics/pokemon/primeape/front.4bpp.lz" - - .align 2 -gMonPalette_Primeape:: @ 8D56150 - .incbin "graphics/pokemon/primeape/normal.gbapal.lz" - - .align 2 -gMonBackPic_Primeape:: @ 8D56178 - .incbin "graphics/pokemon/primeape/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Primeape:: @ 8D564E8 - .incbin "graphics/pokemon/primeape/shiny.gbapal.lz" - - .align 2 -gMonIcon_Primeape:: @ 8D56510 - .incbin "graphics/pokemon/primeape/icon.4bpp" - - .align 2 -gMonFootprint_Primeape:: @ 8D56910 - .incbin "graphics/pokemon/primeape/footprint.1bpp" - - .align 2 -gMonFrontPic_Growlithe:: @ 8D56930 - .incbin "graphics/pokemon/growlithe/front.4bpp.lz" - - .align 2 -gMonPalette_Growlithe:: @ 8D56C58 - .incbin "graphics/pokemon/growlithe/normal.gbapal.lz" - - .align 2 -gMonBackPic_Growlithe:: @ 8D56C80 - .incbin "graphics/pokemon/growlithe/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Growlithe:: @ 8D56FBC - .incbin "graphics/pokemon/growlithe/shiny.gbapal.lz" - - .align 2 -gMonIcon_Growlithe:: @ 8D56FE4 - .incbin "graphics/pokemon/growlithe/icon.4bpp" - - .align 2 -gMonFootprint_Growlithe:: @ 8D573E4 - .incbin "graphics/pokemon/growlithe/footprint.1bpp" - - .align 2 -gMonFrontPic_Arcanine:: @ 8D57404 - .incbin "graphics/pokemon/arcanine/front.4bpp.lz" - - .align 2 -gMonPalette_Arcanine:: @ 8D57900 - .incbin "graphics/pokemon/arcanine/normal.gbapal.lz" - - .align 2 -gMonBackPic_Arcanine:: @ 8D57928 - .incbin "graphics/pokemon/arcanine/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Arcanine:: @ 8D57D08 - .incbin "graphics/pokemon/arcanine/shiny.gbapal.lz" - - .align 2 -gMonIcon_Arcanine:: @ 8D57D30 - .incbin "graphics/pokemon/arcanine/icon.4bpp" - - .align 2 -gMonFootprint_Arcanine:: @ 8D58130 - .incbin "graphics/pokemon/arcanine/footprint.1bpp" - - .align 2 -gMonFrontPic_Poliwag:: @ 8D58150 - .incbin "graphics/pokemon/poliwag/front.4bpp.lz" - - .align 2 -gMonPalette_Poliwag:: @ 8D583EC - .incbin "graphics/pokemon/poliwag/normal.gbapal.lz" - - .align 2 -gMonBackPic_Poliwag:: @ 8D58414 - .incbin "graphics/pokemon/poliwag/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Poliwag:: @ 8D58678 - .incbin "graphics/pokemon/poliwag/shiny.gbapal.lz" - - .align 2 -gMonIcon_Poliwag:: @ 8D586A0 - .incbin "graphics/pokemon/poliwag/icon.4bpp" - - .align 2 -gMonFootprint_Poliwag:: @ 8D58AA0 - .incbin "graphics/pokemon/poliwag/footprint.1bpp" - - .align 2 -gMonFrontPic_Poliwhirl:: @ 8D58AC0 - .incbin "graphics/pokemon/poliwhirl/front.4bpp.lz" - - .align 2 -gMonPalette_Poliwhirl:: @ 8D58E40 - .incbin "graphics/pokemon/poliwhirl/normal.gbapal.lz" - - .align 2 -gMonBackPic_Poliwhirl:: @ 8D58E68 - .incbin "graphics/pokemon/poliwhirl/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Poliwhirl:: @ 8D590E4 - .incbin "graphics/pokemon/poliwhirl/shiny.gbapal.lz" - - .align 2 -gMonIcon_Poliwhirl:: @ 8D5910C - .incbin "graphics/pokemon/poliwhirl/icon.4bpp" - - .align 2 -gMonFootprint_Poliwhirl:: @ 8D5950C - .incbin "graphics/pokemon/poliwhirl/footprint.1bpp" - - .align 2 -gMonFrontPic_Poliwrath:: @ 8D5952C - .incbin "graphics/pokemon/poliwrath/front.4bpp.lz" - - .align 2 -gMonPalette_Poliwrath:: @ 8D598F0 - .incbin "graphics/pokemon/poliwrath/normal.gbapal.lz" - - .align 2 -gMonBackPic_Poliwrath:: @ 8D59918 - .incbin "graphics/pokemon/poliwrath/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Poliwrath:: @ 8D59C0C - .incbin "graphics/pokemon/poliwrath/shiny.gbapal.lz" - - .align 2 -gMonIcon_Poliwrath:: @ 8D59C34 - .incbin "graphics/pokemon/poliwrath/icon.4bpp" - - .align 2 -gMonFootprint_Poliwrath:: @ 8D5A034 - .incbin "graphics/pokemon/poliwrath/footprint.1bpp" - - .align 2 -gMonFrontPic_Abra:: @ 8D5A054 - .incbin "graphics/pokemon/abra/front.4bpp.lz" - - .align 2 -gMonPalette_Abra:: @ 8D5A328 - .incbin "graphics/pokemon/abra/normal.gbapal.lz" - - .align 2 -gMonBackPic_Abra:: @ 8D5A34C - .incbin "graphics/pokemon/abra/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Abra:: @ 8D5A620 - .incbin "graphics/pokemon/abra/shiny.gbapal.lz" - - .align 2 -gMonIcon_Abra:: @ 8D5A644 - .incbin "graphics/pokemon/abra/icon.4bpp" - - .align 2 -gMonFootprint_Abra:: @ 8D5AA44 - .incbin "graphics/pokemon/abra/footprint.1bpp" - - .align 2 -gMonFrontPic_Kadabra:: @ 8D5AA64 - .incbin "graphics/pokemon/kadabra/front.4bpp.lz" - - .align 2 -gMonPalette_Kadabra:: @ 8D5AF2C - .incbin "graphics/pokemon/kadabra/normal.gbapal.lz" - - .align 2 -gMonBackPic_Kadabra:: @ 8D5AF54 - .incbin "graphics/pokemon/kadabra/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Kadabra:: @ 8D5B300 - .incbin "graphics/pokemon/kadabra/shiny.gbapal.lz" - - .align 2 -gMonIcon_Kadabra:: @ 8D5B328 - .incbin "graphics/pokemon/kadabra/icon.4bpp" - - .align 2 -gMonFootprint_Kadabra:: @ 8D5B728 - .incbin "graphics/pokemon/kadabra/footprint.1bpp" - - .align 2 -gMonFrontPic_Alakazam:: @ 8D5B748 - .incbin "graphics/pokemon/alakazam/front.4bpp.lz" - - .align 2 -gMonPalette_Alakazam:: @ 8D5BBE0 - .incbin "graphics/pokemon/alakazam/normal.gbapal.lz" - - .align 2 -gMonBackPic_Alakazam:: @ 8D5BC08 - .incbin "graphics/pokemon/alakazam/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Alakazam:: @ 8D5BF88 - .incbin "graphics/pokemon/alakazam/shiny.gbapal.lz" - - .align 2 -gMonIcon_Alakazam:: @ 8D5BFB0 - .incbin "graphics/pokemon/alakazam/icon.4bpp" - - .align 2 -gMonFootprint_Alakazam:: @ 8D5C3B0 - .incbin "graphics/pokemon/alakazam/footprint.1bpp" - - .align 2 -gMonFrontPic_Machop:: @ 8D5C3D0 - .incbin "graphics/pokemon/machop/front.4bpp.lz" - - .align 2 -gMonPalette_Machop:: @ 8D5C65C - .incbin "graphics/pokemon/machop/normal.gbapal.lz" - - .align 2 -gMonBackPic_Machop:: @ 8D5C684 - .incbin "graphics/pokemon/machop/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Machop:: @ 8D5C964 - .incbin "graphics/pokemon/machop/shiny.gbapal.lz" - - .align 2 -gMonIcon_Machop:: @ 8D5C98C - .incbin "graphics/pokemon/machop/icon.4bpp" - - .align 2 -gMonFootprint_Machop:: @ 8D5CD8C - .incbin "graphics/pokemon/machop/footprint.1bpp" - - .align 2 -gMonFrontPic_Machoke:: @ 8D5CDAC - .incbin "graphics/pokemon/machoke/front.4bpp.lz" - - .align 2 -gMonPalette_Machoke:: @ 8D5D178 - .incbin "graphics/pokemon/machoke/normal.gbapal.lz" - - .align 2 -gMonBackPic_Machoke:: @ 8D5D1A0 - .incbin "graphics/pokemon/machoke/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Machoke:: @ 8D5D4F0 - .incbin "graphics/pokemon/machoke/shiny.gbapal.lz" - - .align 2 -gMonIcon_Machoke:: @ 8D5D518 - .incbin "graphics/pokemon/machoke/icon.4bpp" - - .align 2 -gMonFootprint_Machoke:: @ 8D5D918 - .incbin "graphics/pokemon/machoke/footprint.1bpp" - - .align 2 -gMonFrontPic_Machamp:: @ 8D5D938 - .incbin "graphics/pokemon/machamp/front.4bpp.lz" - - .align 2 -gMonPalette_Machamp:: @ 8D5DE24 - .incbin "graphics/pokemon/machamp/normal.gbapal.lz" - - .align 2 -gMonBackPic_Machamp:: @ 8D5DE4C - .incbin "graphics/pokemon/machamp/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Machamp:: @ 8D5E2A8 - .incbin "graphics/pokemon/machamp/shiny.gbapal.lz" - - .align 2 -gMonIcon_Machamp:: @ 8D5E2D0 - .incbin "graphics/pokemon/machamp/icon.4bpp" - - .align 2 -gMonFootprint_Machamp:: @ 8D5E6D0 - .incbin "graphics/pokemon/machamp/footprint.1bpp" - - .align 2 -gMonFrontPic_Bellsprout:: @ 8D5E6F0 - .incbin "graphics/pokemon/bellsprout/front.4bpp.lz" - - .align 2 -gMonPalette_Bellsprout:: @ 8D5E97C - .incbin "graphics/pokemon/bellsprout/normal.gbapal.lz" - - .align 2 -gMonBackPic_Bellsprout:: @ 8D5E9A4 - .incbin "graphics/pokemon/bellsprout/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Bellsprout:: @ 8D5EC40 - .incbin "graphics/pokemon/bellsprout/shiny.gbapal.lz" - - .align 2 -gMonIcon_Bellsprout:: @ 8D5EC68 - .incbin "graphics/pokemon/bellsprout/icon.4bpp" - - .align 2 -gMonFootprint_Bellsprout:: @ 8D5F068 - .incbin "graphics/pokemon/bellsprout/footprint.1bpp" - - .align 2 -gMonFrontPic_Weepinbell:: @ 8D5F088 - .incbin "graphics/pokemon/weepinbell/front.4bpp.lz" - - .align 2 -gMonPalette_Weepinbell:: @ 8D5F3AC - .incbin "graphics/pokemon/weepinbell/normal.gbapal.lz" - - .align 2 -gMonBackPic_Weepinbell:: @ 8D5F3D4 - .incbin "graphics/pokemon/weepinbell/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Weepinbell:: @ 8D5F6D0 - .incbin "graphics/pokemon/weepinbell/shiny.gbapal.lz" - - .align 2 -gMonIcon_Weepinbell:: @ 8D5F6F8 - .incbin "graphics/pokemon/weepinbell/icon.4bpp" - - .align 2 -gMonFootprint_Weepinbell:: @ 8D5FAF8 - .incbin "graphics/pokemon/weepinbell/footprint.1bpp" - - .align 2 -gMonFrontPic_Victreebel:: @ 8D5FB18 - .incbin "graphics/pokemon/victreebel/front.4bpp.lz" - - .align 2 -gMonPalette_Victreebel:: @ 8D5FF44 - .incbin "graphics/pokemon/victreebel/normal.gbapal.lz" - - .align 2 -gMonBackPic_Victreebel:: @ 8D5FF6C - .incbin "graphics/pokemon/victreebel/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Victreebel:: @ 8D60304 - .incbin "graphics/pokemon/victreebel/shiny.gbapal.lz" - - .align 2 -gMonIcon_Victreebel:: @ 8D6032C - .incbin "graphics/pokemon/victreebel/icon.4bpp" - - .align 2 -gMonFootprint_Victreebel:: @ 8D6072C - .incbin "graphics/pokemon/victreebel/footprint.1bpp" - - .align 2 -gMonFrontPic_Tentacool:: @ 8D6074C - .incbin "graphics/pokemon/tentacool/front.4bpp.lz" - - .align 2 -gMonPalette_Tentacool:: @ 8D609F4 - .incbin "graphics/pokemon/tentacool/normal.gbapal.lz" - - .align 2 -gMonBackPic_Tentacool:: @ 8D60A1C - .incbin "graphics/pokemon/tentacool/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Tentacool:: @ 8D60CE8 - .incbin "graphics/pokemon/tentacool/shiny.gbapal.lz" - - .align 2 -gMonIcon_Tentacool:: @ 8D60D10 - .incbin "graphics/pokemon/tentacool/icon.4bpp" - - .align 2 -gMonFootprint_Tentacool:: @ 8D61110 - .incbin "graphics/pokemon/tentacool/footprint.1bpp" - - .align 2 -gMonFrontPic_Tentacruel:: @ 8D61130 - .incbin "graphics/pokemon/tentacruel/front.4bpp.lz" - - .align 2 -gMonPalette_Tentacruel:: @ 8D61624 - .incbin "graphics/pokemon/tentacruel/normal.gbapal.lz" - - .align 2 -gMonBackPic_Tentacruel:: @ 8D6164C - .incbin "graphics/pokemon/tentacruel/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Tentacruel:: @ 8D619E8 - .incbin "graphics/pokemon/tentacruel/shiny.gbapal.lz" - - .align 2 -gMonIcon_Tentacruel:: @ 8D61A10 - .incbin "graphics/pokemon/tentacruel/icon.4bpp" - - .align 2 -gMonFootprint_Tentacruel:: @ 8D61E10 - .incbin "graphics/pokemon/tentacruel/footprint.1bpp" - - .align 2 -gMonFrontPic_Geodude:: @ 8D61E30 - .incbin "graphics/pokemon/geodude/front.4bpp.lz" - - .align 2 -gMonPalette_Geodude:: @ 8D620C4 - .incbin "graphics/pokemon/geodude/normal.gbapal.lz" - - .align 2 -gMonBackPic_Geodude:: @ 8D620E0 - .incbin "graphics/pokemon/geodude/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Geodude:: @ 8D62374 - .incbin "graphics/pokemon/geodude/shiny.gbapal.lz" - - .align 2 -gMonIcon_Geodude:: @ 8D62390 - .incbin "graphics/pokemon/geodude/icon.4bpp" - - .align 2 -gMonFootprint_Geodude:: @ 8D62790 - .incbin "graphics/pokemon/geodude/footprint.1bpp" - - .align 2 -gMonFrontPic_Graveler:: @ 8D627B0 - .incbin "graphics/pokemon/graveler/front.4bpp.lz" - - .align 2 -gMonPalette_Graveler:: @ 8D62BAC - .incbin "graphics/pokemon/graveler/normal.gbapal.lz" - - .align 2 -gMonBackPic_Graveler:: @ 8D62BD0 - .incbin "graphics/pokemon/graveler/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Graveler:: @ 8D62E4C - .incbin "graphics/pokemon/graveler/shiny.gbapal.lz" - - .align 2 -gMonIcon_Graveler:: @ 8D62E70 - .incbin "graphics/pokemon/graveler/icon.4bpp" - - .align 2 -gMonFootprint_Graveler:: @ 8D63270 - .incbin "graphics/pokemon/graveler/footprint.1bpp" - - .align 2 -gMonFrontPic_Golem:: @ 8D63290 - .incbin "graphics/pokemon/golem/front.4bpp.lz" - - .align 2 -gMonPalette_Golem:: @ 8D636C0 - .incbin "graphics/pokemon/golem/normal.gbapal.lz" - - .align 2 -gMonBackPic_Golem:: @ 8D636E8 - .incbin "graphics/pokemon/golem/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Golem:: @ 8D639A8 - .incbin "graphics/pokemon/golem/shiny.gbapal.lz" - - .align 2 -gMonIcon_Golem:: @ 8D639D0 - .incbin "graphics/pokemon/golem/icon.4bpp" - - .align 2 -gMonFootprint_Golem:: @ 8D63DD0 - .incbin "graphics/pokemon/golem/footprint.1bpp" - - .align 2 -gMonFrontPic_Ponyta:: @ 8D63DF0 - .incbin "graphics/pokemon/ponyta/front.4bpp.lz" - - .align 2 -gMonPalette_Ponyta:: @ 8D64180 - .incbin "graphics/pokemon/ponyta/normal.gbapal.lz" - - .align 2 -gMonBackPic_Ponyta:: @ 8D641A8 - .incbin "graphics/pokemon/ponyta/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Ponyta:: @ 8D644E4 - .incbin "graphics/pokemon/ponyta/shiny.gbapal.lz" - - .align 2 -gMonIcon_Ponyta:: @ 8D6450C - .incbin "graphics/pokemon/ponyta/icon.4bpp" - - .align 2 -gMonFootprint_Ponyta:: @ 8D6490C - .incbin "graphics/pokemon/ponyta/footprint.1bpp" - - .align 2 -gMonFrontPic_Rapidash:: @ 8D6492C - .incbin "graphics/pokemon/rapidash/front.4bpp.lz" - - .align 2 -gMonPalette_Rapidash:: @ 8D64DB4 - .incbin "graphics/pokemon/rapidash/normal.gbapal.lz" - - .align 2 -gMonBackPic_Rapidash:: @ 8D64DDC - .incbin "graphics/pokemon/rapidash/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Rapidash:: @ 8D651EC - .incbin "graphics/pokemon/rapidash/shiny.gbapal.lz" - - .align 2 -gMonIcon_Rapidash:: @ 8D65214 - .incbin "graphics/pokemon/rapidash/icon.4bpp" - - .align 2 -gMonFootprint_Rapidash:: @ 8D65614 - .incbin "graphics/pokemon/rapidash/footprint.1bpp" - - .align 2 -gMonFrontPic_Slowpoke:: @ 8D65634 - .incbin "graphics/pokemon/slowpoke/front.4bpp.lz" - - .align 2 -gMonPalette_Slowpoke:: @ 8D65908 - .incbin "graphics/pokemon/slowpoke/normal.gbapal.lz" - - .align 2 -gMonBackPic_Slowpoke:: @ 8D65930 - .incbin "graphics/pokemon/slowpoke/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Slowpoke:: @ 8D65B94 - .incbin "graphics/pokemon/slowpoke/shiny.gbapal.lz" - - .align 2 -gMonIcon_Slowpoke:: @ 8D65BBC - .incbin "graphics/pokemon/slowpoke/icon.4bpp" - - .align 2 -gMonFootprint_Slowpoke:: @ 8D65FBC - .incbin "graphics/pokemon/slowpoke/footprint.1bpp" - - .align 2 -gMonFrontPic_Slowbro:: @ 8D65FDC - .incbin "graphics/pokemon/slowbro/front.4bpp.lz" - - .align 2 -gMonPalette_Slowbro:: @ 8D6647C - .incbin "graphics/pokemon/slowbro/normal.gbapal.lz" - - .align 2 -gMonBackPic_Slowbro:: @ 8D664A4 - .incbin "graphics/pokemon/slowbro/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Slowbro:: @ 8D66840 - .incbin "graphics/pokemon/slowbro/shiny.gbapal.lz" - - .align 2 -gMonIcon_Slowbro:: @ 8D66868 - .incbin "graphics/pokemon/slowbro/icon.4bpp" - - .align 2 -gMonFootprint_Slowbro:: @ 8D66C68 - .incbin "graphics/pokemon/slowbro/footprint.1bpp" - - .align 2 -gMonFrontPic_Magnemite:: @ 8D66C88 - .incbin "graphics/pokemon/magnemite/front.4bpp.lz" - - .align 2 -gMonPalette_Magnemite:: @ 8D66E60 - .incbin "graphics/pokemon/magnemite/normal.gbapal.lz" - - .align 2 -gMonBackPic_Magnemite:: @ 8D66E88 - .incbin "graphics/pokemon/magnemite/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Magnemite:: @ 8D67070 - .incbin "graphics/pokemon/magnemite/shiny.gbapal.lz" - - .align 2 -gMonIcon_Magnemite:: @ 8D67094 - .incbin "graphics/pokemon/magnemite/icon.4bpp" - - .align 2 -gMonFootprint_Magnemite:: @ 8D67494 - .incbin "graphics/pokemon/magnemite/footprint.1bpp" - - .align 2 -gMonFrontPic_Magneton:: @ 8D674B4 - .incbin "graphics/pokemon/magneton/front.4bpp.lz" - - .align 2 -gMonPalette_Magneton:: @ 8D677F0 - .incbin "graphics/pokemon/magneton/normal.gbapal.lz" - - .align 2 -gMonBackPic_Magneton:: @ 8D67818 - .incbin "graphics/pokemon/magneton/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Magneton:: @ 8D67B98 - .incbin "graphics/pokemon/magneton/shiny.gbapal.lz" - - .align 2 -gMonIcon_Magneton:: @ 8D67BC0 - .incbin "graphics/pokemon/magneton/icon.4bpp" - - .align 2 -gMonFootprint_Magneton:: @ 8D67FC0 - .incbin "graphics/pokemon/magneton/footprint.1bpp" - - .align 2 -gMonFrontPic_Farfetchd:: @ 8D67FE0 - .incbin "graphics/pokemon/farfetch_d/front.4bpp.lz" - - .align 2 -gMonPalette_Farfetchd:: @ 8D68334 - .incbin "graphics/pokemon/farfetch_d/normal.gbapal.lz" - - .align 2 -gMonBackPic_Farfetchd:: @ 8D6835C - .incbin "graphics/pokemon/farfetch_d/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Farfetchd:: @ 8D686C8 - .incbin "graphics/pokemon/farfetch_d/shiny.gbapal.lz" - - .align 2 -gMonIcon_Farfetchd:: @ 8D686F0 - .incbin "graphics/pokemon/farfetch_d/icon.4bpp" - - .align 2 -gMonFootprint_Farfetchd:: @ 8D68AF0 - .incbin "graphics/pokemon/farfetch_d/footprint.1bpp" - - .align 2 -gMonFrontPic_Doduo:: @ 8D68B10 - .incbin "graphics/pokemon/doduo/front.4bpp.lz" - - .align 2 -gMonPalette_Doduo:: @ 8D68DFC - .incbin "graphics/pokemon/doduo/normal.gbapal.lz" - - .align 2 -gMonBackPic_Doduo:: @ 8D68E20 - .incbin "graphics/pokemon/doduo/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Doduo:: @ 8D69138 - .incbin "graphics/pokemon/doduo/shiny.gbapal.lz" - - .align 2 -gMonIcon_Doduo:: @ 8D6915C - .incbin "graphics/pokemon/doduo/icon.4bpp" - - .align 2 -gMonFootprint_Doduo:: @ 8D6955C - .incbin "graphics/pokemon/doduo/footprint.1bpp" - - .align 2 -gMonFrontPic_Dodrio:: @ 8D6957C - .incbin "graphics/pokemon/dodrio/front.4bpp.lz" - - .align 2 -gMonPalette_Dodrio:: @ 8D699BC - .incbin "graphics/pokemon/dodrio/normal.gbapal.lz" - - .align 2 -gMonBackPic_Dodrio:: @ 8D699E4 - .incbin "graphics/pokemon/dodrio/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Dodrio:: @ 8D69E48 - .incbin "graphics/pokemon/dodrio/shiny.gbapal.lz" - - .align 2 -gMonIcon_Dodrio:: @ 8D69E70 - .incbin "graphics/pokemon/dodrio/icon.4bpp" - - .align 2 -gMonFootprint_Dodrio:: @ 8D6A270 - .incbin "graphics/pokemon/dodrio/footprint.1bpp" - - .align 2 -gMonFrontPic_Seel:: @ 8D6A290 - .incbin "graphics/pokemon/seel/front.4bpp.lz" - - .align 2 -gMonPalette_Seel:: @ 8D6A5B4 - .incbin "graphics/pokemon/seel/normal.gbapal.lz" - - .align 2 -gMonBackPic_Seel:: @ 8D6A5DC - .incbin "graphics/pokemon/seel/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Seel:: @ 8D6A8C8 - .incbin "graphics/pokemon/seel/shiny.gbapal.lz" - - .align 2 -gMonIcon_Seel:: @ 8D6A8F0 - .incbin "graphics/pokemon/seel/icon.4bpp" - - .align 2 -gMonFootprint_Seel:: @ 8D6ACF0 - .incbin "graphics/pokemon/seel/footprint.1bpp" - - .align 2 -gMonFrontPic_Dewgong:: @ 8D6AD10 - .incbin "graphics/pokemon/dewgong/front.4bpp.lz" - - .align 2 -gMonPalette_Dewgong:: @ 8D6B0E0 - .incbin "graphics/pokemon/dewgong/normal.gbapal.lz" - - .align 2 -gMonBackPic_Dewgong:: @ 8D6B104 - .incbin "graphics/pokemon/dewgong/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Dewgong:: @ 8D6B398 - .incbin "graphics/pokemon/dewgong/shiny.gbapal.lz" - - .align 2 -gMonIcon_Dewgong:: @ 8D6B3BC - .incbin "graphics/pokemon/dewgong/icon.4bpp" - - .align 2 -gMonFootprint_Dewgong:: @ 8D6B7BC - .incbin "graphics/pokemon/dewgong/footprint.1bpp" - - .align 2 -gMonFrontPic_Grimer:: @ 8D6B7DC - .incbin "graphics/pokemon/grimer/front.4bpp.lz" - - .align 2 -gMonPalette_Grimer:: @ 8D6BB04 - .incbin "graphics/pokemon/grimer/normal.gbapal.lz" - - .align 2 -gMonBackPic_Grimer:: @ 8D6BB28 - .incbin "graphics/pokemon/grimer/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Grimer:: @ 8D6BDEC - .incbin "graphics/pokemon/grimer/shiny.gbapal.lz" - - .align 2 -gMonIcon_Grimer:: @ 8D6BE10 - .incbin "graphics/pokemon/grimer/icon.4bpp" - - .align 2 -gMonFootprint_Grimer:: @ 8D6C210 - .incbin "graphics/pokemon/grimer/footprint.1bpp" - - .align 2 -gMonFrontPic_Muk:: @ 8D6C230 - .incbin "graphics/pokemon/muk/front.4bpp.lz" - - .align 2 -gMonPalette_Muk:: @ 8D6C5C0 - .incbin "graphics/pokemon/muk/normal.gbapal.lz" - - .align 2 -gMonBackPic_Muk:: @ 8D6C5E4 - .incbin "graphics/pokemon/muk/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Muk:: @ 8D6C8DC - .incbin "graphics/pokemon/muk/shiny.gbapal.lz" - - .align 2 -gMonIcon_Muk:: @ 8D6C900 - .incbin "graphics/pokemon/muk/icon.4bpp" - - .align 2 -gMonFootprint_Muk:: @ 8D6CD00 - .incbin "graphics/pokemon/muk/footprint.1bpp" - - .align 2 -gMonFrontPic_Shellder:: @ 8D6CD20 - .incbin "graphics/pokemon/shellder/front.4bpp.lz" - - .align 2 -gMonPalette_Shellder:: @ 8D6CF94 - .incbin "graphics/pokemon/shellder/normal.gbapal.lz" - - .align 2 -gMonBackPic_Shellder:: @ 8D6CFB8 - .incbin "graphics/pokemon/shellder/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Shellder:: @ 8D6D2CC - .incbin "graphics/pokemon/shellder/shiny.gbapal.lz" - - .align 2 -gMonIcon_Shellder:: @ 8D6D2F0 - .incbin "graphics/pokemon/shellder/icon.4bpp" - - .align 2 -gMonFootprint_Shellder:: @ 8D6D6F0 - .incbin "graphics/pokemon/shellder/footprint.1bpp" - - .align 2 -gMonFrontPic_Cloyster:: @ 8D6D710 - .incbin "graphics/pokemon/cloyster/front.4bpp.lz" - - .align 2 -gMonPalette_Cloyster:: @ 8D6DB4C - .incbin "graphics/pokemon/cloyster/normal.gbapal.lz" - - .align 2 -gMonBackPic_Cloyster:: @ 8D6DB70 - .incbin "graphics/pokemon/cloyster/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Cloyster:: @ 8D6DF7C - .incbin "graphics/pokemon/cloyster/shiny.gbapal.lz" - - .align 2 -gMonIcon_Cloyster:: @ 8D6DFA0 - .incbin "graphics/pokemon/cloyster/icon.4bpp" - - .align 2 -gMonFootprint_Cloyster:: @ 8D6E3A0 - .incbin "graphics/pokemon/cloyster/footprint.1bpp" - - .align 2 -gMonFrontPic_Gastly:: @ 8D6E3C0 - .incbin "graphics/pokemon/gastly/front.4bpp.lz" - - .align 2 -gMonPalette_Gastly:: @ 8D6E778 - .incbin "graphics/pokemon/gastly/normal.gbapal.lz" - - .align 2 -gMonBackPic_Gastly:: @ 8D6E7A0 - .incbin "graphics/pokemon/gastly/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Gastly:: @ 8D6EAC4 - .incbin "graphics/pokemon/gastly/shiny.gbapal.lz" - - .align 2 -gMonIcon_Gastly:: @ 8D6EAEC - .incbin "graphics/pokemon/gastly/icon.4bpp" - - .align 2 -gMonFootprint_Gastly:: @ 8D6EEEC - .incbin "graphics/pokemon/gastly/footprint.1bpp" - - .align 2 -gMonFrontPic_Haunter:: @ 8D6EF0C - .incbin "graphics/pokemon/haunter/front.4bpp.lz" - - .align 2 -gMonPalette_Haunter:: @ 8D6F2F4 - .incbin "graphics/pokemon/haunter/normal.gbapal.lz" - - .align 2 -gMonBackPic_Haunter:: @ 8D6F318 - .incbin "graphics/pokemon/haunter/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Haunter:: @ 8D6F5FC - .incbin "graphics/pokemon/haunter/shiny.gbapal.lz" - - .align 2 -gMonIcon_Haunter:: @ 8D6F620 - .incbin "graphics/pokemon/haunter/icon.4bpp" - - .align 2 -gMonFootprint_Haunter:: @ 8D6FA20 - .incbin "graphics/pokemon/haunter/footprint.1bpp" - - .align 2 -gMonFrontPic_Gengar:: @ 8D6FA40 - .incbin "graphics/pokemon/gengar/front.4bpp.lz" - - .align 2 -gMonPalette_Gengar:: @ 8D6FD9C - .incbin "graphics/pokemon/gengar/normal.gbapal.lz" - - .align 2 -gMonBackPic_Gengar:: @ 8D6FDC0 - .incbin "graphics/pokemon/gengar/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Gengar:: @ 8D70104 - .incbin "graphics/pokemon/gengar/shiny.gbapal.lz" - - .align 2 -gMonIcon_Gengar:: @ 8D70128 - .incbin "graphics/pokemon/gengar/icon.4bpp" - - .align 2 -gMonFootprint_Gengar:: @ 8D70528 - .incbin "graphics/pokemon/gengar/footprint.1bpp" - - .align 2 -gMonFrontPic_Onix:: @ 8D70548 - .incbin "graphics/pokemon/onix/front.4bpp.lz" - - .align 2 -gMonPalette_Onix:: @ 8D70A18 - .incbin "graphics/pokemon/onix/normal.gbapal.lz" - - .align 2 -gMonBackPic_Onix:: @ 8D70A34 - .incbin "graphics/pokemon/onix/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Onix:: @ 8D70DB0 - .incbin "graphics/pokemon/onix/shiny.gbapal.lz" - - .align 2 -gMonIcon_Onix:: @ 8D70DCC - .incbin "graphics/pokemon/onix/icon.4bpp" - - .align 2 -gMonFootprint_Onix:: @ 8D711CC - .incbin "graphics/pokemon/onix/footprint.1bpp" - - .align 2 -gMonFrontPic_Drowzee:: @ 8D711EC - .incbin "graphics/pokemon/drowzee/front.4bpp.lz" - - .align 2 -gMonPalette_Drowzee:: @ 8D7152C - .incbin "graphics/pokemon/drowzee/normal.gbapal.lz" - - .align 2 -gMonBackPic_Drowzee:: @ 8D71550 - .incbin "graphics/pokemon/drowzee/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Drowzee:: @ 8D7178C - .incbin "graphics/pokemon/drowzee/shiny.gbapal.lz" - - .align 2 -gMonIcon_Drowzee:: @ 8D717B0 - .incbin "graphics/pokemon/drowzee/icon.4bpp" - - .align 2 -gMonFootprint_Drowzee:: @ 8D71BB0 - .incbin "graphics/pokemon/drowzee/footprint.1bpp" - - .align 2 -gMonFrontPic_Hypno:: @ 8D71BD0 - .incbin "graphics/pokemon/hypno/front.4bpp.lz" - - .align 2 -gMonPalette_Hypno:: @ 8D72008 - .incbin "graphics/pokemon/hypno/normal.gbapal.lz" - - .align 2 -gMonBackPic_Hypno:: @ 8D7202C - .incbin "graphics/pokemon/hypno/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Hypno:: @ 8D7235C - .incbin "graphics/pokemon/hypno/shiny.gbapal.lz" - - .align 2 -gMonIcon_Hypno:: @ 8D72380 - .incbin "graphics/pokemon/hypno/icon.4bpp" - - .align 2 -gMonFootprint_Hypno:: @ 8D72780 - .incbin "graphics/pokemon/hypno/footprint.1bpp" - - .align 2 -gMonFrontPic_Krabby:: @ 8D727A0 - .incbin "graphics/pokemon/krabby/front.4bpp.lz" - - .align 2 -gMonPalette_Krabby:: @ 8D72AC4 - .incbin "graphics/pokemon/krabby/normal.gbapal.lz" - - .align 2 -gMonBackPic_Krabby:: @ 8D72AEC - .incbin "graphics/pokemon/krabby/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Krabby:: @ 8D72E78 - .incbin "graphics/pokemon/krabby/shiny.gbapal.lz" - - .align 2 -gMonIcon_Krabby:: @ 8D72EA0 - .incbin "graphics/pokemon/krabby/icon.4bpp" - - .align 2 -gMonFootprint_Krabby:: @ 8D732A0 - .incbin "graphics/pokemon/krabby/footprint.1bpp" - - .align 2 -gMonFrontPic_Kingler:: @ 8D732C0 - .incbin "graphics/pokemon/kingler/front.4bpp.lz" - - .align 2 -gMonPalette_Kingler:: @ 8D73740 - .incbin "graphics/pokemon/kingler/normal.gbapal.lz" - - .align 2 -gMonBackPic_Kingler:: @ 8D73768 - .incbin "graphics/pokemon/kingler/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Kingler:: @ 8D73AEC - .incbin "graphics/pokemon/kingler/shiny.gbapal.lz" - - .align 2 -gMonIcon_Kingler:: @ 8D73B14 - .incbin "graphics/pokemon/kingler/icon.4bpp" - - .align 2 -gMonFootprint_Kingler:: @ 8D73F14 - .incbin "graphics/pokemon/kingler/footprint.1bpp" - - .align 2 -gMonFrontPic_Voltorb:: @ 8D73F34 - .incbin "graphics/pokemon/voltorb/front.4bpp.lz" - - .align 2 -gMonPalette_Voltorb:: @ 8D7413C - .incbin "graphics/pokemon/voltorb/normal.gbapal.lz" - - .align 2 -gMonBackPic_Voltorb:: @ 8D74160 - .incbin "graphics/pokemon/voltorb/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Voltorb:: @ 8D743D4 - .incbin "graphics/pokemon/voltorb/shiny.gbapal.lz" - - .align 2 -gMonIcon_Voltorb:: @ 8D743F8 - .incbin "graphics/pokemon/voltorb/icon.4bpp" - - .align 2 -gMonFootprint_Voltorb:: @ 8D747F8 - .incbin "graphics/pokemon/voltorb/footprint.1bpp" - - .align 2 -gMonFrontPic_Electrode:: @ 8D74818 - .incbin "graphics/pokemon/electrode/front.4bpp.lz" - - .align 2 -gMonPalette_Electrode:: @ 8D74A84 - .incbin "graphics/pokemon/electrode/normal.gbapal.lz" - - .align 2 -gMonBackPic_Electrode:: @ 8D74AA8 - .incbin "graphics/pokemon/electrode/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Electrode:: @ 8D74D18 - .incbin "graphics/pokemon/electrode/shiny.gbapal.lz" - - .align 2 -gMonIcon_Electrode:: @ 8D74D3C - .incbin "graphics/pokemon/electrode/icon.4bpp" - - .align 2 -gMonFootprint_Electrode:: @ 8D7513C - .incbin "graphics/pokemon/electrode/footprint.1bpp" - - .align 2 -gMonFrontPic_Exeggcute:: @ 8D7515C - .incbin "graphics/pokemon/exeggcute/front.4bpp.lz" - - .align 2 -gMonPalette_Exeggcute:: @ 8D754EC - .incbin "graphics/pokemon/exeggcute/normal.gbapal.lz" - - .align 2 -gMonBackPic_Exeggcute:: @ 8D75510 - .incbin "graphics/pokemon/exeggcute/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Exeggcute:: @ 8D75818 - .incbin "graphics/pokemon/exeggcute/shiny.gbapal.lz" - - .align 2 -gMonIcon_Exeggcute:: @ 8D7583C - .incbin "graphics/pokemon/exeggcute/icon.4bpp" - - .align 2 -gMonFootprint_Exeggcute:: @ 8D75C3C - .incbin "graphics/pokemon/exeggcute/footprint.1bpp" - - .align 2 -gMonFrontPic_Exeggutor:: @ 8D75C5C - .incbin "graphics/pokemon/exeggutor/front.4bpp.lz" - - .align 2 -gMonPalette_Exeggutor:: @ 8D760AC - .incbin "graphics/pokemon/exeggutor/normal.gbapal.lz" - - .align 2 -gMonBackPic_Exeggutor:: @ 8D760D4 - .incbin "graphics/pokemon/exeggutor/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Exeggutor:: @ 8D764A0 - .incbin "graphics/pokemon/exeggutor/shiny.gbapal.lz" - - .align 2 -gMonIcon_Exeggutor:: @ 8D764C8 - .incbin "graphics/pokemon/exeggutor/icon.4bpp" - - .align 2 -gMonFootprint_Exeggutor:: @ 8D768C8 - .incbin "graphics/pokemon/exeggutor/footprint.1bpp" - - .align 2 -gMonFrontPic_Cubone:: @ 8D768E8 - .incbin "graphics/pokemon/cubone/front.4bpp.lz" - - .align 2 -gMonPalette_Cubone:: @ 8D76BA4 - .incbin "graphics/pokemon/cubone/normal.gbapal.lz" - - .align 2 -gMonBackPic_Cubone:: @ 8D76BCC - .incbin "graphics/pokemon/cubone/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Cubone:: @ 8D76F0C - .incbin "graphics/pokemon/cubone/shiny.gbapal.lz" - - .align 2 -gMonIcon_Cubone:: @ 8D76F34 - .incbin "graphics/pokemon/cubone/icon.4bpp" - - .align 2 -gMonFootprint_Cubone:: @ 8D77334 - .incbin "graphics/pokemon/cubone/footprint.1bpp" - - .align 2 -gMonFrontPic_Marowak:: @ 8D77354 - .incbin "graphics/pokemon/marowak/front.4bpp.lz" - - .align 2 -gMonPalette_Marowak:: @ 8D776D4 - .incbin "graphics/pokemon/marowak/normal.gbapal.lz" - - .align 2 -gMonBackPic_Marowak:: @ 8D776FC - .incbin "graphics/pokemon/marowak/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Marowak:: @ 8D77A10 - .incbin "graphics/pokemon/marowak/shiny.gbapal.lz" - - .align 2 -gMonIcon_Marowak:: @ 8D77A38 - .incbin "graphics/pokemon/marowak/icon.4bpp" - - .align 2 -gMonFootprint_Marowak:: @ 8D77E38 - .incbin "graphics/pokemon/marowak/footprint.1bpp" - - .align 2 -gMonFrontPic_Hitmonlee:: @ 8D77E58 - .incbin "graphics/pokemon/hitmonlee/front.4bpp.lz" - - .align 2 -gMonPalette_Hitmonlee:: @ 8D781CC - .incbin "graphics/pokemon/hitmonlee/normal.gbapal.lz" - - .align 2 -gMonBackPic_Hitmonlee:: @ 8D781F4 - .incbin "graphics/pokemon/hitmonlee/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Hitmonlee:: @ 8D78498 - .incbin "graphics/pokemon/hitmonlee/shiny.gbapal.lz" - - .align 2 -gMonIcon_Hitmonlee:: @ 8D784C0 - .incbin "graphics/pokemon/hitmonlee/icon.4bpp" - - .align 2 -gMonFootprint_Hitmonlee:: @ 8D788C0 - .incbin "graphics/pokemon/hitmonlee/footprint.1bpp" - - .align 2 -gMonFrontPic_Hitmonchan:: @ 8D788E0 - .incbin "graphics/pokemon/hitmonchan/front.4bpp.lz" - - .align 2 -gMonPalette_Hitmonchan:: @ 8D78C20 - .incbin "graphics/pokemon/hitmonchan/normal.gbapal.lz" - - .align 2 -gMonBackPic_Hitmonchan:: @ 8D78C48 - .incbin "graphics/pokemon/hitmonchan/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Hitmonchan:: @ 8D78F8C - .incbin "graphics/pokemon/hitmonchan/shiny.gbapal.lz" - - .align 2 -gMonIcon_Hitmonchan:: @ 8D78FB4 - .incbin "graphics/pokemon/hitmonchan/icon.4bpp" - - .align 2 -gMonFootprint_Hitmonchan:: @ 8D793B4 - .incbin "graphics/pokemon/hitmonchan/footprint.1bpp" - - .align 2 -gMonFrontPic_Lickitung:: @ 8D793D4 - .incbin "graphics/pokemon/lickitung/front.4bpp.lz" - - .align 2 -gMonPalette_Lickitung:: @ 8D797AC - .incbin "graphics/pokemon/lickitung/normal.gbapal.lz" - - .align 2 -gMonBackPic_Lickitung:: @ 8D797D4 - .incbin "graphics/pokemon/lickitung/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Lickitung:: @ 8D79A78 - .incbin "graphics/pokemon/lickitung/shiny.gbapal.lz" - - .align 2 -gMonIcon_Lickitung:: @ 8D79AA0 - .incbin "graphics/pokemon/lickitung/icon.4bpp" - - .align 2 -gMonFootprint_Lickitung:: @ 8D79EA0 - .incbin "graphics/pokemon/lickitung/footprint.1bpp" - - .align 2 -gMonFrontPic_Koffing:: @ 8D79EC0 - .incbin "graphics/pokemon/koffing/front.4bpp.lz" - - .align 2 -gMonPalette_Koffing:: @ 8D7A1C0 - .incbin "graphics/pokemon/koffing/normal.gbapal.lz" - - .align 2 -gMonBackPic_Koffing:: @ 8D7A1E8 - .incbin "graphics/pokemon/koffing/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Koffing:: @ 8D7A4E8 - .incbin "graphics/pokemon/koffing/shiny.gbapal.lz" - - .align 2 -gMonIcon_Koffing:: @ 8D7A510 - .incbin "graphics/pokemon/koffing/icon.4bpp" - - .align 2 -gMonFootprint_Koffing:: @ 8D7A910 - .incbin "graphics/pokemon/koffing/footprint.1bpp" - - .align 2 -gMonFrontPic_Weezing:: @ 8D7A930 - .incbin "graphics/pokemon/weezing/front.4bpp.lz" - - .align 2 -gMonPalette_Weezing:: @ 8D7ADEC - .incbin "graphics/pokemon/weezing/normal.gbapal.lz" - - .align 2 -gMonBackPic_Weezing:: @ 8D7AE14 - .incbin "graphics/pokemon/weezing/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Weezing:: @ 8D7B198 - .incbin "graphics/pokemon/weezing/shiny.gbapal.lz" - - .align 2 -gMonIcon_Weezing:: @ 8D7B1C0 - .incbin "graphics/pokemon/weezing/icon.4bpp" - - .align 2 -gMonFootprint_Weezing:: @ 8D7B5C0 - .incbin "graphics/pokemon/weezing/footprint.1bpp" - - .align 2 -gMonFrontPic_Rhyhorn:: @ 8D7B5E0 - .incbin "graphics/pokemon/rhyhorn/front.4bpp.lz" - - .align 2 -gMonPalette_Rhyhorn:: @ 8D7B9DC - .incbin "graphics/pokemon/rhyhorn/normal.gbapal.lz" - - .align 2 -gMonBackPic_Rhyhorn:: @ 8D7B9FC - .incbin "graphics/pokemon/rhyhorn/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Rhyhorn:: @ 8D7BD44 - .incbin "graphics/pokemon/rhyhorn/shiny.gbapal.lz" - - .align 2 -gMonIcon_Rhyhorn:: @ 8D7BD64 - .incbin "graphics/pokemon/rhyhorn/icon.4bpp" - - .align 2 -gMonFootprint_Rhyhorn:: @ 8D7C164 - .incbin "graphics/pokemon/rhyhorn/footprint.1bpp" - - .align 2 -gMonFrontPic_Rhydon:: @ 8D7C184 - .incbin "graphics/pokemon/rhydon/front.4bpp.lz" - - .align 2 -gMonPalette_Rhydon:: @ 8D7C678 - .incbin "graphics/pokemon/rhydon/normal.gbapal.lz" - - .align 2 -gMonBackPic_Rhydon:: @ 8D7C6A0 - .incbin "graphics/pokemon/rhydon/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Rhydon:: @ 8D7CAF0 - .incbin "graphics/pokemon/rhydon/shiny.gbapal.lz" - - .align 2 -gMonIcon_Rhydon:: @ 8D7CB18 - .incbin "graphics/pokemon/rhydon/icon.4bpp" - - .align 2 -gMonFootprint_Rhydon:: @ 8D7CF18 - .incbin "graphics/pokemon/rhydon/footprint.1bpp" - - .align 2 -gMonFrontPic_Chansey:: @ 8D7CF38 - .incbin "graphics/pokemon/chansey/front.4bpp.lz" - - .align 2 -gMonPalette_Chansey:: @ 8D7D274 - .incbin "graphics/pokemon/chansey/normal.gbapal.lz" - - .align 2 -gMonBackPic_Chansey:: @ 8D7D298 - .incbin "graphics/pokemon/chansey/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Chansey:: @ 8D7D4E8 - .incbin "graphics/pokemon/chansey/shiny.gbapal.lz" - - .align 2 -gMonIcon_Chansey:: @ 8D7D50C - .incbin "graphics/pokemon/chansey/icon.4bpp" - - .align 2 -gMonFootprint_Chansey:: @ 8D7D90C - .incbin "graphics/pokemon/chansey/footprint.1bpp" - - .align 2 -gMonFrontPic_Tangela:: @ 8D7D92C - .incbin "graphics/pokemon/tangela/front.4bpp.lz" - - .align 2 -gMonPalette_Tangela:: @ 8D7DD00 - .incbin "graphics/pokemon/tangela/normal.gbapal.lz" - - .align 2 -gMonBackPic_Tangela:: @ 8D7DD24 - .incbin "graphics/pokemon/tangela/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Tangela:: @ 8D7E0D0 - .incbin "graphics/pokemon/tangela/shiny.gbapal.lz" - - .align 2 -gMonIcon_Tangela:: @ 8D7E0F4 - .incbin "graphics/pokemon/tangela/icon.4bpp" - - .align 2 -gMonFootprint_Tangela:: @ 8D7E4F4 - .incbin "graphics/pokemon/tangela/footprint.1bpp" - - .align 2 -gMonFrontPic_Kangaskhan:: @ 8D7E514 - .incbin "graphics/pokemon/kangaskhan/front.4bpp.lz" - - .align 2 -gMonPalette_Kangaskhan:: @ 8D7E9BC - .incbin "graphics/pokemon/kangaskhan/normal.gbapal.lz" - - .align 2 -gMonBackPic_Kangaskhan:: @ 8D7E9E4 - .incbin "graphics/pokemon/kangaskhan/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Kangaskhan:: @ 8D7EE14 - .incbin "graphics/pokemon/kangaskhan/shiny.gbapal.lz" - - .align 2 -gMonIcon_Kangaskhan:: @ 8D7EE3C - .incbin "graphics/pokemon/kangaskhan/icon.4bpp" - - .align 2 -gMonFootprint_Kangaskhan:: @ 8D7F23C - .incbin "graphics/pokemon/kangaskhan/footprint.1bpp" - - .align 2 -gMonFrontPic_Horsea:: @ 8D7F25C - .incbin "graphics/pokemon/horsea/front.4bpp.lz" - - .align 2 -gMonPalette_Horsea:: @ 8D7F4C8 - .incbin "graphics/pokemon/horsea/normal.gbapal.lz" - - .align 2 -gMonBackPic_Horsea:: @ 8D7F4F0 - .incbin "graphics/pokemon/horsea/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Horsea:: @ 8D7F7D0 - .incbin "graphics/pokemon/horsea/shiny.gbapal.lz" - - .align 2 -gMonIcon_Horsea:: @ 8D7F7F8 - .incbin "graphics/pokemon/horsea/icon.4bpp" - - .align 2 -gMonFootprint_Horsea:: @ 8D7FBF8 - .incbin "graphics/pokemon/horsea/footprint.1bpp" - - .align 2 -gMonFrontPic_Seadra:: @ 8D7FC18 - .incbin "graphics/pokemon/seadra/front.4bpp.lz" - - .align 2 -gMonPalette_Seadra:: @ 8D7FFA0 - .incbin "graphics/pokemon/seadra/normal.gbapal.lz" - - .align 2 -gMonBackPic_Seadra:: @ 8D7FFC8 - .incbin "graphics/pokemon/seadra/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Seadra:: @ 8D80368 - .incbin "graphics/pokemon/seadra/shiny.gbapal.lz" - - .align 2 -gMonIcon_Seadra:: @ 8D80390 - .incbin "graphics/pokemon/seadra/icon.4bpp" - - .align 2 -gMonFootprint_Seadra:: @ 8D80790 - .incbin "graphics/pokemon/seadra/footprint.1bpp" - - .align 2 -gMonFrontPic_Goldeen:: @ 8D807B0 - .incbin "graphics/pokemon/goldeen/front.4bpp.lz" - - .align 2 -gMonPalette_Goldeen:: @ 8D80B18 - .incbin "graphics/pokemon/goldeen/normal.gbapal.lz" - - .align 2 -gMonBackPic_Goldeen:: @ 8D80B40 - .incbin "graphics/pokemon/goldeen/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Goldeen:: @ 8D80EB0 - .incbin "graphics/pokemon/goldeen/shiny.gbapal.lz" - - .align 2 -gMonIcon_Goldeen:: @ 8D80ED8 - .incbin "graphics/pokemon/goldeen/icon.4bpp" - - .align 2 -gMonFootprint_Goldeen:: @ 8D812D8 - .incbin "graphics/pokemon/goldeen/footprint.1bpp" - - .align 2 -gMonFrontPic_Seaking:: @ 8D812F8 - .incbin "graphics/pokemon/seaking/front.4bpp.lz" - - .align 2 -gMonPalette_Seaking:: @ 8D8176C - .incbin "graphics/pokemon/seaking/normal.gbapal.lz" - - .align 2 -gMonBackPic_Seaking:: @ 8D81794 - .incbin "graphics/pokemon/seaking/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Seaking:: @ 8D81AE4 - .incbin "graphics/pokemon/seaking/shiny.gbapal.lz" - - .align 2 -gMonIcon_Seaking:: @ 8D81B0C - .incbin "graphics/pokemon/seaking/icon.4bpp" - - .align 2 -gMonFootprint_Seaking:: @ 8D81F0C - .incbin "graphics/pokemon/seaking/footprint.1bpp" - - .align 2 -gMonFrontPic_Staryu:: @ 8D81F2C - .incbin "graphics/pokemon/staryu/front.4bpp.lz" - - .align 2 -gMonPalette_Staryu:: @ 8D821DC - .incbin "graphics/pokemon/staryu/normal.gbapal.lz" - - .align 2 -gMonBackPic_Staryu:: @ 8D82204 - .incbin "graphics/pokemon/staryu/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Staryu:: @ 8D8246C - .incbin "graphics/pokemon/staryu/shiny.gbapal.lz" - - .align 2 -gMonIcon_Staryu:: @ 8D82494 - .incbin "graphics/pokemon/staryu/icon.4bpp" - - .align 2 -gMonFootprint_Staryu:: @ 8D82894 - .incbin "graphics/pokemon/staryu/footprint.1bpp" - - .align 2 -gMonFrontPic_Starmie:: @ 8D828B4 - .incbin "graphics/pokemon/starmie/front.4bpp.lz" - - .align 2 -gMonPalette_Starmie:: @ 8D82C54 - .incbin "graphics/pokemon/starmie/normal.gbapal.lz" - - .align 2 -gMonBackPic_Starmie:: @ 8D82C7C - .incbin "graphics/pokemon/starmie/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Starmie:: @ 8D82F20 - .incbin "graphics/pokemon/starmie/shiny.gbapal.lz" - - .align 2 -gMonIcon_Starmie:: @ 8D82F48 - .incbin "graphics/pokemon/starmie/icon.4bpp" - - .align 2 -gMonFootprint_Starmie:: @ 8D83348 - .incbin "graphics/pokemon/starmie/footprint.1bpp" - - .align 2 -gMonFrontPic_Mrmime:: @ 8D83368 - .incbin "graphics/pokemon/mr_mime/front.4bpp.lz" - - .align 2 -gMonPalette_Mrmime:: @ 8D83724 - .incbin "graphics/pokemon/mr_mime/normal.gbapal.lz" - - .align 2 -gMonBackPic_Mrmime:: @ 8D8374C - .incbin "graphics/pokemon/mr_mime/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Mrmime:: @ 8D83A80 - .incbin "graphics/pokemon/mr_mime/shiny.gbapal.lz" - - .align 2 -gMonIcon_Mrmime:: @ 8D83AA8 - .incbin "graphics/pokemon/mr_mime/icon.4bpp" - - .align 2 -gMonFootprint_Mrmime:: @ 8D83EA8 - .incbin "graphics/pokemon/mr_mime/footprint.1bpp" - - .align 2 -gMonFrontPic_Scyther:: @ 8D83EC8 - .incbin "graphics/pokemon/scyther/front.4bpp.lz" - - .align 2 -gMonPalette_Scyther:: @ 8D842F0 - .incbin "graphics/pokemon/scyther/normal.gbapal.lz" - - .align 2 -gMonBackPic_Scyther:: @ 8D84318 - .incbin "graphics/pokemon/scyther/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Scyther:: @ 8D84730 - .incbin "graphics/pokemon/scyther/shiny.gbapal.lz" - - .align 2 -gMonIcon_Scyther:: @ 8D84758 - .incbin "graphics/pokemon/scyther/icon.4bpp" - - .align 2 -gMonFootprint_Scyther:: @ 8D84B58 - .incbin "graphics/pokemon/scyther/footprint.1bpp" - - .align 2 -gMonFrontPic_Jynx:: @ 8D84B78 - .incbin "graphics/pokemon/jynx/front.4bpp.lz" - - .align 2 -gMonPalette_Jynx:: @ 8D84F44 - .incbin "graphics/pokemon/jynx/normal.gbapal.lz" - - .align 2 -gMonBackPic_Jynx:: @ 8D84F6C - .incbin "graphics/pokemon/jynx/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Jynx:: @ 8D85258 - .incbin "graphics/pokemon/jynx/shiny.gbapal.lz" - - .align 2 -gMonIcon_Jynx:: @ 8D85280 - .incbin "graphics/pokemon/jynx/icon.4bpp" - - .align 2 -gMonFootprint_Jynx:: @ 8D85680 - .incbin "graphics/pokemon/jynx/footprint.1bpp" - - .align 2 -gMonFrontPic_Electabuzz:: @ 8D856A0 - .incbin "graphics/pokemon/electabuzz/front.4bpp.lz" - - .align 2 -gMonPalette_Electabuzz:: @ 8D85AF8 - .incbin "graphics/pokemon/electabuzz/normal.gbapal.lz" - - .align 2 -gMonBackPic_Electabuzz:: @ 8D85B20 - .incbin "graphics/pokemon/electabuzz/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Electabuzz:: @ 8D85E30 - .incbin "graphics/pokemon/electabuzz/shiny.gbapal.lz" - - .align 2 -gMonIcon_Electabuzz:: @ 8D85E58 - .incbin "graphics/pokemon/electabuzz/icon.4bpp" - - .align 2 -gMonFootprint_Electabuzz:: @ 8D86258 - .incbin "graphics/pokemon/electabuzz/footprint.1bpp" - - .align 2 -gMonFrontPic_Magmar:: @ 8D86278 - .incbin "graphics/pokemon/magmar/front.4bpp.lz" - - .align 2 -gMonPalette_Magmar:: @ 8D866A8 - .incbin "graphics/pokemon/magmar/normal.gbapal.lz" - - .align 2 -gMonBackPic_Magmar:: @ 8D866D0 - .incbin "graphics/pokemon/magmar/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Magmar:: @ 8D86A08 - .incbin "graphics/pokemon/magmar/shiny.gbapal.lz" - - .align 2 -gMonIcon_Magmar:: @ 8D86A30 - .incbin "graphics/pokemon/magmar/icon.4bpp" - - .align 2 -gMonFootprint_Magmar:: @ 8D86E30 - .incbin "graphics/pokemon/magmar/footprint.1bpp" - - .align 2 -gMonFrontPic_Pinsir:: @ 8D86E50 - .incbin "graphics/pokemon/pinsir/front.4bpp.lz" - - .align 2 -gMonPalette_Pinsir:: @ 8D87280 - .incbin "graphics/pokemon/pinsir/normal.gbapal.lz" - - .align 2 -gMonBackPic_Pinsir:: @ 8D872A4 - .incbin "graphics/pokemon/pinsir/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Pinsir:: @ 8D875F8 - .incbin "graphics/pokemon/pinsir/shiny.gbapal.lz" - - .align 2 -gMonIcon_Pinsir:: @ 8D8761C - .incbin "graphics/pokemon/pinsir/icon.4bpp" - - .align 2 -gMonFootprint_Pinsir:: @ 8D87A1C - .incbin "graphics/pokemon/pinsir/footprint.1bpp" - - .align 2 -gMonFrontPic_Tauros:: @ 8D87A3C - .incbin "graphics/pokemon/tauros/front.4bpp.lz" - - .align 2 -gMonPalette_Tauros:: @ 8D87E9C - .incbin "graphics/pokemon/tauros/normal.gbapal.lz" - - .align 2 -gMonBackPic_Tauros:: @ 8D87EC4 - .incbin "graphics/pokemon/tauros/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Tauros:: @ 8D88178 - .incbin "graphics/pokemon/tauros/shiny.gbapal.lz" - - .align 2 -gMonIcon_Tauros:: @ 8D881A0 - .incbin "graphics/pokemon/tauros/icon.4bpp" - - .align 2 -gMonFootprint_Tauros:: @ 8D885A0 - .incbin "graphics/pokemon/tauros/footprint.1bpp" - - .align 2 -gMonFrontPic_Magikarp:: @ 8D885C0 - .incbin "graphics/pokemon/magikarp/front.4bpp.lz" - - .align 2 -gMonPalette_Magikarp:: @ 8D88908 - .incbin "graphics/pokemon/magikarp/normal.gbapal.lz" - - .align 2 -gMonBackPic_Magikarp:: @ 8D88930 - .incbin "graphics/pokemon/magikarp/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Magikarp:: @ 8D88C60 - .incbin "graphics/pokemon/magikarp/shiny.gbapal.lz" - - .align 2 -gMonIcon_Magikarp:: @ 8D88C88 - .incbin "graphics/pokemon/magikarp/icon.4bpp" - - .align 2 -gMonFootprint_Magikarp:: @ 8D89088 - .incbin "graphics/pokemon/magikarp/footprint.1bpp" - - .align 2 -gMonFrontPic_Gyarados:: @ 8D890A8 - .incbin "graphics/pokemon/gyarados/front.4bpp.lz" - - .align 2 -gMonPalette_Gyarados:: @ 8D8964C - .incbin "graphics/pokemon/gyarados/normal.gbapal.lz" - - .align 2 -gMonBackPic_Gyarados:: @ 8D89674 - .incbin "graphics/pokemon/gyarados/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Gyarados:: @ 8D89B2C - .incbin "graphics/pokemon/gyarados/shiny.gbapal.lz" - - .align 2 -gMonIcon_Gyarados:: @ 8D89B54 - .incbin "graphics/pokemon/gyarados/icon.4bpp" - - .align 2 -gMonFootprint_Gyarados:: @ 8D89F54 - .incbin "graphics/pokemon/gyarados/footprint.1bpp" - - .align 2 -gMonFrontPic_Lapras:: @ 8D89F74 - .incbin "graphics/pokemon/lapras/front.4bpp.lz" - - .align 2 -gMonPalette_Lapras:: @ 8D8A354 - .incbin "graphics/pokemon/lapras/normal.gbapal.lz" - - .align 2 -gMonBackPic_Lapras:: @ 8D8A37C - .incbin "graphics/pokemon/lapras/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Lapras:: @ 8D8A6C0 - .incbin "graphics/pokemon/lapras/shiny.gbapal.lz" - - .align 2 -gMonIcon_Lapras:: @ 8D8A6E8 - .incbin "graphics/pokemon/lapras/icon.4bpp" - - .align 2 -gMonFootprint_Lapras:: @ 8D8AAE8 - .incbin "graphics/pokemon/lapras/footprint.1bpp" - - .align 2 -gMonFrontPic_Ditto:: @ 8D8AB08 - .incbin "graphics/pokemon/ditto/front.4bpp.lz" - - .align 2 -gMonPalette_Ditto:: @ 8D8ACF8 - .incbin "graphics/pokemon/ditto/normal.gbapal.lz" - - .align 2 -gMonBackPic_Ditto:: @ 8D8AD18 - .incbin "graphics/pokemon/ditto/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Ditto:: @ 8D8AF18 - .incbin "graphics/pokemon/ditto/shiny.gbapal.lz" - - .align 2 -gMonIcon_Ditto:: @ 8D8AF38 - .incbin "graphics/pokemon/ditto/icon.4bpp" - - .align 2 -gMonFootprint_Ditto:: @ 8D8B338 - .incbin "graphics/pokemon/ditto/footprint.1bpp" - - .align 2 -gMonFrontPic_Eevee:: @ 8D8B358 - .incbin "graphics/pokemon/eevee/front.4bpp.lz" - - .align 2 -gMonPalette_Eevee:: @ 8D8B644 - .incbin "graphics/pokemon/eevee/normal.gbapal.lz" - - .align 2 -gMonBackPic_Eevee:: @ 8D8B66C - .incbin "graphics/pokemon/eevee/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Eevee:: @ 8D8B994 - .incbin "graphics/pokemon/eevee/shiny.gbapal.lz" - - .align 2 -gMonIcon_Eevee:: @ 8D8B9BC - .incbin "graphics/pokemon/eevee/icon.4bpp" - - .align 2 -gMonFootprint_Eevee:: @ 8D8BDBC - .incbin "graphics/pokemon/eevee/footprint.1bpp" - - .align 2 -gMonFrontPic_Vaporeon:: @ 8D8BDDC - .incbin "graphics/pokemon/vaporeon/front.4bpp.lz" - - .align 2 -gMonPalette_Vaporeon:: @ 8D8C170 - .incbin "graphics/pokemon/vaporeon/normal.gbapal.lz" - - .align 2 -gMonBackPic_Vaporeon:: @ 8D8C198 - .incbin "graphics/pokemon/vaporeon/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Vaporeon:: @ 8D8C460 - .incbin "graphics/pokemon/vaporeon/shiny.gbapal.lz" - - .align 2 -gMonIcon_Vaporeon:: @ 8D8C488 - .incbin "graphics/pokemon/vaporeon/icon.4bpp" - - .align 2 -gMonFootprint_Vaporeon:: @ 8D8C888 - .incbin "graphics/pokemon/vaporeon/footprint.1bpp" - - .align 2 -gMonFrontPic_Jolteon:: @ 8D8C8A8 - .incbin "graphics/pokemon/jolteon/front.4bpp.lz" - - .align 2 -gMonPalette_Jolteon:: @ 8D8CBF8 - .incbin "graphics/pokemon/jolteon/normal.gbapal.lz" - - .align 2 -gMonBackPic_Jolteon:: @ 8D8CC20 - .incbin "graphics/pokemon/jolteon/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Jolteon:: @ 8D8CFCC - .incbin "graphics/pokemon/jolteon/shiny.gbapal.lz" - - .align 2 -gMonIcon_Jolteon:: @ 8D8CFF4 - .incbin "graphics/pokemon/jolteon/icon.4bpp" - - .align 2 -gMonFootprint_Jolteon:: @ 8D8D3F4 - .incbin "graphics/pokemon/jolteon/footprint.1bpp" - - .align 2 -gMonFrontPic_Flareon:: @ 8D8D414 - .incbin "graphics/pokemon/flareon/front.4bpp.lz" - - .align 2 -gMonPalette_Flareon:: @ 8D8D798 - .incbin "graphics/pokemon/flareon/normal.gbapal.lz" - - .align 2 -gMonBackPic_Flareon:: @ 8D8D7C0 - .incbin "graphics/pokemon/flareon/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Flareon:: @ 8D8DB50 - .incbin "graphics/pokemon/flareon/shiny.gbapal.lz" - - .align 2 -gMonIcon_Flareon:: @ 8D8DB78 - .incbin "graphics/pokemon/flareon/icon.4bpp" - - .align 2 -gMonFootprint_Flareon:: @ 8D8DF78 - .incbin "graphics/pokemon/flareon/footprint.1bpp" - - .align 2 -gMonFrontPic_Porygon:: @ 8D8DF98 - .incbin "graphics/pokemon/porygon/front.4bpp.lz" - - .align 2 -gMonPalette_Porygon:: @ 8D8E250 - .incbin "graphics/pokemon/porygon/normal.gbapal.lz" - - .align 2 -gMonBackPic_Porygon:: @ 8D8E274 - .incbin "graphics/pokemon/porygon/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Porygon:: @ 8D8E52C - .incbin "graphics/pokemon/porygon/shiny.gbapal.lz" - - .align 2 -gMonIcon_Porygon:: @ 8D8E550 - .incbin "graphics/pokemon/porygon/icon.4bpp" - - .align 2 -gMonFootprint_Porygon:: @ 8D8E950 - .incbin "graphics/pokemon/porygon/footprint.1bpp" - - .align 2 -gMonFrontPic_Omanyte:: @ 8D8E970 - .incbin "graphics/pokemon/omanyte/front.4bpp.lz" - - .align 2 -gMonPalette_Omanyte:: @ 8D8EC00 - .incbin "graphics/pokemon/omanyte/normal.gbapal.lz" - - .align 2 -gMonBackPic_Omanyte:: @ 8D8EC28 - .incbin "graphics/pokemon/omanyte/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Omanyte:: @ 8D8EF74 - .incbin "graphics/pokemon/omanyte/shiny.gbapal.lz" - - .align 2 -gMonIcon_Omanyte:: @ 8D8EF9C - .incbin "graphics/pokemon/omanyte/icon.4bpp" - - .align 2 -gMonFootprint_Omanyte:: @ 8D8F39C - .incbin "graphics/pokemon/omanyte/footprint.1bpp" - - .align 2 -gMonFrontPic_Omastar:: @ 8D8F3BC - .incbin "graphics/pokemon/omastar/front.4bpp.lz" - - .align 2 -gMonPalette_Omastar:: @ 8D8F77C - .incbin "graphics/pokemon/omastar/normal.gbapal.lz" - - .align 2 -gMonBackPic_Omastar:: @ 8D8F7A4 - .incbin "graphics/pokemon/omastar/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Omastar:: @ 8D8FAE4 - .incbin "graphics/pokemon/omastar/shiny.gbapal.lz" - - .align 2 -gMonIcon_Omastar:: @ 8D8FB0C - .incbin "graphics/pokemon/omastar/icon.4bpp" - - .align 2 -gMonFootprint_Omastar:: @ 8D8FF0C - .incbin "graphics/pokemon/omastar/footprint.1bpp" - - .align 2 -gMonFrontPic_Kabuto:: @ 8D8FF2C - .incbin "graphics/pokemon/kabuto/front.4bpp.lz" - - .align 2 -gMonPalette_Kabuto:: @ 8D90154 - .incbin "graphics/pokemon/kabuto/normal.gbapal.lz" - - .align 2 -gMonBackPic_Kabuto:: @ 8D9017C - .incbin "graphics/pokemon/kabuto/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Kabuto:: @ 8D90414 - .incbin "graphics/pokemon/kabuto/shiny.gbapal.lz" - - .align 2 -gMonIcon_Kabuto:: @ 8D9043C - .incbin "graphics/pokemon/kabuto/icon.4bpp" - - .align 2 -gMonFootprint_Kabuto:: @ 8D9083C - .incbin "graphics/pokemon/kabuto/footprint.1bpp" - - .align 2 -gMonFrontPic_Kabutops:: @ 8D9085C - .incbin "graphics/pokemon/kabutops/front.4bpp.lz" - - .align 2 -gMonPalette_Kabutops:: @ 8D90C6C - .incbin "graphics/pokemon/kabutops/normal.gbapal.lz" - - .align 2 -gMonBackPic_Kabutops:: @ 8D90C90 - .incbin "graphics/pokemon/kabutops/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Kabutops:: @ 8D91034 - .incbin "graphics/pokemon/kabutops/shiny.gbapal.lz" - - .align 2 -gMonIcon_Kabutops:: @ 8D91058 - .incbin "graphics/pokemon/kabutops/icon.4bpp" - - .align 2 -gMonFootprint_Kabutops:: @ 8D91458 - .incbin "graphics/pokemon/kabutops/footprint.1bpp" - - .align 2 -gMonFrontPic_Aerodactyl:: @ 8D91478 - .incbin "graphics/pokemon/aerodactyl/front.4bpp.lz" - - .align 2 -gMonPalette_Aerodactyl:: @ 8D918C8 - .incbin "graphics/pokemon/aerodactyl/normal.gbapal.lz" - - .align 2 -gMonBackPic_Aerodactyl:: @ 8D918F0 - .incbin "graphics/pokemon/aerodactyl/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Aerodactyl:: @ 8D91BF4 - .incbin "graphics/pokemon/aerodactyl/shiny.gbapal.lz" - - .align 2 -gMonIcon_Aerodactyl:: @ 8D91C1C - .incbin "graphics/pokemon/aerodactyl/icon.4bpp" - - .align 2 -gMonFootprint_Aerodactyl:: @ 8D9201C - .incbin "graphics/pokemon/aerodactyl/footprint.1bpp" - - .align 2 -gMonFrontPic_Snorlax:: @ 8D9203C - .incbin "graphics/pokemon/snorlax/front.4bpp.lz" - - .align 2 -gMonPalette_Snorlax:: @ 8D92410 - .incbin "graphics/pokemon/snorlax/normal.gbapal.lz" - - .align 2 -gMonBackPic_Snorlax:: @ 8D92438 - .incbin "graphics/pokemon/snorlax/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Snorlax:: @ 8D92654 - .incbin "graphics/pokemon/snorlax/shiny.gbapal.lz" - - .align 2 -gMonIcon_Snorlax:: @ 8D9267C - .incbin "graphics/pokemon/snorlax/icon.4bpp" - - .align 2 -gMonFootprint_Snorlax:: @ 8D92A7C - .incbin "graphics/pokemon/snorlax/footprint.1bpp" - - .align 2 -gMonFrontPic_Articuno:: @ 8D92A9C - .incbin "graphics/pokemon/articuno/front.4bpp.lz" - - .align 2 -gMonPalette_Articuno:: @ 8D92F94 - .incbin "graphics/pokemon/articuno/normal.gbapal.lz" - - .align 2 -gMonBackPic_Articuno:: @ 8D92FBC - .incbin "graphics/pokemon/articuno/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Articuno:: @ 8D93218 - .incbin "graphics/pokemon/articuno/shiny.gbapal.lz" - - .align 2 -gMonIcon_Articuno:: @ 8D93240 - .incbin "graphics/pokemon/articuno/icon.4bpp" - - .align 2 -gMonFootprint_Articuno:: @ 8D93640 - .incbin "graphics/pokemon/articuno/footprint.1bpp" - - .align 2 -gMonFrontPic_Zapdos:: @ 8D93660 - .incbin "graphics/pokemon/zapdos/front.4bpp.lz" - - .align 2 -gMonPalette_Zapdos:: @ 8D93AB0 - .incbin "graphics/pokemon/zapdos/normal.gbapal.lz" - - .align 2 -gMonBackPic_Zapdos:: @ 8D93AD8 - .incbin "graphics/pokemon/zapdos/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Zapdos:: @ 8D93E14 - .incbin "graphics/pokemon/zapdos/shiny.gbapal.lz" - - .align 2 -gMonIcon_Zapdos:: @ 8D93E3C - .incbin "graphics/pokemon/zapdos/icon.4bpp" - - .align 2 -gMonFootprint_Zapdos:: @ 8D9423C - .incbin "graphics/pokemon/zapdos/footprint.1bpp" - - .align 2 -gMonFrontPic_Moltres:: @ 8D9425C - .incbin "graphics/pokemon/moltres/front.4bpp.lz" - - .align 2 -gMonPalette_Moltres:: @ 8D94728 - .incbin "graphics/pokemon/moltres/normal.gbapal.lz" - - .align 2 -gMonBackPic_Moltres:: @ 8D94750 - .incbin "graphics/pokemon/moltres/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Moltres:: @ 8D94A8C - .incbin "graphics/pokemon/moltres/shiny.gbapal.lz" - - .align 2 -gMonIcon_Moltres:: @ 8D94AB4 - .incbin "graphics/pokemon/moltres/icon.4bpp" - - .align 2 -gMonFootprint_Moltres:: @ 8D94EB4 - .incbin "graphics/pokemon/moltres/footprint.1bpp" - - .align 2 -gMonFrontPic_Dratini:: @ 8D94ED4 - .incbin "graphics/pokemon/dratini/front.4bpp.lz" - - .align 2 -gMonPalette_Dratini:: @ 8D95190 - .incbin "graphics/pokemon/dratini/normal.gbapal.lz" - - .align 2 -gMonBackPic_Dratini:: @ 8D951B4 - .incbin "graphics/pokemon/dratini/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Dratini:: @ 8D95444 - .incbin "graphics/pokemon/dratini/shiny.gbapal.lz" - - .align 2 -gMonIcon_Dratini:: @ 8D95468 - .incbin "graphics/pokemon/dratini/icon.4bpp" - - .align 2 -gMonFootprint_Dratini:: @ 8D95868 - .incbin "graphics/pokemon/dratini/footprint.1bpp" - - .align 2 -gMonFrontPic_Dragonair:: @ 8D95888 - .incbin "graphics/pokemon/dragonair/front.4bpp.lz" - - .align 2 -gMonPalette_Dragonair:: @ 8D95C20 - .incbin "graphics/pokemon/dragonair/normal.gbapal.lz" - - .align 2 -gMonBackPic_Dragonair:: @ 8D95C48 - .incbin "graphics/pokemon/dragonair/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Dragonair:: @ 8D95F58 - .incbin "graphics/pokemon/dragonair/shiny.gbapal.lz" - - .align 2 -gMonIcon_Dragonair:: @ 8D95F80 - .incbin "graphics/pokemon/dragonair/icon.4bpp" - - .align 2 -gMonFootprint_Dragonair:: @ 8D96380 - .incbin "graphics/pokemon/dragonair/footprint.1bpp" - - .align 2 -gMonFrontPic_Dragonite:: @ 8D963A0 - .incbin "graphics/pokemon/dragonite/front.4bpp.lz" - - .align 2 -gMonPalette_Dragonite:: @ 8D968F0 - .incbin "graphics/pokemon/dragonite/normal.gbapal.lz" - - .align 2 -gMonBackPic_Dragonite:: @ 8D96918 - .incbin "graphics/pokemon/dragonite/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Dragonite:: @ 8D96C10 - .incbin "graphics/pokemon/dragonite/shiny.gbapal.lz" - - .align 2 -gMonIcon_Dragonite:: @ 8D96C38 - .incbin "graphics/pokemon/dragonite/icon.4bpp" - - .align 2 -gMonFootprint_Dragonite:: @ 8D97038 - .incbin "graphics/pokemon/dragonite/footprint.1bpp" - - .align 2 -gMonFrontPic_Mewtwo:: @ 8D97058 - .incbin "graphics/pokemon/mewtwo/front.4bpp.lz" - - .align 2 -gMonPalette_Mewtwo:: @ 8D97494 - .incbin "graphics/pokemon/mewtwo/normal.gbapal.lz" - - .align 2 -gMonBackPic_Mewtwo:: @ 8D974B8 - .incbin "graphics/pokemon/mewtwo/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Mewtwo:: @ 8D97884 - .incbin "graphics/pokemon/mewtwo/shiny.gbapal.lz" - - .align 2 -gMonIcon_Mewtwo:: @ 8D978A8 - .incbin "graphics/pokemon/mewtwo/icon.4bpp" - - .align 2 -gMonFootprint_Mewtwo:: @ 8D97CA8 - .incbin "graphics/pokemon/mewtwo/footprint.1bpp" - - .align 2 -gMonFrontPic_Mew:: @ 8D97CC8 - .incbin "graphics/pokemon/mew/front.4bpp.lz" - - .align 2 -gMonPalette_Mew:: @ 8D97F88 - .incbin "graphics/pokemon/mew/normal.gbapal.lz" - - .align 2 -gMonBackPic_Mew:: @ 8D97FAC - .incbin "graphics/pokemon/mew/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Mew:: @ 8D982FC - .incbin "graphics/pokemon/mew/shiny.gbapal.lz" - - .align 2 -gMonIcon_Mew:: @ 8D98320 - .incbin "graphics/pokemon/mew/icon.4bpp" - - .align 2 -gMonFootprint_Mew:: @ 8D98720 - .incbin "graphics/pokemon/mew/footprint.1bpp" - - .align 2 -gMonFrontPic_Chikorita:: @ 8D98740 - .incbin "graphics/pokemon/chikorita/front.4bpp.lz" - - .align 2 -gMonPalette_Chikorita:: @ 8D989A8 - .incbin "graphics/pokemon/chikorita/normal.gbapal.lz" - - .align 2 -gMonBackPic_Chikorita:: @ 8D989D0 - .incbin "graphics/pokemon/chikorita/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Chikorita:: @ 8D98C94 - .incbin "graphics/pokemon/chikorita/shiny.gbapal.lz" - - .align 2 -gMonIcon_Chikorita:: @ 8D98CBC - .incbin "graphics/pokemon/chikorita/icon.4bpp" - - .align 2 -gMonFootprint_Chikorita:: @ 8D990BC - .incbin "graphics/pokemon/chikorita/footprint.1bpp" - - .align 2 -gMonFrontPic_Bayleef:: @ 8D990DC - .incbin "graphics/pokemon/bayleef/front.4bpp.lz" - - .align 2 -gMonPalette_Bayleef:: @ 8D994B0 - .incbin "graphics/pokemon/bayleef/normal.gbapal.lz" - - .align 2 -gMonBackPic_Bayleef:: @ 8D994D8 - .incbin "graphics/pokemon/bayleef/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Bayleef:: @ 8D99868 - .incbin "graphics/pokemon/bayleef/shiny.gbapal.lz" - - .align 2 -gMonIcon_Bayleef:: @ 8D99890 - .incbin "graphics/pokemon/bayleef/icon.4bpp" - - .align 2 -gMonFootprint_Bayleef:: @ 8D99C90 - .incbin "graphics/pokemon/bayleef/footprint.1bpp" - - .align 2 -gMonFrontPic_Meganium:: @ 8D99CB0 - .incbin "graphics/pokemon/meganium/front.4bpp.lz" - - .align 2 -gMonPalette_Meganium:: @ 8D9A20C - .incbin "graphics/pokemon/meganium/normal.gbapal.lz" - - .align 2 -gMonBackPic_Meganium:: @ 8D9A234 - .incbin "graphics/pokemon/meganium/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Meganium:: @ 8D9A584 - .incbin "graphics/pokemon/meganium/shiny.gbapal.lz" - - .align 2 -gMonIcon_Meganium:: @ 8D9A5AC - .incbin "graphics/pokemon/meganium/icon.4bpp" - - .align 2 -gMonFootprint_Meganium:: @ 8D9A9AC - .incbin "graphics/pokemon/meganium/footprint.1bpp" - - .align 2 -gMonFrontPic_Cyndaquil:: @ 8D9A9CC - .incbin "graphics/pokemon/cyndaquil/front.4bpp.lz" - - .align 2 -gMonPalette_Cyndaquil:: @ 8D9AC58 - .incbin "graphics/pokemon/cyndaquil/normal.gbapal.lz" - - .align 2 -gMonBackPic_Cyndaquil:: @ 8D9AC80 - .incbin "graphics/pokemon/cyndaquil/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Cyndaquil:: @ 8D9AFAC - .incbin "graphics/pokemon/cyndaquil/shiny.gbapal.lz" - - .align 2 -gMonIcon_Cyndaquil:: @ 8D9AFD4 - .incbin "graphics/pokemon/cyndaquil/icon.4bpp" - - .align 2 -gMonFootprint_Cyndaquil:: @ 8D9B3D4 - .incbin "graphics/pokemon/cyndaquil/footprint.1bpp" - - .align 2 -gMonFrontPic_Quilava:: @ 8D9B3F4 - .incbin "graphics/pokemon/quilava/front.4bpp.lz" - - .align 2 -gMonPalette_Quilava:: @ 8D9B710 - .incbin "graphics/pokemon/quilava/normal.gbapal.lz" - - .align 2 -gMonBackPic_Quilava:: @ 8D9B738 - .incbin "graphics/pokemon/quilava/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Quilava:: @ 8D9BAAC - .incbin "graphics/pokemon/quilava/shiny.gbapal.lz" - - .align 2 -gMonIcon_Quilava:: @ 8D9BAD4 - .incbin "graphics/pokemon/quilava/icon.4bpp" - - .align 2 -gMonFootprint_Quilava:: @ 8D9BED4 - .incbin "graphics/pokemon/quilava/footprint.1bpp" - - .align 2 -gMonFrontPic_Typhlosion:: @ 8D9BEF4 - .incbin "graphics/pokemon/typhlosion/front.4bpp.lz" - - .align 2 -gMonPalette_Typhlosion:: @ 8D9C31C - .incbin "graphics/pokemon/typhlosion/normal.gbapal.lz" - - .align 2 -gMonBackPic_Typhlosion:: @ 8D9C344 - .incbin "graphics/pokemon/typhlosion/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Typhlosion:: @ 8D9C748 - .incbin "graphics/pokemon/typhlosion/shiny.gbapal.lz" - - .align 2 -gMonIcon_Typhlosion:: @ 8D9C770 - .incbin "graphics/pokemon/typhlosion/icon.4bpp" - - .align 2 -gMonFootprint_Typhlosion:: @ 8D9CB70 - .incbin "graphics/pokemon/typhlosion/footprint.1bpp" - - .align 2 -gMonFrontPic_Totodile:: @ 8D9CB90 - .incbin "graphics/pokemon/totodile/front.4bpp.lz" - - .align 2 -gMonPalette_Totodile:: @ 8D9CE34 - .incbin "graphics/pokemon/totodile/normal.gbapal.lz" - - .align 2 -gMonBackPic_Totodile:: @ 8D9CE5C - .incbin "graphics/pokemon/totodile/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Totodile:: @ 8D9D13C - .incbin "graphics/pokemon/totodile/shiny.gbapal.lz" - - .align 2 -gMonIcon_Totodile:: @ 8D9D164 - .incbin "graphics/pokemon/totodile/icon.4bpp" - - .align 2 -gMonFootprint_Totodile:: @ 8D9D564 - .incbin "graphics/pokemon/totodile/footprint.1bpp" - - .align 2 -gMonFrontPic_Croconaw:: @ 8D9D584 - .incbin "graphics/pokemon/croconaw/front.4bpp.lz" - - .align 2 -gMonPalette_Croconaw:: @ 8D9D8EC - .incbin "graphics/pokemon/croconaw/normal.gbapal.lz" - - .align 2 -gMonBackPic_Croconaw:: @ 8D9D914 - .incbin "graphics/pokemon/croconaw/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Croconaw:: @ 8D9DC64 - .incbin "graphics/pokemon/croconaw/shiny.gbapal.lz" - - .align 2 -gMonIcon_Croconaw:: @ 8D9DC8C - .incbin "graphics/pokemon/croconaw/icon.4bpp" - - .align 2 -gMonFootprint_Croconaw:: @ 8D9E08C - .incbin "graphics/pokemon/croconaw/footprint.1bpp" - - .align 2 -gMonFrontPic_Feraligatr:: @ 8D9E0AC - .incbin "graphics/pokemon/feraligatr/front.4bpp.lz" - - .align 2 -gMonPalette_Feraligatr:: @ 8D9E618 - .incbin "graphics/pokemon/feraligatr/normal.gbapal.lz" - - .align 2 -gMonBackPic_Feraligatr:: @ 8D9E640 - .incbin "graphics/pokemon/feraligatr/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Feraligatr:: @ 8D9EB0C - .incbin "graphics/pokemon/feraligatr/shiny.gbapal.lz" - - .align 2 -gMonIcon_Feraligatr:: @ 8D9EB34 - .incbin "graphics/pokemon/feraligatr/icon.4bpp" - - .align 2 -gMonFootprint_Feraligatr:: @ 8D9EF34 - .incbin "graphics/pokemon/feraligatr/footprint.1bpp" - - .align 2 -gMonFrontPic_Sentret:: @ 8D9EF54 - .incbin "graphics/pokemon/sentret/front.4bpp.lz" - - .align 2 -gMonPalette_Sentret:: @ 8D9F230 - .incbin "graphics/pokemon/sentret/normal.gbapal.lz" - - .align 2 -gMonBackPic_Sentret:: @ 8D9F258 - .incbin "graphics/pokemon/sentret/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Sentret:: @ 8D9F4FC - .incbin "graphics/pokemon/sentret/shiny.gbapal.lz" - - .align 2 -gMonIcon_Sentret:: @ 8D9F524 - .incbin "graphics/pokemon/sentret/icon.4bpp" - - .align 2 -gMonFootprint_Sentret:: @ 8D9F924 - .incbin "graphics/pokemon/sentret/footprint.1bpp" - - .align 2 -gMonFrontPic_Furret:: @ 8D9F944 - .incbin "graphics/pokemon/furret/front.4bpp.lz" - - .align 2 -gMonPalette_Furret:: @ 8D9FC78 - .incbin "graphics/pokemon/furret/normal.gbapal.lz" - - .align 2 -gMonBackPic_Furret:: @ 8D9FCA0 - .incbin "graphics/pokemon/furret/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Furret:: @ 8D9FFC8 - .incbin "graphics/pokemon/furret/shiny.gbapal.lz" - - .align 2 -gMonIcon_Furret:: @ 8D9FFF0 - .incbin "graphics/pokemon/furret/icon.4bpp" - - .align 2 -gMonFootprint_Furret:: @ 8DA03F0 - .incbin "graphics/pokemon/furret/footprint.1bpp" - - .align 2 -gMonFrontPic_Hoothoot:: @ 8DA0410 - .incbin "graphics/pokemon/hoothoot/front.4bpp.lz" - - .align 2 -gMonPalette_Hoothoot:: @ 8DA0694 - .incbin "graphics/pokemon/hoothoot/normal.gbapal.lz" - - .align 2 -gMonBackPic_Hoothoot:: @ 8DA06BC - .incbin "graphics/pokemon/hoothoot/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Hoothoot:: @ 8DA09C4 - .incbin "graphics/pokemon/hoothoot/shiny.gbapal.lz" - - .align 2 -gMonIcon_Hoothoot:: @ 8DA09EC - .incbin "graphics/pokemon/hoothoot/icon.4bpp" - - .align 2 -gMonFootprint_Hoothoot:: @ 8DA0DEC - .incbin "graphics/pokemon/hoothoot/footprint.1bpp" - - .align 2 -gMonFrontPic_Noctowl:: @ 8DA0E0C - .incbin "graphics/pokemon/noctowl/front.4bpp.lz" - - .align 2 -gMonPalette_Noctowl:: @ 8DA1160 - .incbin "graphics/pokemon/noctowl/normal.gbapal.lz" - - .align 2 -gMonBackPic_Noctowl:: @ 8DA1188 - .incbin "graphics/pokemon/noctowl/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Noctowl:: @ 8DA14E4 - .incbin "graphics/pokemon/noctowl/shiny.gbapal.lz" - - .align 2 -gMonIcon_Noctowl:: @ 8DA150C - .incbin "graphics/pokemon/noctowl/icon.4bpp" - - .align 2 -gMonFootprint_Noctowl:: @ 8DA190C - .incbin "graphics/pokemon/noctowl/footprint.1bpp" - - .align 2 -gMonFrontPic_Ledyba:: @ 8DA192C - .incbin "graphics/pokemon/ledyba/front.4bpp.lz" - - .align 2 -gMonPalette_Ledyba:: @ 8DA1C20 - .incbin "graphics/pokemon/ledyba/normal.gbapal.lz" - - .align 2 -gMonBackPic_Ledyba:: @ 8DA1C48 - .incbin "graphics/pokemon/ledyba/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Ledyba:: @ 8DA1F78 - .incbin "graphics/pokemon/ledyba/shiny.gbapal.lz" - - .align 2 -gMonIcon_Ledyba:: @ 8DA1FA0 - .incbin "graphics/pokemon/ledyba/icon.4bpp" - - .align 2 -gMonFootprint_Ledyba:: @ 8DA23A0 - .incbin "graphics/pokemon/ledyba/footprint.1bpp" - - .align 2 -gMonFrontPic_Ledian:: @ 8DA23C0 - .incbin "graphics/pokemon/ledian/front.4bpp.lz" - - .align 2 -gMonPalette_Ledian:: @ 8DA2748 - .incbin "graphics/pokemon/ledian/normal.gbapal.lz" - - .align 2 -gMonBackPic_Ledian:: @ 8DA2770 - .incbin "graphics/pokemon/ledian/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Ledian:: @ 8DA2AC8 - .incbin "graphics/pokemon/ledian/shiny.gbapal.lz" - - .align 2 -gMonIcon_Ledian:: @ 8DA2AF0 - .incbin "graphics/pokemon/ledian/icon.4bpp" - - .align 2 -gMonFootprint_Ledian:: @ 8DA2EF0 - .incbin "graphics/pokemon/ledian/footprint.1bpp" - - .align 2 -gMonFrontPic_Spinarak:: @ 8DA2F10 - .incbin "graphics/pokemon/spinarak/front.4bpp.lz" - - .align 2 -gMonPalette_Spinarak:: @ 8DA3184 - .incbin "graphics/pokemon/spinarak/normal.gbapal.lz" - - .align 2 -gMonBackPic_Spinarak:: @ 8DA31AC - .incbin "graphics/pokemon/spinarak/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Spinarak:: @ 8DA3410 - .incbin "graphics/pokemon/spinarak/shiny.gbapal.lz" - - .align 2 -gMonIcon_Spinarak:: @ 8DA3438 - .incbin "graphics/pokemon/spinarak/icon.4bpp" - - .align 2 -gMonFootprint_Spinarak:: @ 8DA3838 - .incbin "graphics/pokemon/spinarak/footprint.1bpp" - - .align 2 -gMonFrontPic_Ariados:: @ 8DA3858 - .incbin "graphics/pokemon/ariados/front.4bpp.lz" - - .align 2 -gMonPalette_Ariados:: @ 8DA3C18 - .incbin "graphics/pokemon/ariados/normal.gbapal.lz" - - .align 2 -gMonBackPic_Ariados:: @ 8DA3C40 - .incbin "graphics/pokemon/ariados/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Ariados:: @ 8DA3FB8 - .incbin "graphics/pokemon/ariados/shiny.gbapal.lz" - - .align 2 -gMonIcon_Ariados:: @ 8DA3FE0 - .incbin "graphics/pokemon/ariados/icon.4bpp" - - .align 2 -gMonFootprint_Ariados:: @ 8DA43E0 - .incbin "graphics/pokemon/ariados/footprint.1bpp" - - .align 2 -gMonFrontPic_Crobat:: @ 8DA4400 - .incbin "graphics/pokemon/crobat/front.4bpp.lz" - - .align 2 -gMonPalette_Crobat:: @ 8DA47B0 - .incbin "graphics/pokemon/crobat/normal.gbapal.lz" - - .align 2 -gMonBackPic_Crobat:: @ 8DA47D8 - .incbin "graphics/pokemon/crobat/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Crobat:: @ 8DA4AE0 - .incbin "graphics/pokemon/crobat/shiny.gbapal.lz" - - .align 2 -gMonIcon_Crobat:: @ 8DA4B08 - .incbin "graphics/pokemon/crobat/icon.4bpp" - - .align 2 -gMonFootprint_Crobat:: @ 8DA4F08 - .incbin "graphics/pokemon/crobat/footprint.1bpp" - - .align 2 -gMonFrontPic_Chinchou:: @ 8DA4F28 - .incbin "graphics/pokemon/chinchou/front.4bpp.lz" - - .align 2 -gMonPalette_Chinchou:: @ 8DA5200 - .incbin "graphics/pokemon/chinchou/normal.gbapal.lz" - - .align 2 -gMonBackPic_Chinchou:: @ 8DA5228 - .incbin "graphics/pokemon/chinchou/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Chinchou:: @ 8DA5520 - .incbin "graphics/pokemon/chinchou/shiny.gbapal.lz" - - .align 2 -gMonIcon_Chinchou:: @ 8DA5548 - .incbin "graphics/pokemon/chinchou/icon.4bpp" - - .align 2 -gMonFootprint_Chinchou:: @ 8DA5948 - .incbin "graphics/pokemon/chinchou/footprint.1bpp" - - .align 2 -gMonFrontPic_Lanturn:: @ 8DA5968 - .incbin "graphics/pokemon/lanturn/front.4bpp.lz" - - .align 2 -gMonPalette_Lanturn:: @ 8DA5CD8 - .incbin "graphics/pokemon/lanturn/normal.gbapal.lz" - - .align 2 -gMonBackPic_Lanturn:: @ 8DA5D00 - .incbin "graphics/pokemon/lanturn/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Lanturn:: @ 8DA6000 - .incbin "graphics/pokemon/lanturn/shiny.gbapal.lz" - - .align 2 -gMonIcon_Lanturn:: @ 8DA6028 - .incbin "graphics/pokemon/lanturn/icon.4bpp" - - .align 2 -gMonFootprint_Lanturn:: @ 8DA6428 - .incbin "graphics/pokemon/lanturn/footprint.1bpp" - - .align 2 -gMonFrontPic_Pichu:: @ 8DA6448 - .incbin "graphics/pokemon/pichu/front.4bpp.lz" - - .align 2 -gMonPalette_Pichu:: @ 8DA6664 - .incbin "graphics/pokemon/pichu/normal.gbapal.lz" - - .align 2 -gMonBackPic_Pichu:: @ 8DA668C - .incbin "graphics/pokemon/pichu/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Pichu:: @ 8DA68E8 - .incbin "graphics/pokemon/pichu/shiny.gbapal.lz" - - .align 2 -gMonIcon_Pichu:: @ 8DA6910 - .incbin "graphics/pokemon/pichu/icon.4bpp" - - .align 2 -gMonFootprint_Pichu:: @ 8DA6D10 - .incbin "graphics/pokemon/pichu/footprint.1bpp" - - .align 2 -gMonFrontPic_Cleffa:: @ 8DA6D30 - .incbin "graphics/pokemon/cleffa/front.4bpp.lz" - - .align 2 -gMonPalette_Cleffa:: @ 8DA6F10 - .incbin "graphics/pokemon/cleffa/normal.gbapal.lz" - - .align 2 -gMonBackPic_Cleffa:: @ 8DA6F38 - .incbin "graphics/pokemon/cleffa/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Cleffa:: @ 8DA7174 - .incbin "graphics/pokemon/cleffa/shiny.gbapal.lz" - - .align 2 -gMonIcon_Cleffa:: @ 8DA719C - .incbin "graphics/pokemon/cleffa/icon.4bpp" - - .align 2 -gMonFootprint_Cleffa:: @ 8DA759C - .incbin "graphics/pokemon/cleffa/footprint.1bpp" - - .align 2 -gMonFrontPic_Igglybuff:: @ 8DA75BC - .incbin "graphics/pokemon/igglybuff/front.4bpp.lz" - - .align 2 -gMonPalette_Igglybuff:: @ 8DA77A4 - .incbin "graphics/pokemon/igglybuff/normal.gbapal.lz" - - .align 2 -gMonBackPic_Igglybuff:: @ 8DA77CC - .incbin "graphics/pokemon/igglybuff/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Igglybuff:: @ 8DA7A08 - .incbin "graphics/pokemon/igglybuff/shiny.gbapal.lz" - - .align 2 -gMonIcon_Igglybuff:: @ 8DA7A30 - .incbin "graphics/pokemon/igglybuff/icon.4bpp" - - .align 2 -gMonFootprint_Igglybuff:: @ 8DA7E30 - .incbin "graphics/pokemon/igglybuff/footprint.1bpp" - - .align 2 -gMonFrontPic_Togepi:: @ 8DA7E50 - .incbin "graphics/pokemon/togepi/front.4bpp.lz" - - .align 2 -gMonPalette_Togepi:: @ 8DA8024 - .incbin "graphics/pokemon/togepi/normal.gbapal.lz" - - .align 2 -gMonBackPic_Togepi:: @ 8DA804C - .incbin "graphics/pokemon/togepi/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Togepi:: @ 8DA82C0 - .incbin "graphics/pokemon/togepi/shiny.gbapal.lz" - - .align 2 -gMonIcon_Togepi:: @ 8DA82E8 - .incbin "graphics/pokemon/togepi/icon.4bpp" - - .align 2 -gMonFootprint_Togepi:: @ 8DA86E8 - .incbin "graphics/pokemon/togepi/footprint.1bpp" - - .align 2 -gMonFrontPic_Togetic:: @ 8DA8708 - .incbin "graphics/pokemon/togetic/front.4bpp.lz" - - .align 2 -gMonPalette_Togetic:: @ 8DA897C - .incbin "graphics/pokemon/togetic/normal.gbapal.lz" - - .align 2 -gMonBackPic_Togetic:: @ 8DA89A4 - .incbin "graphics/pokemon/togetic/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Togetic:: @ 8DA8CD0 - .incbin "graphics/pokemon/togetic/shiny.gbapal.lz" - - .align 2 -gMonIcon_Togetic:: @ 8DA8CF8 - .incbin "graphics/pokemon/togetic/icon.4bpp" - - .align 2 -gMonFootprint_Togetic:: @ 8DA90F8 - .incbin "graphics/pokemon/togetic/footprint.1bpp" - - .align 2 -gMonFrontPic_Natu:: @ 8DA9118 - .incbin "graphics/pokemon/natu/front.4bpp.lz" - - .align 2 -gMonPalette_Natu:: @ 8DA92E4 - .incbin "graphics/pokemon/natu/normal.gbapal.lz" - - .align 2 -gMonBackPic_Natu:: @ 8DA930C - .incbin "graphics/pokemon/natu/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Natu:: @ 8DA9520 - .incbin "graphics/pokemon/natu/shiny.gbapal.lz" - - .align 2 -gMonIcon_Natu:: @ 8DA9548 - .incbin "graphics/pokemon/natu/icon.4bpp" - - .align 2 -gMonFootprint_Natu:: @ 8DA9948 - .incbin "graphics/pokemon/natu/footprint.1bpp" - - .align 2 -gMonFrontPic_Xatu:: @ 8DA9968 - .incbin "graphics/pokemon/xatu/front.4bpp.lz" - - .align 2 -gMonPalette_Xatu:: @ 8DA9C44 - .incbin "graphics/pokemon/xatu/normal.gbapal.lz" - - .align 2 -gMonBackPic_Xatu:: @ 8DA9C6C - .incbin "graphics/pokemon/xatu/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Xatu:: @ 8DA9FE4 - .incbin "graphics/pokemon/xatu/shiny.gbapal.lz" - - .align 2 -gMonIcon_Xatu:: @ 8DAA00C - .incbin "graphics/pokemon/xatu/icon.4bpp" - - .align 2 -gMonFootprint_Xatu:: @ 8DAA40C - .incbin "graphics/pokemon/xatu/footprint.1bpp" - - .align 2 -gMonFrontPic_Mareep:: @ 8DAA42C - .incbin "graphics/pokemon/mareep/front.4bpp.lz" - - .align 2 -gMonPalette_Mareep:: @ 8DAA6E0 - .incbin "graphics/pokemon/mareep/normal.gbapal.lz" - - .align 2 -gMonBackPic_Mareep:: @ 8DAA708 - .incbin "graphics/pokemon/mareep/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Mareep:: @ 8DAA9FC - .incbin "graphics/pokemon/mareep/shiny.gbapal.lz" - - .align 2 -gMonIcon_Mareep:: @ 8DAAA24 - .incbin "graphics/pokemon/mareep/icon.4bpp" - - .align 2 -gMonFootprint_Mareep:: @ 8DAAE24 - .incbin "graphics/pokemon/mareep/footprint.1bpp" - - .align 2 -gMonFrontPic_Flaaffy:: @ 8DAAE44 - .incbin "graphics/pokemon/flaaffy/front.4bpp.lz" - - .align 2 -gMonPalette_Flaaffy:: @ 8DAB144 - .incbin "graphics/pokemon/flaaffy/normal.gbapal.lz" - - .align 2 -gMonBackPic_Flaaffy:: @ 8DAB16C - .incbin "graphics/pokemon/flaaffy/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Flaaffy:: @ 8DAB488 - .incbin "graphics/pokemon/flaaffy/shiny.gbapal.lz" - - .align 2 -gMonIcon_Flaaffy:: @ 8DAB4B0 - .incbin "graphics/pokemon/flaaffy/icon.4bpp" - - .align 2 -gMonFootprint_Flaaffy:: @ 8DAB8B0 - .incbin "graphics/pokemon/flaaffy/footprint.1bpp" - - .align 2 -gMonFrontPic_Ampharos:: @ 8DAB8D0 - .incbin "graphics/pokemon/ampharos/front.4bpp.lz" - - .align 2 -gMonPalette_Ampharos:: @ 8DABC2C - .incbin "graphics/pokemon/ampharos/normal.gbapal.lz" - - .align 2 -gMonBackPic_Ampharos:: @ 8DABC54 - .incbin "graphics/pokemon/ampharos/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Ampharos:: @ 8DABFCC - .incbin "graphics/pokemon/ampharos/shiny.gbapal.lz" - - .align 2 -gMonIcon_Ampharos:: @ 8DABFF4 - .incbin "graphics/pokemon/ampharos/icon.4bpp" - - .align 2 -gMonFootprint_Ampharos:: @ 8DAC3F4 - .incbin "graphics/pokemon/ampharos/footprint.1bpp" - - .align 2 -gMonFrontPic_Bellossom:: @ 8DAC414 - .incbin "graphics/pokemon/bellossom/front.4bpp.lz" - - .align 2 -gMonPalette_Bellossom:: @ 8DAC684 - .incbin "graphics/pokemon/bellossom/normal.gbapal.lz" - - .align 2 -gMonBackPic_Bellossom:: @ 8DAC6AC - .incbin "graphics/pokemon/bellossom/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Bellossom:: @ 8DAC9D0 - .incbin "graphics/pokemon/bellossom/shiny.gbapal.lz" - - .align 2 -gMonIcon_Bellossom:: @ 8DAC9F8 - .incbin "graphics/pokemon/bellossom/icon.4bpp" - - .align 2 -gMonFootprint_Bellossom:: @ 8DACDF8 - .incbin "graphics/pokemon/bellossom/footprint.1bpp" - - .align 2 -gMonFrontPic_Marill:: @ 8DACE18 - .incbin "graphics/pokemon/marill/front.4bpp.lz" - - .align 2 -gMonPalette_Marill:: @ 8DAD0DC - .incbin "graphics/pokemon/marill/normal.gbapal.lz" - - .align 2 -gMonBackPic_Marill:: @ 8DAD104 - .incbin "graphics/pokemon/marill/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Marill:: @ 8DAD3B0 - .incbin "graphics/pokemon/marill/shiny.gbapal.lz" - - .align 2 -gMonIcon_Marill:: @ 8DAD3D8 - .incbin "graphics/pokemon/marill/icon.4bpp" - - .align 2 -gMonFootprint_Marill:: @ 8DAD7D8 - .incbin "graphics/pokemon/marill/footprint.1bpp" - - .align 2 -gMonFrontPic_Azumarill:: @ 8DAD7F8 - .incbin "graphics/pokemon/azumarill/front.4bpp.lz" - - .align 2 -gMonPalette_Azumarill:: @ 8DADAF8 - .incbin "graphics/pokemon/azumarill/normal.gbapal.lz" - - .align 2 -gMonBackPic_Azumarill:: @ 8DADB20 - .incbin "graphics/pokemon/azumarill/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Azumarill:: @ 8DADDDC - .incbin "graphics/pokemon/azumarill/shiny.gbapal.lz" - - .align 2 -gMonIcon_Azumarill:: @ 8DADE04 - .incbin "graphics/pokemon/azumarill/icon.4bpp" - - .align 2 -gMonFootprint_Azumarill:: @ 8DAE204 - .incbin "graphics/pokemon/azumarill/footprint.1bpp" - - .align 2 -gMonFrontPic_Sudowoodo:: @ 8DAE224 - .incbin "graphics/pokemon/sudowoodo/front.4bpp.lz" - - .align 2 -gMonPalette_Sudowoodo:: @ 8DAE53C - .incbin "graphics/pokemon/sudowoodo/normal.gbapal.lz" - - .align 2 -gMonBackPic_Sudowoodo:: @ 8DAE564 - .incbin "graphics/pokemon/sudowoodo/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Sudowoodo:: @ 8DAE8C0 - .incbin "graphics/pokemon/sudowoodo/shiny.gbapal.lz" - - .align 2 -gMonIcon_Sudowoodo:: @ 8DAE8E8 - .incbin "graphics/pokemon/sudowoodo/icon.4bpp" - - .align 2 -gMonFootprint_Sudowoodo:: @ 8DAECE8 - .incbin "graphics/pokemon/sudowoodo/footprint.1bpp" - - .align 2 -gMonFrontPic_Politoed:: @ 8DAED08 - .incbin "graphics/pokemon/politoed/front.4bpp.lz" - - .align 2 -gMonPalette_Politoed:: @ 8DAF044 - .incbin "graphics/pokemon/politoed/normal.gbapal.lz" - - .align 2 -gMonBackPic_Politoed:: @ 8DAF06C - .incbin "graphics/pokemon/politoed/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Politoed:: @ 8DAF328 - .incbin "graphics/pokemon/politoed/shiny.gbapal.lz" - - .align 2 -gMonIcon_Politoed:: @ 8DAF350 - .incbin "graphics/pokemon/politoed/icon.4bpp" - - .align 2 -gMonFootprint_Politoed:: @ 8DAF750 - .incbin "graphics/pokemon/politoed/footprint.1bpp" - - .align 2 -gMonFrontPic_Hoppip:: @ 8DAF770 - .incbin "graphics/pokemon/hoppip/front.4bpp.lz" - - .align 2 -gMonPalette_Hoppip:: @ 8DAFA24 - .incbin "graphics/pokemon/hoppip/normal.gbapal.lz" - - .align 2 -gMonBackPic_Hoppip:: @ 8DAFA4C - .incbin "graphics/pokemon/hoppip/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Hoppip:: @ 8DAFD2C - .incbin "graphics/pokemon/hoppip/shiny.gbapal.lz" - - .align 2 -gMonIcon_Hoppip:: @ 8DAFD54 - .incbin "graphics/pokemon/hoppip/icon.4bpp" - - .align 2 -gMonFootprint_Hoppip:: @ 8DB0154 - .incbin "graphics/pokemon/hoppip/footprint.1bpp" - - .align 2 -gMonFrontPic_Skiploom:: @ 8DB0174 - .incbin "graphics/pokemon/skiploom/front.4bpp.lz" - - .align 2 -gMonPalette_Skiploom:: @ 8DB03FC - .incbin "graphics/pokemon/skiploom/normal.gbapal.lz" - - .align 2 -gMonBackPic_Skiploom:: @ 8DB0424 - .incbin "graphics/pokemon/skiploom/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Skiploom:: @ 8DB0704 - .incbin "graphics/pokemon/skiploom/shiny.gbapal.lz" - - .align 2 -gMonIcon_Skiploom:: @ 8DB072C - .incbin "graphics/pokemon/skiploom/icon.4bpp" - - .align 2 -gMonFootprint_Skiploom:: @ 8DB0B2C - .incbin "graphics/pokemon/skiploom/footprint.1bpp" - - .align 2 -gMonFrontPic_Jumpluff:: @ 8DB0B4C - .incbin "graphics/pokemon/jumpluff/front.4bpp.lz" - - .align 2 -gMonPalette_Jumpluff:: @ 8DB0EB8 - .incbin "graphics/pokemon/jumpluff/normal.gbapal.lz" - - .align 2 -gMonBackPic_Jumpluff:: @ 8DB0EE0 - .incbin "graphics/pokemon/jumpluff/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Jumpluff:: @ 8DB12D8 - .incbin "graphics/pokemon/jumpluff/shiny.gbapal.lz" - - .align 2 -gMonIcon_Jumpluff:: @ 8DB1300 - .incbin "graphics/pokemon/jumpluff/icon.4bpp" - - .align 2 -gMonFootprint_Jumpluff:: @ 8DB1700 - .incbin "graphics/pokemon/jumpluff/footprint.1bpp" - - .align 2 -gMonFrontPic_Aipom:: @ 8DB1720 - .incbin "graphics/pokemon/aipom/front.4bpp.lz" - - .align 2 -gMonPalette_Aipom:: @ 8DB1A1C - .incbin "graphics/pokemon/aipom/normal.gbapal.lz" - - .align 2 -gMonBackPic_Aipom:: @ 8DB1A44 - .incbin "graphics/pokemon/aipom/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Aipom:: @ 8DB1D38 - .incbin "graphics/pokemon/aipom/shiny.gbapal.lz" - - .align 2 -gMonIcon_Aipom:: @ 8DB1D60 - .incbin "graphics/pokemon/aipom/icon.4bpp" - - .align 2 -gMonFootprint_Aipom:: @ 8DB2160 - .incbin "graphics/pokemon/aipom/footprint.1bpp" - - .align 2 -gMonFrontPic_Sunkern:: @ 8DB2180 - .incbin "graphics/pokemon/sunkern/front.4bpp.lz" - - .align 2 -gMonPalette_Sunkern:: @ 8DB23B8 - .incbin "graphics/pokemon/sunkern/normal.gbapal.lz" - - .align 2 -gMonBackPic_Sunkern:: @ 8DB23E0 - .incbin "graphics/pokemon/sunkern/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Sunkern:: @ 8DB26A4 - .incbin "graphics/pokemon/sunkern/shiny.gbapal.lz" - - .align 2 -gMonIcon_Sunkern:: @ 8DB26CC - .incbin "graphics/pokemon/sunkern/icon.4bpp" - - .align 2 -gMonFootprint_Sunkern:: @ 8DB2ACC - .incbin "graphics/pokemon/sunkern/footprint.1bpp" - - .align 2 -gMonFrontPic_Sunflora:: @ 8DB2AEC - .incbin "graphics/pokemon/sunflora/front.4bpp.lz" - - .align 2 -gMonPalette_Sunflora:: @ 8DB2E44 - .incbin "graphics/pokemon/sunflora/normal.gbapal.lz" - - .align 2 -gMonBackPic_Sunflora:: @ 8DB2E6C - .incbin "graphics/pokemon/sunflora/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Sunflora:: @ 8DB320C - .incbin "graphics/pokemon/sunflora/shiny.gbapal.lz" - - .align 2 -gMonIcon_Sunflora:: @ 8DB3234 - .incbin "graphics/pokemon/sunflora/icon.4bpp" - - .align 2 -gMonFootprint_Sunflora:: @ 8DB3634 - .incbin "graphics/pokemon/sunflora/footprint.1bpp" - - .align 2 -gMonFrontPic_Yanma:: @ 8DB3654 - .incbin "graphics/pokemon/yanma/front.4bpp.lz" - - .align 2 -gMonPalette_Yanma:: @ 8DB39D8 - .incbin "graphics/pokemon/yanma/normal.gbapal.lz" - - .align 2 -gMonBackPic_Yanma:: @ 8DB3A00 - .incbin "graphics/pokemon/yanma/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Yanma:: @ 8DB3DB4 - .incbin "graphics/pokemon/yanma/shiny.gbapal.lz" - - .align 2 -gMonIcon_Yanma:: @ 8DB3DDC - .incbin "graphics/pokemon/yanma/icon.4bpp" - - .align 2 -gMonFootprint_Yanma:: @ 8DB41DC - .incbin "graphics/pokemon/yanma/footprint.1bpp" - - .align 2 -gMonFrontPic_Wooper:: @ 8DB41FC - .incbin "graphics/pokemon/wooper/front.4bpp.lz" - - .align 2 -gMonPalette_Wooper:: @ 8DB443C - .incbin "graphics/pokemon/wooper/normal.gbapal.lz" - - .align 2 -gMonBackPic_Wooper:: @ 8DB4464 - .incbin "graphics/pokemon/wooper/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Wooper:: @ 8DB46F0 - .incbin "graphics/pokemon/wooper/shiny.gbapal.lz" - - .align 2 -gMonIcon_Wooper:: @ 8DB4718 - .incbin "graphics/pokemon/wooper/icon.4bpp" - - .align 2 -gMonFootprint_Wooper:: @ 8DB4B18 - .incbin "graphics/pokemon/wooper/footprint.1bpp" - - .align 2 -gMonFrontPic_Quagsire:: @ 8DB4B38 - .incbin "graphics/pokemon/quagsire/front.4bpp.lz" - - .align 2 -gMonPalette_Quagsire:: @ 8DB4EAC - .incbin "graphics/pokemon/quagsire/normal.gbapal.lz" - - .align 2 -gMonBackPic_Quagsire:: @ 8DB4ED4 - .incbin "graphics/pokemon/quagsire/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Quagsire:: @ 8DB51D0 - .incbin "graphics/pokemon/quagsire/shiny.gbapal.lz" - - .align 2 -gMonIcon_Quagsire:: @ 8DB51F8 - .incbin "graphics/pokemon/quagsire/icon.4bpp" - - .align 2 -gMonFootprint_Quagsire:: @ 8DB55F8 - .incbin "graphics/pokemon/quagsire/footprint.1bpp" - - .align 2 -gMonFrontPic_Espeon:: @ 8DB5618 - .incbin "graphics/pokemon/espeon/front.4bpp.lz" - - .align 2 -gMonPalette_Espeon:: @ 8DB5958 - .incbin "graphics/pokemon/espeon/normal.gbapal.lz" - - .align 2 -gMonBackPic_Espeon:: @ 8DB597C - .incbin "graphics/pokemon/espeon/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Espeon:: @ 8DB5C58 - .incbin "graphics/pokemon/espeon/shiny.gbapal.lz" - - .align 2 -gMonIcon_Espeon:: @ 8DB5C7C - .incbin "graphics/pokemon/espeon/icon.4bpp" - - .align 2 -gMonFootprint_Espeon:: @ 8DB607C - .incbin "graphics/pokemon/espeon/footprint.1bpp" - - .align 2 -gMonFrontPic_Umbreon:: @ 8DB609C - .incbin "graphics/pokemon/umbreon/front.4bpp.lz" - - .align 2 -gMonPalette_Umbreon:: @ 8DB63B0 - .incbin "graphics/pokemon/umbreon/normal.gbapal.lz" - - .align 2 -gMonBackPic_Umbreon:: @ 8DB63D8 - .incbin "graphics/pokemon/umbreon/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Umbreon:: @ 8DB66EC - .incbin "graphics/pokemon/umbreon/shiny.gbapal.lz" - - .align 2 -gMonIcon_Umbreon:: @ 8DB6714 - .incbin "graphics/pokemon/umbreon/icon.4bpp" - - .align 2 -gMonFootprint_Umbreon:: @ 8DB6B14 - .incbin "graphics/pokemon/umbreon/footprint.1bpp" - - .align 2 -gMonFrontPic_Murkrow:: @ 8DB6B34 - .incbin "graphics/pokemon/murkrow/front.4bpp.lz" - - .align 2 -gMonPalette_Murkrow:: @ 8DB6E14 - .incbin "graphics/pokemon/murkrow/normal.gbapal.lz" - - .align 2 -gMonBackPic_Murkrow:: @ 8DB6E3C - .incbin "graphics/pokemon/murkrow/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Murkrow:: @ 8DB7154 - .incbin "graphics/pokemon/murkrow/shiny.gbapal.lz" - - .align 2 -gMonIcon_Murkrow:: @ 8DB717C - .incbin "graphics/pokemon/murkrow/icon.4bpp" - - .align 2 -gMonFootprint_Murkrow:: @ 8DB757C - .incbin "graphics/pokemon/murkrow/footprint.1bpp" - - .align 2 -gMonFrontPic_Slowking:: @ 8DB759C - .incbin "graphics/pokemon/slowking/front.4bpp.lz" - - .align 2 -gMonPalette_Slowking:: @ 8DB7950 - .incbin "graphics/pokemon/slowking/normal.gbapal.lz" - - .align 2 -gMonBackPic_Slowking:: @ 8DB7978 - .incbin "graphics/pokemon/slowking/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Slowking:: @ 8DB7D04 - .incbin "graphics/pokemon/slowking/shiny.gbapal.lz" - - .align 2 -gMonIcon_Slowking:: @ 8DB7D2C - .incbin "graphics/pokemon/slowking/icon.4bpp" - - .align 2 -gMonFootprint_Slowking:: @ 8DB812C - .incbin "graphics/pokemon/slowking/footprint.1bpp" - - .align 2 -gMonFrontPic_Misdreavus:: @ 8DB814C - .incbin "graphics/pokemon/misdreavus/front.4bpp.lz" - - .align 2 -gMonPalette_Misdreavus:: @ 8DB840C - .incbin "graphics/pokemon/misdreavus/normal.gbapal.lz" - - .align 2 -gMonBackPic_Misdreavus:: @ 8DB8434 - .incbin "graphics/pokemon/misdreavus/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Misdreavus:: @ 8DB8758 - .incbin "graphics/pokemon/misdreavus/shiny.gbapal.lz" - - .align 2 -gMonIcon_Misdreavus:: @ 8DB8780 - .incbin "graphics/pokemon/misdreavus/icon.4bpp" - - .align 2 -gMonFootprint_Misdreavus:: @ 8DB8B80 - .incbin "graphics/pokemon/misdreavus/footprint.1bpp" - - .align 2 -gMonFrontPic_UnownA:: @ 8DB8BA0 - .incbin "graphics/pokemon/unown/a/front.4bpp.lz" - - .align 2 -gMonPalette_Unown:: @ 8DB8D74 - .incbin "graphics/pokemon/unown/normal.gbapal.lz" - - .align 2 -gMonBackPic_UnownA:: @ 8DB8D94 - .incbin "graphics/pokemon/unown/a/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Unown:: @ 8DB8F94 - .incbin "graphics/pokemon/unown/shiny.gbapal.lz" - - .align 2 -gMonIcon_UnownA:: @ 8DB8FB4 - .incbin "graphics/pokemon/unown/a/icon.4bpp" - - .align 2 -gMonFootprint_Unown:: @ 8DB93B4 - .incbin "graphics/pokemon/unown/footprint.1bpp" - - .align 2 -gMonFrontPic_Wobbuffet:: @ 8DB93D4 - .incbin "graphics/pokemon/wobbuffet/front.4bpp.lz" - - .align 2 -gMonPalette_Wobbuffet:: @ 8DB9724 - .incbin "graphics/pokemon/wobbuffet/normal.gbapal.lz" - - .align 2 -gMonBackPic_Wobbuffet:: @ 8DB974C - .incbin "graphics/pokemon/wobbuffet/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Wobbuffet:: @ 8DB9990 - .incbin "graphics/pokemon/wobbuffet/shiny.gbapal.lz" - - .align 2 -gMonIcon_Wobbuffet:: @ 8DB99B8 - .incbin "graphics/pokemon/wobbuffet/icon.4bpp" - - .align 2 -gMonFootprint_Wobbuffet:: @ 8DB9DB8 - .incbin "graphics/pokemon/wobbuffet/footprint.1bpp" - - .align 2 -gMonFrontPic_Girafarig:: @ 8DB9DD8 - .incbin "graphics/pokemon/girafarig/front.4bpp.lz" - - .align 2 -gMonPalette_Girafarig:: @ 8DBA1DC - .incbin "graphics/pokemon/girafarig/normal.gbapal.lz" - - .align 2 -gMonBackPic_Girafarig:: @ 8DBA204 - .incbin "graphics/pokemon/girafarig/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Girafarig:: @ 8DBA5B0 - .incbin "graphics/pokemon/girafarig/shiny.gbapal.lz" - - .align 2 -gMonIcon_Girafarig:: @ 8DBA5D8 - .incbin "graphics/pokemon/girafarig/icon.4bpp" - - .align 2 -gMonFootprint_Girafarig:: @ 8DBA9D8 - .incbin "graphics/pokemon/girafarig/footprint.1bpp" - - .align 2 -gMonFrontPic_Pineco:: @ 8DBA9F8 - .incbin "graphics/pokemon/pineco/front.4bpp.lz" - - .align 2 -gMonPalette_Pineco:: @ 8DBAD38 - .incbin "graphics/pokemon/pineco/normal.gbapal.lz" - - .align 2 -gMonBackPic_Pineco:: @ 8DBAD5C - .incbin "graphics/pokemon/pineco/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Pineco:: @ 8DBB034 - .incbin "graphics/pokemon/pineco/shiny.gbapal.lz" - - .align 2 -gMonIcon_Pineco:: @ 8DBB058 - .incbin "graphics/pokemon/pineco/icon.4bpp" - - .align 2 -gMonFootprint_Pineco:: @ 8DBB458 - .incbin "graphics/pokemon/pineco/footprint.1bpp" - - .align 2 -gMonFrontPic_Forretress:: @ 8DBB478 - .incbin "graphics/pokemon/forretress/front.4bpp.lz" - - .align 2 -gMonPalette_Forretress:: @ 8DBB894 - .incbin "graphics/pokemon/forretress/normal.gbapal.lz" - - .align 2 -gMonBackPic_Forretress:: @ 8DBB8BC - .incbin "graphics/pokemon/forretress/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Forretress:: @ 8DBBB7C - .incbin "graphics/pokemon/forretress/shiny.gbapal.lz" - - .align 2 -gMonIcon_Forretress:: @ 8DBBBA4 - .incbin "graphics/pokemon/forretress/icon.4bpp" - - .align 2 -gMonFootprint_Forretress:: @ 8DBBFA4 - .incbin "graphics/pokemon/forretress/footprint.1bpp" - - .align 2 -gMonFrontPic_Dunsparce:: @ 8DBBFC4 - .incbin "graphics/pokemon/dunsparce/front.4bpp.lz" - - .align 2 -gMonPalette_Dunsparce:: @ 8DBC2D4 - .incbin "graphics/pokemon/dunsparce/normal.gbapal.lz" - - .align 2 -gMonBackPic_Dunsparce:: @ 8DBC2FC - .incbin "graphics/pokemon/dunsparce/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Dunsparce:: @ 8DBC5F8 - .incbin "graphics/pokemon/dunsparce/shiny.gbapal.lz" - - .align 2 -gMonIcon_Dunsparce:: @ 8DBC620 - .incbin "graphics/pokemon/dunsparce/icon.4bpp" - - .align 2 -gMonFootprint_Dunsparce:: @ 8DBCA20 - .incbin "graphics/pokemon/dunsparce/footprint.1bpp" - - .align 2 -gMonFrontPic_Gligar:: @ 8DBCA40 - .incbin "graphics/pokemon/gligar/front.4bpp.lz" - - .align 2 -gMonPalette_Gligar:: @ 8DBCE68 - .incbin "graphics/pokemon/gligar/normal.gbapal.lz" - - .align 2 -gMonBackPic_Gligar:: @ 8DBCE90 - .incbin "graphics/pokemon/gligar/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Gligar:: @ 8DBD268 - .incbin "graphics/pokemon/gligar/shiny.gbapal.lz" - - .align 2 -gMonIcon_Gligar:: @ 8DBD290 - .incbin "graphics/pokemon/gligar/icon.4bpp" - - .align 2 -gMonFootprint_Gligar:: @ 8DBD690 - .incbin "graphics/pokemon/gligar/footprint.1bpp" - - .align 2 -gMonFrontPic_Steelix:: @ 8DBD6B0 - .incbin "graphics/pokemon/steelix/front.4bpp.lz" - - .align 2 -gMonPalette_Steelix:: @ 8DBDB78 - .incbin "graphics/pokemon/steelix/normal.gbapal.lz" - - .align 2 -gMonBackPic_Steelix:: @ 8DBDB9C - .incbin "graphics/pokemon/steelix/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Steelix:: @ 8DBDFA8 - .incbin "graphics/pokemon/steelix/shiny.gbapal.lz" - - .align 2 -gMonIcon_Steelix:: @ 8DBDFCC - .incbin "graphics/pokemon/steelix/icon.4bpp" - - .align 2 -gMonFootprint_Steelix:: @ 8DBE3CC - .incbin "graphics/pokemon/steelix/footprint.1bpp" - - .align 2 -gMonFrontPic_Snubbull:: @ 8DBE3EC - .incbin "graphics/pokemon/snubbull/front.4bpp.lz" - - .align 2 -gMonPalette_Snubbull:: @ 8DBE6C0 - .incbin "graphics/pokemon/snubbull/normal.gbapal.lz" - - .align 2 -gMonBackPic_Snubbull:: @ 8DBE6E8 - .incbin "graphics/pokemon/snubbull/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Snubbull:: @ 8DBEA10 - .incbin "graphics/pokemon/snubbull/shiny.gbapal.lz" - - .align 2 -gMonIcon_Snubbull:: @ 8DBEA38 - .incbin "graphics/pokemon/snubbull/icon.4bpp" - - .align 2 -gMonFootprint_Snubbull:: @ 8DBEE38 - .incbin "graphics/pokemon/snubbull/footprint.1bpp" - - .align 2 -gMonFrontPic_Granbull:: @ 8DBEE58 - .incbin "graphics/pokemon/granbull/front.4bpp.lz" - - .align 2 -gMonPalette_Granbull:: @ 8DBF1E4 - .incbin "graphics/pokemon/granbull/normal.gbapal.lz" - - .align 2 -gMonBackPic_Granbull:: @ 8DBF20C - .incbin "graphics/pokemon/granbull/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Granbull:: @ 8DBF530 - .incbin "graphics/pokemon/granbull/shiny.gbapal.lz" - - .align 2 -gMonIcon_Granbull:: @ 8DBF558 - .incbin "graphics/pokemon/granbull/icon.4bpp" - - .align 2 -gMonFootprint_Granbull:: @ 8DBF958 - .incbin "graphics/pokemon/granbull/footprint.1bpp" - - .align 2 -gMonFrontPic_Qwilfish:: @ 8DBF978 - .incbin "graphics/pokemon/qwilfish/front.4bpp.lz" - - .align 2 -gMonPalette_Qwilfish:: @ 8DBFC38 - .incbin "graphics/pokemon/qwilfish/normal.gbapal.lz" - - .align 2 -gMonBackPic_Qwilfish:: @ 8DBFC60 - .incbin "graphics/pokemon/qwilfish/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Qwilfish:: @ 8DBFF40 - .incbin "graphics/pokemon/qwilfish/shiny.gbapal.lz" - - .align 2 -gMonIcon_Qwilfish:: @ 8DBFF68 - .incbin "graphics/pokemon/qwilfish/icon.4bpp" - - .align 2 -gMonFootprint_Qwilfish:: @ 8DC0368 - .incbin "graphics/pokemon/qwilfish/footprint.1bpp" - - .align 2 -gMonFrontPic_Scizor:: @ 8DC0388 - .incbin "graphics/pokemon/scizor/front.4bpp.lz" - - .align 2 -gMonPalette_Scizor:: @ 8DC0870 - .incbin "graphics/pokemon/scizor/normal.gbapal.lz" - - .align 2 -gMonBackPic_Scizor:: @ 8DC0898 - .incbin "graphics/pokemon/scizor/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Scizor:: @ 8DC0C18 - .incbin "graphics/pokemon/scizor/shiny.gbapal.lz" - - .align 2 -gMonIcon_Scizor:: @ 8DC0C40 - .incbin "graphics/pokemon/scizor/icon.4bpp" - - .align 2 -gMonFootprint_Scizor:: @ 8DC1040 - .incbin "graphics/pokemon/scizor/footprint.1bpp" - - .align 2 -gMonFrontPic_Shuckle:: @ 8DC1060 - .incbin "graphics/pokemon/shuckle/front.4bpp.lz" - - .align 2 -gMonPalette_Shuckle:: @ 8DC1328 - .incbin "graphics/pokemon/shuckle/normal.gbapal.lz" - - .align 2 -gMonBackPic_Shuckle:: @ 8DC1350 - .incbin "graphics/pokemon/shuckle/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Shuckle:: @ 8DC15A8 - .incbin "graphics/pokemon/shuckle/shiny.gbapal.lz" - - .align 2 -gMonIcon_Shuckle:: @ 8DC15D0 - .incbin "graphics/pokemon/shuckle/icon.4bpp" - - .align 2 -gMonFootprint_Shuckle:: @ 8DC19D0 - .incbin "graphics/pokemon/shuckle/footprint.1bpp" - - .align 2 -gMonFrontPic_Heracross:: @ 8DC19F0 - .incbin "graphics/pokemon/heracross/front.4bpp.lz" - - .align 2 -gMonPalette_Heracross:: @ 8DC1DE0 - .incbin "graphics/pokemon/heracross/normal.gbapal.lz" - - .align 2 -gMonBackPic_Heracross:: @ 8DC1E08 - .incbin "graphics/pokemon/heracross/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Heracross:: @ 8DC2178 - .incbin "graphics/pokemon/heracross/shiny.gbapal.lz" - - .align 2 -gMonIcon_Heracross:: @ 8DC21A0 - .incbin "graphics/pokemon/heracross/icon.4bpp" - -gUnknown_heracross_icon:: @ 8DC25A0 - .incbin "graphics/pokemon/heracross/unk_icon.4bpp" - - .align 2 -gMonFootprint_Heracross:: @ 8DC29A0 - .incbin "graphics/pokemon/heracross/footprint.1bpp" - - .align 2 -gMonFrontPic_Sneasel:: @ 8DC29C0 - .incbin "graphics/pokemon/sneasel/front.4bpp.lz" - - .align 2 -gMonPalette_Sneasel:: @ 8DC2D04 - .incbin "graphics/pokemon/sneasel/normal.gbapal.lz" - - .align 2 -gMonBackPic_Sneasel:: @ 8DC2D2C - .incbin "graphics/pokemon/sneasel/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Sneasel:: @ 8DC3050 - .incbin "graphics/pokemon/sneasel/shiny.gbapal.lz" - - .align 2 -gMonIcon_Sneasel:: @ 8DC3078 - .incbin "graphics/pokemon/sneasel/icon.4bpp" - - .align 2 -gMonFootprint_Sneasel:: @ 8DC3478 - .incbin "graphics/pokemon/sneasel/footprint.1bpp" - - .align 2 -gMonFrontPic_Teddiursa:: @ 8DC3498 - .incbin "graphics/pokemon/teddiursa/front.4bpp.lz" - - .align 2 -gMonPalette_Teddiursa:: @ 8DC3740 - .incbin "graphics/pokemon/teddiursa/normal.gbapal.lz" - - .align 2 -gMonBackPic_Teddiursa:: @ 8DC3768 - .incbin "graphics/pokemon/teddiursa/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Teddiursa:: @ 8DC39E0 - .incbin "graphics/pokemon/teddiursa/shiny.gbapal.lz" - - .align 2 -gMonIcon_Teddiursa:: @ 8DC3A08 - .incbin "graphics/pokemon/teddiursa/icon.4bpp" - - .align 2 -gMonFootprint_Teddiursa:: @ 8DC3E08 - .incbin "graphics/pokemon/teddiursa/footprint.1bpp" - - .align 2 -gMonFrontPic_Ursaring:: @ 8DC3E28 - .incbin "graphics/pokemon/ursaring/front.4bpp.lz" - - .align 2 -gMonPalette_Ursaring:: @ 8DC4260 - .incbin "graphics/pokemon/ursaring/normal.gbapal.lz" - - .align 2 -gMonBackPic_Ursaring:: @ 8DC4288 - .incbin "graphics/pokemon/ursaring/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Ursaring:: @ 8DC4610 - .incbin "graphics/pokemon/ursaring/shiny.gbapal.lz" - - .align 2 -gMonIcon_Ursaring:: @ 8DC4638 - .incbin "graphics/pokemon/ursaring/icon.4bpp" - - .align 2 -gMonFootprint_Ursaring:: @ 8DC4A38 - .incbin "graphics/pokemon/ursaring/footprint.1bpp" - - .align 2 -gMonFrontPic_Slugma:: @ 8DC4A58 - .incbin "graphics/pokemon/slugma/front.4bpp.lz" - - .align 2 -gMonPalette_Slugma:: @ 8DC4CCC - .incbin "graphics/pokemon/slugma/normal.gbapal.lz" - - .align 2 -gMonBackPic_Slugma:: @ 8DC4CF0 - .incbin "graphics/pokemon/slugma/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Slugma:: @ 8DC4FD8 - .incbin "graphics/pokemon/slugma/shiny.gbapal.lz" - - .align 2 -gMonIcon_Slugma:: @ 8DC4FFC - .incbin "graphics/pokemon/slugma/icon.4bpp" - - .align 2 -gMonFootprint_Slugma:: @ 8DC53FC - .incbin "graphics/pokemon/slugma/footprint.1bpp" - - .align 2 -gMonFrontPic_Magcargo:: @ 8DC541C - .incbin "graphics/pokemon/magcargo/front.4bpp.lz" - - .align 2 -gMonPalette_Magcargo:: @ 8DC5764 - .incbin "graphics/pokemon/magcargo/normal.gbapal.lz" - - .align 2 -gMonBackPic_Magcargo:: @ 8DC578C - .incbin "graphics/pokemon/magcargo/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Magcargo:: @ 8DC5BA4 - .incbin "graphics/pokemon/magcargo/shiny.gbapal.lz" - - .align 2 -gMonIcon_Magcargo:: @ 8DC5BCC - .incbin "graphics/pokemon/magcargo/icon.4bpp" - - .align 2 -gMonFootprint_Magcargo:: @ 8DC5FCC - .incbin "graphics/pokemon/magcargo/footprint.1bpp" - - .align 2 -gMonFrontPic_Swinub:: @ 8DC5FEC - .incbin "graphics/pokemon/swinub/front.4bpp.lz" - - .align 2 -gMonPalette_Swinub:: @ 8DC61E8 - .incbin "graphics/pokemon/swinub/normal.gbapal.lz" - - .align 2 -gMonBackPic_Swinub:: @ 8DC6210 - .incbin "graphics/pokemon/swinub/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Swinub:: @ 8DC644C - .incbin "graphics/pokemon/swinub/shiny.gbapal.lz" - - .align 2 -gMonIcon_Swinub:: @ 8DC6474 - .incbin "graphics/pokemon/swinub/icon.4bpp" - - .align 2 -gMonFootprint_Swinub:: @ 8DC6874 - .incbin "graphics/pokemon/swinub/footprint.1bpp" - - .align 2 -gMonFrontPic_Piloswine:: @ 8DC6894 - .incbin "graphics/pokemon/piloswine/front.4bpp.lz" - - .align 2 -gMonPalette_Piloswine:: @ 8DC6BBC - .incbin "graphics/pokemon/piloswine/normal.gbapal.lz" - - .align 2 -gMonBackPic_Piloswine:: @ 8DC6BE4 - .incbin "graphics/pokemon/piloswine/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Piloswine:: @ 8DC6E30 - .incbin "graphics/pokemon/piloswine/shiny.gbapal.lz" - - .align 2 -gMonIcon_Piloswine:: @ 8DC6E58 - .incbin "graphics/pokemon/piloswine/icon.4bpp" - - .align 2 -gMonFootprint_Piloswine:: @ 8DC7258 - .incbin "graphics/pokemon/piloswine/footprint.1bpp" - - .align 2 -gMonFrontPic_Corsola:: @ 8DC7278 - .incbin "graphics/pokemon/corsola/front.4bpp.lz" - - .align 2 -gMonPalette_Corsola:: @ 8DC7560 - .incbin "graphics/pokemon/corsola/normal.gbapal.lz" - - .align 2 -gMonBackPic_Corsola:: @ 8DC7588 - .incbin "graphics/pokemon/corsola/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Corsola:: @ 8DC7848 - .incbin "graphics/pokemon/corsola/shiny.gbapal.lz" - - .align 2 -gMonIcon_Corsola:: @ 8DC7870 - .incbin "graphics/pokemon/corsola/icon.4bpp" - - .align 2 -gMonFootprint_Corsola:: @ 8DC7C70 - .incbin "graphics/pokemon/corsola/footprint.1bpp" - - .align 2 -gMonFrontPic_Remoraid:: @ 8DC7C90 - .incbin "graphics/pokemon/remoraid/front.4bpp.lz" - - .align 2 -gMonPalette_Remoraid:: @ 8DC7EF8 - .incbin "graphics/pokemon/remoraid/normal.gbapal.lz" - - .align 2 -gMonBackPic_Remoraid:: @ 8DC7F20 - .incbin "graphics/pokemon/remoraid/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Remoraid:: @ 8DC8234 - .incbin "graphics/pokemon/remoraid/shiny.gbapal.lz" - - .align 2 -gMonIcon_Remoraid:: @ 8DC825C - .incbin "graphics/pokemon/remoraid/icon.4bpp" - - .align 2 -gMonFootprint_Remoraid:: @ 8DC865C - .incbin "graphics/pokemon/remoraid/footprint.1bpp" - - .align 2 -gMonFrontPic_Octillery:: @ 8DC867C - .incbin "graphics/pokemon/octillery/front.4bpp.lz" - - .align 2 -gMonPalette_Octillery:: @ 8DC89B0 - .incbin "graphics/pokemon/octillery/normal.gbapal.lz" - - .align 2 -gMonBackPic_Octillery:: @ 8DC89D8 - .incbin "graphics/pokemon/octillery/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Octillery:: @ 8DC8C90 - .incbin "graphics/pokemon/octillery/shiny.gbapal.lz" - - .align 2 -gMonIcon_Octillery:: @ 8DC8CB8 - .incbin "graphics/pokemon/octillery/icon.4bpp" - - .align 2 -gMonFootprint_Octillery:: @ 8DC90B8 - .incbin "graphics/pokemon/octillery/footprint.1bpp" - - .align 2 -gMonFrontPic_Delibird:: @ 8DC90D8 - .incbin "graphics/pokemon/delibird/front.4bpp.lz" - - .align 2 -gMonPalette_Delibird:: @ 8DC9448 - .incbin "graphics/pokemon/delibird/normal.gbapal.lz" - - .align 2 -gMonBackPic_Delibird:: @ 8DC9470 - .incbin "graphics/pokemon/delibird/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Delibird:: @ 8DC9830 - .incbin "graphics/pokemon/delibird/shiny.gbapal.lz" - - .align 2 -gMonIcon_Delibird:: @ 8DC9858 - .incbin "graphics/pokemon/delibird/icon.4bpp" - - .align 2 -gMonFootprint_Delibird:: @ 8DC9C58 - .incbin "graphics/pokemon/delibird/footprint.1bpp" - - .align 2 -gMonFrontPic_Mantine:: @ 8DC9C78 - .incbin "graphics/pokemon/mantine/front.4bpp.lz" - - .align 2 -gMonPalette_Mantine:: @ 8DCA114 - .incbin "graphics/pokemon/mantine/normal.gbapal.lz" - - .align 2 -gMonBackPic_Mantine:: @ 8DCA13C - .incbin "graphics/pokemon/mantine/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Mantine:: @ 8DCA3DC - .incbin "graphics/pokemon/mantine/shiny.gbapal.lz" - - .align 2 -gMonIcon_Mantine:: @ 8DCA404 - .incbin "graphics/pokemon/mantine/icon.4bpp" - - .align 2 -gMonFootprint_Mantine:: @ 8DCA804 - .incbin "graphics/pokemon/mantine/footprint.1bpp" - - .align 2 -gMonFrontPic_Skarmory:: @ 8DCA824 - .incbin "graphics/pokemon/skarmory/front.4bpp.lz" - - .align 2 -gMonPalette_Skarmory:: @ 8DCAD04 - .incbin "graphics/pokemon/skarmory/normal.gbapal.lz" - - .align 2 -gMonBackPic_Skarmory:: @ 8DCAD2C - .incbin "graphics/pokemon/skarmory/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Skarmory:: @ 8DCB030 - .incbin "graphics/pokemon/skarmory/shiny.gbapal.lz" - - .align 2 -gMonIcon_Skarmory:: @ 8DCB058 - .incbin "graphics/pokemon/skarmory/icon.4bpp" - - .align 2 -gMonFootprint_Skarmory:: @ 8DCB458 - .incbin "graphics/pokemon/skarmory/footprint.1bpp" - - .align 2 -gMonFrontPic_Houndour:: @ 8DCB478 - .incbin "graphics/pokemon/houndour/front.4bpp.lz" - - .align 2 -gMonPalette_Houndour:: @ 8DCB730 - .incbin "graphics/pokemon/houndour/normal.gbapal.lz" - - .align 2 -gMonBackPic_Houndour:: @ 8DCB758 - .incbin "graphics/pokemon/houndour/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Houndour:: @ 8DCB9D8 - .incbin "graphics/pokemon/houndour/shiny.gbapal.lz" - - .align 2 -gMonIcon_Houndour:: @ 8DCBA00 - .incbin "graphics/pokemon/houndour/icon.4bpp" - - .align 2 -gMonFootprint_Houndour:: @ 8DCBE00 - .incbin "graphics/pokemon/houndour/footprint.1bpp" - - .align 2 -gMonFrontPic_Houndoom:: @ 8DCBE20 - .incbin "graphics/pokemon/houndoom/front.4bpp.lz" - - .align 2 -gMonPalette_Houndoom:: @ 8DCC220 - .incbin "graphics/pokemon/houndoom/normal.gbapal.lz" - - .align 2 -gMonBackPic_Houndoom:: @ 8DCC248 - .incbin "graphics/pokemon/houndoom/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Houndoom:: @ 8DCC56C - .incbin "graphics/pokemon/houndoom/shiny.gbapal.lz" - - .align 2 -gMonIcon_Houndoom:: @ 8DCC594 - .incbin "graphics/pokemon/houndoom/icon.4bpp" - - .align 2 -gMonFootprint_Houndoom:: @ 8DCC994 - .incbin "graphics/pokemon/houndoom/footprint.1bpp" - - .align 2 -gMonFrontPic_Kingdra:: @ 8DCC9B4 - .incbin "graphics/pokemon/kingdra/front.4bpp.lz" - - .align 2 -gMonPalette_Kingdra:: @ 8DCCDD4 - .incbin "graphics/pokemon/kingdra/normal.gbapal.lz" - - .align 2 -gMonBackPic_Kingdra:: @ 8DCCDFC - .incbin "graphics/pokemon/kingdra/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Kingdra:: @ 8DCD1B0 - .incbin "graphics/pokemon/kingdra/shiny.gbapal.lz" - - .align 2 -gMonIcon_Kingdra:: @ 8DCD1D8 - .incbin "graphics/pokemon/kingdra/icon.4bpp" - - .align 2 -gMonFootprint_Kingdra:: @ 8DCD5D8 - .incbin "graphics/pokemon/kingdra/footprint.1bpp" - - .align 2 -gMonFrontPic_Phanpy:: @ 8DCD5F8 - .incbin "graphics/pokemon/phanpy/front.4bpp.lz" - - .align 2 -gMonPalette_Phanpy:: @ 8DCD854 - .incbin "graphics/pokemon/phanpy/normal.gbapal.lz" - - .align 2 -gMonBackPic_Phanpy:: @ 8DCD87C - .incbin "graphics/pokemon/phanpy/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Phanpy:: @ 8DCDB40 - .incbin "graphics/pokemon/phanpy/shiny.gbapal.lz" - - .align 2 -gMonIcon_Phanpy:: @ 8DCDB68 - .incbin "graphics/pokemon/phanpy/icon.4bpp" - - .align 2 -gMonFootprint_Phanpy:: @ 8DCDF68 - .incbin "graphics/pokemon/phanpy/footprint.1bpp" - - .align 2 -gMonFrontPic_Donphan:: @ 8DCDF88 - .incbin "graphics/pokemon/donphan/front.4bpp.lz" - - .align 2 -gMonPalette_Donphan:: @ 8DCE3FC - .incbin "graphics/pokemon/donphan/normal.gbapal.lz" - - .align 2 -gMonBackPic_Donphan:: @ 8DCE424 - .incbin "graphics/pokemon/donphan/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Donphan:: @ 8DCE720 - .incbin "graphics/pokemon/donphan/shiny.gbapal.lz" - - .align 2 -gMonIcon_Donphan:: @ 8DCE748 - .incbin "graphics/pokemon/donphan/icon.4bpp" - - .align 2 -gMonFootprint_Donphan:: @ 8DCEB48 - .incbin "graphics/pokemon/donphan/footprint.1bpp" - - .align 2 -gMonFrontPic_Porygon2:: @ 8DCEB68 - .incbin "graphics/pokemon/porygon2/front.4bpp.lz" - - .align 2 -gMonPalette_Porygon2:: @ 8DCEDF0 - .incbin "graphics/pokemon/porygon2/normal.gbapal.lz" - - .align 2 -gMonBackPic_Porygon2:: @ 8DCEE18 - .incbin "graphics/pokemon/porygon2/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Porygon2:: @ 8DCF134 - .incbin "graphics/pokemon/porygon2/shiny.gbapal.lz" - - .align 2 -gMonIcon_Porygon2:: @ 8DCF15C - .incbin "graphics/pokemon/porygon2/icon.4bpp" - - .align 2 -gMonFootprint_Porygon2:: @ 8DCF55C - .incbin "graphics/pokemon/porygon2/footprint.1bpp" - - .align 2 -gMonFrontPic_Stantler:: @ 8DCF57C - .incbin "graphics/pokemon/stantler/front.4bpp.lz" - - .align 2 -gMonPalette_Stantler:: @ 8DCF990 - .incbin "graphics/pokemon/stantler/normal.gbapal.lz" - - .align 2 -gMonBackPic_Stantler:: @ 8DCF9B8 - .incbin "graphics/pokemon/stantler/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Stantler:: @ 8DCFD04 - .incbin "graphics/pokemon/stantler/shiny.gbapal.lz" - - .align 2 -gMonIcon_Stantler:: @ 8DCFD2C - .incbin "graphics/pokemon/stantler/icon.4bpp" - - .align 2 -gMonFootprint_Stantler:: @ 8DD012C - .incbin "graphics/pokemon/stantler/footprint.1bpp" - - .align 2 -gMonFrontPic_Smeargle:: @ 8DD014C - .incbin "graphics/pokemon/smeargle/front.4bpp.lz" - - .align 2 -gMonPalette_Smeargle:: @ 8DD04E0 - .incbin "graphics/pokemon/smeargle/normal.gbapal.lz" - - .align 2 -gMonBackPic_Smeargle:: @ 8DD0508 - .incbin "graphics/pokemon/smeargle/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Smeargle:: @ 8DD082C - .incbin "graphics/pokemon/smeargle/shiny.gbapal.lz" - - .align 2 -gMonIcon_Smeargle:: @ 8DD0854 - .incbin "graphics/pokemon/smeargle/icon.4bpp" - - .align 2 -gMonFootprint_Smeargle:: @ 8DD0C54 - .incbin "graphics/pokemon/smeargle/footprint.1bpp" - - .align 2 -gMonFrontPic_Tyrogue:: @ 8DD0C74 - .incbin "graphics/pokemon/tyrogue/front.4bpp.lz" - - .align 2 -gMonPalette_Tyrogue:: @ 8DD0F00 - .incbin "graphics/pokemon/tyrogue/normal.gbapal.lz" - - .align 2 -gMonBackPic_Tyrogue:: @ 8DD0F28 - .incbin "graphics/pokemon/tyrogue/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Tyrogue:: @ 8DD1244 - .incbin "graphics/pokemon/tyrogue/shiny.gbapal.lz" - - .align 2 -gMonIcon_Tyrogue:: @ 8DD126C - .incbin "graphics/pokemon/tyrogue/icon.4bpp" - - .align 2 -gMonFootprint_Tyrogue:: @ 8DD166C - .incbin "graphics/pokemon/tyrogue/footprint.1bpp" - - .align 2 -gMonFrontPic_Hitmontop:: @ 8DD168C - .incbin "graphics/pokemon/hitmontop/front.4bpp.lz" - - .align 2 -gMonPalette_Hitmontop:: @ 8DD1A18 - .incbin "graphics/pokemon/hitmontop/normal.gbapal.lz" - - .align 2 -gMonBackPic_Hitmontop:: @ 8DD1A40 - .incbin "graphics/pokemon/hitmontop/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Hitmontop:: @ 8DD1E68 - .incbin "graphics/pokemon/hitmontop/shiny.gbapal.lz" - - .align 2 -gMonIcon_Hitmontop:: @ 8DD1E90 - .incbin "graphics/pokemon/hitmontop/icon.4bpp" - - @ this might be undefined memory garbage. Its all 00s except for 1 0F. Its also not referenced. - .align 2 -gUndefined_8DD1E90:: @ 8DD2290 - .incbin "data/garbage_8DD2290.bin" - - .align 2 -gMonFootprint_Hitmontop:: @ 8DD2490 - .incbin "graphics/pokemon/hitmontop/footprint.1bpp" - - .align 2 -gMonFrontPic_Smoochum:: @ 8DD24B0 - .incbin "graphics/pokemon/smoochum/front.4bpp.lz" - - .align 2 -gMonPalette_Smoochum:: @ 8DD2708 - .incbin "graphics/pokemon/smoochum/normal.gbapal.lz" - - .align 2 -gMonBackPic_Smoochum:: @ 8DD2730 - .incbin "graphics/pokemon/smoochum/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Smoochum:: @ 8DD29A8 - .incbin "graphics/pokemon/smoochum/shiny.gbapal.lz" - - .align 2 -gMonIcon_Smoochum:: @ 8DD29D0 - .incbin "graphics/pokemon/smoochum/icon.4bpp" - - .align 2 -gMonFootprint_Smoochum:: @ 8DD2DD0 - .incbin "graphics/pokemon/smoochum/footprint.1bpp" - - .align 2 -gMonFrontPic_Elekid:: @ 8DD2DF0 - .incbin "graphics/pokemon/elekid/front.4bpp.lz" - - .align 2 -gMonPalette_Elekid:: @ 8DD30F8 - .incbin "graphics/pokemon/elekid/normal.gbapal.lz" - - .align 2 -gMonBackPic_Elekid:: @ 8DD3120 - .incbin "graphics/pokemon/elekid/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Elekid:: @ 8DD3478 - .incbin "graphics/pokemon/elekid/shiny.gbapal.lz" - - .align 2 -gMonIcon_Elekid:: @ 8DD34A0 - .incbin "graphics/pokemon/elekid/icon.4bpp" - - .align 2 -gMonFootprint_Elekid:: @ 8DD38A0 - .incbin "graphics/pokemon/elekid/footprint.1bpp" - - .align 2 -gMonFrontPic_Magby:: @ 8DD38C0 - .incbin "graphics/pokemon/magby/front.4bpp.lz" - - .align 2 -gMonPalette_Magby:: @ 8DD3B44 - .incbin "graphics/pokemon/magby/normal.gbapal.lz" - - .align 2 -gMonBackPic_Magby:: @ 8DD3B6C - .incbin "graphics/pokemon/magby/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Magby:: @ 8DD3E18 - .incbin "graphics/pokemon/magby/shiny.gbapal.lz" - - .align 2 -gMonIcon_Magby:: @ 8DD3E40 - .incbin "graphics/pokemon/magby/icon.4bpp" - - .align 2 -gMonFootprint_Magby:: @ 8DD4240 - .incbin "graphics/pokemon/magby/footprint.1bpp" - - .align 2 -gMonFrontPic_Miltank:: @ 8DD4260 - .incbin "graphics/pokemon/miltank/front.4bpp.lz" - - .align 2 -gMonPalette_Miltank:: @ 8DD4610 - .incbin "graphics/pokemon/miltank/normal.gbapal.lz" - - .align 2 -gMonBackPic_Miltank:: @ 8DD4638 - .incbin "graphics/pokemon/miltank/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Miltank:: @ 8DD49D4 - .incbin "graphics/pokemon/miltank/shiny.gbapal.lz" - - .align 2 -gMonIcon_Miltank:: @ 8DD49FC - .incbin "graphics/pokemon/miltank/icon.4bpp" - - .align 2 -gMonFootprint_Miltank:: @ 8DD4DFC - .incbin "graphics/pokemon/miltank/footprint.1bpp" - - .align 2 -gMonFrontPic_Blissey:: @ 8DD4E1C - .incbin "graphics/pokemon/blissey/front.4bpp.lz" - - .align 2 -gMonPalette_Blissey:: @ 8DD5204 - .incbin "graphics/pokemon/blissey/normal.gbapal.lz" - - .align 2 -gMonBackPic_Blissey:: @ 8DD522C - .incbin "graphics/pokemon/blissey/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Blissey:: @ 8DD54F8 - .incbin "graphics/pokemon/blissey/shiny.gbapal.lz" - - .align 2 -gMonIcon_Blissey:: @ 8DD5520 - .incbin "graphics/pokemon/blissey/icon.4bpp" - - .align 2 -gMonFootprint_Blissey:: @ 8DD5920 - .incbin "graphics/pokemon/blissey/footprint.1bpp" - - .align 2 -gMonFrontPic_Raikou:: @ 8DD5940 - .incbin "graphics/pokemon/raikou/front.4bpp.lz" - - .align 2 -gMonPalette_Raikou:: @ 8DD5EBC - .incbin "graphics/pokemon/raikou/normal.gbapal.lz" - - .align 2 -gMonBackPic_Raikou:: @ 8DD5EE4 - .incbin "graphics/pokemon/raikou/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Raikou:: @ 8DD628C - .incbin "graphics/pokemon/raikou/shiny.gbapal.lz" - - .align 2 -gMonIcon_Raikou:: @ 8DD62B4 - .incbin "graphics/pokemon/raikou/icon.4bpp" - - .align 2 -gMonFootprint_Raikou:: @ 8DD66B4 - .incbin "graphics/pokemon/raikou/footprint.1bpp" - - .align 2 -gMonFrontPic_Entei:: @ 8DD66D4 - .incbin "graphics/pokemon/entei/front.4bpp.lz" - - .align 2 -gMonPalette_Entei:: @ 8DD6CD0 - .incbin "graphics/pokemon/entei/normal.gbapal.lz" - - .align 2 -gMonBackPic_Entei:: @ 8DD6CF8 - .incbin "graphics/pokemon/entei/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Entei:: @ 8DD711C - .incbin "graphics/pokemon/entei/shiny.gbapal.lz" - - .align 2 -gMonIcon_Entei:: @ 8DD7144 - .incbin "graphics/pokemon/entei/icon.4bpp" - - .align 2 -gMonFootprint_Entei:: @ 8DD7544 - .incbin "graphics/pokemon/entei/footprint.1bpp" - - .align 2 -gMonFrontPic_Suicune:: @ 8DD7564 - .incbin "graphics/pokemon/suicune/front.4bpp.lz" - - .align 2 -gMonPalette_Suicune:: @ 8DD7AE8 - .incbin "graphics/pokemon/suicune/normal.gbapal.lz" - - .align 2 -gMonBackPic_Suicune:: @ 8DD7B10 - .incbin "graphics/pokemon/suicune/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Suicune:: @ 8DD7FEC - .incbin "graphics/pokemon/suicune/shiny.gbapal.lz" - - .align 2 -gMonIcon_Suicune:: @ 8DD8014 - .incbin "graphics/pokemon/suicune/icon.4bpp" - - .align 2 -gMonFootprint_Suicune:: @ 8DD8414 - .incbin "graphics/pokemon/suicune/footprint.1bpp" - - .align 2 -gMonFrontPic_Larvitar:: @ 8DD8434 - .incbin "graphics/pokemon/larvitar/front.4bpp.lz" - - .align 2 -gMonPalette_Larvitar:: @ 8DD8690 - .incbin "graphics/pokemon/larvitar/normal.gbapal.lz" - - .align 2 -gMonBackPic_Larvitar:: @ 8DD86B8 - .incbin "graphics/pokemon/larvitar/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Larvitar:: @ 8DD8964 - .incbin "graphics/pokemon/larvitar/shiny.gbapal.lz" - - .align 2 -gMonIcon_Larvitar:: @ 8DD898C - .incbin "graphics/pokemon/larvitar/icon.4bpp" - - .align 2 -gMonFootprint_Larvitar:: @ 8DD8D8C - .incbin "graphics/pokemon/larvitar/footprint.1bpp" - - .align 2 -gMonFrontPic_Pupitar:: @ 8DD8DAC - .incbin "graphics/pokemon/pupitar/front.4bpp.lz" - - .align 2 -gMonPalette_Pupitar:: @ 8DD909C - .incbin "graphics/pokemon/pupitar/normal.gbapal.lz" - - .align 2 -gMonBackPic_Pupitar:: @ 8DD90C4 - .incbin "graphics/pokemon/pupitar/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Pupitar:: @ 8DD93FC - .incbin "graphics/pokemon/pupitar/shiny.gbapal.lz" - - .align 2 -gMonIcon_Pupitar:: @ 8DD9424 - .incbin "graphics/pokemon/pupitar/icon.4bpp" - - .align 2 -gMonFootprint_Pupitar:: @ 8DD9824 - .incbin "graphics/pokemon/pupitar/footprint.1bpp" - - .align 2 -gMonFrontPic_Tyranitar:: @ 8DD9844 - .incbin "graphics/pokemon/tyranitar/front.4bpp.lz" - - .align 2 -gMonPalette_Tyranitar:: @ 8DD9D80 - .incbin "graphics/pokemon/tyranitar/normal.gbapal.lz" - - .align 2 -gMonBackPic_Tyranitar:: @ 8DD9DA8 - .incbin "graphics/pokemon/tyranitar/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Tyranitar:: @ 8DDA194 - .incbin "graphics/pokemon/tyranitar/shiny.gbapal.lz" - - .align 2 -gMonIcon_Tyranitar:: @ 8DDA1BC - .incbin "graphics/pokemon/tyranitar/icon.4bpp" - - .align 2 -gMonFootprint_Tyranitar:: @ 8DDA5BC - .incbin "graphics/pokemon/tyranitar/footprint.1bpp" - - .align 2 -gMonFrontPic_Lugia:: @ 8DDA5DC - .incbin "graphics/pokemon/lugia/front.4bpp.lz" - - .align 2 -gMonPalette_Lugia:: @ 8DDAAA0 - .incbin "graphics/pokemon/lugia/normal.gbapal.lz" - - .align 2 -gMonBackPic_Lugia:: @ 8DDAAC8 - .incbin "graphics/pokemon/lugia/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Lugia:: @ 8DDAE9C - .incbin "graphics/pokemon/lugia/shiny.gbapal.lz" - - .align 2 -gMonIcon_Lugia:: @ 8DDAEC4 - .incbin "graphics/pokemon/lugia/icon.4bpp" - - .align 2 -gMonFootprint_Lugia:: @ 8DDB2C4 - .incbin "graphics/pokemon/lugia/footprint.1bpp" - - .align 2 -gMonFrontPic_HoOh:: @ 8DDB2E4 - .incbin "graphics/pokemon/ho_oh/front.4bpp.lz" - - .align 2 -gMonPalette_HoOh:: @ 8DDB938 - .incbin "graphics/pokemon/ho_oh/normal.gbapal.lz" - - .align 2 -gMonBackPic_HoOh:: @ 8DDB960 - .incbin "graphics/pokemon/ho_oh/back.4bpp.lz" - - .align 2 -gMonShinyPalette_HoOh:: @ 8DDBD70 - .incbin "graphics/pokemon/ho_oh/shiny.gbapal.lz" - - .align 2 -gMonIcon_HoOh:: @ 8DDBD98 - .incbin "graphics/pokemon/ho_oh/icon.4bpp" - - .align 2 -gMonFootprint_HoOh:: @ 8DDC198 - .incbin "graphics/pokemon/ho_oh/footprint.1bpp" - - .align 2 -gMonFrontPic_Celebi:: @ 8DDC1B8 - .incbin "graphics/pokemon/celebi/front.4bpp.lz" - - .align 2 -gMonPalette_Celebi:: @ 8DDC430 - .incbin "graphics/pokemon/celebi/normal.gbapal.lz" - - .align 2 -gMonBackPic_Celebi:: @ 8DDC458 - .incbin "graphics/pokemon/celebi/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Celebi:: @ 8DDC804 - .incbin "graphics/pokemon/celebi/shiny.gbapal.lz" - - .align 2 -gMonIcon_Celebi:: @ 8DDC82C - .incbin "graphics/pokemon/celebi/icon.4bpp" - - .align 2 -gMonFootprint_Celebi:: @ 8DDCC2C - .incbin "graphics/pokemon/celebi/footprint.1bpp" - - .align 2 -gMonFrontPic_DoubleQuestionMark:: @ 8DDCC4C - .incbin "graphics/pokemon/circled_question_mark/double/front.4bpp.lz" - - .align 2 -gMonPalette_DoubleQuestionMark:: @ 8DDCDD0 - .incbin "graphics/pokemon/circled_question_mark/double/normal.gbapal.lz" - - .align 2 -gMonBackPic_DoubleQuestionMark:: @ 8DDCDE4 - .incbin "graphics/pokemon/circled_question_mark/double/back.4bpp.lz" - - .align 2 -gMonShinyPalette_DoubleQuestionMark:: @ 8DDCF68 - .incbin "graphics/pokemon/circled_question_mark/double/shiny.gbapal.lz" - - .align 2 -gMonFrontPic_Treecko:: @ 8DDCF7C - .incbin "graphics/pokemon/treecko/front.4bpp.lz" - - .align 2 -gMonPalette_Treecko:: @ 8DDD284 - .incbin "graphics/pokemon/treecko/normal.gbapal.lz" - - .align 2 -gMonBackPic_Treecko:: @ 8DDD2AC - .incbin "graphics/pokemon/treecko/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Treecko:: @ 8DDD5AC - .incbin "graphics/pokemon/treecko/shiny.gbapal.lz" - - .align 2 -gMonIcon_Treecko:: @ 8DDD5D4 - .incbin "graphics/pokemon/treecko/icon.4bpp" - - .align 2 -gMonFootprint_Treecko:: @ 8DDD9D4 - .incbin "graphics/pokemon/treecko/footprint.1bpp" - - .align 2 -gMonFrontPic_Grovyle:: @ 8DDD9F4 - .incbin "graphics/pokemon/grovyle/front.4bpp.lz" - - .align 2 -gMonPalette_Grovyle:: @ 8DDDE80 - .incbin "graphics/pokemon/grovyle/normal.gbapal.lz" - - .align 2 -gMonBackPic_Grovyle:: @ 8DDDEA8 - .incbin "graphics/pokemon/grovyle/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Grovyle:: @ 8DDE1E4 - .incbin "graphics/pokemon/grovyle/shiny.gbapal.lz" - - .align 2 -gMonIcon_Grovyle:: @ 8DDE20C - .incbin "graphics/pokemon/grovyle/icon.4bpp" - - .align 2 -gMonFootprint_Grovyle:: @ 8DDE60C - .incbin "graphics/pokemon/grovyle/footprint.1bpp" - - .align 2 -gMonFrontPic_Sceptile:: @ 8DDE62C - .incbin "graphics/pokemon/sceptile/front.4bpp.lz" - - .align 2 -gMonPalette_Sceptile:: @ 8DDEB30 - .incbin "graphics/pokemon/sceptile/normal.gbapal.lz" - - .align 2 -gMonBackPic_Sceptile:: @ 8DDEB58 - .incbin "graphics/pokemon/sceptile/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Sceptile:: @ 8DDEF54 - .incbin "graphics/pokemon/sceptile/shiny.gbapal.lz" - - .align 2 -gMonIcon_Sceptile:: @ 8DDEF7C - .incbin "graphics/pokemon/sceptile/icon.4bpp" - - .align 2 -gMonFootprint_Sceptile:: @ 8DDF37C - .incbin "graphics/pokemon/sceptile/footprint.1bpp" - - .align 2 -gMonFrontPic_Torchic:: @ 8DDF39C - .incbin "graphics/pokemon/torchic/front.4bpp.lz" - - .align 2 -gMonPalette_Torchic:: @ 8DDF638 - .incbin "graphics/pokemon/torchic/normal.gbapal.lz" - - .align 2 -gMonBackPic_Torchic:: @ 8DDF660 - .incbin "graphics/pokemon/torchic/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Torchic:: @ 8DDF938 - .incbin "graphics/pokemon/torchic/shiny.gbapal.lz" - - .align 2 -gMonIcon_Torchic:: @ 8DDF960 - .incbin "graphics/pokemon/torchic/icon.4bpp" - - .align 2 -gMonFootprint_Torchic:: @ 8DDFD60 - .incbin "graphics/pokemon/torchic/footprint.1bpp" - - .align 2 -gMonFrontPic_Combusken:: @ 8DDFD80 - .incbin "graphics/pokemon/combusken/front.4bpp.lz" - - .align 2 -gMonPalette_Combusken:: @ 8DE016C - .incbin "graphics/pokemon/combusken/normal.gbapal.lz" - - .align 2 -gMonBackPic_Combusken:: @ 8DE0194 - .incbin "graphics/pokemon/combusken/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Combusken:: @ 8DE0564 - .incbin "graphics/pokemon/combusken/shiny.gbapal.lz" - - .align 2 -gMonIcon_Combusken:: @ 8DE058C - .incbin "graphics/pokemon/combusken/icon.4bpp" - - .align 2 -gMonFootprint_Combusken:: @ 8DE098C - .incbin "graphics/pokemon/combusken/footprint.1bpp" - - .align 2 -gMonFrontPic_Blaziken:: @ 8DE09AC - .incbin "graphics/pokemon/blaziken/front.4bpp.lz" - - .align 2 -gMonPalette_Blaziken:: @ 8DE0E24 - .incbin "graphics/pokemon/blaziken/normal.gbapal.lz" - - .align 2 -gMonBackPic_Blaziken:: @ 8DE0E4C - .incbin "graphics/pokemon/blaziken/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Blaziken:: @ 8DE1228 - .incbin "graphics/pokemon/blaziken/shiny.gbapal.lz" - - .align 2 -gMonIcon_Blaziken:: @ 8DE1250 - .incbin "graphics/pokemon/blaziken/icon.4bpp" - - .align 2 -gMonFootprint_Blaziken:: @ 8DE1650 - .incbin "graphics/pokemon/blaziken/footprint.1bpp" - - .align 2 -gMonFrontPic_Mudkip:: @ 8DE1670 - .incbin "graphics/pokemon/mudkip/front.4bpp.lz" - - .align 2 -gMonPalette_Mudkip:: @ 8DE1928 - .incbin "graphics/pokemon/mudkip/normal.gbapal.lz" - - .align 2 -gMonBackPic_Mudkip:: @ 8DE1950 - .incbin "graphics/pokemon/mudkip/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Mudkip:: @ 8DE1C30 - .incbin "graphics/pokemon/mudkip/shiny.gbapal.lz" - - .align 2 -gMonIcon_Mudkip:: @ 8DE1C58 - .incbin "graphics/pokemon/mudkip/icon.4bpp" - - .align 2 -gMonFootprint_Mudkip:: @ 8DE2058 - .incbin "graphics/pokemon/mudkip/footprint.1bpp" - - .align 2 -gMonFrontPic_Marshtomp:: @ 8DE2078 - .incbin "graphics/pokemon/marshtomp/front.4bpp.lz" - - .align 2 -gMonPalette_Marshtomp:: @ 8DE2400 - .incbin "graphics/pokemon/marshtomp/normal.gbapal.lz" - - .align 2 -gMonBackPic_Marshtomp:: @ 8DE2428 - .incbin "graphics/pokemon/marshtomp/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Marshtomp:: @ 8DE27D8 - .incbin "graphics/pokemon/marshtomp/shiny.gbapal.lz" - - .align 2 -gMonIcon_Marshtomp:: @ 8DE2800 - .incbin "graphics/pokemon/marshtomp/icon.4bpp" - - .align 2 -gMonFootprint_Marshtomp:: @ 8DE2C00 - .incbin "graphics/pokemon/marshtomp/footprint.1bpp" - - .align 2 -gMonFrontPic_Swampert:: @ 8DE2C20 - .incbin "graphics/pokemon/swampert/front.4bpp.lz" - - .align 2 -gMonPalette_Swampert:: @ 8DE319C - .incbin "graphics/pokemon/swampert/normal.gbapal.lz" - - .align 2 -gMonBackPic_Swampert:: @ 8DE31C4 - .incbin "graphics/pokemon/swampert/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Swampert:: @ 8DE3578 - .incbin "graphics/pokemon/swampert/shiny.gbapal.lz" - - .align 2 -gMonIcon_Swampert:: @ 8DE35A0 - .incbin "graphics/pokemon/swampert/icon.4bpp" - - .align 2 -gMonFootprint_Swampert:: @ 8DE39A0 - .incbin "graphics/pokemon/swampert/footprint.1bpp" - - .align 2 -gMonFrontPic_Poochyena:: @ 8DE39C0 - .incbin "graphics/pokemon/poochyena/front.4bpp.lz" - - .align 2 -gMonPalette_Poochyena:: @ 8DE3C88 - .incbin "graphics/pokemon/poochyena/normal.gbapal.lz" - - .align 2 -gMonBackPic_Poochyena:: @ 8DE3CB0 - .incbin "graphics/pokemon/poochyena/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Poochyena:: @ 8DE3FDC - .incbin "graphics/pokemon/poochyena/shiny.gbapal.lz" - - .align 2 -gMonIcon_Poochyena:: @ 8DE4004 - .incbin "graphics/pokemon/poochyena/icon.4bpp" - - .align 2 -gMonFootprint_Poochyena:: @ 8DE4404 - .incbin "graphics/pokemon/poochyena/footprint.1bpp" - - .align 2 -gMonFrontPic_Mightyena:: @ 8DE4424 - .incbin "graphics/pokemon/mightyena/front.4bpp.lz" - - .align 2 -gMonPalette_Mightyena:: @ 8DE485C - .incbin "graphics/pokemon/mightyena/normal.gbapal.lz" - - .align 2 -gMonBackPic_Mightyena:: @ 8DE4884 - .incbin "graphics/pokemon/mightyena/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Mightyena:: @ 8DE4BFC - .incbin "graphics/pokemon/mightyena/shiny.gbapal.lz" - - .align 2 -gMonIcon_Mightyena:: @ 8DE4C24 - .incbin "graphics/pokemon/mightyena/icon.4bpp" - - .align 2 -gMonFootprint_Mightyena:: @ 8DE5024 - .incbin "graphics/pokemon/mightyena/footprint.1bpp" - - .align 2 -gMonFrontPic_Zigzagoon:: @ 8DE5044 - .incbin "graphics/pokemon/zigzagoon/front.4bpp.lz" - - .align 2 -gMonPalette_Zigzagoon:: @ 8DE5414 - .incbin "graphics/pokemon/zigzagoon/normal.gbapal.lz" - - .align 2 -gMonBackPic_Zigzagoon:: @ 8DE543C - .incbin "graphics/pokemon/zigzagoon/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Zigzagoon:: @ 8DE577C - .incbin "graphics/pokemon/zigzagoon/shiny.gbapal.lz" - - .align 2 -gMonIcon_Zigzagoon:: @ 8DE57A4 - .incbin "graphics/pokemon/zigzagoon/icon.4bpp" - - .align 2 -gMonFootprint_Zigzagoon:: @ 8DE5BA4 - .incbin "graphics/pokemon/zigzagoon/footprint.1bpp" - - .align 2 -gMonFrontPic_Linoone:: @ 8DE5BC4 - .incbin "graphics/pokemon/linoone/front.4bpp.lz" - - .align 2 -gMonPalette_Linoone:: @ 8DE5F34 - .incbin "graphics/pokemon/linoone/normal.gbapal.lz" - - .align 2 -gMonBackPic_Linoone:: @ 8DE5F5C - .incbin "graphics/pokemon/linoone/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Linoone:: @ 8DE6230 - .incbin "graphics/pokemon/linoone/shiny.gbapal.lz" - - .align 2 -gMonIcon_Linoone:: @ 8DE6258 - .incbin "graphics/pokemon/linoone/icon.4bpp" - - .align 2 -gMonFootprint_Linoone:: @ 8DE6658 - .incbin "graphics/pokemon/linoone/footprint.1bpp" - - .align 2 -gMonFrontPic_Wurmple:: @ 8DE6678 - .incbin "graphics/pokemon/wurmple/front.4bpp.lz" - - .align 2 -gMonPalette_Wurmple:: @ 8DE6900 - .incbin "graphics/pokemon/wurmple/normal.gbapal.lz" - - .align 2 -gMonBackPic_Wurmple:: @ 8DE6928 - .incbin "graphics/pokemon/wurmple/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Wurmple:: @ 8DE6B74 - .incbin "graphics/pokemon/wurmple/shiny.gbapal.lz" - - .align 2 -gMonIcon_Wurmple:: @ 8DE6B9C - .incbin "graphics/pokemon/wurmple/icon.4bpp" - - .align 2 -gMonFootprint_Wurmple:: @ 8DE6F9C - .incbin "graphics/pokemon/wurmple/footprint.1bpp" - - .align 2 -gMonFrontPic_Silcoon:: @ 8DE6FBC - .incbin "graphics/pokemon/silcoon/front.4bpp.lz" - - .align 2 -gMonPalette_Silcoon:: @ 8DE723C - .incbin "graphics/pokemon/silcoon/normal.gbapal.lz" - - .align 2 -gMonBackPic_Silcoon:: @ 8DE7264 - .incbin "graphics/pokemon/silcoon/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Silcoon:: @ 8DE7480 - .incbin "graphics/pokemon/silcoon/shiny.gbapal.lz" - - .align 2 -gMonIcon_Silcoon:: @ 8DE74A8 - .incbin "graphics/pokemon/silcoon/icon.4bpp" - - .align 2 -gMonFootprint_Silcoon:: @ 8DE78A8 - .incbin "graphics/pokemon/silcoon/footprint.1bpp" - - .align 2 -gMonFrontPic_Beautifly:: @ 8DE78C8 - .incbin "graphics/pokemon/beautifly/front.4bpp.lz" - - .align 2 -gMonPalette_Beautifly:: @ 8DE7C20 - .incbin "graphics/pokemon/beautifly/normal.gbapal.lz" - - .align 2 -gMonBackPic_Beautifly:: @ 8DE7C48 - .incbin "graphics/pokemon/beautifly/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Beautifly:: @ 8DE7FF8 - .incbin "graphics/pokemon/beautifly/shiny.gbapal.lz" - - .align 2 -gMonIcon_Beautifly:: @ 8DE8020 - .incbin "graphics/pokemon/beautifly/icon.4bpp" - - .align 2 -gMonFootprint_Beautifly:: @ 8DE8420 - .incbin "graphics/pokemon/beautifly/footprint.1bpp" - - .align 2 -gMonFrontPic_Cascoon:: @ 8DE8440 - .incbin "graphics/pokemon/cascoon/front.4bpp.lz" - - .align 2 -gMonPalette_Cascoon:: @ 8DE86AC - .incbin "graphics/pokemon/cascoon/normal.gbapal.lz" - - .align 2 -gMonBackPic_Cascoon:: @ 8DE86D4 - .incbin "graphics/pokemon/cascoon/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Cascoon:: @ 8DE88E4 - .incbin "graphics/pokemon/cascoon/shiny.gbapal.lz" - - .align 2 -gMonIcon_Cascoon:: @ 8DE890C - .incbin "graphics/pokemon/cascoon/icon.4bpp" - - .align 2 -gMonFootprint_Cascoon:: @ 8DE8D0C - .incbin "graphics/pokemon/cascoon/footprint.1bpp" - - .align 2 -gMonFrontPic_Dustox:: @ 8DE8D2C - .incbin "graphics/pokemon/dustox/front.4bpp.lz" - - .align 2 -gMonPalette_Dustox:: @ 8DE9094 - .incbin "graphics/pokemon/dustox/normal.gbapal.lz" - - .align 2 -gMonBackPic_Dustox:: @ 8DE90BC - .incbin "graphics/pokemon/dustox/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Dustox:: @ 8DE9314 - .incbin "graphics/pokemon/dustox/shiny.gbapal.lz" - - .align 2 -gMonIcon_Dustox:: @ 8DE933C - .incbin "graphics/pokemon/dustox/icon.4bpp" - - .align 2 -gMonFootprint_Dustox:: @ 8DE973C - .incbin "graphics/pokemon/dustox/footprint.1bpp" - - .align 2 -gMonFrontPic_Lotad:: @ 8DE975C - .incbin "graphics/pokemon/lotad/front.4bpp.lz" - - .align 2 -gMonPalette_Lotad:: @ 8DE99BC - .incbin "graphics/pokemon/lotad/normal.gbapal.lz" - - .align 2 -gMonBackPic_Lotad:: @ 8DE99E4 - .incbin "graphics/pokemon/lotad/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Lotad:: @ 8DE9CCC - .incbin "graphics/pokemon/lotad/shiny.gbapal.lz" - - .align 2 -gMonIcon_Lotad:: @ 8DE9CF4 - .incbin "graphics/pokemon/lotad/icon.4bpp" - - .align 2 -gMonFootprint_Lotad:: @ 8DEA0F4 - .incbin "graphics/pokemon/lotad/footprint.1bpp" - - .align 2 -gMonFrontPic_Lombre:: @ 8DEA114 - .incbin "graphics/pokemon/lombre/front.4bpp.lz" - - .align 2 -gMonPalette_Lombre:: @ 8DEA42C - .incbin "graphics/pokemon/lombre/normal.gbapal.lz" - - .align 2 -gMonBackPic_Lombre:: @ 8DEA454 - .incbin "graphics/pokemon/lombre/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Lombre:: @ 8DEA750 - .incbin "graphics/pokemon/lombre/shiny.gbapal.lz" - - .align 2 -gMonIcon_Lombre:: @ 8DEA778 - .incbin "graphics/pokemon/lombre/icon.4bpp" - - .align 2 -gMonFootprint_Lombre:: @ 8DEAB78 - .incbin "graphics/pokemon/lombre/footprint.1bpp" - - .align 2 -gMonFrontPic_Ludicolo:: @ 8DEAB98 - .incbin "graphics/pokemon/ludicolo/front.4bpp.lz" - - .align 2 -gMonPalette_Ludicolo:: @ 8DEB07C - .incbin "graphics/pokemon/ludicolo/normal.gbapal.lz" - - .align 2 -gMonBackPic_Ludicolo:: @ 8DEB0A4 - .incbin "graphics/pokemon/ludicolo/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Ludicolo:: @ 8DEB3A0 - .incbin "graphics/pokemon/ludicolo/shiny.gbapal.lz" - - .align 2 -gMonIcon_Ludicolo:: @ 8DEB3C8 - .incbin "graphics/pokemon/ludicolo/icon.4bpp" - - .align 2 -gMonFootprint_Ludicolo:: @ 8DEB7C8 - .incbin "graphics/pokemon/ludicolo/footprint.1bpp" - - .align 2 -gMonFrontPic_Seedot:: @ 8DEB7E8 - .incbin "graphics/pokemon/seedot/front.4bpp.lz" - - .align 2 -gMonPalette_Seedot:: @ 8DEBA7C - .incbin "graphics/pokemon/seedot/normal.gbapal.lz" - - .align 2 -gMonBackPic_Seedot:: @ 8DEBAA4 - .incbin "graphics/pokemon/seedot/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Seedot:: @ 8DEBD84 - .incbin "graphics/pokemon/seedot/shiny.gbapal.lz" - - .align 2 -gMonIcon_Seedot:: @ 8DEBDAC - .incbin "graphics/pokemon/seedot/icon.4bpp" - - .align 2 -gMonFootprint_Seedot:: @ 8DEC1AC - .incbin "graphics/pokemon/seedot/footprint.1bpp" - - .align 2 -gMonFrontPic_Nuzleaf:: @ 8DEC1CC - .incbin "graphics/pokemon/nuzleaf/front.4bpp.lz" - - .align 2 -gMonPalette_Nuzleaf:: @ 8DEC4B8 - .incbin "graphics/pokemon/nuzleaf/normal.gbapal.lz" - - .align 2 -gMonBackPic_Nuzleaf:: @ 8DEC4E0 - .incbin "graphics/pokemon/nuzleaf/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Nuzleaf:: @ 8DEC7A8 - .incbin "graphics/pokemon/nuzleaf/shiny.gbapal.lz" - - .align 2 -gMonIcon_Nuzleaf:: @ 8DEC7D0 - .incbin "graphics/pokemon/nuzleaf/icon.4bpp" - - .align 2 -gMonFootprint_Nuzleaf:: @ 8DECBD0 - .incbin "graphics/pokemon/nuzleaf/footprint.1bpp" - - .align 2 -gMonFrontPic_Shiftry:: @ 8DECBF0 - .incbin "graphics/pokemon/shiftry/front.4bpp.lz" - - .align 2 -gMonPalette_Shiftry:: @ 8DED0AC - .incbin "graphics/pokemon/shiftry/normal.gbapal.lz" - - .align 2 -gMonBackPic_Shiftry:: @ 8DED0D4 - .incbin "graphics/pokemon/shiftry/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Shiftry:: @ 8DED398 - .incbin "graphics/pokemon/shiftry/shiny.gbapal.lz" - - .align 2 -gMonIcon_Shiftry:: @ 8DED3C0 - .incbin "graphics/pokemon/shiftry/icon.4bpp" - - .align 2 -gMonFootprint_Shiftry:: @ 8DED7C0 - .incbin "graphics/pokemon/shiftry/footprint.1bpp" - - .align 2 -gMonFrontPic_Nincada:: @ 8DED7E0 - .incbin "graphics/pokemon/nincada/front.4bpp.lz" - - .align 2 -gMonPalette_Nincada:: @ 8DEDA80 - .incbin "graphics/pokemon/nincada/normal.gbapal.lz" - - .align 2 -gMonBackPic_Nincada:: @ 8DEDAA8 - .incbin "graphics/pokemon/nincada/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Nincada:: @ 8DEDD60 - .incbin "graphics/pokemon/nincada/shiny.gbapal.lz" - - .align 2 -gMonIcon_Nincada:: @ 8DEDD88 - .incbin "graphics/pokemon/nincada/icon.4bpp" - - .align 2 -gMonFootprint_Nincada:: @ 8DEE188 - .incbin "graphics/pokemon/nincada/footprint.1bpp" - - .align 2 -gMonFrontPic_Ninjask:: @ 8DEE1A8 - .incbin "graphics/pokemon/ninjask/front.4bpp.lz" - - .align 2 -gMonPalette_Ninjask:: @ 8DEE518 - .incbin "graphics/pokemon/ninjask/normal.gbapal.lz" - - .align 2 -gMonBackPic_Ninjask:: @ 8DEE540 - .incbin "graphics/pokemon/ninjask/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Ninjask:: @ 8DEE90C - .incbin "graphics/pokemon/ninjask/shiny.gbapal.lz" - - .align 2 -gMonIcon_Ninjask:: @ 8DEE934 - .incbin "graphics/pokemon/ninjask/icon.4bpp" - - .align 2 -gMonFootprint_Ninjask:: @ 8DEED34 - .incbin "graphics/pokemon/ninjask/footprint.1bpp" - - .align 2 -gMonFrontPic_Shedinja:: @ 8DEED54 - .incbin "graphics/pokemon/shedinja/front.4bpp.lz" - - .align 2 -gMonPalette_Shedinja:: @ 8DEF074 - .incbin "graphics/pokemon/shedinja/normal.gbapal.lz" - - .align 2 -gMonBackPic_Shedinja:: @ 8DEF09C - .incbin "graphics/pokemon/shedinja/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Shedinja:: @ 8DEF43C - .incbin "graphics/pokemon/shedinja/shiny.gbapal.lz" - - .align 2 -gMonIcon_Shedinja:: @ 8DEF464 - .incbin "graphics/pokemon/shedinja/icon.4bpp" - - .align 2 -gMonFootprint_Shedinja:: @ 8DEF864 - .incbin "graphics/pokemon/shedinja/footprint.1bpp" - - .align 2 -gMonFrontPic_Taillow:: @ 8DEF884 - .incbin "graphics/pokemon/taillow/front.4bpp.lz" - - .align 2 -gMonPalette_Taillow:: @ 8DEFADC - .incbin "graphics/pokemon/taillow/normal.gbapal.lz" - - .align 2 -gMonBackPic_Taillow:: @ 8DEFB04 - .incbin "graphics/pokemon/taillow/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Taillow:: @ 8DEFD24 - .incbin "graphics/pokemon/taillow/shiny.gbapal.lz" - - .align 2 -gMonIcon_Taillow:: @ 8DEFD4C - .incbin "graphics/pokemon/taillow/icon.4bpp" - - .align 2 -gMonFootprint_Taillow:: @ 8DF014C - .incbin "graphics/pokemon/taillow/footprint.1bpp" - - .align 2 -gMonFrontPic_Swellow:: @ 8DF016C - .incbin "graphics/pokemon/swellow/front.4bpp.lz" - - .align 2 -gMonPalette_Swellow:: @ 8DF0530 - .incbin "graphics/pokemon/swellow/normal.gbapal.lz" - - .align 2 -gMonBackPic_Swellow:: @ 8DF0558 - .incbin "graphics/pokemon/swellow/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Swellow:: @ 8DF0890 - .incbin "graphics/pokemon/swellow/shiny.gbapal.lz" - - .align 2 -gMonIcon_Swellow:: @ 8DF08B8 - .incbin "graphics/pokemon/swellow/icon.4bpp" - - .align 2 -gMonFootprint_Swellow:: @ 8DF0CB8 - .incbin "graphics/pokemon/swellow/footprint.1bpp" - - .align 2 -gMonFrontPic_Shroomish:: @ 8DF0CD8 - .incbin "graphics/pokemon/shroomish/front.4bpp.lz" - - .align 2 -gMonPalette_Shroomish:: @ 8DF0F40 - .incbin "graphics/pokemon/shroomish/normal.gbapal.lz" - - .align 2 -gMonBackPic_Shroomish:: @ 8DF0F68 - .incbin "graphics/pokemon/shroomish/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Shroomish:: @ 8DF1248 - .incbin "graphics/pokemon/shroomish/shiny.gbapal.lz" - - .align 2 -gMonIcon_Shroomish:: @ 8DF1270 - .incbin "graphics/pokemon/shroomish/icon.4bpp" - - .align 2 -gMonFootprint_Shroomish:: @ 8DF1670 - .incbin "graphics/pokemon/shroomish/footprint.1bpp" - - .align 2 -gMonFrontPic_Breloom:: @ 8DF1690 - .incbin "graphics/pokemon/breloom/front.4bpp.lz" - - .align 2 -gMonPalette_Breloom:: @ 8DF1A78 - .incbin "graphics/pokemon/breloom/normal.gbapal.lz" - - .align 2 -gMonBackPic_Breloom:: @ 8DF1AA0 - .incbin "graphics/pokemon/breloom/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Breloom:: @ 8DF1E80 - .incbin "graphics/pokemon/breloom/shiny.gbapal.lz" - - .align 2 -gMonIcon_Breloom:: @ 8DF1EA8 - .incbin "graphics/pokemon/breloom/icon.4bpp" - - .align 2 -gMonFootprint_Breloom:: @ 8DF22A8 - .incbin "graphics/pokemon/breloom/footprint.1bpp" - - .align 2 -gMonFrontPic_Spinda:: @ 8DF22C8 - .incbin "graphics/pokemon/spinda/front.4bpp.lz" - - .align 2 -gMonPalette_Spinda:: @ 8DF25C8 - .incbin "graphics/pokemon/spinda/normal.gbapal.lz" - - .align 2 -gMonBackPic_Spinda:: @ 8DF25F0 - .incbin "graphics/pokemon/spinda/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Spinda:: @ 8DF292C - .incbin "graphics/pokemon/spinda/shiny.gbapal.lz" - - .align 2 -gMonIcon_Spinda:: @ 8DF2954 - .incbin "graphics/pokemon/spinda/icon.4bpp" - - .align 2 -gMonFootprint_Spinda:: @ 8DF2D54 - .incbin "graphics/pokemon/spinda/footprint.1bpp" - - .align 2 -gMonFrontPic_Wingull:: @ 8DF2D74 - .incbin "graphics/pokemon/wingull/front.4bpp.lz" - - .align 2 -gMonPalette_Wingull:: @ 8DF2FB0 - .incbin "graphics/pokemon/wingull/normal.gbapal.lz" - - .align 2 -gMonBackPic_Wingull:: @ 8DF2FD8 - .incbin "graphics/pokemon/wingull/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Wingull:: @ 8DF3328 - .incbin "graphics/pokemon/wingull/shiny.gbapal.lz" - - .align 2 -gMonIcon_Wingull:: @ 8DF3350 - .incbin "graphics/pokemon/wingull/icon.4bpp" - - .align 2 -gMonFootprint_Wingull:: @ 8DF3750 - .incbin "graphics/pokemon/wingull/footprint.1bpp" - - .align 2 -gMonFrontPic_Pelipper:: @ 8DF3770 - .incbin "graphics/pokemon/pelipper/front.4bpp.lz" - - .align 2 -gMonPalette_Pelipper:: @ 8DF3B08 - .incbin "graphics/pokemon/pelipper/normal.gbapal.lz" - - .align 2 -gMonBackPic_Pelipper:: @ 8DF3B30 - .incbin "graphics/pokemon/pelipper/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Pelipper:: @ 8DF3EB0 - .incbin "graphics/pokemon/pelipper/shiny.gbapal.lz" - - .align 2 -gMonIcon_Pelipper:: @ 8DF3ED8 - .incbin "graphics/pokemon/pelipper/icon.4bpp" - - .align 2 -gMonFootprint_Pelipper:: @ 8DF42D8 - .incbin "graphics/pokemon/pelipper/footprint.1bpp" - - .align 2 -gMonFrontPic_Surskit:: @ 8DF42F8 - .incbin "graphics/pokemon/surskit/front.4bpp.lz" - - .align 2 -gMonPalette_Surskit:: @ 8DF4504 - .incbin "graphics/pokemon/surskit/normal.gbapal.lz" - - .align 2 -gMonBackPic_Surskit:: @ 8DF452C - .incbin "graphics/pokemon/surskit/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Surskit:: @ 8DF4764 - .incbin "graphics/pokemon/surskit/shiny.gbapal.lz" - - .align 2 -gMonIcon_Surskit:: @ 8DF478C - .incbin "graphics/pokemon/surskit/icon.4bpp" - - .align 2 -gMonFootprint_Surskit:: @ 8DF4B8C - .incbin "graphics/pokemon/surskit/footprint.1bpp" - - .align 2 -gMonFrontPic_Masquerain:: @ 8DF4BAC - .incbin "graphics/pokemon/masquerain/front.4bpp.lz" - - .align 2 -gMonPalette_Masquerain:: @ 8DF4F48 - .incbin "graphics/pokemon/masquerain/normal.gbapal.lz" - - .align 2 -gMonBackPic_Masquerain:: @ 8DF4F70 - .incbin "graphics/pokemon/masquerain/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Masquerain:: @ 8DF52C8 - .incbin "graphics/pokemon/masquerain/shiny.gbapal.lz" - - .align 2 -gMonIcon_Masquerain:: @ 8DF52F0 - .incbin "graphics/pokemon/masquerain/icon.4bpp" - - .align 2 -gMonFootprint_Masquerain:: @ 8DF56F0 - .incbin "graphics/pokemon/masquerain/footprint.1bpp" - - .align 2 -gMonFrontPic_Wailmer:: @ 8DF5710 - .incbin "graphics/pokemon/wailmer/front.4bpp.lz" - - .align 2 -gMonPalette_Wailmer:: @ 8DF59F0 - .incbin "graphics/pokemon/wailmer/normal.gbapal.lz" - - .align 2 -gMonBackPic_Wailmer:: @ 8DF5A18 - .incbin "graphics/pokemon/wailmer/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Wailmer:: @ 8DF5BFC - .incbin "graphics/pokemon/wailmer/shiny.gbapal.lz" - - .align 2 -gMonIcon_Wailmer:: @ 8DF5C24 - .incbin "graphics/pokemon/wailmer/icon.4bpp" - - .align 2 -gMonFootprint_Wailmer:: @ 8DF6024 - .incbin "graphics/pokemon/wailmer/footprint.1bpp" - - .align 2 -gMonFrontPic_Wailord:: @ 8DF6044 - .incbin "graphics/pokemon/wailord/front.4bpp.lz" - - .align 2 -gMonPalette_Wailord:: @ 8DF6408 - .incbin "graphics/pokemon/wailord/normal.gbapal.lz" - - .align 2 -gMonBackPic_Wailord:: @ 8DF6430 - .incbin "graphics/pokemon/wailord/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Wailord:: @ 8DF6648 - .incbin "graphics/pokemon/wailord/shiny.gbapal.lz" - - .align 2 -gMonIcon_Wailord:: @ 8DF6670 - .incbin "graphics/pokemon/wailord/icon.4bpp" - - .align 2 -gMonFootprint_Wailord:: @ 8DF6A70 - .incbin "graphics/pokemon/wailord/footprint.1bpp" - - .align 2 -gMonFrontPic_Skitty:: @ 8DF6A90 - .incbin "graphics/pokemon/skitty/front.4bpp.lz" - - .align 2 -gMonPalette_Skitty:: @ 8DF6D90 - .incbin "graphics/pokemon/skitty/normal.gbapal.lz" - - .align 2 -gMonBackPic_Skitty:: @ 8DF6DB8 - .incbin "graphics/pokemon/skitty/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Skitty:: @ 8DF7100 - .incbin "graphics/pokemon/skitty/shiny.gbapal.lz" - - .align 2 -gMonIcon_Skitty:: @ 8DF7128 - .incbin "graphics/pokemon/skitty/icon.4bpp" - - .align 2 -gMonFootprint_Skitty:: @ 8DF7528 - .incbin "graphics/pokemon/skitty/footprint.1bpp" - - .align 2 -gMonFrontPic_Delcatty:: @ 8DF7548 - .incbin "graphics/pokemon/delcatty/front.4bpp.lz" - - .align 2 -gMonPalette_Delcatty:: @ 8DF78D4 - .incbin "graphics/pokemon/delcatty/normal.gbapal.lz" - - .align 2 -gMonBackPic_Delcatty:: @ 8DF78FC - .incbin "graphics/pokemon/delcatty/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Delcatty:: @ 8DF7C98 - .incbin "graphics/pokemon/delcatty/shiny.gbapal.lz" - - .align 2 -gMonIcon_Delcatty:: @ 8DF7CC0 - .incbin "graphics/pokemon/delcatty/icon.4bpp" - - .align 2 -gMonFootprint_Delcatty:: @ 8DF80C0 - .incbin "graphics/pokemon/delcatty/footprint.1bpp" - - .align 2 -gMonFrontPic_Kecleon:: @ 8DF80E0 - .incbin "graphics/pokemon/kecleon/front.4bpp.lz" - - .align 2 -gMonPalette_Kecleon:: @ 8DF8460 - .incbin "graphics/pokemon/kecleon/normal.gbapal.lz" - - .align 2 -gMonBackPic_Kecleon:: @ 8DF8488 - .incbin "graphics/pokemon/kecleon/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Kecleon:: @ 8DF8860 - .incbin "graphics/pokemon/kecleon/shiny.gbapal.lz" - - .align 2 -gMonIcon_Kecleon:: @ 8DF8888 - .incbin "graphics/pokemon/kecleon/icon.4bpp" - - .align 2 -gMonFootprint_Kecleon:: @ 8DF8C88 - .incbin "graphics/pokemon/kecleon/footprint.1bpp" - - .align 2 -gMonFrontPic_Baltoy:: @ 8DF8CA8 - .incbin "graphics/pokemon/baltoy/front.4bpp.lz" - - .align 2 -gMonPalette_Baltoy:: @ 8DF8ECC - .incbin "graphics/pokemon/baltoy/normal.gbapal.lz" - - .align 2 -gMonBackPic_Baltoy:: @ 8DF8EEC - .incbin "graphics/pokemon/baltoy/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Baltoy:: @ 8DF9194 - .incbin "graphics/pokemon/baltoy/shiny.gbapal.lz" - - .align 2 -gMonIcon_Baltoy:: @ 8DF91B4 - .incbin "graphics/pokemon/baltoy/icon.4bpp" - - .align 2 -gMonFootprint_Baltoy:: @ 8DF95B4 - .incbin "graphics/pokemon/baltoy/footprint.1bpp" - - .align 2 -gMonFrontPic_Claydol:: @ 8DF95D4 - .incbin "graphics/pokemon/claydol/front.4bpp.lz" - - .align 2 -gMonPalette_Claydol:: @ 8DF998C - .incbin "graphics/pokemon/claydol/normal.gbapal.lz" - - .align 2 -gMonBackPic_Claydol:: @ 8DF99B4 - .incbin "graphics/pokemon/claydol/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Claydol:: @ 8DF9D88 - .incbin "graphics/pokemon/claydol/shiny.gbapal.lz" - - .align 2 -gMonIcon_Claydol:: @ 8DF9DB0 - .incbin "graphics/pokemon/claydol/icon.4bpp" - - .align 2 -gMonFootprint_Claydol:: @ 8DFA1B0 - .incbin "graphics/pokemon/claydol/footprint.1bpp" - - .align 2 -gMonFrontPic_Nosepass:: @ 8DFA1D0 - .incbin "graphics/pokemon/nosepass/front.4bpp.lz" - - .align 2 -gMonPalette_Nosepass:: @ 8DFA49C - .incbin "graphics/pokemon/nosepass/normal.gbapal.lz" - - .align 2 -gMonBackPic_Nosepass:: @ 8DFA4C4 - .incbin "graphics/pokemon/nosepass/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Nosepass:: @ 8DFA764 - .incbin "graphics/pokemon/nosepass/shiny.gbapal.lz" - - .align 2 -gMonIcon_Nosepass:: @ 8DFA78C - .incbin "graphics/pokemon/nosepass/icon.4bpp" - - .align 2 -gMonFootprint_Nosepass:: @ 8DFAB8C - .incbin "graphics/pokemon/nosepass/footprint.1bpp" - - .align 2 -gMonFrontPic_Torkoal:: @ 8DFABAC - .incbin "graphics/pokemon/torkoal/front.4bpp.lz" - - .align 2 -gMonPalette_Torkoal:: @ 8DFB058 - .incbin "graphics/pokemon/torkoal/normal.gbapal.lz" - - .align 2 -gMonBackPic_Torkoal:: @ 8DFB080 - .incbin "graphics/pokemon/torkoal/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Torkoal:: @ 8DFB348 - .incbin "graphics/pokemon/torkoal/shiny.gbapal.lz" - - .align 2 -gMonIcon_Torkoal:: @ 8DFB370 - .incbin "graphics/pokemon/torkoal/icon.4bpp" - - .align 2 -gMonFootprint_Torkoal:: @ 8DFB770 - .incbin "graphics/pokemon/torkoal/footprint.1bpp" - - .align 2 -gMonFrontPic_Sableye:: @ 8DFB790 - .incbin "graphics/pokemon/sableye/front.4bpp.lz" - - .align 2 -gMonPalette_Sableye:: @ 8DFBA64 - .incbin "graphics/pokemon/sableye/normal.gbapal.lz" - - .align 2 -gMonBackPic_Sableye:: @ 8DFBA8C - .incbin "graphics/pokemon/sableye/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Sableye:: @ 8DFBDB4 - .incbin "graphics/pokemon/sableye/shiny.gbapal.lz" - - .align 2 -gMonIcon_Sableye:: @ 8DFBDDC - .incbin "graphics/pokemon/sableye/icon.4bpp" - - .align 2 -gMonFootprint_Sableye:: @ 8DFC1DC - .incbin "graphics/pokemon/sableye/footprint.1bpp" - - .align 2 -gMonFrontPic_Barboach:: @ 8DFC1FC - .incbin "graphics/pokemon/barboach/front.4bpp.lz" - - .align 2 -gMonPalette_Barboach:: @ 8DFC48C - .incbin "graphics/pokemon/barboach/normal.gbapal.lz" - - .align 2 -gMonBackPic_Barboach:: @ 8DFC4B4 - .incbin "graphics/pokemon/barboach/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Barboach:: @ 8DFC744 - .incbin "graphics/pokemon/barboach/shiny.gbapal.lz" - - .align 2 -gMonIcon_Barboach:: @ 8DFC76C - .incbin "graphics/pokemon/barboach/icon.4bpp" - - .align 2 -gMonFootprint_Barboach:: @ 8DFCB6C - .incbin "graphics/pokemon/barboach/footprint.1bpp" - - .align 2 -gMonFrontPic_Whiscash:: @ 8DFCB8C - .incbin "graphics/pokemon/whiscash/front.4bpp.lz" - - .align 2 -gMonPalette_Whiscash:: @ 8DFCF04 - .incbin "graphics/pokemon/whiscash/normal.gbapal.lz" - - .align 2 -gMonBackPic_Whiscash:: @ 8DFCF2C - .incbin "graphics/pokemon/whiscash/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Whiscash:: @ 8DFD278 - .incbin "graphics/pokemon/whiscash/shiny.gbapal.lz" - - .align 2 -gMonIcon_Whiscash:: @ 8DFD2A0 - .incbin "graphics/pokemon/whiscash/icon.4bpp" - - .align 2 -gMonFootprint_Whiscash:: @ 8DFD6A0 - .incbin "graphics/pokemon/whiscash/footprint.1bpp" - - .align 2 -gMonFrontPic_Luvdisc:: @ 8DFD6C0 - .incbin "graphics/pokemon/luvdisc/front.4bpp.lz" - - .align 2 -gMonPalette_Luvdisc:: @ 8DFD880 - .incbin "graphics/pokemon/luvdisc/normal.gbapal.lz" - - .align 2 -gMonBackPic_Luvdisc:: @ 8DFD8A4 - .incbin "graphics/pokemon/luvdisc/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Luvdisc:: @ 8DFDA78 - .incbin "graphics/pokemon/luvdisc/shiny.gbapal.lz" - - .align 2 -gMonIcon_Luvdisc:: @ 8DFDA9C - .incbin "graphics/pokemon/luvdisc/icon.4bpp" - - .align 2 -gMonFootprint_Luvdisc:: @ 8DFDE9C - .incbin "graphics/pokemon/luvdisc/footprint.1bpp" - - .align 2 -gMonFrontPic_Corphish:: @ 8DFDEBC - .incbin "graphics/pokemon/corphish/front.4bpp.lz" - - .align 2 -gMonPalette_Corphish:: @ 8DFE218 - .incbin "graphics/pokemon/corphish/normal.gbapal.lz" - - .align 2 -gMonBackPic_Corphish:: @ 8DFE240 - .incbin "graphics/pokemon/corphish/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Corphish:: @ 8DFE55C - .incbin "graphics/pokemon/corphish/shiny.gbapal.lz" - - .align 2 -gMonIcon_Corphish:: @ 8DFE584 - .incbin "graphics/pokemon/corphish/icon.4bpp" - - .align 2 -gMonFootprint_Corphish:: @ 8DFE984 - .incbin "graphics/pokemon/corphish/footprint.1bpp" - - .align 2 -gMonFrontPic_Crawdaunt:: @ 8DFE9A4 - .incbin "graphics/pokemon/crawdaunt/front.4bpp.lz" - - .align 2 -gMonPalette_Crawdaunt:: @ 8DFEE34 - .incbin "graphics/pokemon/crawdaunt/normal.gbapal.lz" - - .align 2 -gMonBackPic_Crawdaunt:: @ 8DFEE5C - .incbin "graphics/pokemon/crawdaunt/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Crawdaunt:: @ 8DFF240 - .incbin "graphics/pokemon/crawdaunt/shiny.gbapal.lz" - - .align 2 -gMonIcon_Crawdaunt:: @ 8DFF268 - .incbin "graphics/pokemon/crawdaunt/icon.4bpp" - - .align 2 -gMonFootprint_Crawdaunt:: @ 8DFF668 - .incbin "graphics/pokemon/crawdaunt/footprint.1bpp" - - .align 2 -gMonFrontPic_Feebas:: @ 8DFF688 - .incbin "graphics/pokemon/feebas/front.4bpp.lz" - - .align 2 -gMonPalette_Feebas:: @ 8DFF914 - .incbin "graphics/pokemon/feebas/normal.gbapal.lz" - - .align 2 -gMonBackPic_Feebas:: @ 8DFF93C - .incbin "graphics/pokemon/feebas/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Feebas:: @ 8DFFC74 - .incbin "graphics/pokemon/feebas/shiny.gbapal.lz" - - .align 2 -gMonIcon_Feebas:: @ 8DFFC9C - .incbin "graphics/pokemon/feebas/icon.4bpp" - - .align 2 -gMonFootprint_Feebas:: @ 8E0009C - .incbin "graphics/pokemon/feebas/footprint.1bpp" - - .align 2 -gMonFrontPic_Milotic:: @ 8E000BC - .incbin "graphics/pokemon/milotic/front.4bpp.lz" - - .align 2 -gMonPalette_Milotic:: @ 8E0054C - .incbin "graphics/pokemon/milotic/normal.gbapal.lz" - - .align 2 -gMonBackPic_Milotic:: @ 8E00574 - .incbin "graphics/pokemon/milotic/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Milotic:: @ 8E00868 - .incbin "graphics/pokemon/milotic/shiny.gbapal.lz" - - .align 2 -gMonIcon_Milotic:: @ 8E00890 - .incbin "graphics/pokemon/milotic/icon.4bpp" - - .align 2 -gMonFootprint_Milotic:: @ 8E00C90 - .incbin "graphics/pokemon/milotic/footprint.1bpp" - - .align 2 -gMonFrontPic_Carvanha:: @ 8E00CB0 - .incbin "graphics/pokemon/carvanha/front.4bpp.lz" - - .align 2 -gMonPalette_Carvanha:: @ 8E00FDC - .incbin "graphics/pokemon/carvanha/normal.gbapal.lz" - - .align 2 -gMonBackPic_Carvanha:: @ 8E01004 - .incbin "graphics/pokemon/carvanha/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Carvanha:: @ 8E01314 - .incbin "graphics/pokemon/carvanha/shiny.gbapal.lz" - - .align 2 -gMonIcon_Carvanha:: @ 8E0133C - .incbin "graphics/pokemon/carvanha/icon.4bpp" - - .align 2 -gMonFootprint_Carvanha:: @ 8E0173C - .incbin "graphics/pokemon/carvanha/footprint.1bpp" - - .align 2 -gMonFrontPic_Sharpedo:: @ 8E0175C - .incbin "graphics/pokemon/sharpedo/front.4bpp.lz" - - .align 2 -gMonPalette_Sharpedo:: @ 8E01AEC - .incbin "graphics/pokemon/sharpedo/normal.gbapal.lz" - - .align 2 -gMonBackPic_Sharpedo:: @ 8E01B14 - .incbin "graphics/pokemon/sharpedo/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Sharpedo:: @ 8E01E6C - .incbin "graphics/pokemon/sharpedo/shiny.gbapal.lz" - - .align 2 -gMonIcon_Sharpedo:: @ 8E01E94 - .incbin "graphics/pokemon/sharpedo/icon.4bpp" - - .align 2 -gMonFootprint_Sharpedo:: @ 8E02294 - .incbin "graphics/pokemon/sharpedo/footprint.1bpp" - - .align 2 -gMonFrontPic_Trapinch:: @ 8E022B4 - .incbin "graphics/pokemon/trapinch/front.4bpp.lz" - - .align 2 -gMonPalette_Trapinch:: @ 8E024D0 - .incbin "graphics/pokemon/trapinch/normal.gbapal.lz" - - .align 2 -gMonBackPic_Trapinch:: @ 8E024F8 - .incbin "graphics/pokemon/trapinch/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Trapinch:: @ 8E02718 - .incbin "graphics/pokemon/trapinch/shiny.gbapal.lz" - - .align 2 -gMonIcon_Trapinch:: @ 8E02740 - .incbin "graphics/pokemon/trapinch/icon.4bpp" - - .align 2 -gMonFootprint_Trapinch:: @ 8E02B40 - .incbin "graphics/pokemon/trapinch/footprint.1bpp" - - .align 2 -gMonFrontPic_Vibrava:: @ 8E02B60 - .incbin "graphics/pokemon/vibrava/front.4bpp.lz" - - .align 2 -gMonPalette_Vibrava:: @ 8E02ED0 - .incbin "graphics/pokemon/vibrava/normal.gbapal.lz" - - .align 2 -gMonBackPic_Vibrava:: @ 8E02EF8 - .incbin "graphics/pokemon/vibrava/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Vibrava:: @ 8E03170 - .incbin "graphics/pokemon/vibrava/shiny.gbapal.lz" - - .align 2 -gMonIcon_Vibrava:: @ 8E03198 - .incbin "graphics/pokemon/vibrava/icon.4bpp" - - .align 2 -gMonFootprint_Vibrava:: @ 8E03598 - .incbin "graphics/pokemon/vibrava/footprint.1bpp" - - .align 2 -gMonFrontPic_Flygon:: @ 8E035B8 - .incbin "graphics/pokemon/flygon/front.4bpp.lz" - - .align 2 -gMonPalette_Flygon:: @ 8E03AA8 - .incbin "graphics/pokemon/flygon/normal.gbapal.lz" - - .align 2 -gMonBackPic_Flygon:: @ 8E03AD0 - .incbin "graphics/pokemon/flygon/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Flygon:: @ 8E03F0C - .incbin "graphics/pokemon/flygon/shiny.gbapal.lz" - - .align 2 -gMonIcon_Flygon:: @ 8E03F34 - .incbin "graphics/pokemon/flygon/icon.4bpp" - - .align 2 -gMonFootprint_Flygon:: @ 8E04334 - .incbin "graphics/pokemon/flygon/footprint.1bpp" - - .align 2 -gMonFrontPic_Makuhita:: @ 8E04354 - .incbin "graphics/pokemon/makuhita/front.4bpp.lz" - - .align 2 -gMonPalette_Makuhita:: @ 8E0466C - .incbin "graphics/pokemon/makuhita/normal.gbapal.lz" - - .align 2 -gMonBackPic_Makuhita:: @ 8E04694 - .incbin "graphics/pokemon/makuhita/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Makuhita:: @ 8E04984 - .incbin "graphics/pokemon/makuhita/shiny.gbapal.lz" - - .align 2 -gMonIcon_Makuhita:: @ 8E049A8 - .incbin "graphics/pokemon/makuhita/icon.4bpp" - - .align 2 -gMonFootprint_Makuhita:: @ 8E04DA8 - .incbin "graphics/pokemon/makuhita/footprint.1bpp" - - .align 2 -gMonFrontPic_Hariyama:: @ 8E04DC8 - .incbin "graphics/pokemon/hariyama/front.4bpp.lz" - - .align 2 -gMonPalette_Hariyama:: @ 8E05278 - .incbin "graphics/pokemon/hariyama/normal.gbapal.lz" - - .align 2 -gMonBackPic_Hariyama:: @ 8E052A0 - .incbin "graphics/pokemon/hariyama/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Hariyama:: @ 8E05680 - .incbin "graphics/pokemon/hariyama/shiny.gbapal.lz" - - .align 2 -gMonIcon_Hariyama:: @ 8E056A8 - .incbin "graphics/pokemon/hariyama/icon.4bpp" - - .align 2 -gMonFootprint_Hariyama:: @ 8E05AA8 - .incbin "graphics/pokemon/hariyama/footprint.1bpp" - - .align 2 -gMonFrontPic_Electrike:: @ 8E05AC8 - .incbin "graphics/pokemon/electrike/front.4bpp.lz" - - .align 2 -gMonPalette_Electrike:: @ 8E05D58 - .incbin "graphics/pokemon/electrike/normal.gbapal.lz" - - .align 2 -gMonBackPic_Electrike:: @ 8E05D80 - .incbin "graphics/pokemon/electrike/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Electrike:: @ 8E0600C - .incbin "graphics/pokemon/electrike/shiny.gbapal.lz" - - .align 2 -gMonIcon_Electrike:: @ 8E06034 - .incbin "graphics/pokemon/electrike/icon.4bpp" - - .align 2 -gMonFootprint_Electrike:: @ 8E06434 - .incbin "graphics/pokemon/electrike/footprint.1bpp" - - .align 2 -gMonFrontPic_Manectric:: @ 8E06454 - .incbin "graphics/pokemon/manectric/front.4bpp.lz" - - .align 2 -gMonPalette_Manectric:: @ 8E06784 - .incbin "graphics/pokemon/manectric/normal.gbapal.lz" - - .align 2 -gMonBackPic_Manectric:: @ 8E067AC - .incbin "graphics/pokemon/manectric/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Manectric:: @ 8E069D8 - .incbin "graphics/pokemon/manectric/shiny.gbapal.lz" - - .align 2 -gMonIcon_Manectric:: @ 8E06A00 - .incbin "graphics/pokemon/manectric/icon.4bpp" - - .align 2 -gMonFootprint_Manectric:: @ 8E06E00 - .incbin "graphics/pokemon/manectric/footprint.1bpp" - - .align 2 -gMonFrontPic_Numel:: @ 8E06E20 - .incbin "graphics/pokemon/numel/front.4bpp.lz" - - .align 2 -gMonPalette_Numel:: @ 8E070F0 - .incbin "graphics/pokemon/numel/normal.gbapal.lz" - - .align 2 -gMonBackPic_Numel:: @ 8E07118 - .incbin "graphics/pokemon/numel/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Numel:: @ 8E073D4 - .incbin "graphics/pokemon/numel/shiny.gbapal.lz" - - .align 2 -gMonIcon_Numel:: @ 8E073FC - .incbin "graphics/pokemon/numel/icon.4bpp" - - .align 2 -gMonFootprint_Numel:: @ 8E077FC - .incbin "graphics/pokemon/numel/footprint.1bpp" - - .align 2 -gMonFrontPic_Camerupt:: @ 8E0781C - .incbin "graphics/pokemon/camerupt/front.4bpp.lz" - - .align 2 -gMonPalette_Camerupt:: @ 8E07C34 - .incbin "graphics/pokemon/camerupt/normal.gbapal.lz" - - .align 2 -gMonBackPic_Camerupt:: @ 8E07C5C - .incbin "graphics/pokemon/camerupt/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Camerupt:: @ 8E07F20 - .incbin "graphics/pokemon/camerupt/shiny.gbapal.lz" - - .align 2 -gMonIcon_Camerupt:: @ 8E07F48 - .incbin "graphics/pokemon/camerupt/icon.4bpp" - - .align 2 -gMonFootprint_Camerupt:: @ 8E08348 - .incbin "graphics/pokemon/camerupt/footprint.1bpp" - - .align 2 -gMonFrontPic_Spheal:: @ 8E08368 - .incbin "graphics/pokemon/spheal/front.4bpp.lz" - - .align 2 -gMonPalette_Spheal:: @ 8E085DC - .incbin "graphics/pokemon/spheal/normal.gbapal.lz" - - .align 2 -gMonBackPic_Spheal:: @ 8E08604 - .incbin "graphics/pokemon/spheal/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Spheal:: @ 8E08800 - .incbin "graphics/pokemon/spheal/shiny.gbapal.lz" - - .align 2 -gMonIcon_Spheal:: @ 8E08828 - .incbin "graphics/pokemon/spheal/icon.4bpp" - - .align 2 -gMonFootprint_Spheal:: @ 8E08C28 - .incbin "graphics/pokemon/spheal/footprint.1bpp" - - .align 2 -gMonFrontPic_Sealeo:: @ 8E08C48 - .incbin "graphics/pokemon/sealeo/front.4bpp.lz" - - .align 2 -gMonPalette_Sealeo:: @ 8E08FC8 - .incbin "graphics/pokemon/sealeo/normal.gbapal.lz" - - .align 2 -gMonBackPic_Sealeo:: @ 8E08FF0 - .incbin "graphics/pokemon/sealeo/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Sealeo:: @ 8E0926C - .incbin "graphics/pokemon/sealeo/shiny.gbapal.lz" - - .align 2 -gMonIcon_Sealeo:: @ 8E09294 - .incbin "graphics/pokemon/sealeo/icon.4bpp" - - .align 2 -gMonFootprint_Sealeo:: @ 8E09694 - .incbin "graphics/pokemon/sealeo/footprint.1bpp" - - .align 2 -gMonFrontPic_Walrein:: @ 8E096B4 - .incbin "graphics/pokemon/walrein/front.4bpp.lz" - - .align 2 -gMonPalette_Walrein:: @ 8E09B54 - .incbin "graphics/pokemon/walrein/normal.gbapal.lz" - - .align 2 -gMonBackPic_Walrein:: @ 8E09B7C - .incbin "graphics/pokemon/walrein/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Walrein:: @ 8E09F04 - .incbin "graphics/pokemon/walrein/shiny.gbapal.lz" - - .align 2 -gMonIcon_Walrein:: @ 8E09F2C - .incbin "graphics/pokemon/walrein/icon.4bpp" - - .align 2 -gMonFootprint_Walrein:: @ 8E0A32C - .incbin "graphics/pokemon/walrein/footprint.1bpp" - - .align 2 -gMonFrontPic_Cacnea:: @ 8E0A34C - .incbin "graphics/pokemon/cacnea/front.4bpp.lz" - - .align 2 -gMonPalette_Cacnea:: @ 8E0A65C - .incbin "graphics/pokemon/cacnea/normal.gbapal.lz" - - .align 2 -gMonBackPic_Cacnea:: @ 8E0A684 - .incbin "graphics/pokemon/cacnea/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Cacnea:: @ 8E0A9E4 - .incbin "graphics/pokemon/cacnea/shiny.gbapal.lz" - - .align 2 -gMonIcon_Cacnea:: @ 8E0AA0C - .incbin "graphics/pokemon/cacnea/icon.4bpp" - - .align 2 -gMonFootprint_Cacnea:: @ 8E0AE0C - .incbin "graphics/pokemon/cacnea/footprint.1bpp" - - .align 2 -gMonFrontPic_Cacturne:: @ 8E0AE2C - .incbin "graphics/pokemon/cacturne/front.4bpp.lz" - - .align 2 -gMonPalette_Cacturne:: @ 8E0B264 - .incbin "graphics/pokemon/cacturne/normal.gbapal.lz" - - .align 2 -gMonBackPic_Cacturne:: @ 8E0B28C - .incbin "graphics/pokemon/cacturne/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Cacturne:: @ 8E0B58C - .incbin "graphics/pokemon/cacturne/shiny.gbapal.lz" - - .align 2 -gMonIcon_Cacturne:: @ 8E0B5B4 - .incbin "graphics/pokemon/cacturne/icon.4bpp" - - .align 2 -gMonFootprint_Cacturne:: @ 8E0B9B4 - .incbin "graphics/pokemon/cacturne/footprint.1bpp" - - .align 2 -gMonFrontPic_Snorunt:: @ 8E0B9D4 - .incbin "graphics/pokemon/snorunt/front.4bpp.lz" - - .align 2 -gMonPalette_Snorunt:: @ 8E0BC98 - .incbin "graphics/pokemon/snorunt/normal.gbapal.lz" - - .align 2 -gMonBackPic_Snorunt:: @ 8E0BCC0 - .incbin "graphics/pokemon/snorunt/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Snorunt:: @ 8E0BFA4 - .incbin "graphics/pokemon/snorunt/shiny.gbapal.lz" - - .align 2 -gMonIcon_Snorunt:: @ 8E0BFCC - .incbin "graphics/pokemon/snorunt/icon.4bpp" - - .align 2 -gMonFootprint_Snorunt:: @ 8E0C3CC - .incbin "graphics/pokemon/snorunt/footprint.1bpp" - - .align 2 -gMonFrontPic_Glalie:: @ 8E0C3EC - .incbin "graphics/pokemon/glalie/front.4bpp.lz" - - .align 2 -gMonPalette_Glalie:: @ 8E0C7B4 - .incbin "graphics/pokemon/glalie/normal.gbapal.lz" - - .align 2 -gMonBackPic_Glalie:: @ 8E0C7DC - .incbin "graphics/pokemon/glalie/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Glalie:: @ 8E0CB8C - .incbin "graphics/pokemon/glalie/shiny.gbapal.lz" - - .align 2 -gMonIcon_Glalie:: @ 8E0CBB4 - .incbin "graphics/pokemon/glalie/icon.4bpp" - - .align 2 -gMonFootprint_Glalie:: @ 8E0CFB4 - .incbin "graphics/pokemon/glalie/footprint.1bpp" - - .align 2 -gMonFrontPic_Lunatone:: @ 8E0CFD4 - .incbin "graphics/pokemon/lunatone/front.4bpp.lz" - - .align 2 -gMonPalette_Lunatone:: @ 8E0D2FC - .incbin "graphics/pokemon/lunatone/normal.gbapal.lz" - - .align 2 -gMonBackPic_Lunatone:: @ 8E0D324 - .incbin "graphics/pokemon/lunatone/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Lunatone:: @ 8E0D67C - .incbin "graphics/pokemon/lunatone/shiny.gbapal.lz" - - .align 2 -gMonIcon_Lunatone:: @ 8E0D6A4 - .incbin "graphics/pokemon/lunatone/icon.4bpp" - - .align 2 -gMonFootprint_Lunatone:: @ 8E0DAA4 - .incbin "graphics/pokemon/lunatone/footprint.1bpp" - - .align 2 -gMonFrontPic_Solrock:: @ 8E0DAC4 - .incbin "graphics/pokemon/solrock/front.4bpp.lz" - - .align 2 -gMonPalette_Solrock:: @ 8E0DF10 - .incbin "graphics/pokemon/solrock/normal.gbapal.lz" - - .align 2 -gMonBackPic_Solrock:: @ 8E0DF38 - .incbin "graphics/pokemon/solrock/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Solrock:: @ 8E0E324 - .incbin "graphics/pokemon/solrock/shiny.gbapal.lz" - - .align 2 -gMonIcon_Solrock:: @ 8E0E34C - .incbin "graphics/pokemon/solrock/icon.4bpp" - - .align 2 -gMonFootprint_Solrock:: @ 8E0E74C - .incbin "graphics/pokemon/solrock/footprint.1bpp" - - .align 2 -gMonFrontPic_Azurill:: @ 8E0E76C - .incbin "graphics/pokemon/azurill/front.4bpp.lz" - - .align 2 -gMonPalette_Azurill:: @ 8E0EA34 - .incbin "graphics/pokemon/azurill/normal.gbapal.lz" - - .align 2 -gMonBackPic_Azurill:: @ 8E0EA5C - .incbin "graphics/pokemon/azurill/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Azurill:: @ 8E0ED74 - .incbin "graphics/pokemon/azurill/shiny.gbapal.lz" - - .align 2 -gMonIcon_Azurill:: @ 8E0ED9C - .incbin "graphics/pokemon/azurill/icon.4bpp" - - .align 2 -gMonFootprint_Azurill:: @ 8E0F19C - .incbin "graphics/pokemon/azurill/footprint.1bpp" - - .align 2 -gMonFrontPic_Spoink:: @ 8E0F1BC - .incbin "graphics/pokemon/spoink/front.4bpp.lz" - - .align 2 -gMonPalette_Spoink:: @ 8E0F428 - .incbin "graphics/pokemon/spoink/normal.gbapal.lz" - - .align 2 -gMonBackPic_Spoink:: @ 8E0F450 - .incbin "graphics/pokemon/spoink/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Spoink:: @ 8E0F690 - .incbin "graphics/pokemon/spoink/shiny.gbapal.lz" - - .align 2 -gMonIcon_Spoink:: @ 8E0F6B8 - .incbin "graphics/pokemon/spoink/icon.4bpp" - - .align 2 -gMonFootprint_Spoink:: @ 8E0FAB8 - .incbin "graphics/pokemon/spoink/footprint.1bpp" - - .align 2 -gMonFrontPic_Grumpig:: @ 8E0FAD8 - .incbin "graphics/pokemon/grumpig/front.4bpp.lz" - - .align 2 -gMonPalette_Grumpig:: @ 8E0FE94 - .incbin "graphics/pokemon/grumpig/normal.gbapal.lz" - - .align 2 -gMonBackPic_Grumpig:: @ 8E0FEBC - .incbin "graphics/pokemon/grumpig/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Grumpig:: @ 8E1021C - .incbin "graphics/pokemon/grumpig/shiny.gbapal.lz" - - .align 2 -gMonIcon_Grumpig:: @ 8E10244 - .incbin "graphics/pokemon/grumpig/icon.4bpp" - - .align 2 -gMonFootprint_Grumpig:: @ 8E10644 - .incbin "graphics/pokemon/grumpig/footprint.1bpp" - - .align 2 -gMonFrontPic_Plusle:: @ 8E10664 - .incbin "graphics/pokemon/plusle/front.4bpp.lz" - - .align 2 -gMonPalette_Plusle:: @ 8E108F0 - .incbin "graphics/pokemon/plusle/normal.gbapal.lz" - - .align 2 -gMonBackPic_Plusle:: @ 8E10918 - .incbin "graphics/pokemon/plusle/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Plusle:: @ 8E10BD0 - .incbin "graphics/pokemon/plusle/shiny.gbapal.lz" - - .align 2 -gMonIcon_Plusle:: @ 8E10BF8 - .incbin "graphics/pokemon/plusle/icon.4bpp" - - .align 2 -gMonFootprint_Plusle:: @ 8E10FF8 - .incbin "graphics/pokemon/plusle/footprint.1bpp" - - .align 2 -gMonFrontPic_Minun:: @ 8E11018 - .incbin "graphics/pokemon/minun/front.4bpp.lz" - - .align 2 -gMonPalette_Minun:: @ 8E11280 - .incbin "graphics/pokemon/minun/normal.gbapal.lz" - - .align 2 -gMonBackPic_Minun:: @ 8E112A8 - .incbin "graphics/pokemon/minun/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Minun:: @ 8E11570 - .incbin "graphics/pokemon/minun/shiny.gbapal.lz" - - .align 2 -gMonIcon_Minun:: @ 8E11598 - .incbin "graphics/pokemon/minun/icon.4bpp" - - .align 2 -gMonFootprint_Minun:: @ 8E11998 - .incbin "graphics/pokemon/minun/footprint.1bpp" - - .align 2 -gMonFrontPic_Mawile:: @ 8E119B8 - .incbin "graphics/pokemon/mawile/front.4bpp.lz" - - .align 2 -gMonPalette_Mawile:: @ 8E11D74 - .incbin "graphics/pokemon/mawile/normal.gbapal.lz" - - .align 2 -gMonBackPic_Mawile:: @ 8E11D9C - .incbin "graphics/pokemon/mawile/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Mawile:: @ 8E1219C - .incbin "graphics/pokemon/mawile/shiny.gbapal.lz" - - .align 2 -gMonIcon_Mawile:: @ 8E121C4 - .incbin "graphics/pokemon/mawile/icon.4bpp" - - .align 2 -gMonFootprint_Mawile:: @ 8E125C4 - .incbin "graphics/pokemon/mawile/footprint.1bpp" - - .align 2 -gMonFrontPic_Meditite:: @ 8E125E4 - .incbin "graphics/pokemon/meditite/front.4bpp.lz" - - .align 2 -gMonPalette_Meditite:: @ 8E1289C - .incbin "graphics/pokemon/meditite/normal.gbapal.lz" - - .align 2 -gMonBackPic_Meditite:: @ 8E128C4 - .incbin "graphics/pokemon/meditite/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Meditite:: @ 8E12B8C - .incbin "graphics/pokemon/meditite/shiny.gbapal.lz" - - .align 2 -gMonIcon_Meditite:: @ 8E12BB0 - .incbin "graphics/pokemon/meditite/icon.4bpp" - - .align 2 -gMonFootprint_Meditite:: @ 8E12FB0 - .incbin "graphics/pokemon/meditite/footprint.1bpp" - - .align 2 -gMonFrontPic_Medicham:: @ 8E12FD0 - .incbin "graphics/pokemon/medicham/front.4bpp.lz" - - .align 2 -gMonPalette_Medicham:: @ 8E13300 - .incbin "graphics/pokemon/medicham/normal.gbapal.lz" - - .align 2 -gMonBackPic_Medicham:: @ 8E13328 - .incbin "graphics/pokemon/medicham/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Medicham:: @ 8E13660 - .incbin "graphics/pokemon/medicham/shiny.gbapal.lz" - - .align 2 -gMonIcon_Medicham:: @ 8E13688 - .incbin "graphics/pokemon/medicham/icon.4bpp" - - .align 2 -gMonFootprint_Medicham:: @ 8E13A88 - .incbin "graphics/pokemon/medicham/footprint.1bpp" - - .align 2 -gMonFrontPic_Swablu:: @ 8E13AA8 - .incbin "graphics/pokemon/swablu/front.4bpp.lz" - - .align 2 -gMonPalette_Swablu:: @ 8E13D80 - .incbin "graphics/pokemon/swablu/normal.gbapal.lz" - - .align 2 -gMonBackPic_Swablu:: @ 8E13DA8 - .incbin "graphics/pokemon/swablu/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Swablu:: @ 8E14160 - .incbin "graphics/pokemon/swablu/shiny.gbapal.lz" - - .align 2 -gMonIcon_Swablu:: @ 8E14188 - .incbin "graphics/pokemon/swablu/icon.4bpp" - - .align 2 -gMonFootprint_Swablu:: @ 8E14588 - .incbin "graphics/pokemon/swablu/footprint.1bpp" - - .align 2 -gMonFrontPic_Altaria:: @ 8E145A8 - .incbin "graphics/pokemon/altaria/front.4bpp.lz" - - .align 2 -gMonPalette_Altaria:: @ 8E14984 - .incbin "graphics/pokemon/altaria/normal.gbapal.lz" - - .align 2 -gMonBackPic_Altaria:: @ 8E149AC - .incbin "graphics/pokemon/altaria/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Altaria:: @ 8E14D24 - .incbin "graphics/pokemon/altaria/shiny.gbapal.lz" - - .align 2 -gMonIcon_Altaria:: @ 8E14D4C - .incbin "graphics/pokemon/altaria/icon.4bpp" - - .align 2 -gMonFootprint_Altaria:: @ 8E1514C - .incbin "graphics/pokemon/altaria/footprint.1bpp" - - .align 2 -gMonFrontPic_Wynaut:: @ 8E1516C - .incbin "graphics/pokemon/wynaut/front.4bpp.lz" - - .align 2 -gMonPalette_Wynaut:: @ 8E15404 - .incbin "graphics/pokemon/wynaut/normal.gbapal.lz" - - .align 2 -gMonBackPic_Wynaut:: @ 8E1542C - .incbin "graphics/pokemon/wynaut/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Wynaut:: @ 8E156BC - .incbin "graphics/pokemon/wynaut/shiny.gbapal.lz" - - .align 2 -gMonIcon_Wynaut:: @ 8E156E4 - .incbin "graphics/pokemon/wynaut/icon.4bpp" - - .align 2 -gMonFootprint_Wynaut:: @ 8E15AE4 - .incbin "graphics/pokemon/wynaut/footprint.1bpp" - - .align 2 -gMonFrontPic_Duskull:: @ 8E15B04 - .incbin "graphics/pokemon/duskull/front.4bpp.lz" - - .align 2 -gMonPalette_Duskull:: @ 8E15DF4 - .incbin "graphics/pokemon/duskull/normal.gbapal.lz" - - .align 2 -gMonBackPic_Duskull:: @ 8E15E1C - .incbin "graphics/pokemon/duskull/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Duskull:: @ 8E160CC - .incbin "graphics/pokemon/duskull/shiny.gbapal.lz" - - .align 2 -gMonIcon_Duskull:: @ 8E160F4 - .incbin "graphics/pokemon/duskull/icon.4bpp" - - .align 2 -gMonFootprint_Duskull:: @ 8E164F4 - .incbin "graphics/pokemon/duskull/footprint.1bpp" - - .align 2 -gMonFrontPic_Dusclops:: @ 8E16514 - .incbin "graphics/pokemon/dusclops/front.4bpp.lz" - - .align 2 -gMonPalette_Dusclops:: @ 8E168B4 - .incbin "graphics/pokemon/dusclops/normal.gbapal.lz" - - .align 2 -gMonBackPic_Dusclops:: @ 8E168DC - .incbin "graphics/pokemon/dusclops/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Dusclops:: @ 8E16BC8 - .incbin "graphics/pokemon/dusclops/shiny.gbapal.lz" - - .align 2 -gMonIcon_Dusclops:: @ 8E16BF0 - .incbin "graphics/pokemon/dusclops/icon.4bpp" - - .align 2 -gMonFootprint_Dusclops:: @ 8E16FF0 - .incbin "graphics/pokemon/dusclops/footprint.1bpp" - - .align 2 -gMonFrontPic_Roselia:: @ 8E17010 - .incbin "graphics/pokemon/roselia/front.4bpp.lz" - - .align 2 -gMonPalette_Roselia:: @ 8E1737C - .incbin "graphics/pokemon/roselia/normal.gbapal.lz" - - .align 2 -gMonBackPic_Roselia:: @ 8E173A4 - .incbin "graphics/pokemon/roselia/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Roselia:: @ 8E1776C - .incbin "graphics/pokemon/roselia/shiny.gbapal.lz" - - .align 2 -gMonIcon_Roselia:: @ 8E17794 - .incbin "graphics/pokemon/roselia/icon.4bpp" - - .align 2 -gMonFootprint_Roselia:: @ 8E17B94 - .incbin "graphics/pokemon/roselia/footprint.1bpp" - - .align 2 -gMonFrontPic_Slakoth:: @ 8E17BB4 - .incbin "graphics/pokemon/slakoth/front.4bpp.lz" - - .align 2 -gMonPalette_Slakoth:: @ 8E17E9C - .incbin "graphics/pokemon/slakoth/normal.gbapal.lz" - - .align 2 -gMonBackPic_Slakoth:: @ 8E17EC4 - .incbin "graphics/pokemon/slakoth/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Slakoth:: @ 8E181AC - .incbin "graphics/pokemon/slakoth/shiny.gbapal.lz" - - .align 2 -gMonIcon_Slakoth:: @ 8E181D4 - .incbin "graphics/pokemon/slakoth/icon.4bpp" - - .align 2 -gMonFootprint_Slakoth:: @ 8E185D4 - .incbin "graphics/pokemon/slakoth/footprint.1bpp" - - .align 2 -gMonFrontPic_Vigoroth:: @ 8E185F4 - .incbin "graphics/pokemon/vigoroth/front.4bpp.lz" - - .align 2 -gMonPalette_Vigoroth:: @ 8E189F0 - .incbin "graphics/pokemon/vigoroth/normal.gbapal.lz" - - .align 2 -gMonBackPic_Vigoroth:: @ 8E18A18 - .incbin "graphics/pokemon/vigoroth/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Vigoroth:: @ 8E18CE0 - .incbin "graphics/pokemon/vigoroth/shiny.gbapal.lz" - - .align 2 -gMonIcon_Vigoroth:: @ 8E18D08 - .incbin "graphics/pokemon/vigoroth/icon.4bpp" - - .align 2 -gMonFootprint_Vigoroth:: @ 8E19108 - .incbin "graphics/pokemon/vigoroth/footprint.1bpp" - - .align 2 -gMonFrontPic_Slaking:: @ 8E19128 - .incbin "graphics/pokemon/slaking/front.4bpp.lz" - - .align 2 -gMonPalette_Slaking:: @ 8E195FC - .incbin "graphics/pokemon/slaking/normal.gbapal.lz" - - .align 2 -gMonBackPic_Slaking:: @ 8E19624 - .incbin "graphics/pokemon/slaking/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Slaking:: @ 8E199E8 - .incbin "graphics/pokemon/slaking/shiny.gbapal.lz" - - .align 2 -gMonIcon_Slaking:: @ 8E19A10 - .incbin "graphics/pokemon/slaking/icon.4bpp" - - .align 2 -gMonFootprint_Slaking:: @ 8E19E10 - .incbin "graphics/pokemon/slaking/footprint.1bpp" - - .align 2 -gMonFrontPic_Gulpin:: @ 8E19E30 - .incbin "graphics/pokemon/gulpin/front.4bpp.lz" - - .align 2 -gMonPalette_Gulpin:: @ 8E1A048 - .incbin "graphics/pokemon/gulpin/normal.gbapal.lz" - - .align 2 -gMonBackPic_Gulpin:: @ 8E1A070 - .incbin "graphics/pokemon/gulpin/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Gulpin:: @ 8E1A2F4 - .incbin "graphics/pokemon/gulpin/shiny.gbapal.lz" - - .align 2 -gMonIcon_Gulpin:: @ 8E1A31C - .incbin "graphics/pokemon/gulpin/icon.4bpp" - - .align 2 -gMonFootprint_Gulpin:: @ 8E1A71C - .incbin "graphics/pokemon/gulpin/footprint.1bpp" - - .align 2 -gMonFrontPic_Swalot:: @ 8E1A73C - .incbin "graphics/pokemon/swalot/front.4bpp.lz" - - .align 2 -gMonPalette_Swalot:: @ 8E1AA80 - .incbin "graphics/pokemon/swalot/normal.gbapal.lz" - - .align 2 -gMonBackPic_Swalot:: @ 8E1AAA8 - .incbin "graphics/pokemon/swalot/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Swalot:: @ 8E1ADF0 - .incbin "graphics/pokemon/swalot/shiny.gbapal.lz" - - .align 2 -gMonIcon_Swalot:: @ 8E1AE18 - .incbin "graphics/pokemon/swalot/icon.4bpp" - - .align 2 -gMonFootprint_Swalot:: @ 8E1B218 - .incbin "graphics/pokemon/swalot/footprint.1bpp" - - .align 2 -gMonFrontPic_Tropius:: @ 8E1B238 - .incbin "graphics/pokemon/tropius/front.4bpp.lz" - - .align 2 -gMonPalette_Tropius:: @ 8E1B7B0 - .incbin "graphics/pokemon/tropius/normal.gbapal.lz" - - .align 2 -gMonBackPic_Tropius:: @ 8E1B7D8 - .incbin "graphics/pokemon/tropius/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Tropius:: @ 8E1BAFC - .incbin "graphics/pokemon/tropius/shiny.gbapal.lz" - - .align 2 -gMonIcon_Tropius:: @ 8E1BB24 - .incbin "graphics/pokemon/tropius/icon.4bpp" - - .align 2 -gMonFootprint_Tropius:: @ 8E1BF24 - .incbin "graphics/pokemon/tropius/footprint.1bpp" - - .align 2 -gMonFrontPic_Whismur:: @ 8E1BF44 - .incbin "graphics/pokemon/whismur/front.4bpp.lz" - - .align 2 -gMonPalette_Whismur:: @ 8E1C1D8 - .incbin "graphics/pokemon/whismur/normal.gbapal.lz" - - .align 2 -gMonBackPic_Whismur:: @ 8E1C200 - .incbin "graphics/pokemon/whismur/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Whismur:: @ 8E1C470 - .incbin "graphics/pokemon/whismur/shiny.gbapal.lz" - - .align 2 -gMonIcon_Whismur:: @ 8E1C498 - .incbin "graphics/pokemon/whismur/icon.4bpp" - - .align 2 -gMonFootprint_Whismur:: @ 8E1C898 - .incbin "graphics/pokemon/whismur/footprint.1bpp" - - .align 2 -gMonFrontPic_Loudred:: @ 8E1C8B8 - .incbin "graphics/pokemon/loudred/front.4bpp.lz" - - .align 2 -gMonPalette_Loudred:: @ 8E1CD30 - .incbin "graphics/pokemon/loudred/normal.gbapal.lz" - - .align 2 -gMonBackPic_Loudred:: @ 8E1CD58 - .incbin "graphics/pokemon/loudred/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Loudred:: @ 8E1D0C8 - .incbin "graphics/pokemon/loudred/shiny.gbapal.lz" - - .align 2 -gMonIcon_Loudred:: @ 8E1D0F0 - .incbin "graphics/pokemon/loudred/icon.4bpp" - - .align 2 -gMonFootprint_Loudred:: @ 8E1D4F0 - .incbin "graphics/pokemon/loudred/footprint.1bpp" - - .align 2 -gMonFrontPic_Exploud:: @ 8E1D510 - .incbin "graphics/pokemon/exploud/front.4bpp.lz" - - .align 2 -gMonPalette_Exploud:: @ 8E1DA78 - .incbin "graphics/pokemon/exploud/normal.gbapal.lz" - - .align 2 -gMonBackPic_Exploud:: @ 8E1DAA0 - .incbin "graphics/pokemon/exploud/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Exploud:: @ 8E1DEAC - .incbin "graphics/pokemon/exploud/shiny.gbapal.lz" - - .align 2 -gMonIcon_Exploud:: @ 8E1DED4 - .incbin "graphics/pokemon/exploud/icon.4bpp" - - .align 2 -gMonFootprint_Exploud:: @ 8E1E2D4 - .incbin "graphics/pokemon/exploud/footprint.1bpp" - - .align 2 -gMonFrontPic_Clamperl:: @ 8E1E2F4 - .incbin "graphics/pokemon/clamperl/front.4bpp.lz" - - .align 2 -gMonPalette_Clamperl:: @ 8E1E5CC - .incbin "graphics/pokemon/clamperl/normal.gbapal.lz" - - .align 2 -gMonBackPic_Clamperl:: @ 8E1E5F4 - .incbin "graphics/pokemon/clamperl/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Clamperl:: @ 8E1E888 - .incbin "graphics/pokemon/clamperl/shiny.gbapal.lz" - - .align 2 -gMonIcon_Clamperl:: @ 8E1E8B0 - .incbin "graphics/pokemon/clamperl/icon.4bpp" - - .align 2 -gMonFootprint_Clamperl:: @ 8E1ECB0 - .incbin "graphics/pokemon/clamperl/footprint.1bpp" - - .align 2 -gMonFrontPic_Huntail:: @ 8E1ECD0 - .incbin "graphics/pokemon/huntail/front.4bpp.lz" - - .align 2 -gMonPalette_Huntail:: @ 8E1F09C - .incbin "graphics/pokemon/huntail/normal.gbapal.lz" - - .align 2 -gMonBackPic_Huntail:: @ 8E1F0C4 - .incbin "graphics/pokemon/huntail/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Huntail:: @ 8E1F418 - .incbin "graphics/pokemon/huntail/shiny.gbapal.lz" - - .align 2 -gMonIcon_Huntail:: @ 8E1F440 - .incbin "graphics/pokemon/huntail/icon.4bpp" - - .align 2 -gMonFootprint_Huntail:: @ 8E1F840 - .incbin "graphics/pokemon/huntail/footprint.1bpp" - - .align 2 -gMonFrontPic_Gorebyss:: @ 8E1F860 - .incbin "graphics/pokemon/gorebyss/front.4bpp.lz" - - .align 2 -gMonPalette_Gorebyss:: @ 8E1FB70 - .incbin "graphics/pokemon/gorebyss/normal.gbapal.lz" - - .align 2 -gMonBackPic_Gorebyss:: @ 8E1FB98 - .incbin "graphics/pokemon/gorebyss/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Gorebyss:: @ 8E1FE80 - .incbin "graphics/pokemon/gorebyss/shiny.gbapal.lz" - - .align 2 -gMonIcon_Gorebyss:: @ 8E1FEA8 - .incbin "graphics/pokemon/gorebyss/icon.4bpp" - - .align 2 -gMonFootprint_Gorebyss:: @ 8E202A8 - .incbin "graphics/pokemon/gorebyss/footprint.1bpp" - - .align 2 -gMonFrontPic_Absol:: @ 8E202C8 - .incbin "graphics/pokemon/absol/front.4bpp.lz" - - .align 2 -gMonPalette_Absol:: @ 8E206F8 - .incbin "graphics/pokemon/absol/normal.gbapal.lz" - - .align 2 -gMonBackPic_Absol:: @ 8E20720 - .incbin "graphics/pokemon/absol/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Absol:: @ 8E20A80 - .incbin "graphics/pokemon/absol/shiny.gbapal.lz" - - .align 2 -gMonIcon_Absol:: @ 8E20AA8 - .incbin "graphics/pokemon/absol/icon.4bpp" - - .align 2 -gMonFootprint_Absol:: @ 8E20EA8 - .incbin "graphics/pokemon/absol/footprint.1bpp" - - .align 2 -gMonFrontPic_Shuppet:: @ 8E20EC8 - .incbin "graphics/pokemon/shuppet/front.4bpp.lz" - - .align 2 -gMonPalette_Shuppet:: @ 8E21100 - .incbin "graphics/pokemon/shuppet/normal.gbapal.lz" - - .align 2 -gMonBackPic_Shuppet:: @ 8E21128 - .incbin "graphics/pokemon/shuppet/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Shuppet:: @ 8E213C0 - .incbin "graphics/pokemon/shuppet/shiny.gbapal.lz" - - .align 2 -gMonIcon_Shuppet:: @ 8E213E8 - .incbin "graphics/pokemon/shuppet/icon.4bpp" - - .align 2 -gMonFootprint_Shuppet:: @ 8E217E8 - .incbin "graphics/pokemon/shuppet/footprint.1bpp" - - .align 2 -gMonFrontPic_Banette:: @ 8E21808 - .incbin "graphics/pokemon/banette/front.4bpp.lz" - - .align 2 -gMonPalette_Banette:: @ 8E21ABC - .incbin "graphics/pokemon/banette/normal.gbapal.lz" - - .align 2 -gMonBackPic_Banette:: @ 8E21AE4 - .incbin "graphics/pokemon/banette/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Banette:: @ 8E21D60 - .incbin "graphics/pokemon/banette/shiny.gbapal.lz" - - .align 2 -gMonIcon_Banette:: @ 8E21D88 - .incbin "graphics/pokemon/banette/icon.4bpp" - - .align 2 -gMonFootprint_Banette:: @ 8E22188 - .incbin "graphics/pokemon/banette/footprint.1bpp" - - .align 2 -gMonFrontPic_Seviper:: @ 8E221A8 - .incbin "graphics/pokemon/seviper/front.4bpp.lz" - - .align 2 -gMonPalette_Seviper:: @ 8E225C8 - .incbin "graphics/pokemon/seviper/normal.gbapal.lz" - - .align 2 -gMonBackPic_Seviper:: @ 8E225F0 - .incbin "graphics/pokemon/seviper/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Seviper:: @ 8E22A7C - .incbin "graphics/pokemon/seviper/shiny.gbapal.lz" - - .align 2 -gMonIcon_Seviper:: @ 8E22AA4 - .incbin "graphics/pokemon/seviper/icon.4bpp" - - .align 2 -gMonFootprint_Seviper:: @ 8E22EA4 - .incbin "graphics/pokemon/seviper/footprint.1bpp" - - .align 2 -gMonFrontPic_Zangoose:: @ 8E22EC4 - .incbin "graphics/pokemon/zangoose/front.4bpp.lz" - - .align 2 -gMonPalette_Zangoose:: @ 8E23290 - .incbin "graphics/pokemon/zangoose/normal.gbapal.lz" - - .align 2 -gMonBackPic_Zangoose:: @ 8E232B8 - .incbin "graphics/pokemon/zangoose/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Zangoose:: @ 8E2362C - .incbin "graphics/pokemon/zangoose/shiny.gbapal.lz" - - .align 2 -gMonIcon_Zangoose:: @ 8E23654 - .incbin "graphics/pokemon/zangoose/icon.4bpp" - - .align 2 -gMonFootprint_Zangoose:: @ 8E23A54 - .incbin "graphics/pokemon/zangoose/footprint.1bpp" - - .align 2 -gMonFrontPic_Relicanth:: @ 8E23A74 - .incbin "graphics/pokemon/relicanth/front.4bpp.lz" - - .align 2 -gMonPalette_Relicanth:: @ 8E23E08 - .incbin "graphics/pokemon/relicanth/normal.gbapal.lz" - - .align 2 -gMonBackPic_Relicanth:: @ 8E23E30 - .incbin "graphics/pokemon/relicanth/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Relicanth:: @ 8E24188 - .incbin "graphics/pokemon/relicanth/shiny.gbapal.lz" - - .align 2 -gMonIcon_Relicanth:: @ 8E241B0 - .incbin "graphics/pokemon/relicanth/icon.4bpp" - - .align 2 -gMonFootprint_Relicanth:: @ 8E245B0 - .incbin "graphics/pokemon/relicanth/footprint.1bpp" - - .align 2 -gMonFrontPic_Aron:: @ 8E245D0 - .incbin "graphics/pokemon/aron/front.4bpp.lz" - - .align 2 -gMonPalette_Aron:: @ 8E247B8 - .incbin "graphics/pokemon/aron/normal.gbapal.lz" - - .align 2 -gMonBackPic_Aron:: @ 8E247E0 - .incbin "graphics/pokemon/aron/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Aron:: @ 8E24A08 - .incbin "graphics/pokemon/aron/shiny.gbapal.lz" - - .align 2 -gMonIcon_Aron:: @ 8E24A30 - .incbin "graphics/pokemon/aron/icon.4bpp" - - .align 2 -gMonFootprint_Aron:: @ 8E24E30 - .incbin "graphics/pokemon/aron/footprint.1bpp" - - .align 2 -gMonFrontPic_Lairon:: @ 8E24E50 - .incbin "graphics/pokemon/lairon/front.4bpp.lz" - - .align 2 -gMonPalette_Lairon:: @ 8E2521C - .incbin "graphics/pokemon/lairon/normal.gbapal.lz" - - .align 2 -gMonBackPic_Lairon:: @ 8E25244 - .incbin "graphics/pokemon/lairon/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Lairon:: @ 8E25530 - .incbin "graphics/pokemon/lairon/shiny.gbapal.lz" - - .align 2 -gMonIcon_Lairon:: @ 8E25558 - .incbin "graphics/pokemon/lairon/icon.4bpp" - - .align 2 -gMonFootprint_Lairon:: @ 8E25958 - .incbin "graphics/pokemon/lairon/footprint.1bpp" - - .align 2 -gMonFrontPic_Aggron:: @ 8E25978 - .incbin "graphics/pokemon/aggron/front.4bpp.lz" - - .align 2 -gMonPalette_Aggron:: @ 8E25EF4 - .incbin "graphics/pokemon/aggron/normal.gbapal.lz" - - .align 2 -gMonBackPic_Aggron:: @ 8E25F1C - .incbin "graphics/pokemon/aggron/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Aggron:: @ 8E26344 - .incbin "graphics/pokemon/aggron/shiny.gbapal.lz" - - .align 2 -gMonIcon_Aggron:: @ 8E2636C - .incbin "graphics/pokemon/aggron/icon.4bpp" - - .align 2 -gMonFootprint_Aggron:: @ 8E2676C - .incbin "graphics/pokemon/aggron/footprint.1bpp" - - .align 2 -gMonFrontPic_Castform:: @ 8E2678C - .incbin "graphics/pokemon/castform/front.4bpp.lz" - - .align 2 -gMonPalette_Castform:: @ 8E27214 - .incbin "graphics/pokemon/castform/normal.gbapal.lz" - - .align 2 -gMonBackPic_Castform:: @ 8E27294 - .incbin "graphics/pokemon/castform/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Castform:: @ 8E27C50 - .incbin "graphics/pokemon/castform/shiny.gbapal.lz" - - .align 2 -gMonIcon_Castform:: @ 8E27CCC - .incbin "graphics/pokemon/castform/icon.4bpp" - - .align 2 -gMonFootprint_Castform:: @ 8E280CC - .incbin "graphics/pokemon/castform/footprint.1bpp" - - .align 2 -gMonFrontPic_Volbeat:: @ 8E280EC - .incbin "graphics/pokemon/volbeat/front.4bpp.lz" - - .align 2 -gMonPalette_Volbeat:: @ 8E2847C - .incbin "graphics/pokemon/volbeat/normal.gbapal.lz" - - .align 2 -gMonBackPic_Volbeat:: @ 8E284A4 - .incbin "graphics/pokemon/volbeat/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Volbeat:: @ 8E28804 - .incbin "graphics/pokemon/volbeat/shiny.gbapal.lz" - - .align 2 -gMonIcon_Volbeat:: @ 8E2882C - .incbin "graphics/pokemon/volbeat/icon.4bpp" - - .align 2 -gMonFootprint_Volbeat:: @ 8E28C2C - .incbin "graphics/pokemon/volbeat/footprint.1bpp" - - .align 2 -gMonFrontPic_Illumise:: @ 8E28C4C - .incbin "graphics/pokemon/illumise/front.4bpp.lz" - - .align 2 -gMonPalette_Illumise:: @ 8E28FC0 - .incbin "graphics/pokemon/illumise/normal.gbapal.lz" - - .align 2 -gMonBackPic_Illumise:: @ 8E28FE8 - .incbin "graphics/pokemon/illumise/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Illumise:: @ 8E29304 - .incbin "graphics/pokemon/illumise/shiny.gbapal.lz" - - .align 2 -gMonIcon_Illumise:: @ 8E2932C - .incbin "graphics/pokemon/illumise/icon.4bpp" - - .align 2 -gMonFootprint_Illumise:: @ 8E2972C - .incbin "graphics/pokemon/illumise/footprint.1bpp" - - .align 2 -gMonFrontPic_Lileep:: @ 8E2974C - .incbin "graphics/pokemon/lileep/front.4bpp.lz" - - .align 2 -gMonPalette_Lileep:: @ 8E29A90 - .incbin "graphics/pokemon/lileep/normal.gbapal.lz" - - .align 2 -gMonBackPic_Lileep:: @ 8E29AB8 - .incbin "graphics/pokemon/lileep/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Lileep:: @ 8E29DFC - .incbin "graphics/pokemon/lileep/shiny.gbapal.lz" - - .align 2 -gMonIcon_Lileep:: @ 8E29E24 - .incbin "graphics/pokemon/lileep/icon.4bpp" - - .align 2 -gMonFootprint_Lileep:: @ 8E2A224 - .incbin "graphics/pokemon/lileep/footprint.1bpp" - - .align 2 -gMonFrontPic_Cradily:: @ 8E2A244 - .incbin "graphics/pokemon/cradily/front.4bpp.lz" - - .align 2 -gMonPalette_Cradily:: @ 8E2A660 - .incbin "graphics/pokemon/cradily/normal.gbapal.lz" - - .align 2 -gMonBackPic_Cradily:: @ 8E2A688 - .incbin "graphics/pokemon/cradily/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Cradily:: @ 8E2AA84 - .incbin "graphics/pokemon/cradily/shiny.gbapal.lz" - - .align 2 -gMonIcon_Cradily:: @ 8E2AAAC - .incbin "graphics/pokemon/cradily/icon.4bpp" - - .align 2 -gMonFootprint_Cradily:: @ 8E2AEAC - .incbin "graphics/pokemon/cradily/footprint.1bpp" - - .align 2 -gMonFrontPic_Anorith:: @ 8E2AECC - .incbin "graphics/pokemon/anorith/front.4bpp.lz" - - .align 2 -gMonPalette_Anorith:: @ 8E2B1F0 - .incbin "graphics/pokemon/anorith/normal.gbapal.lz" - - .align 2 -gMonBackPic_Anorith:: @ 8E2B218 - .incbin "graphics/pokemon/anorith/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Anorith:: @ 8E2B460 - .incbin "graphics/pokemon/anorith/shiny.gbapal.lz" - - .align 2 -gMonIcon_Anorith:: @ 8E2B488 - .incbin "graphics/pokemon/anorith/icon.4bpp" - - .align 2 -gMonFootprint_Anorith:: @ 8E2B888 - .incbin "graphics/pokemon/anorith/footprint.1bpp" - - .align 2 -gMonFrontPic_Armaldo:: @ 8E2B8A8 - .incbin "graphics/pokemon/armaldo/front.4bpp.lz" - - .align 2 -gMonPalette_Armaldo:: @ 8E2BE28 - .incbin "graphics/pokemon/armaldo/normal.gbapal.lz" - - .align 2 -gMonBackPic_Armaldo:: @ 8E2BE50 - .incbin "graphics/pokemon/armaldo/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Armaldo:: @ 8E2C288 - .incbin "graphics/pokemon/armaldo/shiny.gbapal.lz" - - .align 2 -gMonIcon_Armaldo:: @ 8E2C2B0 - .incbin "graphics/pokemon/armaldo/icon.4bpp" - - .align 2 -gMonFootprint_Armaldo:: @ 8E2C6B0 - .incbin "graphics/pokemon/armaldo/footprint.1bpp" - - .align 2 -gMonFrontPic_Ralts:: @ 8E2C6D0 - .incbin "graphics/pokemon/ralts/front.4bpp.lz" - - .align 2 -gMonPalette_Ralts:: @ 8E2C900 - .incbin "graphics/pokemon/ralts/normal.gbapal.lz" - - .align 2 -gMonBackPic_Ralts:: @ 8E2C928 - .incbin "graphics/pokemon/ralts/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Ralts:: @ 8E2CB64 - .incbin "graphics/pokemon/ralts/shiny.gbapal.lz" - - .align 2 -gMonIcon_Ralts:: @ 8E2CB8C - .incbin "graphics/pokemon/ralts/icon.4bpp" - - .align 2 -gMonFootprint_Ralts:: @ 8E2CF8C - .incbin "graphics/pokemon/ralts/footprint.1bpp" - - .align 2 -gMonFrontPic_Kirlia:: @ 8E2CFAC - .incbin "graphics/pokemon/kirlia/front.4bpp.lz" - - .align 2 -gMonPalette_Kirlia:: @ 8E2D2A8 - .incbin "graphics/pokemon/kirlia/normal.gbapal.lz" - - .align 2 -gMonBackPic_Kirlia:: @ 8E2D2D0 - .incbin "graphics/pokemon/kirlia/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Kirlia:: @ 8E2D644 - .incbin "graphics/pokemon/kirlia/shiny.gbapal.lz" - - .align 2 -gMonIcon_Kirlia:: @ 8E2D66C - .incbin "graphics/pokemon/kirlia/icon.4bpp" - - .align 2 -gMonFootprint_Kirlia:: @ 8E2DA6C - .incbin "graphics/pokemon/kirlia/footprint.1bpp" - - .align 2 -gMonFrontPic_Gardevoir:: @ 8E2DA8C - .incbin "graphics/pokemon/gardevoir/front.4bpp.lz" - - .align 2 -gMonPalette_Gardevoir:: @ 8E2DE08 - .incbin "graphics/pokemon/gardevoir/normal.gbapal.lz" - - .align 2 -gMonBackPic_Gardevoir:: @ 8E2DE30 - .incbin "graphics/pokemon/gardevoir/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Gardevoir:: @ 8E2E164 - .incbin "graphics/pokemon/gardevoir/shiny.gbapal.lz" - - .align 2 -gMonIcon_Gardevoir:: @ 8E2E18C - .incbin "graphics/pokemon/gardevoir/icon.4bpp" - - .align 2 -gMonFootprint_Gardevoir:: @ 8E2E58C - .incbin "graphics/pokemon/gardevoir/footprint.1bpp" - - .align 2 -gMonFrontPic_Bagon:: @ 8E2E5AC - .incbin "graphics/pokemon/bagon/front.4bpp.lz" - - .align 2 -gMonPalette_Bagon:: @ 8E2E824 - .incbin "graphics/pokemon/bagon/normal.gbapal.lz" - - .align 2 -gMonBackPic_Bagon:: @ 8E2E84C - .incbin "graphics/pokemon/bagon/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Bagon:: @ 8E2EB34 - .incbin "graphics/pokemon/bagon/shiny.gbapal.lz" - - .align 2 -gMonIcon_Bagon:: @ 8E2EB5C - .incbin "graphics/pokemon/bagon/icon.4bpp" - - .align 2 -gMonFootprint_Bagon:: @ 8E2EF5C - .incbin "graphics/pokemon/bagon/footprint.1bpp" - - .align 2 -gMonFrontPic_Shelgon:: @ 8E2EF7C - .incbin "graphics/pokemon/shelgon/front.4bpp.lz" - - .align 2 -gMonPalette_Shelgon:: @ 8E2F280 - .incbin "graphics/pokemon/shelgon/normal.gbapal.lz" - - .align 2 -gMonBackPic_Shelgon:: @ 8E2F2A8 - .incbin "graphics/pokemon/shelgon/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Shelgon:: @ 8E2F590 - .incbin "graphics/pokemon/shelgon/shiny.gbapal.lz" - - .align 2 -gMonIcon_Shelgon:: @ 8E2F5B8 - .incbin "graphics/pokemon/shelgon/icon.4bpp" - - .align 2 -gMonFootprint_Shelgon:: @ 8E2F9B8 - .incbin "graphics/pokemon/shelgon/footprint.1bpp" - - .align 2 -gMonFrontPic_Salamence:: @ 8E2F9D8 - .incbin "graphics/pokemon/salamence/front.4bpp.lz" - - .align 2 -gMonPalette_Salamence:: @ 8E2FE3C - .incbin "graphics/pokemon/salamence/normal.gbapal.lz" - - .align 2 -gMonBackPic_Salamence:: @ 8E2FE64 - .incbin "graphics/pokemon/salamence/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Salamence:: @ 8E30148 - .incbin "graphics/pokemon/salamence/shiny.gbapal.lz" - - .align 2 -gMonIcon_Salamence:: @ 8E30170 - .incbin "graphics/pokemon/salamence/icon.4bpp" - - .align 2 -gMonFootprint_Salamence:: @ 8E30570 - .incbin "graphics/pokemon/salamence/footprint.1bpp" - - .align 2 -gMonFrontPic_Beldum:: @ 8E30590 - .incbin "graphics/pokemon/beldum/front.4bpp.lz" - - .align 2 -gMonPalette_Beldum:: @ 8E30800 - .incbin "graphics/pokemon/beldum/normal.gbapal.lz" - - .align 2 -gMonBackPic_Beldum:: @ 8E30828 - .incbin "graphics/pokemon/beldum/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Beldum:: @ 8E30B18 - .incbin "graphics/pokemon/beldum/shiny.gbapal.lz" - - .align 2 -gMonIcon_Beldum:: @ 8E30B40 - .incbin "graphics/pokemon/beldum/icon.4bpp" - - .align 2 -gMonFootprint_Beldum:: @ 8E30F40 - .incbin "graphics/pokemon/beldum/footprint.1bpp" - - .align 2 -gMonFrontPic_Metang:: @ 8E30F60 - .incbin "graphics/pokemon/metang/front.4bpp.lz" - - .align 2 -gMonPalette_Metang:: @ 8E313BC - .incbin "graphics/pokemon/metang/normal.gbapal.lz" - - .align 2 -gMonBackPic_Metang:: @ 8E313E4 - .incbin "graphics/pokemon/metang/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Metang:: @ 8E31708 - .incbin "graphics/pokemon/metang/shiny.gbapal.lz" - - .align 2 -gMonIcon_Metang:: @ 8E31730 - .incbin "graphics/pokemon/metang/icon.4bpp" - - .align 2 -gMonFootprint_Metang:: @ 8E31B30 - .incbin "graphics/pokemon/metang/footprint.1bpp" - - .align 2 -gMonFrontPic_Metagross:: @ 8E31B50 - .incbin "graphics/pokemon/metagross/front.4bpp.lz" - - .align 2 -gMonPalette_Metagross:: @ 8E31FB4 - .incbin "graphics/pokemon/metagross/normal.gbapal.lz" - - .align 2 -gMonBackPic_Metagross:: @ 8E31FDC - .incbin "graphics/pokemon/metagross/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Metagross:: @ 8E322A8 - .incbin "graphics/pokemon/metagross/shiny.gbapal.lz" - - .align 2 -gMonIcon_Metagross:: @ 8E322D0 - .incbin "graphics/pokemon/metagross/icon.4bpp" - - .align 2 -gMonFootprint_Metagross:: @ 8E326D0 - .incbin "graphics/pokemon/metagross/footprint.1bpp" - - .align 2 -gMonFrontPic_Regirock:: @ 8E326F0 - .incbin "graphics/pokemon/regirock/front.4bpp.lz" - - .align 2 -gMonPalette_Regirock:: @ 8E32BAC - .incbin "graphics/pokemon/regirock/normal.gbapal.lz" - - .align 2 -gMonBackPic_Regirock:: @ 8E32BD4 - .incbin "graphics/pokemon/regirock/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Regirock:: @ 8E33020 - .incbin "graphics/pokemon/regirock/shiny.gbapal.lz" - - .align 2 -gMonIcon_Regirock:: @ 8E33048 - .incbin "graphics/pokemon/regirock/icon.4bpp" - - .align 2 -gMonFootprint_Regirock:: @ 8E33448 - .incbin "graphics/pokemon/regirock/footprint.1bpp" - - .align 2 -gMonFrontPic_Regice:: @ 8E33468 - .incbin "graphics/pokemon/regice/front.4bpp.lz" - - .align 2 -gMonPalette_Regice:: @ 8E338B0 - .incbin "graphics/pokemon/regice/normal.gbapal.lz" - - .align 2 -gMonBackPic_Regice:: @ 8E338D8 - .incbin "graphics/pokemon/regice/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Regice:: @ 8E33BC8 - .incbin "graphics/pokemon/regice/shiny.gbapal.lz" - - .align 2 -gMonIcon_Regice:: @ 8E33BF0 - .incbin "graphics/pokemon/regice/icon.4bpp" - - .align 2 -gMonFootprint_Regice:: @ 8E33FF0 - .incbin "graphics/pokemon/regice/footprint.1bpp" - - .align 2 -gMonFrontPic_Registeel:: @ 8E34010 - .incbin "graphics/pokemon/registeel/front.4bpp.lz" - - .align 2 -gMonPalette_Registeel:: @ 8E34498 - .incbin "graphics/pokemon/registeel/normal.gbapal.lz" - - .align 2 -gMonBackPic_Registeel:: @ 8E344C0 - .incbin "graphics/pokemon/registeel/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Registeel:: @ 8E347F8 - .incbin "graphics/pokemon/registeel/shiny.gbapal.lz" - - .align 2 -gMonIcon_Registeel:: @ 8E34820 - .incbin "graphics/pokemon/registeel/icon.4bpp" - - .align 2 -gMonFootprint_Registeel:: @ 8E34C20 - .incbin "graphics/pokemon/registeel/footprint.1bpp" - - .align 2 -gMonFrontPic_Kyogre:: @ 8E34C40 - .incbin "graphics/pokemon/kyogre/front.4bpp.lz" - - .align 2 -gMonPalette_Kyogre:: @ 8E350B0 - .incbin "graphics/pokemon/kyogre/normal.gbapal.lz" - - .align 2 -gMonBackPic_Kyogre:: @ 8E350D8 - .incbin "graphics/pokemon/kyogre/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Kyogre:: @ 8E35350 - .incbin "graphics/pokemon/kyogre/shiny.gbapal.lz" - - .align 2 -gMonIcon_Kyogre:: @ 8E35378 - .incbin "graphics/pokemon/kyogre/icon.4bpp" - - .align 2 -gMonFootprint_Kyogre:: @ 8E35778 - .incbin "graphics/pokemon/kyogre/footprint.1bpp" - - .align 2 -gMonFrontPic_Groudon:: @ 8E35798 - .incbin "graphics/pokemon/groudon/front.4bpp.lz" - - .align 2 -gMonPalette_Groudon:: @ 8E35D2C - .incbin "graphics/pokemon/groudon/normal.gbapal.lz" - - .align 2 -gMonBackPic_Groudon:: @ 8E35D54 - .incbin "graphics/pokemon/groudon/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Groudon:: @ 8E361BC - .incbin "graphics/pokemon/groudon/shiny.gbapal.lz" - - .align 2 -gMonIcon_Groudon:: @ 8E361E4 - .incbin "graphics/pokemon/groudon/icon.4bpp" - - .align 2 -gMonFootprint_Groudon:: @ 8E365E4 - .incbin "graphics/pokemon/groudon/footprint.1bpp" - - .align 2 -gMonFrontPic_Rayquaza:: @ 8E36604 - .incbin "graphics/pokemon/rayquaza/front.4bpp.lz" - - .align 2 -gMonPalette_Rayquaza:: @ 8E36B14 - .incbin "graphics/pokemon/rayquaza/normal.gbapal.lz" - - .align 2 -gMonBackPic_Rayquaza:: @ 8E36B3C - .incbin "graphics/pokemon/rayquaza/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Rayquaza:: @ 8E36E74 - .incbin "graphics/pokemon/rayquaza/shiny.gbapal.lz" - - .align 2 -gMonIcon_Rayquaza:: @ 8E36E9C - .incbin "graphics/pokemon/rayquaza/icon.4bpp" - - .align 2 -gMonFootprint_Rayquaza:: @ 8E3729C - .incbin "graphics/pokemon/rayquaza/footprint.1bpp" - - .align 2 -gMonFrontPic_Latias:: @ 8E372BC - .incbin "graphics/pokemon/latias/front.4bpp.lz" - - .align 2 -gMonPalette_Latias:: @ 8E376E0 - .incbin "graphics/pokemon/latias/normal.gbapal.lz" - - .align 2 -gMonBackPic_Latias:: @ 8E37708 - .incbin "graphics/pokemon/latias/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Latias:: @ 8E37A04 - .incbin "graphics/pokemon/latias/shiny.gbapal.lz" - - .align 2 -gMonIcon_Latias:: @ 8E37A2C - .incbin "graphics/pokemon/latias/icon.4bpp" - - .align 2 -gMonFootprint_Latias:: @ 8E37E2C - .incbin "graphics/pokemon/latias/footprint.1bpp" - - .align 2 -gMonFrontPic_Latios:: @ 8E37E4C - .incbin "graphics/pokemon/latios/front.4bpp.lz" - - .align 2 -gMonPalette_Latios:: @ 8E382A0 - .incbin "graphics/pokemon/latios/normal.gbapal.lz" - - .align 2 -gMonBackPic_Latios:: @ 8E382C8 - .incbin "graphics/pokemon/latios/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Latios:: @ 8E38628 - .incbin "graphics/pokemon/latios/shiny.gbapal.lz" - - .align 2 -gMonIcon_Latios:: @ 8E38650 - .incbin "graphics/pokemon/latios/icon.4bpp" - - .align 2 -gMonFootprint_Latios:: @ 8E38A50 - .incbin "graphics/pokemon/latios/footprint.1bpp" - - .align 2 -gMonFrontPic_Jirachi:: @ 8E38A70 - .incbin "graphics/pokemon/jirachi/front.4bpp.lz" - - .align 2 -gMonPalette_Jirachi:: @ 8E38D7C - .incbin "graphics/pokemon/jirachi/normal.gbapal.lz" - - .align 2 -gMonBackPic_Jirachi:: @ 8E38DA4 - .incbin "graphics/pokemon/jirachi/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Jirachi:: @ 8E39144 - .incbin "graphics/pokemon/jirachi/shiny.gbapal.lz" - - .align 2 -gMonIcon_Jirachi:: @ 8E3916C - .incbin "graphics/pokemon/jirachi/icon.4bpp" - - .align 2 -gMonFootprint_Jirachi:: @ 8E3956C - .incbin "graphics/pokemon/jirachi/footprint.1bpp" - - .align 2 -gMonFrontPic_Deoxys:: @ 8E3958C - .ifdef FIRERED - .incbin "graphics/pokemon/deoxys/front.4bpp.lz" - .else - .ifdef LEAFGREEN - .incbin "graphics/pokemon/deoxys/front_def.4bpp.lz" - .endif - .endif - - .align 2 -gMonPalette_Deoxys:: @ 8E39D48 - .incbin "graphics/pokemon/deoxys/normal.gbapal.lz" - - .align 2 -gMonBackPic_Deoxys:: @ 8E39D70 - .ifdef FIRERED - .incbin "graphics/pokemon/deoxys/back.4bpp.lz" - .else - .ifdef LEAFGREEN - .incbin "graphics/pokemon/deoxys/back_def.4bpp.lz" - .endif - .endif - - .align 2 -gMonShinyPalette_Deoxys:: @ 8E3A360 - .incbin "graphics/pokemon/deoxys/shiny.gbapal.lz" - - .align 2 -gMonIcon_Deoxys:: @ 8E3A388 - .incbin "graphics/pokemon/deoxys/icon.4bpp" - @ Referenced as part of the same array as normal deoxys - .ifdef FIRERED - .incbin "graphics/pokemon/deoxys/icon_attack.4bpp" - .else - .ifdef LEAFGREEN - .incbin "graphics/pokemon/deoxys/icon_defense.4bpp" - .endif - .endif - - .align 2 -gMonFootprint_Deoxys:: @ 8E3AB88 - .incbin "graphics/pokemon/deoxys/footprint.1bpp" - - .align 2 -gMonFrontPic_Chimecho:: @ 8E3ABA8 - .incbin "graphics/pokemon/chimecho/front.4bpp.lz" - - .align 2 -gMonPalette_Chimecho:: @ 8E3ADF4 - .incbin "graphics/pokemon/chimecho/normal.gbapal.lz" - - .align 2 -gMonBackPic_Chimecho:: @ 8E3AE1C - .incbin "graphics/pokemon/chimecho/back.4bpp.lz" - - .align 2 -gMonShinyPalette_Chimecho:: @ 8E3B090 - .incbin "graphics/pokemon/chimecho/shiny.gbapal.lz" - - .align 2 -gMonIcon_Chimecho:: @ 8E3B0B8 - .incbin "graphics/pokemon/chimecho/icon.4bpp" - - .align 2 -gMonFootprint_Chimecho:: @ 8E3B4B8 - .incbin "graphics/pokemon/chimecho/footprint.1bpp" - - .align 2 -gMonFrontPic_Egg:: @ 8E3B4D8 - .incbin "graphics/pokemon/egg/front.4bpp.lz" - - .align 2 -gMonPalette_Egg:: @ 8E3B68C - .incbin "graphics/pokemon/egg/normal.gbapal.lz" - - .align 2 -gMonFrontPic_UnownB:: @ 8E3B6AC - .incbin "graphics/pokemon/unown/b/front.4bpp.lz" - - .align 2 -gMonBackPic_UnownB:: @ 8E3B884 - .incbin "graphics/pokemon/unown/b/back.4bpp.lz" - - .align 2 -gMonIcon_UnownB:: @ 8E3BA88 - .incbin "graphics/pokemon/unown/b/icon.4bpp" - - .align 2 -gMonFrontPic_UnownC:: @ 8E3BE88 - .incbin "graphics/pokemon/unown/c/front.4bpp.lz" - - .align 2 -gMonBackPic_UnownC:: @ 8E3C09C - .incbin "graphics/pokemon/unown/c/back.4bpp.lz" - - .align 2 -gMonIcon_UnownC:: @ 8E3C348 - .incbin "graphics/pokemon/unown/c/icon.4bpp" - - .align 2 -gMonFrontPic_UnownD:: @ 8E3C748 - .incbin "graphics/pokemon/unown/d/front.4bpp.lz" - - .align 2 -gMonBackPic_UnownD:: @ 8E3C940 - .incbin "graphics/pokemon/unown/d/back.4bpp.lz" - - .align 2 -gMonIcon_UnownD:: @ 8E3CB98 - .incbin "graphics/pokemon/unown/d/icon.4bpp" - - .align 2 -gMonFrontPic_UnownE:: @ 8E3CF98 - .incbin "graphics/pokemon/unown/e/front.4bpp.lz" - - .align 2 -gMonBackPic_UnownE:: @ 8E3D150 - .incbin "graphics/pokemon/unown/e/back.4bpp.lz" - - .align 2 -gMonIcon_UnownE:: @ 8E3D350 - .incbin "graphics/pokemon/unown/e/icon.4bpp" - - .align 2 -gMonFrontPic_UnownF:: @ 8E3D750 - .incbin "graphics/pokemon/unown/f/front.4bpp.lz" - - .align 2 -gMonBackPic_UnownF:: @ 8E3D944 - .incbin "graphics/pokemon/unown/f/back.4bpp.lz" - - .align 2 -gMonIcon_UnownF:: @ 8E3DB60 - .incbin "graphics/pokemon/unown/f/icon.4bpp" - - .align 2 -gMonFrontPic_UnownG:: @ 8E3DF60 - .incbin "graphics/pokemon/unown/g/front.4bpp.lz" - - .align 2 -gMonBackPic_UnownG:: @ 8E3E13C - .incbin "graphics/pokemon/unown/g/back.4bpp.lz" - - .align 2 -gMonIcon_UnownG:: @ 8E3E388 - .incbin "graphics/pokemon/unown/g/icon.4bpp" - - .align 2 -gMonFrontPic_UnownH:: @ 8E3E788 - .incbin "graphics/pokemon/unown/h/front.4bpp.lz" - - .align 2 -gMonBackPic_UnownH:: @ 8E3E9CC - .incbin "graphics/pokemon/unown/h/back.4bpp.lz" - - .align 2 -gMonIcon_UnownH:: @ 8E3EC90 - .incbin "graphics/pokemon/unown/h/icon.4bpp" - - .align 2 -gMonFrontPic_UnownI:: @ 8E3F090 - .incbin "graphics/pokemon/unown/i/front.4bpp.lz" - - .align 2 -gMonBackPic_UnownI:: @ 8E3F228 - .incbin "graphics/pokemon/unown/i/back.4bpp.lz" - - .align 2 -gMonIcon_UnownI:: @ 8E3F3D0 - .incbin "graphics/pokemon/unown/i/icon.4bpp" - - .align 2 -gMonFrontPic_UnownJ:: @ 8E3F7D0 - .incbin "graphics/pokemon/unown/j/front.4bpp.lz" - - .align 2 -gMonBackPic_UnownJ:: @ 8E3F994 - .incbin "graphics/pokemon/unown/j/back.4bpp.lz" - - .align 2 -gMonIcon_UnownJ:: @ 8E3FB7C - .incbin "graphics/pokemon/unown/j/icon.4bpp" - - .align 2 -gMonFrontPic_UnownK:: @ 8E3FF7C - .incbin "graphics/pokemon/unown/k/front.4bpp.lz" - - .align 2 -gMonBackPic_UnownK:: @ 8E4014C - .incbin "graphics/pokemon/unown/k/back.4bpp.lz" - - .align 2 -gMonIcon_UnownK:: @ 8E40344 - .incbin "graphics/pokemon/unown/k/icon.4bpp" - - .align 2 -gMonFrontPic_UnownL:: @ 8E40744 - .incbin "graphics/pokemon/unown/l/front.4bpp.lz" - - .align 2 -gMonBackPic_UnownL:: @ 8E408F4 - .incbin "graphics/pokemon/unown/l/back.4bpp.lz" - - .align 2 -gMonIcon_UnownL:: @ 8E40AC8 - .incbin "graphics/pokemon/unown/l/icon.4bpp" - - .align 2 -gMonFrontPic_UnownM:: @ 8E40EC8 - .incbin "graphics/pokemon/unown/m/front.4bpp.lz" - - .align 2 -gMonBackPic_UnownM:: @ 8E410EC - .incbin "graphics/pokemon/unown/m/back.4bpp.lz" - - .align 2 -gMonIcon_UnownM:: @ 8E41394 - .incbin "graphics/pokemon/unown/m/icon.4bpp" - - .align 2 -gMonFrontPic_UnownN:: @ 8E41794 - .incbin "graphics/pokemon/unown/n/front.4bpp.lz" - - .align 2 -gMonBackPic_UnownN:: @ 8E4198C - .incbin "graphics/pokemon/unown/n/back.4bpp.lz" - - .align 2 -gMonIcon_UnownN:: @ 8E41BF8 - .incbin "graphics/pokemon/unown/n/icon.4bpp" - - .align 2 -gMonFrontPic_UnownO:: @ 8E41FF8 - .incbin "graphics/pokemon/unown/o/front.4bpp.lz" - - .align 2 -gMonBackPic_UnownO:: @ 8E42230 - .incbin "graphics/pokemon/unown/o/back.4bpp.lz" - - .align 2 -gMonIcon_UnownO:: @ 8E424F0 - .incbin "graphics/pokemon/unown/o/icon.4bpp" - - .align 2 -gMonFrontPic_UnownP:: @ 8E428F0 - .incbin "graphics/pokemon/unown/p/front.4bpp.lz" - - .align 2 -gMonBackPic_UnownP:: @ 8E42A90 - .incbin "graphics/pokemon/unown/p/back.4bpp.lz" - - .align 2 -gMonIcon_UnownP:: @ 8E42C54 - .incbin "graphics/pokemon/unown/p/icon.4bpp" - - .align 2 -gMonFrontPic_UnownQ:: @ 8E43054 - .incbin "graphics/pokemon/unown/q/front.4bpp.lz" - - .align 2 -gMonBackPic_UnownQ:: @ 8E43208 - .incbin "graphics/pokemon/unown/q/back.4bpp.lz" - - .align 2 -gMonIcon_UnownQ:: @ 8E433D4 - .incbin "graphics/pokemon/unown/q/icon.4bpp" - - .align 2 -gMonFrontPic_UnownR:: @ 8E437D4 - .incbin "graphics/pokemon/unown/r/front.4bpp.lz" - - .align 2 -gMonBackPic_UnownR:: @ 8E43978 - .incbin "graphics/pokemon/unown/r/back.4bpp.lz" - - .align 2 -gMonIcon_UnownR:: @ 8E43B40 - .incbin "graphics/pokemon/unown/r/icon.4bpp" - - .align 2 -gMonFrontPic_UnownS:: @ 8E43F40 - .incbin "graphics/pokemon/unown/s/front.4bpp.lz" - - .align 2 -gMonBackPic_UnownS:: @ 8E44128 - .incbin "graphics/pokemon/unown/s/back.4bpp.lz" - - .align 2 -gMonIcon_UnownS:: @ 8E4437C - .incbin "graphics/pokemon/unown/s/icon.4bpp" - - .align 2 -gMonFrontPic_UnownT:: @ 8E4477C - .incbin "graphics/pokemon/unown/t/front.4bpp.lz" - - .align 2 -gMonBackPic_UnownT:: @ 8E4492C - .incbin "graphics/pokemon/unown/t/back.4bpp.lz" - - .align 2 -gMonIcon_UnownT:: @ 8E44AE0 - .incbin "graphics/pokemon/unown/t/icon.4bpp" - - .align 2 -gMonFrontPic_UnownU:: @ 8E44EE0 - .incbin "graphics/pokemon/unown/u/front.4bpp.lz" - - .align 2 -gMonBackPic_UnownU:: @ 8E450F8 - .incbin "graphics/pokemon/unown/u/back.4bpp.lz" - - .align 2 -gMonIcon_UnownU:: @ 8E4534C - .incbin "graphics/pokemon/unown/u/icon.4bpp" - - .align 2 -gMonFrontPic_UnownV:: @ 8E4574C - .incbin "graphics/pokemon/unown/v/front.4bpp.lz" - - .align 2 -gMonBackPic_UnownV:: @ 8E45930 - .incbin "graphics/pokemon/unown/v/back.4bpp.lz" - - .align 2 -gMonIcon_UnownV:: @ 8E45B60 - .incbin "graphics/pokemon/unown/v/icon.4bpp" - - .align 2 -gMonFrontPic_UnownW:: @ 8E45F60 - .incbin "graphics/pokemon/unown/w/front.4bpp.lz" - - .align 2 -gMonBackPic_UnownW:: @ 8E46134 - .incbin "graphics/pokemon/unown/w/back.4bpp.lz" - - .align 2 -gMonIcon_UnownW:: @ 8E46338 - .incbin "graphics/pokemon/unown/w/icon.4bpp" - - .align 2 -gMonFrontPic_UnownX:: @ 8E46738 - .incbin "graphics/pokemon/unown/x/front.4bpp.lz" - - .align 2 -gMonBackPic_UnownX:: @ 8E468FC - .incbin "graphics/pokemon/unown/x/back.4bpp.lz" - - .align 2 -gMonIcon_UnownX:: @ 8E46AEC - .incbin "graphics/pokemon/unown/x/icon.4bpp" - - .align 2 -gMonFrontPic_UnownY:: @ 8E46EEC - .incbin "graphics/pokemon/unown/y/front.4bpp.lz" - - .align 2 -gMonBackPic_UnownY:: @ 8E470C4 - .incbin "graphics/pokemon/unown/y/back.4bpp.lz" - - .align 2 -gMonIcon_UnownY:: @ 8E472B8 - .incbin "graphics/pokemon/unown/y/icon.4bpp" - - .align 2 -gMonFrontPic_UnownZ:: @ 8E476B8 - .incbin "graphics/pokemon/unown/z/front.4bpp.lz" - - .align 2 -gMonBackPic_UnownZ:: @ 8E47868 - .incbin "graphics/pokemon/unown/z/back.4bpp.lz" - - .align 2 -gMonIcon_UnownZ:: @ 8E47A44 - .incbin "graphics/pokemon/unown/z/icon.4bpp" - - .align 2 -gMonFrontPic_UnownExclamationMark:: @ 8E47E44 - .incbin "graphics/pokemon/unown/exclamation_mark/front.4bpp.lz" - - .align 2 -gMonBackPic_UnownExclamationMark:: @ 8E47FD4 - .incbin "graphics/pokemon/unown/exclamation_mark/back.4bpp.lz" - - .align 2 -gMonIcon_UnownExclamationMark:: @ 8E4819C - .incbin "graphics/pokemon/unown/exclamation_mark/icon.4bpp" - - .align 2 -gMonFrontPic_UnownQuestionMark:: @ 8E4859C - .incbin "graphics/pokemon/unown/question_mark/front.4bpp.lz" - - .align 2 -gMonBackPic_UnownQuestionMark:: @ 8E48758 - .incbin "graphics/pokemon/unown/question_mark/back.4bpp.lz" - - .align 2 -gMonIcon_UnownQuestionMark:: @ 8E48958 - .incbin "graphics/pokemon/unown/question_mark/icon.4bpp" - .align 2 gTrainerFrontPic_AquaLeaderArchie:: @ 8E48D58 .incbin "graphics/trainers/front_pics/aqua_leader_archie_front_pic.4bpp.lz" @@ -13509,11 +1226,11 @@ gTrainerPalette_OldManBackPic:: @ 8E76F34 .align 2 gMonIcon_QuestionMark:: @ 8E76F5C - .incbin "graphics/pokemon/circled_question_mark/icon.4bpp" + .incbin "graphics/pokemon/question_mark/icon.4bpp" .align 2 gMonFootprint_QuestionMark:: @ 8E7735C - .incbin "graphics/pokemon/circled_question_mark/footprint.1bpp" + .incbin "graphics/pokemon/question_mark/footprint.1bpp" .align 2 gFile_graphics_battle_transitions_vs_frame_sheet:: @ 8E7737C @@ -13613,7 +1330,7 @@ gFile_graphics_battle_terrain_building_anim_map_tilemap:: @ 8E790C4 .align 2 gBattleAnimSpriteGfx_FlyingDirt:: @ 8E791E8 - .incbin "graphics/battle_anims/sprites/261.4bpp.lz" + .incbin "graphics/battle_anims/sprites/flying_dirt.4bpp.lz" .align 2 gFile_graphics_battle_anims_backgrounds_sandstorm_brew_tilemap:: @ 8E79354 @@ -13625,35 +1342,35 @@ gFile_graphics_battle_anims_backgrounds_sandstorm_brew_sheet:: @ 8E794D0 .align 2 gBattleAnimSpritePal_FlyingDirt:: @ 8E799FC - .incbin "graphics/battle_anims/sprites/261.gbapal.lz" + .incbin "graphics/battle_anims/sprites/flying_dirt.gbapal.lz" .align 2 gBattleAnimSpriteGfx_MetalSoundWaves:: @ 8E79A24 - .incbin "graphics/battle_anims/sprites/260.4bpp.lz" + .incbin "graphics/battle_anims/sprites/metal_sound_waves.4bpp.lz" .align 2 gBattleAnimSpritePal_MetalSoundWaves:: @ 8E79BE0 - .incbin "graphics/battle_anims/sprites/260.gbapal.lz" + .incbin "graphics/battle_anims/sprites/metal_sound_waves.gbapal.lz" .align 2 gBattleAnimBgImage_Ice:: @ 8E79BF8 - .incbin "graphics/battle_anims/backgrounds/15.4bpp.lz" + .incbin "graphics/battle_anims/backgrounds/ice.4bpp.lz" .align 2 gBattleAnimBgPalette_Ice:: @ 8E7A568 - .incbin "graphics/battle_anims/backgrounds/15.gbapal.lz" + .incbin "graphics/battle_anims/backgrounds/ice.gbapal.lz" .align 2 gBattleAnimBgTilemap_Ice:: @ 8E7A58C - .incbin "graphics/battle_anims/backgrounds/15.bin.lz" + .incbin "graphics/battle_anims/backgrounds/ice.bin.lz" .align 2 gBattleAnimSpriteGfx_IcicleSpear:: @ 8E7A784 - .incbin "graphics/battle_anims/sprites/262.4bpp.lz" + .incbin "graphics/battle_anims/sprites/icicle_spear.4bpp.lz" .align 2 gBattleAnimSpritePal_IcicleSpear:: @ 8E7A858 - .incbin "graphics/battle_anims/sprites/262.gbapal.lz" + .incbin "graphics/battle_anims/sprites/icicle_spear.gbapal.lz" .align 2 gContestNextTurnGfx:: @ 8E7A880 @@ -13669,23 +1386,23 @@ gFile_graphics_contest_nextturn_random:: @ 8E7A95C .align 2 gBattleAnimSpriteGfx_GlowyRedOrb:: @ 8E7A97C - .incbin "graphics/battle_anims/sprites/264.4bpp.lz" + .incbin "graphics/battle_anims/sprites/glowy_red_orb.4bpp.lz" .align 2 gBattleAnimSpritePal_GlowyRedOrb:: @ 8E7A99C - .incbin "graphics/battle_anims/sprites/264.gbapal.lz" + .incbin "graphics/battle_anims/sprites/glowy_red_orb.gbapal.lz" .align 2 gBattleAnimSpritePal_GlowyGreenOrb:: @ 8E7A9B4 - .incbin "graphics/battle_anims/sprites/265.gbapal.lz" + .incbin "graphics/battle_anims/sprites/glowy_green_orb.gbapal.lz" .align 2 gBattleAnimSpritePal_SleepPowder:: @ 8E7A9CC - .incbin "graphics/battle_anims/sprites/067.gbapal.lz" + .incbin "graphics/battle_anims/sprites/sleep_powder.gbapal.lz" .align 2 gBattleAnimSpritePal_StunSpore:: @ 8E7A9EC - .incbin "graphics/battle_anims/sprites/068.gbapal.lz" + .incbin "graphics/battle_anims/sprites/stun_spore.gbapal.lz" .align 2 gContestApplauseGfx:: @ 8E7AA0C @@ -13701,59 +1418,59 @@ gFile_graphics_contest_nextturn:: @ 8E7ABB8 .align 2 gBattleAnimSpriteGfx_Splash:: @ 8E7ABD8 - .incbin "graphics/battle_anims/sprites/272.4bpp.lz" + .incbin "graphics/battle_anims/sprites/splash.4bpp.lz" .align 2 gBattleAnimSpritePal_Splash:: @ 8E7ADF4 - .incbin "graphics/battle_anims/sprites/272.gbapal.lz" + .incbin "graphics/battle_anims/sprites/splash.gbapal.lz" .align 2 gBattleAnimSpriteGfx_SweatBead:: @ 8E7AE18 - .incbin "graphics/battle_anims/sprites/273.4bpp.lz" + .incbin "graphics/battle_anims/sprites/sweat_bead.4bpp.lz" .align 2 gBattleAnimSpriteGfx_Pokeblock:: @ 8E7AE40 - .incbin "graphics/battle_anims/sprites/269.4bpp.lz" + .incbin "graphics/battle_anims/sprites/pokeblock.4bpp.lz" .align 2 gBattleAnimSpritePal_Pokeblock:: @ 8E7AE94 - .incbin "graphics/battle_anims/sprites/269.gbapal.lz" + .incbin "graphics/battle_anims/sprites/pokeblock.gbapal.lz" .align 2 gBattleAnimSpriteGfx_Gem1:: @ 8E7AEAC - .incbin "graphics/battle_anims/sprites/274.4bpp.lz" + .incbin "graphics/battle_anims/sprites/gem_1.4bpp.lz" .align 2 gBattleAnimSpriteGfx_Gem2:: @ 8E7B02C - .incbin "graphics/battle_anims/sprites/275.4bpp.lz" + .incbin "graphics/battle_anims/sprites/gem_2.4bpp.lz" .align 2 gBattleAnimSpriteGfx_Gem3:: @ 8E7B198 - .incbin "graphics/battle_anims/sprites/276.4bpp.lz" + .incbin "graphics/battle_anims/sprites/gem_3.4bpp.lz" .align 2 gBattleAnimSpritePal_Gem1:: @ 8E7B300 - .incbin "graphics/battle_anims/sprites/274.gbapal.lz" + .incbin "graphics/battle_anims/sprites/gem_1.gbapal.lz" .align 2 gBattleAnimBgImage_InAir:: @ 8E7B328 - .incbin "graphics/battle_anims/backgrounds/17.4bpp.lz" + .incbin "graphics/battle_anims/backgrounds/in_air.4bpp.lz" .align 2 gBattleAnimBgPalette_InAir:: @ 8E7B484 - .incbin "graphics/battle_anims/backgrounds/17.gbapal.lz" + .incbin "graphics/battle_anims/backgrounds/in_air.gbapal.lz" .align 2 gBattleAnimBgTilemap_InAir:: @ 8E7B4AC - .incbin "graphics/battle_anims/backgrounds/17.bin.lz" + .incbin "graphics/battle_anims/backgrounds/in_air.bin.lz" .align 2 gBattleAnimSpriteGfx_Protect:: @ 8E7B694 - .incbin "graphics/battle_anims/sprites/280.4bpp.lz" + .incbin "graphics/battle_anims/sprites/protect.4bpp.lz" .align 2 gBattleAnimSpritePal_Protect:: @ 8E7BA90 - .incbin "graphics/battle_anims/sprites/280.gbapal.lz" + .incbin "graphics/battle_anims/sprites/protect.gbapal.lz" .align 2 gFile_graphics_battle_anims_backgrounds_water_muddy_palette:: @ 8E7BAB0 @@ -13773,23 +1490,23 @@ gMonIcon_Egg:: @ 8E7BB88 .align 2 gBattleAnimBgImage_Ghost:: @ 8E7BF88 - .incbin "graphics/battle_anims/backgrounds/02.4bpp.lz" + .incbin "graphics/battle_anims/backgrounds/ghost.4bpp.lz" .align 2 gBattleAnimBgPalette_Ghost:: @ 8E7CC50 - .incbin "graphics/battle_anims/backgrounds/02.gbapal.lz" + .incbin "graphics/battle_anims/backgrounds/ghost.gbapal.lz" .align 2 gBattleAnimBgTilemap_Ghost:: @ 8E7CC6C - .incbin "graphics/battle_anims/backgrounds/02.bin.lz" + .incbin "graphics/battle_anims/backgrounds/ghost.bin.lz" .align 2 gBattleAnimSpritePal_WhipHit:: @ 8E7CF60 - .incbin "graphics/battle_anims/sprites/287.gbapal.lz" + .incbin "graphics/battle_anims/sprites/whip_hit.gbapal.lz" .align 2 gBattleAnimBgPalette_Solarbeam:: @ 8E7CF88 - .incbin "graphics/battle_anims/backgrounds/24.gbapal.lz" + .incbin "graphics/battle_anims/backgrounds/solarbeam.gbapal.lz" .align 2 gFile_graphics_unknown_unknown_E7CFB0_tilemap:: @ 8E7CFB0 @@ -13809,23 +1526,23 @@ gFile_graphics_berry_blender_outer_map_tilemap:: @ 8E7E700 .align 2 gBattleAnimBgPalette_Cosmic:: @ 8E7EA14 - .incbin "graphics/battle_anims/backgrounds/16.gbapal.lz" + .incbin "graphics/battle_anims/backgrounds/cosmic.gbapal.lz" .align 2 gBattleAnimBgImage_Cosmic:: @ 8E7EA3C - .incbin "graphics/battle_anims/backgrounds/16.4bpp.lz" + .incbin "graphics/battle_anims/backgrounds/cosmic.4bpp.lz" .align 2 gBattleAnimBgTilemap_Cosmic:: @ 8E7EC9C - .incbin "graphics/battle_anims/backgrounds/16.bin.lz" + .incbin "graphics/battle_anims/backgrounds/cosmic.bin.lz" .align 2 gBattleAnimSpritePal_SlamHit2:: @ 8E7EDD8 - .incbin "graphics/battle_anims/sprites/277.gbapal.lz" + .incbin "graphics/battle_anims/sprites/slam_hit_2.gbapal.lz" .align 2 gBattleAnimSpriteGfx_SlamHit2:: @ 8E7EE00 - .incbin "graphics/battle_anims/sprites/277.4bpp.lz" + .incbin "graphics/battle_anims/sprites/slam_hit_2.4bpp.lz" .align 2 gBattleAnimFogTilemap:: @ 8E7F1F4 @@ -13833,11 +1550,11 @@ gBattleAnimFogTilemap:: @ 8E7F1F4 .align 2 gBattleAnimSpritePal_WeatherBall:: @ 8E7F36C - .incbin "graphics/battle_anims/sprites/283.gbapal.lz" + .incbin "graphics/battle_anims/sprites/weather_ball.gbapal.lz" .align 2 gBattleAnimSpriteGfx_WeatherBall:: @ 8E7F388 - .incbin "graphics/battle_anims/sprites/283.4bpp.lz" + .incbin "graphics/battle_anims/sprites/weather_ball.4bpp.lz" .align 2 gBattleAnimBgTilemap_ScaryFacePlayer:: @ 8E7F4AC @@ -13853,79 +1570,79 @@ gBattleAnimBgTilemap_ScaryFaceContest:: @ 8E7F874 .align 2 gBattleAnimSpriteGfx_Hail:: @ 8E7FA58 - .incbin "graphics/battle_anims/sprites/263.4bpp.lz" + .incbin "graphics/battle_anims/sprites/hail.4bpp.lz" .align 2 gBattleAnimSpritePal_Hail:: @ 8E7FA98 - .incbin "graphics/battle_anims/sprites/263.gbapal.lz" + .incbin "graphics/battle_anims/sprites/hail.gbapal.lz" .align 2 gBattleAnimSpriteGfx_GreenSpike:: @ 8E7FAB0 - .incbin "graphics/battle_anims/sprites/266.4bpp.lz" + .incbin "graphics/battle_anims/sprites/green_spike.4bpp.lz" .align 2 gBattleAnimSpritePal_GreenSpike:: @ 8E7FAF0 - .incbin "graphics/battle_anims/sprites/266.gbapal.lz" + .incbin "graphics/battle_anims/sprites/green_spike.gbapal.lz" .align 2 gBattleAnimSpritePal_WhiteCircleOfLight:: @ 8E7FB08 - .incbin "graphics/battle_anims/sprites/267.gbapal.lz" + .incbin "graphics/battle_anims/sprites/white_circle_of_light.gbapal.lz" .align 2 gBattleAnimSpritePal_GlowyBlueOrb:: @ 8E7FB20 - .incbin "graphics/battle_anims/sprites/268.gbapal.lz" + .incbin "graphics/battle_anims/sprites/glowy_blue_orb.gbapal.lz" .align 2 gBattleAnimSpriteGfx_Recycle:: @ 8E7FB38 - .incbin "graphics/battle_anims/sprites/278.4bpp.lz" + .incbin "graphics/battle_anims/sprites/recycle.4bpp.lz" .align 2 gBattleAnimSpritePal_Recycle:: @ 8E7FD44 - .incbin "graphics/battle_anims/sprites/278.gbapal.lz" + .incbin "graphics/battle_anims/sprites/recycle.gbapal.lz" .align 2 gBattleAnimSpriteGfx_RedParticles:: @ 8E7FD60 - .incbin "graphics/battle_anims/sprites/279.4bpp.lz" + .incbin "graphics/battle_anims/sprites/red_particles.4bpp.lz" .align 2 gBattleAnimSpritePal_RedParticles:: @ 8E7FDAC - .incbin "graphics/battle_anims/sprites/279.gbapal.lz" + .incbin "graphics/battle_anims/sprites/red_particles.gbapal.lz" .align 2 gBattleAnimSpriteGfx_DirtMound:: @ 8E7FDC8 - .incbin "graphics/battle_anims/sprites/281.4bpp.lz" + .incbin "graphics/battle_anims/sprites/dirt_mound.4bpp.lz" .align 2 gBattleAnimSpritePal_DirtMound:: @ 8E7FF50 - .incbin "graphics/battle_anims/sprites/281.gbapal.lz" + .incbin "graphics/battle_anims/sprites/dirt_mound.gbapal.lz" .align 2 gBattleAnimBgImage_Fissure:: @ 8E7FF70 - .incbin "graphics/battle_anims/backgrounds/21.4bpp.lz" + .incbin "graphics/battle_anims/backgrounds/fissure.4bpp.lz" .align 2 gBattleAnimBgPalette_Fissure:: @ 8E80264 - .incbin "graphics/battle_anims/backgrounds/21.gbapal.lz" + .incbin "graphics/battle_anims/backgrounds/fissure.gbapal.lz" .align 2 gBattleAnimBgTilemap_Fissure:: @ 8E80280 - .incbin "graphics/battle_anims/backgrounds/21.bin.lz" + .incbin "graphics/battle_anims/backgrounds/fissure.bin.lz" .align 2 gBattleAnimSpriteGfx_Bird:: @ 8E8056C - .incbin "graphics/battle_anims/sprites/284.4bpp.lz" + .incbin "graphics/battle_anims/sprites/bird.4bpp.lz" .align 2 gBattleAnimSpritePal_Bird:: @ 8E808E8 - .incbin "graphics/battle_anims/sprites/284.gbapal.lz" + .incbin "graphics/battle_anims/sprites/bird.gbapal.lz" .align 2 gBattleAnimSpriteGfx_CrossImpact:: @ 8E80904 - .incbin "graphics/battle_anims/sprites/285.4bpp.lz" + .incbin "graphics/battle_anims/sprites/cross_impact.4bpp.lz" .align 2 gBattleAnimSpritePal_CrossImpact:: @ 8E809A4 - .incbin "graphics/battle_anims/sprites/285.gbapal.lz" + .incbin "graphics/battle_anims/sprites/cross_impact.gbapal.lz" .align 2 gFile_graphics_battle_anims_backgrounds_water_sheet:: @ 8E809CC @@ -13949,15 +1666,15 @@ gFile_graphics_unknown_unknown_E822B8_tilemap:: @ 8E822B8 .align 2 gBattleAnimSpritePal_Slash2:: @ 8E825AC - .incbin "graphics/battle_anims/sprites/286.gbapal.lz" + .incbin "graphics/battle_anims/sprites/slash_2.gbapal.lz" .align 2 gBattleAnimSpriteGfx_WhiteShadow:: @ 8E825D4 - .incbin "graphics/battle_anims/sprites/188.4bpp.lz" + .incbin "graphics/battle_anims/sprites/white_shadow.4bpp.lz" .align 2 gBattleAnimSpritePal_WhiteShadow:: @ 8E826E8 - .incbin "graphics/battle_anims/sprites/188.gbapal.lz" + .incbin "graphics/battle_anims/sprites/white_shadow.gbapal.lz" .align 2 gPartyMenuBg_Gfx:: @ 8E82700 @@ -15977,27 +3694,27 @@ gFile_graphics_items_icon_palettes_sapphire_palette:: @ 8E93720 .align 2 gBattleAnimSpritePal_Shock3:: @ 8E93748 - .incbin "graphics/battle_anims/sprites/282.gbapal.lz" + .incbin "graphics/battle_anims/sprites/shock_3.gbapal.lz" .align 2 gBattleAnimSpriteGfx_Shock3:: @ 8E93770 - .incbin "graphics/battle_anims/sprites/282.4bpp.lz" + .incbin "graphics/battle_anims/sprites/shock_3.4bpp.lz" .align 2 gBattleAnimSpritePal_WhiteFeather:: @ 8E93958 - .incbin "graphics/battle_anims/sprites/270.gbapal.lz" + .incbin "graphics/battle_anims/sprites/white_feather.gbapal.lz" .align 2 gBattleAnimSpriteGfx_WhiteFeather:: @ 8E93974 - .incbin "graphics/battle_anims/sprites/270.4bpp.lz" + .incbin "graphics/battle_anims/sprites/white_feather.4bpp.lz" .align 2 gBattleAnimSpritePal_Sparkle6:: @ 8E93A9C - .incbin "graphics/battle_anims/sprites/271.gbapal.lz" + .incbin "graphics/battle_anims/sprites/sparkle_6.gbapal.lz" .align 2 gBattleAnimSpriteGfx_Sparkle6:: @ 8E93AB4 - .incbin "graphics/battle_anims/sprites/271.4bpp.lz" + .incbin "graphics/battle_anims/sprites/sparkle_6.4bpp.lz" .align 2 gGhostPalette:: @ 8E93B14 diff --git a/data/smokescreen.s b/data/smokescreen.s index 49b13847b..e30e23b0d 100644 --- a/data/smokescreen.s +++ b/data/smokescreen.s @@ -4,10 +4,10 @@ .align 2 gSmokescreenImpactSpriteSheet:: @ 825098C - obj_tiles gFile_graphics_battle_anims_sprites_smokescreen_impact_sheet, 0x0180, 55019 + obj_tiles gSmokescreenImpactTiles, 0x0180, 55019 gSmokescreenImpactSpritePalette:: @ 8250994 - obj_pal gFile_graphics_battle_anims_sprites_smokescreen_impact_palette, 55019 + obj_pal gSmokescreenImpactPalette, 55019 gOamData_835099C:: .4byte 0x40000000, 0x00000400 -- cgit v1.2.3 From 2d733fb993cd2c98d0273de1b593c4076efcc573 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 22 Feb 2020 12:56:01 -0500 Subject: Move trainer pics/pals and battle terrain to src --- data/graphics.s | 1328 ------------------------------------------------------- 1 file changed, 1328 deletions(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index ae725879d..ff372fa03 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -1,1333 +1,5 @@ .section gfx_data, "aw", %progbits - .align 2 -gTrainerFrontPic_AquaLeaderArchie:: @ 8E48D58 - .incbin "graphics/trainers/front_pics/aqua_leader_archie_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_AquaLeaderArchie:: @ 8E49094 - .incbin "graphics/trainers/palettes/aqua_leader_archie.gbapal.lz" - - .align 2 -gTrainerFrontPic_AquaGruntM:: @ 8E490BC - .incbin "graphics/trainers/front_pics/aqua_grunt_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_AquaGruntM:: @ 8E4941C - .incbin "graphics/trainers/palettes/aqua_grunt_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_AquaGruntF:: @ 8E49444 - .incbin "graphics/trainers/front_pics/aqua_grunt_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_AquaGruntF:: @ 8E49780 - .incbin "graphics/trainers/palettes/aqua_grunt_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSAromaLady:: @ 8E497A8 - .incbin "graphics/trainers/front_pics/rs_aroma_lady_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSAromaLady:: @ 8E49A6C - .incbin "graphics/trainers/palettes/rs_aroma_lady.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSRuinManiac:: @ 8E49A94 - .incbin "graphics/trainers/front_pics/rs_ruin_maniac_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSRuinManiac:: @ 8E49E30 - .incbin "graphics/trainers/palettes/rs_ruin_maniac.gbapal.lz" - - .align 2 -gTrainerFrontPic_Interviewer:: @ 8E49E58 - .incbin "graphics/trainers/front_pics/interviewer_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Interviewer:: @ 8E4A2FC - .incbin "graphics/trainers/palettes/interviewer.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSTuberF:: @ 8E4A324 - .incbin "graphics/trainers/front_pics/rs_tuber_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSTuberF:: @ 8E4A5C8 - .incbin "graphics/trainers/palettes/rs_tuber_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_TuberM:: @ 8E4A5F0 - .incbin "graphics/trainers/front_pics/tuber_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_TuberM:: @ 8E4A87C - .incbin "graphics/trainers/palettes/tuber_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSCooltrainerM:: @ 8E4A8A4 - .incbin "graphics/trainers/front_pics/rs_cool_trainer_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSCooltrainerM:: @ 8E4AB8C - .incbin "graphics/trainers/palettes/rs_cool_trainer_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSCooltrainerF:: @ 8E4ABB4 - .incbin "graphics/trainers/front_pics/rs_cool_trainer_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSCooltrainerF:: @ 8E4AEC8 - .incbin "graphics/trainers/palettes/rs_cool_trainer_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_HexManiac:: @ 8E4AEF0 - .incbin "graphics/trainers/front_pics/hex_maniac_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_HexManiac:: @ 8E4B25C - .incbin "graphics/trainers/palettes/hex_maniac.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSLady:: @ 8E4B284 - .incbin "graphics/trainers/front_pics/rs_lady_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSLady:: @ 8E4B638 - .incbin "graphics/trainers/palettes/rs_lady.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSBeauty:: @ 8E4B660 - .incbin "graphics/trainers/front_pics/rs_beauty_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSBeauty:: @ 8E4B948 - .incbin "graphics/trainers/palettes/rs_beauty.gbapal.lz" - - .align 2 -gTrainerFrontPic_RichBoy:: @ 8E4B970 - .incbin "graphics/trainers/front_pics/rich_boy_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RichBoy:: @ 8E4BC24 - .incbin "graphics/trainers/palettes/rich_boy.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSPokeManiac:: @ 8E4BC4C - .incbin "graphics/trainers/front_pics/rs_pokemaniac_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSPokeManiac:: @ 8E4BFBC - .incbin "graphics/trainers/palettes/rs_pokemaniac.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSSwimmerM:: @ 8E4BFE4 - .incbin "graphics/trainers/front_pics/rs_swimmer_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSSwimmerM:: @ 8E4C2A4 - .incbin "graphics/trainers/palettes/rs_swimmer_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSBlackBelt:: @ 8E4C2CC - .incbin "graphics/trainers/front_pics/rs_black_belt_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSBlackBelt:: @ 8E4C630 - .incbin "graphics/trainers/palettes/rs_black_belt.gbapal.lz" - - .align 2 -gTrainerFrontPic_Guitarist:: @ 8E4C658 - .incbin "graphics/trainers/front_pics/guitarist_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Guitarist:: @ 8E4C9DC - .incbin "graphics/trainers/palettes/guitarist.gbapal.lz" - - .align 2 -gTrainerFrontPic_Kindler:: @ 8E4CA04 - .incbin "graphics/trainers/front_pics/kindler_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Kindler:: @ 8E4CD70 - .incbin "graphics/trainers/palettes/kindler.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSCamper:: @ 8E4CD98 - .incbin "graphics/trainers/front_pics/rs_camper_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSCamper:: @ 8E4D080 - .incbin "graphics/trainers/palettes/rs_camper.gbapal.lz" - - .align 2 -gTrainerFrontPic_BugManiac:: @ 8E4D0A8 - .incbin "graphics/trainers/front_pics/bug_maniac_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_BugManiac:: @ 8E4D4F8 - .incbin "graphics/trainers/palettes/bug_maniac.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSPsychicM:: @ 8E4D520 - .incbin "graphics/trainers/front_pics/rs_psychic_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSPsychicM:: @ 8E4D84C - .incbin "graphics/trainers/palettes/rs_psychic_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSPsychicF:: @ 8E4D874 - .incbin "graphics/trainers/front_pics/rs_psychic_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSPsychicF:: @ 8E4DB9C - .incbin "graphics/trainers/palettes/rs_psychic_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSGentleman:: @ 8E4DBC4 - .incbin "graphics/trainers/front_pics/rs_gentleman_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSGentleman:: @ 8E4DEC4 - .incbin "graphics/trainers/palettes/rs_gentleman.gbapal.lz" - - .align 2 -gTrainerFrontPic_EliteFourSidney:: @ 8E4DEEC - .incbin "graphics/trainers/front_pics/elite_four_sidney_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_EliteFourSidney:: @ 8E4E220 - .incbin "graphics/trainers/palettes/elite_four_sidney.gbapal.lz" - - .align 2 -gTrainerFrontPic_EliteFourPhoebe:: @ 8E4E248 - .incbin "graphics/trainers/front_pics/elite_four_phoebe_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_EliteFourPhoebe:: @ 8E4E548 - .incbin "graphics/trainers/palettes/elite_four_phoebe.gbapal.lz" - - .align 2 -gTrainerFrontPic_LeaderRoxanne:: @ 8E4E570 - .incbin "graphics/trainers/front_pics/leader_roxanne_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_LeaderRoxanne:: @ 8E4E85C - .incbin "graphics/trainers/palettes/leader_roxanne.gbapal.lz" - - .align 2 -gTrainerFrontPic_LeaderBrawly:: @ 8E4E884 - .incbin "graphics/trainers/front_pics/leader_brawly_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_LeaderBrawly:: @ 8E4EC18 - .incbin "graphics/trainers/palettes/leader_brawly.gbapal.lz" - - .align 2 -gTrainerFrontPic_LeaderTateAndLiza:: @ 8E4EC40 - .incbin "graphics/trainers/front_pics/leader_tate_and_liza_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_LeaderTateAndLiza:: @ 8E4F084 - .incbin "graphics/trainers/palettes/leader_tate_and_liza.gbapal.lz" - - .align 2 -gTrainerFrontPic_SchoolKidM:: @ 8E4F0AC - .incbin "graphics/trainers/front_pics/school_kid_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_SchoolKidM:: @ 8E4F36C - .incbin "graphics/trainers/palettes/school_kid_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_SchoolKidF:: @ 8E4F394 - .incbin "graphics/trainers/front_pics/school_kid_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_SchoolKidF:: @ 8E4F630 - .incbin "graphics/trainers/palettes/school_kid_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_SrAndJr:: @ 8E4F658 - .incbin "graphics/trainers/front_pics/sr_and_jr_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_SrAndJr:: @ 8E4FAC8 - .incbin "graphics/trainers/palettes/sr_and_jr.gbapal.lz" - - .align 2 -gTrainerFrontPic_PokefanM:: @ 8E4FAF0 - .incbin "graphics/trainers/front_pics/pokefan_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_PokefanM:: @ 8E4FEAC - .incbin "graphics/trainers/palettes/pokefan_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_PokefanF:: @ 8E4FED4 - .incbin "graphics/trainers/front_pics/pokefan_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_PokefanF:: @ 8E502A0 - .incbin "graphics/trainers/palettes/pokefan_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_ExpertM:: @ 8E502C8 - .incbin "graphics/trainers/front_pics/expert_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_ExpertM:: @ 8E50608 - .incbin "graphics/trainers/palettes/expert_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_ExpertF:: @ 8E50630 - .incbin "graphics/trainers/front_pics/expert_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_ExpertF:: @ 8E5094C - .incbin "graphics/trainers/palettes/expert_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSYoungster:: @ 8E50974 - .incbin "graphics/trainers/front_pics/rs_youngster_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSYoungster:: @ 8E50C1C - .incbin "graphics/trainers/palettes/rs_youngster.gbapal.lz" - - .align 2 -gTrainerFrontPic_ChampionSteven:: @ 8E50C44 - .incbin "graphics/trainers/front_pics/champion_steven_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_ChampionSteven:: @ 8E50F7C - .incbin "graphics/trainers/palettes/champion_steven.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSFisherman:: @ 8E50FA4 - .incbin "graphics/trainers/front_pics/rs_fisherman_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSFisherman:: @ 8E51388 - .incbin "graphics/trainers/palettes/rs_fisherman.gbapal.lz" - - .align 2 -gTrainerFrontPic_CyclingTriathleteM:: @ 8E513B0 - .incbin "graphics/trainers/front_pics/cycling_triathlete_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_CyclingTriathleteM:: @ 8E517C0 - .incbin "graphics/trainers/palettes/cycling_triathlete_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_CyclingTriathleteF:: @ 8E517E8 - .incbin "graphics/trainers/front_pics/cycling_triathlete_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_CyclingTriathleteF:: @ 8E51BF4 - .incbin "graphics/trainers/palettes/cycling_triathlete_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_RunningTriathleteM:: @ 8E51C1C - .incbin "graphics/trainers/front_pics/running_triathlete_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RunningTriathleteM:: @ 8E51ED4 - .incbin "graphics/trainers/palettes/running_triathlete_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_RunningTriathleteF:: @ 8E51EFC - .incbin "graphics/trainers/front_pics/running_triathlete_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RunningTriathleteF:: @ 8E521A0 - .incbin "graphics/trainers/palettes/running_triathlete_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_SwimmingTriathleteM:: @ 8E521C8 - .incbin "graphics/trainers/front_pics/swimming_triathlete_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_SwimmingTriathleteM:: @ 8E524F4 - .incbin "graphics/trainers/palettes/swimming_triathlete_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_SwimmingTriathleteF:: @ 8E5251C - .incbin "graphics/trainers/front_pics/swimming_triathlete_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_SwimmingTriathleteF:: @ 8E527F8 - .incbin "graphics/trainers/palettes/swimming_triathlete_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_DragonTamer:: @ 8E52820 - .incbin "graphics/trainers/front_pics/dragon_tamer_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_DragonTamer:: @ 8E52B74 - .incbin "graphics/trainers/palettes/dragon_tamer.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSBirdKeeper:: @ 8E52B9C - .incbin "graphics/trainers/front_pics/rs_bird_keeper_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSBirdKeeper:: @ 8E52ED4 - .incbin "graphics/trainers/palettes/rs_bird_keeper.gbapal.lz" - - .align 2 -gTrainerFrontPic_NinjaBoy:: @ 8E52EFC - .incbin "graphics/trainers/front_pics/ninja_boy_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_NinjaBoy:: @ 8E531D8 - .incbin "graphics/trainers/palettes/ninja_boy.gbapal.lz" - - .align 2 -gTrainerFrontPic_BattleGirl:: @ 8E53200 - .incbin "graphics/trainers/front_pics/battle_girl_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_BattleGirl:: @ 8E53520 - .incbin "graphics/trainers/palettes/battle_girl.gbapal.lz" - - .align 2 -gTrainerFrontPic_ParasolLady:: @ 8E53548 - .incbin "graphics/trainers/front_pics/parasol_lady_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_ParasolLady:: @ 8E53880 - .incbin "graphics/trainers/palettes/parasol_lady.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSSwimmerF:: @ 8E538A8 - .incbin "graphics/trainers/front_pics/rs_swimmer_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSSwimmerF:: @ 8E53B78 - .incbin "graphics/trainers/palettes/rs_swimmer_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSPicnicker:: @ 8E53BA0 - .incbin "graphics/trainers/front_pics/rs_picnicker_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSPicnicker:: @ 8E53E80 - .incbin "graphics/trainers/palettes/rs_picnicker.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSTwins:: @ 8E53EA8 - .incbin "graphics/trainers/front_pics/rs_twins_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSTwins:: @ 8E5426C - .incbin "graphics/trainers/palettes/rs_twins.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSSailor:: @ 8E54294 - .incbin "graphics/trainers/front_pics/rs_sailor_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSSailor:: @ 8E54644 - .incbin "graphics/trainers/palettes/rs_sailor.gbapal.lz" - - .align 2 -gTrainerFrontPic_Collector:: @ 8E5466C - .incbin "graphics/trainers/front_pics/collector_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Collector:: @ 8E54A70 - .incbin "graphics/trainers/palettes/collector.gbapal.lz" - - .align 2 -gTrainerFrontPic_Wally:: @ 8E54A98 - .incbin "graphics/trainers/front_pics/wally_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Wally:: @ 8E54D68 - .incbin "graphics/trainers/palettes/wally.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSBrendan1:: @ 8E54D90 - .incbin "graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSBrendan1:: @ 8E550A4 - .incbin "graphics/trainers/palettes/ruby_sapphire_brendan.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSMay1:: @ 8E550CC - .incbin "graphics/trainers/front_pics/ruby_sapphire_may_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSMay1:: @ 8E553CC - .incbin "graphics/trainers/palettes/ruby_sapphire_may.gbapal.lz" - - .align 2 -gTrainerFrontPic_PokemonBreederM:: @ 8E553F4 - .incbin "graphics/trainers/front_pics/pokemon_breeder_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_PokemonBreederM:: @ 8E55724 - .incbin "graphics/trainers/palettes/pokemon_breeder_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSPokemonBreederF:: @ 8E5574C - .incbin "graphics/trainers/front_pics/rs_pokemon_breeder_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSPokemonBreederF:: @ 8E55A80 - .incbin "graphics/trainers/palettes/rs_pokemon_breeder_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSPokemonRangerM:: @ 8E55AA8 - .incbin "graphics/trainers/front_pics/rs_pokemon_ranger_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSPokemonRangerM:: @ 8E55DF0 - .incbin "graphics/trainers/palettes/rs_pokemon_ranger_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSPokemonRangerF:: @ 8E55E18 - .incbin "graphics/trainers/front_pics/rs_pokemon_ranger_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSPokemonRangerF:: @ 8E5614C - .incbin "graphics/trainers/palettes/rs_pokemon_ranger_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_MagmaLeaderMaxie:: @ 8E56174 - .incbin "graphics/trainers/front_pics/magma_leader_maxie_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_MagmaLeaderMaxie:: @ 8E56468 - .incbin "graphics/trainers/palettes/magma_leader_maxie.gbapal.lz" - - .align 2 -gTrainerFrontPic_MagmaGruntM:: @ 8E56490 - .incbin "graphics/trainers/front_pics/magma_grunt_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_MagmaGruntM:: @ 8E56810 - .incbin "graphics/trainers/palettes/magma_grunt_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_MagmaGruntF:: @ 8E56838 - .incbin "graphics/trainers/front_pics/magma_grunt_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_MagmaGruntF:: @ 8E56BC4 - .incbin "graphics/trainers/palettes/magma_grunt_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSLass:: @ 8E56BEC - .incbin "graphics/trainers/front_pics/rs_lass_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSLass:: @ 8E56EC4 - .incbin "graphics/trainers/palettes/rs_lass.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSBugCatcher:: @ 8E56EEC - .incbin "graphics/trainers/front_pics/rs_bug_catcher_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSBugCatcher:: @ 8E57218 - .incbin "graphics/trainers/palettes/rs_bug_catcher.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSHiker:: @ 8E57240 - .incbin "graphics/trainers/front_pics/rs_hiker_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSHiker:: @ 8E576C0 - .incbin "graphics/trainers/palettes/rs_hiker.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSYoungCouple:: @ 8E576E8 - .incbin "graphics/trainers/front_pics/rs_young_couple_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSYoungCouple:: @ 8E57AA8 - .incbin "graphics/trainers/palettes/rs_young_couple.gbapal.lz" - - .align 2 -gTrainerFrontPic_OldCouple:: @ 8E57AD0 - .incbin "graphics/trainers/front_pics/old_couple_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_OldCouple:: @ 8E57FE0 - .incbin "graphics/trainers/palettes/old_couple.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSSisAndBro:: @ 8E58008 - .incbin "graphics/trainers/front_pics/rs_sis_and_bro_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSSisAndBro:: @ 8E58454 - .incbin "graphics/trainers/palettes/rs_sis_and_bro.gbapal.lz" - - .align 2 -gTrainerFrontPic_AquaAdminM:: @ 8E5847C - .incbin "graphics/trainers/front_pics/aqua_admin_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_AquaAdminM:: @ 8E58830 - .incbin "graphics/trainers/palettes/aqua_admin_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_AquaAdminF:: @ 8E58858 - .incbin "graphics/trainers/front_pics/aqua_admin_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_AquaAdminF:: @ 8E58C1C - .incbin "graphics/trainers/palettes/aqua_admin_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_MagmaAdminM:: @ 8E58C44 - .incbin "graphics/trainers/front_pics/magma_admin_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_MagmaAdminM:: @ 8E5901C - .incbin "graphics/trainers/palettes/magma_admin_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_MagmaAdminF:: @ 8E59044 - .incbin "graphics/trainers/front_pics/magma_admin_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_MagmaAdminF:: @ 8E593F4 - .incbin "graphics/trainers/palettes/magma_admin_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_LeaderWattson:: @ 8E5941C - .incbin "graphics/trainers/front_pics/leader_wattson_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_LeaderWattson:: @ 8E59764 - .incbin "graphics/trainers/palettes/leader_wattson.gbapal.lz" - - .align 2 -gTrainerFrontPic_LeaderFlannery:: @ 8E5978C - .incbin "graphics/trainers/front_pics/leader_flannery_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_LeaderFlannery:: @ 8E59B0C - .incbin "graphics/trainers/palettes/leader_flannery.gbapal.lz" - - .align 2 -gTrainerFrontPic_LeaderNorman:: @ 8E59B34 - .incbin "graphics/trainers/front_pics/leader_norman_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_LeaderNorman:: @ 8E59E70 - .incbin "graphics/trainers/palettes/leader_norman.gbapal.lz" - - .align 2 -gTrainerFrontPic_LeaderWinona:: @ 8E59E98 - .incbin "graphics/trainers/front_pics/leader_winona_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_LeaderWinona:: @ 8E5A218 - .incbin "graphics/trainers/palettes/leader_winona.gbapal.lz" - - .align 2 -gTrainerFrontPic_LeaderWallace:: @ 8E5A240 - .incbin "graphics/trainers/front_pics/leader_wallace_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_LeaderWallace:: @ 8E5A5B8 - .incbin "graphics/trainers/palettes/leader_wallace.gbapal.lz" - - .align 2 -gTrainerFrontPic_EliteFourGlacia:: @ 8E5A5E0 - .incbin "graphics/trainers/front_pics/elite_four_glacia_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_EliteFourGlacia:: @ 8E5A964 - .incbin "graphics/trainers/palettes/elite_four_glacia.gbapal.lz" - - .align 2 -gTrainerFrontPic_EliteFourDrake:: @ 8E5A98C - .incbin "graphics/trainers/front_pics/elite_four_drake_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_EliteFourDrake:: @ 8E5AD34 - .incbin "graphics/trainers/palettes/elite_four_drake.gbapal.lz" - - .align 2 -gTrainerFrontPic_Youngster:: @ 8E5AD5C - .incbin "graphics/trainers/front_pics/youngster_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Youngster:: @ 8E5AFFC - .incbin "graphics/trainers/palettes/youngster.gbapal.lz" - - .align 2 -gTrainerFrontPic_BugCatcher:: @ 8E5B024 - .incbin "graphics/trainers/front_pics/bug_catcher_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_BugCatcher:: @ 8E5B36C - .incbin "graphics/trainers/palettes/bug_catcher.gbapal.lz" - - .align 2 -gTrainerFrontPic_Lass:: @ 8E5B394 - .incbin "graphics/trainers/front_pics/lass_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Lass:: @ 8E5B680 - .incbin "graphics/trainers/palettes/lass.gbapal.lz" - - .align 2 -gTrainerFrontPic_Sailor:: @ 8E5B6A8 - .incbin "graphics/trainers/front_pics/sailor_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Sailor:: @ 8E5B9C8 - .incbin "graphics/trainers/palettes/sailor.gbapal.lz" - - .align 2 -gTrainerFrontPic_Camper:: @ 8E5B9F0 - .incbin "graphics/trainers/front_pics/camper_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Camper:: @ 8E5BCD0 - .incbin "graphics/trainers/palettes/camper.gbapal.lz" - - .align 2 -gTrainerFrontPic_Picnicker:: @ 8E5BCF8 - .incbin "graphics/trainers/front_pics/picnicker_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Picnicker:: @ 8E5BFE0 - .incbin "graphics/trainers/palettes/picnicker.gbapal.lz" - - .align 2 -gTrainerFrontPic_PokeManiac:: @ 8E5C008 - .incbin "graphics/trainers/front_pics/pokemaniac_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_PokeManiac:: @ 8E5C3C4 - .incbin "graphics/trainers/palettes/pokemaniac.gbapal.lz" - - .align 2 -gTrainerFrontPic_SuperNerd:: @ 8E5C3EC - .incbin "graphics/trainers/front_pics/super_nerd_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_SuperNerd:: @ 8E5C704 - .incbin "graphics/trainers/palettes/super_nerd.gbapal.lz" - - .align 2 -gTrainerFrontPic_Hiker:: @ 8E5C72C - .incbin "graphics/trainers/front_pics/hiker_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Hiker:: @ 8E5CB9C - .incbin "graphics/trainers/palettes/hiker.gbapal.lz" - - .align 2 -gTrainerFrontPic_Biker:: @ 8E5CBC4 - .incbin "graphics/trainers/front_pics/biker_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Biker:: @ 8E5D12C - .incbin "graphics/trainers/palettes/biker.gbapal.lz" - - .align 2 -gTrainerFrontPic_Burglar:: @ 8E5D154 - .incbin "graphics/trainers/front_pics/burglar_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Burglar:: @ 8E5D4A0 - .incbin "graphics/trainers/palettes/burglar.gbapal.lz" - - .align 2 -gTrainerFrontPic_Engineer:: @ 8E5D4C8 - .incbin "graphics/trainers/front_pics/engineer_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Engineer:: @ 8E5D8D4 - .incbin "graphics/trainers/palettes/engineer.gbapal.lz" - - .align 2 -gTrainerFrontPic_Fisherman:: @ 8E5D8FC - .incbin "graphics/trainers/front_pics/fisherman_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Fisherman:: @ 8E5DCA8 - .incbin "graphics/trainers/palettes/fisherman.gbapal.lz" - - .align 2 -gTrainerFrontPic_SwimmerM:: @ 8E5DCD0 - .incbin "graphics/trainers/front_pics/swimmer_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_SwimmerM:: @ 8E5DFA8 - .incbin "graphics/trainers/palettes/swimmer_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_CueBall:: @ 8E5DFD0 - .incbin "graphics/trainers/front_pics/cue_ball_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_CueBall:: @ 8E5E598 - .incbin "graphics/trainers/palettes/cue_ball.gbapal.lz" - - .align 2 -gTrainerFrontPic_Gamer:: @ 8E5E5C0 - .incbin "graphics/trainers/front_pics/gamer_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Gamer:: @ 8E5E954 - .incbin "graphics/trainers/palettes/gamer.gbapal.lz" - - .align 2 -gTrainerFrontPic_Beauty:: @ 8E5E97C - .incbin "graphics/trainers/front_pics/beauty_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Beauty:: @ 8E5ECD8 - .incbin "graphics/trainers/palettes/beauty.gbapal.lz" - - .align 2 -gTrainerFrontPic_SwimmerF:: @ 8E5ED00 - .incbin "graphics/trainers/front_pics/swimmer_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_SwimmerF:: @ 8E5EFEC - .incbin "graphics/trainers/palettes/swimmer_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_PsychicM:: @ 8E5F014 - .incbin "graphics/trainers/front_pics/psychic_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_PsychicM:: @ 8E5F374 - .incbin "graphics/trainers/palettes/psychic_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_Rocker:: @ 8E5F39C - .incbin "graphics/trainers/front_pics/rocker_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Rocker:: @ 8E5F7F8 - .incbin "graphics/trainers/palettes/rocker.gbapal.lz" - - .align 2 -gTrainerFrontPic_Juggler:: @ 8E5F820 - .incbin "graphics/trainers/front_pics/juggler_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Juggler:: @ 8E5FC5C - .incbin "graphics/trainers/palettes/juggler.gbapal.lz" - - .align 2 -gTrainerFrontPic_Tamer:: @ 8E5FC84 - .incbin "graphics/trainers/front_pics/tamer_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Tamer:: @ 8E60038 - .incbin "graphics/trainers/palettes/tamer.gbapal.lz" - - .align 2 -gTrainerFrontPic_BirdKeeper:: @ 8E60060 - .incbin "graphics/trainers/front_pics/bird_keeper_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_BirdKeeper:: @ 8E60424 - .incbin "graphics/trainers/palettes/bird_keeper.gbapal.lz" - - .align 2 -gTrainerFrontPic_BlackBelt:: @ 8E6044C - .incbin "graphics/trainers/front_pics/black_belt_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_BlackBelt:: @ 8E6086C - .incbin "graphics/trainers/palettes/black_belt.gbapal.lz" - - .align 2 -gTrainerFrontPic_Rival1:: @ 8E60894 - .incbin "graphics/trainers/front_pics/rival_1_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Rival1:: @ 8E60B4C - .incbin "graphics/trainers/palettes/rival_1.gbapal.lz" - - .align 2 -gTrainerFrontPic_Scientist:: @ 8E60B74 - .incbin "graphics/trainers/front_pics/scientist_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Scientist:: @ 8E60F50 - .incbin "graphics/trainers/palettes/scientist.gbapal.lz" - - .align 2 -gTrainerFrontPic_LeaderGiovanni:: @ 8E60F78 - .incbin "graphics/trainers/front_pics/leader_giovanni_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_LeaderGiovanni:: @ 8E61288 - .incbin "graphics/trainers/palettes/leader_giovanni.gbapal.lz" - - .align 2 -gTrainerFrontPic_RocketGruntM:: @ 8E612B0 - .incbin "graphics/trainers/front_pics/rocket_grunt_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RocketGruntM:: @ 8E615E4 - .incbin "graphics/trainers/palettes/rocket_grunt_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_CooltrainerM:: @ 8E6160C - .incbin "graphics/trainers/front_pics/cool_trainer_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_CooltrainerM:: @ 8E618DC - .incbin "graphics/trainers/palettes/cool_trainer_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_CooltrainerF:: @ 8E61904 - .incbin "graphics/trainers/front_pics/cool_trainer_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_CooltrainerF:: @ 8E61C1C - .incbin "graphics/trainers/palettes/cool_trainer_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_EliteFourLorelei:: @ 8E61C44 - .incbin "graphics/trainers/front_pics/elite_four_lorelei_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_EliteFourLorelei:: @ 8E61F70 - .incbin "graphics/trainers/palettes/elite_four_lorelei.gbapal.lz" - - .align 2 -gTrainerFrontPic_EliteFourBruno:: @ 8E61F98 - .incbin "graphics/trainers/front_pics/elite_four_bruno_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_EliteFourBruno:: @ 8E623E4 - .incbin "graphics/trainers/palettes/elite_four_bruno.gbapal.lz" - - .align 2 -gTrainerFrontPic_EliteFourAgatha:: @ 8E6240C - .incbin "graphics/trainers/front_pics/elite_four_agatha_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_EliteFourAgatha:: @ 8E62728 - .incbin "graphics/trainers/palettes/elite_four_agatha.gbapal.lz" - - .align 2 -gTrainerFrontPic_EliteFourLance:: @ 8E62750 - .incbin "graphics/trainers/front_pics/elite_four_lance_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_EliteFourLance:: @ 8E62B18 - .incbin "graphics/trainers/palettes/elite_four_lance.gbapal.lz" - - .align 2 -gTrainerFrontPic_LeaderBrock:: @ 8E62B40 - .incbin "graphics/trainers/front_pics/leader_brock_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_LeaderBrock:: @ 8E62E8C - .incbin "graphics/trainers/palettes/leader_brock.gbapal.lz" - - .align 2 -gTrainerFrontPic_LeaderMisty:: @ 8E62EB4 - .incbin "graphics/trainers/front_pics/leader_misty_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_LeaderMisty:: @ 8E631B4 - .incbin "graphics/trainers/palettes/leader_misty.gbapal.lz" - - .align 2 -gTrainerFrontPic_LeaderLtSurge:: @ 8E631DC - .incbin "graphics/trainers/front_pics/leader_lt_surge_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_LeaderLtSurge:: @ 8E6356C - .incbin "graphics/trainers/palettes/leader_lt_surge.gbapal.lz" - - .align 2 -gTrainerFrontPic_LeaderErika:: @ 8E63594 - .incbin "graphics/trainers/front_pics/leader_erika_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_LeaderErika:: @ 8E63888 - .incbin "graphics/trainers/palettes/leader_erika.gbapal.lz" - - .align 2 -gTrainerFrontPic_LeaderKoga:: @ 8E638B0 - .incbin "graphics/trainers/front_pics/leader_koga_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_LeaderKoga:: @ 8E63C18 - .incbin "graphics/trainers/palettes/leader_koga.gbapal.lz" - - .align 2 -gTrainerFrontPic_LeaderBlaine:: @ 8E63C40 - .incbin "graphics/trainers/front_pics/leader_blaine_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_LeaderBlaine:: @ 8E6404C - .incbin "graphics/trainers/palettes/leader_blaine.gbapal.lz" - - .align 2 -gTrainerFrontPic_LeaderSabrina:: @ 8E64074 - .incbin "graphics/trainers/front_pics/leader_sabrina_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_LeaderSabrina:: @ 8E6437C - .incbin "graphics/trainers/palettes/leader_sabrina.gbapal.lz" - - .align 2 -gTrainerFrontPic_Gentleman:: @ 8E643A4 - .incbin "graphics/trainers/front_pics/gentleman_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Gentleman:: @ 8E646DC - .incbin "graphics/trainers/palettes/gentleman.gbapal.lz" - - .align 2 -gTrainerFrontPic_Rival2:: @ 8E64704 - .incbin "graphics/trainers/front_pics/rival_2_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Rival2:: @ 8E649F8 - .incbin "graphics/trainers/palettes/rival_2.gbapal.lz" - - .align 2 -gTrainerFrontPic_ChampionRival:: @ 8E64A20 - .incbin "graphics/trainers/front_pics/champion_rival_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_ChampionRival:: @ 8E64D1C - .incbin "graphics/trainers/palettes/champion_rival.gbapal.lz" - - .align 2 -gTrainerFrontPic_Channeler:: @ 8E64D44 - .incbin "graphics/trainers/front_pics/channeler_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Channeler:: @ 8E6511C - .incbin "graphics/trainers/palettes/channeler.gbapal.lz" - - .align 2 -gTrainerFrontPic_Twins:: @ 8E65144 - .incbin "graphics/trainers/front_pics/twins_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Twins:: @ 8E65494 - .incbin "graphics/trainers/palettes/twins.gbapal.lz" - - .align 2 -gTrainerFrontPic_CoolCouple:: @ 8E654BC - .incbin "graphics/trainers/front_pics/cool_couple_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_CoolCouple:: @ 8E6599C - .incbin "graphics/trainers/palettes/cool_couple.gbapal.lz" - - .align 2 -gTrainerFrontPic_YoungCouple:: @ 8E659C4 - .incbin "graphics/trainers/front_pics/young_couple_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_YoungCouple:: @ 8E65E10 - .incbin "graphics/trainers/palettes/young_couple.gbapal.lz" - - .align 2 -gTrainerFrontPic_CrushKin:: @ 8E65E38 - .incbin "graphics/trainers/front_pics/crush_kin_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_CrushKin:: @ 8E663D8 - .incbin "graphics/trainers/palettes/crush_kin.gbapal.lz" - - .align 2 -gTrainerFrontPic_SisAndBro:: @ 8E66400 - .incbin "graphics/trainers/front_pics/sis_and_bro_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_SisAndBro:: @ 8E66860 - .incbin "graphics/trainers/palettes/sis_and_bro.gbapal.lz" - - .align 2 -gTrainerFrontPic_ProfessorOak:: @ 8E66888 - .incbin "graphics/trainers/front_pics/professor_oak_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_ProfessorOak:: @ 8E66BF4 - .incbin "graphics/trainers/palettes/professor_oak.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSBrendan2:: @ 8E66C1C - .incbin "graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSBrendan2:: @ 8E66F30 - .incbin "graphics/trainers/palettes/ruby_sapphire_brendan.gbapal.lz" - - .align 2 -gTrainerFrontPic_RSMay2:: @ 8E66F58 - .incbin "graphics/trainers/front_pics/ruby_sapphire_may_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RSMay2:: @ 8E67258 - .incbin "graphics/trainers/palettes/ruby_sapphire_may.gbapal.lz" - - .align 2 -gTrainerFrontPic_Red:: @ 8E67280 - .incbin "graphics/trainers/front_pics/red_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Red:: @ 8E6758C - .incbin "graphics/trainers/palettes/red.gbapal.lz" - - .align 2 -gTrainerFrontPic_Leaf:: @ 8E675B4 - .incbin "graphics/trainers/front_pics/leaf_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Leaf:: @ 8E678F0 - .incbin "graphics/trainers/palettes/leaf.gbapal.lz" - - .align 2 -gTrainerFrontPic_RocketGruntF:: @ 8E67918 - .incbin "graphics/trainers/front_pics/rocket_grunt_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RocketGruntF:: @ 8E67C30 - .incbin "graphics/trainers/palettes/rocket_grunt_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_PsychicF:: @ 8E67C58 - .incbin "graphics/trainers/front_pics/psychic_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_PsychicF:: @ 8E67FF8 - .incbin "graphics/trainers/palettes/psychic_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_CrushGirl:: @ 8E68020 - .incbin "graphics/trainers/front_pics/crush_girl_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_CrushGirl:: @ 8E6832C - .incbin "graphics/trainers/palettes/crush_girl.gbapal.lz" - - .align 2 -gTrainerFrontPic_TuberF:: @ 8E68354 - .incbin "graphics/trainers/front_pics/tuber_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_TuberF:: @ 8E68658 - .incbin "graphics/trainers/palettes/tuber_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_PokemonBreederF:: @ 8E68680 - .incbin "graphics/trainers/front_pics/pokemon_breeder_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_PokemonBreederF:: @ 8E689C0 - .incbin "graphics/trainers/palettes/pokemon_breeder_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_PokemonRangerM:: @ 8E689E8 - .incbin "graphics/trainers/front_pics/pokemon_ranger_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_PokemonRangerM:: @ 8E68D48 - .incbin "graphics/trainers/palettes/pokemon_ranger_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_PokemonRangerF:: @ 8E68D70 - .incbin "graphics/trainers/front_pics/pokemon_ranger_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_PokemonRangerF:: @ 8E690A4 - .incbin "graphics/trainers/palettes/pokemon_ranger_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_AromaLady:: @ 8E690CC - .incbin "graphics/trainers/front_pics/aroma_lady_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_AromaLady:: @ 8E6941C - .incbin "graphics/trainers/palettes/aroma_lady.gbapal.lz" - - .align 2 -gTrainerFrontPic_RuinManiac:: @ 8E69444 - .incbin "graphics/trainers/front_pics/ruin_maniac_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RuinManiac:: @ 8E69850 - .incbin "graphics/trainers/palettes/ruin_maniac.gbapal.lz" - - .align 2 -gTrainerFrontPic_Lady:: @ 8E69878 - .incbin "graphics/trainers/front_pics/lady_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Lady:: @ 8E69BA0 - .incbin "graphics/trainers/palettes/lady.gbapal.lz" - - .align 2 -gTrainerFrontPic_Painter:: @ 8E69BC8 - .incbin "graphics/trainers/front_pics/painter_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Painter:: @ 8E69E94 - .incbin "graphics/trainers/palettes/painter.gbapal.lz" - - .align 2 -gTrainerBackPic_Red:: @ 8E69EBC - .incbin "graphics/trainers/back_pics/red_back_pic.4bpp" - - .align 2 -gTrainerBackPic_Leaf:: @ 8E6C6BC - .incbin "graphics/trainers/back_pics/leaf_back_pic.4bpp" - - .align 2 -gTrainerBackPic_Pokedude:: @ 8E6EEBC - .incbin "graphics/trainers/back_pics/pokedude_back_pic.4bpp" - - .align 2 -gTrainerBackPic_OldMan:: @ 8E70EBC - .incbin "graphics/trainers/back_pics/old_man_back_pic.4bpp" - - .align 2 -gTrainerBackPic_RSBrendan:: @ 8E72EBC - .incbin "graphics/trainers/back_pics/ruby_sapphire_brendan_back_pic.4bpp" - - .align 2 -gTrainerBackPic_RSMay:: @ 8E74EBC - .incbin "graphics/trainers/back_pics/ruby_sapphire_may_back_pic.4bpp" - - .align 2 -gTrainerPalette_RedBackPic:: @ 8E76EBC - .incbin "graphics/trainers/palettes/leaf_back_pic.gbapal.lz" - - .align 2 -gTrainerPalette_LeafBackPic:: @ 8E76EE4 - .incbin "graphics/trainers/palettes/red_back_pic.gbapal.lz" - - .align 2 -gTrainerPalette_PokedudeBackPic:: @ 8E76F0C - .incbin "graphics/trainers/palettes/pokedude_back_pic.gbapal.lz" - - .align 2 -gTrainerPalette_OldManBackPic:: @ 8E76F34 - .incbin "graphics/trainers/palettes/old_man_back_pic.gbapal.lz" - - .align 2 -gMonIcon_QuestionMark:: @ 8E76F5C - .incbin "graphics/pokemon/question_mark/icon.4bpp" - - .align 2 -gMonFootprint_QuestionMark:: @ 8E7735C - .incbin "graphics/pokemon/question_mark/footprint.1bpp" - - .align 2 -gFile_graphics_battle_transitions_vs_frame_sheet:: @ 8E7737C - .incbin "graphics/battle_transitions/vs_frame.4bpp.lz" - - .align 2 -gFile_graphics_battle_transitions_vs_frame_tilemap:: @ 8E77464 - .incbin "graphics/battle_transitions/vs_frame.bin.lz" - - .align 2 -gFile_graphics_battle_transitions_vs_frame_palette:: @ 8E77570 - .incbin "graphics/battle_transitions/vs_frame.gbapal.lz" - - .align 2 -gFile_graphics_battle_transitions_vs_sheet:: @ 8E77598 - .incbin "graphics/battle_transitions/vs.4bpp.lz" @from ruby - - .align 2 -gFile_graphics_battle_terrain_plain_palette_palette:: @ 8E777A8 - .incbin "graphics/battle_terrain/plain/palette.gbapal.lz" - - .align 2 -gFile_graphics_battle_terrain_building_tiles_sheet:: @ 8E777E4 - .incbin "graphics/battle_terrain/building/tiles.4bpp.lz" - - .align 2 -gFile_graphics_battle_terrain_stadium_battle_frontier_palette:: @ 8E77D90 - .incbin "graphics/battle_terrain/stadium/battle_frontier.gbapal.lz" - - .align 2 -gFile_graphics_battle_terrain_building_map_tilemap:: @ 8E77DCC - .incbin "graphics/battle_terrain/building/map.bin.lz" - - .align 2 -gFile_graphics_battle_terrain_stadium_tiles_sheet:: @ 8E7807C - .incbin "graphics/battle_terrain/stadium/tiles.4bpp.lz" - - .align 2 -gFile_graphics_battle_terrain_stadium_map_tilemap:: @ 8E78684 - .incbin "graphics/battle_terrain/stadium/map.bin.lz" - - .align 2 -gFile_graphics_battle_terrain_building_palette_palette:: @ 8E78934 - .incbin "graphics/battle_terrain/building/palette.gbapal.lz" - - .align 2 -gFile_graphics_battle_terrain_water_kyogre_palette:: @ 8E78974 - .incbin "graphics/battle_terrain/water/kyogre.gbapal.lz" - - .align 2 -gFile_graphics_battle_terrain_cave_groudon_palette:: @ 8E789B0 - .incbin "graphics/battle_terrain/cave/groudon.gbapal.lz" - - .align 2 -gFile_graphics_battle_terrain_building_palette2_palette:: @ 8E78A08 - .incbin "graphics/battle_terrain/building/palette2.gbapal.lz" - - .align 2 -gFile_graphics_battle_terrain_building_palette3_palette:: @ 8E78A44 - .incbin "graphics/battle_terrain/building/palette3.gbapal.lz" - - .align 2 -gFile_graphics_battle_terrain_stadium_palette1_palette:: @ 8E78A80 - .incbin "graphics/battle_terrain/stadium/palette1.gbapal.lz" - - .align 2 -gFile_graphics_battle_terrain_stadium_palette2_palette:: @ 8E78AE0 - .incbin "graphics/battle_terrain/stadium/palette2.gbapal.lz" - - .align 2 -gFile_graphics_battle_terrain_stadium_palette3_palette:: @ 8E78B4C - .incbin "graphics/battle_terrain/stadium/palette3.gbapal.lz" - - .align 2 -gFile_graphics_battle_terrain_stadium_palette4_palette:: @ 8E78B9C - .incbin "graphics/battle_terrain/stadium/palette4.gbapal.lz" - - .align 2 -gFile_graphics_battle_terrain_stadium_palette5_palette:: @ 8E78BE4 - .incbin "graphics/battle_terrain/stadium/palette5.gbapal.lz" - - .align 2 -gFile_graphics_battle_terrain_stadium_palette6_palette:: @ 8E78C28 - .incbin "graphics/battle_terrain/stadium/palette6.gbapal.lz" - - .align 2 -gFile_graphics_battle_terrain_stadium_palette7_palette:: @ 8E78C78 - .incbin "graphics/battle_terrain/stadium/palette7.gbapal.lz" @from ruby - - .align 2 -gFile_graphics_battle_terrain_building_anim_tiles_sheet:: @ 8E78CB4 - .incbin "graphics/battle_terrain/building/anim_tiles.4bpp.lz" - - .align 2 -gFile_graphics_battle_terrain_building_anim_map_tilemap:: @ 8E790C4 - .incbin "graphics/battle_terrain/building/anim_map.bin.lz" - .align 2 gBattleAnimSpriteGfx_FlyingDirt:: @ 8E791E8 .incbin "graphics/battle_anims/sprites/flying_dirt.4bpp.lz" -- cgit v1.2.3 From 5d1303c3f346dd8c89d8033d455f485b00802eae Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 22 Feb 2020 13:49:42 -0500 Subject: Move graphics up to item icons to src --- data/graphics.s | 499 -------------------------------------------------------- 1 file changed, 499 deletions(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index ff372fa03..2743b4ecd 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -1,504 +1,5 @@ .section gfx_data, "aw", %progbits - .align 2 -gBattleAnimSpriteGfx_FlyingDirt:: @ 8E791E8 - .incbin "graphics/battle_anims/sprites/flying_dirt.4bpp.lz" - - .align 2 -gFile_graphics_battle_anims_backgrounds_sandstorm_brew_tilemap:: @ 8E79354 - .incbin "graphics/battle_anims/backgrounds/sandstorm_brew.bin.lz" - - .align 2 -gFile_graphics_battle_anims_backgrounds_sandstorm_brew_sheet:: @ 8E794D0 - .incbin "graphics/battle_anims/backgrounds/sandstorm_brew.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_FlyingDirt:: @ 8E799FC - .incbin "graphics/battle_anims/sprites/flying_dirt.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_MetalSoundWaves:: @ 8E79A24 - .incbin "graphics/battle_anims/sprites/metal_sound_waves.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_MetalSoundWaves:: @ 8E79BE0 - .incbin "graphics/battle_anims/sprites/metal_sound_waves.gbapal.lz" - - .align 2 -gBattleAnimBgImage_Ice:: @ 8E79BF8 - .incbin "graphics/battle_anims/backgrounds/ice.4bpp.lz" - - .align 2 -gBattleAnimBgPalette_Ice:: @ 8E7A568 - .incbin "graphics/battle_anims/backgrounds/ice.gbapal.lz" - - .align 2 -gBattleAnimBgTilemap_Ice:: @ 8E7A58C - .incbin "graphics/battle_anims/backgrounds/ice.bin.lz" - - .align 2 -gBattleAnimSpriteGfx_IcicleSpear:: @ 8E7A784 - .incbin "graphics/battle_anims/sprites/icicle_spear.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_IcicleSpear:: @ 8E7A858 - .incbin "graphics/battle_anims/sprites/icicle_spear.gbapal.lz" - - .align 2 -gContestNextTurnGfx:: @ 8E7A880 - .incbin "graphics/contest/next_turn.4bpp.lz" - - .align 2 -gFile_graphics_contest_nextturn_numbers:: @ 8E7A8DC - .incbin "graphics/contest/next_turn_numbers.4bpp" - - .align 2 -gFile_graphics_contest_nextturn_random:: @ 8E7A95C - .incbin "graphics/contest/next_turn_random.4bpp" - - .align 2 -gBattleAnimSpriteGfx_GlowyRedOrb:: @ 8E7A97C - .incbin "graphics/battle_anims/sprites/glowy_red_orb.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_GlowyRedOrb:: @ 8E7A99C - .incbin "graphics/battle_anims/sprites/glowy_red_orb.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_GlowyGreenOrb:: @ 8E7A9B4 - .incbin "graphics/battle_anims/sprites/glowy_green_orb.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_SleepPowder:: @ 8E7A9CC - .incbin "graphics/battle_anims/sprites/sleep_powder.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_StunSpore:: @ 8E7A9EC - .incbin "graphics/battle_anims/sprites/stun_spore.gbapal.lz" - - .align 2 -gContestApplauseGfx:: @ 8E7AA0C - .incbin "graphics/contest/applause.4bpp.lz" - - .align 2 -gFile_graphics_contest_applause_meter:: @ 8E7AB38 - .incbin "graphics/contest/applause_meter.4bpp" - - .align 2 -gFile_graphics_contest_nextturn:: @ 8E7ABB8 - .incbin "graphics/contest/next_turn.gbapal" - - .align 2 -gBattleAnimSpriteGfx_Splash:: @ 8E7ABD8 - .incbin "graphics/battle_anims/sprites/splash.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Splash:: @ 8E7ADF4 - .incbin "graphics/battle_anims/sprites/splash.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_SweatBead:: @ 8E7AE18 - .incbin "graphics/battle_anims/sprites/sweat_bead.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Pokeblock:: @ 8E7AE40 - .incbin "graphics/battle_anims/sprites/pokeblock.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Pokeblock:: @ 8E7AE94 - .incbin "graphics/battle_anims/sprites/pokeblock.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Gem1:: @ 8E7AEAC - .incbin "graphics/battle_anims/sprites/gem_1.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Gem2:: @ 8E7B02C - .incbin "graphics/battle_anims/sprites/gem_2.4bpp.lz" - - .align 2 -gBattleAnimSpriteGfx_Gem3:: @ 8E7B198 - .incbin "graphics/battle_anims/sprites/gem_3.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Gem1:: @ 8E7B300 - .incbin "graphics/battle_anims/sprites/gem_1.gbapal.lz" - - .align 2 -gBattleAnimBgImage_InAir:: @ 8E7B328 - .incbin "graphics/battle_anims/backgrounds/in_air.4bpp.lz" - - .align 2 -gBattleAnimBgPalette_InAir:: @ 8E7B484 - .incbin "graphics/battle_anims/backgrounds/in_air.gbapal.lz" - - .align 2 -gBattleAnimBgTilemap_InAir:: @ 8E7B4AC - .incbin "graphics/battle_anims/backgrounds/in_air.bin.lz" - - .align 2 -gBattleAnimSpriteGfx_Protect:: @ 8E7B694 - .incbin "graphics/battle_anims/sprites/protect.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Protect:: @ 8E7BA90 - .incbin "graphics/battle_anims/sprites/protect.gbapal.lz" - - .align 2 -gFile_graphics_battle_anims_backgrounds_water_muddy_palette:: @ 8E7BAB0 - .incbin "graphics/battle_anims/backgrounds/water_muddy.gbapal.lz" - - .align 2 -gFile_graphics_battle_interface_enemy_mon_shadow_sheet:: @ 8E7BAD4 - .incbin "graphics/battle_interface/enemy_mon_shadow.4bpp.lz" - - .align 2 -gFile_graphics_battle_interface_ball_status_bar_sheet:: @ 8E7BB04 - .incbin "graphics/battle_interface/ball_status_bar.4bpp.lz" - - .align 2 -gMonIcon_Egg:: @ 8E7BB88 - .incbin "graphics/pokemon/egg/icon.4bpp" - - .align 2 -gBattleAnimBgImage_Ghost:: @ 8E7BF88 - .incbin "graphics/battle_anims/backgrounds/ghost.4bpp.lz" - - .align 2 -gBattleAnimBgPalette_Ghost:: @ 8E7CC50 - .incbin "graphics/battle_anims/backgrounds/ghost.gbapal.lz" - - .align 2 -gBattleAnimBgTilemap_Ghost:: @ 8E7CC6C - .incbin "graphics/battle_anims/backgrounds/ghost.bin.lz" - - .align 2 -gBattleAnimSpritePal_WhipHit:: @ 8E7CF60 - .incbin "graphics/battle_anims/sprites/whip_hit.gbapal.lz" - - .align 2 -gBattleAnimBgPalette_Solarbeam:: @ 8E7CF88 - .incbin "graphics/battle_anims/backgrounds/solarbeam.gbapal.lz" - - .align 2 -gFile_graphics_unknown_unknown_E7CFB0_tilemap:: @ 8E7CFB0 - .incbin "graphics/unknown/unknown_E7CFB0.bin.lz" - - .align 2 -gFile_graphics_berry_blender_center_sheet:: @ 8E7D4AC - .incbin "graphics/berry_blender/center.8bpp.lz" - - .align 2 -gFile_graphics_berry_blender_outer_sheet:: @ 8E7DCCC - .incbin "graphics/berry_blender/outer.4bpp.lz" - - .align 2 -gFile_graphics_berry_blender_outer_map_tilemap:: @ 8E7E700 - .incbin "graphics/berry_blender/outer_map.bin.lz" - - .align 2 -gBattleAnimBgPalette_Cosmic:: @ 8E7EA14 - .incbin "graphics/battle_anims/backgrounds/cosmic.gbapal.lz" - - .align 2 -gBattleAnimBgImage_Cosmic:: @ 8E7EA3C - .incbin "graphics/battle_anims/backgrounds/cosmic.4bpp.lz" - - .align 2 -gBattleAnimBgTilemap_Cosmic:: @ 8E7EC9C - .incbin "graphics/battle_anims/backgrounds/cosmic.bin.lz" - - .align 2 -gBattleAnimSpritePal_SlamHit2:: @ 8E7EDD8 - .incbin "graphics/battle_anims/sprites/slam_hit_2.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_SlamHit2:: @ 8E7EE00 - .incbin "graphics/battle_anims/sprites/slam_hit_2.4bpp.lz" - - .align 2 -gBattleAnimFogTilemap:: @ 8E7F1F4 - .incbin "graphics/battle_anims/backgrounds/fog.bin.lz" - - .align 2 -gBattleAnimSpritePal_WeatherBall:: @ 8E7F36C - .incbin "graphics/battle_anims/sprites/weather_ball.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_WeatherBall:: @ 8E7F388 - .incbin "graphics/battle_anims/sprites/weather_ball.4bpp.lz" - - .align 2 -gBattleAnimBgTilemap_ScaryFacePlayer:: @ 8E7F4AC - .incbin "graphics/battle_anims/backgrounds/scary_face_player.bin.lz" - - .align 2 -gBattleAnimBgTilemap_ScaryFaceOpponent:: @ 8E7F690 - .incbin "graphics/battle_anims/backgrounds/scary_face_opponent.bin.lz" - - .align 2 -gBattleAnimBgTilemap_ScaryFaceContest:: @ 8E7F874 - .incbin "graphics/battle_anims/backgrounds/scary_face_contest.bin.lz" - - .align 2 -gBattleAnimSpriteGfx_Hail:: @ 8E7FA58 - .incbin "graphics/battle_anims/sprites/hail.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Hail:: @ 8E7FA98 - .incbin "graphics/battle_anims/sprites/hail.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_GreenSpike:: @ 8E7FAB0 - .incbin "graphics/battle_anims/sprites/green_spike.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_GreenSpike:: @ 8E7FAF0 - .incbin "graphics/battle_anims/sprites/green_spike.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_WhiteCircleOfLight:: @ 8E7FB08 - .incbin "graphics/battle_anims/sprites/white_circle_of_light.gbapal.lz" - - .align 2 -gBattleAnimSpritePal_GlowyBlueOrb:: @ 8E7FB20 - .incbin "graphics/battle_anims/sprites/glowy_blue_orb.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Recycle:: @ 8E7FB38 - .incbin "graphics/battle_anims/sprites/recycle.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Recycle:: @ 8E7FD44 - .incbin "graphics/battle_anims/sprites/recycle.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_RedParticles:: @ 8E7FD60 - .incbin "graphics/battle_anims/sprites/red_particles.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_RedParticles:: @ 8E7FDAC - .incbin "graphics/battle_anims/sprites/red_particles.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_DirtMound:: @ 8E7FDC8 - .incbin "graphics/battle_anims/sprites/dirt_mound.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_DirtMound:: @ 8E7FF50 - .incbin "graphics/battle_anims/sprites/dirt_mound.gbapal.lz" - - .align 2 -gBattleAnimBgImage_Fissure:: @ 8E7FF70 - .incbin "graphics/battle_anims/backgrounds/fissure.4bpp.lz" - - .align 2 -gBattleAnimBgPalette_Fissure:: @ 8E80264 - .incbin "graphics/battle_anims/backgrounds/fissure.gbapal.lz" - - .align 2 -gBattleAnimBgTilemap_Fissure:: @ 8E80280 - .incbin "graphics/battle_anims/backgrounds/fissure.bin.lz" - - .align 2 -gBattleAnimSpriteGfx_Bird:: @ 8E8056C - .incbin "graphics/battle_anims/sprites/bird.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Bird:: @ 8E808E8 - .incbin "graphics/battle_anims/sprites/bird.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_CrossImpact:: @ 8E80904 - .incbin "graphics/battle_anims/sprites/cross_impact.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_CrossImpact:: @ 8E809A4 - .incbin "graphics/battle_anims/sprites/cross_impact.gbapal.lz" - - .align 2 -gFile_graphics_battle_anims_backgrounds_water_sheet:: @ 8E809CC - .incbin "graphics/battle_anims/backgrounds/water.4bpp.lz" - - .align 2 -gFile_graphics_battle_anims_backgrounds_water_palette:: @ 8E81CEC - .incbin "graphics/battle_anims/backgrounds/water.gbapal.lz" - - .align 2 -gFile_graphics_unknown_unknown_E81D14_tilemap:: @ 8E81D14 - .incbin "graphics/unknown/unknown_E81D14.bin.lz" - - .align 2 -gFile_graphics_unknown_unknown_E81FE4_tilemap:: @ 8E81FE4 - .incbin "graphics/unknown/unknown_E81FE4.bin.lz" - - .align 2 -gFile_graphics_unknown_unknown_E822B8_tilemap:: @ 8E822B8 - .incbin "graphics/unknown/unknown_E822B8.bin.lz" - - .align 2 -gBattleAnimSpritePal_Slash2:: @ 8E825AC - .incbin "graphics/battle_anims/sprites/slash_2.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_WhiteShadow:: @ 8E825D4 - .incbin "graphics/battle_anims/sprites/white_shadow.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_WhiteShadow:: @ 8E826E8 - .incbin "graphics/battle_anims/sprites/white_shadow.gbapal.lz" - - .align 2 -gPartyMenuBg_Gfx:: @ 8E82700 - .incbin "graphics/interface/party_menu_misc.4bpp.lz" - - .align 2 -gPartyMenuBg_Pal:: @ 8E829C8 - .incbin "graphics/interface/party_menu_misc.gbapal.lz" - - .align 2 -gPartyMenuBg_Tilemap:: @ 8E82AB0 - .incbin "graphics/interface/party_menu_misc.bin.lz" - - .align 2 -gPartyMenuPokeball_Gfx:: @ 8E82BE8 - .incbin "graphics/interface/party_menu_pokeball.4bpp.lz" - - .align 2 -gPartyMenuPokeballSmall_Gfx:: @ 8E82D68 - .incbin "graphics/interface/party_menu_pokeball_small.4bpp.lz" - - .align 2 -gPartyMenuPokeball_Pal:: @ 8E82E7C - .incbin "graphics/interface/party_menu_pokeball.gbapal.lz" - - .align 2 -gStatusGfx_Icons:: @ 8E82EA0 - .incbin "graphics/interface/status_icons.4bpp.lz" - - .align 2 -gStatusPal_Icons:: @ 8E830A4 - .incbin "graphics/interface/status_icons.gbapal.lz" - - .align 2 -gUnknown_8E830CC:: @ 8E830CC - .incbin "graphics/item_menu/bag_tiles.4bpp.lz" @ bag tiles - - .align 2 -gUnknown_8E832C0:: @ 8E832C0 - .incbin "graphics/item_menu/bag_tilemap1.bin.lz" @ bag menu - - .align 2 -gUnknown_8E83444:: @ 8E83444 - .incbin "graphics/item_menu/bag_tilemap2.bin.lz" @ PC deposit items - - .align 2 -gBagBgPalette:: @ 8E835B4 - .incbin "graphics/item_menu/bag_pal1.gbapal.lz" @ palette 1 (Boy + misc Pal) - - .align 2 -gBagBgPalette_FemaleOverride:: @ 8E83604 - .incbin "graphics/item_menu/bag_pal2.gbapal.lz" @ palette 2 (Girl) - -gUnknown_8E8362C:: @ 8E8362C - .incbin "graphics/interface/unk_8E8362C.4bpp.lz" - -gUnknown_8E83DBC:: @ 8E83DBC - .incbin "graphics/interface/unk_8E83DBC.4bpp.lz" - -gUnknown_8E84560:: @ 8E84560 - .incbin "graphics/interface/unk_8E84560.gbapal.lz" - - .align 2 -gFile_graphics_interface_bag_swap_sheet:: @ 8E84588 - .incbin "graphics/interface/bag_swap.4bpp.lz" - - .align 2 -gFile_graphics_interface_bag_swap_palette:: @ 8E845C8 - .incbin "graphics/interface/bag_swap.gbapal.lz" - - .align 2 -gUnknown_8E845D8:: @ 8E845D8 - .incbin "graphics/tm_case/unk_8E845D8.4bpp.lz" - -gUnknown_8E84A24:: @ 8E84A24 - .incbin "graphics/tm_case/unk_8E84A24.bin.lz" - -gUnknown_8E84B70:: @ 8E84B70 - .incbin "graphics/tm_case/unk_8E84B70.bin.lz" - -gUnknown_8E84CB0:: @ 8E84CB0 - .incbin "graphics/tm_case/unk_8E84CB0.gbapal.lz" - -gUnknown_8E84D20:: @ 8E84D20 - .incbin "graphics/tm_case/unk_8E84D20.gbapal.lz" - -gTMCase_TMSpriteGfx:: @ 8E84D90 - .incbin "graphics/tm_case/unk_8E84D90.4bpp.lz" - -gUnknown_8E84F20:: @ 8E84F20 - .incbin "graphics/tm_case/unk_8E84F20.gbapal.lz" - -gUnknown_8E85068:: @ 8E85068 - .incbin "graphics/tm_case/unk_8E85068.gbapal.lz" - -gItemPcTiles:: @ 8E85090 - .incbin "graphics/item_pc/unk_8E85090.4bpp.lz" - -gItemPcBgPals:: @ 8E85408 - .incbin "graphics/item_pc/unk_8E85408.gbapal.lz" - -gItemPcTilemap:: @ 8E85458 - .incbin "graphics/item_pc/unk_8E85458.bin.lz" - -gBerryPouchSpriteTiles:: @ 8E8560C - .incbin "graphics/berry_pouch/unk_8E8560C.4bpp.lz" - -gBerryPouchBgGfx:: @ 8E859D0 - .incbin "graphics/berry_pouch/unk_8E859D0.4bpp.lz" - -gBerryPouchBgPals:: @ 8E85BA4 - .incbin "graphics/berry_pouch/unk_8E85BA4.gbapal.lz" - -gBerryPouchBgPal0FemaleOverride:: @ 8E85BF4 - .incbin "graphics/berry_pouch/unk_8E85BF4.gbapal.lz" - -gBerryPouchSpritePalette:: @ 8E85C1C - .incbin "graphics/berry_pouch/unk_8E85C1C.gbapal.lz" - -gBerryPouchBg1Tilemap:: @ 8E85C44 - .incbin "graphics/berry_pouch/unk_8E85C44.bin.lz" - -gBuyMenuFrame_Gfx:: @ 8E85DC8 - .incbin "graphics/shop_menu/shop_menu.4bpp.lz" - -gBuyMenuFrame_Tilemap:: @ 8E85EFC - .incbin "graphics/shop_menu/shop_tilemap.bin" - -gBuyMenuFrame_TmHmTilemap:: @ 8E86038 - .incbin "graphics/shop_menu/shop_tm_hm_tilemap.bin" - -gBuyMenuFrame_Pal:: @ 8E86170 - .incbin "graphics/shop_menu/shop_menu.gbapal.lz" - -gUnknown_8E861A8:: @ 8E861A8 - .incbin "graphics/unknown/unknown_E861A8.bin.lz" @ hmm what is this. - -gUnknown_8E86240:: @ 8E86240 - .incbin "graphics/teachy_tv/tiles.4bpp.lz" - -gUnknown_8E86BE8:: @ 8E86BE8 - .incbin "graphics/teachy_tv/bg1_tilemap.bin.lz" - -gUnknown_8E86D6C:: @ 8E86D6C - .incbin "graphics/teachy_tv/bg2_tilemap.bin.lz" - -gUnknown_8E86F98:: @ 8E86F98 - .incbin "graphics/teachy_tv/palettes.gbapal.lz" - -gUnknown_8E87010:: @ 8E87010 - .incbin "graphics/unknown/unknown_E87010.gbapal.lz" - @ THIS IS ITEM ICONS .align 2 gFile_graphics_items_icons_question_mark_sheet:: @ 8E87028 -- cgit v1.2.3 From ad17ce193d4e2e5e37d66315eb7187fe53442612 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 22 Feb 2020 14:08:05 -0500 Subject: Move item icons/pals to src --- data/graphics.s | 1865 ------------------------------------------------------- 1 file changed, 1865 deletions(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index 2743b4ecd..31cd6e887 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -1,1870 +1,5 @@ .section gfx_data, "aw", %progbits - @ THIS IS ITEM ICONS - .align 2 -gFile_graphics_items_icons_question_mark_sheet:: @ 8E87028 - .incbin "graphics/items/icons/question_mark.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_question_mark_palette:: @ 8E870A0 - .incbin "graphics/items/icon_palettes/question_mark.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_return_to_field_arrow_sheet:: @ 8E870B4 - .incbin "graphics/items/icons/return_to_field_arrow.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_return_to_field_arrow_palette:: @ 8E8713C - .incbin "graphics/items/icon_palettes/return_to_field_arrow.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_master_ball_sheet:: @ 8E87154 - .incbin "graphics/items/icons/master_ball.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_master_ball_palette:: @ 8E87224 - .incbin "graphics/items/icon_palettes/master_ball.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_ultra_ball_sheet:: @ 8E8724C - .incbin "graphics/items/icons/ultra_ball.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_ultra_ball_palette:: @ 8E8730C - .incbin "graphics/items/icon_palettes/ultra_ball.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_great_ball_sheet:: @ 8E87334 - .incbin "graphics/items/icons/great_ball.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_great_ball_palette:: @ 8E87404 - .incbin "graphics/items/icon_palettes/great_ball.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_poke_ball_sheet:: @ 8E8742C - .incbin "graphics/items/icons/poke_ball.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_poke_ball_palette:: @ 8E874DC - .incbin "graphics/items/icon_palettes/poke_ball.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_safari_ball_sheet:: @ 8E87500 - .incbin "graphics/items/icons/safari_ball.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_safari_ball_palette:: @ 8E875D0 - .incbin "graphics/items/icon_palettes/safari_ball.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_net_ball_sheet:: @ 8E875F8 - .incbin "graphics/items/icons/net_ball.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_net_ball_palette:: @ 8E876CC - .incbin "graphics/items/icon_palettes/net_ball.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_dive_ball_sheet:: @ 8E876F0 - .incbin "graphics/items/icons/dive_ball.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_dive_ball_palette:: @ 8E877B8 - .incbin "graphics/items/icon_palettes/dive_ball.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_nest_ball_sheet:: @ 8E877DC - .incbin "graphics/items/icons/nest_ball.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_nest_ball_palette:: @ 8E878A0 - .incbin "graphics/items/icon_palettes/nest_ball.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_repeat_ball_sheet:: @ 8E878C8 - .incbin "graphics/items/icons/repeat_ball.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_repeat_ball_palette:: @ 8E8798C - .incbin "graphics/items/icon_palettes/repeat_ball.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_timer_ball_sheet:: @ 8E879B4 - .incbin "graphics/items/icons/timer_ball.4bpp.lz" - - .align 2 -gFile_graphics_items_icons_luxury_ball_sheet:: @ 8E87A7C - .incbin "graphics/items/icons/luxury_ball.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_luxury_ball_palette:: @ 8E87B38 - .incbin "graphics/items/icon_palettes/luxury_ball.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_premier_ball_sheet:: @ 8E87B60 - .incbin "graphics/items/icons/premier_ball.4bpp.lz" - - .align 2 -gFile_graphics_items_icons_potion_sheet:: @ 8E87C04 - .incbin "graphics/items/icons/potion.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_potion_palette:: @ 8E87CCC - .incbin "graphics/items/icon_palettes/potion.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_antidote_sheet:: @ 8E87CF0 - .incbin "graphics/items/icons/antidote.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_antidote_palette:: @ 8E87DA0 - .incbin "graphics/items/icon_palettes/antidote.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_burn_heal_palette:: @ 8E87DC4 - .incbin "graphics/items/icon_palettes/burn_heal.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_ice_heal_palette:: @ 8E87DE8 - .incbin "graphics/items/icon_palettes/ice_heal.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_status_heal_sheet:: @ 8E87E0C - .incbin "graphics/items/icons/status_heal.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_awakening_palette:: @ 8E87EBC - .incbin "graphics/items/icon_palettes/awakening.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_paralyze_heal_palette:: @ 8E87EE0 - .incbin "graphics/items/icon_palettes/paralyze_heal.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_large_potion_sheet:: @ 8E87F04 - .incbin "graphics/items/icons/large_potion.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_full_restore_palette:: @ 8E87FE8 - .incbin "graphics/items/icon_palettes/full_restore.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_max_potion_palette:: @ 8E8800C - .incbin "graphics/items/icon_palettes/max_potion.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_hyper_potion_palette:: @ 8E88030 - .incbin "graphics/items/icon_palettes/hyper_potion.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_super_potion_palette:: @ 8E88054 - .incbin "graphics/items/icon_palettes/super_potion.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_full_heal_sheet:: @ 8E88078 - .incbin "graphics/items/icons/full_heal.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_full_heal_palette:: @ 8E88120 - .incbin "graphics/items/icon_palettes/full_heal.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_revive_sheet:: @ 8E88148 - .incbin "graphics/items/icons/revive.4bpp.lz" - - .align 2 -gFile_graphics_items_icons_max_revive_sheet:: @ 8E881A4 - .incbin "graphics/items/icons/max_revive.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_revive_palette:: @ 8E88270 - .incbin "graphics/items/icon_palettes/revive.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_fresh_water_sheet:: @ 8E8828C - .incbin "graphics/items/icons/fresh_water.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_fresh_water_palette:: @ 8E8833C - .incbin "graphics/items/icon_palettes/fresh_water.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_soda_pop_sheet:: @ 8E88360 - .incbin "graphics/items/icons/soda_pop.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_soda_pop_palette:: @ 8E883F4 - .incbin "graphics/items/icon_palettes/soda_pop.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_lemonade_sheet:: @ 8E8841C - .incbin "graphics/items/icons/lemonade.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_lemonade_palette:: @ 8E884DC - .incbin "graphics/items/icon_palettes/lemonade.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_moomoo_milk_sheet:: @ 8E88504 - .incbin "graphics/items/icons/moomoo_milk.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_moomoo_milk_palette:: @ 8E885B4 - .incbin "graphics/items/icon_palettes/moomoo_milk.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_powder_sheet:: @ 8E885DC - .incbin "graphics/items/icons/powder.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_energy_powder_palette:: @ 8E88668 - .incbin "graphics/items/icon_palettes/energy_powder.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_energy_root_sheet:: @ 8E88688 - .incbin "graphics/items/icons/energy_root.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_energy_root_palette:: @ 8E88754 - .incbin "graphics/items/icon_palettes/energy_root.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_heal_powder_palette:: @ 8E88770 - .incbin "graphics/items/icon_palettes/heal_powder.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_revival_herb_sheet:: @ 8E88790 - .incbin "graphics/items/icons/revival_herb.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_revival_herb_palette:: @ 8E88860 - .incbin "graphics/items/icon_palettes/revival_herb.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_ether_sheet:: @ 8E88880 - .incbin "graphics/items/icons/ether.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_ether_palette:: @ 8E88940 - .incbin "graphics/items/icon_palettes/ether.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_max_ether_palette:: @ 8E88964 - .incbin "graphics/items/icon_palettes/max_ether.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_elixir_palette:: @ 8E88988 - .incbin "graphics/items/icon_palettes/elixir.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_max_elixir_palette:: @ 8E889AC - .incbin "graphics/items/icon_palettes/max_elixir.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_lava_cookie_sheet:: @ 8E889D0 - .incbin "graphics/items/icons/lava_cookie.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_lava_cookie_and_letter_palette:: @ 8E88A9C - .incbin "graphics/items/icon_palettes/lava_cookie_and_letter.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_flute_sheet:: @ 8E88AC0 - .incbin "graphics/items/icons/flute.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_blue_flute_palette:: @ 8E88B74 - .incbin "graphics/items/icon_palettes/blue_flute.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_yellow_flute_palette:: @ 8E88B98 - .incbin "graphics/items/icon_palettes/yellow_flute.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_red_flute_palette:: @ 8E88BBC - .incbin "graphics/items/icon_palettes/red_flute.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_black_flute_palette:: @ 8E88BE0 - .incbin "graphics/items/icon_palettes/black_flute.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_white_flute_palette:: @ 8E88C04 - .incbin "graphics/items/icon_palettes/white_flute.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_berry_juice_sheet:: @ 8E88C28 - .incbin "graphics/items/icons/berry_juice.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_berry_juice_palette:: @ 8E88D08 - .incbin "graphics/items/icon_palettes/berry_juice.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_sacred_ash_sheet:: @ 8E88D30 - .incbin "graphics/items/icons/sacred_ash.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_sacred_ash_palette:: @ 8E88DF0 - .incbin "graphics/items/icon_palettes/sacred_ash.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_shoal_salt_palette:: @ 8E88E14 - .incbin "graphics/items/icon_palettes/shoal_salt.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_shoal_shell_sheet:: @ 8E88E34 - .incbin "graphics/items/icons/shoal_shell.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_shell_palette:: @ 8E88F28 - .incbin "graphics/items/icon_palettes/shell.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_shard_sheet:: @ 8E88F50 - .incbin "graphics/items/icons/shard.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_red_shard_palette:: @ 8E88FAC - .incbin "graphics/items/icon_palettes/red_shard.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_blue_shard_palette:: @ 8E88FC4 - .incbin "graphics/items/icon_palettes/blue_shard.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_yellow_shard_palette:: @ 8E88FDC - .incbin "graphics/items/icon_palettes/yellow_shard.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_green_shard_palette:: @ 8E88FF4 - .incbin "graphics/items/icon_palettes/green_shard.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_hp_up_sheet:: @ 8E8900C - .incbin "graphics/items/icons/hp_up.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_hp_up_palette:: @ 8E890C4 - .incbin "graphics/items/icon_palettes/hp_up.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_vitamin_sheet:: @ 8E890EC - .incbin "graphics/items/icons/vitamin.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_protein_palette:: @ 8E8919C - .incbin "graphics/items/icon_palettes/protein.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_iron_palette:: @ 8E891C4 - .incbin "graphics/items/icon_palettes/iron.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_carbos_palette:: @ 8E891EC - .incbin "graphics/items/icon_palettes/carbos.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_calcium_palette:: @ 8E89214 - .incbin "graphics/items/icon_palettes/calcium.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_rare_candy_sheet:: @ 8E8923C - .incbin "graphics/items/icons/rare_candy.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_rare_candy_palette:: @ 8E89300 - .incbin "graphics/items/icon_palettes/rare_candy.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_pp_up_sheet:: @ 8E8931C - .incbin "graphics/items/icons/pp_up.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_pp_up_palette:: @ 8E893CC - .incbin "graphics/items/icon_palettes/pp_up.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_zinc_palette:: @ 8E893F4 - .incbin "graphics/items/icon_palettes/zinc.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_pp_max_sheet:: @ 8E8941C - .incbin "graphics/items/icons/pp_max.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_pp_max_palette:: @ 8E894C4 - .incbin "graphics/items/icon_palettes/pp_max.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_guard_spec_palette:: @ 8E894EC - .incbin "graphics/items/icon_palettes/guard_spec.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_dire_hit_palette:: @ 8E89510 - .incbin "graphics/items/icon_palettes/dire_hit.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_x_attack_palette:: @ 8E89534 - .incbin "graphics/items/icon_palettes/x_attack.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_battle_stat_item_sheet:: @ 8E89558 - .incbin "graphics/items/icons/battle_stat_item.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_x_defend_palette:: @ 8E8963C - .incbin "graphics/items/icon_palettes/x_defend.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_x_speed_palette:: @ 8E89660 - .incbin "graphics/items/icon_palettes/x_speed.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_x_accuracy_palette:: @ 8E89684 - .incbin "graphics/items/icon_palettes/x_accuracy.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_x_special_palette:: @ 8E896A8 - .incbin "graphics/items/icon_palettes/x_special.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_poke_doll_sheet:: @ 8E896CC - .incbin "graphics/items/icons/poke_doll.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_poke_doll_palette:: @ 8E897BC - .incbin "graphics/items/icon_palettes/poke_doll.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_fluffy_tail_sheet:: @ 8E897D8 - .incbin "graphics/items/icons/fluffy_tail.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_fluffy_tail_palette:: @ 8E898C8 - .incbin "graphics/items/icon_palettes/fluffy_tail.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_repel_sheet:: @ 8E898EC - .incbin "graphics/items/icons/repel.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_super_repel_palette:: @ 8E8998C - .incbin "graphics/items/icon_palettes/super_repel.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_max_repel_palette:: @ 8E899B4 - .incbin "graphics/items/icon_palettes/max_repel.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_escape_rope_sheet:: @ 8E899DC - .incbin "graphics/items/icons/escape_rope.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_escape_rope_palette:: @ 8E89A90 - .incbin "graphics/items/icon_palettes/escape_rope.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_repel_palette:: @ 8E89AB4 - .incbin "graphics/items/icon_palettes/repel.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_sun_stone_sheet:: @ 8E89ADC - .incbin "graphics/items/icons/sun_stone.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_sun_stone_palette:: @ 8E89BD4 - .incbin "graphics/items/icon_palettes/sun_stone.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_moon_stone_sheet:: @ 8E89BF0 - .incbin "graphics/items/icons/moon_stone.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_moon_stone_palette:: @ 8E89CC4 - .incbin "graphics/items/icon_palettes/moon_stone.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_fire_stone_sheet:: @ 8E89CE4 - .incbin "graphics/items/icons/fire_stone.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_fire_stone_palette:: @ 8E89DD8 - .incbin "graphics/items/icon_palettes/fire_stone.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_thunder_stone_sheet:: @ 8E89E00 - .incbin "graphics/items/icons/thunder_stone.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_thunder_stone_palette:: @ 8E89EE8 - .incbin "graphics/items/icon_palettes/thunder_stone.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_water_stone_sheet:: @ 8E89F08 - .incbin "graphics/items/icons/water_stone.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_water_stone_palette:: @ 8E89FE8 - .incbin "graphics/items/icon_palettes/water_stone.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_leaf_stone_sheet:: @ 8E8A00C - .incbin "graphics/items/icons/leaf_stone.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_leaf_stone_palette:: @ 8E8A100 - .incbin "graphics/items/icon_palettes/leaf_stone.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_tiny_mushroom_sheet:: @ 8E8A128 - .incbin "graphics/items/icons/tiny_mushroom.4bpp.lz" - - .align 2 -gFile_graphics_items_icons_big_mushroom_sheet:: @ 8E8A1A8 - .incbin "graphics/items/icons/big_mushroom.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_mushroom_palette:: @ 8E8A260 - .incbin "graphics/items/icon_palettes/mushroom.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_pearl_sheet:: @ 8E8A284 - .incbin "graphics/items/icons/pearl.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_pearl_palette:: @ 8E8A300 - .incbin "graphics/items/icon_palettes/pearl.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_big_pearl_sheet:: @ 8E8A328 - .incbin "graphics/items/icons/big_pearl.4bpp.lz" - - .align 2 -gFile_graphics_items_icons_stardust_sheet:: @ 8E8A3E0 - .incbin "graphics/items/icons/stardust.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_star_palette:: @ 8E8A4A0 - .incbin "graphics/items/icon_palettes/star.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_star_piece_sheet:: @ 8E8A4C4 - .incbin "graphics/items/icons/star_piece.4bpp.lz" - - .align 2 -gFile_graphics_items_icons_nugget_sheet:: @ 8E8A548 - .incbin "graphics/items/icons/nugget.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_nugget_palette:: @ 8E8A5D4 - .incbin "graphics/items/icon_palettes/nugget.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_heart_scale_sheet:: @ 8E8A5F4 - .incbin "graphics/items/icons/heart_scale.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_heart_scale_palette:: @ 8E8A694 - .incbin "graphics/items/icon_palettes/heart_scale.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_orange_mail_sheet:: @ 8E8A6B0 - .incbin "graphics/items/icons/orange_mail.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_orange_mail_palette:: @ 8E8A784 - .incbin "graphics/items/icon_palettes/orange_mail.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_harbor_mail_sheet:: @ 8E8A7A4 - .incbin "graphics/items/icons/harbor_mail.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_harbor_mail_palette:: @ 8E8A86C - .incbin "graphics/items/icon_palettes/harbor_mail.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_glitter_mail_sheet:: @ 8E8A88C - .incbin "graphics/items/icons/glitter_mail.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_glitter_mail_palette:: @ 8E8A968 - .incbin "graphics/items/icon_palettes/glitter_mail.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_mech_mail_sheet:: @ 8E8A990 - .incbin "graphics/items/icons/mech_mail.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_mech_mail_palette:: @ 8E8AA6C - .incbin "graphics/items/icon_palettes/mech_mail.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_wood_mail_sheet:: @ 8E8AA8C - .incbin "graphics/items/icons/wood_mail.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_wood_mail_palette:: @ 8E8AB6C - .incbin "graphics/items/icon_palettes/wood_mail.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_wave_mail_sheet:: @ 8E8AB8C - .incbin "graphics/items/icons/wave_mail.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_wave_mail_palette:: @ 8E8AC64 - .incbin "graphics/items/icon_palettes/wave_mail.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_bead_mail_sheet:: @ 8E8AC84 - .incbin "graphics/items/icons/bead_mail.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_bead_mail_palette:: @ 8E8AD44 - .incbin "graphics/items/icon_palettes/bead_mail.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_shadow_mail_sheet:: @ 8E8AD64 - .incbin "graphics/items/icons/shadow_mail.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_shadow_mail_palette:: @ 8E8AE38 - .incbin "graphics/items/icon_palettes/shadow_mail.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_tropic_mail_sheet:: @ 8E8AE5C - .incbin "graphics/items/icons/tropic_mail.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_tropic_mail_palette:: @ 8E8AF40 - .incbin "graphics/items/icon_palettes/tropic_mail.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_dream_mail_sheet:: @ 8E8AF64 - .incbin "graphics/items/icons/dream_mail.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_dream_mail_palette:: @ 8E8B044 - .incbin "graphics/items/icon_palettes/dream_mail.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_fab_mail_sheet:: @ 8E8B064 - .incbin "graphics/items/icons/fab_mail.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_fab_mail_palette:: @ 8E8B12C - .incbin "graphics/items/icon_palettes/fab_mail.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_retro_mail_sheet:: @ 8E8B148 - .incbin "graphics/items/icons/retro_mail.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_retro_mail_palette:: @ 8E8B1E0 - .incbin "graphics/items/icon_palettes/retro_mail.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_cheri_berry_sheet:: @ 8E8B200 - .incbin "graphics/items/icons/cheri_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_cheri_berry_palette:: @ 8E8B2E8 - .incbin "graphics/items/icon_palettes/cheri_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_chesto_berry_sheet:: @ 8E8B310 - .incbin "graphics/items/icons/chesto_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_chesto_berry_palette:: @ 8E8B3D0 - .incbin "graphics/items/icon_palettes/chesto_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_pecha_berry_sheet:: @ 8E8B3F4 - .incbin "graphics/items/icons/pecha_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_pecha_berry_palette:: @ 8E8B4B4 - .incbin "graphics/items/icon_palettes/pecha_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_rawst_berry_sheet:: @ 8E8B4D8 - .incbin "graphics/items/icons/rawst_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_rawst_berry_palette:: @ 8E8B5BC - .incbin "graphics/items/icon_palettes/rawst_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_aspear_berry_sheet:: @ 8E8B5E0 - .incbin "graphics/items/icons/aspear_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_aspear_berry_palette:: @ 8E8B6C8 - .incbin "graphics/items/icon_palettes/aspear_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_leppa_berry_sheet:: @ 8E8B6EC - .incbin "graphics/items/icons/leppa_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_leppa_berry_palette:: @ 8E8B7A4 - .incbin "graphics/items/icon_palettes/leppa_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_oran_berry_sheet:: @ 8E8B7C8 - .incbin "graphics/items/icons/oran_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_oran_berry_palette:: @ 8E8B88C - .incbin "graphics/items/icon_palettes/oran_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_persim_berry_sheet:: @ 8E8B8B0 - .incbin "graphics/items/icons/persim_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_persim_berry_palette:: @ 8E8B984 - .incbin "graphics/items/icon_palettes/persim_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_lum_berry_sheet:: @ 8E8B9A8 - .incbin "graphics/items/icons/lum_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_lum_berry_palette:: @ 8E8BA60 - .incbin "graphics/items/icon_palettes/lum_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_sitrus_berry_sheet:: @ 8E8BA7C - .incbin "graphics/items/icons/sitrus_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_sitrus_berry_palette:: @ 8E8BB48 - .incbin "graphics/items/icon_palettes/sitrus_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_figy_berry_sheet:: @ 8E8BB6C - .incbin "graphics/items/icons/figy_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_figy_berry_palette:: @ 8E8BC34 - .incbin "graphics/items/icon_palettes/figy_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_wiki_berry_sheet:: @ 8E8BC58 - .incbin "graphics/items/icons/wiki_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_wiki_berry_palette:: @ 8E8BD3C - .incbin "graphics/items/icon_palettes/wiki_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_mago_berry_sheet:: @ 8E8BD60 - .incbin "graphics/items/icons/mago_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_mago_berry_palette:: @ 8E8BE1C - .incbin "graphics/items/icon_palettes/mago_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_aguav_berry_sheet:: @ 8E8BE40 - .incbin "graphics/items/icons/aguav_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_aguav_berry_palette:: @ 8E8BF2C - .incbin "graphics/items/icon_palettes/aguav_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_iapapa_berry_sheet:: @ 8E8BF4C - .incbin "graphics/items/icons/iapapa_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_iapapa_berry_palette:: @ 8E8C034 - .incbin "graphics/items/icon_palettes/iapapa_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_razz_berry_sheet:: @ 8E8C058 - .incbin "graphics/items/icons/razz_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_razz_berry_palette:: @ 8E8C138 - .incbin "graphics/items/icon_palettes/razz_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_bluk_berry_sheet:: @ 8E8C15C - .incbin "graphics/items/icons/bluk_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_bluk_berry_palette:: @ 8E8C24C - .incbin "graphics/items/icon_palettes/bluk_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_nanab_berry_sheet:: @ 8E8C270 - .incbin "graphics/items/icons/nanab_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_nanab_berry_palette:: @ 8E8C354 - .incbin "graphics/items/icon_palettes/nanab_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_wepear_berry_sheet:: @ 8E8C378 - .incbin "graphics/items/icons/wepear_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_wepear_berry_palette:: @ 8E8C440 - .incbin "graphics/items/icon_palettes/wepear_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_pinap_berry_sheet:: @ 8E8C45C - .incbin "graphics/items/icons/pinap_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_pinap_berry_palette:: @ 8E8C550 - .incbin "graphics/items/icon_palettes/pinap_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_pomeg_berry_sheet:: @ 8E8C574 - .incbin "graphics/items/icons/pomeg_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_pomeg_berry_palette:: @ 8E8C628 - .incbin "graphics/items/icon_palettes/pomeg_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_kelpsy_berry_sheet:: @ 8E8C64C - .incbin "graphics/items/icons/kelpsy_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_kelpsy_berry_palette:: @ 8E8C71C - .incbin "graphics/items/icon_palettes/kelpsy_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_qualot_berry_sheet:: @ 8E8C73C - .incbin "graphics/items/icons/qualot_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_qualot_berry_palette:: @ 8E8C808 - .incbin "graphics/items/icon_palettes/qualot_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_hondew_berry_sheet:: @ 8E8C82C - .incbin "graphics/items/icons/hondew_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_hondew_berry_palette:: @ 8E8C90C - .incbin "graphics/items/icon_palettes/hondew_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_grepa_berry_sheet:: @ 8E8C930 - .incbin "graphics/items/icons/grepa_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_grepa_berry_palette:: @ 8E8C9E4 - .incbin "graphics/items/icon_palettes/grepa_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_tamato_berry_sheet:: @ 8E8CA08 - .incbin "graphics/items/icons/tamato_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_tamato_berry_palette:: @ 8E8CAE4 - .incbin "graphics/items/icon_palettes/tamato_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_cornn_berry_sheet:: @ 8E8CB08 - .incbin "graphics/items/icons/cornn_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_cornn_berry_palette:: @ 8E8CBF4 - .incbin "graphics/items/icon_palettes/cornn_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_magost_berry_sheet:: @ 8E8CC1C - .incbin "graphics/items/icons/magost_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_magost_berry_palette:: @ 8E8CCC4 - .incbin "graphics/items/icon_palettes/magost_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_rabuta_berry_sheet:: @ 8E8CCE8 - .incbin "graphics/items/icons/rabuta_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_rabuta_berry_palette:: @ 8E8CDE4 - .incbin "graphics/items/icon_palettes/rabuta_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_nomel_berry_sheet:: @ 8E8CE08 - .incbin "graphics/items/icons/nomel_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_nomel_berry_palette:: @ 8E8CEAC - .incbin "graphics/items/icon_palettes/nomel_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_spelon_berry_sheet:: @ 8E8CEC8 - .incbin "graphics/items/icons/spelon_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_spelon_berry_palette:: @ 8E8CF8C - .incbin "graphics/items/icon_palettes/spelon_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_pamtre_berry_sheet:: @ 8E8CFAC - .incbin "graphics/items/icons/pamtre_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_pamtre_berry_palette:: @ 8E8D08C - .incbin "graphics/items/icon_palettes/pamtre_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_watmel_berry_sheet:: @ 8E8D0B4 - .incbin "graphics/items/icons/watmel_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_watmel_berry_palette:: @ 8E8D1C4 - .incbin "graphics/items/icon_palettes/watmel_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_durin_berry_sheet:: @ 8E8D1E8 - .incbin "graphics/items/icons/durin_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_durin_berry_palette:: @ 8E8D2EC - .incbin "graphics/items/icon_palettes/durin_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_belue_berry_sheet:: @ 8E8D310 - .incbin "graphics/items/icons/belue_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_belue_berry_palette:: @ 8E8D3F4 - .incbin "graphics/items/icon_palettes/belue_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_liechi_berry_sheet:: @ 8E8D418 - .incbin "graphics/items/icons/liechi_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_liechi_berry_palette:: @ 8E8D4F8 - .incbin "graphics/items/icon_palettes/liechi_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_ganlon_berry_sheet:: @ 8E8D518 - .incbin "graphics/items/icons/ganlon_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_ganlon_berry_palette:: @ 8E8D5F8 - .incbin "graphics/items/icon_palettes/ganlon_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_salac_berry_sheet:: @ 8E8D618 - .incbin "graphics/items/icons/salac_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_salac_berry_palette:: @ 8E8D700 - .incbin "graphics/items/icon_palettes/salac_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_petaya_berry_sheet:: @ 8E8D720 - .incbin "graphics/items/icons/petaya_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_petaya_berry_palette:: @ 8E8D818 - .incbin "graphics/items/icon_palettes/petaya_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_apicot_berry_sheet:: @ 8E8D83C - .incbin "graphics/items/icons/apicot_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_apicot_berry_palette:: @ 8E8D8F4 - .incbin "graphics/items/icon_palettes/apicot_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_lansat_berry_sheet:: @ 8E8D91C - .incbin "graphics/items/icons/lansat_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_lansat_berry_palette:: @ 8E8D9FC - .incbin "graphics/items/icon_palettes/lansat_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_starf_berry_sheet:: @ 8E8DA20 - .incbin "graphics/items/icons/starf_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_starf_berry_palette:: @ 8E8DAF0 - .incbin "graphics/items/icon_palettes/starf_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_enigma_berry_sheet:: @ 8E8DB14 - .incbin "graphics/items/icons/enigma_berry.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_enigma_berry_palette:: @ 8E8DBE0 - .incbin "graphics/items/icon_palettes/enigma_berry.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_bright_powder_sheet:: @ 8E8DC00 - .incbin "graphics/items/icons/bright_powder.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_bright_powder_palette:: @ 8E8DCBC - .incbin "graphics/items/icon_palettes/bright_powder.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_in_battle_herb_sheet:: @ 8E8DCDC - .incbin "graphics/items/icons/in_battle_herb.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_white_herb_palette:: @ 8E8DD88 - .incbin "graphics/items/icon_palettes/white_herb.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_macho_brace_sheet:: @ 8E8DDA8 - .incbin "graphics/items/icons/macho_brace.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_macho_brace_palette:: @ 8E8DE94 - .incbin "graphics/items/icon_palettes/macho_brace.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_exp_share_sheet:: @ 8E8DEBC - .incbin "graphics/items/icons/exp_share.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_exp_share_palette:: @ 8E8DFA8 - .incbin "graphics/items/icon_palettes/exp_share.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_quick_claw_sheet:: @ 8E8DFD0 - .incbin "graphics/items/icons/quick_claw.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_quick_claw_palette:: @ 8E8E068 - .incbin "graphics/items/icon_palettes/quick_claw.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_soothe_bell_sheet:: @ 8E8E088 - .incbin "graphics/items/icons/soothe_bell.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_soothe_bell_palette:: @ 8E8E14C - .incbin "graphics/items/icon_palettes/soothe_bell.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_mental_herb_palette:: @ 8E8E170 - .incbin "graphics/items/icon_palettes/mental_herb.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_choice_band_sheet:: @ 8E8E190 - .incbin "graphics/items/icons/choice_band.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_choice_band_palette:: @ 8E8E27C - .incbin "graphics/items/icon_palettes/choice_band.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_kings_rock_sheet:: @ 8E8E2A4 - .incbin "graphics/items/icons/kings_rock.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_kings_rock_palette:: @ 8E8E394 - .incbin "graphics/items/icon_palettes/kings_rock.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_silver_powder_sheet:: @ 8E8E3B0 - .incbin "graphics/items/icons/silver_powder.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_silver_powder_palette:: @ 8E8E43C - .incbin "graphics/items/icon_palettes/silver_powder.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_amulet_coin_sheet:: @ 8E8E460 - .incbin "graphics/items/icons/amulet_coin.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_amulet_coin_palette:: @ 8E8E4F8 - .incbin "graphics/items/icon_palettes/amulet_coin.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_cleanse_tag_sheet:: @ 8E8E51C - .incbin "graphics/items/icons/cleanse_tag.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_cleanse_tag_palette:: @ 8E8E5C0 - .incbin "graphics/items/icon_palettes/cleanse_tag.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_soul_dew_sheet:: @ 8E8E5E0 - .incbin "graphics/items/icons/soul_dew.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_soul_dew_palette:: @ 8E8E674 - .incbin "graphics/items/icon_palettes/soul_dew.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_deep_sea_tooth_sheet:: @ 8E8E694 - .incbin "graphics/items/icons/deep_sea_tooth.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_deep_sea_tooth_palette:: @ 8E8E748 - .incbin "graphics/items/icon_palettes/deep_sea_tooth.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_deep_sea_scale_sheet:: @ 8E8E76C - .incbin "graphics/items/icons/deep_sea_scale.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_deep_sea_scale_palette:: @ 8E8E814 - .incbin "graphics/items/icon_palettes/deep_sea_scale.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_smoke_ball_sheet:: @ 8E8E834 - .incbin "graphics/items/icons/smoke_ball.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_smoke_ball_palette:: @ 8E8E8EC - .incbin "graphics/items/icon_palettes/smoke_ball.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_everstone_sheet:: @ 8E8E910 - .incbin "graphics/items/icons/everstone.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_everstone_palette:: @ 8E8E9C4 - .incbin "graphics/items/icon_palettes/everstone.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_focus_band_sheet:: @ 8E8E9E0 - .incbin "graphics/items/icons/focus_band.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_focus_band_palette:: @ 8E8EAD0 - .incbin "graphics/items/icon_palettes/focus_band.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_lucky_egg_sheet:: @ 8E8EAF8 - .incbin "graphics/items/icons/lucky_egg.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_lucky_egg_palette:: @ 8E8EB80 - .incbin "graphics/items/icon_palettes/lucky_egg.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_scope_lens_sheet:: @ 8E8EB98 - .incbin "graphics/items/icons/scope_lens.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_scope_lens_palette:: @ 8E8EC98 - .incbin "graphics/items/icon_palettes/scope_lens.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_metal_coat_sheet:: @ 8E8ECC0 - .incbin "graphics/items/icons/metal_coat.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_metal_coat_palette:: @ 8E8ED7C - .incbin "graphics/items/icon_palettes/metal_coat.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_leftovers_sheet:: @ 8E8ED9C - .incbin "graphics/items/icons/leftovers.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_leftovers_palette:: @ 8E8EE40 - .incbin "graphics/items/icon_palettes/leftovers.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_dragon_scale_sheet:: @ 8E8EE64 - .incbin "graphics/items/icons/dragon_scale.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_dragon_scale_palette:: @ 8E8EF18 - .incbin "graphics/items/icon_palettes/dragon_scale.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_light_ball_sheet:: @ 8E8EF38 - .incbin "graphics/items/icons/light_ball.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_light_ball_palette:: @ 8E8EFCC - .incbin "graphics/items/icon_palettes/light_ball.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_soft_sand_sheet:: @ 8E8EFF0 - .incbin "graphics/items/icons/soft_sand.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_soft_sand_palette:: @ 8E8F0AC - .incbin "graphics/items/icon_palettes/soft_sand.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_hard_stone_sheet:: @ 8E8F0CC - .incbin "graphics/items/icons/hard_stone.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_hard_stone_palette:: @ 8E8F180 - .incbin "graphics/items/icon_palettes/hard_stone.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_miracle_seed_sheet:: @ 8E8F1A4 - .incbin "graphics/items/icons/miracle_seed.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_miracle_seed_palette:: @ 8E8F254 - .incbin "graphics/items/icon_palettes/miracle_seed.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_black_glasses_sheet:: @ 8E8F270 - .incbin "graphics/items/icons/black_glasses.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_black_type_enhancing_item_palette:: @ 8E8F2F8 - .incbin "graphics/items/icon_palettes/black_type_enhancing_item.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_black_belt_sheet:: @ 8E8F310 - .incbin "graphics/items/icons/black_belt.4bpp.lz" - - .align 2 -gFile_graphics_items_icons_magnet_sheet:: @ 8E8F3D8 - .incbin "graphics/items/icons/magnet.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_magnet_palette:: @ 8E8F488 - .incbin "graphics/items/icon_palettes/magnet.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_mystic_water_sheet:: @ 8E8F4B0 - .incbin "graphics/items/icons/mystic_water.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_mystic_water_palette:: @ 8E8F548 - .incbin "graphics/items/icon_palettes/mystic_water.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_sharp_beak_sheet:: @ 8E8F568 - .incbin "graphics/items/icons/sharp_beak.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_sharp_beak_palette:: @ 8E8F624 - .incbin "graphics/items/icon_palettes/sharp_beak.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_poison_barb_sheet:: @ 8E8F644 - .incbin "graphics/items/icons/poison_barb.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_poison_barb_palette:: @ 8E8F6CC - .incbin "graphics/items/icon_palettes/poison_barb.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_never_melt_ice_sheet:: @ 8E8F6EC - .incbin "graphics/items/icons/never_melt_ice.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_never_melt_ice_palette:: @ 8E8F7B8 - .incbin "graphics/items/icon_palettes/never_melt_ice.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_spell_tag_sheet:: @ 8E8F7D4 - .incbin "graphics/items/icons/spell_tag.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_spell_tag_palette:: @ 8E8F874 - .incbin "graphics/items/icon_palettes/spell_tag.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_twisted_spoon_sheet:: @ 8E8F894 - .incbin "graphics/items/icons/twisted_spoon.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_twisted_spoon_palette:: @ 8E8F934 - .incbin "graphics/items/icon_palettes/twisted_spoon.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_charcoal_sheet:: @ 8E8F94C - .incbin "graphics/items/icons/charcoal.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_charcoal_palette:: @ 8E8FA1C - .incbin "graphics/items/icon_palettes/charcoal.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_dragon_fang_sheet:: @ 8E8FA38 - .incbin "graphics/items/icons/dragon_fang.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_dragon_fang_palette:: @ 8E8FAEC - .incbin "graphics/items/icon_palettes/dragon_fang.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_silk_scarf_sheet:: @ 8E8FB0C - .incbin "graphics/items/icons/silk_scarf.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_silk_scarf_palette:: @ 8E8FC14 - .incbin "graphics/items/icon_palettes/silk_scarf.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_up_grade_sheet:: @ 8E8FC34 - .incbin "graphics/items/icons/up_grade.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_up_grade_palette:: @ 8E8FCF0 - .incbin "graphics/items/icon_palettes/up_grade.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_shell_bell_sheet:: @ 8E8FD18 - .incbin "graphics/items/icons/shell_bell.4bpp.lz" - - .align 2 -gFile_graphics_items_icons_sea_incense_sheet:: @ 8E8FDF8 - .incbin "graphics/items/icons/sea_incense.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_sea_incense_palette:: @ 8E8FEE0 - .incbin "graphics/items/icon_palettes/sea_incense.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_lax_incense_sheet:: @ 8E8FF08 - .incbin "graphics/items/icons/lax_incense.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_lax_incense_palette:: @ 8E8FFF0 - .incbin "graphics/items/icon_palettes/lax_incense.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_lucky_punch_sheet:: @ 8E90018 - .incbin "graphics/items/icons/lucky_punch.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_lucky_punch_palette:: @ 8E900DC - .incbin "graphics/items/icon_palettes/lucky_punch.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_metal_powder_sheet:: @ 8E900FC - .incbin "graphics/items/icons/metal_powder.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_metal_powder_palette:: @ 8E901BC - .incbin "graphics/items/icon_palettes/metal_powder.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_thick_club_sheet:: @ 8E901E0 - .incbin "graphics/items/icons/thick_club.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_thick_club_palette:: @ 8E90274 - .incbin "graphics/items/icon_palettes/thick_club.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_stick_sheet:: @ 8E90290 - .incbin "graphics/items/icons/stick.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_stick_palette:: @ 8E90330 - .incbin "graphics/items/icon_palettes/stick.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_scarf_sheet:: @ 8E90354 - .incbin "graphics/items/icons/scarf.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_red_scarf_palette:: @ 8E90420 - .incbin "graphics/items/icon_palettes/red_scarf.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_blue_scarf_palette:: @ 8E9043C - .incbin "graphics/items/icon_palettes/blue_scarf.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_pink_scarf_palette:: @ 8E90458 - .incbin "graphics/items/icon_palettes/pink_scarf.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_green_scarf_palette:: @ 8E90474 - .incbin "graphics/items/icon_palettes/green_scarf.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_yellow_scarf_palette:: @ 8E90490 - .incbin "graphics/items/icon_palettes/yellow_scarf.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_mach_bike_sheet:: @ 8E904AC - .incbin "graphics/items/icons/mach_bike.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_mach_bike_palette:: @ 8E905B4 - .incbin "graphics/items/icon_palettes/mach_bike.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_coin_case_sheet:: @ 8E905D8 - .incbin "graphics/items/icons/coin_case.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_coin_case_palette:: @ 8E90698 - .incbin "graphics/items/icon_palettes/coin_case.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_itemfinder_sheet:: @ 8E906B8 - .incbin "graphics/items/icons/itemfinder.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_itemfinder_palette:: @ 8E90774 - .incbin "graphics/items/icon_palettes/itemfinder.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_old_rod_sheet:: @ 8E9079C - .incbin "graphics/items/icons/old_rod.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_old_rod_palette:: @ 8E90848 - .incbin "graphics/items/icon_palettes/old_rod.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_good_rod_sheet:: @ 8E9086C - .incbin "graphics/items/icons/good_rod.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_good_rod_palette:: @ 8E90908 - .incbin "graphics/items/icon_palettes/good_rod.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_super_rod_sheet:: @ 8E90930 - .incbin "graphics/items/icons/super_rod.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_super_rod_palette:: @ 8E909E0 - .incbin "graphics/items/icon_palettes/super_rod.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_ss_ticket_sheet:: @ 8E90A08 - .incbin "graphics/items/icons/ss_ticket.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_ss_ticket_palette:: @ 8E90A9C - .incbin "graphics/items/icon_palettes/ss_ticket.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_contest_pass_sheet:: @ 8E90AB4 - .incbin "graphics/items/icons/contest_pass.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_contest_pass_palette:: @ 8E90B60 - .incbin "graphics/items/icon_palettes/contest_pass.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_wailmer_pail_sheet:: @ 8E90B88 - .incbin "graphics/items/icons/wailmer_pail.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_wailmer_pail_palette:: @ 8E90C54 - .incbin "graphics/items/icon_palettes/wailmer_pail.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_devon_goods_sheet:: @ 8E90C78 - .incbin "graphics/items/icons/devon_goods.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_devon_goods_palette:: @ 8E90D20 - .incbin "graphics/items/icon_palettes/devon_goods.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_soot_sack_sheet:: @ 8E90D3C - .incbin "graphics/items/icons/soot_sack.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_soot_sack_palette:: @ 8E90E14 - .incbin "graphics/items/icon_palettes/soot_sack.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_basement_key_sheet:: @ 8E90E3C - .incbin "graphics/items/icons/basement_key.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_old_key_palette:: @ 8E90EE4 - .incbin "graphics/items/icon_palettes/old_key.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_acro_bike_sheet:: @ 8E90F0C - .incbin "graphics/items/icons/acro_bike.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_acro_bike_palette:: @ 8E91008 - .incbin "graphics/items/icon_palettes/acro_bike.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_pokeblock_case_sheet:: @ 8E91028 - .incbin "graphics/items/icons/pokeblock_case.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_pokeblock_case_palette:: @ 8E91110 - .incbin "graphics/items/icon_palettes/pokeblock_case.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_letter_sheet:: @ 8E91138 - .incbin "graphics/items/icons/letter.4bpp.lz" - - .align 2 -gFile_graphics_items_icons_eon_ticket_sheet:: @ 8E911B8 - .incbin "graphics/items/icons/eon_ticket.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_eon_ticket_palette:: @ 8E91254 - .incbin "graphics/items/icon_palettes/eon_ticket.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_orb_sheet:: @ 8E91278 - .incbin "graphics/items/icons/orb.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_red_orb_palette:: @ 8E91330 - .incbin "graphics/items/icon_palettes/red_orb.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_blue_orb_palette:: @ 8E9134C - .incbin "graphics/items/icon_palettes/blue_orb.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_scanner_sheet:: @ 8E91368 - .incbin "graphics/items/icons/scanner.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_scanner_palette:: @ 8E91430 - .incbin "graphics/items/icon_palettes/scanner.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_go_goggles_sheet:: @ 8E91454 - .incbin "graphics/items/icons/go_goggles.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_go_goggles_palette:: @ 8E91508 - .incbin "graphics/items/icon_palettes/go_goggles.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_meteorite_sheet:: @ 8E91528 - .incbin "graphics/items/icons/meteorite.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_meteorite_palette:: @ 8E91608 - .incbin "graphics/items/icon_palettes/meteorite.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_room1_key_sheet:: @ 8E91628 - .incbin "graphics/items/icons/room1_key.4bpp.lz" - - .align 2 -gFile_graphics_items_icons_room2_key_sheet:: @ 8E916E0 - .incbin "graphics/items/icons/room2_key.4bpp.lz" - - .align 2 -gFile_graphics_items_icons_room4_key_sheet:: @ 8E9179C - .incbin "graphics/items/icons/room4_key.4bpp.lz" - - .align 2 -gFile_graphics_items_icons_room6_key_sheet:: @ 8E9185C - .incbin "graphics/items/icons/room6_key.4bpp.lz" - - .align 2 -gFile_graphics_items_icons_storage_key_sheet:: @ 8E91918 - .incbin "graphics/items/icons/storage_key.4bpp.lz" - - .align 2 -gFile_graphics_items_icons_root_fossil_sheet:: @ 8E919C0 - .incbin "graphics/items/icons/root_fossil.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_hoenn_fossil_palette:: @ 8E91ACC - .incbin "graphics/items/icon_palettes/hoenn_fossil.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_claw_fossil_sheet:: @ 8E91AF4 - .incbin "graphics/items/icons/claw_fossil.4bpp.lz" - - .align 2 -gFile_graphics_items_icons_devon_scope_sheet:: @ 8E91BE4 - .incbin "graphics/items/icons/devon_scope.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_devon_scope_palette:: @ 8E91CA0 - .incbin "graphics/items/icon_palettes/devon_scope.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_tm_sheet:: @ 8E91CC8 - .incbin "graphics/items/icons/tm.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_fighting_tm_hm_palette:: @ 8E91DC4 - .incbin "graphics/items/icon_palettes/fighting_tm_hm.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_dragon_tm_hm_palette:: @ 8E91DEC - .incbin "graphics/items/icon_palettes/dragon_tm_hm.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_water_tm_hm_palette:: @ 8E91E14 - .incbin "graphics/items/icon_palettes/water_tm_hm.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_psychic_tm_hm_palette:: @ 8E91E3C - .incbin "graphics/items/icon_palettes/psychic_tm_hm.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_normal_tm_hm_palette:: @ 8E91E64 - .incbin "graphics/items/icon_palettes/normal_tm_hm.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_poison_tm_hm_palette:: @ 8E91E8C - .incbin "graphics/items/icon_palettes/poison_tm_hm.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_ice_tm_hm_palette:: @ 8E91EB4 - .incbin "graphics/items/icon_palettes/ice_tm_hm.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_grass_tm_hm_palette:: @ 8E91EDC - .incbin "graphics/items/icon_palettes/grass_tm_hm.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_fire_tm_hm_palette:: @ 8E91F04 - .incbin "graphics/items/icon_palettes/fire_tm_hm.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_dark_tm_hm_palette:: @ 8E91F2C - .incbin "graphics/items/icon_palettes/dark_tm_hm.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_steel_tm_hm_palette:: @ 8E91F54 - .incbin "graphics/items/icon_palettes/steel_tm_hm.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_electric_tm_hm_palette:: @ 8E91F7C - .incbin "graphics/items/icon_palettes/electric_tm_hm.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_ground_tm_hm_palette:: @ 8E91FA4 - .incbin "graphics/items/icon_palettes/ground_tm_hm.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_ghost_tm_hm_palette:: @ 8E91FCC - .incbin "graphics/items/icon_palettes/ghost_tm_hm.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_rock_tm_hm_palette:: @ 8E91FF4 - .incbin "graphics/items/icon_palettes/rock_tm_hm.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_flying_tm_hm_palette:: @ 8E9201C - .incbin "graphics/items/icon_palettes/flying_tm_hm.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_oaks_parcel_sheet:: @ 8E92044 - .incbin "graphics/items/icons/oaks_parcel.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_oaks_parcel_palette:: @ 8E920FC - .incbin "graphics/items/icon_palettes/oaks_parcel.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_poke_flute_sheet:: @ 8E9211C - .incbin "graphics/items/icons/poke_flute.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_poke_flute_palette:: @ 8E921E0 - .incbin "graphics/items/icon_palettes/poke_flute.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_secret_key_sheet:: @ 8E92208 - .incbin "graphics/items/icons/secret_key.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_secret_key_palette:: @ 8E922D4 - .incbin "graphics/items/icon_palettes/secret_key.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_bike_voucher_sheet:: @ 8E922FC - .incbin "graphics/items/icons/bike_voucher.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_bike_voucher_palette:: @ 8E9239C - .incbin "graphics/items/icon_palettes/bike_voucher.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_gold_teeth_sheet:: @ 8E923BC - .incbin "graphics/items/icons/gold_teeth.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_gold_teeth_palette:: @ 8E924A8 - .incbin "graphics/items/icon_palettes/gold_teeth.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_old_amber_sheet:: @ 8E924CC - .incbin "graphics/items/icons/old_amber.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_old_amber_palette:: @ 8E925AC - .incbin "graphics/items/icon_palettes/old_amber.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_card_key_sheet:: @ 8E925D0 - .incbin "graphics/items/icons/card_key.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_card_key_palette:: @ 8E92678 - .incbin "graphics/items/icon_palettes/card_key.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_lift_key_sheet:: @ 8E92698 - .incbin "graphics/items/icons/lift_key.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_key_palette:: @ 8E92754 - .incbin "graphics/items/icon_palettes/key.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_helix_fossil_sheet:: @ 8E92774 - .incbin "graphics/items/icons/helix_fossil.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_kanto_fossil_palette:: @ 8E92868 - .incbin "graphics/items/icon_palettes/kanto_fossil.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_dome_fossil_sheet:: @ 8E92888 - .incbin "graphics/items/icons/dome_fossil.4bpp.lz" - - .align 2 -gFile_graphics_items_icons_silph_scope_sheet:: @ 8E92978 - .incbin "graphics/items/icons/silph_scope.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_silph_scope_palette:: @ 8E92A4C - .incbin "graphics/items/icon_palettes/silph_scope.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_bicycle_sheet:: @ 8E92A70 - .incbin "graphics/items/icons/bicycle.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_bicycle_palette:: @ 8E92B74 - .incbin "graphics/items/icon_palettes/bicycle.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_town_map_sheet:: @ 8E92B94 - .incbin "graphics/items/icons/town_map.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_town_map_palette:: @ 8E92C50 - .incbin "graphics/items/icon_palettes/town_map.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_vs_seeker_sheet:: @ 8E92C78 - .incbin "graphics/items/icons/vs_seeker.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_vs_seeker_palette:: @ 8E92D40 - .incbin "graphics/items/icon_palettes/vs_seeker.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_fame_checker_sheet:: @ 8E92D60 - .incbin "graphics/items/icons/fame_checker.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_fame_checker_palette:: @ 8E92E18 - .incbin "graphics/items/icon_palettes/fame_checker.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_tm_case_sheet:: @ 8E92E3C - .incbin "graphics/items/icons/tm_case.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_tm_case_palette:: @ 8E92F00 - .incbin "graphics/items/icon_palettes/tm_case.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_berry_pouch_sheet:: @ 8E92F28 - .incbin "graphics/items/icons/berry_pouch.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_berry_pouch_palette:: @ 8E93028 - .incbin "graphics/items/icon_palettes/berry_pouch.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_teachy_tv_sheet:: @ 8E93050 - .incbin "graphics/items/icons/teachy_tv.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_teachy_tv_palette:: @ 8E93148 - .incbin "graphics/items/icon_palettes/teachy_tv.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_tri_pass_sheet:: @ 8E93170 - .incbin "graphics/items/icons/tri_pass.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_tri_pass_palette:: @ 8E93214 - .incbin "graphics/items/icon_palettes/tri_pass.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_rainbow_pass_sheet:: @ 8E93234 - .incbin "graphics/items/icons/rainbow_pass.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_rainbow_pass_palette:: @ 8E932DC - .incbin "graphics/items/icon_palettes/rainbow_pass.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_tea_sheet:: @ 8E93304 - .incbin "graphics/items/icons/tea.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_tea_palette:: @ 8E933CC - .incbin "graphics/items/icon_palettes/tea.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_mystic_ticket_sheet:: @ 8E933F0 - .incbin "graphics/items/icons/mystic_ticket.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_mystic_ticket_palette:: @ 8E93488 - .incbin "graphics/items/icon_palettes/mystic_ticket.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_aurora_ticket_sheet:: @ 8E934A8 - .incbin "graphics/items/icons/aurora_ticket.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_aurora_ticket_palette:: @ 8E93544 - .incbin "graphics/items/icon_palettes/aurora_ticket.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_powder_jar_sheet:: @ 8E93568 - .incbin "graphics/items/icons/powder_jar.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_powder_jar_palette:: @ 8E93608 - .incbin "graphics/items/icon_palettes/powder_jar.gbapal.lz" - - .align 2 -gFile_graphics_items_icon_palettes_ruby_palette:: @ 8E93630 - .incbin "graphics/items/icon_palettes/ruby.gbapal.lz" - - .align 2 -gFile_graphics_items_icons_gem_sheet:: @ 8E93658 - .incbin "graphics/items/icons/gem.4bpp.lz" - - .align 2 -gFile_graphics_items_icon_palettes_sapphire_palette:: @ 8E93720 - .incbin "graphics/items/icon_palettes/sapphire.gbapal.lz" - .align 2 gBattleAnimSpritePal_Shock3:: @ 8E93748 .incbin "graphics/battle_anims/sprites/shock_3.gbapal.lz" -- cgit v1.2.3 From 707e0db0494f2fa0c762457c5ac14ba27380596d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 22 Feb 2020 14:28:19 -0500 Subject: Move graphics through mail to src --- data/graphics.s | 164 -------------------------------------------------------- 1 file changed, 164 deletions(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index 31cd6e887..5702ab599 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -1,169 +1,5 @@ .section gfx_data, "aw", %progbits - .align 2 -gBattleAnimSpritePal_Shock3:: @ 8E93748 - .incbin "graphics/battle_anims/sprites/shock_3.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Shock3:: @ 8E93770 - .incbin "graphics/battle_anims/sprites/shock_3.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_WhiteFeather:: @ 8E93958 - .incbin "graphics/battle_anims/sprites/white_feather.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_WhiteFeather:: @ 8E93974 - .incbin "graphics/battle_anims/sprites/white_feather.4bpp.lz" - - .align 2 -gBattleAnimSpritePal_Sparkle6:: @ 8E93A9C - .incbin "graphics/battle_anims/sprites/sparkle_6.gbapal.lz" - - .align 2 -gBattleAnimSpriteGfx_Sparkle6:: @ 8E93AB4 - .incbin "graphics/battle_anims/sprites/sparkle_6.4bpp.lz" - - .align 2 -gGhostPalette:: @ 8E93B14 - .incbin "graphics/pokemon/ghost/front.gbapal.lz" - - .align 2 -gGhostFrontPic:: @ 8E93B38 - .incbin "graphics/pokemon/ghost/front.4bpp.lz" - -gFile_graphics_mail_orange_palette_pal:: @ 8E93EA0 - .incbin "graphics/mail/orange/palette.gbapal" - -gFile_graphics_mail_harbor_palette_pal:: @ 8E93EC0 - .incbin "graphics/mail/harbor/palette.gbapal" - -gFile_graphics_mail_glitter_palette_pal:: @ 8E93EE0 - .incbin "graphics/mail/glitter/palette.gbapal" - -gFile_graphics_mail_mech_palette_pal:: @ 8E93F00 - .incbin "graphics/mail/mech/palette.gbapal" - -gFile_graphics_mail_wood_palette_pal:: @ 8E93F20 - .incbin "graphics/mail/wood/palette.gbapal" - -gFile_graphics_mail_wave_palette_pal:: @ 8E93F40 - .incbin "graphics/mail/wave/palette.gbapal" - -gFile_graphics_mail_bead_palette_pal:: @ 8E93F60 - .incbin "graphics/mail/bead/palette.gbapal" - -gFile_graphics_mail_shadow_palette_pal:: @ 8E93F80 - .incbin "graphics/mail/shadow/palette.gbapal" - -gFile_graphics_mail_tropic_palette_pal:: @ 8E93FA0 - .incbin "graphics/mail/tropic/palette.gbapal" - -gFile_graphics_mail_dream_palette_pal:: @ 8E93FC0 - .incbin "graphics/mail/dream/palette.gbapal" - -gFile_graphics_mail_fab_palette_pal:: @ 8E93FE0 - .incbin "graphics/mail/fab/palette.gbapal" - -gFile_graphics_mail_retro_palette_pal:: @ 8E94000 - .incbin "graphics/mail/retro/palette.gbapal" - - .align 2 -gFile_graphics_mail_orange_tiles_sheet:: @ 8E94020 - .incbin "graphics/mail/orange/tiles.4bpp.lz" - - .align 2 -gFile_graphics_mail_harbor_tiles_sheet:: @ 8E941C0 - .incbin "graphics/mail/harbor/tiles.4bpp.lz" - - .align 2 -gFile_graphics_mail_glitter_tiles_sheet:: @ 8E942FC - .incbin "graphics/mail/glitter/tiles.4bpp.lz" - - .align 2 -gFile_graphics_mail_mech_tiles_sheet:: @ 8E9450C - .incbin "graphics/mail/mech/tiles.4bpp.lz" - - .align 2 -gFile_graphics_mail_wood_tiles_sheet:: @ 8E945E4 - .incbin "graphics/mail/wood/tiles.4bpp.lz" - - .align 2 -gFile_graphics_mail_wave_tiles_sheet:: @ 8E947DC - .incbin "graphics/mail/wave/tiles.4bpp.lz" - - .align 2 -gFile_graphics_mail_bead_tiles_sheet:: @ 8E9495C - .incbin "graphics/mail/bead/tiles.4bpp.lz" - - .align 2 -gFile_graphics_mail_shadow_tiles_sheet:: @ 8E94A04 - .incbin "graphics/mail/shadow/tiles.4bpp.lz" - - .align 2 -gFile_graphics_mail_tropic_tiles_sheet:: @ 8E94B94 - .incbin "graphics/mail/tropic/tiles.4bpp.lz" - - .align 2 -gFile_graphics_mail_dream_tiles_sheet:: @ 8E94CD4 - .incbin "graphics/mail/dream/tiles.4bpp.lz" - - .align 2 -gFile_graphics_mail_fab_tiles_sheet:: @ 8E94E3C - .incbin "graphics/mail/fab/tiles.4bpp.lz" - - .align 2 -gFile_graphics_mail_retro_tiles_sheet:: @ 8E94F8C - .incbin "graphics/mail/retro/tiles.4bpp.lz" - - .align 2 -gFile_graphics_mail_orange_map_tilemap:: @ 8E9522C - .incbin "graphics/mail/orange/map.bin.lz" - - .align 2 -gFile_graphics_mail_harbor_map_tilemap:: @ 8E95304 - .incbin "graphics/mail/harbor/map.bin.lz" - - .align 2 -gFile_graphics_mail_glitter_map_tilemap:: @ 8E953E4 - .incbin "graphics/mail/glitter/map.bin.lz" - - .align 2 -gFile_graphics_mail_mech_map_tilemap:: @ 8E954F0 - .incbin "graphics/mail/mech/map.bin.lz" - - .align 2 -gFile_graphics_mail_wood_map_tilemap:: @ 8E955CC - .incbin "graphics/mail/wood/map.bin.lz" - - .align 2 -gFile_graphics_mail_wave_map_tilemap:: @ 8E956BC - .incbin "graphics/mail/wave/map.bin.lz" - - .align 2 -gFile_graphics_mail_bead_map_tilemap:: @ 8E9579C - .incbin "graphics/mail/bead/map.bin.lz" - - .align 2 -gFile_graphics_mail_shadow_map_tilemap:: @ 8E9587C - .incbin "graphics/mail/shadow/map.bin.lz" - - .align 2 -gFile_graphics_mail_tropic_map_tilemap:: @ 8E95988 - .incbin "graphics/mail/tropic/map.bin.lz" - - .align 2 -gFile_graphics_mail_dream_map_tilemap:: @ 8E95A78 - .incbin "graphics/mail/dream/map.bin.lz" - - .align 2 -gFile_graphics_mail_fab_map_tilemap:: @ 8E95B70 - .incbin "graphics/mail/fab/map.bin.lz" - - .align 2 -gFile_graphics_mail_retro_map_tilemap:: @ 8E95C88 - .incbin "graphics/mail/retro/map.bin.lz" - .align 2 gFireRedMenuElements1_Pal:: @ 8E95D9C .incbin "graphics/interface/dex_caught_pokeball.gbapal" -- cgit v1.2.3 From 9f138f0e1317b8f6538bed0424b393bf0ea7a2d4 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 22 Feb 2020 15:51:32 -0500 Subject: Move remainder of graphics to src --- data/graphics.s | 492 -------------------------------------------------------- 1 file changed, 492 deletions(-) delete mode 100644 data/graphics.s (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s deleted file mode 100644 index 5702ab599..000000000 --- a/data/graphics.s +++ /dev/null @@ -1,492 +0,0 @@ - .section gfx_data, "aw", %progbits - - .align 2 -gFireRedMenuElements1_Pal:: @ 8E95D9C - .incbin "graphics/interface/dex_caught_pokeball.gbapal" - -gFireRedMenuElements2_Pal:: @ 8E95DBC - .incbin "graphics/interface/pokemon_types.gbapal" - -gFireRedMenuElements_Gfx:: @ 8E95DDC - .incbin "graphics/interface/dex_caught_pokeball_and_pokemon_types.4bpp" - -gUnknown_8E97DDC:: @ 8E97DDC - .incbin "graphics/interface/learn_move.gbapal" - -gUnknown_8E97DFC:: @ 8E97DFC - .incbin "graphics/interface/learn_move.4bpp.lz" - -gUnknown_8E97EC4:: @ 8E97EC4 - .incbin "graphics/interface/learn_move.bin.lz" - -gUnknown_8E97FE4:: @ 8E97FE4 - .incbin "graphics/interface/naming_screen_8E97FE4.gbapal" @ TODO: Find the image this goes with - -gUnknown_8E98004:: @ 8E98004 - .incbin "graphics/interface/naming_screen_8E98004.gbapal" - -gUnknown_8E98024:: @ 8E98024 - .incbin "graphics/interface/naming_screen_8E98024.gbapal" - -gUnknown_8E98044:: @ 8E98044 - .incbin "graphics/interface/naming_screen_8E98044.gbapal" - -gUnknown_8E98064:: @ 8E98064 - .incbin "graphics/interface/naming_screen_8E98064.gbapal" - -gUnknown_8E98084:: @ 8E98084 - .incbin "graphics/interface/naming_screen_8E98084.gbapal" - -gUnknown_8E980A4:: @ 8E980A4 - .incbin "graphics/interface/naming_screen_8E980A4.gbapal" - -gUnknown_8E980C4:: @ 8E980C4 - .incbin "graphics/interface/naming_screen_8E980C4.gbapal" - -gUnknown_8E980E4:: @ 8E980E4 - .incbin "graphics/interface/naming_screen_menu.4bpp.lz" - -gUnknown_8E982BC:: @ 8E982BC - .incbin "graphics/interface/naming_screen_menu.bin.lz" - -gUnknown_8E98398:: @ 8E98398 - .incbin "graphics/interface/naming_screen_E98398.bin.lz" - -gUnknown_8E98458:: @ 8E98458 - .incbin "graphics/interface/naming_screen_E98458.bin.lz" - -gUnknown_8E98518:: @ 8E98518 - .incbin "graphics/interface/naming_screen_E98518.bin.lz" - -gUnknown_8E985D8:: @ 8E985D8 - .incbin "graphics/interface/naming_screen_8E985D8.4bpp" - -gUnknown_8E98858:: @ 8E98858 - .incbin "graphics/interface/naming_screen_8E98858.4bpp" - -gUnknown_8E98A38:: @ 8E98A38 - .incbin "graphics/interface/naming_screen_8E98A38.4bpp" - -gUnknown_8E98C18:: @ 8E98C18 - .incbin "graphics/interface/naming_screen_8E98C18.4bpp" - -gUnknown_8E98CB8:: @ 8E98CB8 - .incbin "graphics/interface/naming_screen_8E98CB8.4bpp" - -gUnknown_8E98D58:: @ 8E98D58 - .incbin "graphics/interface/naming_screen_8E98D58.4bpp" - -gUnknown_8E98DF8:: @ 8E98DF8 - .incbin "graphics/interface/naming_screen_8E98DF8.4bpp" - -gUnknown_8E98E98:: @ 8E98E98 - .incbin "graphics/interface/naming_screen_8E98E98.4bpp" - -gUnknown_8E98F38:: @ 8E98F38 - .incbin "graphics/interface/naming_screen_8E98F38.4bpp" - -gUnknown_8E98FD8:: @ 8E98FD8 - .incbin "graphics/interface/naming_screen_8E98FD8.4bpp" - -gUnknown_8E990D8:: @ 8E990D8 - .incbin "graphics/interface/naming_screen_8E990D8.4bpp" - -gUnknown_8E990F8:: @ 8E990F8 - .incbin "graphics/interface/naming_screen_8E990F8.4bpp" - -gUnknown_8E99118:: @ 8E99118 - .incbin "graphics/tm_case/unk_8E99118.4bpp" - -gFireRedTrainerCard_Pal:: @ 8E99198 - .incbin "graphics/trainer_card/0star.gbapal" - -gFireRedTrainerCard_Gfx:: @ 8E991F8 - .incbin "graphics/trainer_card/card.4bpp.lz" - -gEmeraldTrainerCard_Pal:: @ 8E9986C - .incbin "graphics/trainer_card/0star_em.gbapal" - -gEmeraldTrainerCard_Gfx:: @ 8E998CC - .incbin "graphics/trainer_card/card_em.4bpp.lz" - -gUnknown_8E99D8C:: @ 8E99D8C - .incbin "graphics/link_rfu/unk_8E99DAC.gbapal" - -gUnknown_8E99DAC:: @ 8E99DAC - .incbin "graphics/link_rfu/unk_8E99DAC.4bpp.lz" - -gUnknown_8E99E74:: @ 8E99E74 - .incbin "graphics/link_rfu/unk_8E99E74.bin.lz" - -gUnknown_8E99F24:: @ 8E99F24 - .incbin "graphics/link_rfu/unk_8E9A168.gbapal" - -gUnknown_8E99F44:: @ 8E99F44 - .incbin "graphics/link_rfu/unk_8E99F44.4bpp.lz" - -gUnknown_8E9A168:: @ 8E9A168 - .incbin "graphics/link_rfu/unk_8E9A168.4bpp.lz" - -gUnknown_8E9A460:: @ 8E9A460 - .incbin "graphics/interface/trainer_memo.4bpp.lz" - -gUnknown_8E9B310:: @ 8E9B310 - .incbin "graphics/interface/trainer_memo_pal1.gbapal" - -gUnknown_8E9B3B0:: @ 8E9B3B0 - .incbin "graphics/interface/trainer_memo_pal2.gbapal" - -gUnknown_8E9B3D0:: @ 8E9B3D0 - .incbin "graphics/interface/trainer_memo_pal3.gbapal" - -gUnknown_8E9B3F0:: @ 8E9B3F0 - .incbin "graphics/interface/summary_exp_bar.4bpp.lz" - -gUnknown_8E9B4B8:: @ 8E9B4B8 - .incbin "graphics/interface/summary_hp_bar.4bpp.lz" - -gUnknown_8E9B578:: @ 8E9B578 - .incbin "graphics/interface/summary_exp_bar.gbapal" @ hp bar uses this too - -gUnknown_8E9B598:: @ 8E9B598 - .incbin "graphics/interface/trainer_memo.bin.lz" - -gUnknown_8E9B750:: @ 8E9B750 - .incbin "graphics/interface/trainer_memo_2.bin.lz" - -gUnknown_8E9B950:: @ 8E9B950 - .incbin "graphics/interface/trainer_memo_3.bin.lz" - -gUnknown_8E9BA9C:: @ 8E9BA9C - .incbin "graphics/interface/trainer_memo_4.bin.lz" - -gUnknown_8E9BBCC:: @ 8E9BBCC - .incbin "graphics/interface/trainer_memo_5.bin.lz" - -gUnknown_8E9BD08:: @ 8E9BD08 - .incbin "graphics/unknown/unknown_E9BD08.gbapal" @ might be an alternate unused palette of the link_rfu gfx below. - -gUnknown_8E9BD28:: @ 8E9BD28 - .incbin "graphics/interface/link_rfu_frame.4bpp.lz" - -gUnknown_8E9BF28:: @ 8E9BF28 - .incbin "graphics/interface/link_rfu_frame.gbapal" - -gUnknown_8E9BF48:: @ 8E9BF48 - .incbin "graphics/interface/link_rfu_status.4bpp.lz" - -gUnknown_8E9C14C:: @ 8E9C14C - .incbin "graphics/interface/pokedex_abc.gbapal" - -gUnknown_8E9C16C:: @ 8E9C16C - .incbin "graphics/interface/pokedex_abc.4bpp.lz" - -gUnknown_8E9C3D8:: @ 8E9C3D8 - .incbin "graphics/interface/box_tiles_pal1.gbapal" - -gUnknown_8E9C3F8:: @ 8E9C3F8 - .incbin "graphics/interface/box_tiles_pal2.gbapal" - -gUnknown_8E9C418:: @ 8E9C418 - .incbin "graphics/interface/box_tiles_pal3.gbapal" - -gUnknown_8E9C438:: @ 8E9C438 - .incbin "graphics/interface/box_tiles.4bpp.lz" - -gUnknown_8E9CAEC:: @ 8E9CAEC - .incbin "graphics/unknown/unknown_E9CAEC.bin.lz" - -gUnknown_8E9CB9C:: @ 8E9CB9C - .incbin "graphics/misc/markings2.gbapal" - -gUnknown_8E9CBBC:: @ 8E9CBBC - .incbin "graphics/misc/markings2.4bpp" - -gTradeMenu_Pal:: @ 8E9CEDC - .incbin "graphics/trade/menu.gbapal" - -gTradeButtons_Pal:: @ E9CF3C - .incbin "graphics/trade/unknown_DDB444.gbapal" - -gTradeMenu_Gfx:: @ 8E9CF5C - .incbin "graphics/trade/menu.4bpp" - -gTradeButtons_Gfx:: @ E9E1DC - .incbin "graphics/trade/buttons.4bpp" - -gUnknown_8E9E9DC:: @ E9E9DC - .incbin "graphics/unused/unused_DDCEE4.bin" - -gUnknown_8E9E9FC:: @ 8E9E9FC - .incbin "graphics/trade/unknown_DDCF04.bin" - -gTradeMenuMonBox_Tilemap:: @ 8E9F1FC - .incbin "graphics/trade/menu_mon_box.bin" - -gFameCheckerBgPals:: @ 8E9F220 - .incbin "data/graphics/fame_checker_bg.gbapal" - -gFameCheckerBgTiles:: @ 8E9F260 - .incbin "data/graphics/fame_checker_bg.4bpp" - -gFameCheckerBg3Tilemap:: @ 8EA0700 - .incbin "data/graphics/fame_checker_tilemap3.bin" - -gFameCheckerBg2Tilemap:: @ 8EA0F00 - .incbin "data/graphics/fame_checker_tilemap2.bin" - -gLinkMiscMenu_Pal:: @ 8EA1700 - .incbin "graphics/interface/union_room_chat.gbapal" - -gLinkMiscMenu_Gfx:: @ 8EA1720 - .incbin "graphics/interface/union_room_chat.4bpp.lz" - -gLinkMiscMenu_Tilemap:: @ 8EA1958 - .incbin "graphics/interface/union_room_chat.bin.lz" - -gUnionRoomChatIcons:: @ 8EA1A50 - .incbin "graphics/interface/union_room_chat_icons.4bpp.lz" - - .align 2 -gTilesetPalettes_General:: @ 8EA1B68 - .incbin "data/tilesets/primary/general/palettes/0.gbapal" - .incbin "data/tilesets/primary/general/palettes/1.gbapal" - .incbin "data/tilesets/primary/general/palettes/2.gbapal" - .incbin "data/tilesets/primary/general/palettes/3.gbapal" - .incbin "data/tilesets/primary/general/palettes/4.gbapal" - .incbin "data/tilesets/primary/general/palettes/5.gbapal" - .incbin "data/tilesets/primary/general/palettes/6.gbapal" - .incbin "data/tilesets/primary/general/palettes/7.gbapal" - .incbin "data/tilesets/primary/general/palettes/8.gbapal" - .incbin "data/tilesets/primary/general/palettes/9.gbapal" - .incbin "data/tilesets/primary/general/palettes/10.gbapal" - .incbin "data/tilesets/primary/general/palettes/11.gbapal" - .incbin "data/tilesets/primary/general/palettes/12.gbapal" - .incbin "data/tilesets/primary/general/palettes/13.gbapal" - .incbin "data/tilesets/primary/general/palettes/14.gbapal" - .incbin "data/tilesets/primary/general/palettes/15.gbapal" - -gTilesetTiles_General:: @ 8EA1D68 - .incbin "data/tilesets/primary/general/tiles.4bpp.lz" - -gBerryFixGameboy_Pal:: @ 8EA463C - .incbin "graphics/berry_fix/gba_small.gbapal" - -gBerryFixGameboy_Gfx:: @ 8EA467C - .incbin "graphics/berry_fix/gba_small.4bpp.lz" - -gBerryFixGameboy_Tilemap:: @ 8EA52B8 - .incbin "graphics/berry_fix/gba_small.bin.lz" - -gBerryFixGameboyLogo_Pal:: @ 8EA5604 - .incbin "graphics/berry_fix/logo.gbapal" - -gBerryFixGameboyLogo_Gfx:: @ 8EA5664 - .incbin "graphics/berry_fix/logo.4bpp.lz" - -gBerryFixGameboyLogo_Tilemap:: @ 8EA60C8 - .incbin "graphics/berry_fix/logo.bin.lz" - -gBerryFixGbaTransfer_Pal:: @ 8EA63C8 - .incbin "graphics/berry_fix/gba_transfer.gbapal" - -gBerryFixGbaTransfer_Gfx:: @ 8EA6408 - .incbin "graphics/berry_fix/gba_transfer.4bpp.lz" - -gBerryFixGbaTransfer_Tilemap:: @ 8EA7028 - .incbin "graphics/berry_fix/gba_transfer.bin.lz" - -gBerryFixGbaTransferHighlight_Pal:: @ 8EA72E0 - .incbin "graphics/berry_fix/gba_transfer_highlight.gbapal" - -gBerryFixGbaTransferHighlight_Gfx:: @ 8EA7320 - .incbin "graphics/berry_fix/gba_transfer_highlight.4bpp.lz" - -gBerryFixGbaTransferHighlight_Tilemap:: @ 8EA8118 - .incbin "graphics/berry_fix/gba_transfer_highlight.bin.lz" - -gBerryFixGbaTransferError_Pal:: @ 8EA83C8 - .incbin "graphics/berry_fix/gba_transfer_error.gbapal" - -gBerryFixGbaTransferError_Gfx:: @ 8EA8408 - .incbin "graphics/berry_fix/gba_transfer_error.4bpp.lz" - -gBerryFixGbaTransferError_Tilemap:: @ 8EA8CC8 - .incbin "graphics/berry_fix/gba_transfer_error.bin.lz" - -gBerryFixWindow_Pal:: @ 8EA8F00 - .incbin "graphics/berry_fix/window.gbapal" - -gBerryFixWindow_Gfx:: @ 8EA8F40 - .incbin "graphics/berry_fix/window.4bpp.lz" - -gBerryFixWindow_Tilemap:: @ 8EA9588 - .incbin "graphics/berry_fix/window.bin.lz" - - .align 2 -gTilesetPalettes_GenericBuilding1:: @ 8EA97F4 - .incbin "data/tilesets/secondary/generic_building1/palettes/0.gbapal" - .incbin "data/tilesets/secondary/generic_building1/palettes/1.gbapal" - .incbin "data/tilesets/secondary/generic_building1/palettes/2.gbapal" - .incbin "data/tilesets/secondary/generic_building1/palettes/3.gbapal" - .incbin "data/tilesets/secondary/generic_building1/palettes/4.gbapal" - .incbin "data/tilesets/secondary/generic_building1/palettes/5.gbapal" - .incbin "data/tilesets/secondary/generic_building1/palettes/6.gbapal" - .incbin "data/tilesets/secondary/generic_building1/palettes/7.gbapal" - .incbin "data/tilesets/secondary/generic_building1/palettes/8.gbapal" - .incbin "data/tilesets/secondary/generic_building1/palettes/9.gbapal" - .incbin "data/tilesets/secondary/generic_building1/palettes/10.gbapal" - .incbin "data/tilesets/secondary/generic_building1/palettes/11.gbapal" - .incbin "data/tilesets/secondary/generic_building1/palettes/12.gbapal" - .incbin "data/tilesets/secondary/generic_building1/palettes/13.gbapal" - .incbin "data/tilesets/secondary/generic_building1/palettes/14.gbapal" - .incbin "data/tilesets/secondary/generic_building1/palettes/15.gbapal" - - .align 2 -gTilesetTiles_GenericBuilding1:: @ 8EA99F4 - .incbin "data/tilesets/secondary/generic_building1/tiles.4bpp.lz" - - .align 2 -gTilesetPalettes_DepartmentStore:: @ 8EA9D88 - .incbin "data/tilesets/secondary/department_store/palettes/0.gbapal" - .incbin "data/tilesets/secondary/department_store/palettes/1.gbapal" - .incbin "data/tilesets/secondary/department_store/palettes/2.gbapal" - .incbin "data/tilesets/secondary/department_store/palettes/3.gbapal" - .incbin "data/tilesets/secondary/department_store/palettes/4.gbapal" - .incbin "data/tilesets/secondary/department_store/palettes/5.gbapal" - .incbin "data/tilesets/secondary/department_store/palettes/6.gbapal" - .incbin "data/tilesets/secondary/department_store/palettes/7.gbapal" - .incbin "data/tilesets/secondary/department_store/palettes/8.gbapal" - .incbin "data/tilesets/secondary/department_store/palettes/9.gbapal" - .incbin "data/tilesets/secondary/department_store/palettes/10.gbapal" - .incbin "data/tilesets/secondary/department_store/palettes/11.gbapal" - .incbin "data/tilesets/secondary/department_store/palettes/12.gbapal" - .incbin "data/tilesets/secondary/department_store/palettes/13.gbapal" - .incbin "data/tilesets/secondary/department_store/palettes/14.gbapal" - .incbin "data/tilesets/secondary/department_store/palettes/15.gbapal" - - -gTilesetTiles_DepartmentStore:: @ 8EA9F88 - .incbin "data/tilesets/secondary/department_store/tiles.4bpp.lz" - -gUnionRoomChatPanelBgPal_7:: @ 8EAA9F0 - .incbin "graphics/interface/union_room_chat_panel.gbapal" - -gUnionRoomChatPanelBgTiles:: @ 8EAAA10 - .incbin "graphics/interface/union_room_chat_panel.4bpp.lz" - -gUnionRoomChatPanelBgMap:: @ 8EAAA6C - .incbin "graphics/interface/union_room_chat_panel.bin.lz" - -gCreditsMonBackdropPals:: @ 8EAAB18 - .incbin "graphics/credits/charizard.gbapal" - .incbin "graphics/credits/venusaur.gbapal" - .incbin "graphics/credits/blastoise.gbapal" - .incbin "graphics/credits/pikachu.gbapal" - -gCreditsPokeballBgGfxTiles:: @ 8EAAB98 - .incbin "graphics/credits/unk_8EAAB98.4bpp.lz" - -gCreditsPokeballBgGfxMap:: @ 8EAB30C - .incbin "graphics/credits/unk_8EAB30C.bin.lz" - - @ title_screen - .ifdef FIRERED -gGraphics_TitleScreen_GameTitleLogoPals:: @ 8EAB6C4 - .incbin "graphics/title_screen/unk_8eab6c4.gbapal" - -gGraphics_TitleScreen_GameTitleLogoTiles:: @ 8EAB8C4 - .incbin "graphics/title_screen/unk_8eab8c4.8bpp.lz" - -gGraphics_TitleScreen_GameTitleLogoMap:: @ 8EAD390 - .incbin "graphics/title_screen/unk_8ead390.bin.lz" - -gGraphics_TitleScreen_BoxArtMonPals:: @ 8EAD5E8 - .incbin "graphics/title_screen/unk_8ead5e8.gbapal" - -gGraphics_TitleScreen_BoxArtMonTiles:: @ 8EAD608 - .incbin "graphics/title_screen/unk_8ead608.4bpp.lz" - -gGraphics_TitleScreen_BoxArtMonMap:: @ 8EADEE4 - .incbin "graphics/title_screen/unk_8eadee4.bin.lz" - -gGraphics_TitleScreen_BackgroundPals:: @ 8EAE094 - .incbin "graphics/title_screen/unk_8eae094.gbapal" - .else - .ifdef LEAFGREEN -gGraphics_TitleScreen_GameTitleLogoPals:: @ 8EAB6C4 - .incbin "graphics/title_screen/unk_lg_8eab744.gbapal" - -gGraphics_TitleScreen_GameTitleLogoTiles:: @ 8EAB8C4 - .incbin "graphics/title_screen/unk_lg_8eab944.8bpp.lz" - -gGraphics_TitleScreen_GameTitleLogoMap:: @ 8EAD390 - .incbin "graphics/title_screen/unk_lg_8ead508.bin.lz" - -gGraphics_TitleScreen_BoxArtMonPals:: @ 8EAD5E8 - .incbin "graphics/title_screen/unk_lg_8ead768.gbapal" - -gGraphics_TitleScreen_BoxArtMonTiles:: @ 8EAD608 - .incbin "graphics/title_screen/unk_lg_8ead788.4bpp.lz" - -gGraphics_TitleScreen_BoxArtMonMap:: @ 8EADEE4 - .incbin "graphics/title_screen/unk_lg_8eae1ec.bin.lz" - -gGraphics_TitleScreen_BackgroundPals:: @ 8EAE094 - .incbin "graphics/title_screen/unk_lg_8eae388.gbapal" - .endif - .endif - -gGraphics_TitleScreen_CopyrightPressStartTiles:: @ 8EAE0B4 - .incbin "graphics/title_screen/unk_8eae0b4.4bpp.lz" - -gGraphics_TitleScreen_CopyrightPressStartMap:: @ 8EAE374 - .incbin "graphics/title_screen/unk_8eae374.bin.lz" - - .ifdef FIRERED -gGraphics_TitleScreen_FireOrLeafPals:: @ 8EAE488 - .incbin "graphics/title_screen/unk_8eae488.gbapal" - .else - .ifdef LEAFGREEN -gGraphics_TitleScreen_FireOrLeafPals:: @ 8EAE488 - .incbin "graphics/title_screen/unk_lg_8eae77c.gbapal" - .endif - .endif - -gGraphics_TitleScreen_BlankObjTiles:: @ 8EAE4A8 - .incbin "graphics/title_screen/unk_8eae4a8.4bpp.lz" - -gCreditsAllRightsReservedGfxPal:: @ 8EAE528 - .incbin "graphics/credits/unk_8EAE548.gbapal" - -gCreditsAllRightsReservedGfxTiles:: @ 8EAE548 - .incbin "graphics/credits/unk_8EAE548.4bpp.lz" - -gCreditsAllRightsReservedGfxMap:: @ 8EAE900 - .incbin "graphics/credits/unk_8EAE548.bin.lz" - -gUnknown_8EAEA00:: @ 8EAEA00 - .incbin "graphics/link/gba.gbapal" - -gTradeGba2_Pal:: @ 8EAEA20 - .incbin "graphics/link/gba_pal2.gbapal" - -gTradeGba_Gfx:: @ 8EAEA80 - .incbin "graphics/link/gba.4bpp" - -gUnknown_8EAFE80:: @ 8EAFE80 - .incbin "graphics/interface/blank2.gbapal" - -gUnknown_8EAFEA0:: @ 8EAFEA0 - .incbin "graphics/berry_crush/berry_crush.gbapal" - -gUnknown_8EAFF60:: @ 8EAFF60 - .incbin "graphics/unknown/unknown_EAFF60.gbapal" @ seems to be unused. Loaded palette for above is 0xC0 so this is unused. - -gUnknown_8EAFFC0:: @ 8EAFFC0 - .incbin "graphics/berry_crush/berry_crush.4bpp.lz" - -gUnknown_8EB0ADC:: @ 8EB0ADC - .incbin "graphics/berry_crush/data_EB0ADC.bin.lz" @ TODO: What is this? - - @ EOF -- cgit v1.2.3 From 8c02668a19f45e2969c206657ec08799d4dddd3e Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 22 Feb 2020 17:08:29 -0500 Subject: Rename tileset pals for porymap --- data/tilesets/graphics.inc | 1280 ++++++++++---------- data/tilesets/primary/building/palettes/0.pal | 19 - data/tilesets/primary/building/palettes/00.pal | 19 + data/tilesets/primary/building/palettes/01.pal | 19 + data/tilesets/primary/building/palettes/02.pal | 19 + data/tilesets/primary/building/palettes/03.pal | 19 + data/tilesets/primary/building/palettes/04.pal | 19 + data/tilesets/primary/building/palettes/05.pal | 19 + data/tilesets/primary/building/palettes/06.pal | 19 + data/tilesets/primary/building/palettes/07.pal | 19 + data/tilesets/primary/building/palettes/08.pal | 19 + data/tilesets/primary/building/palettes/09.pal | 19 + data/tilesets/primary/building/palettes/1.pal | 19 - data/tilesets/primary/building/palettes/2.pal | 19 - data/tilesets/primary/building/palettes/3.pal | 19 - data/tilesets/primary/building/palettes/4.pal | 19 - data/tilesets/primary/building/palettes/5.pal | 19 - data/tilesets/primary/building/palettes/6.pal | 19 - data/tilesets/primary/building/palettes/7.pal | 19 - data/tilesets/primary/building/palettes/8.pal | 19 - data/tilesets/primary/building/palettes/9.pal | 19 - data/tilesets/primary/general/palettes/0.pal | 19 - data/tilesets/primary/general/palettes/00.pal | 19 + data/tilesets/primary/general/palettes/01.pal | 19 + data/tilesets/primary/general/palettes/02.pal | 19 + data/tilesets/primary/general/palettes/03.pal | 19 + data/tilesets/primary/general/palettes/04.pal | 19 + data/tilesets/primary/general/palettes/05.pal | 19 + data/tilesets/primary/general/palettes/06.pal | 19 + data/tilesets/primary/general/palettes/07.pal | 19 + data/tilesets/primary/general/palettes/08.pal | 19 + data/tilesets/primary/general/palettes/09.pal | 19 + data/tilesets/primary/general/palettes/1.pal | 19 - data/tilesets/primary/general/palettes/2.pal | 19 - data/tilesets/primary/general/palettes/3.pal | 19 - data/tilesets/primary/general/palettes/4.pal | 19 - data/tilesets/primary/general/palettes/5.pal | 19 - data/tilesets/primary/general/palettes/6.pal | 19 - data/tilesets/primary/general/palettes/7.pal | 19 - data/tilesets/primary/general/palettes/8.pal | 19 - data/tilesets/primary/general/palettes/9.pal | 19 - .../tilesets/secondary/berry_forest/palettes/0.pal | 19 - .../secondary/berry_forest/palettes/00.pal | 19 + .../secondary/berry_forest/palettes/01.pal | 19 + .../secondary/berry_forest/palettes/02.pal | 19 + .../secondary/berry_forest/palettes/03.pal | 19 + .../secondary/berry_forest/palettes/04.pal | 19 + .../secondary/berry_forest/palettes/05.pal | 19 + .../secondary/berry_forest/palettes/06.pal | 19 + .../secondary/berry_forest/palettes/07.pal | 19 + .../secondary/berry_forest/palettes/08.pal | 19 + .../secondary/berry_forest/palettes/09.pal | 19 + .../tilesets/secondary/berry_forest/palettes/1.pal | 19 - .../tilesets/secondary/berry_forest/palettes/2.pal | 19 - .../tilesets/secondary/berry_forest/palettes/3.pal | 19 - .../tilesets/secondary/berry_forest/palettes/4.pal | 19 - .../tilesets/secondary/berry_forest/palettes/5.pal | 19 - .../tilesets/secondary/berry_forest/palettes/6.pal | 19 - .../tilesets/secondary/berry_forest/palettes/7.pal | 19 - .../tilesets/secondary/berry_forest/palettes/8.pal | 19 - .../tilesets/secondary/berry_forest/palettes/9.pal | 19 - data/tilesets/secondary/bike_shop/palettes/0.pal | 19 - data/tilesets/secondary/bike_shop/palettes/00.pal | 19 + data/tilesets/secondary/bike_shop/palettes/01.pal | 19 + data/tilesets/secondary/bike_shop/palettes/02.pal | 19 + data/tilesets/secondary/bike_shop/palettes/03.pal | 19 + data/tilesets/secondary/bike_shop/palettes/04.pal | 19 + data/tilesets/secondary/bike_shop/palettes/05.pal | 19 + data/tilesets/secondary/bike_shop/palettes/06.pal | 19 + data/tilesets/secondary/bike_shop/palettes/07.pal | 19 + data/tilesets/secondary/bike_shop/palettes/08.pal | 19 + data/tilesets/secondary/bike_shop/palettes/09.pal | 19 + data/tilesets/secondary/bike_shop/palettes/1.pal | 19 - data/tilesets/secondary/bike_shop/palettes/2.pal | 19 - data/tilesets/secondary/bike_shop/palettes/3.pal | 19 - data/tilesets/secondary/bike_shop/palettes/4.pal | 19 - data/tilesets/secondary/bike_shop/palettes/5.pal | 19 - data/tilesets/secondary/bike_shop/palettes/6.pal | 19 - data/tilesets/secondary/bike_shop/palettes/7.pal | 19 - data/tilesets/secondary/bike_shop/palettes/8.pal | 19 - data/tilesets/secondary/bike_shop/palettes/9.pal | 19 - .../secondary/burgled_house/palettes/0.pal | 19 - .../secondary/burgled_house/palettes/00.pal | 19 + .../secondary/burgled_house/palettes/01.pal | 19 + .../secondary/burgled_house/palettes/02.pal | 19 + .../secondary/burgled_house/palettes/03.pal | 19 + .../secondary/burgled_house/palettes/04.pal | 19 + .../secondary/burgled_house/palettes/05.pal | 19 + .../secondary/burgled_house/palettes/06.pal | 19 + .../secondary/burgled_house/palettes/07.pal | 19 + .../secondary/burgled_house/palettes/08.pal | 19 + .../secondary/burgled_house/palettes/09.pal | 19 + .../secondary/burgled_house/palettes/1.pal | 19 - .../secondary/burgled_house/palettes/2.pal | 19 - .../secondary/burgled_house/palettes/3.pal | 19 - .../secondary/burgled_house/palettes/4.pal | 19 - .../secondary/burgled_house/palettes/5.pal | 19 - .../secondary/burgled_house/palettes/6.pal | 19 - .../secondary/burgled_house/palettes/7.pal | 19 - .../secondary/burgled_house/palettes/8.pal | 19 - .../secondary/burgled_house/palettes/9.pal | 19 - data/tilesets/secondary/cable_club/palettes/0.pal | 19 - data/tilesets/secondary/cable_club/palettes/00.pal | 19 + data/tilesets/secondary/cable_club/palettes/01.pal | 19 + data/tilesets/secondary/cable_club/palettes/02.pal | 19 + data/tilesets/secondary/cable_club/palettes/03.pal | 19 + data/tilesets/secondary/cable_club/palettes/04.pal | 19 + data/tilesets/secondary/cable_club/palettes/05.pal | 19 + data/tilesets/secondary/cable_club/palettes/06.pal | 19 + data/tilesets/secondary/cable_club/palettes/07.pal | 19 + data/tilesets/secondary/cable_club/palettes/08.pal | 19 + data/tilesets/secondary/cable_club/palettes/09.pal | 19 + data/tilesets/secondary/cable_club/palettes/1.pal | 19 - data/tilesets/secondary/cable_club/palettes/2.pal | 19 - data/tilesets/secondary/cable_club/palettes/3.pal | 19 - data/tilesets/secondary/cable_club/palettes/4.pal | 19 - data/tilesets/secondary/cable_club/palettes/5.pal | 19 - data/tilesets/secondary/cable_club/palettes/6.pal | 19 - data/tilesets/secondary/cable_club/palettes/7.pal | 19 - data/tilesets/secondary/cable_club/palettes/8.pal | 19 - data/tilesets/secondary/cable_club/palettes/9.pal | 19 - data/tilesets/secondary/cave/palettes/0.pal | 19 - data/tilesets/secondary/cave/palettes/00.pal | 19 + data/tilesets/secondary/cave/palettes/01.pal | 19 + data/tilesets/secondary/cave/palettes/02.pal | 19 + data/tilesets/secondary/cave/palettes/03.pal | 19 + data/tilesets/secondary/cave/palettes/04.pal | 19 + data/tilesets/secondary/cave/palettes/05.pal | 19 + data/tilesets/secondary/cave/palettes/06.pal | 19 + data/tilesets/secondary/cave/palettes/07.pal | 19 + data/tilesets/secondary/cave/palettes/08.pal | 19 + data/tilesets/secondary/cave/palettes/09.pal | 19 + data/tilesets/secondary/cave/palettes/1.pal | 19 - data/tilesets/secondary/cave/palettes/2.pal | 19 - data/tilesets/secondary/cave/palettes/3.pal | 19 - data/tilesets/secondary/cave/palettes/4.pal | 19 - data/tilesets/secondary/cave/palettes/5.pal | 19 - data/tilesets/secondary/cave/palettes/6.pal | 19 - data/tilesets/secondary/cave/palettes/7.pal | 19 - data/tilesets/secondary/cave/palettes/8.pal | 19 - data/tilesets/secondary/cave/palettes/9.pal | 19 - .../tilesets/secondary/celadon_city/palettes/0.pal | 19 - .../secondary/celadon_city/palettes/00.pal | 19 + .../secondary/celadon_city/palettes/01.pal | 19 + .../secondary/celadon_city/palettes/02.pal | 19 + .../secondary/celadon_city/palettes/03.pal | 19 + .../secondary/celadon_city/palettes/04.pal | 19 + .../secondary/celadon_city/palettes/05.pal | 19 + .../secondary/celadon_city/palettes/06.pal | 19 + .../secondary/celadon_city/palettes/07.pal | 19 + .../secondary/celadon_city/palettes/08.pal | 19 + .../secondary/celadon_city/palettes/09.pal | 19 + .../tilesets/secondary/celadon_city/palettes/1.pal | 19 - .../tilesets/secondary/celadon_city/palettes/2.pal | 19 - .../tilesets/secondary/celadon_city/palettes/3.pal | 19 - .../tilesets/secondary/celadon_city/palettes/4.pal | 19 - .../tilesets/secondary/celadon_city/palettes/5.pal | 19 - .../tilesets/secondary/celadon_city/palettes/6.pal | 19 - .../tilesets/secondary/celadon_city/palettes/7.pal | 19 - .../tilesets/secondary/celadon_city/palettes/8.pal | 19 - .../tilesets/secondary/celadon_city/palettes/9.pal | 19 - data/tilesets/secondary/celadon_gym/palettes/0.pal | 19 - .../tilesets/secondary/celadon_gym/palettes/00.pal | 19 + .../tilesets/secondary/celadon_gym/palettes/01.pal | 19 + .../tilesets/secondary/celadon_gym/palettes/02.pal | 19 + .../tilesets/secondary/celadon_gym/palettes/03.pal | 19 + .../tilesets/secondary/celadon_gym/palettes/04.pal | 19 + .../tilesets/secondary/celadon_gym/palettes/05.pal | 19 + .../tilesets/secondary/celadon_gym/palettes/06.pal | 19 + .../tilesets/secondary/celadon_gym/palettes/07.pal | 19 + .../tilesets/secondary/celadon_gym/palettes/08.pal | 19 + .../tilesets/secondary/celadon_gym/palettes/09.pal | 19 + data/tilesets/secondary/celadon_gym/palettes/1.pal | 19 - data/tilesets/secondary/celadon_gym/palettes/2.pal | 19 - data/tilesets/secondary/celadon_gym/palettes/3.pal | 19 - data/tilesets/secondary/celadon_gym/palettes/4.pal | 19 - data/tilesets/secondary/celadon_gym/palettes/5.pal | 19 - data/tilesets/secondary/celadon_gym/palettes/6.pal | 19 - data/tilesets/secondary/celadon_gym/palettes/7.pal | 19 - data/tilesets/secondary/celadon_gym/palettes/8.pal | 19 - data/tilesets/secondary/celadon_gym/palettes/9.pal | 19 - .../secondary/cerulean_cave/palettes/0.pal | 19 - .../secondary/cerulean_cave/palettes/00.pal | 19 + .../secondary/cerulean_cave/palettes/01.pal | 19 + .../secondary/cerulean_cave/palettes/02.pal | 19 + .../secondary/cerulean_cave/palettes/03.pal | 19 + .../secondary/cerulean_cave/palettes/04.pal | 19 + .../secondary/cerulean_cave/palettes/05.pal | 19 + .../secondary/cerulean_cave/palettes/06.pal | 19 + .../secondary/cerulean_cave/palettes/07.pal | 19 + .../secondary/cerulean_cave/palettes/08.pal | 19 + .../secondary/cerulean_cave/palettes/09.pal | 19 + .../secondary/cerulean_cave/palettes/1.pal | 19 - .../secondary/cerulean_cave/palettes/2.pal | 19 - .../secondary/cerulean_cave/palettes/3.pal | 19 - .../secondary/cerulean_cave/palettes/4.pal | 19 - .../secondary/cerulean_cave/palettes/5.pal | 19 - .../secondary/cerulean_cave/palettes/6.pal | 19 - .../secondary/cerulean_cave/palettes/7.pal | 19 - .../secondary/cerulean_cave/palettes/8.pal | 19 - .../secondary/cerulean_cave/palettes/9.pal | 19 - .../secondary/cerulean_city/palettes/0.pal | 19 - .../secondary/cerulean_city/palettes/00.pal | 19 + .../secondary/cerulean_city/palettes/01.pal | 19 + .../secondary/cerulean_city/palettes/02.pal | 19 + .../secondary/cerulean_city/palettes/03.pal | 19 + .../secondary/cerulean_city/palettes/04.pal | 19 + .../secondary/cerulean_city/palettes/05.pal | 19 + .../secondary/cerulean_city/palettes/06.pal | 19 + .../secondary/cerulean_city/palettes/07.pal | 19 + .../secondary/cerulean_city/palettes/08.pal | 19 + .../secondary/cerulean_city/palettes/09.pal | 19 + .../secondary/cerulean_city/palettes/1.pal | 19 - .../secondary/cerulean_city/palettes/2.pal | 19 - .../secondary/cerulean_city/palettes/3.pal | 19 - .../secondary/cerulean_city/palettes/4.pal | 19 - .../secondary/cerulean_city/palettes/5.pal | 19 - .../secondary/cerulean_city/palettes/6.pal | 19 - .../secondary/cerulean_city/palettes/7.pal | 19 - .../secondary/cerulean_city/palettes/8.pal | 19 - .../secondary/cerulean_city/palettes/9.pal | 19 - .../tilesets/secondary/cerulean_gym/palettes/0.pal | 19 - .../secondary/cerulean_gym/palettes/00.pal | 19 + .../secondary/cerulean_gym/palettes/01.pal | 19 + .../secondary/cerulean_gym/palettes/02.pal | 19 + .../secondary/cerulean_gym/palettes/03.pal | 19 + .../secondary/cerulean_gym/palettes/04.pal | 19 + .../secondary/cerulean_gym/palettes/05.pal | 19 + .../secondary/cerulean_gym/palettes/06.pal | 19 + .../secondary/cerulean_gym/palettes/07.pal | 19 + .../secondary/cerulean_gym/palettes/08.pal | 19 + .../secondary/cerulean_gym/palettes/09.pal | 19 + .../tilesets/secondary/cerulean_gym/palettes/1.pal | 19 - .../tilesets/secondary/cerulean_gym/palettes/2.pal | 19 - .../tilesets/secondary/cerulean_gym/palettes/3.pal | 19 - .../tilesets/secondary/cerulean_gym/palettes/4.pal | 19 - .../tilesets/secondary/cerulean_gym/palettes/5.pal | 19 - .../tilesets/secondary/cerulean_gym/palettes/6.pal | 19 - .../tilesets/secondary/cerulean_gym/palettes/7.pal | 19 - .../tilesets/secondary/cerulean_gym/palettes/8.pal | 19 - .../tilesets/secondary/cerulean_gym/palettes/9.pal | 19 - .../tilesets/secondary/cinnabar_gym/palettes/0.pal | 19 - .../secondary/cinnabar_gym/palettes/00.pal | 19 + .../secondary/cinnabar_gym/palettes/01.pal | 19 + .../secondary/cinnabar_gym/palettes/02.pal | 19 + .../secondary/cinnabar_gym/palettes/03.pal | 19 + .../secondary/cinnabar_gym/palettes/04.pal | 19 + .../secondary/cinnabar_gym/palettes/05.pal | 19 + .../secondary/cinnabar_gym/palettes/06.pal | 19 + .../secondary/cinnabar_gym/palettes/07.pal | 19 + .../secondary/cinnabar_gym/palettes/08.pal | 19 + .../secondary/cinnabar_gym/palettes/09.pal | 19 + .../tilesets/secondary/cinnabar_gym/palettes/1.pal | 19 - .../tilesets/secondary/cinnabar_gym/palettes/2.pal | 19 - .../tilesets/secondary/cinnabar_gym/palettes/3.pal | 19 - .../tilesets/secondary/cinnabar_gym/palettes/4.pal | 19 - .../tilesets/secondary/cinnabar_gym/palettes/5.pal | 19 - .../tilesets/secondary/cinnabar_gym/palettes/6.pal | 19 - .../tilesets/secondary/cinnabar_gym/palettes/7.pal | 19 - .../tilesets/secondary/cinnabar_gym/palettes/8.pal | 19 - .../tilesets/secondary/cinnabar_gym/palettes/9.pal | 19 - .../secondary/cinnabar_island/palettes/0.pal | 19 - .../secondary/cinnabar_island/palettes/00.pal | 19 + .../secondary/cinnabar_island/palettes/01.pal | 19 + .../secondary/cinnabar_island/palettes/02.pal | 19 + .../secondary/cinnabar_island/palettes/03.pal | 19 + .../secondary/cinnabar_island/palettes/04.pal | 19 + .../secondary/cinnabar_island/palettes/05.pal | 19 + .../secondary/cinnabar_island/palettes/06.pal | 19 + .../secondary/cinnabar_island/palettes/07.pal | 19 + .../secondary/cinnabar_island/palettes/08.pal | 19 + .../secondary/cinnabar_island/palettes/09.pal | 19 + .../secondary/cinnabar_island/palettes/1.pal | 19 - .../secondary/cinnabar_island/palettes/2.pal | 19 - .../secondary/cinnabar_island/palettes/3.pal | 19 - .../secondary/cinnabar_island/palettes/4.pal | 19 - .../secondary/cinnabar_island/palettes/5.pal | 19 - .../secondary/cinnabar_island/palettes/6.pal | 19 - .../secondary/cinnabar_island/palettes/7.pal | 19 - .../secondary/cinnabar_island/palettes/8.pal | 19 - .../secondary/cinnabar_island/palettes/9.pal | 19 - .../tilesets/secondary/condominiums/palettes/0.pal | 19 - .../secondary/condominiums/palettes/00.pal | 19 + .../secondary/condominiums/palettes/01.pal | 19 + .../secondary/condominiums/palettes/02.pal | 19 + .../secondary/condominiums/palettes/03.pal | 19 + .../secondary/condominiums/palettes/04.pal | 19 + .../secondary/condominiums/palettes/05.pal | 19 + .../secondary/condominiums/palettes/06.pal | 19 + .../secondary/condominiums/palettes/07.pal | 19 + .../secondary/condominiums/palettes/08.pal | 19 + .../secondary/condominiums/palettes/09.pal | 19 + .../tilesets/secondary/condominiums/palettes/1.pal | 19 - .../tilesets/secondary/condominiums/palettes/2.pal | 19 - .../tilesets/secondary/condominiums/palettes/3.pal | 19 - .../tilesets/secondary/condominiums/palettes/4.pal | 19 - .../tilesets/secondary/condominiums/palettes/5.pal | 19 - .../tilesets/secondary/condominiums/palettes/6.pal | 19 - .../tilesets/secondary/condominiums/palettes/7.pal | 19 - .../tilesets/secondary/condominiums/palettes/8.pal | 19 - .../tilesets/secondary/condominiums/palettes/9.pal | 19 - .../secondary/department_store/palettes/0.pal | 19 - .../secondary/department_store/palettes/00.pal | 19 + .../secondary/department_store/palettes/01.pal | 19 + .../secondary/department_store/palettes/02.pal | 19 + .../secondary/department_store/palettes/03.pal | 19 + .../secondary/department_store/palettes/04.pal | 19 + .../secondary/department_store/palettes/05.pal | 19 + .../secondary/department_store/palettes/06.pal | 19 + .../secondary/department_store/palettes/07.pal | 19 + .../secondary/department_store/palettes/08.pal | 19 + .../secondary/department_store/palettes/09.pal | 19 + .../secondary/department_store/palettes/1.pal | 19 - .../secondary/department_store/palettes/2.pal | 19 - .../secondary/department_store/palettes/3.pal | 19 - .../secondary/department_store/palettes/4.pal | 19 - .../secondary/department_store/palettes/5.pal | 19 - .../secondary/department_store/palettes/6.pal | 19 - .../secondary/department_store/palettes/7.pal | 19 - .../secondary/department_store/palettes/8.pal | 19 - .../secondary/department_store/palettes/9.pal | 19 - .../secondary/digletts_cave/palettes/0.pal | 19 - .../secondary/digletts_cave/palettes/00.pal | 19 + .../secondary/digletts_cave/palettes/01.pal | 19 + .../secondary/digletts_cave/palettes/02.pal | 19 + .../secondary/digletts_cave/palettes/03.pal | 19 + .../secondary/digletts_cave/palettes/04.pal | 19 + .../secondary/digletts_cave/palettes/05.pal | 19 + .../secondary/digletts_cave/palettes/06.pal | 19 + .../secondary/digletts_cave/palettes/07.pal | 19 + .../secondary/digletts_cave/palettes/08.pal | 19 + .../secondary/digletts_cave/palettes/09.pal | 19 + .../secondary/digletts_cave/palettes/1.pal | 19 - .../secondary/digletts_cave/palettes/2.pal | 19 - .../secondary/digletts_cave/palettes/3.pal | 19 - .../secondary/digletts_cave/palettes/4.pal | 19 - .../secondary/digletts_cave/palettes/5.pal | 19 - .../secondary/digletts_cave/palettes/6.pal | 19 - .../secondary/digletts_cave/palettes/7.pal | 19 - .../secondary/digletts_cave/palettes/8.pal | 19 - .../secondary/digletts_cave/palettes/9.pal | 19 - data/tilesets/secondary/dummy1/palettes/0.pal | 19 - data/tilesets/secondary/dummy1/palettes/00.pal | 19 + data/tilesets/secondary/dummy1/palettes/01.pal | 19 + data/tilesets/secondary/dummy1/palettes/02.pal | 19 + data/tilesets/secondary/dummy1/palettes/03.pal | 19 + data/tilesets/secondary/dummy1/palettes/04.pal | 19 + data/tilesets/secondary/dummy1/palettes/05.pal | 19 + data/tilesets/secondary/dummy1/palettes/06.pal | 19 + data/tilesets/secondary/dummy1/palettes/07.pal | 19 + data/tilesets/secondary/dummy1/palettes/08.pal | 19 + data/tilesets/secondary/dummy1/palettes/09.pal | 19 + data/tilesets/secondary/dummy1/palettes/1.pal | 19 - data/tilesets/secondary/dummy1/palettes/2.pal | 19 - data/tilesets/secondary/dummy1/palettes/3.pal | 19 - data/tilesets/secondary/dummy1/palettes/4.pal | 19 - data/tilesets/secondary/dummy1/palettes/5.pal | 19 - data/tilesets/secondary/dummy1/palettes/6.pal | 19 - data/tilesets/secondary/dummy1/palettes/7.pal | 19 - data/tilesets/secondary/dummy1/palettes/8.pal | 19 - data/tilesets/secondary/dummy1/palettes/9.pal | 19 - data/tilesets/secondary/dummy2/palettes/0.pal | 19 - data/tilesets/secondary/dummy2/palettes/00.pal | 19 + data/tilesets/secondary/dummy2/palettes/01.pal | 19 + data/tilesets/secondary/dummy2/palettes/02.pal | 19 + data/tilesets/secondary/dummy2/palettes/03.pal | 19 + data/tilesets/secondary/dummy2/palettes/04.pal | 19 + data/tilesets/secondary/dummy2/palettes/05.pal | 19 + data/tilesets/secondary/dummy2/palettes/06.pal | 19 + data/tilesets/secondary/dummy2/palettes/07.pal | 19 + data/tilesets/secondary/dummy2/palettes/08.pal | 19 + data/tilesets/secondary/dummy2/palettes/09.pal | 19 + data/tilesets/secondary/dummy2/palettes/1.pal | 19 - data/tilesets/secondary/dummy2/palettes/2.pal | 19 - data/tilesets/secondary/dummy2/palettes/3.pal | 19 - data/tilesets/secondary/dummy2/palettes/4.pal | 19 - data/tilesets/secondary/dummy2/palettes/5.pal | 19 - data/tilesets/secondary/dummy2/palettes/6.pal | 19 - data/tilesets/secondary/dummy2/palettes/7.pal | 19 - data/tilesets/secondary/dummy2/palettes/8.pal | 19 - data/tilesets/secondary/dummy2/palettes/9.pal | 19 - data/tilesets/secondary/dummy3/palettes/0.pal | 19 - data/tilesets/secondary/dummy3/palettes/00.pal | 19 + data/tilesets/secondary/dummy3/palettes/01.pal | 19 + data/tilesets/secondary/dummy3/palettes/02.pal | 19 + data/tilesets/secondary/dummy3/palettes/03.pal | 19 + data/tilesets/secondary/dummy3/palettes/04.pal | 19 + data/tilesets/secondary/dummy3/palettes/05.pal | 19 + data/tilesets/secondary/dummy3/palettes/06.pal | 19 + data/tilesets/secondary/dummy3/palettes/07.pal | 19 + data/tilesets/secondary/dummy3/palettes/08.pal | 19 + data/tilesets/secondary/dummy3/palettes/09.pal | 19 + data/tilesets/secondary/dummy3/palettes/1.pal | 19 - data/tilesets/secondary/dummy3/palettes/2.pal | 19 - data/tilesets/secondary/dummy3/palettes/3.pal | 19 - data/tilesets/secondary/dummy3/palettes/4.pal | 19 - data/tilesets/secondary/dummy3/palettes/5.pal | 19 - data/tilesets/secondary/dummy3/palettes/6.pal | 19 - data/tilesets/secondary/dummy3/palettes/7.pal | 19 - data/tilesets/secondary/dummy3/palettes/8.pal | 19 - data/tilesets/secondary/dummy3/palettes/9.pal | 19 - data/tilesets/secondary/dummy4/palettes/0.pal | 19 - data/tilesets/secondary/dummy4/palettes/00.pal | 19 + data/tilesets/secondary/dummy4/palettes/01.pal | 19 + data/tilesets/secondary/dummy4/palettes/02.pal | 19 + data/tilesets/secondary/dummy4/palettes/03.pal | 19 + data/tilesets/secondary/dummy4/palettes/04.pal | 19 + data/tilesets/secondary/dummy4/palettes/05.pal | 19 + data/tilesets/secondary/dummy4/palettes/06.pal | 19 + data/tilesets/secondary/dummy4/palettes/07.pal | 19 + data/tilesets/secondary/dummy4/palettes/08.pal | 19 + data/tilesets/secondary/dummy4/palettes/09.pal | 19 + data/tilesets/secondary/dummy4/palettes/1.pal | 19 - data/tilesets/secondary/dummy4/palettes/2.pal | 19 - data/tilesets/secondary/dummy4/palettes/3.pal | 19 - data/tilesets/secondary/dummy4/palettes/4.pal | 19 - data/tilesets/secondary/dummy4/palettes/5.pal | 19 - data/tilesets/secondary/dummy4/palettes/6.pal | 19 - data/tilesets/secondary/dummy4/palettes/7.pal | 19 - data/tilesets/secondary/dummy4/palettes/8.pal | 19 - data/tilesets/secondary/dummy4/palettes/9.pal | 19 - .../secondary/fan_club_daycare/palettes/0.pal | 19 - .../secondary/fan_club_daycare/palettes/00.pal | 19 + .../secondary/fan_club_daycare/palettes/01.pal | 19 + .../secondary/fan_club_daycare/palettes/02.pal | 19 + .../secondary/fan_club_daycare/palettes/03.pal | 19 + .../secondary/fan_club_daycare/palettes/04.pal | 19 + .../secondary/fan_club_daycare/palettes/05.pal | 19 + .../secondary/fan_club_daycare/palettes/06.pal | 19 + .../secondary/fan_club_daycare/palettes/07.pal | 19 + .../secondary/fan_club_daycare/palettes/08.pal | 19 + .../secondary/fan_club_daycare/palettes/09.pal | 19 + .../secondary/fan_club_daycare/palettes/1.pal | 19 - .../secondary/fan_club_daycare/palettes/2.pal | 19 - .../secondary/fan_club_daycare/palettes/3.pal | 19 - .../secondary/fan_club_daycare/palettes/4.pal | 19 - .../secondary/fan_club_daycare/palettes/5.pal | 19 - .../secondary/fan_club_daycare/palettes/6.pal | 19 - .../secondary/fan_club_daycare/palettes/7.pal | 19 - .../secondary/fan_club_daycare/palettes/8.pal | 19 - .../secondary/fan_club_daycare/palettes/9.pal | 19 - .../tilesets/secondary/fuchsia_city/palettes/0.pal | 19 - .../secondary/fuchsia_city/palettes/00.pal | 19 + .../secondary/fuchsia_city/palettes/01.pal | 19 + .../secondary/fuchsia_city/palettes/02.pal | 19 + .../secondary/fuchsia_city/palettes/03.pal | 19 + .../secondary/fuchsia_city/palettes/04.pal | 19 + .../secondary/fuchsia_city/palettes/05.pal | 19 + .../secondary/fuchsia_city/palettes/06.pal | 19 + .../secondary/fuchsia_city/palettes/07.pal | 19 + .../secondary/fuchsia_city/palettes/08.pal | 19 + .../secondary/fuchsia_city/palettes/09.pal | 19 + .../tilesets/secondary/fuchsia_city/palettes/1.pal | 19 - .../tilesets/secondary/fuchsia_city/palettes/2.pal | 19 - .../tilesets/secondary/fuchsia_city/palettes/3.pal | 19 - .../tilesets/secondary/fuchsia_city/palettes/4.pal | 19 - .../tilesets/secondary/fuchsia_city/palettes/5.pal | 19 - .../tilesets/secondary/fuchsia_city/palettes/6.pal | 19 - .../tilesets/secondary/fuchsia_city/palettes/7.pal | 19 - .../tilesets/secondary/fuchsia_city/palettes/8.pal | 19 - .../tilesets/secondary/fuchsia_city/palettes/9.pal | 19 - data/tilesets/secondary/fuchsia_gym/palettes/0.pal | 19 - .../tilesets/secondary/fuchsia_gym/palettes/00.pal | 19 + .../tilesets/secondary/fuchsia_gym/palettes/01.pal | 19 + .../tilesets/secondary/fuchsia_gym/palettes/02.pal | 19 + .../tilesets/secondary/fuchsia_gym/palettes/03.pal | 19 + .../tilesets/secondary/fuchsia_gym/palettes/04.pal | 19 + .../tilesets/secondary/fuchsia_gym/palettes/05.pal | 19 + .../tilesets/secondary/fuchsia_gym/palettes/06.pal | 19 + .../tilesets/secondary/fuchsia_gym/palettes/07.pal | 19 + .../tilesets/secondary/fuchsia_gym/palettes/08.pal | 19 + .../tilesets/secondary/fuchsia_gym/palettes/09.pal | 19 + data/tilesets/secondary/fuchsia_gym/palettes/1.pal | 19 - data/tilesets/secondary/fuchsia_gym/palettes/2.pal | 19 - data/tilesets/secondary/fuchsia_gym/palettes/3.pal | 19 - data/tilesets/secondary/fuchsia_gym/palettes/4.pal | 19 - data/tilesets/secondary/fuchsia_gym/palettes/5.pal | 19 - data/tilesets/secondary/fuchsia_gym/palettes/6.pal | 19 - data/tilesets/secondary/fuchsia_gym/palettes/7.pal | 19 - data/tilesets/secondary/fuchsia_gym/palettes/8.pal | 19 - data/tilesets/secondary/fuchsia_gym/palettes/9.pal | 19 - data/tilesets/secondary/game_corner/palettes/0.pal | 19 - .../tilesets/secondary/game_corner/palettes/00.pal | 19 + .../tilesets/secondary/game_corner/palettes/01.pal | 19 + .../tilesets/secondary/game_corner/palettes/02.pal | 19 + .../tilesets/secondary/game_corner/palettes/03.pal | 19 + .../tilesets/secondary/game_corner/palettes/04.pal | 19 + .../tilesets/secondary/game_corner/palettes/05.pal | 19 + .../tilesets/secondary/game_corner/palettes/06.pal | 19 + .../tilesets/secondary/game_corner/palettes/07.pal | 19 + .../tilesets/secondary/game_corner/palettes/08.pal | 19 + .../tilesets/secondary/game_corner/palettes/09.pal | 19 + data/tilesets/secondary/game_corner/palettes/1.pal | 19 - data/tilesets/secondary/game_corner/palettes/2.pal | 19 - data/tilesets/secondary/game_corner/palettes/3.pal | 19 - data/tilesets/secondary/game_corner/palettes/4.pal | 19 - data/tilesets/secondary/game_corner/palettes/5.pal | 19 - data/tilesets/secondary/game_corner/palettes/6.pal | 19 - data/tilesets/secondary/game_corner/palettes/7.pal | 19 - data/tilesets/secondary/game_corner/palettes/8.pal | 19 - data/tilesets/secondary/game_corner/palettes/9.pal | 19 - .../secondary/generic_building1/palettes/0.pal | 19 - .../secondary/generic_building1/palettes/00.pal | 19 + .../secondary/generic_building1/palettes/01.pal | 19 + .../secondary/generic_building1/palettes/02.pal | 19 + .../secondary/generic_building1/palettes/03.pal | 19 + .../secondary/generic_building1/palettes/04.pal | 19 + .../secondary/generic_building1/palettes/05.pal | 19 + .../secondary/generic_building1/palettes/06.pal | 19 + .../secondary/generic_building1/palettes/07.pal | 19 + .../secondary/generic_building1/palettes/08.pal | 19 + .../secondary/generic_building1/palettes/09.pal | 19 + .../secondary/generic_building1/palettes/1.pal | 19 - .../secondary/generic_building1/palettes/2.pal | 19 - .../secondary/generic_building1/palettes/3.pal | 19 - .../secondary/generic_building1/palettes/4.pal | 19 - .../secondary/generic_building1/palettes/5.pal | 19 - .../secondary/generic_building1/palettes/6.pal | 19 - .../secondary/generic_building1/palettes/7.pal | 19 - .../secondary/generic_building1/palettes/8.pal | 19 - .../secondary/generic_building1/palettes/9.pal | 19 - .../secondary/generic_building2/palettes/0.pal | 19 - .../secondary/generic_building2/palettes/00.pal | 19 + .../secondary/generic_building2/palettes/01.pal | 19 + .../secondary/generic_building2/palettes/02.pal | 19 + .../secondary/generic_building2/palettes/03.pal | 19 + .../secondary/generic_building2/palettes/04.pal | 19 + .../secondary/generic_building2/palettes/05.pal | 19 + .../secondary/generic_building2/palettes/06.pal | 19 + .../secondary/generic_building2/palettes/07.pal | 19 + .../secondary/generic_building2/palettes/08.pal | 19 + .../secondary/generic_building2/palettes/09.pal | 19 + .../secondary/generic_building2/palettes/1.pal | 19 - .../secondary/generic_building2/palettes/2.pal | 19 - .../secondary/generic_building2/palettes/3.pal | 19 - .../secondary/generic_building2/palettes/4.pal | 19 - .../secondary/generic_building2/palettes/5.pal | 19 - .../secondary/generic_building2/palettes/6.pal | 19 - .../secondary/generic_building2/palettes/7.pal | 19 - .../secondary/generic_building2/palettes/8.pal | 19 - .../secondary/generic_building2/palettes/9.pal | 19 - .../tilesets/secondary/hall_of_fame/palettes/0.pal | 19 - .../secondary/hall_of_fame/palettes/00.pal | 19 + .../secondary/hall_of_fame/palettes/01.pal | 19 + .../secondary/hall_of_fame/palettes/02.pal | 19 + .../secondary/hall_of_fame/palettes/03.pal | 19 + .../secondary/hall_of_fame/palettes/04.pal | 19 + .../secondary/hall_of_fame/palettes/05.pal | 19 + .../secondary/hall_of_fame/palettes/06.pal | 19 + .../secondary/hall_of_fame/palettes/07.pal | 19 + .../secondary/hall_of_fame/palettes/08.pal | 19 + .../secondary/hall_of_fame/palettes/09.pal | 19 + .../tilesets/secondary/hall_of_fame/palettes/1.pal | 19 - .../tilesets/secondary/hall_of_fame/palettes/2.pal | 19 - .../tilesets/secondary/hall_of_fame/palettes/3.pal | 19 - .../tilesets/secondary/hall_of_fame/palettes/4.pal | 19 - .../tilesets/secondary/hall_of_fame/palettes/5.pal | 19 - .../tilesets/secondary/hall_of_fame/palettes/6.pal | 19 - .../tilesets/secondary/hall_of_fame/palettes/7.pal | 19 - .../tilesets/secondary/hall_of_fame/palettes/8.pal | 19 - .../tilesets/secondary/hall_of_fame/palettes/9.pal | 19 - .../secondary/hoenn_building/palettes/0.pal | 19 - .../secondary/hoenn_building/palettes/00.pal | 19 + .../secondary/hoenn_building/palettes/01.pal | 19 + .../secondary/hoenn_building/palettes/02.pal | 19 + .../secondary/hoenn_building/palettes/03.pal | 19 + .../secondary/hoenn_building/palettes/04.pal | 19 + .../secondary/hoenn_building/palettes/05.pal | 19 + .../secondary/hoenn_building/palettes/06.pal | 19 + .../secondary/hoenn_building/palettes/07.pal | 19 + .../secondary/hoenn_building/palettes/08.pal | 19 + .../secondary/hoenn_building/palettes/09.pal | 19 + .../secondary/hoenn_building/palettes/1.pal | 19 - .../secondary/hoenn_building/palettes/2.pal | 19 - .../secondary/hoenn_building/palettes/3.pal | 19 - .../secondary/hoenn_building/palettes/4.pal | 19 - .../secondary/hoenn_building/palettes/5.pal | 19 - .../secondary/hoenn_building/palettes/6.pal | 19 - .../secondary/hoenn_building/palettes/7.pal | 19 - .../secondary/hoenn_building/palettes/8.pal | 19 - .../secondary/hoenn_building/palettes/9.pal | 19 - .../secondary/indigo_plateau/palettes/0.pal | 19 - .../secondary/indigo_plateau/palettes/00.pal | 19 + .../secondary/indigo_plateau/palettes/01.pal | 19 + .../secondary/indigo_plateau/palettes/02.pal | 19 + .../secondary/indigo_plateau/palettes/03.pal | 19 + .../secondary/indigo_plateau/palettes/04.pal | 19 + .../secondary/indigo_plateau/palettes/05.pal | 19 + .../secondary/indigo_plateau/palettes/06.pal | 19 + .../secondary/indigo_plateau/palettes/07.pal | 19 + .../secondary/indigo_plateau/palettes/08.pal | 19 + .../secondary/indigo_plateau/palettes/09.pal | 19 + .../secondary/indigo_plateau/palettes/1.pal | 19 - .../secondary/indigo_plateau/palettes/2.pal | 19 - .../secondary/indigo_plateau/palettes/3.pal | 19 - .../secondary/indigo_plateau/palettes/4.pal | 19 - .../secondary/indigo_plateau/palettes/5.pal | 19 - .../secondary/indigo_plateau/palettes/6.pal | 19 - .../secondary/indigo_plateau/palettes/7.pal | 19 - .../secondary/indigo_plateau/palettes/8.pal | 19 - .../secondary/indigo_plateau/palettes/9.pal | 19 - .../secondary/island_harbor/palettes/0.pal | 19 - .../secondary/island_harbor/palettes/00.pal | 19 + .../secondary/island_harbor/palettes/01.pal | 19 + .../secondary/island_harbor/palettes/02.pal | 19 + .../secondary/island_harbor/palettes/03.pal | 19 + .../secondary/island_harbor/palettes/04.pal | 19 + .../secondary/island_harbor/palettes/05.pal | 19 + .../secondary/island_harbor/palettes/06.pal | 19 + .../secondary/island_harbor/palettes/07.pal | 19 + .../secondary/island_harbor/palettes/08.pal | 19 + .../secondary/island_harbor/palettes/09.pal | 19 + .../secondary/island_harbor/palettes/1.pal | 19 - .../secondary/island_harbor/palettes/2.pal | 19 - .../secondary/island_harbor/palettes/3.pal | 19 - .../secondary/island_harbor/palettes/4.pal | 19 - .../secondary/island_harbor/palettes/5.pal | 19 - .../secondary/island_harbor/palettes/6.pal | 19 - .../secondary/island_harbor/palettes/7.pal | 19 - .../secondary/island_harbor/palettes/8.pal | 19 - .../secondary/island_harbor/palettes/9.pal | 19 - data/tilesets/secondary/lab/palettes/0.pal | 19 - data/tilesets/secondary/lab/palettes/00.pal | 19 + data/tilesets/secondary/lab/palettes/01.pal | 19 + data/tilesets/secondary/lab/palettes/02.pal | 19 + data/tilesets/secondary/lab/palettes/03.pal | 19 + data/tilesets/secondary/lab/palettes/04.pal | 19 + data/tilesets/secondary/lab/palettes/05.pal | 19 + data/tilesets/secondary/lab/palettes/06.pal | 19 + data/tilesets/secondary/lab/palettes/07.pal | 19 + data/tilesets/secondary/lab/palettes/08.pal | 19 + data/tilesets/secondary/lab/palettes/09.pal | 19 + data/tilesets/secondary/lab/palettes/1.pal | 19 - data/tilesets/secondary/lab/palettes/2.pal | 19 - data/tilesets/secondary/lab/palettes/3.pal | 19 - data/tilesets/secondary/lab/palettes/4.pal | 19 - data/tilesets/secondary/lab/palettes/5.pal | 19 - data/tilesets/secondary/lab/palettes/6.pal | 19 - data/tilesets/secondary/lab/palettes/7.pal | 19 - data/tilesets/secondary/lab/palettes/8.pal | 19 - data/tilesets/secondary/lab/palettes/9.pal | 19 - .../secondary/lavender_town/palettes/0.pal | 19 - .../secondary/lavender_town/palettes/00.pal | 19 + .../secondary/lavender_town/palettes/01.pal | 19 + .../secondary/lavender_town/palettes/02.pal | 19 + .../secondary/lavender_town/palettes/03.pal | 19 + .../secondary/lavender_town/palettes/04.pal | 19 + .../secondary/lavender_town/palettes/05.pal | 19 + .../secondary/lavender_town/palettes/06.pal | 19 + .../secondary/lavender_town/palettes/07.pal | 19 + .../secondary/lavender_town/palettes/08.pal | 19 + .../secondary/lavender_town/palettes/09.pal | 19 + .../secondary/lavender_town/palettes/1.pal | 19 - .../secondary/lavender_town/palettes/2.pal | 19 - .../secondary/lavender_town/palettes/3.pal | 19 - .../secondary/lavender_town/palettes/4.pal | 19 - .../secondary/lavender_town/palettes/5.pal | 19 - .../secondary/lavender_town/palettes/6.pal | 19 - .../secondary/lavender_town/palettes/7.pal | 19 - .../secondary/lavender_town/palettes/8.pal | 19 - .../secondary/lavender_town/palettes/9.pal | 19 - data/tilesets/secondary/mart/palettes/0.pal | 19 - data/tilesets/secondary/mart/palettes/00.pal | 19 + data/tilesets/secondary/mart/palettes/01.pal | 19 + data/tilesets/secondary/mart/palettes/02.pal | 19 + data/tilesets/secondary/mart/palettes/03.pal | 19 + data/tilesets/secondary/mart/palettes/04.pal | 19 + data/tilesets/secondary/mart/palettes/05.pal | 19 + data/tilesets/secondary/mart/palettes/06.pal | 19 + data/tilesets/secondary/mart/palettes/07.pal | 19 + data/tilesets/secondary/mart/palettes/08.pal | 19 + data/tilesets/secondary/mart/palettes/09.pal | 19 + data/tilesets/secondary/mart/palettes/1.pal | 19 - data/tilesets/secondary/mart/palettes/2.pal | 19 - data/tilesets/secondary/mart/palettes/3.pal | 19 - data/tilesets/secondary/mart/palettes/4.pal | 19 - data/tilesets/secondary/mart/palettes/5.pal | 19 - data/tilesets/secondary/mart/palettes/6.pal | 19 - data/tilesets/secondary/mart/palettes/7.pal | 19 - data/tilesets/secondary/mart/palettes/8.pal | 19 - data/tilesets/secondary/mart/palettes/9.pal | 19 - data/tilesets/secondary/mt_ember/palettes/0.pal | 19 - data/tilesets/secondary/mt_ember/palettes/00.pal | 19 + data/tilesets/secondary/mt_ember/palettes/01.pal | 19 + data/tilesets/secondary/mt_ember/palettes/02.pal | 19 + data/tilesets/secondary/mt_ember/palettes/03.pal | 19 + data/tilesets/secondary/mt_ember/palettes/04.pal | 19 + data/tilesets/secondary/mt_ember/palettes/05.pal | 19 + data/tilesets/secondary/mt_ember/palettes/06.pal | 19 + data/tilesets/secondary/mt_ember/palettes/07.pal | 19 + data/tilesets/secondary/mt_ember/palettes/08.pal | 19 + data/tilesets/secondary/mt_ember/palettes/09.pal | 19 + data/tilesets/secondary/mt_ember/palettes/1.pal | 19 - data/tilesets/secondary/mt_ember/palettes/2.pal | 19 - data/tilesets/secondary/mt_ember/palettes/3.pal | 19 - data/tilesets/secondary/mt_ember/palettes/4.pal | 19 - data/tilesets/secondary/mt_ember/palettes/5.pal | 19 - data/tilesets/secondary/mt_ember/palettes/6.pal | 19 - data/tilesets/secondary/mt_ember/palettes/7.pal | 19 - data/tilesets/secondary/mt_ember/palettes/8.pal | 19 - data/tilesets/secondary/mt_ember/palettes/9.pal | 19 - data/tilesets/secondary/museum/palettes/0.pal | 19 - data/tilesets/secondary/museum/palettes/00.pal | 19 + data/tilesets/secondary/museum/palettes/01.pal | 19 + data/tilesets/secondary/museum/palettes/02.pal | 19 + data/tilesets/secondary/museum/palettes/03.pal | 19 + data/tilesets/secondary/museum/palettes/04.pal | 19 + data/tilesets/secondary/museum/palettes/05.pal | 19 + data/tilesets/secondary/museum/palettes/06.pal | 19 + data/tilesets/secondary/museum/palettes/07.pal | 19 + data/tilesets/secondary/museum/palettes/08.pal | 19 + data/tilesets/secondary/museum/palettes/09.pal | 19 + data/tilesets/secondary/museum/palettes/1.pal | 19 - data/tilesets/secondary/museum/palettes/2.pal | 19 - data/tilesets/secondary/museum/palettes/3.pal | 19 - data/tilesets/secondary/museum/palettes/4.pal | 19 - data/tilesets/secondary/museum/palettes/5.pal | 19 - data/tilesets/secondary/museum/palettes/6.pal | 19 - data/tilesets/secondary/museum/palettes/7.pal | 19 - data/tilesets/secondary/museum/palettes/8.pal | 19 - data/tilesets/secondary/museum/palettes/9.pal | 19 - data/tilesets/secondary/navel_rock/palettes/0.pal | 19 - data/tilesets/secondary/navel_rock/palettes/00.pal | 19 + data/tilesets/secondary/navel_rock/palettes/01.pal | 19 + data/tilesets/secondary/navel_rock/palettes/02.pal | 19 + data/tilesets/secondary/navel_rock/palettes/03.pal | 19 + data/tilesets/secondary/navel_rock/palettes/04.pal | 19 + data/tilesets/secondary/navel_rock/palettes/05.pal | 19 + data/tilesets/secondary/navel_rock/palettes/06.pal | 19 + data/tilesets/secondary/navel_rock/palettes/07.pal | 19 + data/tilesets/secondary/navel_rock/palettes/08.pal | 19 + data/tilesets/secondary/navel_rock/palettes/09.pal | 19 + data/tilesets/secondary/navel_rock/palettes/1.pal | 19 - data/tilesets/secondary/navel_rock/palettes/2.pal | 19 - data/tilesets/secondary/navel_rock/palettes/3.pal | 19 - data/tilesets/secondary/navel_rock/palettes/4.pal | 19 - data/tilesets/secondary/navel_rock/palettes/5.pal | 19 - data/tilesets/secondary/navel_rock/palettes/6.pal | 19 - data/tilesets/secondary/navel_rock/palettes/7.pal | 19 - data/tilesets/secondary/navel_rock/palettes/8.pal | 19 - data/tilesets/secondary/navel_rock/palettes/9.pal | 19 - data/tilesets/secondary/pallet_town/palettes/0.pal | 19 - .../tilesets/secondary/pallet_town/palettes/00.pal | 19 + .../tilesets/secondary/pallet_town/palettes/01.pal | 19 + .../tilesets/secondary/pallet_town/palettes/02.pal | 19 + .../tilesets/secondary/pallet_town/palettes/03.pal | 19 + .../tilesets/secondary/pallet_town/palettes/04.pal | 19 + .../tilesets/secondary/pallet_town/palettes/05.pal | 19 + .../tilesets/secondary/pallet_town/palettes/06.pal | 19 + .../tilesets/secondary/pallet_town/palettes/07.pal | 19 + .../tilesets/secondary/pallet_town/palettes/08.pal | 19 + .../tilesets/secondary/pallet_town/palettes/09.pal | 19 + data/tilesets/secondary/pallet_town/palettes/1.pal | 19 - data/tilesets/secondary/pallet_town/palettes/2.pal | 19 - data/tilesets/secondary/pallet_town/palettes/3.pal | 19 - data/tilesets/secondary/pallet_town/palettes/4.pal | 19 - data/tilesets/secondary/pallet_town/palettes/5.pal | 19 - data/tilesets/secondary/pallet_town/palettes/6.pal | 19 - data/tilesets/secondary/pallet_town/palettes/7.pal | 19 - data/tilesets/secondary/pallet_town/palettes/8.pal | 19 - data/tilesets/secondary/pallet_town/palettes/9.pal | 19 - data/tilesets/secondary/pewter_city/palettes/0.pal | 19 - .../tilesets/secondary/pewter_city/palettes/00.pal | 19 + .../tilesets/secondary/pewter_city/palettes/01.pal | 19 + .../tilesets/secondary/pewter_city/palettes/02.pal | 19 + .../tilesets/secondary/pewter_city/palettes/03.pal | 19 + .../tilesets/secondary/pewter_city/palettes/04.pal | 19 + .../tilesets/secondary/pewter_city/palettes/05.pal | 19 + .../tilesets/secondary/pewter_city/palettes/06.pal | 19 + .../tilesets/secondary/pewter_city/palettes/07.pal | 19 + .../tilesets/secondary/pewter_city/palettes/08.pal | 19 + .../tilesets/secondary/pewter_city/palettes/09.pal | 19 + data/tilesets/secondary/pewter_city/palettes/1.pal | 19 - data/tilesets/secondary/pewter_city/palettes/2.pal | 19 - data/tilesets/secondary/pewter_city/palettes/3.pal | 19 - data/tilesets/secondary/pewter_city/palettes/4.pal | 19 - data/tilesets/secondary/pewter_city/palettes/5.pal | 19 - data/tilesets/secondary/pewter_city/palettes/6.pal | 19 - data/tilesets/secondary/pewter_city/palettes/7.pal | 19 - data/tilesets/secondary/pewter_city/palettes/8.pal | 19 - data/tilesets/secondary/pewter_city/palettes/9.pal | 19 - data/tilesets/secondary/pewter_gym/palettes/0.pal | 19 - data/tilesets/secondary/pewter_gym/palettes/00.pal | 19 + data/tilesets/secondary/pewter_gym/palettes/01.pal | 19 + data/tilesets/secondary/pewter_gym/palettes/02.pal | 19 + data/tilesets/secondary/pewter_gym/palettes/03.pal | 19 + data/tilesets/secondary/pewter_gym/palettes/04.pal | 19 + data/tilesets/secondary/pewter_gym/palettes/05.pal | 19 + data/tilesets/secondary/pewter_gym/palettes/06.pal | 19 + data/tilesets/secondary/pewter_gym/palettes/07.pal | 19 + data/tilesets/secondary/pewter_gym/palettes/08.pal | 19 + data/tilesets/secondary/pewter_gym/palettes/09.pal | 19 + data/tilesets/secondary/pewter_gym/palettes/1.pal | 19 - data/tilesets/secondary/pewter_gym/palettes/2.pal | 19 - data/tilesets/secondary/pewter_gym/palettes/3.pal | 19 - data/tilesets/secondary/pewter_gym/palettes/4.pal | 19 - data/tilesets/secondary/pewter_gym/palettes/5.pal | 19 - data/tilesets/secondary/pewter_gym/palettes/6.pal | 19 - data/tilesets/secondary/pewter_gym/palettes/7.pal | 19 - data/tilesets/secondary/pewter_gym/palettes/8.pal | 19 - data/tilesets/secondary/pewter_gym/palettes/9.pal | 19 - .../secondary/pokemon_center/palettes/0.pal | 19 - .../secondary/pokemon_center/palettes/00.pal | 19 + .../secondary/pokemon_center/palettes/01.pal | 19 + .../secondary/pokemon_center/palettes/02.pal | 19 + .../secondary/pokemon_center/palettes/03.pal | 19 + .../secondary/pokemon_center/palettes/04.pal | 19 + .../secondary/pokemon_center/palettes/05.pal | 19 + .../secondary/pokemon_center/palettes/06.pal | 19 + .../secondary/pokemon_center/palettes/07.pal | 19 + .../secondary/pokemon_center/palettes/08.pal | 19 + .../secondary/pokemon_center/palettes/09.pal | 19 + .../secondary/pokemon_center/palettes/1.pal | 19 - .../secondary/pokemon_center/palettes/2.pal | 19 - .../secondary/pokemon_center/palettes/3.pal | 19 - .../secondary/pokemon_center/palettes/4.pal | 19 - .../secondary/pokemon_center/palettes/5.pal | 19 - .../secondary/pokemon_center/palettes/6.pal | 19 - .../secondary/pokemon_center/palettes/7.pal | 19 - .../secondary/pokemon_center/palettes/8.pal | 19 - .../secondary/pokemon_center/palettes/9.pal | 19 - .../secondary/pokemon_league/palettes/0.pal | 19 - .../secondary/pokemon_league/palettes/00.pal | 19 + .../secondary/pokemon_league/palettes/01.pal | 19 + .../secondary/pokemon_league/palettes/02.pal | 19 + .../secondary/pokemon_league/palettes/03.pal | 19 + .../secondary/pokemon_league/palettes/04.pal | 19 + .../secondary/pokemon_league/palettes/05.pal | 19 + .../secondary/pokemon_league/palettes/06.pal | 19 + .../secondary/pokemon_league/palettes/07.pal | 19 + .../secondary/pokemon_league/palettes/08.pal | 19 + .../secondary/pokemon_league/palettes/09.pal | 19 + .../secondary/pokemon_league/palettes/1.pal | 19 - .../secondary/pokemon_league/palettes/2.pal | 19 - .../secondary/pokemon_league/palettes/3.pal | 19 - .../secondary/pokemon_league/palettes/4.pal | 19 - .../secondary/pokemon_league/palettes/5.pal | 19 - .../secondary/pokemon_league/palettes/6.pal | 19 - .../secondary/pokemon_league/palettes/7.pal | 19 - .../secondary/pokemon_league/palettes/8.pal | 19 - .../secondary/pokemon_league/palettes/9.pal | 19 - .../secondary/pokemon_mansion/palettes/0.pal | 19 - .../secondary/pokemon_mansion/palettes/00.pal | 19 + .../secondary/pokemon_mansion/palettes/01.pal | 19 + .../secondary/pokemon_mansion/palettes/02.pal | 19 + .../secondary/pokemon_mansion/palettes/03.pal | 19 + .../secondary/pokemon_mansion/palettes/04.pal | 19 + .../secondary/pokemon_mansion/palettes/05.pal | 19 + .../secondary/pokemon_mansion/palettes/06.pal | 19 + .../secondary/pokemon_mansion/palettes/07.pal | 19 + .../secondary/pokemon_mansion/palettes/08.pal | 19 + .../secondary/pokemon_mansion/palettes/09.pal | 19 + .../secondary/pokemon_mansion/palettes/1.pal | 19 - .../secondary/pokemon_mansion/palettes/2.pal | 19 - .../secondary/pokemon_mansion/palettes/3.pal | 19 - .../secondary/pokemon_mansion/palettes/4.pal | 19 - .../secondary/pokemon_mansion/palettes/5.pal | 19 - .../secondary/pokemon_mansion/palettes/6.pal | 19 - .../secondary/pokemon_mansion/palettes/7.pal | 19 - .../secondary/pokemon_mansion/palettes/8.pal | 19 - .../secondary/pokemon_mansion/palettes/9.pal | 19 - .../secondary/pokemon_tower/palettes/0.pal | 19 - .../secondary/pokemon_tower/palettes/00.pal | 19 + .../secondary/pokemon_tower/palettes/01.pal | 19 + .../secondary/pokemon_tower/palettes/02.pal | 19 + .../secondary/pokemon_tower/palettes/03.pal | 19 + .../secondary/pokemon_tower/palettes/04.pal | 19 + .../secondary/pokemon_tower/palettes/05.pal | 19 + .../secondary/pokemon_tower/palettes/06.pal | 19 + .../secondary/pokemon_tower/palettes/07.pal | 19 + .../secondary/pokemon_tower/palettes/08.pal | 19 + .../secondary/pokemon_tower/palettes/09.pal | 19 + .../secondary/pokemon_tower/palettes/1.pal | 19 - .../secondary/pokemon_tower/palettes/2.pal | 19 - .../secondary/pokemon_tower/palettes/3.pal | 19 - .../secondary/pokemon_tower/palettes/4.pal | 19 - .../secondary/pokemon_tower/palettes/5.pal | 19 - .../secondary/pokemon_tower/palettes/6.pal | 19 - .../secondary/pokemon_tower/palettes/7.pal | 19 - .../secondary/pokemon_tower/palettes/8.pal | 19 - .../secondary/pokemon_tower/palettes/9.pal | 19 - data/tilesets/secondary/power_plant/palettes/0.pal | 19 - .../tilesets/secondary/power_plant/palettes/00.pal | 19 + .../tilesets/secondary/power_plant/palettes/01.pal | 19 + .../tilesets/secondary/power_plant/palettes/02.pal | 19 + .../tilesets/secondary/power_plant/palettes/03.pal | 19 + .../tilesets/secondary/power_plant/palettes/04.pal | 19 + .../tilesets/secondary/power_plant/palettes/05.pal | 19 + .../tilesets/secondary/power_plant/palettes/06.pal | 19 + .../tilesets/secondary/power_plant/palettes/07.pal | 19 + .../tilesets/secondary/power_plant/palettes/08.pal | 19 + .../tilesets/secondary/power_plant/palettes/09.pal | 19 + data/tilesets/secondary/power_plant/palettes/1.pal | 19 - data/tilesets/secondary/power_plant/palettes/2.pal | 19 - data/tilesets/secondary/power_plant/palettes/3.pal | 19 - data/tilesets/secondary/power_plant/palettes/4.pal | 19 - data/tilesets/secondary/power_plant/palettes/5.pal | 19 - data/tilesets/secondary/power_plant/palettes/6.pal | 19 - data/tilesets/secondary/power_plant/palettes/7.pal | 19 - data/tilesets/secondary/power_plant/palettes/8.pal | 19 - data/tilesets/secondary/power_plant/palettes/9.pal | 19 - .../secondary/restaurant_hotel/palettes/0.pal | 19 - .../secondary/restaurant_hotel/palettes/00.pal | 19 + .../secondary/restaurant_hotel/palettes/01.pal | 19 + .../secondary/restaurant_hotel/palettes/02.pal | 19 + .../secondary/restaurant_hotel/palettes/03.pal | 19 + .../secondary/restaurant_hotel/palettes/04.pal | 19 + .../secondary/restaurant_hotel/palettes/05.pal | 19 + .../secondary/restaurant_hotel/palettes/06.pal | 19 + .../secondary/restaurant_hotel/palettes/07.pal | 19 + .../secondary/restaurant_hotel/palettes/08.pal | 19 + .../secondary/restaurant_hotel/palettes/09.pal | 19 + .../secondary/restaurant_hotel/palettes/1.pal | 19 - .../secondary/restaurant_hotel/palettes/2.pal | 19 - .../secondary/restaurant_hotel/palettes/3.pal | 19 - .../secondary/restaurant_hotel/palettes/4.pal | 19 - .../secondary/restaurant_hotel/palettes/5.pal | 19 - .../secondary/restaurant_hotel/palettes/6.pal | 19 - .../secondary/restaurant_hotel/palettes/7.pal | 19 - .../secondary/restaurant_hotel/palettes/8.pal | 19 - .../secondary/restaurant_hotel/palettes/9.pal | 19 - data/tilesets/secondary/rock_tunnel/palettes/0.pal | 19 - .../tilesets/secondary/rock_tunnel/palettes/00.pal | 19 + .../tilesets/secondary/rock_tunnel/palettes/01.pal | 19 + .../tilesets/secondary/rock_tunnel/palettes/02.pal | 19 + .../tilesets/secondary/rock_tunnel/palettes/03.pal | 19 + .../tilesets/secondary/rock_tunnel/palettes/04.pal | 19 + .../tilesets/secondary/rock_tunnel/palettes/05.pal | 19 + .../tilesets/secondary/rock_tunnel/palettes/06.pal | 19 + .../tilesets/secondary/rock_tunnel/palettes/07.pal | 19 + .../tilesets/secondary/rock_tunnel/palettes/08.pal | 19 + .../tilesets/secondary/rock_tunnel/palettes/09.pal | 19 + data/tilesets/secondary/rock_tunnel/palettes/1.pal | 19 - data/tilesets/secondary/rock_tunnel/palettes/2.pal | 19 - data/tilesets/secondary/rock_tunnel/palettes/3.pal | 19 - data/tilesets/secondary/rock_tunnel/palettes/4.pal | 19 - data/tilesets/secondary/rock_tunnel/palettes/5.pal | 19 - data/tilesets/secondary/rock_tunnel/palettes/6.pal | 19 - data/tilesets/secondary/rock_tunnel/palettes/7.pal | 19 - data/tilesets/secondary/rock_tunnel/palettes/8.pal | 19 - data/tilesets/secondary/rock_tunnel/palettes/9.pal | 19 - .../secondary/safari_zone_building/palettes/0.pal | 19 - .../secondary/safari_zone_building/palettes/00.pal | 19 + .../secondary/safari_zone_building/palettes/01.pal | 19 + .../secondary/safari_zone_building/palettes/02.pal | 19 + .../secondary/safari_zone_building/palettes/03.pal | 19 + .../secondary/safari_zone_building/palettes/04.pal | 19 + .../secondary/safari_zone_building/palettes/05.pal | 19 + .../secondary/safari_zone_building/palettes/06.pal | 19 + .../secondary/safari_zone_building/palettes/07.pal | 19 + .../secondary/safari_zone_building/palettes/08.pal | 19 + .../secondary/safari_zone_building/palettes/09.pal | 19 + .../secondary/safari_zone_building/palettes/1.pal | 19 - .../secondary/safari_zone_building/palettes/2.pal | 19 - .../secondary/safari_zone_building/palettes/3.pal | 19 - .../secondary/safari_zone_building/palettes/4.pal | 19 - .../secondary/safari_zone_building/palettes/5.pal | 19 - .../secondary/safari_zone_building/palettes/6.pal | 19 - .../secondary/safari_zone_building/palettes/7.pal | 19 - .../secondary/safari_zone_building/palettes/8.pal | 19 - .../secondary/safari_zone_building/palettes/9.pal | 19 - .../tilesets/secondary/saffron_city/palettes/0.pal | 19 - .../secondary/saffron_city/palettes/00.pal | 19 + .../secondary/saffron_city/palettes/01.pal | 19 + .../secondary/saffron_city/palettes/02.pal | 19 + .../secondary/saffron_city/palettes/03.pal | 19 + .../secondary/saffron_city/palettes/04.pal | 19 + .../secondary/saffron_city/palettes/05.pal | 19 + .../secondary/saffron_city/palettes/06.pal | 19 + .../secondary/saffron_city/palettes/07.pal | 19 + .../secondary/saffron_city/palettes/08.pal | 19 + .../secondary/saffron_city/palettes/09.pal | 19 + .../tilesets/secondary/saffron_city/palettes/1.pal | 19 - .../tilesets/secondary/saffron_city/palettes/2.pal | 19 - .../tilesets/secondary/saffron_city/palettes/3.pal | 19 - .../tilesets/secondary/saffron_city/palettes/4.pal | 19 - .../tilesets/secondary/saffron_city/palettes/5.pal | 19 - .../tilesets/secondary/saffron_city/palettes/6.pal | 19 - .../tilesets/secondary/saffron_city/palettes/7.pal | 19 - .../tilesets/secondary/saffron_city/palettes/8.pal | 19 - .../tilesets/secondary/saffron_city/palettes/9.pal | 19 - data/tilesets/secondary/saffron_gym/palettes/0.pal | 19 - .../tilesets/secondary/saffron_gym/palettes/00.pal | 19 + .../tilesets/secondary/saffron_gym/palettes/01.pal | 19 + .../tilesets/secondary/saffron_gym/palettes/02.pal | 19 + .../tilesets/secondary/saffron_gym/palettes/03.pal | 19 + .../tilesets/secondary/saffron_gym/palettes/04.pal | 19 + .../tilesets/secondary/saffron_gym/palettes/05.pal | 19 + .../tilesets/secondary/saffron_gym/palettes/06.pal | 19 + .../tilesets/secondary/saffron_gym/palettes/07.pal | 19 + .../tilesets/secondary/saffron_gym/palettes/08.pal | 19 + .../tilesets/secondary/saffron_gym/palettes/09.pal | 19 + data/tilesets/secondary/saffron_gym/palettes/1.pal | 19 - data/tilesets/secondary/saffron_gym/palettes/2.pal | 19 - data/tilesets/secondary/saffron_gym/palettes/3.pal | 19 - data/tilesets/secondary/saffron_gym/palettes/4.pal | 19 - data/tilesets/secondary/saffron_gym/palettes/5.pal | 19 - data/tilesets/secondary/saffron_gym/palettes/6.pal | 19 - data/tilesets/secondary/saffron_gym/palettes/7.pal | 19 - data/tilesets/secondary/saffron_gym/palettes/8.pal | 19 - data/tilesets/secondary/saffron_gym/palettes/9.pal | 19 - data/tilesets/secondary/school/palettes/0.pal | 19 - data/tilesets/secondary/school/palettes/00.pal | 19 + data/tilesets/secondary/school/palettes/01.pal | 19 + data/tilesets/secondary/school/palettes/02.pal | 19 + data/tilesets/secondary/school/palettes/03.pal | 19 + data/tilesets/secondary/school/palettes/04.pal | 19 + data/tilesets/secondary/school/palettes/05.pal | 19 + data/tilesets/secondary/school/palettes/06.pal | 19 + data/tilesets/secondary/school/palettes/07.pal | 19 + data/tilesets/secondary/school/palettes/08.pal | 19 + data/tilesets/secondary/school/palettes/09.pal | 19 + data/tilesets/secondary/school/palettes/1.pal | 19 - data/tilesets/secondary/school/palettes/2.pal | 19 - data/tilesets/secondary/school/palettes/3.pal | 19 - data/tilesets/secondary/school/palettes/4.pal | 19 - data/tilesets/secondary/school/palettes/5.pal | 19 - data/tilesets/secondary/school/palettes/6.pal | 19 - data/tilesets/secondary/school/palettes/7.pal | 19 - data/tilesets/secondary/school/palettes/8.pal | 19 - data/tilesets/secondary/school/palettes/9.pal | 19 - data/tilesets/secondary/sea_cottage/palettes/0.pal | 19 - .../tilesets/secondary/sea_cottage/palettes/00.pal | 19 + .../tilesets/secondary/sea_cottage/palettes/01.pal | 19 + .../tilesets/secondary/sea_cottage/palettes/02.pal | 19 + .../tilesets/secondary/sea_cottage/palettes/03.pal | 19 + .../tilesets/secondary/sea_cottage/palettes/04.pal | 19 + .../tilesets/secondary/sea_cottage/palettes/05.pal | 19 + .../tilesets/secondary/sea_cottage/palettes/06.pal | 19 + .../tilesets/secondary/sea_cottage/palettes/07.pal | 19 + .../tilesets/secondary/sea_cottage/palettes/08.pal | 19 + .../tilesets/secondary/sea_cottage/palettes/09.pal | 19 + data/tilesets/secondary/sea_cottage/palettes/1.pal | 19 - data/tilesets/secondary/sea_cottage/palettes/2.pal | 19 - data/tilesets/secondary/sea_cottage/palettes/3.pal | 19 - data/tilesets/secondary/sea_cottage/palettes/4.pal | 19 - data/tilesets/secondary/sea_cottage/palettes/5.pal | 19 - data/tilesets/secondary/sea_cottage/palettes/6.pal | 19 - data/tilesets/secondary/sea_cottage/palettes/7.pal | 19 - data/tilesets/secondary/sea_cottage/palettes/8.pal | 19 - data/tilesets/secondary/sea_cottage/palettes/9.pal | 19 - .../secondary/seafoam_islands/palettes/0.pal | 19 - .../secondary/seafoam_islands/palettes/00.pal | 19 + .../secondary/seafoam_islands/palettes/01.pal | 19 + .../secondary/seafoam_islands/palettes/02.pal | 19 + .../secondary/seafoam_islands/palettes/03.pal | 19 + .../secondary/seafoam_islands/palettes/04.pal | 19 + .../secondary/seafoam_islands/palettes/05.pal | 19 + .../secondary/seafoam_islands/palettes/06.pal | 19 + .../secondary/seafoam_islands/palettes/07.pal | 19 + .../secondary/seafoam_islands/palettes/08.pal | 19 + .../secondary/seafoam_islands/palettes/09.pal | 19 + .../secondary/seafoam_islands/palettes/1.pal | 19 - .../secondary/seafoam_islands/palettes/2.pal | 19 - .../secondary/seafoam_islands/palettes/3.pal | 19 - .../secondary/seafoam_islands/palettes/4.pal | 19 - .../secondary/seafoam_islands/palettes/5.pal | 19 - .../secondary/seafoam_islands/palettes/6.pal | 19 - .../secondary/seafoam_islands/palettes/7.pal | 19 - .../secondary/seafoam_islands/palettes/8.pal | 19 - .../secondary/seafoam_islands/palettes/9.pal | 19 - .../secondary/sevii_islands_123/palettes/0.pal | 19 - .../secondary/sevii_islands_123/palettes/00.pal | 19 + .../secondary/sevii_islands_123/palettes/01.pal | 19 + .../secondary/sevii_islands_123/palettes/02.pal | 19 + .../secondary/sevii_islands_123/palettes/03.pal | 19 + .../secondary/sevii_islands_123/palettes/04.pal | 19 + .../secondary/sevii_islands_123/palettes/05.pal | 19 + .../secondary/sevii_islands_123/palettes/06.pal | 19 + .../secondary/sevii_islands_123/palettes/07.pal | 19 + .../secondary/sevii_islands_123/palettes/08.pal | 19 + .../secondary/sevii_islands_123/palettes/09.pal | 19 + .../secondary/sevii_islands_123/palettes/1.pal | 19 - .../secondary/sevii_islands_123/palettes/2.pal | 19 - .../secondary/sevii_islands_123/palettes/3.pal | 19 - .../secondary/sevii_islands_123/palettes/4.pal | 19 - .../secondary/sevii_islands_123/palettes/5.pal | 19 - .../secondary/sevii_islands_123/palettes/6.pal | 19 - .../secondary/sevii_islands_123/palettes/7.pal | 19 - .../secondary/sevii_islands_123/palettes/8.pal | 19 - .../secondary/sevii_islands_123/palettes/9.pal | 19 - .../secondary/sevii_islands_45/palettes/0.pal | 19 - .../secondary/sevii_islands_45/palettes/00.pal | 19 + .../secondary/sevii_islands_45/palettes/01.pal | 19 + .../secondary/sevii_islands_45/palettes/02.pal | 19 + .../secondary/sevii_islands_45/palettes/03.pal | 19 + .../secondary/sevii_islands_45/palettes/04.pal | 19 + .../secondary/sevii_islands_45/palettes/05.pal | 19 + .../secondary/sevii_islands_45/palettes/06.pal | 19 + .../secondary/sevii_islands_45/palettes/07.pal | 19 + .../secondary/sevii_islands_45/palettes/08.pal | 19 + .../secondary/sevii_islands_45/palettes/09.pal | 19 + .../secondary/sevii_islands_45/palettes/1.pal | 19 - .../secondary/sevii_islands_45/palettes/2.pal | 19 - .../secondary/sevii_islands_45/palettes/3.pal | 19 - .../secondary/sevii_islands_45/palettes/4.pal | 19 - .../secondary/sevii_islands_45/palettes/5.pal | 19 - .../secondary/sevii_islands_45/palettes/6.pal | 19 - .../secondary/sevii_islands_45/palettes/7.pal | 19 - .../secondary/sevii_islands_45/palettes/8.pal | 19 - .../secondary/sevii_islands_45/palettes/9.pal | 19 - .../secondary/sevii_islands_67/palettes/0.pal | 19 - .../secondary/sevii_islands_67/palettes/00.pal | 19 + .../secondary/sevii_islands_67/palettes/01.pal | 19 + .../secondary/sevii_islands_67/palettes/02.pal | 19 + .../secondary/sevii_islands_67/palettes/03.pal | 19 + .../secondary/sevii_islands_67/palettes/04.pal | 19 + .../secondary/sevii_islands_67/palettes/05.pal | 19 + .../secondary/sevii_islands_67/palettes/06.pal | 19 + .../secondary/sevii_islands_67/palettes/07.pal | 19 + .../secondary/sevii_islands_67/palettes/08.pal | 19 + .../secondary/sevii_islands_67/palettes/09.pal | 19 + .../secondary/sevii_islands_67/palettes/1.pal | 19 - .../secondary/sevii_islands_67/palettes/2.pal | 19 - .../secondary/sevii_islands_67/palettes/3.pal | 19 - .../secondary/sevii_islands_67/palettes/4.pal | 19 - .../secondary/sevii_islands_67/palettes/5.pal | 19 - .../secondary/sevii_islands_67/palettes/6.pal | 19 - .../secondary/sevii_islands_67/palettes/7.pal | 19 - .../secondary/sevii_islands_67/palettes/8.pal | 19 - .../secondary/sevii_islands_67/palettes/9.pal | 19 - data/tilesets/secondary/ss_anne/palettes/0.pal | 19 - data/tilesets/secondary/ss_anne/palettes/00.pal | 19 + data/tilesets/secondary/ss_anne/palettes/01.pal | 19 + data/tilesets/secondary/ss_anne/palettes/02.pal | 19 + data/tilesets/secondary/ss_anne/palettes/03.pal | 19 + data/tilesets/secondary/ss_anne/palettes/04.pal | 19 + data/tilesets/secondary/ss_anne/palettes/05.pal | 19 + data/tilesets/secondary/ss_anne/palettes/06.pal | 19 + data/tilesets/secondary/ss_anne/palettes/07.pal | 19 + data/tilesets/secondary/ss_anne/palettes/08.pal | 19 + data/tilesets/secondary/ss_anne/palettes/09.pal | 19 + data/tilesets/secondary/ss_anne/palettes/1.pal | 19 - data/tilesets/secondary/ss_anne/palettes/2.pal | 19 - data/tilesets/secondary/ss_anne/palettes/3.pal | 19 - data/tilesets/secondary/ss_anne/palettes/4.pal | 19 - data/tilesets/secondary/ss_anne/palettes/5.pal | 19 - data/tilesets/secondary/ss_anne/palettes/6.pal | 19 - data/tilesets/secondary/ss_anne/palettes/7.pal | 19 - data/tilesets/secondary/ss_anne/palettes/8.pal | 19 - data/tilesets/secondary/ss_anne/palettes/9.pal | 19 - .../tilesets/secondary/tanoby_ruins/palettes/0.pal | 19 - .../secondary/tanoby_ruins/palettes/00.pal | 19 + .../secondary/tanoby_ruins/palettes/01.pal | 19 + .../secondary/tanoby_ruins/palettes/02.pal | 19 + .../secondary/tanoby_ruins/palettes/03.pal | 19 + .../secondary/tanoby_ruins/palettes/04.pal | 19 + .../secondary/tanoby_ruins/palettes/05.pal | 19 + .../secondary/tanoby_ruins/palettes/06.pal | 19 + .../secondary/tanoby_ruins/palettes/07.pal | 19 + .../secondary/tanoby_ruins/palettes/08.pal | 19 + .../secondary/tanoby_ruins/palettes/09.pal | 19 + .../tilesets/secondary/tanoby_ruins/palettes/1.pal | 19 - .../tilesets/secondary/tanoby_ruins/palettes/2.pal | 19 - .../tilesets/secondary/tanoby_ruins/palettes/3.pal | 19 - .../tilesets/secondary/tanoby_ruins/palettes/4.pal | 19 - .../tilesets/secondary/tanoby_ruins/palettes/5.pal | 19 - .../tilesets/secondary/tanoby_ruins/palettes/6.pal | 19 - .../tilesets/secondary/tanoby_ruins/palettes/7.pal | 19 - .../tilesets/secondary/tanoby_ruins/palettes/8.pal | 19 - .../tilesets/secondary/tanoby_ruins/palettes/9.pal | 19 - .../secondary/trainer_tower/palettes/0.pal | 19 - .../secondary/trainer_tower/palettes/00.pal | 19 + .../secondary/trainer_tower/palettes/01.pal | 19 + .../secondary/trainer_tower/palettes/02.pal | 19 + .../secondary/trainer_tower/palettes/03.pal | 19 + .../secondary/trainer_tower/palettes/04.pal | 19 + .../secondary/trainer_tower/palettes/05.pal | 19 + .../secondary/trainer_tower/palettes/06.pal | 19 + .../secondary/trainer_tower/palettes/07.pal | 19 + .../secondary/trainer_tower/palettes/08.pal | 19 + .../secondary/trainer_tower/palettes/09.pal | 19 + .../secondary/trainer_tower/palettes/1.pal | 19 - .../secondary/trainer_tower/palettes/2.pal | 19 - .../secondary/trainer_tower/palettes/3.pal | 19 - .../secondary/trainer_tower/palettes/4.pal | 19 - .../secondary/trainer_tower/palettes/5.pal | 19 - .../secondary/trainer_tower/palettes/6.pal | 19 - .../secondary/trainer_tower/palettes/7.pal | 19 - .../secondary/trainer_tower/palettes/8.pal | 19 - .../secondary/trainer_tower/palettes/9.pal | 19 - .../secondary/underground_path/palettes/0.pal | 19 - .../secondary/underground_path/palettes/00.pal | 19 + .../secondary/underground_path/palettes/01.pal | 19 + .../secondary/underground_path/palettes/02.pal | 19 + .../secondary/underground_path/palettes/03.pal | 19 + .../secondary/underground_path/palettes/04.pal | 19 + .../secondary/underground_path/palettes/05.pal | 19 + .../secondary/underground_path/palettes/06.pal | 19 + .../secondary/underground_path/palettes/07.pal | 19 + .../secondary/underground_path/palettes/08.pal | 19 + .../secondary/underground_path/palettes/09.pal | 19 + .../secondary/underground_path/palettes/1.pal | 19 - .../secondary/underground_path/palettes/2.pal | 19 - .../secondary/underground_path/palettes/3.pal | 19 - .../secondary/underground_path/palettes/4.pal | 19 - .../secondary/underground_path/palettes/5.pal | 19 - .../secondary/underground_path/palettes/6.pal | 19 - .../secondary/underground_path/palettes/7.pal | 19 - .../secondary/underground_path/palettes/8.pal | 19 - .../secondary/underground_path/palettes/9.pal | 19 - .../secondary/unused_gatehouse1/palettes/0.pal | 19 - .../secondary/unused_gatehouse1/palettes/00.pal | 19 + .../secondary/unused_gatehouse1/palettes/01.pal | 19 + .../secondary/unused_gatehouse1/palettes/02.pal | 19 + .../secondary/unused_gatehouse1/palettes/03.pal | 19 + .../secondary/unused_gatehouse1/palettes/04.pal | 19 + .../secondary/unused_gatehouse1/palettes/05.pal | 19 + .../secondary/unused_gatehouse1/palettes/06.pal | 19 + .../secondary/unused_gatehouse1/palettes/07.pal | 19 + .../secondary/unused_gatehouse1/palettes/08.pal | 19 + .../secondary/unused_gatehouse1/palettes/09.pal | 19 + .../secondary/unused_gatehouse1/palettes/1.pal | 19 - .../secondary/unused_gatehouse1/palettes/2.pal | 19 - .../secondary/unused_gatehouse1/palettes/3.pal | 19 - .../secondary/unused_gatehouse1/palettes/4.pal | 19 - .../secondary/unused_gatehouse1/palettes/5.pal | 19 - .../secondary/unused_gatehouse1/palettes/6.pal | 19 - .../secondary/unused_gatehouse1/palettes/7.pal | 19 - .../secondary/unused_gatehouse1/palettes/8.pal | 19 - .../secondary/unused_gatehouse1/palettes/9.pal | 19 - .../secondary/unused_gatehouse2/palettes/0.pal | 19 - .../secondary/unused_gatehouse2/palettes/00.pal | 19 + .../secondary/unused_gatehouse2/palettes/01.pal | 19 + .../secondary/unused_gatehouse2/palettes/02.pal | 19 + .../secondary/unused_gatehouse2/palettes/03.pal | 19 + .../secondary/unused_gatehouse2/palettes/04.pal | 19 + .../secondary/unused_gatehouse2/palettes/05.pal | 19 + .../secondary/unused_gatehouse2/palettes/06.pal | 19 + .../secondary/unused_gatehouse2/palettes/07.pal | 19 + .../secondary/unused_gatehouse2/palettes/08.pal | 19 + .../secondary/unused_gatehouse2/palettes/09.pal | 19 + .../secondary/unused_gatehouse2/palettes/1.pal | 19 - .../secondary/unused_gatehouse2/palettes/2.pal | 19 - .../secondary/unused_gatehouse2/palettes/3.pal | 19 - .../secondary/unused_gatehouse2/palettes/4.pal | 19 - .../secondary/unused_gatehouse2/palettes/5.pal | 19 - .../secondary/unused_gatehouse2/palettes/6.pal | 19 - .../secondary/unused_gatehouse2/palettes/7.pal | 19 - .../secondary/unused_gatehouse2/palettes/8.pal | 19 - .../secondary/unused_gatehouse2/palettes/9.pal | 19 - .../secondary/vermilion_city/palettes/0.pal | 19 - .../secondary/vermilion_city/palettes/00.pal | 19 + .../secondary/vermilion_city/palettes/01.pal | 19 + .../secondary/vermilion_city/palettes/02.pal | 19 + .../secondary/vermilion_city/palettes/03.pal | 19 + .../secondary/vermilion_city/palettes/04.pal | 19 + .../secondary/vermilion_city/palettes/05.pal | 19 + .../secondary/vermilion_city/palettes/06.pal | 19 + .../secondary/vermilion_city/palettes/07.pal | 19 + .../secondary/vermilion_city/palettes/08.pal | 19 + .../secondary/vermilion_city/palettes/09.pal | 19 + .../secondary/vermilion_city/palettes/1.pal | 19 - .../secondary/vermilion_city/palettes/2.pal | 19 - .../secondary/vermilion_city/palettes/3.pal | 19 - .../secondary/vermilion_city/palettes/4.pal | 19 - .../secondary/vermilion_city/palettes/5.pal | 19 - .../secondary/vermilion_city/palettes/6.pal | 19 - .../secondary/vermilion_city/palettes/7.pal | 19 - .../secondary/vermilion_city/palettes/8.pal | 19 - .../secondary/vermilion_city/palettes/9.pal | 19 - .../secondary/vermilion_gym/palettes/0.pal | 19 - .../secondary/vermilion_gym/palettes/00.pal | 19 + .../secondary/vermilion_gym/palettes/01.pal | 19 + .../secondary/vermilion_gym/palettes/02.pal | 19 + .../secondary/vermilion_gym/palettes/03.pal | 19 + .../secondary/vermilion_gym/palettes/04.pal | 19 + .../secondary/vermilion_gym/palettes/05.pal | 19 + .../secondary/vermilion_gym/palettes/06.pal | 19 + .../secondary/vermilion_gym/palettes/07.pal | 19 + .../secondary/vermilion_gym/palettes/08.pal | 19 + .../secondary/vermilion_gym/palettes/09.pal | 19 + .../secondary/vermilion_gym/palettes/1.pal | 19 - .../secondary/vermilion_gym/palettes/2.pal | 19 - .../secondary/vermilion_gym/palettes/3.pal | 19 - .../secondary/vermilion_gym/palettes/4.pal | 19 - .../secondary/vermilion_gym/palettes/5.pal | 19 - .../secondary/vermilion_gym/palettes/6.pal | 19 - .../secondary/vermilion_gym/palettes/7.pal | 19 - .../secondary/vermilion_gym/palettes/8.pal | 19 - .../secondary/vermilion_gym/palettes/9.pal | 19 - .../secondary/viridian_city/palettes/0.pal | 19 - .../secondary/viridian_city/palettes/00.pal | 19 + .../secondary/viridian_city/palettes/01.pal | 19 + .../secondary/viridian_city/palettes/02.pal | 19 + .../secondary/viridian_city/palettes/03.pal | 19 + .../secondary/viridian_city/palettes/04.pal | 19 + .../secondary/viridian_city/palettes/05.pal | 19 + .../secondary/viridian_city/palettes/06.pal | 19 + .../secondary/viridian_city/palettes/07.pal | 19 + .../secondary/viridian_city/palettes/08.pal | 19 + .../secondary/viridian_city/palettes/09.pal | 19 + .../secondary/viridian_city/palettes/1.pal | 19 - .../secondary/viridian_city/palettes/2.pal | 19 - .../secondary/viridian_city/palettes/3.pal | 19 - .../secondary/viridian_city/palettes/4.pal | 19 - .../secondary/viridian_city/palettes/5.pal | 19 - .../secondary/viridian_city/palettes/6.pal | 19 - .../secondary/viridian_city/palettes/7.pal | 19 - .../secondary/viridian_city/palettes/8.pal | 19 - .../secondary/viridian_city/palettes/9.pal | 19 - .../secondary/viridian_forest/palettes/0.pal | 19 - .../secondary/viridian_forest/palettes/00.pal | 19 + .../secondary/viridian_forest/palettes/01.pal | 19 + .../secondary/viridian_forest/palettes/02.pal | 19 + .../secondary/viridian_forest/palettes/03.pal | 19 + .../secondary/viridian_forest/palettes/04.pal | 19 + .../secondary/viridian_forest/palettes/05.pal | 19 + .../secondary/viridian_forest/palettes/06.pal | 19 + .../secondary/viridian_forest/palettes/07.pal | 19 + .../secondary/viridian_forest/palettes/08.pal | 19 + .../secondary/viridian_forest/palettes/09.pal | 19 + .../secondary/viridian_forest/palettes/1.pal | 19 - .../secondary/viridian_forest/palettes/2.pal | 19 - .../secondary/viridian_forest/palettes/3.pal | 19 - .../secondary/viridian_forest/palettes/4.pal | 19 - .../secondary/viridian_forest/palettes/5.pal | 19 - .../secondary/viridian_forest/palettes/6.pal | 19 - .../secondary/viridian_forest/palettes/7.pal | 19 - .../secondary/viridian_forest/palettes/8.pal | 19 - .../secondary/viridian_forest/palettes/9.pal | 19 - .../tilesets/secondary/viridian_gym/palettes/0.pal | 19 - .../secondary/viridian_gym/palettes/00.pal | 19 + .../secondary/viridian_gym/palettes/01.pal | 19 + .../secondary/viridian_gym/palettes/02.pal | 19 + .../secondary/viridian_gym/palettes/03.pal | 19 + .../secondary/viridian_gym/palettes/04.pal | 19 + .../secondary/viridian_gym/palettes/05.pal | 19 + .../secondary/viridian_gym/palettes/06.pal | 19 + .../secondary/viridian_gym/palettes/07.pal | 19 + .../secondary/viridian_gym/palettes/08.pal | 19 + .../secondary/viridian_gym/palettes/09.pal | 19 + .../tilesets/secondary/viridian_gym/palettes/1.pal | 19 - .../tilesets/secondary/viridian_gym/palettes/2.pal | 19 - .../tilesets/secondary/viridian_gym/palettes/3.pal | 19 - .../tilesets/secondary/viridian_gym/palettes/4.pal | 19 - .../tilesets/secondary/viridian_gym/palettes/5.pal | 19 - .../tilesets/secondary/viridian_gym/palettes/6.pal | 19 - .../tilesets/secondary/viridian_gym/palettes/7.pal | 19 - .../tilesets/secondary/viridian_gym/palettes/8.pal | 19 - .../tilesets/secondary/viridian_gym/palettes/9.pal | 19 - 1341 files changed, 13370 insertions(+), 13370 deletions(-) delete mode 100644 data/tilesets/primary/building/palettes/0.pal create mode 100644 data/tilesets/primary/building/palettes/00.pal create mode 100644 data/tilesets/primary/building/palettes/01.pal create mode 100644 data/tilesets/primary/building/palettes/02.pal create mode 100644 data/tilesets/primary/building/palettes/03.pal create mode 100644 data/tilesets/primary/building/palettes/04.pal create mode 100644 data/tilesets/primary/building/palettes/05.pal create mode 100644 data/tilesets/primary/building/palettes/06.pal create mode 100644 data/tilesets/primary/building/palettes/07.pal create mode 100644 data/tilesets/primary/building/palettes/08.pal create mode 100644 data/tilesets/primary/building/palettes/09.pal delete mode 100644 data/tilesets/primary/building/palettes/1.pal delete mode 100644 data/tilesets/primary/building/palettes/2.pal delete mode 100644 data/tilesets/primary/building/palettes/3.pal delete mode 100644 data/tilesets/primary/building/palettes/4.pal delete mode 100644 data/tilesets/primary/building/palettes/5.pal delete mode 100644 data/tilesets/primary/building/palettes/6.pal delete mode 100644 data/tilesets/primary/building/palettes/7.pal delete mode 100644 data/tilesets/primary/building/palettes/8.pal delete mode 100644 data/tilesets/primary/building/palettes/9.pal delete mode 100644 data/tilesets/primary/general/palettes/0.pal create mode 100644 data/tilesets/primary/general/palettes/00.pal create mode 100644 data/tilesets/primary/general/palettes/01.pal create mode 100644 data/tilesets/primary/general/palettes/02.pal create mode 100644 data/tilesets/primary/general/palettes/03.pal create mode 100644 data/tilesets/primary/general/palettes/04.pal create mode 100644 data/tilesets/primary/general/palettes/05.pal create mode 100644 data/tilesets/primary/general/palettes/06.pal create mode 100644 data/tilesets/primary/general/palettes/07.pal create mode 100644 data/tilesets/primary/general/palettes/08.pal create mode 100644 data/tilesets/primary/general/palettes/09.pal delete mode 100644 data/tilesets/primary/general/palettes/1.pal delete mode 100644 data/tilesets/primary/general/palettes/2.pal delete mode 100644 data/tilesets/primary/general/palettes/3.pal delete mode 100644 data/tilesets/primary/general/palettes/4.pal delete mode 100644 data/tilesets/primary/general/palettes/5.pal delete mode 100644 data/tilesets/primary/general/palettes/6.pal delete mode 100644 data/tilesets/primary/general/palettes/7.pal delete mode 100644 data/tilesets/primary/general/palettes/8.pal delete mode 100644 data/tilesets/primary/general/palettes/9.pal delete mode 100644 data/tilesets/secondary/berry_forest/palettes/0.pal create mode 100644 data/tilesets/secondary/berry_forest/palettes/00.pal create mode 100644 data/tilesets/secondary/berry_forest/palettes/01.pal create mode 100644 data/tilesets/secondary/berry_forest/palettes/02.pal create mode 100644 data/tilesets/secondary/berry_forest/palettes/03.pal create mode 100644 data/tilesets/secondary/berry_forest/palettes/04.pal create mode 100644 data/tilesets/secondary/berry_forest/palettes/05.pal create mode 100644 data/tilesets/secondary/berry_forest/palettes/06.pal create mode 100644 data/tilesets/secondary/berry_forest/palettes/07.pal create mode 100644 data/tilesets/secondary/berry_forest/palettes/08.pal create mode 100644 data/tilesets/secondary/berry_forest/palettes/09.pal delete mode 100644 data/tilesets/secondary/berry_forest/palettes/1.pal delete mode 100644 data/tilesets/secondary/berry_forest/palettes/2.pal delete mode 100644 data/tilesets/secondary/berry_forest/palettes/3.pal delete mode 100644 data/tilesets/secondary/berry_forest/palettes/4.pal delete mode 100644 data/tilesets/secondary/berry_forest/palettes/5.pal delete mode 100644 data/tilesets/secondary/berry_forest/palettes/6.pal delete mode 100644 data/tilesets/secondary/berry_forest/palettes/7.pal delete mode 100644 data/tilesets/secondary/berry_forest/palettes/8.pal delete mode 100644 data/tilesets/secondary/berry_forest/palettes/9.pal delete mode 100644 data/tilesets/secondary/bike_shop/palettes/0.pal create mode 100644 data/tilesets/secondary/bike_shop/palettes/00.pal create mode 100644 data/tilesets/secondary/bike_shop/palettes/01.pal create mode 100644 data/tilesets/secondary/bike_shop/palettes/02.pal create mode 100644 data/tilesets/secondary/bike_shop/palettes/03.pal create mode 100644 data/tilesets/secondary/bike_shop/palettes/04.pal create mode 100644 data/tilesets/secondary/bike_shop/palettes/05.pal create mode 100644 data/tilesets/secondary/bike_shop/palettes/06.pal create mode 100644 data/tilesets/secondary/bike_shop/palettes/07.pal create mode 100644 data/tilesets/secondary/bike_shop/palettes/08.pal create mode 100644 data/tilesets/secondary/bike_shop/palettes/09.pal delete mode 100644 data/tilesets/secondary/bike_shop/palettes/1.pal delete mode 100644 data/tilesets/secondary/bike_shop/palettes/2.pal delete mode 100644 data/tilesets/secondary/bike_shop/palettes/3.pal delete mode 100644 data/tilesets/secondary/bike_shop/palettes/4.pal delete mode 100644 data/tilesets/secondary/bike_shop/palettes/5.pal delete mode 100644 data/tilesets/secondary/bike_shop/palettes/6.pal delete mode 100644 data/tilesets/secondary/bike_shop/palettes/7.pal delete mode 100644 data/tilesets/secondary/bike_shop/palettes/8.pal delete mode 100644 data/tilesets/secondary/bike_shop/palettes/9.pal delete mode 100644 data/tilesets/secondary/burgled_house/palettes/0.pal create mode 100644 data/tilesets/secondary/burgled_house/palettes/00.pal create mode 100644 data/tilesets/secondary/burgled_house/palettes/01.pal create mode 100644 data/tilesets/secondary/burgled_house/palettes/02.pal create mode 100644 data/tilesets/secondary/burgled_house/palettes/03.pal create mode 100644 data/tilesets/secondary/burgled_house/palettes/04.pal create mode 100644 data/tilesets/secondary/burgled_house/palettes/05.pal create mode 100644 data/tilesets/secondary/burgled_house/palettes/06.pal create mode 100644 data/tilesets/secondary/burgled_house/palettes/07.pal create mode 100644 data/tilesets/secondary/burgled_house/palettes/08.pal create mode 100644 data/tilesets/secondary/burgled_house/palettes/09.pal delete mode 100644 data/tilesets/secondary/burgled_house/palettes/1.pal delete mode 100644 data/tilesets/secondary/burgled_house/palettes/2.pal delete mode 100644 data/tilesets/secondary/burgled_house/palettes/3.pal delete mode 100644 data/tilesets/secondary/burgled_house/palettes/4.pal delete mode 100644 data/tilesets/secondary/burgled_house/palettes/5.pal delete mode 100644 data/tilesets/secondary/burgled_house/palettes/6.pal delete mode 100644 data/tilesets/secondary/burgled_house/palettes/7.pal delete mode 100644 data/tilesets/secondary/burgled_house/palettes/8.pal delete mode 100644 data/tilesets/secondary/burgled_house/palettes/9.pal delete mode 100644 data/tilesets/secondary/cable_club/palettes/0.pal create mode 100644 data/tilesets/secondary/cable_club/palettes/00.pal create mode 100644 data/tilesets/secondary/cable_club/palettes/01.pal create mode 100644 data/tilesets/secondary/cable_club/palettes/02.pal create mode 100644 data/tilesets/secondary/cable_club/palettes/03.pal create mode 100644 data/tilesets/secondary/cable_club/palettes/04.pal create mode 100644 data/tilesets/secondary/cable_club/palettes/05.pal create mode 100644 data/tilesets/secondary/cable_club/palettes/06.pal create mode 100644 data/tilesets/secondary/cable_club/palettes/07.pal create mode 100644 data/tilesets/secondary/cable_club/palettes/08.pal create mode 100644 data/tilesets/secondary/cable_club/palettes/09.pal delete mode 100644 data/tilesets/secondary/cable_club/palettes/1.pal delete mode 100644 data/tilesets/secondary/cable_club/palettes/2.pal delete mode 100644 data/tilesets/secondary/cable_club/palettes/3.pal delete mode 100644 data/tilesets/secondary/cable_club/palettes/4.pal delete mode 100644 data/tilesets/secondary/cable_club/palettes/5.pal delete mode 100644 data/tilesets/secondary/cable_club/palettes/6.pal delete mode 100644 data/tilesets/secondary/cable_club/palettes/7.pal delete mode 100644 data/tilesets/secondary/cable_club/palettes/8.pal delete mode 100644 data/tilesets/secondary/cable_club/palettes/9.pal delete mode 100644 data/tilesets/secondary/cave/palettes/0.pal create mode 100644 data/tilesets/secondary/cave/palettes/00.pal create mode 100644 data/tilesets/secondary/cave/palettes/01.pal create mode 100644 data/tilesets/secondary/cave/palettes/02.pal create mode 100644 data/tilesets/secondary/cave/palettes/03.pal create mode 100644 data/tilesets/secondary/cave/palettes/04.pal create mode 100644 data/tilesets/secondary/cave/palettes/05.pal create mode 100644 data/tilesets/secondary/cave/palettes/06.pal create mode 100644 data/tilesets/secondary/cave/palettes/07.pal create mode 100644 data/tilesets/secondary/cave/palettes/08.pal create mode 100644 data/tilesets/secondary/cave/palettes/09.pal delete mode 100644 data/tilesets/secondary/cave/palettes/1.pal delete mode 100644 data/tilesets/secondary/cave/palettes/2.pal delete mode 100644 data/tilesets/secondary/cave/palettes/3.pal delete mode 100644 data/tilesets/secondary/cave/palettes/4.pal delete mode 100644 data/tilesets/secondary/cave/palettes/5.pal delete mode 100644 data/tilesets/secondary/cave/palettes/6.pal delete mode 100644 data/tilesets/secondary/cave/palettes/7.pal delete mode 100644 data/tilesets/secondary/cave/palettes/8.pal delete mode 100644 data/tilesets/secondary/cave/palettes/9.pal delete mode 100644 data/tilesets/secondary/celadon_city/palettes/0.pal create mode 100644 data/tilesets/secondary/celadon_city/palettes/00.pal create mode 100644 data/tilesets/secondary/celadon_city/palettes/01.pal create mode 100644 data/tilesets/secondary/celadon_city/palettes/02.pal create mode 100644 data/tilesets/secondary/celadon_city/palettes/03.pal create mode 100644 data/tilesets/secondary/celadon_city/palettes/04.pal create mode 100644 data/tilesets/secondary/celadon_city/palettes/05.pal create mode 100644 data/tilesets/secondary/celadon_city/palettes/06.pal create mode 100644 data/tilesets/secondary/celadon_city/palettes/07.pal create mode 100644 data/tilesets/secondary/celadon_city/palettes/08.pal create mode 100644 data/tilesets/secondary/celadon_city/palettes/09.pal delete mode 100644 data/tilesets/secondary/celadon_city/palettes/1.pal delete mode 100644 data/tilesets/secondary/celadon_city/palettes/2.pal delete mode 100644 data/tilesets/secondary/celadon_city/palettes/3.pal delete mode 100644 data/tilesets/secondary/celadon_city/palettes/4.pal delete mode 100644 data/tilesets/secondary/celadon_city/palettes/5.pal delete mode 100644 data/tilesets/secondary/celadon_city/palettes/6.pal delete mode 100644 data/tilesets/secondary/celadon_city/palettes/7.pal delete mode 100644 data/tilesets/secondary/celadon_city/palettes/8.pal delete mode 100644 data/tilesets/secondary/celadon_city/palettes/9.pal delete mode 100644 data/tilesets/secondary/celadon_gym/palettes/0.pal create mode 100644 data/tilesets/secondary/celadon_gym/palettes/00.pal create mode 100644 data/tilesets/secondary/celadon_gym/palettes/01.pal create mode 100644 data/tilesets/secondary/celadon_gym/palettes/02.pal create mode 100644 data/tilesets/secondary/celadon_gym/palettes/03.pal create mode 100644 data/tilesets/secondary/celadon_gym/palettes/04.pal create mode 100644 data/tilesets/secondary/celadon_gym/palettes/05.pal create mode 100644 data/tilesets/secondary/celadon_gym/palettes/06.pal create mode 100644 data/tilesets/secondary/celadon_gym/palettes/07.pal create mode 100644 data/tilesets/secondary/celadon_gym/palettes/08.pal create mode 100644 data/tilesets/secondary/celadon_gym/palettes/09.pal delete mode 100644 data/tilesets/secondary/celadon_gym/palettes/1.pal delete mode 100644 data/tilesets/secondary/celadon_gym/palettes/2.pal delete mode 100644 data/tilesets/secondary/celadon_gym/palettes/3.pal delete mode 100644 data/tilesets/secondary/celadon_gym/palettes/4.pal delete mode 100644 data/tilesets/secondary/celadon_gym/palettes/5.pal delete mode 100644 data/tilesets/secondary/celadon_gym/palettes/6.pal delete mode 100644 data/tilesets/secondary/celadon_gym/palettes/7.pal delete mode 100644 data/tilesets/secondary/celadon_gym/palettes/8.pal delete mode 100644 data/tilesets/secondary/celadon_gym/palettes/9.pal delete mode 100644 data/tilesets/secondary/cerulean_cave/palettes/0.pal create mode 100644 data/tilesets/secondary/cerulean_cave/palettes/00.pal create mode 100644 data/tilesets/secondary/cerulean_cave/palettes/01.pal create mode 100644 data/tilesets/secondary/cerulean_cave/palettes/02.pal create mode 100644 data/tilesets/secondary/cerulean_cave/palettes/03.pal create mode 100644 data/tilesets/secondary/cerulean_cave/palettes/04.pal create mode 100644 data/tilesets/secondary/cerulean_cave/palettes/05.pal create mode 100644 data/tilesets/secondary/cerulean_cave/palettes/06.pal create mode 100644 data/tilesets/secondary/cerulean_cave/palettes/07.pal create mode 100644 data/tilesets/secondary/cerulean_cave/palettes/08.pal create mode 100644 data/tilesets/secondary/cerulean_cave/palettes/09.pal delete mode 100644 data/tilesets/secondary/cerulean_cave/palettes/1.pal delete mode 100644 data/tilesets/secondary/cerulean_cave/palettes/2.pal delete mode 100644 data/tilesets/secondary/cerulean_cave/palettes/3.pal delete mode 100644 data/tilesets/secondary/cerulean_cave/palettes/4.pal delete mode 100644 data/tilesets/secondary/cerulean_cave/palettes/5.pal delete mode 100644 data/tilesets/secondary/cerulean_cave/palettes/6.pal delete mode 100644 data/tilesets/secondary/cerulean_cave/palettes/7.pal delete mode 100644 data/tilesets/secondary/cerulean_cave/palettes/8.pal delete mode 100644 data/tilesets/secondary/cerulean_cave/palettes/9.pal delete mode 100644 data/tilesets/secondary/cerulean_city/palettes/0.pal create mode 100644 data/tilesets/secondary/cerulean_city/palettes/00.pal create mode 100644 data/tilesets/secondary/cerulean_city/palettes/01.pal create mode 100644 data/tilesets/secondary/cerulean_city/palettes/02.pal create mode 100644 data/tilesets/secondary/cerulean_city/palettes/03.pal create mode 100644 data/tilesets/secondary/cerulean_city/palettes/04.pal create mode 100644 data/tilesets/secondary/cerulean_city/palettes/05.pal create mode 100644 data/tilesets/secondary/cerulean_city/palettes/06.pal create mode 100644 data/tilesets/secondary/cerulean_city/palettes/07.pal create mode 100644 data/tilesets/secondary/cerulean_city/palettes/08.pal create mode 100644 data/tilesets/secondary/cerulean_city/palettes/09.pal delete mode 100644 data/tilesets/secondary/cerulean_city/palettes/1.pal delete mode 100644 data/tilesets/secondary/cerulean_city/palettes/2.pal delete mode 100644 data/tilesets/secondary/cerulean_city/palettes/3.pal delete mode 100644 data/tilesets/secondary/cerulean_city/palettes/4.pal delete mode 100644 data/tilesets/secondary/cerulean_city/palettes/5.pal delete mode 100644 data/tilesets/secondary/cerulean_city/palettes/6.pal delete mode 100644 data/tilesets/secondary/cerulean_city/palettes/7.pal delete mode 100644 data/tilesets/secondary/cerulean_city/palettes/8.pal delete mode 100644 data/tilesets/secondary/cerulean_city/palettes/9.pal delete mode 100644 data/tilesets/secondary/cerulean_gym/palettes/0.pal create mode 100644 data/tilesets/secondary/cerulean_gym/palettes/00.pal create mode 100644 data/tilesets/secondary/cerulean_gym/palettes/01.pal create mode 100644 data/tilesets/secondary/cerulean_gym/palettes/02.pal create mode 100644 data/tilesets/secondary/cerulean_gym/palettes/03.pal create mode 100644 data/tilesets/secondary/cerulean_gym/palettes/04.pal create mode 100644 data/tilesets/secondary/cerulean_gym/palettes/05.pal create mode 100644 data/tilesets/secondary/cerulean_gym/palettes/06.pal create mode 100644 data/tilesets/secondary/cerulean_gym/palettes/07.pal create mode 100644 data/tilesets/secondary/cerulean_gym/palettes/08.pal create mode 100644 data/tilesets/secondary/cerulean_gym/palettes/09.pal delete mode 100644 data/tilesets/secondary/cerulean_gym/palettes/1.pal delete mode 100644 data/tilesets/secondary/cerulean_gym/palettes/2.pal delete mode 100644 data/tilesets/secondary/cerulean_gym/palettes/3.pal delete mode 100644 data/tilesets/secondary/cerulean_gym/palettes/4.pal delete mode 100644 data/tilesets/secondary/cerulean_gym/palettes/5.pal delete mode 100644 data/tilesets/secondary/cerulean_gym/palettes/6.pal delete mode 100644 data/tilesets/secondary/cerulean_gym/palettes/7.pal delete mode 100644 data/tilesets/secondary/cerulean_gym/palettes/8.pal delete mode 100644 data/tilesets/secondary/cerulean_gym/palettes/9.pal delete mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/0.pal create mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/00.pal create mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/01.pal create mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/02.pal create mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/03.pal create mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/04.pal create mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/05.pal create mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/06.pal create mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/07.pal create mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/08.pal create mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/09.pal delete mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/1.pal delete mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/2.pal delete mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/3.pal delete mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/4.pal delete mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/5.pal delete mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/6.pal delete mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/7.pal delete mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/8.pal delete mode 100644 data/tilesets/secondary/cinnabar_gym/palettes/9.pal delete mode 100644 data/tilesets/secondary/cinnabar_island/palettes/0.pal create mode 100644 data/tilesets/secondary/cinnabar_island/palettes/00.pal create mode 100644 data/tilesets/secondary/cinnabar_island/palettes/01.pal create mode 100644 data/tilesets/secondary/cinnabar_island/palettes/02.pal create mode 100644 data/tilesets/secondary/cinnabar_island/palettes/03.pal create mode 100644 data/tilesets/secondary/cinnabar_island/palettes/04.pal create mode 100644 data/tilesets/secondary/cinnabar_island/palettes/05.pal create mode 100644 data/tilesets/secondary/cinnabar_island/palettes/06.pal create mode 100644 data/tilesets/secondary/cinnabar_island/palettes/07.pal create mode 100644 data/tilesets/secondary/cinnabar_island/palettes/08.pal create mode 100644 data/tilesets/secondary/cinnabar_island/palettes/09.pal delete mode 100644 data/tilesets/secondary/cinnabar_island/palettes/1.pal delete mode 100644 data/tilesets/secondary/cinnabar_island/palettes/2.pal delete mode 100644 data/tilesets/secondary/cinnabar_island/palettes/3.pal delete mode 100644 data/tilesets/secondary/cinnabar_island/palettes/4.pal delete mode 100644 data/tilesets/secondary/cinnabar_island/palettes/5.pal delete mode 100644 data/tilesets/secondary/cinnabar_island/palettes/6.pal delete mode 100644 data/tilesets/secondary/cinnabar_island/palettes/7.pal delete mode 100644 data/tilesets/secondary/cinnabar_island/palettes/8.pal delete mode 100644 data/tilesets/secondary/cinnabar_island/palettes/9.pal delete mode 100644 data/tilesets/secondary/condominiums/palettes/0.pal create mode 100644 data/tilesets/secondary/condominiums/palettes/00.pal create mode 100644 data/tilesets/secondary/condominiums/palettes/01.pal create mode 100644 data/tilesets/secondary/condominiums/palettes/02.pal create mode 100644 data/tilesets/secondary/condominiums/palettes/03.pal create mode 100644 data/tilesets/secondary/condominiums/palettes/04.pal create mode 100644 data/tilesets/secondary/condominiums/palettes/05.pal create mode 100644 data/tilesets/secondary/condominiums/palettes/06.pal create mode 100644 data/tilesets/secondary/condominiums/palettes/07.pal create mode 100644 data/tilesets/secondary/condominiums/palettes/08.pal create mode 100644 data/tilesets/secondary/condominiums/palettes/09.pal delete mode 100644 data/tilesets/secondary/condominiums/palettes/1.pal delete mode 100644 data/tilesets/secondary/condominiums/palettes/2.pal delete mode 100644 data/tilesets/secondary/condominiums/palettes/3.pal delete mode 100644 data/tilesets/secondary/condominiums/palettes/4.pal delete mode 100644 data/tilesets/secondary/condominiums/palettes/5.pal delete mode 100644 data/tilesets/secondary/condominiums/palettes/6.pal delete mode 100644 data/tilesets/secondary/condominiums/palettes/7.pal delete mode 100644 data/tilesets/secondary/condominiums/palettes/8.pal delete mode 100644 data/tilesets/secondary/condominiums/palettes/9.pal delete mode 100644 data/tilesets/secondary/department_store/palettes/0.pal create mode 100644 data/tilesets/secondary/department_store/palettes/00.pal create mode 100644 data/tilesets/secondary/department_store/palettes/01.pal create mode 100644 data/tilesets/secondary/department_store/palettes/02.pal create mode 100644 data/tilesets/secondary/department_store/palettes/03.pal create mode 100644 data/tilesets/secondary/department_store/palettes/04.pal create mode 100644 data/tilesets/secondary/department_store/palettes/05.pal create mode 100644 data/tilesets/secondary/department_store/palettes/06.pal create mode 100644 data/tilesets/secondary/department_store/palettes/07.pal create mode 100644 data/tilesets/secondary/department_store/palettes/08.pal create mode 100644 data/tilesets/secondary/department_store/palettes/09.pal delete mode 100644 data/tilesets/secondary/department_store/palettes/1.pal delete mode 100644 data/tilesets/secondary/department_store/palettes/2.pal delete mode 100644 data/tilesets/secondary/department_store/palettes/3.pal delete mode 100644 data/tilesets/secondary/department_store/palettes/4.pal delete mode 100644 data/tilesets/secondary/department_store/palettes/5.pal delete mode 100644 data/tilesets/secondary/department_store/palettes/6.pal delete mode 100644 data/tilesets/secondary/department_store/palettes/7.pal delete mode 100644 data/tilesets/secondary/department_store/palettes/8.pal delete mode 100644 data/tilesets/secondary/department_store/palettes/9.pal delete mode 100644 data/tilesets/secondary/digletts_cave/palettes/0.pal create mode 100644 data/tilesets/secondary/digletts_cave/palettes/00.pal create mode 100644 data/tilesets/secondary/digletts_cave/palettes/01.pal create mode 100644 data/tilesets/secondary/digletts_cave/palettes/02.pal create mode 100644 data/tilesets/secondary/digletts_cave/palettes/03.pal create mode 100644 data/tilesets/secondary/digletts_cave/palettes/04.pal create mode 100644 data/tilesets/secondary/digletts_cave/palettes/05.pal create mode 100644 data/tilesets/secondary/digletts_cave/palettes/06.pal create mode 100644 data/tilesets/secondary/digletts_cave/palettes/07.pal create mode 100644 data/tilesets/secondary/digletts_cave/palettes/08.pal create mode 100644 data/tilesets/secondary/digletts_cave/palettes/09.pal delete mode 100644 data/tilesets/secondary/digletts_cave/palettes/1.pal delete mode 100644 data/tilesets/secondary/digletts_cave/palettes/2.pal delete mode 100644 data/tilesets/secondary/digletts_cave/palettes/3.pal delete mode 100644 data/tilesets/secondary/digletts_cave/palettes/4.pal delete mode 100644 data/tilesets/secondary/digletts_cave/palettes/5.pal delete mode 100644 data/tilesets/secondary/digletts_cave/palettes/6.pal delete mode 100644 data/tilesets/secondary/digletts_cave/palettes/7.pal delete mode 100644 data/tilesets/secondary/digletts_cave/palettes/8.pal delete mode 100644 data/tilesets/secondary/digletts_cave/palettes/9.pal delete mode 100644 data/tilesets/secondary/dummy1/palettes/0.pal create mode 100644 data/tilesets/secondary/dummy1/palettes/00.pal create mode 100644 data/tilesets/secondary/dummy1/palettes/01.pal create mode 100644 data/tilesets/secondary/dummy1/palettes/02.pal create mode 100644 data/tilesets/secondary/dummy1/palettes/03.pal create mode 100644 data/tilesets/secondary/dummy1/palettes/04.pal create mode 100644 data/tilesets/secondary/dummy1/palettes/05.pal create mode 100644 data/tilesets/secondary/dummy1/palettes/06.pal create mode 100644 data/tilesets/secondary/dummy1/palettes/07.pal create mode 100644 data/tilesets/secondary/dummy1/palettes/08.pal create mode 100644 data/tilesets/secondary/dummy1/palettes/09.pal delete mode 100644 data/tilesets/secondary/dummy1/palettes/1.pal delete mode 100644 data/tilesets/secondary/dummy1/palettes/2.pal delete mode 100644 data/tilesets/secondary/dummy1/palettes/3.pal delete mode 100644 data/tilesets/secondary/dummy1/palettes/4.pal delete mode 100644 data/tilesets/secondary/dummy1/palettes/5.pal delete mode 100644 data/tilesets/secondary/dummy1/palettes/6.pal delete mode 100644 data/tilesets/secondary/dummy1/palettes/7.pal delete mode 100644 data/tilesets/secondary/dummy1/palettes/8.pal delete mode 100644 data/tilesets/secondary/dummy1/palettes/9.pal delete mode 100644 data/tilesets/secondary/dummy2/palettes/0.pal create mode 100644 data/tilesets/secondary/dummy2/palettes/00.pal create mode 100644 data/tilesets/secondary/dummy2/palettes/01.pal create mode 100644 data/tilesets/secondary/dummy2/palettes/02.pal create mode 100644 data/tilesets/secondary/dummy2/palettes/03.pal create mode 100644 data/tilesets/secondary/dummy2/palettes/04.pal create mode 100644 data/tilesets/secondary/dummy2/palettes/05.pal create mode 100644 data/tilesets/secondary/dummy2/palettes/06.pal create mode 100644 data/tilesets/secondary/dummy2/palettes/07.pal create mode 100644 data/tilesets/secondary/dummy2/palettes/08.pal create mode 100644 data/tilesets/secondary/dummy2/palettes/09.pal delete mode 100644 data/tilesets/secondary/dummy2/palettes/1.pal delete mode 100644 data/tilesets/secondary/dummy2/palettes/2.pal delete mode 100644 data/tilesets/secondary/dummy2/palettes/3.pal delete mode 100644 data/tilesets/secondary/dummy2/palettes/4.pal delete mode 100644 data/tilesets/secondary/dummy2/palettes/5.pal delete mode 100644 data/tilesets/secondary/dummy2/palettes/6.pal delete mode 100644 data/tilesets/secondary/dummy2/palettes/7.pal delete mode 100644 data/tilesets/secondary/dummy2/palettes/8.pal delete mode 100644 data/tilesets/secondary/dummy2/palettes/9.pal delete mode 100644 data/tilesets/secondary/dummy3/palettes/0.pal create mode 100644 data/tilesets/secondary/dummy3/palettes/00.pal create mode 100644 data/tilesets/secondary/dummy3/palettes/01.pal create mode 100644 data/tilesets/secondary/dummy3/palettes/02.pal create mode 100644 data/tilesets/secondary/dummy3/palettes/03.pal create mode 100644 data/tilesets/secondary/dummy3/palettes/04.pal create mode 100644 data/tilesets/secondary/dummy3/palettes/05.pal create mode 100644 data/tilesets/secondary/dummy3/palettes/06.pal create mode 100644 data/tilesets/secondary/dummy3/palettes/07.pal create mode 100644 data/tilesets/secondary/dummy3/palettes/08.pal create mode 100644 data/tilesets/secondary/dummy3/palettes/09.pal delete mode 100644 data/tilesets/secondary/dummy3/palettes/1.pal delete mode 100644 data/tilesets/secondary/dummy3/palettes/2.pal delete mode 100644 data/tilesets/secondary/dummy3/palettes/3.pal delete mode 100644 data/tilesets/secondary/dummy3/palettes/4.pal delete mode 100644 data/tilesets/secondary/dummy3/palettes/5.pal delete mode 100644 data/tilesets/secondary/dummy3/palettes/6.pal delete mode 100644 data/tilesets/secondary/dummy3/palettes/7.pal delete mode 100644 data/tilesets/secondary/dummy3/palettes/8.pal delete mode 100644 data/tilesets/secondary/dummy3/palettes/9.pal delete mode 100644 data/tilesets/secondary/dummy4/palettes/0.pal create mode 100644 data/tilesets/secondary/dummy4/palettes/00.pal create mode 100644 data/tilesets/secondary/dummy4/palettes/01.pal create mode 100644 data/tilesets/secondary/dummy4/palettes/02.pal create mode 100644 data/tilesets/secondary/dummy4/palettes/03.pal create mode 100644 data/tilesets/secondary/dummy4/palettes/04.pal create mode 100644 data/tilesets/secondary/dummy4/palettes/05.pal create mode 100644 data/tilesets/secondary/dummy4/palettes/06.pal create mode 100644 data/tilesets/secondary/dummy4/palettes/07.pal create mode 100644 data/tilesets/secondary/dummy4/palettes/08.pal create mode 100644 data/tilesets/secondary/dummy4/palettes/09.pal delete mode 100644 data/tilesets/secondary/dummy4/palettes/1.pal delete mode 100644 data/tilesets/secondary/dummy4/palettes/2.pal delete mode 100644 data/tilesets/secondary/dummy4/palettes/3.pal delete mode 100644 data/tilesets/secondary/dummy4/palettes/4.pal delete mode 100644 data/tilesets/secondary/dummy4/palettes/5.pal delete mode 100644 data/tilesets/secondary/dummy4/palettes/6.pal delete mode 100644 data/tilesets/secondary/dummy4/palettes/7.pal delete mode 100644 data/tilesets/secondary/dummy4/palettes/8.pal delete mode 100644 data/tilesets/secondary/dummy4/palettes/9.pal delete mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/0.pal create mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/00.pal create mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/01.pal create mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/02.pal create mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/03.pal create mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/04.pal create mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/05.pal create mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/06.pal create mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/07.pal create mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/08.pal create mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/09.pal delete mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/1.pal delete mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/2.pal delete mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/3.pal delete mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/4.pal delete mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/5.pal delete mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/6.pal delete mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/7.pal delete mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/8.pal delete mode 100644 data/tilesets/secondary/fan_club_daycare/palettes/9.pal delete mode 100644 data/tilesets/secondary/fuchsia_city/palettes/0.pal create mode 100644 data/tilesets/secondary/fuchsia_city/palettes/00.pal create mode 100644 data/tilesets/secondary/fuchsia_city/palettes/01.pal create mode 100644 data/tilesets/secondary/fuchsia_city/palettes/02.pal create mode 100644 data/tilesets/secondary/fuchsia_city/palettes/03.pal create mode 100644 data/tilesets/secondary/fuchsia_city/palettes/04.pal create mode 100644 data/tilesets/secondary/fuchsia_city/palettes/05.pal create mode 100644 data/tilesets/secondary/fuchsia_city/palettes/06.pal create mode 100644 data/tilesets/secondary/fuchsia_city/palettes/07.pal create mode 100644 data/tilesets/secondary/fuchsia_city/palettes/08.pal create mode 100644 data/tilesets/secondary/fuchsia_city/palettes/09.pal delete mode 100644 data/tilesets/secondary/fuchsia_city/palettes/1.pal delete mode 100644 data/tilesets/secondary/fuchsia_city/palettes/2.pal delete mode 100644 data/tilesets/secondary/fuchsia_city/palettes/3.pal delete mode 100644 data/tilesets/secondary/fuchsia_city/palettes/4.pal delete mode 100644 data/tilesets/secondary/fuchsia_city/palettes/5.pal delete mode 100644 data/tilesets/secondary/fuchsia_city/palettes/6.pal delete mode 100644 data/tilesets/secondary/fuchsia_city/palettes/7.pal delete mode 100644 data/tilesets/secondary/fuchsia_city/palettes/8.pal delete mode 100644 data/tilesets/secondary/fuchsia_city/palettes/9.pal delete mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/0.pal create mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/00.pal create mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/01.pal create mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/02.pal create mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/03.pal create mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/04.pal create mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/05.pal create mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/06.pal create mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/07.pal create mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/08.pal create mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/09.pal delete mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/1.pal delete mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/2.pal delete mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/3.pal delete mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/4.pal delete mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/5.pal delete mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/6.pal delete mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/7.pal delete mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/8.pal delete mode 100644 data/tilesets/secondary/fuchsia_gym/palettes/9.pal delete mode 100644 data/tilesets/secondary/game_corner/palettes/0.pal create mode 100644 data/tilesets/secondary/game_corner/palettes/00.pal create mode 100644 data/tilesets/secondary/game_corner/palettes/01.pal create mode 100644 data/tilesets/secondary/game_corner/palettes/02.pal create mode 100644 data/tilesets/secondary/game_corner/palettes/03.pal create mode 100644 data/tilesets/secondary/game_corner/palettes/04.pal create mode 100644 data/tilesets/secondary/game_corner/palettes/05.pal create mode 100644 data/tilesets/secondary/game_corner/palettes/06.pal create mode 100644 data/tilesets/secondary/game_corner/palettes/07.pal create mode 100644 data/tilesets/secondary/game_corner/palettes/08.pal create mode 100644 data/tilesets/secondary/game_corner/palettes/09.pal delete mode 100644 data/tilesets/secondary/game_corner/palettes/1.pal delete mode 100644 data/tilesets/secondary/game_corner/palettes/2.pal delete mode 100644 data/tilesets/secondary/game_corner/palettes/3.pal delete mode 100644 data/tilesets/secondary/game_corner/palettes/4.pal delete mode 100644 data/tilesets/secondary/game_corner/palettes/5.pal delete mode 100644 data/tilesets/secondary/game_corner/palettes/6.pal delete mode 100644 data/tilesets/secondary/game_corner/palettes/7.pal delete mode 100644 data/tilesets/secondary/game_corner/palettes/8.pal delete mode 100644 data/tilesets/secondary/game_corner/palettes/9.pal delete mode 100644 data/tilesets/secondary/generic_building1/palettes/0.pal create mode 100644 data/tilesets/secondary/generic_building1/palettes/00.pal create mode 100644 data/tilesets/secondary/generic_building1/palettes/01.pal create mode 100644 data/tilesets/secondary/generic_building1/palettes/02.pal create mode 100644 data/tilesets/secondary/generic_building1/palettes/03.pal create mode 100644 data/tilesets/secondary/generic_building1/palettes/04.pal create mode 100644 data/tilesets/secondary/generic_building1/palettes/05.pal create mode 100644 data/tilesets/secondary/generic_building1/palettes/06.pal create mode 100644 data/tilesets/secondary/generic_building1/palettes/07.pal create mode 100644 data/tilesets/secondary/generic_building1/palettes/08.pal create mode 100644 data/tilesets/secondary/generic_building1/palettes/09.pal delete mode 100644 data/tilesets/secondary/generic_building1/palettes/1.pal delete mode 100644 data/tilesets/secondary/generic_building1/palettes/2.pal delete mode 100644 data/tilesets/secondary/generic_building1/palettes/3.pal delete mode 100644 data/tilesets/secondary/generic_building1/palettes/4.pal delete mode 100644 data/tilesets/secondary/generic_building1/palettes/5.pal delete mode 100644 data/tilesets/secondary/generic_building1/palettes/6.pal delete mode 100644 data/tilesets/secondary/generic_building1/palettes/7.pal delete mode 100644 data/tilesets/secondary/generic_building1/palettes/8.pal delete mode 100644 data/tilesets/secondary/generic_building1/palettes/9.pal delete mode 100644 data/tilesets/secondary/generic_building2/palettes/0.pal create mode 100644 data/tilesets/secondary/generic_building2/palettes/00.pal create mode 100644 data/tilesets/secondary/generic_building2/palettes/01.pal create mode 100644 data/tilesets/secondary/generic_building2/palettes/02.pal create mode 100644 data/tilesets/secondary/generic_building2/palettes/03.pal create mode 100644 data/tilesets/secondary/generic_building2/palettes/04.pal create mode 100644 data/tilesets/secondary/generic_building2/palettes/05.pal create mode 100644 data/tilesets/secondary/generic_building2/palettes/06.pal create mode 100644 data/tilesets/secondary/generic_building2/palettes/07.pal create mode 100644 data/tilesets/secondary/generic_building2/palettes/08.pal create mode 100644 data/tilesets/secondary/generic_building2/palettes/09.pal delete mode 100644 data/tilesets/secondary/generic_building2/palettes/1.pal delete mode 100644 data/tilesets/secondary/generic_building2/palettes/2.pal delete mode 100644 data/tilesets/secondary/generic_building2/palettes/3.pal delete mode 100644 data/tilesets/secondary/generic_building2/palettes/4.pal delete mode 100644 data/tilesets/secondary/generic_building2/palettes/5.pal delete mode 100644 data/tilesets/secondary/generic_building2/palettes/6.pal delete mode 100644 data/tilesets/secondary/generic_building2/palettes/7.pal delete mode 100644 data/tilesets/secondary/generic_building2/palettes/8.pal delete mode 100644 data/tilesets/secondary/generic_building2/palettes/9.pal delete mode 100644 data/tilesets/secondary/hall_of_fame/palettes/0.pal create mode 100644 data/tilesets/secondary/hall_of_fame/palettes/00.pal create mode 100644 data/tilesets/secondary/hall_of_fame/palettes/01.pal create mode 100644 data/tilesets/secondary/hall_of_fame/palettes/02.pal create mode 100644 data/tilesets/secondary/hall_of_fame/palettes/03.pal create mode 100644 data/tilesets/secondary/hall_of_fame/palettes/04.pal create mode 100644 data/tilesets/secondary/hall_of_fame/palettes/05.pal create mode 100644 data/tilesets/secondary/hall_of_fame/palettes/06.pal create mode 100644 data/tilesets/secondary/hall_of_fame/palettes/07.pal create mode 100644 data/tilesets/secondary/hall_of_fame/palettes/08.pal create mode 100644 data/tilesets/secondary/hall_of_fame/palettes/09.pal delete mode 100644 data/tilesets/secondary/hall_of_fame/palettes/1.pal delete mode 100644 data/tilesets/secondary/hall_of_fame/palettes/2.pal delete mode 100644 data/tilesets/secondary/hall_of_fame/palettes/3.pal delete mode 100644 data/tilesets/secondary/hall_of_fame/palettes/4.pal delete mode 100644 data/tilesets/secondary/hall_of_fame/palettes/5.pal delete mode 100644 data/tilesets/secondary/hall_of_fame/palettes/6.pal delete mode 100644 data/tilesets/secondary/hall_of_fame/palettes/7.pal delete mode 100644 data/tilesets/secondary/hall_of_fame/palettes/8.pal delete mode 100644 data/tilesets/secondary/hall_of_fame/palettes/9.pal delete mode 100644 data/tilesets/secondary/hoenn_building/palettes/0.pal create mode 100644 data/tilesets/secondary/hoenn_building/palettes/00.pal create mode 100644 data/tilesets/secondary/hoenn_building/palettes/01.pal create mode 100644 data/tilesets/secondary/hoenn_building/palettes/02.pal create mode 100644 data/tilesets/secondary/hoenn_building/palettes/03.pal create mode 100644 data/tilesets/secondary/hoenn_building/palettes/04.pal create mode 100644 data/tilesets/secondary/hoenn_building/palettes/05.pal create mode 100644 data/tilesets/secondary/hoenn_building/palettes/06.pal create mode 100644 data/tilesets/secondary/hoenn_building/palettes/07.pal create mode 100644 data/tilesets/secondary/hoenn_building/palettes/08.pal create mode 100644 data/tilesets/secondary/hoenn_building/palettes/09.pal delete mode 100644 data/tilesets/secondary/hoenn_building/palettes/1.pal delete mode 100644 data/tilesets/secondary/hoenn_building/palettes/2.pal delete mode 100644 data/tilesets/secondary/hoenn_building/palettes/3.pal delete mode 100644 data/tilesets/secondary/hoenn_building/palettes/4.pal delete mode 100644 data/tilesets/secondary/hoenn_building/palettes/5.pal delete mode 100644 data/tilesets/secondary/hoenn_building/palettes/6.pal delete mode 100644 data/tilesets/secondary/hoenn_building/palettes/7.pal delete mode 100644 data/tilesets/secondary/hoenn_building/palettes/8.pal delete mode 100644 data/tilesets/secondary/hoenn_building/palettes/9.pal delete mode 100644 data/tilesets/secondary/indigo_plateau/palettes/0.pal create mode 100644 data/tilesets/secondary/indigo_plateau/palettes/00.pal create mode 100644 data/tilesets/secondary/indigo_plateau/palettes/01.pal create mode 100644 data/tilesets/secondary/indigo_plateau/palettes/02.pal create mode 100644 data/tilesets/secondary/indigo_plateau/palettes/03.pal create mode 100644 data/tilesets/secondary/indigo_plateau/palettes/04.pal create mode 100644 data/tilesets/secondary/indigo_plateau/palettes/05.pal create mode 100644 data/tilesets/secondary/indigo_plateau/palettes/06.pal create mode 100644 data/tilesets/secondary/indigo_plateau/palettes/07.pal create mode 100644 data/tilesets/secondary/indigo_plateau/palettes/08.pal create mode 100644 data/tilesets/secondary/indigo_plateau/palettes/09.pal delete mode 100644 data/tilesets/secondary/indigo_plateau/palettes/1.pal delete mode 100644 data/tilesets/secondary/indigo_plateau/palettes/2.pal delete mode 100644 data/tilesets/secondary/indigo_plateau/palettes/3.pal delete mode 100644 data/tilesets/secondary/indigo_plateau/palettes/4.pal delete mode 100644 data/tilesets/secondary/indigo_plateau/palettes/5.pal delete mode 100644 data/tilesets/secondary/indigo_plateau/palettes/6.pal delete mode 100644 data/tilesets/secondary/indigo_plateau/palettes/7.pal delete mode 100644 data/tilesets/secondary/indigo_plateau/palettes/8.pal delete mode 100644 data/tilesets/secondary/indigo_plateau/palettes/9.pal delete mode 100644 data/tilesets/secondary/island_harbor/palettes/0.pal create mode 100644 data/tilesets/secondary/island_harbor/palettes/00.pal create mode 100644 data/tilesets/secondary/island_harbor/palettes/01.pal create mode 100644 data/tilesets/secondary/island_harbor/palettes/02.pal create mode 100644 data/tilesets/secondary/island_harbor/palettes/03.pal create mode 100644 data/tilesets/secondary/island_harbor/palettes/04.pal create mode 100644 data/tilesets/secondary/island_harbor/palettes/05.pal create mode 100644 data/tilesets/secondary/island_harbor/palettes/06.pal create mode 100644 data/tilesets/secondary/island_harbor/palettes/07.pal create mode 100644 data/tilesets/secondary/island_harbor/palettes/08.pal create mode 100644 data/tilesets/secondary/island_harbor/palettes/09.pal delete mode 100644 data/tilesets/secondary/island_harbor/palettes/1.pal delete mode 100644 data/tilesets/secondary/island_harbor/palettes/2.pal delete mode 100644 data/tilesets/secondary/island_harbor/palettes/3.pal delete mode 100644 data/tilesets/secondary/island_harbor/palettes/4.pal delete mode 100644 data/tilesets/secondary/island_harbor/palettes/5.pal delete mode 100644 data/tilesets/secondary/island_harbor/palettes/6.pal delete mode 100644 data/tilesets/secondary/island_harbor/palettes/7.pal delete mode 100644 data/tilesets/secondary/island_harbor/palettes/8.pal delete mode 100644 data/tilesets/secondary/island_harbor/palettes/9.pal delete mode 100644 data/tilesets/secondary/lab/palettes/0.pal create mode 100644 data/tilesets/secondary/lab/palettes/00.pal create mode 100644 data/tilesets/secondary/lab/palettes/01.pal create mode 100644 data/tilesets/secondary/lab/palettes/02.pal create mode 100644 data/tilesets/secondary/lab/palettes/03.pal create mode 100644 data/tilesets/secondary/lab/palettes/04.pal create mode 100644 data/tilesets/secondary/lab/palettes/05.pal create mode 100644 data/tilesets/secondary/lab/palettes/06.pal create mode 100644 data/tilesets/secondary/lab/palettes/07.pal create mode 100644 data/tilesets/secondary/lab/palettes/08.pal create mode 100644 data/tilesets/secondary/lab/palettes/09.pal delete mode 100644 data/tilesets/secondary/lab/palettes/1.pal delete mode 100644 data/tilesets/secondary/lab/palettes/2.pal delete mode 100644 data/tilesets/secondary/lab/palettes/3.pal delete mode 100644 data/tilesets/secondary/lab/palettes/4.pal delete mode 100644 data/tilesets/secondary/lab/palettes/5.pal delete mode 100644 data/tilesets/secondary/lab/palettes/6.pal delete mode 100644 data/tilesets/secondary/lab/palettes/7.pal delete mode 100644 data/tilesets/secondary/lab/palettes/8.pal delete mode 100644 data/tilesets/secondary/lab/palettes/9.pal delete mode 100644 data/tilesets/secondary/lavender_town/palettes/0.pal create mode 100644 data/tilesets/secondary/lavender_town/palettes/00.pal create mode 100644 data/tilesets/secondary/lavender_town/palettes/01.pal create mode 100644 data/tilesets/secondary/lavender_town/palettes/02.pal create mode 100644 data/tilesets/secondary/lavender_town/palettes/03.pal create mode 100644 data/tilesets/secondary/lavender_town/palettes/04.pal create mode 100644 data/tilesets/secondary/lavender_town/palettes/05.pal create mode 100644 data/tilesets/secondary/lavender_town/palettes/06.pal create mode 100644 data/tilesets/secondary/lavender_town/palettes/07.pal create mode 100644 data/tilesets/secondary/lavender_town/palettes/08.pal create mode 100644 data/tilesets/secondary/lavender_town/palettes/09.pal delete mode 100644 data/tilesets/secondary/lavender_town/palettes/1.pal delete mode 100644 data/tilesets/secondary/lavender_town/palettes/2.pal delete mode 100644 data/tilesets/secondary/lavender_town/palettes/3.pal delete mode 100644 data/tilesets/secondary/lavender_town/palettes/4.pal delete mode 100644 data/tilesets/secondary/lavender_town/palettes/5.pal delete mode 100644 data/tilesets/secondary/lavender_town/palettes/6.pal delete mode 100644 data/tilesets/secondary/lavender_town/palettes/7.pal delete mode 100644 data/tilesets/secondary/lavender_town/palettes/8.pal delete mode 100644 data/tilesets/secondary/lavender_town/palettes/9.pal delete mode 100644 data/tilesets/secondary/mart/palettes/0.pal create mode 100644 data/tilesets/secondary/mart/palettes/00.pal create mode 100644 data/tilesets/secondary/mart/palettes/01.pal create mode 100644 data/tilesets/secondary/mart/palettes/02.pal create mode 100644 data/tilesets/secondary/mart/palettes/03.pal create mode 100644 data/tilesets/secondary/mart/palettes/04.pal create mode 100644 data/tilesets/secondary/mart/palettes/05.pal create mode 100644 data/tilesets/secondary/mart/palettes/06.pal create mode 100644 data/tilesets/secondary/mart/palettes/07.pal create mode 100644 data/tilesets/secondary/mart/palettes/08.pal create mode 100644 data/tilesets/secondary/mart/palettes/09.pal delete mode 100644 data/tilesets/secondary/mart/palettes/1.pal delete mode 100644 data/tilesets/secondary/mart/palettes/2.pal delete mode 100644 data/tilesets/secondary/mart/palettes/3.pal delete mode 100644 data/tilesets/secondary/mart/palettes/4.pal delete mode 100644 data/tilesets/secondary/mart/palettes/5.pal delete mode 100644 data/tilesets/secondary/mart/palettes/6.pal delete mode 100644 data/tilesets/secondary/mart/palettes/7.pal delete mode 100644 data/tilesets/secondary/mart/palettes/8.pal delete mode 100644 data/tilesets/secondary/mart/palettes/9.pal delete mode 100644 data/tilesets/secondary/mt_ember/palettes/0.pal create mode 100644 data/tilesets/secondary/mt_ember/palettes/00.pal create mode 100644 data/tilesets/secondary/mt_ember/palettes/01.pal create mode 100644 data/tilesets/secondary/mt_ember/palettes/02.pal create mode 100644 data/tilesets/secondary/mt_ember/palettes/03.pal create mode 100644 data/tilesets/secondary/mt_ember/palettes/04.pal create mode 100644 data/tilesets/secondary/mt_ember/palettes/05.pal create mode 100644 data/tilesets/secondary/mt_ember/palettes/06.pal create mode 100644 data/tilesets/secondary/mt_ember/palettes/07.pal create mode 100644 data/tilesets/secondary/mt_ember/palettes/08.pal create mode 100644 data/tilesets/secondary/mt_ember/palettes/09.pal delete mode 100644 data/tilesets/secondary/mt_ember/palettes/1.pal delete mode 100644 data/tilesets/secondary/mt_ember/palettes/2.pal delete mode 100644 data/tilesets/secondary/mt_ember/palettes/3.pal delete mode 100644 data/tilesets/secondary/mt_ember/palettes/4.pal delete mode 100644 data/tilesets/secondary/mt_ember/palettes/5.pal delete mode 100644 data/tilesets/secondary/mt_ember/palettes/6.pal delete mode 100644 data/tilesets/secondary/mt_ember/palettes/7.pal delete mode 100644 data/tilesets/secondary/mt_ember/palettes/8.pal delete mode 100644 data/tilesets/secondary/mt_ember/palettes/9.pal delete mode 100644 data/tilesets/secondary/museum/palettes/0.pal create mode 100644 data/tilesets/secondary/museum/palettes/00.pal create mode 100644 data/tilesets/secondary/museum/palettes/01.pal create mode 100644 data/tilesets/secondary/museum/palettes/02.pal create mode 100644 data/tilesets/secondary/museum/palettes/03.pal create mode 100644 data/tilesets/secondary/museum/palettes/04.pal create mode 100644 data/tilesets/secondary/museum/palettes/05.pal create mode 100644 data/tilesets/secondary/museum/palettes/06.pal create mode 100644 data/tilesets/secondary/museum/palettes/07.pal create mode 100644 data/tilesets/secondary/museum/palettes/08.pal create mode 100644 data/tilesets/secondary/museum/palettes/09.pal delete mode 100644 data/tilesets/secondary/museum/palettes/1.pal delete mode 100644 data/tilesets/secondary/museum/palettes/2.pal delete mode 100644 data/tilesets/secondary/museum/palettes/3.pal delete mode 100644 data/tilesets/secondary/museum/palettes/4.pal delete mode 100644 data/tilesets/secondary/museum/palettes/5.pal delete mode 100644 data/tilesets/secondary/museum/palettes/6.pal delete mode 100644 data/tilesets/secondary/museum/palettes/7.pal delete mode 100644 data/tilesets/secondary/museum/palettes/8.pal delete mode 100644 data/tilesets/secondary/museum/palettes/9.pal delete mode 100644 data/tilesets/secondary/navel_rock/palettes/0.pal create mode 100644 data/tilesets/secondary/navel_rock/palettes/00.pal create mode 100644 data/tilesets/secondary/navel_rock/palettes/01.pal create mode 100644 data/tilesets/secondary/navel_rock/palettes/02.pal create mode 100644 data/tilesets/secondary/navel_rock/palettes/03.pal create mode 100644 data/tilesets/secondary/navel_rock/palettes/04.pal create mode 100644 data/tilesets/secondary/navel_rock/palettes/05.pal create mode 100644 data/tilesets/secondary/navel_rock/palettes/06.pal create mode 100644 data/tilesets/secondary/navel_rock/palettes/07.pal create mode 100644 data/tilesets/secondary/navel_rock/palettes/08.pal create mode 100644 data/tilesets/secondary/navel_rock/palettes/09.pal delete mode 100644 data/tilesets/secondary/navel_rock/palettes/1.pal delete mode 100644 data/tilesets/secondary/navel_rock/palettes/2.pal delete mode 100644 data/tilesets/secondary/navel_rock/palettes/3.pal delete mode 100644 data/tilesets/secondary/navel_rock/palettes/4.pal delete mode 100644 data/tilesets/secondary/navel_rock/palettes/5.pal delete mode 100644 data/tilesets/secondary/navel_rock/palettes/6.pal delete mode 100644 data/tilesets/secondary/navel_rock/palettes/7.pal delete mode 100644 data/tilesets/secondary/navel_rock/palettes/8.pal delete mode 100644 data/tilesets/secondary/navel_rock/palettes/9.pal delete mode 100644 data/tilesets/secondary/pallet_town/palettes/0.pal create mode 100644 data/tilesets/secondary/pallet_town/palettes/00.pal create mode 100644 data/tilesets/secondary/pallet_town/palettes/01.pal create mode 100644 data/tilesets/secondary/pallet_town/palettes/02.pal create mode 100644 data/tilesets/secondary/pallet_town/palettes/03.pal create mode 100644 data/tilesets/secondary/pallet_town/palettes/04.pal create mode 100644 data/tilesets/secondary/pallet_town/palettes/05.pal create mode 100644 data/tilesets/secondary/pallet_town/palettes/06.pal create mode 100644 data/tilesets/secondary/pallet_town/palettes/07.pal create mode 100644 data/tilesets/secondary/pallet_town/palettes/08.pal create mode 100644 data/tilesets/secondary/pallet_town/palettes/09.pal delete mode 100644 data/tilesets/secondary/pallet_town/palettes/1.pal delete mode 100644 data/tilesets/secondary/pallet_town/palettes/2.pal delete mode 100644 data/tilesets/secondary/pallet_town/palettes/3.pal delete mode 100644 data/tilesets/secondary/pallet_town/palettes/4.pal delete mode 100644 data/tilesets/secondary/pallet_town/palettes/5.pal delete mode 100644 data/tilesets/secondary/pallet_town/palettes/6.pal delete mode 100644 data/tilesets/secondary/pallet_town/palettes/7.pal delete mode 100644 data/tilesets/secondary/pallet_town/palettes/8.pal delete mode 100644 data/tilesets/secondary/pallet_town/palettes/9.pal delete mode 100644 data/tilesets/secondary/pewter_city/palettes/0.pal create mode 100644 data/tilesets/secondary/pewter_city/palettes/00.pal create mode 100644 data/tilesets/secondary/pewter_city/palettes/01.pal create mode 100644 data/tilesets/secondary/pewter_city/palettes/02.pal create mode 100644 data/tilesets/secondary/pewter_city/palettes/03.pal create mode 100644 data/tilesets/secondary/pewter_city/palettes/04.pal create mode 100644 data/tilesets/secondary/pewter_city/palettes/05.pal create mode 100644 data/tilesets/secondary/pewter_city/palettes/06.pal create mode 100644 data/tilesets/secondary/pewter_city/palettes/07.pal create mode 100644 data/tilesets/secondary/pewter_city/palettes/08.pal create mode 100644 data/tilesets/secondary/pewter_city/palettes/09.pal delete mode 100644 data/tilesets/secondary/pewter_city/palettes/1.pal delete mode 100644 data/tilesets/secondary/pewter_city/palettes/2.pal delete mode 100644 data/tilesets/secondary/pewter_city/palettes/3.pal delete mode 100644 data/tilesets/secondary/pewter_city/palettes/4.pal delete mode 100644 data/tilesets/secondary/pewter_city/palettes/5.pal delete mode 100644 data/tilesets/secondary/pewter_city/palettes/6.pal delete mode 100644 data/tilesets/secondary/pewter_city/palettes/7.pal delete mode 100644 data/tilesets/secondary/pewter_city/palettes/8.pal delete mode 100644 data/tilesets/secondary/pewter_city/palettes/9.pal delete mode 100644 data/tilesets/secondary/pewter_gym/palettes/0.pal create mode 100644 data/tilesets/secondary/pewter_gym/palettes/00.pal create mode 100644 data/tilesets/secondary/pewter_gym/palettes/01.pal create mode 100644 data/tilesets/secondary/pewter_gym/palettes/02.pal create mode 100644 data/tilesets/secondary/pewter_gym/palettes/03.pal create mode 100644 data/tilesets/secondary/pewter_gym/palettes/04.pal create mode 100644 data/tilesets/secondary/pewter_gym/palettes/05.pal create mode 100644 data/tilesets/secondary/pewter_gym/palettes/06.pal create mode 100644 data/tilesets/secondary/pewter_gym/palettes/07.pal create mode 100644 data/tilesets/secondary/pewter_gym/palettes/08.pal create mode 100644 data/tilesets/secondary/pewter_gym/palettes/09.pal delete mode 100644 data/tilesets/secondary/pewter_gym/palettes/1.pal delete mode 100644 data/tilesets/secondary/pewter_gym/palettes/2.pal delete mode 100644 data/tilesets/secondary/pewter_gym/palettes/3.pal delete mode 100644 data/tilesets/secondary/pewter_gym/palettes/4.pal delete mode 100644 data/tilesets/secondary/pewter_gym/palettes/5.pal delete mode 100644 data/tilesets/secondary/pewter_gym/palettes/6.pal delete mode 100644 data/tilesets/secondary/pewter_gym/palettes/7.pal delete mode 100644 data/tilesets/secondary/pewter_gym/palettes/8.pal delete mode 100644 data/tilesets/secondary/pewter_gym/palettes/9.pal delete mode 100644 data/tilesets/secondary/pokemon_center/palettes/0.pal create mode 100644 data/tilesets/secondary/pokemon_center/palettes/00.pal create mode 100644 data/tilesets/secondary/pokemon_center/palettes/01.pal create mode 100644 data/tilesets/secondary/pokemon_center/palettes/02.pal create mode 100644 data/tilesets/secondary/pokemon_center/palettes/03.pal create mode 100644 data/tilesets/secondary/pokemon_center/palettes/04.pal create mode 100644 data/tilesets/secondary/pokemon_center/palettes/05.pal create mode 100644 data/tilesets/secondary/pokemon_center/palettes/06.pal create mode 100644 data/tilesets/secondary/pokemon_center/palettes/07.pal create mode 100644 data/tilesets/secondary/pokemon_center/palettes/08.pal create mode 100644 data/tilesets/secondary/pokemon_center/palettes/09.pal delete mode 100644 data/tilesets/secondary/pokemon_center/palettes/1.pal delete mode 100644 data/tilesets/secondary/pokemon_center/palettes/2.pal delete mode 100644 data/tilesets/secondary/pokemon_center/palettes/3.pal delete mode 100644 data/tilesets/secondary/pokemon_center/palettes/4.pal delete mode 100644 data/tilesets/secondary/pokemon_center/palettes/5.pal delete mode 100644 data/tilesets/secondary/pokemon_center/palettes/6.pal delete mode 100644 data/tilesets/secondary/pokemon_center/palettes/7.pal delete mode 100644 data/tilesets/secondary/pokemon_center/palettes/8.pal delete mode 100644 data/tilesets/secondary/pokemon_center/palettes/9.pal delete mode 100644 data/tilesets/secondary/pokemon_league/palettes/0.pal create mode 100644 data/tilesets/secondary/pokemon_league/palettes/00.pal create mode 100644 data/tilesets/secondary/pokemon_league/palettes/01.pal create mode 100644 data/tilesets/secondary/pokemon_league/palettes/02.pal create mode 100644 data/tilesets/secondary/pokemon_league/palettes/03.pal create mode 100644 data/tilesets/secondary/pokemon_league/palettes/04.pal create mode 100644 data/tilesets/secondary/pokemon_league/palettes/05.pal create mode 100644 data/tilesets/secondary/pokemon_league/palettes/06.pal create mode 100644 data/tilesets/secondary/pokemon_league/palettes/07.pal create mode 100644 data/tilesets/secondary/pokemon_league/palettes/08.pal create mode 100644 data/tilesets/secondary/pokemon_league/palettes/09.pal delete mode 100644 data/tilesets/secondary/pokemon_league/palettes/1.pal delete mode 100644 data/tilesets/secondary/pokemon_league/palettes/2.pal delete mode 100644 data/tilesets/secondary/pokemon_league/palettes/3.pal delete mode 100644 data/tilesets/secondary/pokemon_league/palettes/4.pal delete mode 100644 data/tilesets/secondary/pokemon_league/palettes/5.pal delete mode 100644 data/tilesets/secondary/pokemon_league/palettes/6.pal delete mode 100644 data/tilesets/secondary/pokemon_league/palettes/7.pal delete mode 100644 data/tilesets/secondary/pokemon_league/palettes/8.pal delete mode 100644 data/tilesets/secondary/pokemon_league/palettes/9.pal delete mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/0.pal create mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/00.pal create mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/01.pal create mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/02.pal create mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/03.pal create mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/04.pal create mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/05.pal create mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/06.pal create mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/07.pal create mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/08.pal create mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/09.pal delete mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/1.pal delete mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/2.pal delete mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/3.pal delete mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/4.pal delete mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/5.pal delete mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/6.pal delete mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/7.pal delete mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/8.pal delete mode 100644 data/tilesets/secondary/pokemon_mansion/palettes/9.pal delete mode 100644 data/tilesets/secondary/pokemon_tower/palettes/0.pal create mode 100644 data/tilesets/secondary/pokemon_tower/palettes/00.pal create mode 100644 data/tilesets/secondary/pokemon_tower/palettes/01.pal create mode 100644 data/tilesets/secondary/pokemon_tower/palettes/02.pal create mode 100644 data/tilesets/secondary/pokemon_tower/palettes/03.pal create mode 100644 data/tilesets/secondary/pokemon_tower/palettes/04.pal create mode 100644 data/tilesets/secondary/pokemon_tower/palettes/05.pal create mode 100644 data/tilesets/secondary/pokemon_tower/palettes/06.pal create mode 100644 data/tilesets/secondary/pokemon_tower/palettes/07.pal create mode 100644 data/tilesets/secondary/pokemon_tower/palettes/08.pal create mode 100644 data/tilesets/secondary/pokemon_tower/palettes/09.pal delete mode 100644 data/tilesets/secondary/pokemon_tower/palettes/1.pal delete mode 100644 data/tilesets/secondary/pokemon_tower/palettes/2.pal delete mode 100644 data/tilesets/secondary/pokemon_tower/palettes/3.pal delete mode 100644 data/tilesets/secondary/pokemon_tower/palettes/4.pal delete mode 100644 data/tilesets/secondary/pokemon_tower/palettes/5.pal delete mode 100644 data/tilesets/secondary/pokemon_tower/palettes/6.pal delete mode 100644 data/tilesets/secondary/pokemon_tower/palettes/7.pal delete mode 100644 data/tilesets/secondary/pokemon_tower/palettes/8.pal delete mode 100644 data/tilesets/secondary/pokemon_tower/palettes/9.pal delete mode 100644 data/tilesets/secondary/power_plant/palettes/0.pal create mode 100644 data/tilesets/secondary/power_plant/palettes/00.pal create mode 100644 data/tilesets/secondary/power_plant/palettes/01.pal create mode 100644 data/tilesets/secondary/power_plant/palettes/02.pal create mode 100644 data/tilesets/secondary/power_plant/palettes/03.pal create mode 100644 data/tilesets/secondary/power_plant/palettes/04.pal create mode 100644 data/tilesets/secondary/power_plant/palettes/05.pal create mode 100644 data/tilesets/secondary/power_plant/palettes/06.pal create mode 100644 data/tilesets/secondary/power_plant/palettes/07.pal create mode 100644 data/tilesets/secondary/power_plant/palettes/08.pal create mode 100644 data/tilesets/secondary/power_plant/palettes/09.pal delete mode 100644 data/tilesets/secondary/power_plant/palettes/1.pal delete mode 100644 data/tilesets/secondary/power_plant/palettes/2.pal delete mode 100644 data/tilesets/secondary/power_plant/palettes/3.pal delete mode 100644 data/tilesets/secondary/power_plant/palettes/4.pal delete mode 100644 data/tilesets/secondary/power_plant/palettes/5.pal delete mode 100644 data/tilesets/secondary/power_plant/palettes/6.pal delete mode 100644 data/tilesets/secondary/power_plant/palettes/7.pal delete mode 100644 data/tilesets/secondary/power_plant/palettes/8.pal delete mode 100644 data/tilesets/secondary/power_plant/palettes/9.pal delete mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/0.pal create mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/00.pal create mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/01.pal create mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/02.pal create mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/03.pal create mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/04.pal create mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/05.pal create mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/06.pal create mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/07.pal create mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/08.pal create mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/09.pal delete mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/1.pal delete mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/2.pal delete mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/3.pal delete mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/4.pal delete mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/5.pal delete mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/6.pal delete mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/7.pal delete mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/8.pal delete mode 100644 data/tilesets/secondary/restaurant_hotel/palettes/9.pal delete mode 100644 data/tilesets/secondary/rock_tunnel/palettes/0.pal create mode 100644 data/tilesets/secondary/rock_tunnel/palettes/00.pal create mode 100644 data/tilesets/secondary/rock_tunnel/palettes/01.pal create mode 100644 data/tilesets/secondary/rock_tunnel/palettes/02.pal create mode 100644 data/tilesets/secondary/rock_tunnel/palettes/03.pal create mode 100644 data/tilesets/secondary/rock_tunnel/palettes/04.pal create mode 100644 data/tilesets/secondary/rock_tunnel/palettes/05.pal create mode 100644 data/tilesets/secondary/rock_tunnel/palettes/06.pal create mode 100644 data/tilesets/secondary/rock_tunnel/palettes/07.pal create mode 100644 data/tilesets/secondary/rock_tunnel/palettes/08.pal create mode 100644 data/tilesets/secondary/rock_tunnel/palettes/09.pal delete mode 100644 data/tilesets/secondary/rock_tunnel/palettes/1.pal delete mode 100644 data/tilesets/secondary/rock_tunnel/palettes/2.pal delete mode 100644 data/tilesets/secondary/rock_tunnel/palettes/3.pal delete mode 100644 data/tilesets/secondary/rock_tunnel/palettes/4.pal delete mode 100644 data/tilesets/secondary/rock_tunnel/palettes/5.pal delete mode 100644 data/tilesets/secondary/rock_tunnel/palettes/6.pal delete mode 100644 data/tilesets/secondary/rock_tunnel/palettes/7.pal delete mode 100644 data/tilesets/secondary/rock_tunnel/palettes/8.pal delete mode 100644 data/tilesets/secondary/rock_tunnel/palettes/9.pal delete mode 100644 data/tilesets/secondary/safari_zone_building/palettes/0.pal create mode 100644 data/tilesets/secondary/safari_zone_building/palettes/00.pal create mode 100644 data/tilesets/secondary/safari_zone_building/palettes/01.pal create mode 100644 data/tilesets/secondary/safari_zone_building/palettes/02.pal create mode 100644 data/tilesets/secondary/safari_zone_building/palettes/03.pal create mode 100644 data/tilesets/secondary/safari_zone_building/palettes/04.pal create mode 100644 data/tilesets/secondary/safari_zone_building/palettes/05.pal create mode 100644 data/tilesets/secondary/safari_zone_building/palettes/06.pal create mode 100644 data/tilesets/secondary/safari_zone_building/palettes/07.pal create mode 100644 data/tilesets/secondary/safari_zone_building/palettes/08.pal create mode 100644 data/tilesets/secondary/safari_zone_building/palettes/09.pal delete mode 100644 data/tilesets/secondary/safari_zone_building/palettes/1.pal delete mode 100644 data/tilesets/secondary/safari_zone_building/palettes/2.pal delete mode 100644 data/tilesets/secondary/safari_zone_building/palettes/3.pal delete mode 100644 data/tilesets/secondary/safari_zone_building/palettes/4.pal delete mode 100644 data/tilesets/secondary/safari_zone_building/palettes/5.pal delete mode 100644 data/tilesets/secondary/safari_zone_building/palettes/6.pal delete mode 100644 data/tilesets/secondary/safari_zone_building/palettes/7.pal delete mode 100644 data/tilesets/secondary/safari_zone_building/palettes/8.pal delete mode 100644 data/tilesets/secondary/safari_zone_building/palettes/9.pal delete mode 100644 data/tilesets/secondary/saffron_city/palettes/0.pal create mode 100644 data/tilesets/secondary/saffron_city/palettes/00.pal create mode 100644 data/tilesets/secondary/saffron_city/palettes/01.pal create mode 100644 data/tilesets/secondary/saffron_city/palettes/02.pal create mode 100644 data/tilesets/secondary/saffron_city/palettes/03.pal create mode 100644 data/tilesets/secondary/saffron_city/palettes/04.pal create mode 100644 data/tilesets/secondary/saffron_city/palettes/05.pal create mode 100644 data/tilesets/secondary/saffron_city/palettes/06.pal create mode 100644 data/tilesets/secondary/saffron_city/palettes/07.pal create mode 100644 data/tilesets/secondary/saffron_city/palettes/08.pal create mode 100644 data/tilesets/secondary/saffron_city/palettes/09.pal delete mode 100644 data/tilesets/secondary/saffron_city/palettes/1.pal delete mode 100644 data/tilesets/secondary/saffron_city/palettes/2.pal delete mode 100644 data/tilesets/secondary/saffron_city/palettes/3.pal delete mode 100644 data/tilesets/secondary/saffron_city/palettes/4.pal delete mode 100644 data/tilesets/secondary/saffron_city/palettes/5.pal delete mode 100644 data/tilesets/secondary/saffron_city/palettes/6.pal delete mode 100644 data/tilesets/secondary/saffron_city/palettes/7.pal delete mode 100644 data/tilesets/secondary/saffron_city/palettes/8.pal delete mode 100644 data/tilesets/secondary/saffron_city/palettes/9.pal delete mode 100644 data/tilesets/secondary/saffron_gym/palettes/0.pal create mode 100644 data/tilesets/secondary/saffron_gym/palettes/00.pal create mode 100644 data/tilesets/secondary/saffron_gym/palettes/01.pal create mode 100644 data/tilesets/secondary/saffron_gym/palettes/02.pal create mode 100644 data/tilesets/secondary/saffron_gym/palettes/03.pal create mode 100644 data/tilesets/secondary/saffron_gym/palettes/04.pal create mode 100644 data/tilesets/secondary/saffron_gym/palettes/05.pal create mode 100644 data/tilesets/secondary/saffron_gym/palettes/06.pal create mode 100644 data/tilesets/secondary/saffron_gym/palettes/07.pal create mode 100644 data/tilesets/secondary/saffron_gym/palettes/08.pal create mode 100644 data/tilesets/secondary/saffron_gym/palettes/09.pal delete mode 100644 data/tilesets/secondary/saffron_gym/palettes/1.pal delete mode 100644 data/tilesets/secondary/saffron_gym/palettes/2.pal delete mode 100644 data/tilesets/secondary/saffron_gym/palettes/3.pal delete mode 100644 data/tilesets/secondary/saffron_gym/palettes/4.pal delete mode 100644 data/tilesets/secondary/saffron_gym/palettes/5.pal delete mode 100644 data/tilesets/secondary/saffron_gym/palettes/6.pal delete mode 100644 data/tilesets/secondary/saffron_gym/palettes/7.pal delete mode 100644 data/tilesets/secondary/saffron_gym/palettes/8.pal delete mode 100644 data/tilesets/secondary/saffron_gym/palettes/9.pal delete mode 100644 data/tilesets/secondary/school/palettes/0.pal create mode 100644 data/tilesets/secondary/school/palettes/00.pal create mode 100644 data/tilesets/secondary/school/palettes/01.pal create mode 100644 data/tilesets/secondary/school/palettes/02.pal create mode 100644 data/tilesets/secondary/school/palettes/03.pal create mode 100644 data/tilesets/secondary/school/palettes/04.pal create mode 100644 data/tilesets/secondary/school/palettes/05.pal create mode 100644 data/tilesets/secondary/school/palettes/06.pal create mode 100644 data/tilesets/secondary/school/palettes/07.pal create mode 100644 data/tilesets/secondary/school/palettes/08.pal create mode 100644 data/tilesets/secondary/school/palettes/09.pal delete mode 100644 data/tilesets/secondary/school/palettes/1.pal delete mode 100644 data/tilesets/secondary/school/palettes/2.pal delete mode 100644 data/tilesets/secondary/school/palettes/3.pal delete mode 100644 data/tilesets/secondary/school/palettes/4.pal delete mode 100644 data/tilesets/secondary/school/palettes/5.pal delete mode 100644 data/tilesets/secondary/school/palettes/6.pal delete mode 100644 data/tilesets/secondary/school/palettes/7.pal delete mode 100644 data/tilesets/secondary/school/palettes/8.pal delete mode 100644 data/tilesets/secondary/school/palettes/9.pal delete mode 100644 data/tilesets/secondary/sea_cottage/palettes/0.pal create mode 100644 data/tilesets/secondary/sea_cottage/palettes/00.pal create mode 100644 data/tilesets/secondary/sea_cottage/palettes/01.pal create mode 100644 data/tilesets/secondary/sea_cottage/palettes/02.pal create mode 100644 data/tilesets/secondary/sea_cottage/palettes/03.pal create mode 100644 data/tilesets/secondary/sea_cottage/palettes/04.pal create mode 100644 data/tilesets/secondary/sea_cottage/palettes/05.pal create mode 100644 data/tilesets/secondary/sea_cottage/palettes/06.pal create mode 100644 data/tilesets/secondary/sea_cottage/palettes/07.pal create mode 100644 data/tilesets/secondary/sea_cottage/palettes/08.pal create mode 100644 data/tilesets/secondary/sea_cottage/palettes/09.pal delete mode 100644 data/tilesets/secondary/sea_cottage/palettes/1.pal delete mode 100644 data/tilesets/secondary/sea_cottage/palettes/2.pal delete mode 100644 data/tilesets/secondary/sea_cottage/palettes/3.pal delete mode 100644 data/tilesets/secondary/sea_cottage/palettes/4.pal delete mode 100644 data/tilesets/secondary/sea_cottage/palettes/5.pal delete mode 100644 data/tilesets/secondary/sea_cottage/palettes/6.pal delete mode 100644 data/tilesets/secondary/sea_cottage/palettes/7.pal delete mode 100644 data/tilesets/secondary/sea_cottage/palettes/8.pal delete mode 100644 data/tilesets/secondary/sea_cottage/palettes/9.pal delete mode 100644 data/tilesets/secondary/seafoam_islands/palettes/0.pal create mode 100644 data/tilesets/secondary/seafoam_islands/palettes/00.pal create mode 100644 data/tilesets/secondary/seafoam_islands/palettes/01.pal create mode 100644 data/tilesets/secondary/seafoam_islands/palettes/02.pal create mode 100644 data/tilesets/secondary/seafoam_islands/palettes/03.pal create mode 100644 data/tilesets/secondary/seafoam_islands/palettes/04.pal create mode 100644 data/tilesets/secondary/seafoam_islands/palettes/05.pal create mode 100644 data/tilesets/secondary/seafoam_islands/palettes/06.pal create mode 100644 data/tilesets/secondary/seafoam_islands/palettes/07.pal create mode 100644 data/tilesets/secondary/seafoam_islands/palettes/08.pal create mode 100644 data/tilesets/secondary/seafoam_islands/palettes/09.pal delete mode 100644 data/tilesets/secondary/seafoam_islands/palettes/1.pal delete mode 100644 data/tilesets/secondary/seafoam_islands/palettes/2.pal delete mode 100644 data/tilesets/secondary/seafoam_islands/palettes/3.pal delete mode 100644 data/tilesets/secondary/seafoam_islands/palettes/4.pal delete mode 100644 data/tilesets/secondary/seafoam_islands/palettes/5.pal delete mode 100644 data/tilesets/secondary/seafoam_islands/palettes/6.pal delete mode 100644 data/tilesets/secondary/seafoam_islands/palettes/7.pal delete mode 100644 data/tilesets/secondary/seafoam_islands/palettes/8.pal delete mode 100644 data/tilesets/secondary/seafoam_islands/palettes/9.pal delete mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/0.pal create mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/00.pal create mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/01.pal create mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/02.pal create mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/03.pal create mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/04.pal create mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/05.pal create mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/06.pal create mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/07.pal create mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/08.pal create mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/09.pal delete mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/1.pal delete mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/2.pal delete mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/3.pal delete mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/4.pal delete mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/5.pal delete mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/6.pal delete mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/7.pal delete mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/8.pal delete mode 100644 data/tilesets/secondary/sevii_islands_123/palettes/9.pal delete mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/0.pal create mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/00.pal create mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/01.pal create mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/02.pal create mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/03.pal create mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/04.pal create mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/05.pal create mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/06.pal create mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/07.pal create mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/08.pal create mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/09.pal delete mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/1.pal delete mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/2.pal delete mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/3.pal delete mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/4.pal delete mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/5.pal delete mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/6.pal delete mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/7.pal delete mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/8.pal delete mode 100644 data/tilesets/secondary/sevii_islands_45/palettes/9.pal delete mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/0.pal create mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/00.pal create mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/01.pal create mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/02.pal create mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/03.pal create mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/04.pal create mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/05.pal create mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/06.pal create mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/07.pal create mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/08.pal create mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/09.pal delete mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/1.pal delete mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/2.pal delete mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/3.pal delete mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/4.pal delete mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/5.pal delete mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/6.pal delete mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/7.pal delete mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/8.pal delete mode 100644 data/tilesets/secondary/sevii_islands_67/palettes/9.pal delete mode 100644 data/tilesets/secondary/ss_anne/palettes/0.pal create mode 100644 data/tilesets/secondary/ss_anne/palettes/00.pal create mode 100644 data/tilesets/secondary/ss_anne/palettes/01.pal create mode 100644 data/tilesets/secondary/ss_anne/palettes/02.pal create mode 100644 data/tilesets/secondary/ss_anne/palettes/03.pal create mode 100644 data/tilesets/secondary/ss_anne/palettes/04.pal create mode 100644 data/tilesets/secondary/ss_anne/palettes/05.pal create mode 100644 data/tilesets/secondary/ss_anne/palettes/06.pal create mode 100644 data/tilesets/secondary/ss_anne/palettes/07.pal create mode 100644 data/tilesets/secondary/ss_anne/palettes/08.pal create mode 100644 data/tilesets/secondary/ss_anne/palettes/09.pal delete mode 100644 data/tilesets/secondary/ss_anne/palettes/1.pal delete mode 100644 data/tilesets/secondary/ss_anne/palettes/2.pal delete mode 100644 data/tilesets/secondary/ss_anne/palettes/3.pal delete mode 100644 data/tilesets/secondary/ss_anne/palettes/4.pal delete mode 100644 data/tilesets/secondary/ss_anne/palettes/5.pal delete mode 100644 data/tilesets/secondary/ss_anne/palettes/6.pal delete mode 100644 data/tilesets/secondary/ss_anne/palettes/7.pal delete mode 100644 data/tilesets/secondary/ss_anne/palettes/8.pal delete mode 100644 data/tilesets/secondary/ss_anne/palettes/9.pal delete mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/0.pal create mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/00.pal create mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/01.pal create mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/02.pal create mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/03.pal create mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/04.pal create mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/05.pal create mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/06.pal create mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/07.pal create mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/08.pal create mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/09.pal delete mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/1.pal delete mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/2.pal delete mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/3.pal delete mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/4.pal delete mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/5.pal delete mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/6.pal delete mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/7.pal delete mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/8.pal delete mode 100644 data/tilesets/secondary/tanoby_ruins/palettes/9.pal delete mode 100644 data/tilesets/secondary/trainer_tower/palettes/0.pal create mode 100644 data/tilesets/secondary/trainer_tower/palettes/00.pal create mode 100644 data/tilesets/secondary/trainer_tower/palettes/01.pal create mode 100644 data/tilesets/secondary/trainer_tower/palettes/02.pal create mode 100644 data/tilesets/secondary/trainer_tower/palettes/03.pal create mode 100644 data/tilesets/secondary/trainer_tower/palettes/04.pal create mode 100644 data/tilesets/secondary/trainer_tower/palettes/05.pal create mode 100644 data/tilesets/secondary/trainer_tower/palettes/06.pal create mode 100644 data/tilesets/secondary/trainer_tower/palettes/07.pal create mode 100644 data/tilesets/secondary/trainer_tower/palettes/08.pal create mode 100644 data/tilesets/secondary/trainer_tower/palettes/09.pal delete mode 100644 data/tilesets/secondary/trainer_tower/palettes/1.pal delete mode 100644 data/tilesets/secondary/trainer_tower/palettes/2.pal delete mode 100644 data/tilesets/secondary/trainer_tower/palettes/3.pal delete mode 100644 data/tilesets/secondary/trainer_tower/palettes/4.pal delete mode 100644 data/tilesets/secondary/trainer_tower/palettes/5.pal delete mode 100644 data/tilesets/secondary/trainer_tower/palettes/6.pal delete mode 100644 data/tilesets/secondary/trainer_tower/palettes/7.pal delete mode 100644 data/tilesets/secondary/trainer_tower/palettes/8.pal delete mode 100644 data/tilesets/secondary/trainer_tower/palettes/9.pal delete mode 100644 data/tilesets/secondary/underground_path/palettes/0.pal create mode 100644 data/tilesets/secondary/underground_path/palettes/00.pal create mode 100644 data/tilesets/secondary/underground_path/palettes/01.pal create mode 100644 data/tilesets/secondary/underground_path/palettes/02.pal create mode 100644 data/tilesets/secondary/underground_path/palettes/03.pal create mode 100644 data/tilesets/secondary/underground_path/palettes/04.pal create mode 100644 data/tilesets/secondary/underground_path/palettes/05.pal create mode 100644 data/tilesets/secondary/underground_path/palettes/06.pal create mode 100644 data/tilesets/secondary/underground_path/palettes/07.pal create mode 100644 data/tilesets/secondary/underground_path/palettes/08.pal create mode 100644 data/tilesets/secondary/underground_path/palettes/09.pal delete mode 100644 data/tilesets/secondary/underground_path/palettes/1.pal delete mode 100644 data/tilesets/secondary/underground_path/palettes/2.pal delete mode 100644 data/tilesets/secondary/underground_path/palettes/3.pal delete mode 100644 data/tilesets/secondary/underground_path/palettes/4.pal delete mode 100644 data/tilesets/secondary/underground_path/palettes/5.pal delete mode 100644 data/tilesets/secondary/underground_path/palettes/6.pal delete mode 100644 data/tilesets/secondary/underground_path/palettes/7.pal delete mode 100644 data/tilesets/secondary/underground_path/palettes/8.pal delete mode 100644 data/tilesets/secondary/underground_path/palettes/9.pal delete mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/0.pal create mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/00.pal create mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/01.pal create mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/02.pal create mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/03.pal create mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/04.pal create mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/05.pal create mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/06.pal create mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/07.pal create mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/08.pal create mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/09.pal delete mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/1.pal delete mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/2.pal delete mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/3.pal delete mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/4.pal delete mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/5.pal delete mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/6.pal delete mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/7.pal delete mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/8.pal delete mode 100644 data/tilesets/secondary/unused_gatehouse1/palettes/9.pal delete mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/0.pal create mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/00.pal create mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/01.pal create mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/02.pal create mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/03.pal create mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/04.pal create mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/05.pal create mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/06.pal create mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/07.pal create mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/08.pal create mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/09.pal delete mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/1.pal delete mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/2.pal delete mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/3.pal delete mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/4.pal delete mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/5.pal delete mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/6.pal delete mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/7.pal delete mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/8.pal delete mode 100644 data/tilesets/secondary/unused_gatehouse2/palettes/9.pal delete mode 100644 data/tilesets/secondary/vermilion_city/palettes/0.pal create mode 100644 data/tilesets/secondary/vermilion_city/palettes/00.pal create mode 100644 data/tilesets/secondary/vermilion_city/palettes/01.pal create mode 100644 data/tilesets/secondary/vermilion_city/palettes/02.pal create mode 100644 data/tilesets/secondary/vermilion_city/palettes/03.pal create mode 100644 data/tilesets/secondary/vermilion_city/palettes/04.pal create mode 100644 data/tilesets/secondary/vermilion_city/palettes/05.pal create mode 100644 data/tilesets/secondary/vermilion_city/palettes/06.pal create mode 100644 data/tilesets/secondary/vermilion_city/palettes/07.pal create mode 100644 data/tilesets/secondary/vermilion_city/palettes/08.pal create mode 100644 data/tilesets/secondary/vermilion_city/palettes/09.pal delete mode 100644 data/tilesets/secondary/vermilion_city/palettes/1.pal delete mode 100644 data/tilesets/secondary/vermilion_city/palettes/2.pal delete mode 100644 data/tilesets/secondary/vermilion_city/palettes/3.pal delete mode 100644 data/tilesets/secondary/vermilion_city/palettes/4.pal delete mode 100644 data/tilesets/secondary/vermilion_city/palettes/5.pal delete mode 100644 data/tilesets/secondary/vermilion_city/palettes/6.pal delete mode 100644 data/tilesets/secondary/vermilion_city/palettes/7.pal delete mode 100644 data/tilesets/secondary/vermilion_city/palettes/8.pal delete mode 100644 data/tilesets/secondary/vermilion_city/palettes/9.pal delete mode 100644 data/tilesets/secondary/vermilion_gym/palettes/0.pal create mode 100644 data/tilesets/secondary/vermilion_gym/palettes/00.pal create mode 100644 data/tilesets/secondary/vermilion_gym/palettes/01.pal create mode 100644 data/tilesets/secondary/vermilion_gym/palettes/02.pal create mode 100644 data/tilesets/secondary/vermilion_gym/palettes/03.pal create mode 100644 data/tilesets/secondary/vermilion_gym/palettes/04.pal create mode 100644 data/tilesets/secondary/vermilion_gym/palettes/05.pal create mode 100644 data/tilesets/secondary/vermilion_gym/palettes/06.pal create mode 100644 data/tilesets/secondary/vermilion_gym/palettes/07.pal create mode 100644 data/tilesets/secondary/vermilion_gym/palettes/08.pal create mode 100644 data/tilesets/secondary/vermilion_gym/palettes/09.pal delete mode 100644 data/tilesets/secondary/vermilion_gym/palettes/1.pal delete mode 100644 data/tilesets/secondary/vermilion_gym/palettes/2.pal delete mode 100644 data/tilesets/secondary/vermilion_gym/palettes/3.pal delete mode 100644 data/tilesets/secondary/vermilion_gym/palettes/4.pal delete mode 100644 data/tilesets/secondary/vermilion_gym/palettes/5.pal delete mode 100644 data/tilesets/secondary/vermilion_gym/palettes/6.pal delete mode 100644 data/tilesets/secondary/vermilion_gym/palettes/7.pal delete mode 100644 data/tilesets/secondary/vermilion_gym/palettes/8.pal delete mode 100644 data/tilesets/secondary/vermilion_gym/palettes/9.pal delete mode 100644 data/tilesets/secondary/viridian_city/palettes/0.pal create mode 100644 data/tilesets/secondary/viridian_city/palettes/00.pal create mode 100644 data/tilesets/secondary/viridian_city/palettes/01.pal create mode 100644 data/tilesets/secondary/viridian_city/palettes/02.pal create mode 100644 data/tilesets/secondary/viridian_city/palettes/03.pal create mode 100644 data/tilesets/secondary/viridian_city/palettes/04.pal create mode 100644 data/tilesets/secondary/viridian_city/palettes/05.pal create mode 100644 data/tilesets/secondary/viridian_city/palettes/06.pal create mode 100644 data/tilesets/secondary/viridian_city/palettes/07.pal create mode 100644 data/tilesets/secondary/viridian_city/palettes/08.pal create mode 100644 data/tilesets/secondary/viridian_city/palettes/09.pal delete mode 100644 data/tilesets/secondary/viridian_city/palettes/1.pal delete mode 100644 data/tilesets/secondary/viridian_city/palettes/2.pal delete mode 100644 data/tilesets/secondary/viridian_city/palettes/3.pal delete mode 100644 data/tilesets/secondary/viridian_city/palettes/4.pal delete mode 100644 data/tilesets/secondary/viridian_city/palettes/5.pal delete mode 100644 data/tilesets/secondary/viridian_city/palettes/6.pal delete mode 100644 data/tilesets/secondary/viridian_city/palettes/7.pal delete mode 100644 data/tilesets/secondary/viridian_city/palettes/8.pal delete mode 100644 data/tilesets/secondary/viridian_city/palettes/9.pal delete mode 100644 data/tilesets/secondary/viridian_forest/palettes/0.pal create mode 100644 data/tilesets/secondary/viridian_forest/palettes/00.pal create mode 100644 data/tilesets/secondary/viridian_forest/palettes/01.pal create mode 100644 data/tilesets/secondary/viridian_forest/palettes/02.pal create mode 100644 data/tilesets/secondary/viridian_forest/palettes/03.pal create mode 100644 data/tilesets/secondary/viridian_forest/palettes/04.pal create mode 100644 data/tilesets/secondary/viridian_forest/palettes/05.pal create mode 100644 data/tilesets/secondary/viridian_forest/palettes/06.pal create mode 100644 data/tilesets/secondary/viridian_forest/palettes/07.pal create mode 100644 data/tilesets/secondary/viridian_forest/palettes/08.pal create mode 100644 data/tilesets/secondary/viridian_forest/palettes/09.pal delete mode 100644 data/tilesets/secondary/viridian_forest/palettes/1.pal delete mode 100644 data/tilesets/secondary/viridian_forest/palettes/2.pal delete mode 100644 data/tilesets/secondary/viridian_forest/palettes/3.pal delete mode 100644 data/tilesets/secondary/viridian_forest/palettes/4.pal delete mode 100644 data/tilesets/secondary/viridian_forest/palettes/5.pal delete mode 100644 data/tilesets/secondary/viridian_forest/palettes/6.pal delete mode 100644 data/tilesets/secondary/viridian_forest/palettes/7.pal delete mode 100644 data/tilesets/secondary/viridian_forest/palettes/8.pal delete mode 100644 data/tilesets/secondary/viridian_forest/palettes/9.pal delete mode 100644 data/tilesets/secondary/viridian_gym/palettes/0.pal create mode 100644 data/tilesets/secondary/viridian_gym/palettes/00.pal create mode 100644 data/tilesets/secondary/viridian_gym/palettes/01.pal create mode 100644 data/tilesets/secondary/viridian_gym/palettes/02.pal create mode 100644 data/tilesets/secondary/viridian_gym/palettes/03.pal create mode 100644 data/tilesets/secondary/viridian_gym/palettes/04.pal create mode 100644 data/tilesets/secondary/viridian_gym/palettes/05.pal create mode 100644 data/tilesets/secondary/viridian_gym/palettes/06.pal create mode 100644 data/tilesets/secondary/viridian_gym/palettes/07.pal create mode 100644 data/tilesets/secondary/viridian_gym/palettes/08.pal create mode 100644 data/tilesets/secondary/viridian_gym/palettes/09.pal delete mode 100644 data/tilesets/secondary/viridian_gym/palettes/1.pal delete mode 100644 data/tilesets/secondary/viridian_gym/palettes/2.pal delete mode 100644 data/tilesets/secondary/viridian_gym/palettes/3.pal delete mode 100644 data/tilesets/secondary/viridian_gym/palettes/4.pal delete mode 100644 data/tilesets/secondary/viridian_gym/palettes/5.pal delete mode 100644 data/tilesets/secondary/viridian_gym/palettes/6.pal delete mode 100644 data/tilesets/secondary/viridian_gym/palettes/7.pal delete mode 100644 data/tilesets/secondary/viridian_gym/palettes/8.pal delete mode 100644 data/tilesets/secondary/viridian_gym/palettes/9.pal (limited to 'data') diff --git a/data/tilesets/graphics.inc b/data/tilesets/graphics.inc index 6fc9a48f6..46ccee45b 100644 --- a/data/tilesets/graphics.inc +++ b/data/tilesets/graphics.inc @@ -4,16 +4,16 @@ gTilesetTiles_PalletTown:: @ 826D37C .align 2 gTilesetPalettes_PalletTown:: @ 826D7C0 - .incbin "data/tilesets/secondary/pallet_town/palettes/0.gbapal" - .incbin "data/tilesets/secondary/pallet_town/palettes/1.gbapal" - .incbin "data/tilesets/secondary/pallet_town/palettes/2.gbapal" - .incbin "data/tilesets/secondary/pallet_town/palettes/3.gbapal" - .incbin "data/tilesets/secondary/pallet_town/palettes/4.gbapal" - .incbin "data/tilesets/secondary/pallet_town/palettes/5.gbapal" - .incbin "data/tilesets/secondary/pallet_town/palettes/6.gbapal" - .incbin "data/tilesets/secondary/pallet_town/palettes/7.gbapal" - .incbin "data/tilesets/secondary/pallet_town/palettes/8.gbapal" - .incbin "data/tilesets/secondary/pallet_town/palettes/9.gbapal" + .incbin "data/tilesets/secondary/pallet_town/palettes/00.gbapal" + .incbin "data/tilesets/secondary/pallet_town/palettes/01.gbapal" + .incbin "data/tilesets/secondary/pallet_town/palettes/02.gbapal" + .incbin "data/tilesets/secondary/pallet_town/palettes/03.gbapal" + .incbin "data/tilesets/secondary/pallet_town/palettes/04.gbapal" + .incbin "data/tilesets/secondary/pallet_town/palettes/05.gbapal" + .incbin "data/tilesets/secondary/pallet_town/palettes/06.gbapal" + .incbin "data/tilesets/secondary/pallet_town/palettes/07.gbapal" + .incbin "data/tilesets/secondary/pallet_town/palettes/08.gbapal" + .incbin "data/tilesets/secondary/pallet_town/palettes/09.gbapal" .incbin "data/tilesets/secondary/pallet_town/palettes/10.gbapal" .incbin "data/tilesets/secondary/pallet_town/palettes/11.gbapal" .incbin "data/tilesets/secondary/pallet_town/palettes/12.gbapal" @@ -27,16 +27,16 @@ gTilesetTiles_ViridianCity:: @ 826D9C0 .align 2 gTilesetPalettes_ViridianCity:: @ 826DFC0 - .incbin "data/tilesets/secondary/viridian_city/palettes/0.gbapal" - .incbin "data/tilesets/secondary/viridian_city/palettes/1.gbapal" - .incbin "data/tilesets/secondary/viridian_city/palettes/2.gbapal" - .incbin "data/tilesets/secondary/viridian_city/palettes/3.gbapal" - .incbin "data/tilesets/secondary/viridian_city/palettes/4.gbapal" - .incbin "data/tilesets/secondary/viridian_city/palettes/5.gbapal" - .incbin "data/tilesets/secondary/viridian_city/palettes/6.gbapal" - .incbin "data/tilesets/secondary/viridian_city/palettes/7.gbapal" - .incbin "data/tilesets/secondary/viridian_city/palettes/8.gbapal" - .incbin "data/tilesets/secondary/viridian_city/palettes/9.gbapal" + .incbin "data/tilesets/secondary/viridian_city/palettes/00.gbapal" + .incbin "data/tilesets/secondary/viridian_city/palettes/01.gbapal" + .incbin "data/tilesets/secondary/viridian_city/palettes/02.gbapal" + .incbin "data/tilesets/secondary/viridian_city/palettes/03.gbapal" + .incbin "data/tilesets/secondary/viridian_city/palettes/04.gbapal" + .incbin "data/tilesets/secondary/viridian_city/palettes/05.gbapal" + .incbin "data/tilesets/secondary/viridian_city/palettes/06.gbapal" + .incbin "data/tilesets/secondary/viridian_city/palettes/07.gbapal" + .incbin "data/tilesets/secondary/viridian_city/palettes/08.gbapal" + .incbin "data/tilesets/secondary/viridian_city/palettes/09.gbapal" .incbin "data/tilesets/secondary/viridian_city/palettes/10.gbapal" .incbin "data/tilesets/secondary/viridian_city/palettes/11.gbapal" .incbin "data/tilesets/secondary/viridian_city/palettes/12.gbapal" @@ -50,16 +50,16 @@ gTilesetTiles_PewterCity:: @ 826E1C0 .align 2 gTilesetPalettes_PewterCity:: @ 826EAB8 - .incbin "data/tilesets/secondary/pewter_city/palettes/0.gbapal" - .incbin "data/tilesets/secondary/pewter_city/palettes/1.gbapal" - .incbin "data/tilesets/secondary/pewter_city/palettes/2.gbapal" - .incbin "data/tilesets/secondary/pewter_city/palettes/3.gbapal" - .incbin "data/tilesets/secondary/pewter_city/palettes/4.gbapal" - .incbin "data/tilesets/secondary/pewter_city/palettes/5.gbapal" - .incbin "data/tilesets/secondary/pewter_city/palettes/6.gbapal" - .incbin "data/tilesets/secondary/pewter_city/palettes/7.gbapal" - .incbin "data/tilesets/secondary/pewter_city/palettes/8.gbapal" - .incbin "data/tilesets/secondary/pewter_city/palettes/9.gbapal" + .incbin "data/tilesets/secondary/pewter_city/palettes/00.gbapal" + .incbin "data/tilesets/secondary/pewter_city/palettes/01.gbapal" + .incbin "data/tilesets/secondary/pewter_city/palettes/02.gbapal" + .incbin "data/tilesets/secondary/pewter_city/palettes/03.gbapal" + .incbin "data/tilesets/secondary/pewter_city/palettes/04.gbapal" + .incbin "data/tilesets/secondary/pewter_city/palettes/05.gbapal" + .incbin "data/tilesets/secondary/pewter_city/palettes/06.gbapal" + .incbin "data/tilesets/secondary/pewter_city/palettes/07.gbapal" + .incbin "data/tilesets/secondary/pewter_city/palettes/08.gbapal" + .incbin "data/tilesets/secondary/pewter_city/palettes/09.gbapal" .incbin "data/tilesets/secondary/pewter_city/palettes/10.gbapal" .incbin "data/tilesets/secondary/pewter_city/palettes/11.gbapal" .incbin "data/tilesets/secondary/pewter_city/palettes/12.gbapal" @@ -73,16 +73,16 @@ gTilesetTiles_CeruleanCity:: @ 826ECB8 .align 2 gTilesetPalettes_CeruleanCity:: @ 826F4B8 - .incbin "data/tilesets/secondary/cerulean_city/palettes/0.gbapal" - .incbin "data/tilesets/secondary/cerulean_city/palettes/1.gbapal" - .incbin "data/tilesets/secondary/cerulean_city/palettes/2.gbapal" - .incbin "data/tilesets/secondary/cerulean_city/palettes/3.gbapal" - .incbin "data/tilesets/secondary/cerulean_city/palettes/4.gbapal" - .incbin "data/tilesets/secondary/cerulean_city/palettes/5.gbapal" - .incbin "data/tilesets/secondary/cerulean_city/palettes/6.gbapal" - .incbin "data/tilesets/secondary/cerulean_city/palettes/7.gbapal" - .incbin "data/tilesets/secondary/cerulean_city/palettes/8.gbapal" - .incbin "data/tilesets/secondary/cerulean_city/palettes/9.gbapal" + .incbin "data/tilesets/secondary/cerulean_city/palettes/00.gbapal" + .incbin "data/tilesets/secondary/cerulean_city/palettes/01.gbapal" + .incbin "data/tilesets/secondary/cerulean_city/palettes/02.gbapal" + .incbin "data/tilesets/secondary/cerulean_city/palettes/03.gbapal" + .incbin "data/tilesets/secondary/cerulean_city/palettes/04.gbapal" + .incbin "data/tilesets/secondary/cerulean_city/palettes/05.gbapal" + .incbin "data/tilesets/secondary/cerulean_city/palettes/06.gbapal" + .incbin "data/tilesets/secondary/cerulean_city/palettes/07.gbapal" + .incbin "data/tilesets/secondary/cerulean_city/palettes/08.gbapal" + .incbin "data/tilesets/secondary/cerulean_city/palettes/09.gbapal" .incbin "data/tilesets/secondary/cerulean_city/palettes/10.gbapal" .incbin "data/tilesets/secondary/cerulean_city/palettes/11.gbapal" .incbin "data/tilesets/secondary/cerulean_city/palettes/12.gbapal" @@ -96,16 +96,16 @@ gTilesetTiles_LavenderTown:: @ 826F6B8 .align 2 gTilesetPalettes_LavenderTown:: @ 8270438 - .incbin "data/tilesets/secondary/lavender_town/palettes/0.gbapal" - .incbin "data/tilesets/secondary/lavender_town/palettes/1.gbapal" - .incbin "data/tilesets/secondary/lavender_town/palettes/2.gbapal" - .incbin "data/tilesets/secondary/lavender_town/palettes/3.gbapal" - .incbin "data/tilesets/secondary/lavender_town/palettes/4.gbapal" - .incbin "data/tilesets/secondary/lavender_town/palettes/5.gbapal" - .incbin "data/tilesets/secondary/lavender_town/palettes/6.gbapal" - .incbin "data/tilesets/secondary/lavender_town/palettes/7.gbapal" - .incbin "data/tilesets/secondary/lavender_town/palettes/8.gbapal" - .incbin "data/tilesets/secondary/lavender_town/palettes/9.gbapal" + .incbin "data/tilesets/secondary/lavender_town/palettes/00.gbapal" + .incbin "data/tilesets/secondary/lavender_town/palettes/01.gbapal" + .incbin "data/tilesets/secondary/lavender_town/palettes/02.gbapal" + .incbin "data/tilesets/secondary/lavender_town/palettes/03.gbapal" + .incbin "data/tilesets/secondary/lavender_town/palettes/04.gbapal" + .incbin "data/tilesets/secondary/lavender_town/palettes/05.gbapal" + .incbin "data/tilesets/secondary/lavender_town/palettes/06.gbapal" + .incbin "data/tilesets/secondary/lavender_town/palettes/07.gbapal" + .incbin "data/tilesets/secondary/lavender_town/palettes/08.gbapal" + .incbin "data/tilesets/secondary/lavender_town/palettes/09.gbapal" .incbin "data/tilesets/secondary/lavender_town/palettes/10.gbapal" .incbin "data/tilesets/secondary/lavender_town/palettes/11.gbapal" .incbin "data/tilesets/secondary/lavender_town/palettes/12.gbapal" @@ -119,16 +119,16 @@ gTilesetTiles_VermilionCity:: @ 8270638 .align 2 gTilesetPalettes_VermilionCity:: @ 8270DA0 - .incbin "data/tilesets/secondary/vermilion_city/palettes/0.gbapal" - .incbin "data/tilesets/secondary/vermilion_city/palettes/1.gbapal" - .incbin "data/tilesets/secondary/vermilion_city/palettes/2.gbapal" - .incbin "data/tilesets/secondary/vermilion_city/palettes/3.gbapal" - .incbin "data/tilesets/secondary/vermilion_city/palettes/4.gbapal" - .incbin "data/tilesets/secondary/vermilion_city/palettes/5.gbapal" - .incbin "data/tilesets/secondary/vermilion_city/palettes/6.gbapal" - .incbin "data/tilesets/secondary/vermilion_city/palettes/7.gbapal" - .incbin "data/tilesets/secondary/vermilion_city/palettes/8.gbapal" - .incbin "data/tilesets/secondary/vermilion_city/palettes/9.gbapal" + .incbin "data/tilesets/secondary/vermilion_city/palettes/00.gbapal" + .incbin "data/tilesets/secondary/vermilion_city/palettes/01.gbapal" + .incbin "data/tilesets/secondary/vermilion_city/palettes/02.gbapal" + .incbin "data/tilesets/secondary/vermilion_city/palettes/03.gbapal" + .incbin "data/tilesets/secondary/vermilion_city/palettes/04.gbapal" + .incbin "data/tilesets/secondary/vermilion_city/palettes/05.gbapal" + .incbin "data/tilesets/secondary/vermilion_city/palettes/06.gbapal" + .incbin "data/tilesets/secondary/vermilion_city/palettes/07.gbapal" + .incbin "data/tilesets/secondary/vermilion_city/palettes/08.gbapal" + .incbin "data/tilesets/secondary/vermilion_city/palettes/09.gbapal" .incbin "data/tilesets/secondary/vermilion_city/palettes/10.gbapal" .incbin "data/tilesets/secondary/vermilion_city/palettes/11.gbapal" .incbin "data/tilesets/secondary/vermilion_city/palettes/12.gbapal" @@ -142,16 +142,16 @@ gTilesetTiles_CeladonCity:: @ 8270FA0 .align 2 gTilesetPalettes_CeladonCity:: @ 8271C74 - .incbin "data/tilesets/secondary/celadon_city/palettes/0.gbapal" - .incbin "data/tilesets/secondary/celadon_city/palettes/1.gbapal" - .incbin "data/tilesets/secondary/celadon_city/palettes/2.gbapal" - .incbin "data/tilesets/secondary/celadon_city/palettes/3.gbapal" - .incbin "data/tilesets/secondary/celadon_city/palettes/4.gbapal" - .incbin "data/tilesets/secondary/celadon_city/palettes/5.gbapal" - .incbin "data/tilesets/secondary/celadon_city/palettes/6.gbapal" - .incbin "data/tilesets/secondary/celadon_city/palettes/7.gbapal" - .incbin "data/tilesets/secondary/celadon_city/palettes/8.gbapal" - .incbin "data/tilesets/secondary/celadon_city/palettes/9.gbapal" + .incbin "data/tilesets/secondary/celadon_city/palettes/00.gbapal" + .incbin "data/tilesets/secondary/celadon_city/palettes/01.gbapal" + .incbin "data/tilesets/secondary/celadon_city/palettes/02.gbapal" + .incbin "data/tilesets/secondary/celadon_city/palettes/03.gbapal" + .incbin "data/tilesets/secondary/celadon_city/palettes/04.gbapal" + .incbin "data/tilesets/secondary/celadon_city/palettes/05.gbapal" + .incbin "data/tilesets/secondary/celadon_city/palettes/06.gbapal" + .incbin "data/tilesets/secondary/celadon_city/palettes/07.gbapal" + .incbin "data/tilesets/secondary/celadon_city/palettes/08.gbapal" + .incbin "data/tilesets/secondary/celadon_city/palettes/09.gbapal" .incbin "data/tilesets/secondary/celadon_city/palettes/10.gbapal" .incbin "data/tilesets/secondary/celadon_city/palettes/11.gbapal" .incbin "data/tilesets/secondary/celadon_city/palettes/12.gbapal" @@ -165,16 +165,16 @@ gTilesetTiles_FuchsiaCity:: @ 8271E74 .align 2 gTilesetPalettes_FuchsiaCity:: @ 8272A5C - .incbin "data/tilesets/secondary/fuchsia_city/palettes/0.gbapal" - .incbin "data/tilesets/secondary/fuchsia_city/palettes/1.gbapal" - .incbin "data/tilesets/secondary/fuchsia_city/palettes/2.gbapal" - .incbin "data/tilesets/secondary/fuchsia_city/palettes/3.gbapal" - .incbin "data/tilesets/secondary/fuchsia_city/palettes/4.gbapal" - .incbin "data/tilesets/secondary/fuchsia_city/palettes/5.gbapal" - .incbin "data/tilesets/secondary/fuchsia_city/palettes/6.gbapal" - .incbin "data/tilesets/secondary/fuchsia_city/palettes/7.gbapal" - .incbin "data/tilesets/secondary/fuchsia_city/palettes/8.gbapal" - .incbin "data/tilesets/secondary/fuchsia_city/palettes/9.gbapal" + .incbin "data/tilesets/secondary/fuchsia_city/palettes/00.gbapal" + .incbin "data/tilesets/secondary/fuchsia_city/palettes/01.gbapal" + .incbin "data/tilesets/secondary/fuchsia_city/palettes/02.gbapal" + .incbin "data/tilesets/secondary/fuchsia_city/palettes/03.gbapal" + .incbin "data/tilesets/secondary/fuchsia_city/palettes/04.gbapal" + .incbin "data/tilesets/secondary/fuchsia_city/palettes/05.gbapal" + .incbin "data/tilesets/secondary/fuchsia_city/palettes/06.gbapal" + .incbin "data/tilesets/secondary/fuchsia_city/palettes/07.gbapal" + .incbin "data/tilesets/secondary/fuchsia_city/palettes/08.gbapal" + .incbin "data/tilesets/secondary/fuchsia_city/palettes/09.gbapal" .incbin "data/tilesets/secondary/fuchsia_city/palettes/10.gbapal" .incbin "data/tilesets/secondary/fuchsia_city/palettes/11.gbapal" .incbin "data/tilesets/secondary/fuchsia_city/palettes/12.gbapal" @@ -188,16 +188,16 @@ gTilesetTiles_CinnabarIsland:: @ 8272C5C .align 2 gTilesetPalettes_CinnabarIsland:: @ 8273358 - .incbin "data/tilesets/secondary/cinnabar_island/palettes/0.gbapal" - .incbin "data/tilesets/secondary/cinnabar_island/palettes/1.gbapal" - .incbin "data/tilesets/secondary/cinnabar_island/palettes/2.gbapal" - .incbin "data/tilesets/secondary/cinnabar_island/palettes/3.gbapal" - .incbin "data/tilesets/secondary/cinnabar_island/palettes/4.gbapal" - .incbin "data/tilesets/secondary/cinnabar_island/palettes/5.gbapal" - .incbin "data/tilesets/secondary/cinnabar_island/palettes/6.gbapal" - .incbin "data/tilesets/secondary/cinnabar_island/palettes/7.gbapal" - .incbin "data/tilesets/secondary/cinnabar_island/palettes/8.gbapal" - .incbin "data/tilesets/secondary/cinnabar_island/palettes/9.gbapal" + .incbin "data/tilesets/secondary/cinnabar_island/palettes/00.gbapal" + .incbin "data/tilesets/secondary/cinnabar_island/palettes/01.gbapal" + .incbin "data/tilesets/secondary/cinnabar_island/palettes/02.gbapal" + .incbin "data/tilesets/secondary/cinnabar_island/palettes/03.gbapal" + .incbin "data/tilesets/secondary/cinnabar_island/palettes/04.gbapal" + .incbin "data/tilesets/secondary/cinnabar_island/palettes/05.gbapal" + .incbin "data/tilesets/secondary/cinnabar_island/palettes/06.gbapal" + .incbin "data/tilesets/secondary/cinnabar_island/palettes/07.gbapal" + .incbin "data/tilesets/secondary/cinnabar_island/palettes/08.gbapal" + .incbin "data/tilesets/secondary/cinnabar_island/palettes/09.gbapal" .incbin "data/tilesets/secondary/cinnabar_island/palettes/10.gbapal" .incbin "data/tilesets/secondary/cinnabar_island/palettes/11.gbapal" .incbin "data/tilesets/secondary/cinnabar_island/palettes/12.gbapal" @@ -211,16 +211,16 @@ gTilesetTiles_IndigoPlateau:: @ 8273558 .align 2 gTilesetPalettes_IndigoPlateau:: @ 82742D0 - .incbin "data/tilesets/secondary/indigo_plateau/palettes/0.gbapal" - .incbin "data/tilesets/secondary/indigo_plateau/palettes/1.gbapal" - .incbin "data/tilesets/secondary/indigo_plateau/palettes/2.gbapal" - .incbin "data/tilesets/secondary/indigo_plateau/palettes/3.gbapal" - .incbin "data/tilesets/secondary/indigo_plateau/palettes/4.gbapal" - .incbin "data/tilesets/secondary/indigo_plateau/palettes/5.gbapal" - .incbin "data/tilesets/secondary/indigo_plateau/palettes/6.gbapal" - .incbin "data/tilesets/secondary/indigo_plateau/palettes/7.gbapal" - .incbin "data/tilesets/secondary/indigo_plateau/palettes/8.gbapal" - .incbin "data/tilesets/secondary/indigo_plateau/palettes/9.gbapal" + .incbin "data/tilesets/secondary/indigo_plateau/palettes/00.gbapal" + .incbin "data/tilesets/secondary/indigo_plateau/palettes/01.gbapal" + .incbin "data/tilesets/secondary/indigo_plateau/palettes/02.gbapal" + .incbin "data/tilesets/secondary/indigo_plateau/palettes/03.gbapal" + .incbin "data/tilesets/secondary/indigo_plateau/palettes/04.gbapal" + .incbin "data/tilesets/secondary/indigo_plateau/palettes/05.gbapal" + .incbin "data/tilesets/secondary/indigo_plateau/palettes/06.gbapal" + .incbin "data/tilesets/secondary/indigo_plateau/palettes/07.gbapal" + .incbin "data/tilesets/secondary/indigo_plateau/palettes/08.gbapal" + .incbin "data/tilesets/secondary/indigo_plateau/palettes/09.gbapal" .incbin "data/tilesets/secondary/indigo_plateau/palettes/10.gbapal" .incbin "data/tilesets/secondary/indigo_plateau/palettes/11.gbapal" .incbin "data/tilesets/secondary/indigo_plateau/palettes/12.gbapal" @@ -234,16 +234,16 @@ gTilesetTiles_SaffronCity:: @ 82744D0 .align 2 gTilesetPalettes_SaffronCity:: @ 8275094 - .incbin "data/tilesets/secondary/saffron_city/palettes/0.gbapal" - .incbin "data/tilesets/secondary/saffron_city/palettes/1.gbapal" - .incbin "data/tilesets/secondary/saffron_city/palettes/2.gbapal" - .incbin "data/tilesets/secondary/saffron_city/palettes/3.gbapal" - .incbin "data/tilesets/secondary/saffron_city/palettes/4.gbapal" - .incbin "data/tilesets/secondary/saffron_city/palettes/5.gbapal" - .incbin "data/tilesets/secondary/saffron_city/palettes/6.gbapal" - .incbin "data/tilesets/secondary/saffron_city/palettes/7.gbapal" - .incbin "data/tilesets/secondary/saffron_city/palettes/8.gbapal" - .incbin "data/tilesets/secondary/saffron_city/palettes/9.gbapal" + .incbin "data/tilesets/secondary/saffron_city/palettes/00.gbapal" + .incbin "data/tilesets/secondary/saffron_city/palettes/01.gbapal" + .incbin "data/tilesets/secondary/saffron_city/palettes/02.gbapal" + .incbin "data/tilesets/secondary/saffron_city/palettes/03.gbapal" + .incbin "data/tilesets/secondary/saffron_city/palettes/04.gbapal" + .incbin "data/tilesets/secondary/saffron_city/palettes/05.gbapal" + .incbin "data/tilesets/secondary/saffron_city/palettes/06.gbapal" + .incbin "data/tilesets/secondary/saffron_city/palettes/07.gbapal" + .incbin "data/tilesets/secondary/saffron_city/palettes/08.gbapal" + .incbin "data/tilesets/secondary/saffron_city/palettes/09.gbapal" .incbin "data/tilesets/secondary/saffron_city/palettes/10.gbapal" .incbin "data/tilesets/secondary/saffron_city/palettes/11.gbapal" .incbin "data/tilesets/secondary/saffron_city/palettes/12.gbapal" @@ -257,16 +257,16 @@ gTilesetTiles_Building:: @ Building .align 2 gTilesetPalettes_Building:: @ Building - .incbin "data/tilesets/primary/building/palettes/0.gbapal" - .incbin "data/tilesets/primary/building/palettes/1.gbapal" - .incbin "data/tilesets/primary/building/palettes/2.gbapal" - .incbin "data/tilesets/primary/building/palettes/3.gbapal" - .incbin "data/tilesets/primary/building/palettes/4.gbapal" - .incbin "data/tilesets/primary/building/palettes/5.gbapal" - .incbin "data/tilesets/primary/building/palettes/6.gbapal" - .incbin "data/tilesets/primary/building/palettes/7.gbapal" - .incbin "data/tilesets/primary/building/palettes/8.gbapal" - .incbin "data/tilesets/primary/building/palettes/9.gbapal" + .incbin "data/tilesets/primary/building/palettes/00.gbapal" + .incbin "data/tilesets/primary/building/palettes/01.gbapal" + .incbin "data/tilesets/primary/building/palettes/02.gbapal" + .incbin "data/tilesets/primary/building/palettes/03.gbapal" + .incbin "data/tilesets/primary/building/palettes/04.gbapal" + .incbin "data/tilesets/primary/building/palettes/05.gbapal" + .incbin "data/tilesets/primary/building/palettes/06.gbapal" + .incbin "data/tilesets/primary/building/palettes/07.gbapal" + .incbin "data/tilesets/primary/building/palettes/08.gbapal" + .incbin "data/tilesets/primary/building/palettes/09.gbapal" .incbin "data/tilesets/primary/building/palettes/10.gbapal" .incbin "data/tilesets/primary/building/palettes/11.gbapal" .incbin "data/tilesets/primary/building/palettes/12.gbapal" @@ -280,16 +280,16 @@ gTilesetTiles_Mart:: @ 8277894 .align 2 gTilesetPalettes_Mart:: @ 8277A5C - .incbin "data/tilesets/secondary/mart/palettes/0.gbapal" - .incbin "data/tilesets/secondary/mart/palettes/1.gbapal" - .incbin "data/tilesets/secondary/mart/palettes/2.gbapal" - .incbin "data/tilesets/secondary/mart/palettes/3.gbapal" - .incbin "data/tilesets/secondary/mart/palettes/4.gbapal" - .incbin "data/tilesets/secondary/mart/palettes/5.gbapal" - .incbin "data/tilesets/secondary/mart/palettes/6.gbapal" - .incbin "data/tilesets/secondary/mart/palettes/7.gbapal" - .incbin "data/tilesets/secondary/mart/palettes/8.gbapal" - .incbin "data/tilesets/secondary/mart/palettes/9.gbapal" + .incbin "data/tilesets/secondary/mart/palettes/00.gbapal" + .incbin "data/tilesets/secondary/mart/palettes/01.gbapal" + .incbin "data/tilesets/secondary/mart/palettes/02.gbapal" + .incbin "data/tilesets/secondary/mart/palettes/03.gbapal" + .incbin "data/tilesets/secondary/mart/palettes/04.gbapal" + .incbin "data/tilesets/secondary/mart/palettes/05.gbapal" + .incbin "data/tilesets/secondary/mart/palettes/06.gbapal" + .incbin "data/tilesets/secondary/mart/palettes/07.gbapal" + .incbin "data/tilesets/secondary/mart/palettes/08.gbapal" + .incbin "data/tilesets/secondary/mart/palettes/09.gbapal" .incbin "data/tilesets/secondary/mart/palettes/10.gbapal" .incbin "data/tilesets/secondary/mart/palettes/11.gbapal" .incbin "data/tilesets/secondary/mart/palettes/12.gbapal" @@ -303,16 +303,16 @@ gTilesetTiles_PokemonCenter:: @ 8277C5C .align 2 gTilesetPalettes_PokemonCenter:: @ 8278CC4 - .incbin "data/tilesets/secondary/pokemon_center/palettes/0.gbapal" - .incbin "data/tilesets/secondary/pokemon_center/palettes/1.gbapal" - .incbin "data/tilesets/secondary/pokemon_center/palettes/2.gbapal" - .incbin "data/tilesets/secondary/pokemon_center/palettes/3.gbapal" - .incbin "data/tilesets/secondary/pokemon_center/palettes/4.gbapal" - .incbin "data/tilesets/secondary/pokemon_center/palettes/5.gbapal" - .incbin "data/tilesets/secondary/pokemon_center/palettes/6.gbapal" - .incbin "data/tilesets/secondary/pokemon_center/palettes/7.gbapal" - .incbin "data/tilesets/secondary/pokemon_center/palettes/8.gbapal" - .incbin "data/tilesets/secondary/pokemon_center/palettes/9.gbapal" + .incbin "data/tilesets/secondary/pokemon_center/palettes/00.gbapal" + .incbin "data/tilesets/secondary/pokemon_center/palettes/01.gbapal" + .incbin "data/tilesets/secondary/pokemon_center/palettes/02.gbapal" + .incbin "data/tilesets/secondary/pokemon_center/palettes/03.gbapal" + .incbin "data/tilesets/secondary/pokemon_center/palettes/04.gbapal" + .incbin "data/tilesets/secondary/pokemon_center/palettes/05.gbapal" + .incbin "data/tilesets/secondary/pokemon_center/palettes/06.gbapal" + .incbin "data/tilesets/secondary/pokemon_center/palettes/07.gbapal" + .incbin "data/tilesets/secondary/pokemon_center/palettes/08.gbapal" + .incbin "data/tilesets/secondary/pokemon_center/palettes/09.gbapal" .incbin "data/tilesets/secondary/pokemon_center/palettes/10.gbapal" .incbin "data/tilesets/secondary/pokemon_center/palettes/11.gbapal" .incbin "data/tilesets/secondary/pokemon_center/palettes/12.gbapal" @@ -326,16 +326,16 @@ gTilesetTiles_Cave:: @ 8278EC4 .align 2 gTilesetPalettes_Cave:: @ 827A1A8 - .incbin "data/tilesets/secondary/cave/palettes/0.gbapal" - .incbin "data/tilesets/secondary/cave/palettes/1.gbapal" - .incbin "data/tilesets/secondary/cave/palettes/2.gbapal" - .incbin "data/tilesets/secondary/cave/palettes/3.gbapal" - .incbin "data/tilesets/secondary/cave/palettes/4.gbapal" - .incbin "data/tilesets/secondary/cave/palettes/5.gbapal" - .incbin "data/tilesets/secondary/cave/palettes/6.gbapal" - .incbin "data/tilesets/secondary/cave/palettes/7.gbapal" - .incbin "data/tilesets/secondary/cave/palettes/8.gbapal" - .incbin "data/tilesets/secondary/cave/palettes/9.gbapal" + .incbin "data/tilesets/secondary/cave/palettes/00.gbapal" + .incbin "data/tilesets/secondary/cave/palettes/01.gbapal" + .incbin "data/tilesets/secondary/cave/palettes/02.gbapal" + .incbin "data/tilesets/secondary/cave/palettes/03.gbapal" + .incbin "data/tilesets/secondary/cave/palettes/04.gbapal" + .incbin "data/tilesets/secondary/cave/palettes/05.gbapal" + .incbin "data/tilesets/secondary/cave/palettes/06.gbapal" + .incbin "data/tilesets/secondary/cave/palettes/07.gbapal" + .incbin "data/tilesets/secondary/cave/palettes/08.gbapal" + .incbin "data/tilesets/secondary/cave/palettes/09.gbapal" .incbin "data/tilesets/secondary/cave/palettes/10.gbapal" .incbin "data/tilesets/secondary/cave/palettes/11.gbapal" .incbin "data/tilesets/secondary/cave/palettes/12.gbapal" @@ -349,16 +349,16 @@ gTilesetTiles_Dummy1:: @ 827A3A8 .align 2 gTilesetPalettes_Dummy1:: @ 827A3B8 - .incbin "data/tilesets/secondary/dummy1/palettes/0.gbapal" - .incbin "data/tilesets/secondary/dummy1/palettes/1.gbapal" - .incbin "data/tilesets/secondary/dummy1/palettes/2.gbapal" - .incbin "data/tilesets/secondary/dummy1/palettes/3.gbapal" - .incbin "data/tilesets/secondary/dummy1/palettes/4.gbapal" - .incbin "data/tilesets/secondary/dummy1/palettes/5.gbapal" - .incbin "data/tilesets/secondary/dummy1/palettes/6.gbapal" - .incbin "data/tilesets/secondary/dummy1/palettes/7.gbapal" - .incbin "data/tilesets/secondary/dummy1/palettes/8.gbapal" - .incbin "data/tilesets/secondary/dummy1/palettes/9.gbapal" + .incbin "data/tilesets/secondary/dummy1/palettes/00.gbapal" + .incbin "data/tilesets/secondary/dummy1/palettes/01.gbapal" + .incbin "data/tilesets/secondary/dummy1/palettes/02.gbapal" + .incbin "data/tilesets/secondary/dummy1/palettes/03.gbapal" + .incbin "data/tilesets/secondary/dummy1/palettes/04.gbapal" + .incbin "data/tilesets/secondary/dummy1/palettes/05.gbapal" + .incbin "data/tilesets/secondary/dummy1/palettes/06.gbapal" + .incbin "data/tilesets/secondary/dummy1/palettes/07.gbapal" + .incbin "data/tilesets/secondary/dummy1/palettes/08.gbapal" + .incbin "data/tilesets/secondary/dummy1/palettes/09.gbapal" .incbin "data/tilesets/secondary/dummy1/palettes/10.gbapal" .incbin "data/tilesets/secondary/dummy1/palettes/11.gbapal" .incbin "data/tilesets/secondary/dummy1/palettes/12.gbapal" @@ -372,16 +372,16 @@ gTilesetTiles_Museum:: @ 827A5B8 .align 2 gTilesetPalettes_Museum:: @ 827AE14 - .incbin "data/tilesets/secondary/museum/palettes/0.gbapal" - .incbin "data/tilesets/secondary/museum/palettes/1.gbapal" - .incbin "data/tilesets/secondary/museum/palettes/2.gbapal" - .incbin "data/tilesets/secondary/museum/palettes/3.gbapal" - .incbin "data/tilesets/secondary/museum/palettes/4.gbapal" - .incbin "data/tilesets/secondary/museum/palettes/5.gbapal" - .incbin "data/tilesets/secondary/museum/palettes/6.gbapal" - .incbin "data/tilesets/secondary/museum/palettes/7.gbapal" - .incbin "data/tilesets/secondary/museum/palettes/8.gbapal" - .incbin "data/tilesets/secondary/museum/palettes/9.gbapal" + .incbin "data/tilesets/secondary/museum/palettes/00.gbapal" + .incbin "data/tilesets/secondary/museum/palettes/01.gbapal" + .incbin "data/tilesets/secondary/museum/palettes/02.gbapal" + .incbin "data/tilesets/secondary/museum/palettes/03.gbapal" + .incbin "data/tilesets/secondary/museum/palettes/04.gbapal" + .incbin "data/tilesets/secondary/museum/palettes/05.gbapal" + .incbin "data/tilesets/secondary/museum/palettes/06.gbapal" + .incbin "data/tilesets/secondary/museum/palettes/07.gbapal" + .incbin "data/tilesets/secondary/museum/palettes/08.gbapal" + .incbin "data/tilesets/secondary/museum/palettes/09.gbapal" .incbin "data/tilesets/secondary/museum/palettes/10.gbapal" .incbin "data/tilesets/secondary/museum/palettes/11.gbapal" .incbin "data/tilesets/secondary/museum/palettes/12.gbapal" @@ -395,16 +395,16 @@ gTilesetTiles_CableClub:: @ 827B014 .align 2 gTilesetPalettes_CableClub:: @ 827FF14 - .incbin "data/tilesets/secondary/cable_club/palettes/0.gbapal" - .incbin "data/tilesets/secondary/cable_club/palettes/1.gbapal" - .incbin "data/tilesets/secondary/cable_club/palettes/2.gbapal" - .incbin "data/tilesets/secondary/cable_club/palettes/3.gbapal" - .incbin "data/tilesets/secondary/cable_club/palettes/4.gbapal" - .incbin "data/tilesets/secondary/cable_club/palettes/5.gbapal" - .incbin "data/tilesets/secondary/cable_club/palettes/6.gbapal" - .incbin "data/tilesets/secondary/cable_club/palettes/7.gbapal" - .incbin "data/tilesets/secondary/cable_club/palettes/8.gbapal" - .incbin "data/tilesets/secondary/cable_club/palettes/9.gbapal" + .incbin "data/tilesets/secondary/cable_club/palettes/00.gbapal" + .incbin "data/tilesets/secondary/cable_club/palettes/01.gbapal" + .incbin "data/tilesets/secondary/cable_club/palettes/02.gbapal" + .incbin "data/tilesets/secondary/cable_club/palettes/03.gbapal" + .incbin "data/tilesets/secondary/cable_club/palettes/04.gbapal" + .incbin "data/tilesets/secondary/cable_club/palettes/05.gbapal" + .incbin "data/tilesets/secondary/cable_club/palettes/06.gbapal" + .incbin "data/tilesets/secondary/cable_club/palettes/07.gbapal" + .incbin "data/tilesets/secondary/cable_club/palettes/08.gbapal" + .incbin "data/tilesets/secondary/cable_club/palettes/09.gbapal" .incbin "data/tilesets/secondary/cable_club/palettes/10.gbapal" .incbin "data/tilesets/secondary/cable_club/palettes/11.gbapal" .incbin "data/tilesets/secondary/cable_club/palettes/12.gbapal" @@ -418,16 +418,16 @@ gTilesetTiles_BikeShop:: @ 8280114 .align 2 gTilesetPalettes_BikeShop:: @ 82804EC - .incbin "data/tilesets/secondary/bike_shop/palettes/0.gbapal" - .incbin "data/tilesets/secondary/bike_shop/palettes/1.gbapal" - .incbin "data/tilesets/secondary/bike_shop/palettes/2.gbapal" - .incbin "data/tilesets/secondary/bike_shop/palettes/3.gbapal" - .incbin "data/tilesets/secondary/bike_shop/palettes/4.gbapal" - .incbin "data/tilesets/secondary/bike_shop/palettes/5.gbapal" - .incbin "data/tilesets/secondary/bike_shop/palettes/6.gbapal" - .incbin "data/tilesets/secondary/bike_shop/palettes/7.gbapal" - .incbin "data/tilesets/secondary/bike_shop/palettes/8.gbapal" - .incbin "data/tilesets/secondary/bike_shop/palettes/9.gbapal" + .incbin "data/tilesets/secondary/bike_shop/palettes/00.gbapal" + .incbin "data/tilesets/secondary/bike_shop/palettes/01.gbapal" + .incbin "data/tilesets/secondary/bike_shop/palettes/02.gbapal" + .incbin "data/tilesets/secondary/bike_shop/palettes/03.gbapal" + .incbin "data/tilesets/secondary/bike_shop/palettes/04.gbapal" + .incbin "data/tilesets/secondary/bike_shop/palettes/05.gbapal" + .incbin "data/tilesets/secondary/bike_shop/palettes/06.gbapal" + .incbin "data/tilesets/secondary/bike_shop/palettes/07.gbapal" + .incbin "data/tilesets/secondary/bike_shop/palettes/08.gbapal" + .incbin "data/tilesets/secondary/bike_shop/palettes/09.gbapal" .incbin "data/tilesets/secondary/bike_shop/palettes/10.gbapal" .incbin "data/tilesets/secondary/bike_shop/palettes/11.gbapal" .incbin "data/tilesets/secondary/bike_shop/palettes/12.gbapal" @@ -441,16 +441,16 @@ gTilesetTiles_Lab:: @ 82806EC .align 2 gTilesetPalettes_Lab:: @ 8280D00 - .incbin "data/tilesets/secondary/lab/palettes/0.gbapal" - .incbin "data/tilesets/secondary/lab/palettes/1.gbapal" - .incbin "data/tilesets/secondary/lab/palettes/2.gbapal" - .incbin "data/tilesets/secondary/lab/palettes/3.gbapal" - .incbin "data/tilesets/secondary/lab/palettes/4.gbapal" - .incbin "data/tilesets/secondary/lab/palettes/5.gbapal" - .incbin "data/tilesets/secondary/lab/palettes/6.gbapal" - .incbin "data/tilesets/secondary/lab/palettes/7.gbapal" - .incbin "data/tilesets/secondary/lab/palettes/8.gbapal" - .incbin "data/tilesets/secondary/lab/palettes/9.gbapal" + .incbin "data/tilesets/secondary/lab/palettes/00.gbapal" + .incbin "data/tilesets/secondary/lab/palettes/01.gbapal" + .incbin "data/tilesets/secondary/lab/palettes/02.gbapal" + .incbin "data/tilesets/secondary/lab/palettes/03.gbapal" + .incbin "data/tilesets/secondary/lab/palettes/04.gbapal" + .incbin "data/tilesets/secondary/lab/palettes/05.gbapal" + .incbin "data/tilesets/secondary/lab/palettes/06.gbapal" + .incbin "data/tilesets/secondary/lab/palettes/07.gbapal" + .incbin "data/tilesets/secondary/lab/palettes/08.gbapal" + .incbin "data/tilesets/secondary/lab/palettes/09.gbapal" .incbin "data/tilesets/secondary/lab/palettes/10.gbapal" .incbin "data/tilesets/secondary/lab/palettes/11.gbapal" .incbin "data/tilesets/secondary/lab/palettes/12.gbapal" @@ -464,16 +464,16 @@ gTilesetTiles_HoennBuilding:: @ 8280F00 .align 2 gTilesetPalettes_HoennBuilding:: @ 82823A4 - .incbin "data/tilesets/secondary/hoenn_building/palettes/0.gbapal" - .incbin "data/tilesets/secondary/hoenn_building/palettes/1.gbapal" - .incbin "data/tilesets/secondary/hoenn_building/palettes/2.gbapal" - .incbin "data/tilesets/secondary/hoenn_building/palettes/3.gbapal" - .incbin "data/tilesets/secondary/hoenn_building/palettes/4.gbapal" - .incbin "data/tilesets/secondary/hoenn_building/palettes/5.gbapal" - .incbin "data/tilesets/secondary/hoenn_building/palettes/6.gbapal" - .incbin "data/tilesets/secondary/hoenn_building/palettes/7.gbapal" - .incbin "data/tilesets/secondary/hoenn_building/palettes/8.gbapal" - .incbin "data/tilesets/secondary/hoenn_building/palettes/9.gbapal" + .incbin "data/tilesets/secondary/hoenn_building/palettes/00.gbapal" + .incbin "data/tilesets/secondary/hoenn_building/palettes/01.gbapal" + .incbin "data/tilesets/secondary/hoenn_building/palettes/02.gbapal" + .incbin "data/tilesets/secondary/hoenn_building/palettes/03.gbapal" + .incbin "data/tilesets/secondary/hoenn_building/palettes/04.gbapal" + .incbin "data/tilesets/secondary/hoenn_building/palettes/05.gbapal" + .incbin "data/tilesets/secondary/hoenn_building/palettes/06.gbapal" + .incbin "data/tilesets/secondary/hoenn_building/palettes/07.gbapal" + .incbin "data/tilesets/secondary/hoenn_building/palettes/08.gbapal" + .incbin "data/tilesets/secondary/hoenn_building/palettes/09.gbapal" .incbin "data/tilesets/secondary/hoenn_building/palettes/10.gbapal" .incbin "data/tilesets/secondary/hoenn_building/palettes/11.gbapal" .incbin "data/tilesets/secondary/hoenn_building/palettes/12.gbapal" @@ -487,16 +487,16 @@ gTilesetTiles_GameCorner:: @ 82825A4 .align 2 gTilesetPalettes_GameCorner:: @ 8282FBC - .incbin "data/tilesets/secondary/game_corner/palettes/0.gbapal" - .incbin "data/tilesets/secondary/game_corner/palettes/1.gbapal" - .incbin "data/tilesets/secondary/game_corner/palettes/2.gbapal" - .incbin "data/tilesets/secondary/game_corner/palettes/3.gbapal" - .incbin "data/tilesets/secondary/game_corner/palettes/4.gbapal" - .incbin "data/tilesets/secondary/game_corner/palettes/5.gbapal" - .incbin "data/tilesets/secondary/game_corner/palettes/6.gbapal" - .incbin "data/tilesets/secondary/game_corner/palettes/7.gbapal" - .incbin "data/tilesets/secondary/game_corner/palettes/8.gbapal" - .incbin "data/tilesets/secondary/game_corner/palettes/9.gbapal" + .incbin "data/tilesets/secondary/game_corner/palettes/00.gbapal" + .incbin "data/tilesets/secondary/game_corner/palettes/01.gbapal" + .incbin "data/tilesets/secondary/game_corner/palettes/02.gbapal" + .incbin "data/tilesets/secondary/game_corner/palettes/03.gbapal" + .incbin "data/tilesets/secondary/game_corner/palettes/04.gbapal" + .incbin "data/tilesets/secondary/game_corner/palettes/05.gbapal" + .incbin "data/tilesets/secondary/game_corner/palettes/06.gbapal" + .incbin "data/tilesets/secondary/game_corner/palettes/07.gbapal" + .incbin "data/tilesets/secondary/game_corner/palettes/08.gbapal" + .incbin "data/tilesets/secondary/game_corner/palettes/09.gbapal" .incbin "data/tilesets/secondary/game_corner/palettes/10.gbapal" .incbin "data/tilesets/secondary/game_corner/palettes/11.gbapal" .incbin "data/tilesets/secondary/game_corner/palettes/12.gbapal" @@ -510,16 +510,16 @@ gTilesetTiles_PewterGym:: @ 82831BC .align 2 gTilesetPalettes_PewterGym:: @ 82839B0 - .incbin "data/tilesets/secondary/pewter_gym/palettes/0.gbapal" - .incbin "data/tilesets/secondary/pewter_gym/palettes/1.gbapal" - .incbin "data/tilesets/secondary/pewter_gym/palettes/2.gbapal" - .incbin "data/tilesets/secondary/pewter_gym/palettes/3.gbapal" - .incbin "data/tilesets/secondary/pewter_gym/palettes/4.gbapal" - .incbin "data/tilesets/secondary/pewter_gym/palettes/5.gbapal" - .incbin "data/tilesets/secondary/pewter_gym/palettes/6.gbapal" - .incbin "data/tilesets/secondary/pewter_gym/palettes/7.gbapal" - .incbin "data/tilesets/secondary/pewter_gym/palettes/8.gbapal" - .incbin "data/tilesets/secondary/pewter_gym/palettes/9.gbapal" + .incbin "data/tilesets/secondary/pewter_gym/palettes/00.gbapal" + .incbin "data/tilesets/secondary/pewter_gym/palettes/01.gbapal" + .incbin "data/tilesets/secondary/pewter_gym/palettes/02.gbapal" + .incbin "data/tilesets/secondary/pewter_gym/palettes/03.gbapal" + .incbin "data/tilesets/secondary/pewter_gym/palettes/04.gbapal" + .incbin "data/tilesets/secondary/pewter_gym/palettes/05.gbapal" + .incbin "data/tilesets/secondary/pewter_gym/palettes/06.gbapal" + .incbin "data/tilesets/secondary/pewter_gym/palettes/07.gbapal" + .incbin "data/tilesets/secondary/pewter_gym/palettes/08.gbapal" + .incbin "data/tilesets/secondary/pewter_gym/palettes/09.gbapal" .incbin "data/tilesets/secondary/pewter_gym/palettes/10.gbapal" .incbin "data/tilesets/secondary/pewter_gym/palettes/11.gbapal" .incbin "data/tilesets/secondary/pewter_gym/palettes/12.gbapal" @@ -533,16 +533,16 @@ gTilesetTiles_CeruleanGym:: @ 8283BB0 .align 2 gTilesetPalettes_CeruleanGym:: @ 8283FF8 - .incbin "data/tilesets/secondary/cerulean_gym/palettes/0.gbapal" - .incbin "data/tilesets/secondary/cerulean_gym/palettes/1.gbapal" - .incbin "data/tilesets/secondary/cerulean_gym/palettes/2.gbapal" - .incbin "data/tilesets/secondary/cerulean_gym/palettes/3.gbapal" - .incbin "data/tilesets/secondary/cerulean_gym/palettes/4.gbapal" - .incbin "data/tilesets/secondary/cerulean_gym/palettes/5.gbapal" - .incbin "data/tilesets/secondary/cerulean_gym/palettes/6.gbapal" - .incbin "data/tilesets/secondary/cerulean_gym/palettes/7.gbapal" - .incbin "data/tilesets/secondary/cerulean_gym/palettes/8.gbapal" - .incbin "data/tilesets/secondary/cerulean_gym/palettes/9.gbapal" + .incbin "data/tilesets/secondary/cerulean_gym/palettes/00.gbapal" + .incbin "data/tilesets/secondary/cerulean_gym/palettes/01.gbapal" + .incbin "data/tilesets/secondary/cerulean_gym/palettes/02.gbapal" + .incbin "data/tilesets/secondary/cerulean_gym/palettes/03.gbapal" + .incbin "data/tilesets/secondary/cerulean_gym/palettes/04.gbapal" + .incbin "data/tilesets/secondary/cerulean_gym/palettes/05.gbapal" + .incbin "data/tilesets/secondary/cerulean_gym/palettes/06.gbapal" + .incbin "data/tilesets/secondary/cerulean_gym/palettes/07.gbapal" + .incbin "data/tilesets/secondary/cerulean_gym/palettes/08.gbapal" + .incbin "data/tilesets/secondary/cerulean_gym/palettes/09.gbapal" .incbin "data/tilesets/secondary/cerulean_gym/palettes/10.gbapal" .incbin "data/tilesets/secondary/cerulean_gym/palettes/11.gbapal" .incbin "data/tilesets/secondary/cerulean_gym/palettes/12.gbapal" @@ -556,16 +556,16 @@ gTilesetTiles_VermilionGym:: @ 82841F8 .align 2 gTilesetPalettes_VermilionGym:: @ 82849B8 - .incbin "data/tilesets/secondary/vermilion_gym/palettes/0.gbapal" - .incbin "data/tilesets/secondary/vermilion_gym/palettes/1.gbapal" - .incbin "data/tilesets/secondary/vermilion_gym/palettes/2.gbapal" - .incbin "data/tilesets/secondary/vermilion_gym/palettes/3.gbapal" - .incbin "data/tilesets/secondary/vermilion_gym/palettes/4.gbapal" - .incbin "data/tilesets/secondary/vermilion_gym/palettes/5.gbapal" - .incbin "data/tilesets/secondary/vermilion_gym/palettes/6.gbapal" - .incbin "data/tilesets/secondary/vermilion_gym/palettes/7.gbapal" - .incbin "data/tilesets/secondary/vermilion_gym/palettes/8.gbapal" - .incbin "data/tilesets/secondary/vermilion_gym/palettes/9.gbapal" + .incbin "data/tilesets/secondary/vermilion_gym/palettes/00.gbapal" + .incbin "data/tilesets/secondary/vermilion_gym/palettes/01.gbapal" + .incbin "data/tilesets/secondary/vermilion_gym/palettes/02.gbapal" + .incbin "data/tilesets/secondary/vermilion_gym/palettes/03.gbapal" + .incbin "data/tilesets/secondary/vermilion_gym/palettes/04.gbapal" + .incbin "data/tilesets/secondary/vermilion_gym/palettes/05.gbapal" + .incbin "data/tilesets/secondary/vermilion_gym/palettes/06.gbapal" + .incbin "data/tilesets/secondary/vermilion_gym/palettes/07.gbapal" + .incbin "data/tilesets/secondary/vermilion_gym/palettes/08.gbapal" + .incbin "data/tilesets/secondary/vermilion_gym/palettes/09.gbapal" .incbin "data/tilesets/secondary/vermilion_gym/palettes/10.gbapal" .incbin "data/tilesets/secondary/vermilion_gym/palettes/11.gbapal" .incbin "data/tilesets/secondary/vermilion_gym/palettes/12.gbapal" @@ -579,16 +579,16 @@ gTilesetTiles_CeladonGym:: @ 8284BB8 .align 2 gTilesetPalettes_CeladonGym:: @ 8285150 - .incbin "data/tilesets/secondary/celadon_gym/palettes/0.gbapal" - .incbin "data/tilesets/secondary/celadon_gym/palettes/1.gbapal" - .incbin "data/tilesets/secondary/celadon_gym/palettes/2.gbapal" - .incbin "data/tilesets/secondary/celadon_gym/palettes/3.gbapal" - .incbin "data/tilesets/secondary/celadon_gym/palettes/4.gbapal" - .incbin "data/tilesets/secondary/celadon_gym/palettes/5.gbapal" - .incbin "data/tilesets/secondary/celadon_gym/palettes/6.gbapal" - .incbin "data/tilesets/secondary/celadon_gym/palettes/7.gbapal" - .incbin "data/tilesets/secondary/celadon_gym/palettes/8.gbapal" - .incbin "data/tilesets/secondary/celadon_gym/palettes/9.gbapal" + .incbin "data/tilesets/secondary/celadon_gym/palettes/00.gbapal" + .incbin "data/tilesets/secondary/celadon_gym/palettes/01.gbapal" + .incbin "data/tilesets/secondary/celadon_gym/palettes/02.gbapal" + .incbin "data/tilesets/secondary/celadon_gym/palettes/03.gbapal" + .incbin "data/tilesets/secondary/celadon_gym/palettes/04.gbapal" + .incbin "data/tilesets/secondary/celadon_gym/palettes/05.gbapal" + .incbin "data/tilesets/secondary/celadon_gym/palettes/06.gbapal" + .incbin "data/tilesets/secondary/celadon_gym/palettes/07.gbapal" + .incbin "data/tilesets/secondary/celadon_gym/palettes/08.gbapal" + .incbin "data/tilesets/secondary/celadon_gym/palettes/09.gbapal" .incbin "data/tilesets/secondary/celadon_gym/palettes/10.gbapal" .incbin "data/tilesets/secondary/celadon_gym/palettes/11.gbapal" .incbin "data/tilesets/secondary/celadon_gym/palettes/12.gbapal" @@ -602,16 +602,16 @@ gTilesetTiles_FuchsiaGym:: @ 8285350 .align 2 gTilesetPalettes_FuchsiaGym:: @ 82857A4 - .incbin "data/tilesets/secondary/fuchsia_gym/palettes/0.gbapal" - .incbin "data/tilesets/secondary/fuchsia_gym/palettes/1.gbapal" - .incbin "data/tilesets/secondary/fuchsia_gym/palettes/2.gbapal" - .incbin "data/tilesets/secondary/fuchsia_gym/palettes/3.gbapal" - .incbin "data/tilesets/secondary/fuchsia_gym/palettes/4.gbapal" - .incbin "data/tilesets/secondary/fuchsia_gym/palettes/5.gbapal" - .incbin "data/tilesets/secondary/fuchsia_gym/palettes/6.gbapal" - .incbin "data/tilesets/secondary/fuchsia_gym/palettes/7.gbapal" - .incbin "data/tilesets/secondary/fuchsia_gym/palettes/8.gbapal" - .incbin "data/tilesets/secondary/fuchsia_gym/palettes/9.gbapal" + .incbin "data/tilesets/secondary/fuchsia_gym/palettes/00.gbapal" + .incbin "data/tilesets/secondary/fuchsia_gym/palettes/01.gbapal" + .incbin "data/tilesets/secondary/fuchsia_gym/palettes/02.gbapal" + .incbin "data/tilesets/secondary/fuchsia_gym/palettes/03.gbapal" + .incbin "data/tilesets/secondary/fuchsia_gym/palettes/04.gbapal" + .incbin "data/tilesets/secondary/fuchsia_gym/palettes/05.gbapal" + .incbin "data/tilesets/secondary/fuchsia_gym/palettes/06.gbapal" + .incbin "data/tilesets/secondary/fuchsia_gym/palettes/07.gbapal" + .incbin "data/tilesets/secondary/fuchsia_gym/palettes/08.gbapal" + .incbin "data/tilesets/secondary/fuchsia_gym/palettes/09.gbapal" .incbin "data/tilesets/secondary/fuchsia_gym/palettes/10.gbapal" .incbin "data/tilesets/secondary/fuchsia_gym/palettes/11.gbapal" .incbin "data/tilesets/secondary/fuchsia_gym/palettes/12.gbapal" @@ -625,16 +625,16 @@ gTilesetTiles_SaffronGym:: @ 82859A4 .align 2 gTilesetPalettes_SaffronGym:: @ 8285D90 - .incbin "data/tilesets/secondary/saffron_gym/palettes/0.gbapal" - .incbin "data/tilesets/secondary/saffron_gym/palettes/1.gbapal" - .incbin "data/tilesets/secondary/saffron_gym/palettes/2.gbapal" - .incbin "data/tilesets/secondary/saffron_gym/palettes/3.gbapal" - .incbin "data/tilesets/secondary/saffron_gym/palettes/4.gbapal" - .incbin "data/tilesets/secondary/saffron_gym/palettes/5.gbapal" - .incbin "data/tilesets/secondary/saffron_gym/palettes/6.gbapal" - .incbin "data/tilesets/secondary/saffron_gym/palettes/7.gbapal" - .incbin "data/tilesets/secondary/saffron_gym/palettes/8.gbapal" - .incbin "data/tilesets/secondary/saffron_gym/palettes/9.gbapal" + .incbin "data/tilesets/secondary/saffron_gym/palettes/00.gbapal" + .incbin "data/tilesets/secondary/saffron_gym/palettes/01.gbapal" + .incbin "data/tilesets/secondary/saffron_gym/palettes/02.gbapal" + .incbin "data/tilesets/secondary/saffron_gym/palettes/03.gbapal" + .incbin "data/tilesets/secondary/saffron_gym/palettes/04.gbapal" + .incbin "data/tilesets/secondary/saffron_gym/palettes/05.gbapal" + .incbin "data/tilesets/secondary/saffron_gym/palettes/06.gbapal" + .incbin "data/tilesets/secondary/saffron_gym/palettes/07.gbapal" + .incbin "data/tilesets/secondary/saffron_gym/palettes/08.gbapal" + .incbin "data/tilesets/secondary/saffron_gym/palettes/09.gbapal" .incbin "data/tilesets/secondary/saffron_gym/palettes/10.gbapal" .incbin "data/tilesets/secondary/saffron_gym/palettes/11.gbapal" .incbin "data/tilesets/secondary/saffron_gym/palettes/12.gbapal" @@ -648,16 +648,16 @@ gTilesetTiles_CinnabarGym:: @ 8285F90 .align 2 gTilesetPalettes_CinnabarGym:: @ 82865D4 - .incbin "data/tilesets/secondary/cinnabar_gym/palettes/0.gbapal" - .incbin "data/tilesets/secondary/cinnabar_gym/palettes/1.gbapal" - .incbin "data/tilesets/secondary/cinnabar_gym/palettes/2.gbapal" - .incbin "data/tilesets/secondary/cinnabar_gym/palettes/3.gbapal" - .incbin "data/tilesets/secondary/cinnabar_gym/palettes/4.gbapal" - .incbin "data/tilesets/secondary/cinnabar_gym/palettes/5.gbapal" - .incbin "data/tilesets/secondary/cinnabar_gym/palettes/6.gbapal" - .incbin "data/tilesets/secondary/cinnabar_gym/palettes/7.gbapal" - .incbin "data/tilesets/secondary/cinnabar_gym/palettes/8.gbapal" - .incbin "data/tilesets/secondary/cinnabar_gym/palettes/9.gbapal" + .incbin "data/tilesets/secondary/cinnabar_gym/palettes/00.gbapal" + .incbin "data/tilesets/secondary/cinnabar_gym/palettes/01.gbapal" + .incbin "data/tilesets/secondary/cinnabar_gym/palettes/02.gbapal" + .incbin "data/tilesets/secondary/cinnabar_gym/palettes/03.gbapal" + .incbin "data/tilesets/secondary/cinnabar_gym/palettes/04.gbapal" + .incbin "data/tilesets/secondary/cinnabar_gym/palettes/05.gbapal" + .incbin "data/tilesets/secondary/cinnabar_gym/palettes/06.gbapal" + .incbin "data/tilesets/secondary/cinnabar_gym/palettes/07.gbapal" + .incbin "data/tilesets/secondary/cinnabar_gym/palettes/08.gbapal" + .incbin "data/tilesets/secondary/cinnabar_gym/palettes/09.gbapal" .incbin "data/tilesets/secondary/cinnabar_gym/palettes/10.gbapal" .incbin "data/tilesets/secondary/cinnabar_gym/palettes/11.gbapal" .incbin "data/tilesets/secondary/cinnabar_gym/palettes/12.gbapal" @@ -671,16 +671,16 @@ gTilesetTiles_ViridianGym:: @ 82867D4 .align 2 gTilesetPalettes_ViridianGym:: @ 8286BC8 - .incbin "data/tilesets/secondary/viridian_gym/palettes/0.gbapal" - .incbin "data/tilesets/secondary/viridian_gym/palettes/1.gbapal" - .incbin "data/tilesets/secondary/viridian_gym/palettes/2.gbapal" - .incbin "data/tilesets/secondary/viridian_gym/palettes/3.gbapal" - .incbin "data/tilesets/secondary/viridian_gym/palettes/4.gbapal" - .incbin "data/tilesets/secondary/viridian_gym/palettes/5.gbapal" - .incbin "data/tilesets/secondary/viridian_gym/palettes/6.gbapal" - .incbin "data/tilesets/secondary/viridian_gym/palettes/7.gbapal" - .incbin "data/tilesets/secondary/viridian_gym/palettes/8.gbapal" - .incbin "data/tilesets/secondary/viridian_gym/palettes/9.gbapal" + .incbin "data/tilesets/secondary/viridian_gym/palettes/00.gbapal" + .incbin "data/tilesets/secondary/viridian_gym/palettes/01.gbapal" + .incbin "data/tilesets/secondary/viridian_gym/palettes/02.gbapal" + .incbin "data/tilesets/secondary/viridian_gym/palettes/03.gbapal" + .incbin "data/tilesets/secondary/viridian_gym/palettes/04.gbapal" + .incbin "data/tilesets/secondary/viridian_gym/palettes/05.gbapal" + .incbin "data/tilesets/secondary/viridian_gym/palettes/06.gbapal" + .incbin "data/tilesets/secondary/viridian_gym/palettes/07.gbapal" + .incbin "data/tilesets/secondary/viridian_gym/palettes/08.gbapal" + .incbin "data/tilesets/secondary/viridian_gym/palettes/09.gbapal" .incbin "data/tilesets/secondary/viridian_gym/palettes/10.gbapal" .incbin "data/tilesets/secondary/viridian_gym/palettes/11.gbapal" .incbin "data/tilesets/secondary/viridian_gym/palettes/12.gbapal" @@ -694,16 +694,16 @@ gTilesetTiles_SSAnne:: @ 8286DC8 .align 2 gTilesetPalettes_SSAnne:: @ 8287B80 - .incbin "data/tilesets/secondary/ss_anne/palettes/0.gbapal" - .incbin "data/tilesets/secondary/ss_anne/palettes/1.gbapal" - .incbin "data/tilesets/secondary/ss_anne/palettes/2.gbapal" - .incbin "data/tilesets/secondary/ss_anne/palettes/3.gbapal" - .incbin "data/tilesets/secondary/ss_anne/palettes/4.gbapal" - .incbin "data/tilesets/secondary/ss_anne/palettes/5.gbapal" - .incbin "data/tilesets/secondary/ss_anne/palettes/6.gbapal" - .incbin "data/tilesets/secondary/ss_anne/palettes/7.gbapal" - .incbin "data/tilesets/secondary/ss_anne/palettes/8.gbapal" - .incbin "data/tilesets/secondary/ss_anne/palettes/9.gbapal" + .incbin "data/tilesets/secondary/ss_anne/palettes/00.gbapal" + .incbin "data/tilesets/secondary/ss_anne/palettes/01.gbapal" + .incbin "data/tilesets/secondary/ss_anne/palettes/02.gbapal" + .incbin "data/tilesets/secondary/ss_anne/palettes/03.gbapal" + .incbin "data/tilesets/secondary/ss_anne/palettes/04.gbapal" + .incbin "data/tilesets/secondary/ss_anne/palettes/05.gbapal" + .incbin "data/tilesets/secondary/ss_anne/palettes/06.gbapal" + .incbin "data/tilesets/secondary/ss_anne/palettes/07.gbapal" + .incbin "data/tilesets/secondary/ss_anne/palettes/08.gbapal" + .incbin "data/tilesets/secondary/ss_anne/palettes/09.gbapal" .incbin "data/tilesets/secondary/ss_anne/palettes/10.gbapal" .incbin "data/tilesets/secondary/ss_anne/palettes/11.gbapal" .incbin "data/tilesets/secondary/ss_anne/palettes/12.gbapal" @@ -717,16 +717,16 @@ gTilesetTiles_Dummy2:: @ 8287D80 .align 2 gTilesetPalettes_Dummy2:: @ 8287D94 - .incbin "data/tilesets/secondary/dummy2/palettes/0.gbapal" - .incbin "data/tilesets/secondary/dummy2/palettes/1.gbapal" - .incbin "data/tilesets/secondary/dummy2/palettes/2.gbapal" - .incbin "data/tilesets/secondary/dummy2/palettes/3.gbapal" - .incbin "data/tilesets/secondary/dummy2/palettes/4.gbapal" - .incbin "data/tilesets/secondary/dummy2/palettes/5.gbapal" - .incbin "data/tilesets/secondary/dummy2/palettes/6.gbapal" - .incbin "data/tilesets/secondary/dummy2/palettes/7.gbapal" - .incbin "data/tilesets/secondary/dummy2/palettes/8.gbapal" - .incbin "data/tilesets/secondary/dummy2/palettes/9.gbapal" + .incbin "data/tilesets/secondary/dummy2/palettes/00.gbapal" + .incbin "data/tilesets/secondary/dummy2/palettes/01.gbapal" + .incbin "data/tilesets/secondary/dummy2/palettes/02.gbapal" + .incbin "data/tilesets/secondary/dummy2/palettes/03.gbapal" + .incbin "data/tilesets/secondary/dummy2/palettes/04.gbapal" + .incbin "data/tilesets/secondary/dummy2/palettes/05.gbapal" + .incbin "data/tilesets/secondary/dummy2/palettes/06.gbapal" + .incbin "data/tilesets/secondary/dummy2/palettes/07.gbapal" + .incbin "data/tilesets/secondary/dummy2/palettes/08.gbapal" + .incbin "data/tilesets/secondary/dummy2/palettes/09.gbapal" .incbin "data/tilesets/secondary/dummy2/palettes/10.gbapal" .incbin "data/tilesets/secondary/dummy2/palettes/11.gbapal" .incbin "data/tilesets/secondary/dummy2/palettes/12.gbapal" @@ -740,16 +740,16 @@ gTilesetTiles_ViridianForest:: @ 8287F94 .align 2 gTilesetPalettes_ViridianForest:: @ 8288444 - .incbin "data/tilesets/secondary/viridian_forest/palettes/0.gbapal" - .incbin "data/tilesets/secondary/viridian_forest/palettes/1.gbapal" - .incbin "data/tilesets/secondary/viridian_forest/palettes/2.gbapal" - .incbin "data/tilesets/secondary/viridian_forest/palettes/3.gbapal" - .incbin "data/tilesets/secondary/viridian_forest/palettes/4.gbapal" - .incbin "data/tilesets/secondary/viridian_forest/palettes/5.gbapal" - .incbin "data/tilesets/secondary/viridian_forest/palettes/6.gbapal" - .incbin "data/tilesets/secondary/viridian_forest/palettes/7.gbapal" - .incbin "data/tilesets/secondary/viridian_forest/palettes/8.gbapal" - .incbin "data/tilesets/secondary/viridian_forest/palettes/9.gbapal" + .incbin "data/tilesets/secondary/viridian_forest/palettes/00.gbapal" + .incbin "data/tilesets/secondary/viridian_forest/palettes/01.gbapal" + .incbin "data/tilesets/secondary/viridian_forest/palettes/02.gbapal" + .incbin "data/tilesets/secondary/viridian_forest/palettes/03.gbapal" + .incbin "data/tilesets/secondary/viridian_forest/palettes/04.gbapal" + .incbin "data/tilesets/secondary/viridian_forest/palettes/05.gbapal" + .incbin "data/tilesets/secondary/viridian_forest/palettes/06.gbapal" + .incbin "data/tilesets/secondary/viridian_forest/palettes/07.gbapal" + .incbin "data/tilesets/secondary/viridian_forest/palettes/08.gbapal" + .incbin "data/tilesets/secondary/viridian_forest/palettes/09.gbapal" .incbin "data/tilesets/secondary/viridian_forest/palettes/10.gbapal" .incbin "data/tilesets/secondary/viridian_forest/palettes/11.gbapal" .incbin "data/tilesets/secondary/viridian_forest/palettes/12.gbapal" @@ -763,16 +763,16 @@ gTilesetTiles_UnusedGatehouse1:: @ 8288644 .align 2 gTilesetPalettes_UnusedGatehouse1:: @ 8288C60 - .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/0.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/1.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/2.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/3.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/4.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/5.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/6.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/7.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/8.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/9.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/00.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/01.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/02.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/03.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/04.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/05.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/06.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/07.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/08.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/09.gbapal" .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/10.gbapal" .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/11.gbapal" .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/12.gbapal" @@ -786,16 +786,16 @@ gTilesetTiles_RockTunnel:: @ 8288E60 .align 2 gTilesetPalettes_RockTunnel:: @ 8289FC8 - .incbin "data/tilesets/secondary/rock_tunnel/palettes/0.gbapal" - .incbin "data/tilesets/secondary/rock_tunnel/palettes/1.gbapal" - .incbin "data/tilesets/secondary/rock_tunnel/palettes/2.gbapal" - .incbin "data/tilesets/secondary/rock_tunnel/palettes/3.gbapal" - .incbin "data/tilesets/secondary/rock_tunnel/palettes/4.gbapal" - .incbin "data/tilesets/secondary/rock_tunnel/palettes/5.gbapal" - .incbin "data/tilesets/secondary/rock_tunnel/palettes/6.gbapal" - .incbin "data/tilesets/secondary/rock_tunnel/palettes/7.gbapal" - .incbin "data/tilesets/secondary/rock_tunnel/palettes/8.gbapal" - .incbin "data/tilesets/secondary/rock_tunnel/palettes/9.gbapal" + .incbin "data/tilesets/secondary/rock_tunnel/palettes/00.gbapal" + .incbin "data/tilesets/secondary/rock_tunnel/palettes/01.gbapal" + .incbin "data/tilesets/secondary/rock_tunnel/palettes/02.gbapal" + .incbin "data/tilesets/secondary/rock_tunnel/palettes/03.gbapal" + .incbin "data/tilesets/secondary/rock_tunnel/palettes/04.gbapal" + .incbin "data/tilesets/secondary/rock_tunnel/palettes/05.gbapal" + .incbin "data/tilesets/secondary/rock_tunnel/palettes/06.gbapal" + .incbin "data/tilesets/secondary/rock_tunnel/palettes/07.gbapal" + .incbin "data/tilesets/secondary/rock_tunnel/palettes/08.gbapal" + .incbin "data/tilesets/secondary/rock_tunnel/palettes/09.gbapal" .incbin "data/tilesets/secondary/rock_tunnel/palettes/10.gbapal" .incbin "data/tilesets/secondary/rock_tunnel/palettes/11.gbapal" .incbin "data/tilesets/secondary/rock_tunnel/palettes/12.gbapal" @@ -809,16 +809,16 @@ gTilesetTiles_DiglettsCave:: @ 828A1C8 .align 2 gTilesetPalettes_DiglettsCave:: @ 828B250 - .incbin "data/tilesets/secondary/digletts_cave/palettes/0.gbapal" - .incbin "data/tilesets/secondary/digletts_cave/palettes/1.gbapal" - .incbin "data/tilesets/secondary/digletts_cave/palettes/2.gbapal" - .incbin "data/tilesets/secondary/digletts_cave/palettes/3.gbapal" - .incbin "data/tilesets/secondary/digletts_cave/palettes/4.gbapal" - .incbin "data/tilesets/secondary/digletts_cave/palettes/5.gbapal" - .incbin "data/tilesets/secondary/digletts_cave/palettes/6.gbapal" - .incbin "data/tilesets/secondary/digletts_cave/palettes/7.gbapal" - .incbin "data/tilesets/secondary/digletts_cave/palettes/8.gbapal" - .incbin "data/tilesets/secondary/digletts_cave/palettes/9.gbapal" + .incbin "data/tilesets/secondary/digletts_cave/palettes/00.gbapal" + .incbin "data/tilesets/secondary/digletts_cave/palettes/01.gbapal" + .incbin "data/tilesets/secondary/digletts_cave/palettes/02.gbapal" + .incbin "data/tilesets/secondary/digletts_cave/palettes/03.gbapal" + .incbin "data/tilesets/secondary/digletts_cave/palettes/04.gbapal" + .incbin "data/tilesets/secondary/digletts_cave/palettes/05.gbapal" + .incbin "data/tilesets/secondary/digletts_cave/palettes/06.gbapal" + .incbin "data/tilesets/secondary/digletts_cave/palettes/07.gbapal" + .incbin "data/tilesets/secondary/digletts_cave/palettes/08.gbapal" + .incbin "data/tilesets/secondary/digletts_cave/palettes/09.gbapal" .incbin "data/tilesets/secondary/digletts_cave/palettes/10.gbapal" .incbin "data/tilesets/secondary/digletts_cave/palettes/11.gbapal" .incbin "data/tilesets/secondary/digletts_cave/palettes/12.gbapal" @@ -832,16 +832,16 @@ gTilesetTiles_SeafoamIslands:: @ 828B450 .align 2 gTilesetPalettes_SeafoamIslands:: @ 828CAA0 - .incbin "data/tilesets/secondary/seafoam_islands/palettes/0.gbapal" - .incbin "data/tilesets/secondary/seafoam_islands/palettes/1.gbapal" - .incbin "data/tilesets/secondary/seafoam_islands/palettes/2.gbapal" - .incbin "data/tilesets/secondary/seafoam_islands/palettes/3.gbapal" - .incbin "data/tilesets/secondary/seafoam_islands/palettes/4.gbapal" - .incbin "data/tilesets/secondary/seafoam_islands/palettes/5.gbapal" - .incbin "data/tilesets/secondary/seafoam_islands/palettes/6.gbapal" - .incbin "data/tilesets/secondary/seafoam_islands/palettes/7.gbapal" - .incbin "data/tilesets/secondary/seafoam_islands/palettes/8.gbapal" - .incbin "data/tilesets/secondary/seafoam_islands/palettes/9.gbapal" + .incbin "data/tilesets/secondary/seafoam_islands/palettes/00.gbapal" + .incbin "data/tilesets/secondary/seafoam_islands/palettes/01.gbapal" + .incbin "data/tilesets/secondary/seafoam_islands/palettes/02.gbapal" + .incbin "data/tilesets/secondary/seafoam_islands/palettes/03.gbapal" + .incbin "data/tilesets/secondary/seafoam_islands/palettes/04.gbapal" + .incbin "data/tilesets/secondary/seafoam_islands/palettes/05.gbapal" + .incbin "data/tilesets/secondary/seafoam_islands/palettes/06.gbapal" + .incbin "data/tilesets/secondary/seafoam_islands/palettes/07.gbapal" + .incbin "data/tilesets/secondary/seafoam_islands/palettes/08.gbapal" + .incbin "data/tilesets/secondary/seafoam_islands/palettes/09.gbapal" .incbin "data/tilesets/secondary/seafoam_islands/palettes/10.gbapal" .incbin "data/tilesets/secondary/seafoam_islands/palettes/11.gbapal" .incbin "data/tilesets/secondary/seafoam_islands/palettes/12.gbapal" @@ -855,16 +855,16 @@ gTilesetTiles_UnusedGatehouse2:: @ 828CCA0 .align 2 gTilesetPalettes_UnusedGatehouse2:: @ 828D2BC - .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/0.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/1.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/2.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/3.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/4.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/5.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/6.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/7.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/8.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/9.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/00.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/01.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/02.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/03.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/04.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/05.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/06.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/07.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/08.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/09.gbapal" .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/10.gbapal" .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/11.gbapal" .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/12.gbapal" @@ -878,16 +878,16 @@ gTilesetTiles_CeruleanCave:: @ 828D4BC .align 2 gTilesetPalettes_CeruleanCave:: @ 828E3A4 - .incbin "data/tilesets/secondary/cerulean_cave/palettes/0.gbapal" - .incbin "data/tilesets/secondary/cerulean_cave/palettes/1.gbapal" - .incbin "data/tilesets/secondary/cerulean_cave/palettes/2.gbapal" - .incbin "data/tilesets/secondary/cerulean_cave/palettes/3.gbapal" - .incbin "data/tilesets/secondary/cerulean_cave/palettes/4.gbapal" - .incbin "data/tilesets/secondary/cerulean_cave/palettes/5.gbapal" - .incbin "data/tilesets/secondary/cerulean_cave/palettes/6.gbapal" - .incbin "data/tilesets/secondary/cerulean_cave/palettes/7.gbapal" - .incbin "data/tilesets/secondary/cerulean_cave/palettes/8.gbapal" - .incbin "data/tilesets/secondary/cerulean_cave/palettes/9.gbapal" + .incbin "data/tilesets/secondary/cerulean_cave/palettes/00.gbapal" + .incbin "data/tilesets/secondary/cerulean_cave/palettes/01.gbapal" + .incbin "data/tilesets/secondary/cerulean_cave/palettes/02.gbapal" + .incbin "data/tilesets/secondary/cerulean_cave/palettes/03.gbapal" + .incbin "data/tilesets/secondary/cerulean_cave/palettes/04.gbapal" + .incbin "data/tilesets/secondary/cerulean_cave/palettes/05.gbapal" + .incbin "data/tilesets/secondary/cerulean_cave/palettes/06.gbapal" + .incbin "data/tilesets/secondary/cerulean_cave/palettes/07.gbapal" + .incbin "data/tilesets/secondary/cerulean_cave/palettes/08.gbapal" + .incbin "data/tilesets/secondary/cerulean_cave/palettes/09.gbapal" .incbin "data/tilesets/secondary/cerulean_cave/palettes/10.gbapal" .incbin "data/tilesets/secondary/cerulean_cave/palettes/11.gbapal" .incbin "data/tilesets/secondary/cerulean_cave/palettes/12.gbapal" @@ -901,16 +901,16 @@ gTilesetTiles_GenericBuilding2:: @ 828E5A4 .align 2 gTilesetPalettes_GenericBuilding2:: @ 828EC70 - .incbin "data/tilesets/secondary/generic_building2/palettes/0.gbapal" - .incbin "data/tilesets/secondary/generic_building2/palettes/1.gbapal" - .incbin "data/tilesets/secondary/generic_building2/palettes/2.gbapal" - .incbin "data/tilesets/secondary/generic_building2/palettes/3.gbapal" - .incbin "data/tilesets/secondary/generic_building2/palettes/4.gbapal" - .incbin "data/tilesets/secondary/generic_building2/palettes/5.gbapal" - .incbin "data/tilesets/secondary/generic_building2/palettes/6.gbapal" - .incbin "data/tilesets/secondary/generic_building2/palettes/7.gbapal" - .incbin "data/tilesets/secondary/generic_building2/palettes/8.gbapal" - .incbin "data/tilesets/secondary/generic_building2/palettes/9.gbapal" + .incbin "data/tilesets/secondary/generic_building2/palettes/00.gbapal" + .incbin "data/tilesets/secondary/generic_building2/palettes/01.gbapal" + .incbin "data/tilesets/secondary/generic_building2/palettes/02.gbapal" + .incbin "data/tilesets/secondary/generic_building2/palettes/03.gbapal" + .incbin "data/tilesets/secondary/generic_building2/palettes/04.gbapal" + .incbin "data/tilesets/secondary/generic_building2/palettes/05.gbapal" + .incbin "data/tilesets/secondary/generic_building2/palettes/06.gbapal" + .incbin "data/tilesets/secondary/generic_building2/palettes/07.gbapal" + .incbin "data/tilesets/secondary/generic_building2/palettes/08.gbapal" + .incbin "data/tilesets/secondary/generic_building2/palettes/09.gbapal" .incbin "data/tilesets/secondary/generic_building2/palettes/10.gbapal" .incbin "data/tilesets/secondary/generic_building2/palettes/11.gbapal" .incbin "data/tilesets/secondary/generic_building2/palettes/12.gbapal" @@ -924,16 +924,16 @@ gTilesetTiles_PowerPlant:: @ 828EE70 .align 2 gTilesetPalettes_PowerPlant:: @ 828F378 - .incbin "data/tilesets/secondary/power_plant/palettes/0.gbapal" - .incbin "data/tilesets/secondary/power_plant/palettes/1.gbapal" - .incbin "data/tilesets/secondary/power_plant/palettes/2.gbapal" - .incbin "data/tilesets/secondary/power_plant/palettes/3.gbapal" - .incbin "data/tilesets/secondary/power_plant/palettes/4.gbapal" - .incbin "data/tilesets/secondary/power_plant/palettes/5.gbapal" - .incbin "data/tilesets/secondary/power_plant/palettes/6.gbapal" - .incbin "data/tilesets/secondary/power_plant/palettes/7.gbapal" - .incbin "data/tilesets/secondary/power_plant/palettes/8.gbapal" - .incbin "data/tilesets/secondary/power_plant/palettes/9.gbapal" + .incbin "data/tilesets/secondary/power_plant/palettes/00.gbapal" + .incbin "data/tilesets/secondary/power_plant/palettes/01.gbapal" + .incbin "data/tilesets/secondary/power_plant/palettes/02.gbapal" + .incbin "data/tilesets/secondary/power_plant/palettes/03.gbapal" + .incbin "data/tilesets/secondary/power_plant/palettes/04.gbapal" + .incbin "data/tilesets/secondary/power_plant/palettes/05.gbapal" + .incbin "data/tilesets/secondary/power_plant/palettes/06.gbapal" + .incbin "data/tilesets/secondary/power_plant/palettes/07.gbapal" + .incbin "data/tilesets/secondary/power_plant/palettes/08.gbapal" + .incbin "data/tilesets/secondary/power_plant/palettes/09.gbapal" .incbin "data/tilesets/secondary/power_plant/palettes/10.gbapal" .incbin "data/tilesets/secondary/power_plant/palettes/11.gbapal" .incbin "data/tilesets/secondary/power_plant/palettes/12.gbapal" @@ -947,16 +947,16 @@ gTilesetTiles_SeaCottage:: @ 828F578 .align 2 gTilesetPalettes_SeaCottage:: @ 828F9D8 - .incbin "data/tilesets/secondary/sea_cottage/palettes/0.gbapal" - .incbin "data/tilesets/secondary/sea_cottage/palettes/1.gbapal" - .incbin "data/tilesets/secondary/sea_cottage/palettes/2.gbapal" - .incbin "data/tilesets/secondary/sea_cottage/palettes/3.gbapal" - .incbin "data/tilesets/secondary/sea_cottage/palettes/4.gbapal" - .incbin "data/tilesets/secondary/sea_cottage/palettes/5.gbapal" - .incbin "data/tilesets/secondary/sea_cottage/palettes/6.gbapal" - .incbin "data/tilesets/secondary/sea_cottage/palettes/7.gbapal" - .incbin "data/tilesets/secondary/sea_cottage/palettes/8.gbapal" - .incbin "data/tilesets/secondary/sea_cottage/palettes/9.gbapal" + .incbin "data/tilesets/secondary/sea_cottage/palettes/00.gbapal" + .incbin "data/tilesets/secondary/sea_cottage/palettes/01.gbapal" + .incbin "data/tilesets/secondary/sea_cottage/palettes/02.gbapal" + .incbin "data/tilesets/secondary/sea_cottage/palettes/03.gbapal" + .incbin "data/tilesets/secondary/sea_cottage/palettes/04.gbapal" + .incbin "data/tilesets/secondary/sea_cottage/palettes/05.gbapal" + .incbin "data/tilesets/secondary/sea_cottage/palettes/06.gbapal" + .incbin "data/tilesets/secondary/sea_cottage/palettes/07.gbapal" + .incbin "data/tilesets/secondary/sea_cottage/palettes/08.gbapal" + .incbin "data/tilesets/secondary/sea_cottage/palettes/09.gbapal" .incbin "data/tilesets/secondary/sea_cottage/palettes/10.gbapal" .incbin "data/tilesets/secondary/sea_cottage/palettes/11.gbapal" .incbin "data/tilesets/secondary/sea_cottage/palettes/12.gbapal" @@ -970,16 +970,16 @@ gTilesetTiles_SilphCo:: @ 828FBD8 .align 2 gTilesetPalettes_SilphCo:: @ 8290DD0 - .incbin "data/tilesets/secondary/condominiums/palettes/0.gbapal" - .incbin "data/tilesets/secondary/condominiums/palettes/1.gbapal" - .incbin "data/tilesets/secondary/condominiums/palettes/2.gbapal" - .incbin "data/tilesets/secondary/condominiums/palettes/3.gbapal" - .incbin "data/tilesets/secondary/condominiums/palettes/4.gbapal" - .incbin "data/tilesets/secondary/condominiums/palettes/5.gbapal" - .incbin "data/tilesets/secondary/condominiums/palettes/6.gbapal" - .incbin "data/tilesets/secondary/condominiums/palettes/7.gbapal" - .incbin "data/tilesets/secondary/condominiums/palettes/8.gbapal" - .incbin "data/tilesets/secondary/condominiums/palettes/9.gbapal" + .incbin "data/tilesets/secondary/condominiums/palettes/00.gbapal" + .incbin "data/tilesets/secondary/condominiums/palettes/01.gbapal" + .incbin "data/tilesets/secondary/condominiums/palettes/02.gbapal" + .incbin "data/tilesets/secondary/condominiums/palettes/03.gbapal" + .incbin "data/tilesets/secondary/condominiums/palettes/04.gbapal" + .incbin "data/tilesets/secondary/condominiums/palettes/05.gbapal" + .incbin "data/tilesets/secondary/condominiums/palettes/06.gbapal" + .incbin "data/tilesets/secondary/condominiums/palettes/07.gbapal" + .incbin "data/tilesets/secondary/condominiums/palettes/08.gbapal" + .incbin "data/tilesets/secondary/condominiums/palettes/09.gbapal" .incbin "data/tilesets/secondary/condominiums/palettes/10.gbapal" .incbin "data/tilesets/secondary/condominiums/palettes/11.gbapal" .incbin "data/tilesets/secondary/condominiums/palettes/12.gbapal" @@ -993,16 +993,16 @@ gTilesetTiles_UndergroundPath:: @ 8290FD0 .align 2 gTilesetPalettes_UndergroundPath:: @ 8291274 - .incbin "data/tilesets/secondary/underground_path/palettes/0.gbapal" - .incbin "data/tilesets/secondary/underground_path/palettes/1.gbapal" - .incbin "data/tilesets/secondary/underground_path/palettes/2.gbapal" - .incbin "data/tilesets/secondary/underground_path/palettes/3.gbapal" - .incbin "data/tilesets/secondary/underground_path/palettes/4.gbapal" - .incbin "data/tilesets/secondary/underground_path/palettes/5.gbapal" - .incbin "data/tilesets/secondary/underground_path/palettes/6.gbapal" - .incbin "data/tilesets/secondary/underground_path/palettes/7.gbapal" - .incbin "data/tilesets/secondary/underground_path/palettes/8.gbapal" - .incbin "data/tilesets/secondary/underground_path/palettes/9.gbapal" + .incbin "data/tilesets/secondary/underground_path/palettes/00.gbapal" + .incbin "data/tilesets/secondary/underground_path/palettes/01.gbapal" + .incbin "data/tilesets/secondary/underground_path/palettes/02.gbapal" + .incbin "data/tilesets/secondary/underground_path/palettes/03.gbapal" + .incbin "data/tilesets/secondary/underground_path/palettes/04.gbapal" + .incbin "data/tilesets/secondary/underground_path/palettes/05.gbapal" + .incbin "data/tilesets/secondary/underground_path/palettes/06.gbapal" + .incbin "data/tilesets/secondary/underground_path/palettes/07.gbapal" + .incbin "data/tilesets/secondary/underground_path/palettes/08.gbapal" + .incbin "data/tilesets/secondary/underground_path/palettes/09.gbapal" .incbin "data/tilesets/secondary/underground_path/palettes/10.gbapal" .incbin "data/tilesets/secondary/underground_path/palettes/11.gbapal" .incbin "data/tilesets/secondary/underground_path/palettes/12.gbapal" @@ -1016,16 +1016,16 @@ gTilesetTiles_PokemonTower:: @ 8291474 .align 2 gTilesetPalettes_PokemonTower:: @ 8291AFC - .incbin "data/tilesets/secondary/pokemon_tower/palettes/0.gbapal" - .incbin "data/tilesets/secondary/pokemon_tower/palettes/1.gbapal" - .incbin "data/tilesets/secondary/pokemon_tower/palettes/2.gbapal" - .incbin "data/tilesets/secondary/pokemon_tower/palettes/3.gbapal" - .incbin "data/tilesets/secondary/pokemon_tower/palettes/4.gbapal" - .incbin "data/tilesets/secondary/pokemon_tower/palettes/5.gbapal" - .incbin "data/tilesets/secondary/pokemon_tower/palettes/6.gbapal" - .incbin "data/tilesets/secondary/pokemon_tower/palettes/7.gbapal" - .incbin "data/tilesets/secondary/pokemon_tower/palettes/8.gbapal" - .incbin "data/tilesets/secondary/pokemon_tower/palettes/9.gbapal" + .incbin "data/tilesets/secondary/pokemon_tower/palettes/00.gbapal" + .incbin "data/tilesets/secondary/pokemon_tower/palettes/01.gbapal" + .incbin "data/tilesets/secondary/pokemon_tower/palettes/02.gbapal" + .incbin "data/tilesets/secondary/pokemon_tower/palettes/03.gbapal" + .incbin "data/tilesets/secondary/pokemon_tower/palettes/04.gbapal" + .incbin "data/tilesets/secondary/pokemon_tower/palettes/05.gbapal" + .incbin "data/tilesets/secondary/pokemon_tower/palettes/06.gbapal" + .incbin "data/tilesets/secondary/pokemon_tower/palettes/07.gbapal" + .incbin "data/tilesets/secondary/pokemon_tower/palettes/08.gbapal" + .incbin "data/tilesets/secondary/pokemon_tower/palettes/09.gbapal" .incbin "data/tilesets/secondary/pokemon_tower/palettes/10.gbapal" .incbin "data/tilesets/secondary/pokemon_tower/palettes/11.gbapal" .incbin "data/tilesets/secondary/pokemon_tower/palettes/12.gbapal" @@ -1039,16 +1039,16 @@ gTilesetTiles_SafariZoneBuilding:: @ 8291CFC .align 2 gTilesetPalettes_SafariZoneBuilding:: @ 82920F0 - .incbin "data/tilesets/secondary/safari_zone_building/palettes/0.gbapal" - .incbin "data/tilesets/secondary/safari_zone_building/palettes/1.gbapal" - .incbin "data/tilesets/secondary/safari_zone_building/palettes/2.gbapal" - .incbin "data/tilesets/secondary/safari_zone_building/palettes/3.gbapal" - .incbin "data/tilesets/secondary/safari_zone_building/palettes/4.gbapal" - .incbin "data/tilesets/secondary/safari_zone_building/palettes/5.gbapal" - .incbin "data/tilesets/secondary/safari_zone_building/palettes/6.gbapal" - .incbin "data/tilesets/secondary/safari_zone_building/palettes/7.gbapal" - .incbin "data/tilesets/secondary/safari_zone_building/palettes/8.gbapal" - .incbin "data/tilesets/secondary/safari_zone_building/palettes/9.gbapal" + .incbin "data/tilesets/secondary/safari_zone_building/palettes/00.gbapal" + .incbin "data/tilesets/secondary/safari_zone_building/palettes/01.gbapal" + .incbin "data/tilesets/secondary/safari_zone_building/palettes/02.gbapal" + .incbin "data/tilesets/secondary/safari_zone_building/palettes/03.gbapal" + .incbin "data/tilesets/secondary/safari_zone_building/palettes/04.gbapal" + .incbin "data/tilesets/secondary/safari_zone_building/palettes/05.gbapal" + .incbin "data/tilesets/secondary/safari_zone_building/palettes/06.gbapal" + .incbin "data/tilesets/secondary/safari_zone_building/palettes/07.gbapal" + .incbin "data/tilesets/secondary/safari_zone_building/palettes/08.gbapal" + .incbin "data/tilesets/secondary/safari_zone_building/palettes/09.gbapal" .incbin "data/tilesets/secondary/safari_zone_building/palettes/10.gbapal" .incbin "data/tilesets/secondary/safari_zone_building/palettes/11.gbapal" .incbin "data/tilesets/secondary/safari_zone_building/palettes/12.gbapal" @@ -1062,16 +1062,16 @@ gTilesetTiles_PokemonMansion:: @ 82922F0 .align 2 gTilesetPalettes_PokemonMansion:: @ 8292FF0 - .incbin "data/tilesets/secondary/pokemon_mansion/palettes/0.gbapal" - .incbin "data/tilesets/secondary/pokemon_mansion/palettes/1.gbapal" - .incbin "data/tilesets/secondary/pokemon_mansion/palettes/2.gbapal" - .incbin "data/tilesets/secondary/pokemon_mansion/palettes/3.gbapal" - .incbin "data/tilesets/secondary/pokemon_mansion/palettes/4.gbapal" - .incbin "data/tilesets/secondary/pokemon_mansion/palettes/5.gbapal" - .incbin "data/tilesets/secondary/pokemon_mansion/palettes/6.gbapal" - .incbin "data/tilesets/secondary/pokemon_mansion/palettes/7.gbapal" - .incbin "data/tilesets/secondary/pokemon_mansion/palettes/8.gbapal" - .incbin "data/tilesets/secondary/pokemon_mansion/palettes/9.gbapal" + .incbin "data/tilesets/secondary/pokemon_mansion/palettes/00.gbapal" + .incbin "data/tilesets/secondary/pokemon_mansion/palettes/01.gbapal" + .incbin "data/tilesets/secondary/pokemon_mansion/palettes/02.gbapal" + .incbin "data/tilesets/secondary/pokemon_mansion/palettes/03.gbapal" + .incbin "data/tilesets/secondary/pokemon_mansion/palettes/04.gbapal" + .incbin "data/tilesets/secondary/pokemon_mansion/palettes/05.gbapal" + .incbin "data/tilesets/secondary/pokemon_mansion/palettes/06.gbapal" + .incbin "data/tilesets/secondary/pokemon_mansion/palettes/07.gbapal" + .incbin "data/tilesets/secondary/pokemon_mansion/palettes/08.gbapal" + .incbin "data/tilesets/secondary/pokemon_mansion/palettes/09.gbapal" .incbin "data/tilesets/secondary/pokemon_mansion/palettes/10.gbapal" .incbin "data/tilesets/secondary/pokemon_mansion/palettes/11.gbapal" .incbin "data/tilesets/secondary/pokemon_mansion/palettes/12.gbapal" @@ -1085,16 +1085,16 @@ gTilesetTiles_RestaurantHotel:: @ 82931F0 .align 2 gTilesetPalettes_RestaurantHotel:: @ 8293660 - .incbin "data/tilesets/secondary/restaurant_hotel/palettes/0.gbapal" - .incbin "data/tilesets/secondary/restaurant_hotel/palettes/1.gbapal" - .incbin "data/tilesets/secondary/restaurant_hotel/palettes/2.gbapal" - .incbin "data/tilesets/secondary/restaurant_hotel/palettes/3.gbapal" - .incbin "data/tilesets/secondary/restaurant_hotel/palettes/4.gbapal" - .incbin "data/tilesets/secondary/restaurant_hotel/palettes/5.gbapal" - .incbin "data/tilesets/secondary/restaurant_hotel/palettes/6.gbapal" - .incbin "data/tilesets/secondary/restaurant_hotel/palettes/7.gbapal" - .incbin "data/tilesets/secondary/restaurant_hotel/palettes/8.gbapal" - .incbin "data/tilesets/secondary/restaurant_hotel/palettes/9.gbapal" + .incbin "data/tilesets/secondary/restaurant_hotel/palettes/00.gbapal" + .incbin "data/tilesets/secondary/restaurant_hotel/palettes/01.gbapal" + .incbin "data/tilesets/secondary/restaurant_hotel/palettes/02.gbapal" + .incbin "data/tilesets/secondary/restaurant_hotel/palettes/03.gbapal" + .incbin "data/tilesets/secondary/restaurant_hotel/palettes/04.gbapal" + .incbin "data/tilesets/secondary/restaurant_hotel/palettes/05.gbapal" + .incbin "data/tilesets/secondary/restaurant_hotel/palettes/06.gbapal" + .incbin "data/tilesets/secondary/restaurant_hotel/palettes/07.gbapal" + .incbin "data/tilesets/secondary/restaurant_hotel/palettes/08.gbapal" + .incbin "data/tilesets/secondary/restaurant_hotel/palettes/09.gbapal" .incbin "data/tilesets/secondary/restaurant_hotel/palettes/10.gbapal" .incbin "data/tilesets/secondary/restaurant_hotel/palettes/11.gbapal" .incbin "data/tilesets/secondary/restaurant_hotel/palettes/12.gbapal" @@ -1108,16 +1108,16 @@ gTilesetTiles_School:: @ 8293860 .align 2 gTilesetPalettes_School:: @ 8293B0C - .incbin "data/tilesets/secondary/school/palettes/0.gbapal" - .incbin "data/tilesets/secondary/school/palettes/1.gbapal" - .incbin "data/tilesets/secondary/school/palettes/2.gbapal" - .incbin "data/tilesets/secondary/school/palettes/3.gbapal" - .incbin "data/tilesets/secondary/school/palettes/4.gbapal" - .incbin "data/tilesets/secondary/school/palettes/5.gbapal" - .incbin "data/tilesets/secondary/school/palettes/6.gbapal" - .incbin "data/tilesets/secondary/school/palettes/7.gbapal" - .incbin "data/tilesets/secondary/school/palettes/8.gbapal" - .incbin "data/tilesets/secondary/school/palettes/9.gbapal" + .incbin "data/tilesets/secondary/school/palettes/00.gbapal" + .incbin "data/tilesets/secondary/school/palettes/01.gbapal" + .incbin "data/tilesets/secondary/school/palettes/02.gbapal" + .incbin "data/tilesets/secondary/school/palettes/03.gbapal" + .incbin "data/tilesets/secondary/school/palettes/04.gbapal" + .incbin "data/tilesets/secondary/school/palettes/05.gbapal" + .incbin "data/tilesets/secondary/school/palettes/06.gbapal" + .incbin "data/tilesets/secondary/school/palettes/07.gbapal" + .incbin "data/tilesets/secondary/school/palettes/08.gbapal" + .incbin "data/tilesets/secondary/school/palettes/09.gbapal" .incbin "data/tilesets/secondary/school/palettes/10.gbapal" .incbin "data/tilesets/secondary/school/palettes/11.gbapal" .incbin "data/tilesets/secondary/school/palettes/12.gbapal" @@ -1131,16 +1131,16 @@ gTilesetTiles_FanClubDaycare:: @ 8293D0C .align 2 gTilesetPalettes_FanClubDaycare:: @ 8294144 - .incbin "data/tilesets/secondary/fan_club_daycare/palettes/0.gbapal" - .incbin "data/tilesets/secondary/fan_club_daycare/palettes/1.gbapal" - .incbin "data/tilesets/secondary/fan_club_daycare/palettes/2.gbapal" - .incbin "data/tilesets/secondary/fan_club_daycare/palettes/3.gbapal" - .incbin "data/tilesets/secondary/fan_club_daycare/palettes/4.gbapal" - .incbin "data/tilesets/secondary/fan_club_daycare/palettes/5.gbapal" - .incbin "data/tilesets/secondary/fan_club_daycare/palettes/6.gbapal" - .incbin "data/tilesets/secondary/fan_club_daycare/palettes/7.gbapal" - .incbin "data/tilesets/secondary/fan_club_daycare/palettes/8.gbapal" - .incbin "data/tilesets/secondary/fan_club_daycare/palettes/9.gbapal" + .incbin "data/tilesets/secondary/fan_club_daycare/palettes/00.gbapal" + .incbin "data/tilesets/secondary/fan_club_daycare/palettes/01.gbapal" + .incbin "data/tilesets/secondary/fan_club_daycare/palettes/02.gbapal" + .incbin "data/tilesets/secondary/fan_club_daycare/palettes/03.gbapal" + .incbin "data/tilesets/secondary/fan_club_daycare/palettes/04.gbapal" + .incbin "data/tilesets/secondary/fan_club_daycare/palettes/05.gbapal" + .incbin "data/tilesets/secondary/fan_club_daycare/palettes/06.gbapal" + .incbin "data/tilesets/secondary/fan_club_daycare/palettes/07.gbapal" + .incbin "data/tilesets/secondary/fan_club_daycare/palettes/08.gbapal" + .incbin "data/tilesets/secondary/fan_club_daycare/palettes/09.gbapal" .incbin "data/tilesets/secondary/fan_club_daycare/palettes/10.gbapal" .incbin "data/tilesets/secondary/fan_club_daycare/palettes/11.gbapal" .incbin "data/tilesets/secondary/fan_club_daycare/palettes/12.gbapal" @@ -1154,16 +1154,16 @@ gTilesetTiles_BurgledHouse:: @ 8294344 .align 2 gTilesetPalettes_BurgledHouse:: @ 8294D08 - .incbin "data/tilesets/secondary/burgled_house/palettes/0.gbapal" - .incbin "data/tilesets/secondary/burgled_house/palettes/1.gbapal" - .incbin "data/tilesets/secondary/burgled_house/palettes/2.gbapal" - .incbin "data/tilesets/secondary/burgled_house/palettes/3.gbapal" - .incbin "data/tilesets/secondary/burgled_house/palettes/4.gbapal" - .incbin "data/tilesets/secondary/burgled_house/palettes/5.gbapal" - .incbin "data/tilesets/secondary/burgled_house/palettes/6.gbapal" - .incbin "data/tilesets/secondary/burgled_house/palettes/7.gbapal" - .incbin "data/tilesets/secondary/burgled_house/palettes/8.gbapal" - .incbin "data/tilesets/secondary/burgled_house/palettes/9.gbapal" + .incbin "data/tilesets/secondary/burgled_house/palettes/00.gbapal" + .incbin "data/tilesets/secondary/burgled_house/palettes/01.gbapal" + .incbin "data/tilesets/secondary/burgled_house/palettes/02.gbapal" + .incbin "data/tilesets/secondary/burgled_house/palettes/03.gbapal" + .incbin "data/tilesets/secondary/burgled_house/palettes/04.gbapal" + .incbin "data/tilesets/secondary/burgled_house/palettes/05.gbapal" + .incbin "data/tilesets/secondary/burgled_house/palettes/06.gbapal" + .incbin "data/tilesets/secondary/burgled_house/palettes/07.gbapal" + .incbin "data/tilesets/secondary/burgled_house/palettes/08.gbapal" + .incbin "data/tilesets/secondary/burgled_house/palettes/09.gbapal" .incbin "data/tilesets/secondary/burgled_house/palettes/10.gbapal" .incbin "data/tilesets/secondary/burgled_house/palettes/11.gbapal" .incbin "data/tilesets/secondary/burgled_house/palettes/12.gbapal" @@ -1177,16 +1177,16 @@ gTilesetTiles_Dummy3:: @ 8294F08 .align 2 gTilesetPalettes_Dummy3:: @ 8294F18 - .incbin "data/tilesets/secondary/dummy3/palettes/0.gbapal" - .incbin "data/tilesets/secondary/dummy3/palettes/1.gbapal" - .incbin "data/tilesets/secondary/dummy3/palettes/2.gbapal" - .incbin "data/tilesets/secondary/dummy3/palettes/3.gbapal" - .incbin "data/tilesets/secondary/dummy3/palettes/4.gbapal" - .incbin "data/tilesets/secondary/dummy3/palettes/5.gbapal" - .incbin "data/tilesets/secondary/dummy3/palettes/6.gbapal" - .incbin "data/tilesets/secondary/dummy3/palettes/7.gbapal" - .incbin "data/tilesets/secondary/dummy3/palettes/8.gbapal" - .incbin "data/tilesets/secondary/dummy3/palettes/9.gbapal" + .incbin "data/tilesets/secondary/dummy3/palettes/00.gbapal" + .incbin "data/tilesets/secondary/dummy3/palettes/01.gbapal" + .incbin "data/tilesets/secondary/dummy3/palettes/02.gbapal" + .incbin "data/tilesets/secondary/dummy3/palettes/03.gbapal" + .incbin "data/tilesets/secondary/dummy3/palettes/04.gbapal" + .incbin "data/tilesets/secondary/dummy3/palettes/05.gbapal" + .incbin "data/tilesets/secondary/dummy3/palettes/06.gbapal" + .incbin "data/tilesets/secondary/dummy3/palettes/07.gbapal" + .incbin "data/tilesets/secondary/dummy3/palettes/08.gbapal" + .incbin "data/tilesets/secondary/dummy3/palettes/09.gbapal" .incbin "data/tilesets/secondary/dummy3/palettes/10.gbapal" .incbin "data/tilesets/secondary/dummy3/palettes/11.gbapal" .incbin "data/tilesets/secondary/dummy3/palettes/12.gbapal" @@ -1200,16 +1200,16 @@ gTilesetTiles_Dummy4:: @ 8295118 .align 2 gTilesetPalettes_Dummy4:: @ 829512C - .incbin "data/tilesets/secondary/dummy4/palettes/0.gbapal" - .incbin "data/tilesets/secondary/dummy4/palettes/1.gbapal" - .incbin "data/tilesets/secondary/dummy4/palettes/2.gbapal" - .incbin "data/tilesets/secondary/dummy4/palettes/3.gbapal" - .incbin "data/tilesets/secondary/dummy4/palettes/4.gbapal" - .incbin "data/tilesets/secondary/dummy4/palettes/5.gbapal" - .incbin "data/tilesets/secondary/dummy4/palettes/6.gbapal" - .incbin "data/tilesets/secondary/dummy4/palettes/7.gbapal" - .incbin "data/tilesets/secondary/dummy4/palettes/8.gbapal" - .incbin "data/tilesets/secondary/dummy4/palettes/9.gbapal" + .incbin "data/tilesets/secondary/dummy4/palettes/00.gbapal" + .incbin "data/tilesets/secondary/dummy4/palettes/01.gbapal" + .incbin "data/tilesets/secondary/dummy4/palettes/02.gbapal" + .incbin "data/tilesets/secondary/dummy4/palettes/03.gbapal" + .incbin "data/tilesets/secondary/dummy4/palettes/04.gbapal" + .incbin "data/tilesets/secondary/dummy4/palettes/05.gbapal" + .incbin "data/tilesets/secondary/dummy4/palettes/06.gbapal" + .incbin "data/tilesets/secondary/dummy4/palettes/07.gbapal" + .incbin "data/tilesets/secondary/dummy4/palettes/08.gbapal" + .incbin "data/tilesets/secondary/dummy4/palettes/09.gbapal" .incbin "data/tilesets/secondary/dummy4/palettes/10.gbapal" .incbin "data/tilesets/secondary/dummy4/palettes/11.gbapal" .incbin "data/tilesets/secondary/dummy4/palettes/12.gbapal" @@ -1223,16 +1223,16 @@ gTilesetTiles_MtEmber:: @ 829532C .align 2 gTilesetPalettes_MtEmber:: @ 82967D4 - .incbin "data/tilesets/secondary/mt_ember/palettes/0.gbapal" - .incbin "data/tilesets/secondary/mt_ember/palettes/1.gbapal" - .incbin "data/tilesets/secondary/mt_ember/palettes/2.gbapal" - .incbin "data/tilesets/secondary/mt_ember/palettes/3.gbapal" - .incbin "data/tilesets/secondary/mt_ember/palettes/4.gbapal" - .incbin "data/tilesets/secondary/mt_ember/palettes/5.gbapal" - .incbin "data/tilesets/secondary/mt_ember/palettes/6.gbapal" - .incbin "data/tilesets/secondary/mt_ember/palettes/7.gbapal" - .incbin "data/tilesets/secondary/mt_ember/palettes/8.gbapal" - .incbin "data/tilesets/secondary/mt_ember/palettes/9.gbapal" + .incbin "data/tilesets/secondary/mt_ember/palettes/00.gbapal" + .incbin "data/tilesets/secondary/mt_ember/palettes/01.gbapal" + .incbin "data/tilesets/secondary/mt_ember/palettes/02.gbapal" + .incbin "data/tilesets/secondary/mt_ember/palettes/03.gbapal" + .incbin "data/tilesets/secondary/mt_ember/palettes/04.gbapal" + .incbin "data/tilesets/secondary/mt_ember/palettes/05.gbapal" + .incbin "data/tilesets/secondary/mt_ember/palettes/06.gbapal" + .incbin "data/tilesets/secondary/mt_ember/palettes/07.gbapal" + .incbin "data/tilesets/secondary/mt_ember/palettes/08.gbapal" + .incbin "data/tilesets/secondary/mt_ember/palettes/09.gbapal" .incbin "data/tilesets/secondary/mt_ember/palettes/10.gbapal" .incbin "data/tilesets/secondary/mt_ember/palettes/11.gbapal" .incbin "data/tilesets/secondary/mt_ember/palettes/12.gbapal" @@ -1246,16 +1246,16 @@ gTilesetTiles_BerryForest:: @ 82969D4 .align 2 gTilesetPalettes_BerryForest:: @ 8296E90 - .incbin "data/tilesets/secondary/berry_forest/palettes/0.gbapal" - .incbin "data/tilesets/secondary/berry_forest/palettes/1.gbapal" - .incbin "data/tilesets/secondary/berry_forest/palettes/2.gbapal" - .incbin "data/tilesets/secondary/berry_forest/palettes/3.gbapal" - .incbin "data/tilesets/secondary/berry_forest/palettes/4.gbapal" - .incbin "data/tilesets/secondary/berry_forest/palettes/5.gbapal" - .incbin "data/tilesets/secondary/berry_forest/palettes/6.gbapal" - .incbin "data/tilesets/secondary/berry_forest/palettes/7.gbapal" - .incbin "data/tilesets/secondary/berry_forest/palettes/8.gbapal" - .incbin "data/tilesets/secondary/berry_forest/palettes/9.gbapal" + .incbin "data/tilesets/secondary/berry_forest/palettes/00.gbapal" + .incbin "data/tilesets/secondary/berry_forest/palettes/01.gbapal" + .incbin "data/tilesets/secondary/berry_forest/palettes/02.gbapal" + .incbin "data/tilesets/secondary/berry_forest/palettes/03.gbapal" + .incbin "data/tilesets/secondary/berry_forest/palettes/04.gbapal" + .incbin "data/tilesets/secondary/berry_forest/palettes/05.gbapal" + .incbin "data/tilesets/secondary/berry_forest/palettes/06.gbapal" + .incbin "data/tilesets/secondary/berry_forest/palettes/07.gbapal" + .incbin "data/tilesets/secondary/berry_forest/palettes/08.gbapal" + .incbin "data/tilesets/secondary/berry_forest/palettes/09.gbapal" .incbin "data/tilesets/secondary/berry_forest/palettes/10.gbapal" .incbin "data/tilesets/secondary/berry_forest/palettes/11.gbapal" .incbin "data/tilesets/secondary/berry_forest/palettes/12.gbapal" @@ -1269,16 +1269,16 @@ gTilesetTiles_NavelRock:: @ 8297090 .align 2 gTilesetPalettes_NavelRock:: @ 82983BC - .incbin "data/tilesets/secondary/navel_rock/palettes/0.gbapal" - .incbin "data/tilesets/secondary/navel_rock/palettes/1.gbapal" - .incbin "data/tilesets/secondary/navel_rock/palettes/2.gbapal" - .incbin "data/tilesets/secondary/navel_rock/palettes/3.gbapal" - .incbin "data/tilesets/secondary/navel_rock/palettes/4.gbapal" - .incbin "data/tilesets/secondary/navel_rock/palettes/5.gbapal" - .incbin "data/tilesets/secondary/navel_rock/palettes/6.gbapal" - .incbin "data/tilesets/secondary/navel_rock/palettes/7.gbapal" - .incbin "data/tilesets/secondary/navel_rock/palettes/8.gbapal" - .incbin "data/tilesets/secondary/navel_rock/palettes/9.gbapal" + .incbin "data/tilesets/secondary/navel_rock/palettes/00.gbapal" + .incbin "data/tilesets/secondary/navel_rock/palettes/01.gbapal" + .incbin "data/tilesets/secondary/navel_rock/palettes/02.gbapal" + .incbin "data/tilesets/secondary/navel_rock/palettes/03.gbapal" + .incbin "data/tilesets/secondary/navel_rock/palettes/04.gbapal" + .incbin "data/tilesets/secondary/navel_rock/palettes/05.gbapal" + .incbin "data/tilesets/secondary/navel_rock/palettes/06.gbapal" + .incbin "data/tilesets/secondary/navel_rock/palettes/07.gbapal" + .incbin "data/tilesets/secondary/navel_rock/palettes/08.gbapal" + .incbin "data/tilesets/secondary/navel_rock/palettes/09.gbapal" .incbin "data/tilesets/secondary/navel_rock/palettes/10.gbapal" .incbin "data/tilesets/secondary/navel_rock/palettes/11.gbapal" .incbin "data/tilesets/secondary/navel_rock/palettes/12.gbapal" @@ -1292,16 +1292,16 @@ gTilesetTiles_TanobyRuins:: @ 82985BC .align 2 gTilesetPalettes_TanobyRuins:: @ 8298970 - .incbin "data/tilesets/secondary/tanoby_ruins/palettes/0.gbapal" - .incbin "data/tilesets/secondary/tanoby_ruins/palettes/1.gbapal" - .incbin "data/tilesets/secondary/tanoby_ruins/palettes/2.gbapal" - .incbin "data/tilesets/secondary/tanoby_ruins/palettes/3.gbapal" - .incbin "data/tilesets/secondary/tanoby_ruins/palettes/4.gbapal" - .incbin "data/tilesets/secondary/tanoby_ruins/palettes/5.gbapal" - .incbin "data/tilesets/secondary/tanoby_ruins/palettes/6.gbapal" - .incbin "data/tilesets/secondary/tanoby_ruins/palettes/7.gbapal" - .incbin "data/tilesets/secondary/tanoby_ruins/palettes/8.gbapal" - .incbin "data/tilesets/secondary/tanoby_ruins/palettes/9.gbapal" + .incbin "data/tilesets/secondary/tanoby_ruins/palettes/00.gbapal" + .incbin "data/tilesets/secondary/tanoby_ruins/palettes/01.gbapal" + .incbin "data/tilesets/secondary/tanoby_ruins/palettes/02.gbapal" + .incbin "data/tilesets/secondary/tanoby_ruins/palettes/03.gbapal" + .incbin "data/tilesets/secondary/tanoby_ruins/palettes/04.gbapal" + .incbin "data/tilesets/secondary/tanoby_ruins/palettes/05.gbapal" + .incbin "data/tilesets/secondary/tanoby_ruins/palettes/06.gbapal" + .incbin "data/tilesets/secondary/tanoby_ruins/palettes/07.gbapal" + .incbin "data/tilesets/secondary/tanoby_ruins/palettes/08.gbapal" + .incbin "data/tilesets/secondary/tanoby_ruins/palettes/09.gbapal" .incbin "data/tilesets/secondary/tanoby_ruins/palettes/10.gbapal" .incbin "data/tilesets/secondary/tanoby_ruins/palettes/11.gbapal" .incbin "data/tilesets/secondary/tanoby_ruins/palettes/12.gbapal" @@ -1315,16 +1315,16 @@ gTilesetTiles_SeviiIslands123:: @ 8298B70 .align 2 gTilesetPalettes_SeviiIslands123:: @ 8299AA4 - .incbin "data/tilesets/secondary/sevii_islands_123/palettes/0.gbapal" - .incbin "data/tilesets/secondary/sevii_islands_123/palettes/1.gbapal" - .incbin "data/tilesets/secondary/sevii_islands_123/palettes/2.gbapal" - .incbin "data/tilesets/secondary/sevii_islands_123/palettes/3.gbapal" - .incbin "data/tilesets/secondary/sevii_islands_123/palettes/4.gbapal" - .incbin "data/tilesets/secondary/sevii_islands_123/palettes/5.gbapal" - .incbin "data/tilesets/secondary/sevii_islands_123/palettes/6.gbapal" - .incbin "data/tilesets/secondary/sevii_islands_123/palettes/7.gbapal" - .incbin "data/tilesets/secondary/sevii_islands_123/palettes/8.gbapal" - .incbin "data/tilesets/secondary/sevii_islands_123/palettes/9.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_123/palettes/00.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_123/palettes/01.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_123/palettes/02.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_123/palettes/03.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_123/palettes/04.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_123/palettes/05.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_123/palettes/06.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_123/palettes/07.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_123/palettes/08.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_123/palettes/09.gbapal" .incbin "data/tilesets/secondary/sevii_islands_123/palettes/10.gbapal" .incbin "data/tilesets/secondary/sevii_islands_123/palettes/11.gbapal" .incbin "data/tilesets/secondary/sevii_islands_123/palettes/12.gbapal" @@ -1338,16 +1338,16 @@ gTilesetTiles_SeviiIslands45:: @ 8299CA4 .align 2 gTilesetPalettes_SeviiIslands45:: @ 829AB04 - .incbin "data/tilesets/secondary/sevii_islands_45/palettes/0.gbapal" - .incbin "data/tilesets/secondary/sevii_islands_45/palettes/1.gbapal" - .incbin "data/tilesets/secondary/sevii_islands_45/palettes/2.gbapal" - .incbin "data/tilesets/secondary/sevii_islands_45/palettes/3.gbapal" - .incbin "data/tilesets/secondary/sevii_islands_45/palettes/4.gbapal" - .incbin "data/tilesets/secondary/sevii_islands_45/palettes/5.gbapal" - .incbin "data/tilesets/secondary/sevii_islands_45/palettes/6.gbapal" - .incbin "data/tilesets/secondary/sevii_islands_45/palettes/7.gbapal" - .incbin "data/tilesets/secondary/sevii_islands_45/palettes/8.gbapal" - .incbin "data/tilesets/secondary/sevii_islands_45/palettes/9.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_45/palettes/00.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_45/palettes/01.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_45/palettes/02.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_45/palettes/03.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_45/palettes/04.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_45/palettes/05.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_45/palettes/06.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_45/palettes/07.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_45/palettes/08.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_45/palettes/09.gbapal" .incbin "data/tilesets/secondary/sevii_islands_45/palettes/10.gbapal" .incbin "data/tilesets/secondary/sevii_islands_45/palettes/11.gbapal" .incbin "data/tilesets/secondary/sevii_islands_45/palettes/12.gbapal" @@ -1361,16 +1361,16 @@ gTilesetTiles_SeviiIslands67:: @ 829AD04 .align 2 gTilesetPalettes_SeviiIslands67:: @ 829BD64 - .incbin "data/tilesets/secondary/sevii_islands_67/palettes/0.gbapal" - .incbin "data/tilesets/secondary/sevii_islands_67/palettes/1.gbapal" - .incbin "data/tilesets/secondary/sevii_islands_67/palettes/2.gbapal" - .incbin "data/tilesets/secondary/sevii_islands_67/palettes/3.gbapal" - .incbin "data/tilesets/secondary/sevii_islands_67/palettes/4.gbapal" - .incbin "data/tilesets/secondary/sevii_islands_67/palettes/5.gbapal" - .incbin "data/tilesets/secondary/sevii_islands_67/palettes/6.gbapal" - .incbin "data/tilesets/secondary/sevii_islands_67/palettes/7.gbapal" - .incbin "data/tilesets/secondary/sevii_islands_67/palettes/8.gbapal" - .incbin "data/tilesets/secondary/sevii_islands_67/palettes/9.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_67/palettes/00.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_67/palettes/01.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_67/palettes/02.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_67/palettes/03.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_67/palettes/04.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_67/palettes/05.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_67/palettes/06.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_67/palettes/07.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_67/palettes/08.gbapal" + .incbin "data/tilesets/secondary/sevii_islands_67/palettes/09.gbapal" .incbin "data/tilesets/secondary/sevii_islands_67/palettes/10.gbapal" .incbin "data/tilesets/secondary/sevii_islands_67/palettes/11.gbapal" .incbin "data/tilesets/secondary/sevii_islands_67/palettes/12.gbapal" @@ -1384,16 +1384,16 @@ gTilesetTiles_TrainerTower:: @ 829BF64 .align 2 gTilesetPalettes_TrainerTower:: @ 829CEE4 - .incbin "data/tilesets/secondary/trainer_tower/palettes/0.gbapal" - .incbin "data/tilesets/secondary/trainer_tower/palettes/1.gbapal" - .incbin "data/tilesets/secondary/trainer_tower/palettes/2.gbapal" - .incbin "data/tilesets/secondary/trainer_tower/palettes/3.gbapal" - .incbin "data/tilesets/secondary/trainer_tower/palettes/4.gbapal" - .incbin "data/tilesets/secondary/trainer_tower/palettes/5.gbapal" - .incbin "data/tilesets/secondary/trainer_tower/palettes/6.gbapal" - .incbin "data/tilesets/secondary/trainer_tower/palettes/7.gbapal" - .incbin "data/tilesets/secondary/trainer_tower/palettes/8.gbapal" - .incbin "data/tilesets/secondary/trainer_tower/palettes/9.gbapal" + .incbin "data/tilesets/secondary/trainer_tower/palettes/00.gbapal" + .incbin "data/tilesets/secondary/trainer_tower/palettes/01.gbapal" + .incbin "data/tilesets/secondary/trainer_tower/palettes/02.gbapal" + .incbin "data/tilesets/secondary/trainer_tower/palettes/03.gbapal" + .incbin "data/tilesets/secondary/trainer_tower/palettes/04.gbapal" + .incbin "data/tilesets/secondary/trainer_tower/palettes/05.gbapal" + .incbin "data/tilesets/secondary/trainer_tower/palettes/06.gbapal" + .incbin "data/tilesets/secondary/trainer_tower/palettes/07.gbapal" + .incbin "data/tilesets/secondary/trainer_tower/palettes/08.gbapal" + .incbin "data/tilesets/secondary/trainer_tower/palettes/09.gbapal" .incbin "data/tilesets/secondary/trainer_tower/palettes/10.gbapal" .incbin "data/tilesets/secondary/trainer_tower/palettes/11.gbapal" .incbin "data/tilesets/secondary/trainer_tower/palettes/12.gbapal" @@ -1407,16 +1407,16 @@ gTilesetTiles_IslandHarbor:: @ 829D0E4 .align 2 gTilesetPalettes_IslandHarbor:: @ 829D894 - .incbin "data/tilesets/secondary/island_harbor/palettes/0.gbapal" - .incbin "data/tilesets/secondary/island_harbor/palettes/1.gbapal" - .incbin "data/tilesets/secondary/island_harbor/palettes/2.gbapal" - .incbin "data/tilesets/secondary/island_harbor/palettes/3.gbapal" - .incbin "data/tilesets/secondary/island_harbor/palettes/4.gbapal" - .incbin "data/tilesets/secondary/island_harbor/palettes/5.gbapal" - .incbin "data/tilesets/secondary/island_harbor/palettes/6.gbapal" - .incbin "data/tilesets/secondary/island_harbor/palettes/7.gbapal" - .incbin "data/tilesets/secondary/island_harbor/palettes/8.gbapal" - .incbin "data/tilesets/secondary/island_harbor/palettes/9.gbapal" + .incbin "data/tilesets/secondary/island_harbor/palettes/00.gbapal" + .incbin "data/tilesets/secondary/island_harbor/palettes/01.gbapal" + .incbin "data/tilesets/secondary/island_harbor/palettes/02.gbapal" + .incbin "data/tilesets/secondary/island_harbor/palettes/03.gbapal" + .incbin "data/tilesets/secondary/island_harbor/palettes/04.gbapal" + .incbin "data/tilesets/secondary/island_harbor/palettes/05.gbapal" + .incbin "data/tilesets/secondary/island_harbor/palettes/06.gbapal" + .incbin "data/tilesets/secondary/island_harbor/palettes/07.gbapal" + .incbin "data/tilesets/secondary/island_harbor/palettes/08.gbapal" + .incbin "data/tilesets/secondary/island_harbor/palettes/09.gbapal" .incbin "data/tilesets/secondary/island_harbor/palettes/10.gbapal" .incbin "data/tilesets/secondary/island_harbor/palettes/11.gbapal" .incbin "data/tilesets/secondary/island_harbor/palettes/12.gbapal" @@ -1430,16 +1430,16 @@ gTilesetTiles_PokemonLeague:: @ 829DA94 .align 2 gTilesetPalettes_PokemonLeague:: @ 829EA50 - .incbin "data/tilesets/secondary/pokemon_league/palettes/0.gbapal" - .incbin "data/tilesets/secondary/pokemon_league/palettes/1.gbapal" - .incbin "data/tilesets/secondary/pokemon_league/palettes/2.gbapal" - .incbin "data/tilesets/secondary/pokemon_league/palettes/3.gbapal" - .incbin "data/tilesets/secondary/pokemon_league/palettes/4.gbapal" - .incbin "data/tilesets/secondary/pokemon_league/palettes/5.gbapal" - .incbin "data/tilesets/secondary/pokemon_league/palettes/6.gbapal" - .incbin "data/tilesets/secondary/pokemon_league/palettes/7.gbapal" - .incbin "data/tilesets/secondary/pokemon_league/palettes/8.gbapal" - .incbin "data/tilesets/secondary/pokemon_league/palettes/9.gbapal" + .incbin "data/tilesets/secondary/pokemon_league/palettes/00.gbapal" + .incbin "data/tilesets/secondary/pokemon_league/palettes/01.gbapal" + .incbin "data/tilesets/secondary/pokemon_league/palettes/02.gbapal" + .incbin "data/tilesets/secondary/pokemon_league/palettes/03.gbapal" + .incbin "data/tilesets/secondary/pokemon_league/palettes/04.gbapal" + .incbin "data/tilesets/secondary/pokemon_league/palettes/05.gbapal" + .incbin "data/tilesets/secondary/pokemon_league/palettes/06.gbapal" + .incbin "data/tilesets/secondary/pokemon_league/palettes/07.gbapal" + .incbin "data/tilesets/secondary/pokemon_league/palettes/08.gbapal" + .incbin "data/tilesets/secondary/pokemon_league/palettes/09.gbapal" .incbin "data/tilesets/secondary/pokemon_league/palettes/10.gbapal" .incbin "data/tilesets/secondary/pokemon_league/palettes/11.gbapal" .incbin "data/tilesets/secondary/pokemon_league/palettes/12.gbapal" @@ -1453,16 +1453,16 @@ gTilesetTiles_HallOfFame:: @ 829EC50 .align 2 gTilesetPalettes_HallOfFame:: @ 829F4C8 - .incbin "data/tilesets/secondary/hall_of_fame/palettes/0.gbapal" - .incbin "data/tilesets/secondary/hall_of_fame/palettes/1.gbapal" - .incbin "data/tilesets/secondary/hall_of_fame/palettes/2.gbapal" - .incbin "data/tilesets/secondary/hall_of_fame/palettes/3.gbapal" - .incbin "data/tilesets/secondary/hall_of_fame/palettes/4.gbapal" - .incbin "data/tilesets/secondary/hall_of_fame/palettes/5.gbapal" - .incbin "data/tilesets/secondary/hall_of_fame/palettes/6.gbapal" - .incbin "data/tilesets/secondary/hall_of_fame/palettes/7.gbapal" - .incbin "data/tilesets/secondary/hall_of_fame/palettes/8.gbapal" - .incbin "data/tilesets/secondary/hall_of_fame/palettes/9.gbapal" + .incbin "data/tilesets/secondary/hall_of_fame/palettes/00.gbapal" + .incbin "data/tilesets/secondary/hall_of_fame/palettes/01.gbapal" + .incbin "data/tilesets/secondary/hall_of_fame/palettes/02.gbapal" + .incbin "data/tilesets/secondary/hall_of_fame/palettes/03.gbapal" + .incbin "data/tilesets/secondary/hall_of_fame/palettes/04.gbapal" + .incbin "data/tilesets/secondary/hall_of_fame/palettes/05.gbapal" + .incbin "data/tilesets/secondary/hall_of_fame/palettes/06.gbapal" + .incbin "data/tilesets/secondary/hall_of_fame/palettes/07.gbapal" + .incbin "data/tilesets/secondary/hall_of_fame/palettes/08.gbapal" + .incbin "data/tilesets/secondary/hall_of_fame/palettes/09.gbapal" .incbin "data/tilesets/secondary/hall_of_fame/palettes/10.gbapal" .incbin "data/tilesets/secondary/hall_of_fame/palettes/11.gbapal" .incbin "data/tilesets/secondary/hall_of_fame/palettes/12.gbapal" diff --git a/data/tilesets/primary/building/palettes/0.pal b/data/tilesets/primary/building/palettes/0.pal deleted file mode 100644 index 3b6416376..000000000 --- a/data/tilesets/primary/building/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -156 213 255 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/primary/building/palettes/00.pal b/data/tilesets/primary/building/palettes/00.pal new file mode 100644 index 000000000..3b6416376 --- /dev/null +++ b/data/tilesets/primary/building/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +156 213 255 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/primary/building/palettes/01.pal b/data/tilesets/primary/building/palettes/01.pal new file mode 100644 index 000000000..66561f6d3 --- /dev/null +++ b/data/tilesets/primary/building/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +139 180 222 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/primary/building/palettes/02.pal b/data/tilesets/primary/building/palettes/02.pal new file mode 100644 index 000000000..87a022102 --- /dev/null +++ b/data/tilesets/primary/building/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +90 90 115 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/primary/building/palettes/03.pal b/data/tilesets/primary/building/palettes/03.pal new file mode 100644 index 000000000..783496dcd --- /dev/null +++ b/data/tilesets/primary/building/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +65 98 156 +90 123 180 +115 156 197 +222 213 131 +164 164 172 +205 205 213 +238 238 246 +106 172 115 +156 205 139 diff --git a/data/tilesets/primary/building/palettes/04.pal b/data/tilesets/primary/building/palettes/04.pal new file mode 100644 index 000000000..89eace605 --- /dev/null +++ b/data/tilesets/primary/building/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 238 246 +172 197 180 +197 222 205 +90 189 172 +246 238 156 +205 189 131 +189 164 123 +148 131 106 +106 106 106 +213 222 230 +238 180 115 diff --git a/data/tilesets/primary/building/palettes/05.pal b/data/tilesets/primary/building/palettes/05.pal new file mode 100644 index 000000000..c7780e5c7 --- /dev/null +++ b/data/tilesets/primary/building/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +213 222 222 +164 180 189 +255 0 255 +131 115 74 +213 213 148 +197 189 139 +172 156 115 +148 131 90 +197 197 205 +205 82 65 +0 0 0 diff --git a/data/tilesets/primary/building/palettes/06.pal b/data/tilesets/primary/building/palettes/06.pal new file mode 100644 index 000000000..1d08ce9a2 --- /dev/null +++ b/data/tilesets/primary/building/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/primary/building/palettes/07.pal b/data/tilesets/primary/building/palettes/07.pal new file mode 100644 index 000000000..c1e7c3d5c --- /dev/null +++ b/data/tilesets/primary/building/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 diff --git a/data/tilesets/primary/building/palettes/08.pal b/data/tilesets/primary/building/palettes/08.pal new file mode 100644 index 000000000..c1e7c3d5c --- /dev/null +++ b/data/tilesets/primary/building/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 diff --git a/data/tilesets/primary/building/palettes/09.pal b/data/tilesets/primary/building/palettes/09.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/primary/building/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/primary/building/palettes/1.pal b/data/tilesets/primary/building/palettes/1.pal deleted file mode 100644 index 66561f6d3..000000000 --- a/data/tilesets/primary/building/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -139 180 222 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/primary/building/palettes/2.pal b/data/tilesets/primary/building/palettes/2.pal deleted file mode 100644 index 87a022102..000000000 --- a/data/tilesets/primary/building/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -90 90 115 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/primary/building/palettes/3.pal b/data/tilesets/primary/building/palettes/3.pal deleted file mode 100644 index 783496dcd..000000000 --- a/data/tilesets/primary/building/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -65 98 156 -90 123 180 -115 156 197 -222 213 131 -164 164 172 -205 205 213 -238 238 246 -106 172 115 -156 205 139 diff --git a/data/tilesets/primary/building/palettes/4.pal b/data/tilesets/primary/building/palettes/4.pal deleted file mode 100644 index 89eace605..000000000 --- a/data/tilesets/primary/building/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 238 246 -172 197 180 -197 222 205 -90 189 172 -246 238 156 -205 189 131 -189 164 123 -148 131 106 -106 106 106 -213 222 230 -238 180 115 diff --git a/data/tilesets/primary/building/palettes/5.pal b/data/tilesets/primary/building/palettes/5.pal deleted file mode 100644 index c7780e5c7..000000000 --- a/data/tilesets/primary/building/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -213 222 222 -164 180 189 -255 0 255 -131 115 74 -213 213 148 -197 189 139 -172 156 115 -148 131 90 -197 197 205 -205 82 65 -0 0 0 diff --git a/data/tilesets/primary/building/palettes/6.pal b/data/tilesets/primary/building/palettes/6.pal deleted file mode 100644 index 1d08ce9a2..000000000 --- a/data/tilesets/primary/building/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/primary/building/palettes/7.pal b/data/tilesets/primary/building/palettes/7.pal deleted file mode 100644 index c1e7c3d5c..000000000 --- a/data/tilesets/primary/building/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 diff --git a/data/tilesets/primary/building/palettes/8.pal b/data/tilesets/primary/building/palettes/8.pal deleted file mode 100644 index c1e7c3d5c..000000000 --- a/data/tilesets/primary/building/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 diff --git a/data/tilesets/primary/building/palettes/9.pal b/data/tilesets/primary/building/palettes/9.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/primary/building/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/primary/general/palettes/0.pal b/data/tilesets/primary/general/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/primary/general/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/primary/general/palettes/00.pal b/data/tilesets/primary/general/palettes/00.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/primary/general/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/primary/general/palettes/01.pal b/data/tilesets/primary/general/palettes/01.pal new file mode 100644 index 000000000..09828f4f1 --- /dev/null +++ b/data/tilesets/primary/general/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +123 123 131 +32 49 57 +230 238 238 +90 189 139 +90 90 115 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +123 74 74 +90 57 65 +115 205 164 diff --git a/data/tilesets/primary/general/palettes/02.pal b/data/tilesets/primary/general/palettes/02.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/primary/general/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/primary/general/palettes/03.pal b/data/tilesets/primary/general/palettes/03.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/primary/general/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/primary/general/palettes/04.pal b/data/tilesets/primary/general/palettes/04.pal new file mode 100644 index 000000000..9b094a6aa --- /dev/null +++ b/data/tilesets/primary/general/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 0 +230 246 255 +189 222 255 +139 164 255 +106 164 230 +74 148 222 +74 123 222 +82 156 230 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +49 115 197 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/primary/general/palettes/05.pal b/data/tilesets/primary/general/palettes/05.pal new file mode 100644 index 000000000..c5a653979 --- /dev/null +++ b/data/tilesets/primary/general/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/primary/general/palettes/06.pal b/data/tilesets/primary/general/palettes/06.pal new file mode 100644 index 000000000..cdf41b298 --- /dev/null +++ b/data/tilesets/primary/general/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 0 +205 230 246 +180 213 255 +123 156 238 +98 139 213 +65 123 189 +49 98 180 +82 123 205 +238 246 246 +205 222 238 +49 115 197 +139 189 255 +115 164 255 +65 139 222 +57 115 222 +82 148 230 diff --git a/data/tilesets/primary/general/palettes/07.pal b/data/tilesets/primary/general/palettes/07.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/primary/general/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/primary/general/palettes/08.pal b/data/tilesets/primary/general/palettes/08.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/primary/general/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/primary/general/palettes/09.pal b/data/tilesets/primary/general/palettes/09.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/primary/general/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/primary/general/palettes/1.pal b/data/tilesets/primary/general/palettes/1.pal deleted file mode 100644 index 09828f4f1..000000000 --- a/data/tilesets/primary/general/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -123 123 131 -32 49 57 -230 238 238 -90 189 139 -90 90 115 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -123 74 74 -90 57 65 -115 205 164 diff --git a/data/tilesets/primary/general/palettes/2.pal b/data/tilesets/primary/general/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/primary/general/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/primary/general/palettes/3.pal b/data/tilesets/primary/general/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/primary/general/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/primary/general/palettes/4.pal b/data/tilesets/primary/general/palettes/4.pal deleted file mode 100644 index 9b094a6aa..000000000 --- a/data/tilesets/primary/general/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 0 -230 246 255 -189 222 255 -139 164 255 -106 164 230 -74 148 222 -74 123 222 -82 156 230 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -49 115 197 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/primary/general/palettes/5.pal b/data/tilesets/primary/general/palettes/5.pal deleted file mode 100644 index c5a653979..000000000 --- a/data/tilesets/primary/general/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/primary/general/palettes/6.pal b/data/tilesets/primary/general/palettes/6.pal deleted file mode 100644 index cdf41b298..000000000 --- a/data/tilesets/primary/general/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 255 0 -205 230 246 -180 213 255 -123 156 238 -98 139 213 -65 123 189 -49 98 180 -82 123 205 -238 246 246 -205 222 238 -49 115 197 -139 189 255 -115 164 255 -65 139 222 -57 115 222 -82 148 230 diff --git a/data/tilesets/primary/general/palettes/7.pal b/data/tilesets/primary/general/palettes/7.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/primary/general/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/primary/general/palettes/8.pal b/data/tilesets/primary/general/palettes/8.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/primary/general/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/primary/general/palettes/9.pal b/data/tilesets/primary/general/palettes/9.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/primary/general/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/berry_forest/palettes/0.pal b/data/tilesets/secondary/berry_forest/palettes/0.pal deleted file mode 100644 index 7af5bb7d2..000000000 --- a/data/tilesets/secondary/berry_forest/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 82 0 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/berry_forest/palettes/00.pal b/data/tilesets/secondary/berry_forest/palettes/00.pal new file mode 100644 index 000000000..7af5bb7d2 --- /dev/null +++ b/data/tilesets/secondary/berry_forest/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 82 0 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/berry_forest/palettes/01.pal b/data/tilesets/secondary/berry_forest/palettes/01.pal new file mode 100644 index 000000000..391d1e3d1 --- /dev/null +++ b/data/tilesets/secondary/berry_forest/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 189 164 +189 148 139 +156 115 115 +123 82 82 +90 57 74 +115 205 164 diff --git a/data/tilesets/secondary/berry_forest/palettes/02.pal b/data/tilesets/secondary/berry_forest/palettes/02.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/berry_forest/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/berry_forest/palettes/03.pal b/data/tilesets/secondary/berry_forest/palettes/03.pal new file mode 100644 index 000000000..9581f2cd8 --- /dev/null +++ b/data/tilesets/secondary/berry_forest/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 131 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/berry_forest/palettes/04.pal b/data/tilesets/secondary/berry_forest/palettes/04.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/berry_forest/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/berry_forest/palettes/05.pal b/data/tilesets/secondary/berry_forest/palettes/05.pal new file mode 100644 index 000000000..3a2db72a7 --- /dev/null +++ b/data/tilesets/secondary/berry_forest/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +222 205 131 +205 180 106 +180 139 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/berry_forest/palettes/06.pal b/data/tilesets/secondary/berry_forest/palettes/06.pal new file mode 100644 index 000000000..93518605a --- /dev/null +++ b/data/tilesets/secondary/berry_forest/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/berry_forest/palettes/07.pal b/data/tilesets/secondary/berry_forest/palettes/07.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/berry_forest/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/berry_forest/palettes/08.pal b/data/tilesets/secondary/berry_forest/palettes/08.pal new file mode 100644 index 000000000..650a35cc8 --- /dev/null +++ b/data/tilesets/secondary/berry_forest/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 82 0 +57 115 24 +98 65 74 +131 106 82 +65 57 49 +255 0 255 +255 0 255 +255 0 255 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/berry_forest/palettes/09.pal b/data/tilesets/secondary/berry_forest/palettes/09.pal new file mode 100644 index 000000000..df2d04037 --- /dev/null +++ b/data/tilesets/secondary/berry_forest/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +213 230 189 +57 172 131 +222 230 246 +230 172 123 +106 205 164 diff --git a/data/tilesets/secondary/berry_forest/palettes/1.pal b/data/tilesets/secondary/berry_forest/palettes/1.pal deleted file mode 100644 index 391d1e3d1..000000000 --- a/data/tilesets/secondary/berry_forest/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 189 164 -189 148 139 -156 115 115 -123 82 82 -90 57 74 -115 205 164 diff --git a/data/tilesets/secondary/berry_forest/palettes/2.pal b/data/tilesets/secondary/berry_forest/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/berry_forest/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/berry_forest/palettes/3.pal b/data/tilesets/secondary/berry_forest/palettes/3.pal deleted file mode 100644 index 9581f2cd8..000000000 --- a/data/tilesets/secondary/berry_forest/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 131 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/berry_forest/palettes/4.pal b/data/tilesets/secondary/berry_forest/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/berry_forest/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/berry_forest/palettes/5.pal b/data/tilesets/secondary/berry_forest/palettes/5.pal deleted file mode 100644 index 3a2db72a7..000000000 --- a/data/tilesets/secondary/berry_forest/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -222 205 131 -205 180 106 -180 139 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/berry_forest/palettes/6.pal b/data/tilesets/secondary/berry_forest/palettes/6.pal deleted file mode 100644 index 93518605a..000000000 --- a/data/tilesets/secondary/berry_forest/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/berry_forest/palettes/7.pal b/data/tilesets/secondary/berry_forest/palettes/7.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/berry_forest/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/berry_forest/palettes/8.pal b/data/tilesets/secondary/berry_forest/palettes/8.pal deleted file mode 100644 index 650a35cc8..000000000 --- a/data/tilesets/secondary/berry_forest/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 82 0 -57 115 24 -98 65 74 -131 106 82 -65 57 49 -255 0 255 -255 0 255 -255 0 255 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/berry_forest/palettes/9.pal b/data/tilesets/secondary/berry_forest/palettes/9.pal deleted file mode 100644 index df2d04037..000000000 --- a/data/tilesets/secondary/berry_forest/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -213 230 189 -57 172 131 -222 230 246 -230 172 123 -106 205 164 diff --git a/data/tilesets/secondary/bike_shop/palettes/0.pal b/data/tilesets/secondary/bike_shop/palettes/0.pal deleted file mode 100644 index 4b44e19f4..000000000 --- a/data/tilesets/secondary/bike_shop/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -205 156 156 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/bike_shop/palettes/00.pal b/data/tilesets/secondary/bike_shop/palettes/00.pal new file mode 100644 index 000000000..4b44e19f4 --- /dev/null +++ b/data/tilesets/secondary/bike_shop/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 156 156 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/bike_shop/palettes/01.pal b/data/tilesets/secondary/bike_shop/palettes/01.pal new file mode 100644 index 000000000..a39ca6aa8 --- /dev/null +++ b/data/tilesets/secondary/bike_shop/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 156 156 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/bike_shop/palettes/02.pal b/data/tilesets/secondary/bike_shop/palettes/02.pal new file mode 100644 index 000000000..5a4f127be --- /dev/null +++ b/data/tilesets/secondary/bike_shop/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 156 156 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/bike_shop/palettes/03.pal b/data/tilesets/secondary/bike_shop/palettes/03.pal new file mode 100644 index 000000000..c84fa4a58 --- /dev/null +++ b/data/tilesets/secondary/bike_shop/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 156 156 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/bike_shop/palettes/04.pal b/data/tilesets/secondary/bike_shop/palettes/04.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/bike_shop/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/bike_shop/palettes/05.pal b/data/tilesets/secondary/bike_shop/palettes/05.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/bike_shop/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/bike_shop/palettes/06.pal b/data/tilesets/secondary/bike_shop/palettes/06.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/bike_shop/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/bike_shop/palettes/07.pal b/data/tilesets/secondary/bike_shop/palettes/07.pal new file mode 100644 index 000000000..a71b8fee2 --- /dev/null +++ b/data/tilesets/secondary/bike_shop/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +82 82 106 +131 131 139 +172 172 139 +205 205 180 +238 238 222 +131 148 139 +172 189 172 +205 205 205 +213 222 213 +255 255 255 +164 123 74 +189 148 98 +222 172 123 +172 180 106 +197 205 131 diff --git a/data/tilesets/secondary/bike_shop/palettes/08.pal b/data/tilesets/secondary/bike_shop/palettes/08.pal new file mode 100644 index 000000000..0a666a9c9 --- /dev/null +++ b/data/tilesets/secondary/bike_shop/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +65 74 106 +139 139 131 +197 197 197 +255 255 255 +0 0 0 +246 197 197 +74 74 213 +123 123 246 +180 180 0 +213 197 65 +246 246 32 +148 82 74 +205 49 41 +255 123 74 +0 0 0 diff --git a/data/tilesets/secondary/bike_shop/palettes/09.pal b/data/tilesets/secondary/bike_shop/palettes/09.pal new file mode 100644 index 000000000..c06a049b0 --- /dev/null +++ b/data/tilesets/secondary/bike_shop/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/bike_shop/palettes/1.pal b/data/tilesets/secondary/bike_shop/palettes/1.pal deleted file mode 100644 index a39ca6aa8..000000000 --- a/data/tilesets/secondary/bike_shop/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -205 156 156 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/bike_shop/palettes/2.pal b/data/tilesets/secondary/bike_shop/palettes/2.pal deleted file mode 100644 index 5a4f127be..000000000 --- a/data/tilesets/secondary/bike_shop/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -205 156 156 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/bike_shop/palettes/3.pal b/data/tilesets/secondary/bike_shop/palettes/3.pal deleted file mode 100644 index c84fa4a58..000000000 --- a/data/tilesets/secondary/bike_shop/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -205 156 156 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/bike_shop/palettes/4.pal b/data/tilesets/secondary/bike_shop/palettes/4.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/bike_shop/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/bike_shop/palettes/5.pal b/data/tilesets/secondary/bike_shop/palettes/5.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/bike_shop/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/bike_shop/palettes/6.pal b/data/tilesets/secondary/bike_shop/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/bike_shop/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/bike_shop/palettes/7.pal b/data/tilesets/secondary/bike_shop/palettes/7.pal deleted file mode 100644 index a71b8fee2..000000000 --- a/data/tilesets/secondary/bike_shop/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -82 82 106 -131 131 139 -172 172 139 -205 205 180 -238 238 222 -131 148 139 -172 189 172 -205 205 205 -213 222 213 -255 255 255 -164 123 74 -189 148 98 -222 172 123 -172 180 106 -197 205 131 diff --git a/data/tilesets/secondary/bike_shop/palettes/8.pal b/data/tilesets/secondary/bike_shop/palettes/8.pal deleted file mode 100644 index 0a666a9c9..000000000 --- a/data/tilesets/secondary/bike_shop/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -65 74 106 -139 139 131 -197 197 197 -255 255 255 -0 0 0 -246 197 197 -74 74 213 -123 123 246 -180 180 0 -213 197 65 -246 246 32 -148 82 74 -205 49 41 -255 123 74 -0 0 0 diff --git a/data/tilesets/secondary/bike_shop/palettes/9.pal b/data/tilesets/secondary/bike_shop/palettes/9.pal deleted file mode 100644 index c06a049b0..000000000 --- a/data/tilesets/secondary/bike_shop/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/burgled_house/palettes/0.pal b/data/tilesets/secondary/burgled_house/palettes/0.pal deleted file mode 100644 index 6d876039d..000000000 --- a/data/tilesets/secondary/burgled_house/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/burgled_house/palettes/00.pal b/data/tilesets/secondary/burgled_house/palettes/00.pal new file mode 100644 index 000000000..6d876039d --- /dev/null +++ b/data/tilesets/secondary/burgled_house/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/burgled_house/palettes/01.pal b/data/tilesets/secondary/burgled_house/palettes/01.pal new file mode 100644 index 000000000..66561f6d3 --- /dev/null +++ b/data/tilesets/secondary/burgled_house/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +139 180 222 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/burgled_house/palettes/02.pal b/data/tilesets/secondary/burgled_house/palettes/02.pal new file mode 100644 index 000000000..87a022102 --- /dev/null +++ b/data/tilesets/secondary/burgled_house/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +90 90 115 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/burgled_house/palettes/03.pal b/data/tilesets/secondary/burgled_house/palettes/03.pal new file mode 100644 index 000000000..783496dcd --- /dev/null +++ b/data/tilesets/secondary/burgled_house/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +65 98 156 +90 123 180 +115 156 197 +222 213 131 +164 164 172 +205 205 213 +238 238 246 +106 172 115 +156 205 139 diff --git a/data/tilesets/secondary/burgled_house/palettes/04.pal b/data/tilesets/secondary/burgled_house/palettes/04.pal new file mode 100644 index 000000000..89eace605 --- /dev/null +++ b/data/tilesets/secondary/burgled_house/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 238 246 +172 197 180 +197 222 205 +90 189 172 +246 238 156 +205 189 131 +189 164 123 +148 131 106 +106 106 106 +213 222 230 +238 180 115 diff --git a/data/tilesets/secondary/burgled_house/palettes/05.pal b/data/tilesets/secondary/burgled_house/palettes/05.pal new file mode 100644 index 000000000..0eef3df8e --- /dev/null +++ b/data/tilesets/secondary/burgled_house/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +213 222 222 +164 180 189 +255 0 255 +131 115 74 +213 213 148 +197 189 139 +172 156 115 +148 131 90 +255 0 255 +255 0 255 +0 0 0 diff --git a/data/tilesets/secondary/burgled_house/palettes/06.pal b/data/tilesets/secondary/burgled_house/palettes/06.pal new file mode 100644 index 000000000..1d08ce9a2 --- /dev/null +++ b/data/tilesets/secondary/burgled_house/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/burgled_house/palettes/07.pal b/data/tilesets/secondary/burgled_house/palettes/07.pal new file mode 100644 index 000000000..c1e7c3d5c --- /dev/null +++ b/data/tilesets/secondary/burgled_house/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 diff --git a/data/tilesets/secondary/burgled_house/palettes/08.pal b/data/tilesets/secondary/burgled_house/palettes/08.pal new file mode 100644 index 000000000..c1e7c3d5c --- /dev/null +++ b/data/tilesets/secondary/burgled_house/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 diff --git a/data/tilesets/secondary/burgled_house/palettes/09.pal b/data/tilesets/secondary/burgled_house/palettes/09.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/burgled_house/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/burgled_house/palettes/1.pal b/data/tilesets/secondary/burgled_house/palettes/1.pal deleted file mode 100644 index 66561f6d3..000000000 --- a/data/tilesets/secondary/burgled_house/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -139 180 222 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/burgled_house/palettes/2.pal b/data/tilesets/secondary/burgled_house/palettes/2.pal deleted file mode 100644 index 87a022102..000000000 --- a/data/tilesets/secondary/burgled_house/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -90 90 115 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/burgled_house/palettes/3.pal b/data/tilesets/secondary/burgled_house/palettes/3.pal deleted file mode 100644 index 783496dcd..000000000 --- a/data/tilesets/secondary/burgled_house/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -65 98 156 -90 123 180 -115 156 197 -222 213 131 -164 164 172 -205 205 213 -238 238 246 -106 172 115 -156 205 139 diff --git a/data/tilesets/secondary/burgled_house/palettes/4.pal b/data/tilesets/secondary/burgled_house/palettes/4.pal deleted file mode 100644 index 89eace605..000000000 --- a/data/tilesets/secondary/burgled_house/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 238 246 -172 197 180 -197 222 205 -90 189 172 -246 238 156 -205 189 131 -189 164 123 -148 131 106 -106 106 106 -213 222 230 -238 180 115 diff --git a/data/tilesets/secondary/burgled_house/palettes/5.pal b/data/tilesets/secondary/burgled_house/palettes/5.pal deleted file mode 100644 index 0eef3df8e..000000000 --- a/data/tilesets/secondary/burgled_house/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -213 222 222 -164 180 189 -255 0 255 -131 115 74 -213 213 148 -197 189 139 -172 156 115 -148 131 90 -255 0 255 -255 0 255 -0 0 0 diff --git a/data/tilesets/secondary/burgled_house/palettes/6.pal b/data/tilesets/secondary/burgled_house/palettes/6.pal deleted file mode 100644 index 1d08ce9a2..000000000 --- a/data/tilesets/secondary/burgled_house/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/burgled_house/palettes/7.pal b/data/tilesets/secondary/burgled_house/palettes/7.pal deleted file mode 100644 index c1e7c3d5c..000000000 --- a/data/tilesets/secondary/burgled_house/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 diff --git a/data/tilesets/secondary/burgled_house/palettes/8.pal b/data/tilesets/secondary/burgled_house/palettes/8.pal deleted file mode 100644 index c1e7c3d5c..000000000 --- a/data/tilesets/secondary/burgled_house/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 diff --git a/data/tilesets/secondary/burgled_house/palettes/9.pal b/data/tilesets/secondary/burgled_house/palettes/9.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/burgled_house/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/cable_club/palettes/0.pal b/data/tilesets/secondary/cable_club/palettes/0.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/cable_club/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/cable_club/palettes/00.pal b/data/tilesets/secondary/cable_club/palettes/00.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cable_club/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cable_club/palettes/01.pal b/data/tilesets/secondary/cable_club/palettes/01.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cable_club/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cable_club/palettes/02.pal b/data/tilesets/secondary/cable_club/palettes/02.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cable_club/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cable_club/palettes/03.pal b/data/tilesets/secondary/cable_club/palettes/03.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cable_club/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cable_club/palettes/04.pal b/data/tilesets/secondary/cable_club/palettes/04.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cable_club/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cable_club/palettes/05.pal b/data/tilesets/secondary/cable_club/palettes/05.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cable_club/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cable_club/palettes/06.pal b/data/tilesets/secondary/cable_club/palettes/06.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cable_club/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cable_club/palettes/07.pal b/data/tilesets/secondary/cable_club/palettes/07.pal new file mode 100644 index 000000000..00ca6903f --- /dev/null +++ b/data/tilesets/secondary/cable_club/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +65 74 106 +255 213 131 +246 180 82 +213 148 41 +180 172 148 +148 139 123 +255 255 222 +230 230 197 +180 74 24 +213 98 49 +90 156 139 +131 197 180 +172 230 205 +156 222 115 +148 189 106 diff --git a/data/tilesets/secondary/cable_club/palettes/08.pal b/data/tilesets/secondary/cable_club/palettes/08.pal new file mode 100644 index 000000000..43d6db90d --- /dev/null +++ b/data/tilesets/secondary/cable_club/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +65 74 106 +230 238 255 +213 205 246 +164 164 180 +156 197 156 +106 156 139 +246 255 255 +0 0 0 +180 74 24 +213 98 49 +123 106 164 +156 156 197 +197 197 230 +156 222 115 +148 189 106 diff --git a/data/tilesets/secondary/cable_club/palettes/09.pal b/data/tilesets/secondary/cable_club/palettes/09.pal new file mode 100644 index 000000000..87857607f --- /dev/null +++ b/data/tilesets/secondary/cable_club/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +65 74 106 +238 255 255 +213 222 238 +189 205 197 +156 164 172 +0 0 0 +189 139 90 +222 172 106 +246 189 115 +82 156 164 +115 197 222 +213 98 82 +246 148 131 +148 205 90 +49 131 24 diff --git a/data/tilesets/secondary/cable_club/palettes/1.pal b/data/tilesets/secondary/cable_club/palettes/1.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/cable_club/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/cable_club/palettes/2.pal b/data/tilesets/secondary/cable_club/palettes/2.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/cable_club/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/cable_club/palettes/3.pal b/data/tilesets/secondary/cable_club/palettes/3.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/cable_club/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/cable_club/palettes/4.pal b/data/tilesets/secondary/cable_club/palettes/4.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/cable_club/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/cable_club/palettes/5.pal b/data/tilesets/secondary/cable_club/palettes/5.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/cable_club/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/cable_club/palettes/6.pal b/data/tilesets/secondary/cable_club/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/cable_club/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/cable_club/palettes/7.pal b/data/tilesets/secondary/cable_club/palettes/7.pal deleted file mode 100644 index 00ca6903f..000000000 --- a/data/tilesets/secondary/cable_club/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -65 74 106 -255 213 131 -246 180 82 -213 148 41 -180 172 148 -148 139 123 -255 255 222 -230 230 197 -180 74 24 -213 98 49 -90 156 139 -131 197 180 -172 230 205 -156 222 115 -148 189 106 diff --git a/data/tilesets/secondary/cable_club/palettes/8.pal b/data/tilesets/secondary/cable_club/palettes/8.pal deleted file mode 100644 index 43d6db90d..000000000 --- a/data/tilesets/secondary/cable_club/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -65 74 106 -230 238 255 -213 205 246 -164 164 180 -156 197 156 -106 156 139 -246 255 255 -0 0 0 -180 74 24 -213 98 49 -123 106 164 -156 156 197 -197 197 230 -156 222 115 -148 189 106 diff --git a/data/tilesets/secondary/cable_club/palettes/9.pal b/data/tilesets/secondary/cable_club/palettes/9.pal deleted file mode 100644 index 87857607f..000000000 --- a/data/tilesets/secondary/cable_club/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -65 74 106 -238 255 255 -213 222 238 -189 205 197 -156 164 172 -0 0 0 -189 139 90 -222 172 106 -246 189 115 -82 156 164 -115 197 222 -213 98 82 -246 148 131 -148 205 90 -49 131 24 diff --git a/data/tilesets/secondary/cave/palettes/0.pal b/data/tilesets/secondary/cave/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/cave/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/cave/palettes/00.pal b/data/tilesets/secondary/cave/palettes/00.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/cave/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/cave/palettes/01.pal b/data/tilesets/secondary/cave/palettes/01.pal new file mode 100644 index 000000000..09828f4f1 --- /dev/null +++ b/data/tilesets/secondary/cave/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +123 123 131 +32 49 57 +230 238 238 +90 189 139 +90 90 115 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +123 74 74 +90 57 65 +115 205 164 diff --git a/data/tilesets/secondary/cave/palettes/02.pal b/data/tilesets/secondary/cave/palettes/02.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/cave/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/cave/palettes/03.pal b/data/tilesets/secondary/cave/palettes/03.pal new file mode 100644 index 000000000..ef7460f41 --- /dev/null +++ b/data/tilesets/secondary/cave/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +123 197 255 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/cave/palettes/04.pal b/data/tilesets/secondary/cave/palettes/04.pal new file mode 100644 index 000000000..e83c6b367 --- /dev/null +++ b/data/tilesets/secondary/cave/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +230 246 255 +189 222 255 +139 189 255 +115 164 255 +65 139 222 +57 115 205 +82 148 230 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +49 115 197 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/cave/palettes/05.pal b/data/tilesets/secondary/cave/palettes/05.pal new file mode 100644 index 000000000..c5a653979 --- /dev/null +++ b/data/tilesets/secondary/cave/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/cave/palettes/06.pal b/data/tilesets/secondary/cave/palettes/06.pal new file mode 100644 index 000000000..9bad44649 --- /dev/null +++ b/data/tilesets/secondary/cave/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +205 230 246 +180 213 255 +123 180 246 +98 148 230 +65 123 189 +49 98 180 +82 131 222 +213 230 238 +172 189 205 +123 123 131 +90 90 115 +238 246 246 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/cave/palettes/07.pal b/data/tilesets/secondary/cave/palettes/07.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/cave/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cave/palettes/08.pal b/data/tilesets/secondary/cave/palettes/08.pal new file mode 100644 index 000000000..1c8d33fac --- /dev/null +++ b/data/tilesets/secondary/cave/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +189 189 156 +172 172 139 +148 139 115 +123 115 90 +32 49 57 +255 0 255 +255 0 255 +255 0 255 +222 197 189 +205 180 156 +189 148 139 +148 115 106 +115 65 74 +82 49 65 +90 90 98 diff --git a/data/tilesets/secondary/cave/palettes/09.pal b/data/tilesets/secondary/cave/palettes/09.pal new file mode 100644 index 000000000..3795f6c6a --- /dev/null +++ b/data/tilesets/secondary/cave/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 222 213 +189 189 156 +172 172 139 +148 139 115 +123 115 90 +255 238 164 +230 197 139 +205 172 123 +164 123 90 +148 115 74 +106 65 41 +74 74 57 +0 0 0 +98 139 197 +74 115 172 +57 98 156 diff --git a/data/tilesets/secondary/cave/palettes/1.pal b/data/tilesets/secondary/cave/palettes/1.pal deleted file mode 100644 index 09828f4f1..000000000 --- a/data/tilesets/secondary/cave/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -123 123 131 -32 49 57 -230 238 238 -90 189 139 -90 90 115 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -123 74 74 -90 57 65 -115 205 164 diff --git a/data/tilesets/secondary/cave/palettes/2.pal b/data/tilesets/secondary/cave/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/cave/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/cave/palettes/3.pal b/data/tilesets/secondary/cave/palettes/3.pal deleted file mode 100644 index ef7460f41..000000000 --- a/data/tilesets/secondary/cave/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -123 197 255 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/cave/palettes/4.pal b/data/tilesets/secondary/cave/palettes/4.pal deleted file mode 100644 index e83c6b367..000000000 --- a/data/tilesets/secondary/cave/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -230 246 255 -189 222 255 -139 189 255 -115 164 255 -65 139 222 -57 115 205 -82 148 230 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -49 115 197 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/cave/palettes/5.pal b/data/tilesets/secondary/cave/palettes/5.pal deleted file mode 100644 index c5a653979..000000000 --- a/data/tilesets/secondary/cave/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/cave/palettes/6.pal b/data/tilesets/secondary/cave/palettes/6.pal deleted file mode 100644 index 9bad44649..000000000 --- a/data/tilesets/secondary/cave/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -205 230 246 -180 213 255 -123 180 246 -98 148 230 -65 123 189 -49 98 180 -82 131 222 -213 230 238 -172 189 205 -123 123 131 -90 90 115 -238 246 246 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/cave/palettes/7.pal b/data/tilesets/secondary/cave/palettes/7.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/cave/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/cave/palettes/8.pal b/data/tilesets/secondary/cave/palettes/8.pal deleted file mode 100644 index 1c8d33fac..000000000 --- a/data/tilesets/secondary/cave/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -189 189 156 -172 172 139 -148 139 115 -123 115 90 -32 49 57 -255 0 255 -255 0 255 -255 0 255 -222 197 189 -205 180 156 -189 148 139 -148 115 106 -115 65 74 -82 49 65 -90 90 98 diff --git a/data/tilesets/secondary/cave/palettes/9.pal b/data/tilesets/secondary/cave/palettes/9.pal deleted file mode 100644 index 3795f6c6a..000000000 --- a/data/tilesets/secondary/cave/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 222 213 -189 189 156 -172 172 139 -148 139 115 -123 115 90 -255 238 164 -230 197 139 -205 172 123 -164 123 90 -148 115 74 -106 65 41 -74 74 57 -0 0 0 -98 139 197 -74 115 172 -57 98 156 diff --git a/data/tilesets/secondary/celadon_city/palettes/0.pal b/data/tilesets/secondary/celadon_city/palettes/0.pal deleted file mode 100644 index 7af5bb7d2..000000000 --- a/data/tilesets/secondary/celadon_city/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 82 0 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/celadon_city/palettes/00.pal b/data/tilesets/secondary/celadon_city/palettes/00.pal new file mode 100644 index 000000000..7af5bb7d2 --- /dev/null +++ b/data/tilesets/secondary/celadon_city/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 82 0 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/celadon_city/palettes/01.pal b/data/tilesets/secondary/celadon_city/palettes/01.pal new file mode 100644 index 000000000..391d1e3d1 --- /dev/null +++ b/data/tilesets/secondary/celadon_city/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 189 164 +189 148 139 +156 115 115 +123 82 82 +90 57 74 +115 205 164 diff --git a/data/tilesets/secondary/celadon_city/palettes/02.pal b/data/tilesets/secondary/celadon_city/palettes/02.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/celadon_city/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/celadon_city/palettes/03.pal b/data/tilesets/secondary/celadon_city/palettes/03.pal new file mode 100644 index 000000000..973765509 --- /dev/null +++ b/data/tilesets/secondary/celadon_city/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/celadon_city/palettes/04.pal b/data/tilesets/secondary/celadon_city/palettes/04.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/celadon_city/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/celadon_city/palettes/05.pal b/data/tilesets/secondary/celadon_city/palettes/05.pal new file mode 100644 index 000000000..3a2db72a7 --- /dev/null +++ b/data/tilesets/secondary/celadon_city/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +222 205 131 +205 180 106 +180 139 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/celadon_city/palettes/06.pal b/data/tilesets/secondary/celadon_city/palettes/06.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_city/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/celadon_city/palettes/07.pal b/data/tilesets/secondary/celadon_city/palettes/07.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_city/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/celadon_city/palettes/08.pal b/data/tilesets/secondary/celadon_city/palettes/08.pal new file mode 100644 index 000000000..86930c1d1 --- /dev/null +++ b/data/tilesets/secondary/celadon_city/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 255 255 +222 222 230 +123 123 131 +82 82 106 +197 238 255 +172 213 255 +123 164 222 +98 139 189 +246 230 139 +197 180 115 +172 156 90 +123 164 189 +148 189 238 +255 205 139 +230 131 115 diff --git a/data/tilesets/secondary/celadon_city/palettes/09.pal b/data/tilesets/secondary/celadon_city/palettes/09.pal new file mode 100644 index 000000000..5dc82505a --- /dev/null +++ b/data/tilesets/secondary/celadon_city/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 255 255 +222 222 230 +123 123 131 +82 82 106 +197 197 205 +255 213 164 +222 123 82 +189 90 57 +189 230 222 +131 189 164 +106 148 139 +246 238 189 +222 213 156 +213 189 123 +197 180 106 diff --git a/data/tilesets/secondary/celadon_city/palettes/1.pal b/data/tilesets/secondary/celadon_city/palettes/1.pal deleted file mode 100644 index 391d1e3d1..000000000 --- a/data/tilesets/secondary/celadon_city/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 189 164 -189 148 139 -156 115 115 -123 82 82 -90 57 74 -115 205 164 diff --git a/data/tilesets/secondary/celadon_city/palettes/2.pal b/data/tilesets/secondary/celadon_city/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/celadon_city/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/celadon_city/palettes/3.pal b/data/tilesets/secondary/celadon_city/palettes/3.pal deleted file mode 100644 index 973765509..000000000 --- a/data/tilesets/secondary/celadon_city/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/celadon_city/palettes/4.pal b/data/tilesets/secondary/celadon_city/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/celadon_city/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/celadon_city/palettes/5.pal b/data/tilesets/secondary/celadon_city/palettes/5.pal deleted file mode 100644 index 3a2db72a7..000000000 --- a/data/tilesets/secondary/celadon_city/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -222 205 131 -205 180 106 -180 139 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/celadon_city/palettes/6.pal b/data/tilesets/secondary/celadon_city/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/celadon_city/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/celadon_city/palettes/7.pal b/data/tilesets/secondary/celadon_city/palettes/7.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/celadon_city/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/celadon_city/palettes/8.pal b/data/tilesets/secondary/celadon_city/palettes/8.pal deleted file mode 100644 index 86930c1d1..000000000 --- a/data/tilesets/secondary/celadon_city/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -255 255 255 -222 222 230 -123 123 131 -82 82 106 -197 238 255 -172 213 255 -123 164 222 -98 139 189 -246 230 139 -197 180 115 -172 156 90 -123 164 189 -148 189 238 -255 205 139 -230 131 115 diff --git a/data/tilesets/secondary/celadon_city/palettes/9.pal b/data/tilesets/secondary/celadon_city/palettes/9.pal deleted file mode 100644 index 5dc82505a..000000000 --- a/data/tilesets/secondary/celadon_city/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -255 255 255 -222 222 230 -123 123 131 -82 82 106 -197 197 205 -255 213 164 -222 123 82 -189 90 57 -189 230 222 -131 189 164 -106 148 139 -246 238 189 -222 213 156 -213 189 123 -197 180 106 diff --git a/data/tilesets/secondary/celadon_gym/palettes/0.pal b/data/tilesets/secondary/celadon_gym/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/celadon_gym/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/celadon_gym/palettes/00.pal b/data/tilesets/secondary/celadon_gym/palettes/00.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/celadon_gym/palettes/01.pal b/data/tilesets/secondary/celadon_gym/palettes/01.pal new file mode 100644 index 000000000..69f3f0b9e --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +180 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +238 246 238 diff --git a/data/tilesets/secondary/celadon_gym/palettes/02.pal b/data/tilesets/secondary/celadon_gym/palettes/02.pal new file mode 100644 index 000000000..330e35b02 --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +213 131 82 +156 205 246 +98 156 238 +57 123 222 +222 139 106 +189 98 74 diff --git a/data/tilesets/secondary/celadon_gym/palettes/03.pal b/data/tilesets/secondary/celadon_gym/palettes/03.pal new file mode 100644 index 000000000..eac8236f1 --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +148 148 148 +180 180 180 +255 255 255 +238 246 238 +222 238 222 +197 205 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/celadon_gym/palettes/04.pal b/data/tilesets/secondary/celadon_gym/palettes/04.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/celadon_gym/palettes/05.pal b/data/tilesets/secondary/celadon_gym/palettes/05.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/celadon_gym/palettes/06.pal b/data/tilesets/secondary/celadon_gym/palettes/06.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/celadon_gym/palettes/07.pal b/data/tilesets/secondary/celadon_gym/palettes/07.pal new file mode 100644 index 000000000..9d84ecaba --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +139 139 148 +74 156 90 +65 139 139 +115 205 90 +148 238 74 +189 255 98 +156 131 82 +197 115 123 +255 164 123 +238 238 172 +82 115 82 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/celadon_gym/palettes/08.pal b/data/tilesets/secondary/celadon_gym/palettes/08.pal new file mode 100644 index 000000000..085c49344 --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +139 139 148 +222 213 246 +238 238 255 +123 156 246 +106 197 255 +131 222 255 +156 230 255 +115 90 98 +189 115 131 +246 189 115 +222 189 246 +255 230 115 +90 98 213 +255 172 197 diff --git a/data/tilesets/secondary/celadon_gym/palettes/09.pal b/data/tilesets/secondary/celadon_gym/palettes/09.pal new file mode 100644 index 000000000..9020b628f --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +156 131 57 +213 197 106 +246 238 148 +213 222 238 +222 230 255 +41 106 82 +57 131 115 +172 131 115 +197 156 148 +238 180 164 +180 139 123 diff --git a/data/tilesets/secondary/celadon_gym/palettes/1.pal b/data/tilesets/secondary/celadon_gym/palettes/1.pal deleted file mode 100644 index 69f3f0b9e..000000000 --- a/data/tilesets/secondary/celadon_gym/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -180 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -238 246 238 diff --git a/data/tilesets/secondary/celadon_gym/palettes/2.pal b/data/tilesets/secondary/celadon_gym/palettes/2.pal deleted file mode 100644 index 330e35b02..000000000 --- a/data/tilesets/secondary/celadon_gym/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -213 131 82 -156 205 246 -98 156 238 -57 123 222 -222 139 106 -189 98 74 diff --git a/data/tilesets/secondary/celadon_gym/palettes/3.pal b/data/tilesets/secondary/celadon_gym/palettes/3.pal deleted file mode 100644 index eac8236f1..000000000 --- a/data/tilesets/secondary/celadon_gym/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -148 148 148 -180 180 180 -255 255 255 -238 246 238 -222 238 222 -197 205 197 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/celadon_gym/palettes/4.pal b/data/tilesets/secondary/celadon_gym/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/celadon_gym/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/celadon_gym/palettes/5.pal b/data/tilesets/secondary/celadon_gym/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/celadon_gym/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/celadon_gym/palettes/6.pal b/data/tilesets/secondary/celadon_gym/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/celadon_gym/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/celadon_gym/palettes/7.pal b/data/tilesets/secondary/celadon_gym/palettes/7.pal deleted file mode 100644 index 9d84ecaba..000000000 --- a/data/tilesets/secondary/celadon_gym/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -139 139 148 -74 156 90 -65 139 139 -115 205 90 -148 238 74 -189 255 98 -156 131 82 -197 115 123 -255 164 123 -238 238 172 -82 115 82 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/celadon_gym/palettes/8.pal b/data/tilesets/secondary/celadon_gym/palettes/8.pal deleted file mode 100644 index 085c49344..000000000 --- a/data/tilesets/secondary/celadon_gym/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -139 139 148 -222 213 246 -238 238 255 -123 156 246 -106 197 255 -131 222 255 -156 230 255 -115 90 98 -189 115 131 -246 189 115 -222 189 246 -255 230 115 -90 98 213 -255 172 197 diff --git a/data/tilesets/secondary/celadon_gym/palettes/9.pal b/data/tilesets/secondary/celadon_gym/palettes/9.pal deleted file mode 100644 index 9020b628f..000000000 --- a/data/tilesets/secondary/celadon_gym/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -156 131 57 -213 197 106 -246 238 148 -213 222 238 -222 230 255 -41 106 82 -57 131 115 -172 131 115 -197 156 148 -238 180 164 -180 139 123 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/0.pal b/data/tilesets/secondary/cerulean_cave/palettes/0.pal deleted file mode 100644 index a3fab1c2f..000000000 --- a/data/tilesets/secondary/cerulean_cave/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/00.pal b/data/tilesets/secondary/cerulean_cave/palettes/00.pal new file mode 100644 index 000000000..a3fab1c2f --- /dev/null +++ b/data/tilesets/secondary/cerulean_cave/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/01.pal b/data/tilesets/secondary/cerulean_cave/palettes/01.pal new file mode 100644 index 000000000..d8a4e7757 --- /dev/null +++ b/data/tilesets/secondary/cerulean_cave/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/02.pal b/data/tilesets/secondary/cerulean_cave/palettes/02.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/cerulean_cave/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/03.pal b/data/tilesets/secondary/cerulean_cave/palettes/03.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/secondary/cerulean_cave/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/04.pal b/data/tilesets/secondary/cerulean_cave/palettes/04.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/cerulean_cave/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/05.pal b/data/tilesets/secondary/cerulean_cave/palettes/05.pal new file mode 100644 index 000000000..c5a653979 --- /dev/null +++ b/data/tilesets/secondary/cerulean_cave/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/06.pal b/data/tilesets/secondary/cerulean_cave/palettes/06.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/cerulean_cave/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/07.pal b/data/tilesets/secondary/cerulean_cave/palettes/07.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/cerulean_cave/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/08.pal b/data/tilesets/secondary/cerulean_cave/palettes/08.pal new file mode 100644 index 000000000..db2216a05 --- /dev/null +++ b/data/tilesets/secondary/cerulean_cave/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +197 205 222 +172 180 197 +156 164 180 +115 123 139 +148 156 164 +255 0 255 +255 0 255 +255 0 255 +205 246 172 +172 213 148 +139 180 131 +115 156 106 +82 123 90 +57 98 74 +65 65 74 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/09.pal b/data/tilesets/secondary/cerulean_cave/palettes/09.pal new file mode 100644 index 000000000..c1a5d4f29 --- /dev/null +++ b/data/tilesets/secondary/cerulean_cave/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 205 222 +197 205 222 +172 180 197 +156 164 180 +115 123 139 +255 246 164 +205 189 106 +156 131 57 +82 74 32 +90 106 115 +255 0 255 +65 65 74 +16 16 24 +98 139 197 +74 115 172 +57 98 156 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/1.pal b/data/tilesets/secondary/cerulean_cave/palettes/1.pal deleted file mode 100644 index d8a4e7757..000000000 --- a/data/tilesets/secondary/cerulean_cave/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/2.pal b/data/tilesets/secondary/cerulean_cave/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/cerulean_cave/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/3.pal b/data/tilesets/secondary/cerulean_cave/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/secondary/cerulean_cave/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/4.pal b/data/tilesets/secondary/cerulean_cave/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/cerulean_cave/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/5.pal b/data/tilesets/secondary/cerulean_cave/palettes/5.pal deleted file mode 100644 index c5a653979..000000000 --- a/data/tilesets/secondary/cerulean_cave/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/6.pal b/data/tilesets/secondary/cerulean_cave/palettes/6.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/cerulean_cave/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/7.pal b/data/tilesets/secondary/cerulean_cave/palettes/7.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/cerulean_cave/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/8.pal b/data/tilesets/secondary/cerulean_cave/palettes/8.pal deleted file mode 100644 index db2216a05..000000000 --- a/data/tilesets/secondary/cerulean_cave/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -197 205 222 -172 180 197 -156 164 180 -115 123 139 -148 156 164 -255 0 255 -255 0 255 -255 0 255 -205 246 172 -172 213 148 -139 180 131 -115 156 106 -82 123 90 -57 98 74 -65 65 74 diff --git a/data/tilesets/secondary/cerulean_cave/palettes/9.pal b/data/tilesets/secondary/cerulean_cave/palettes/9.pal deleted file mode 100644 index c1a5d4f29..000000000 --- a/data/tilesets/secondary/cerulean_cave/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -197 205 222 -197 205 222 -172 180 197 -156 164 180 -115 123 139 -255 246 164 -205 189 106 -156 131 57 -82 74 32 -90 106 115 -255 0 255 -65 65 74 -16 16 24 -98 139 197 -74 115 172 -57 98 156 diff --git a/data/tilesets/secondary/cerulean_city/palettes/0.pal b/data/tilesets/secondary/cerulean_city/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/cerulean_city/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/cerulean_city/palettes/00.pal b/data/tilesets/secondary/cerulean_city/palettes/00.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/cerulean_city/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/cerulean_city/palettes/01.pal b/data/tilesets/secondary/cerulean_city/palettes/01.pal new file mode 100644 index 000000000..31a636983 --- /dev/null +++ b/data/tilesets/secondary/cerulean_city/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/cerulean_city/palettes/02.pal b/data/tilesets/secondary/cerulean_city/palettes/02.pal new file mode 100644 index 000000000..372fb5d7c --- /dev/null +++ b/data/tilesets/secondary/cerulean_city/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/cerulean_city/palettes/03.pal b/data/tilesets/secondary/cerulean_city/palettes/03.pal new file mode 100644 index 000000000..973765509 --- /dev/null +++ b/data/tilesets/secondary/cerulean_city/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/cerulean_city/palettes/04.pal b/data/tilesets/secondary/cerulean_city/palettes/04.pal new file mode 100644 index 000000000..91fdcabdf --- /dev/null +++ b/data/tilesets/secondary/cerulean_city/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +213 238 255 +172 205 255 +139 180 238 +106 156 230 +74 139 189 +65 123 189 +82 139 205 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +49 115 172 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/cerulean_city/palettes/05.pal b/data/tilesets/secondary/cerulean_city/palettes/05.pal new file mode 100644 index 000000000..0edb843f5 --- /dev/null +++ b/data/tilesets/secondary/cerulean_city/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/cerulean_city/palettes/06.pal b/data/tilesets/secondary/cerulean_city/palettes/06.pal new file mode 100644 index 000000000..f8ebbc6dc --- /dev/null +++ b/data/tilesets/secondary/cerulean_city/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +213 238 255 +172 205 255 +139 180 238 +106 156 230 +65 123 172 +41 98 156 +74 115 197 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +49 115 172 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/cerulean_city/palettes/07.pal b/data/tilesets/secondary/cerulean_city/palettes/07.pal new file mode 100644 index 000000000..93518605a --- /dev/null +++ b/data/tilesets/secondary/cerulean_city/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/cerulean_city/palettes/08.pal b/data/tilesets/secondary/cerulean_city/palettes/08.pal new file mode 100644 index 000000000..ae3dd3f0d --- /dev/null +++ b/data/tilesets/secondary/cerulean_city/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +90 139 164 +115 164 189 +139 189 213 +172 222 238 +139 197 98 +156 222 106 +189 230 139 +222 205 172 +246 230 189 +255 246 213 +164 164 180 +82 82 106 +123 123 139 +205 205 222 +255 255 255 diff --git a/data/tilesets/secondary/cerulean_city/palettes/09.pal b/data/tilesets/secondary/cerulean_city/palettes/09.pal new file mode 100644 index 000000000..3ed18e08f --- /dev/null +++ b/data/tilesets/secondary/cerulean_city/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +180 106 90 +222 180 65 +238 164 156 +246 238 131 +230 205 98 +205 131 123 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +164 164 180 +82 82 106 +123 123 139 +205 205 222 +255 255 255 diff --git a/data/tilesets/secondary/cerulean_city/palettes/1.pal b/data/tilesets/secondary/cerulean_city/palettes/1.pal deleted file mode 100644 index 31a636983..000000000 --- a/data/tilesets/secondary/cerulean_city/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/cerulean_city/palettes/2.pal b/data/tilesets/secondary/cerulean_city/palettes/2.pal deleted file mode 100644 index 372fb5d7c..000000000 --- a/data/tilesets/secondary/cerulean_city/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/cerulean_city/palettes/3.pal b/data/tilesets/secondary/cerulean_city/palettes/3.pal deleted file mode 100644 index 973765509..000000000 --- a/data/tilesets/secondary/cerulean_city/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/cerulean_city/palettes/4.pal b/data/tilesets/secondary/cerulean_city/palettes/4.pal deleted file mode 100644 index 91fdcabdf..000000000 --- a/data/tilesets/secondary/cerulean_city/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -213 238 255 -172 205 255 -139 180 238 -106 156 230 -74 139 189 -65 123 189 -82 139 205 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -49 115 172 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/cerulean_city/palettes/5.pal b/data/tilesets/secondary/cerulean_city/palettes/5.pal deleted file mode 100644 index 0edb843f5..000000000 --- a/data/tilesets/secondary/cerulean_city/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/cerulean_city/palettes/6.pal b/data/tilesets/secondary/cerulean_city/palettes/6.pal deleted file mode 100644 index f8ebbc6dc..000000000 --- a/data/tilesets/secondary/cerulean_city/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -213 238 255 -172 205 255 -139 180 238 -106 156 230 -65 123 172 -41 98 156 -74 115 197 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -49 115 172 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/cerulean_city/palettes/7.pal b/data/tilesets/secondary/cerulean_city/palettes/7.pal deleted file mode 100644 index 93518605a..000000000 --- a/data/tilesets/secondary/cerulean_city/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/cerulean_city/palettes/8.pal b/data/tilesets/secondary/cerulean_city/palettes/8.pal deleted file mode 100644 index ae3dd3f0d..000000000 --- a/data/tilesets/secondary/cerulean_city/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -90 139 164 -115 164 189 -139 189 213 -172 222 238 -139 197 98 -156 222 106 -189 230 139 -222 205 172 -246 230 189 -255 246 213 -164 164 180 -82 82 106 -123 123 139 -205 205 222 -255 255 255 diff --git a/data/tilesets/secondary/cerulean_city/palettes/9.pal b/data/tilesets/secondary/cerulean_city/palettes/9.pal deleted file mode 100644 index 3ed18e08f..000000000 --- a/data/tilesets/secondary/cerulean_city/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -180 106 90 -222 180 65 -238 164 156 -246 238 131 -230 205 98 -205 131 123 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -164 164 180 -82 82 106 -123 123 139 -205 205 222 -255 255 255 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/0.pal b/data/tilesets/secondary/cerulean_gym/palettes/0.pal deleted file mode 100644 index 4b44e19f4..000000000 --- a/data/tilesets/secondary/cerulean_gym/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -205 156 156 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/00.pal b/data/tilesets/secondary/cerulean_gym/palettes/00.pal new file mode 100644 index 000000000..4b44e19f4 --- /dev/null +++ b/data/tilesets/secondary/cerulean_gym/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 156 156 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/01.pal b/data/tilesets/secondary/cerulean_gym/palettes/01.pal new file mode 100644 index 000000000..a39ca6aa8 --- /dev/null +++ b/data/tilesets/secondary/cerulean_gym/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 156 156 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/02.pal b/data/tilesets/secondary/cerulean_gym/palettes/02.pal new file mode 100644 index 000000000..5a4f127be --- /dev/null +++ b/data/tilesets/secondary/cerulean_gym/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 156 156 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/03.pal b/data/tilesets/secondary/cerulean_gym/palettes/03.pal new file mode 100644 index 000000000..c84fa4a58 --- /dev/null +++ b/data/tilesets/secondary/cerulean_gym/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 156 156 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/04.pal b/data/tilesets/secondary/cerulean_gym/palettes/04.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cerulean_gym/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/05.pal b/data/tilesets/secondary/cerulean_gym/palettes/05.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cerulean_gym/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/06.pal b/data/tilesets/secondary/cerulean_gym/palettes/06.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cerulean_gym/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/07.pal b/data/tilesets/secondary/cerulean_gym/palettes/07.pal new file mode 100644 index 000000000..aac016a72 --- /dev/null +++ b/data/tilesets/secondary/cerulean_gym/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +156 205 246 +98 156 238 +0 0 0 +0 0 0 +123 164 172 +148 189 197 +172 205 213 +205 222 230 +98 123 148 +123 148 172 +148 172 197 +98 98 123 +148 139 131 +222 205 213 +255 255 255 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/08.pal b/data/tilesets/secondary/cerulean_gym/palettes/08.pal new file mode 100644 index 000000000..c06a049b0 --- /dev/null +++ b/data/tilesets/secondary/cerulean_gym/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/09.pal b/data/tilesets/secondary/cerulean_gym/palettes/09.pal new file mode 100644 index 000000000..c06a049b0 --- /dev/null +++ b/data/tilesets/secondary/cerulean_gym/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/1.pal b/data/tilesets/secondary/cerulean_gym/palettes/1.pal deleted file mode 100644 index a39ca6aa8..000000000 --- a/data/tilesets/secondary/cerulean_gym/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -205 156 156 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/2.pal b/data/tilesets/secondary/cerulean_gym/palettes/2.pal deleted file mode 100644 index 5a4f127be..000000000 --- a/data/tilesets/secondary/cerulean_gym/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -205 156 156 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/3.pal b/data/tilesets/secondary/cerulean_gym/palettes/3.pal deleted file mode 100644 index c84fa4a58..000000000 --- a/data/tilesets/secondary/cerulean_gym/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -205 156 156 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/4.pal b/data/tilesets/secondary/cerulean_gym/palettes/4.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/cerulean_gym/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/5.pal b/data/tilesets/secondary/cerulean_gym/palettes/5.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/cerulean_gym/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/6.pal b/data/tilesets/secondary/cerulean_gym/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/cerulean_gym/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/7.pal b/data/tilesets/secondary/cerulean_gym/palettes/7.pal deleted file mode 100644 index aac016a72..000000000 --- a/data/tilesets/secondary/cerulean_gym/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -156 205 246 -98 156 238 -0 0 0 -0 0 0 -123 164 172 -148 189 197 -172 205 213 -205 222 230 -98 123 148 -123 148 172 -148 172 197 -98 98 123 -148 139 131 -222 205 213 -255 255 255 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/8.pal b/data/tilesets/secondary/cerulean_gym/palettes/8.pal deleted file mode 100644 index c06a049b0..000000000 --- a/data/tilesets/secondary/cerulean_gym/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/cerulean_gym/palettes/9.pal b/data/tilesets/secondary/cerulean_gym/palettes/9.pal deleted file mode 100644 index c06a049b0..000000000 --- a/data/tilesets/secondary/cerulean_gym/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/0.pal b/data/tilesets/secondary/cinnabar_gym/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/cinnabar_gym/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/00.pal b/data/tilesets/secondary/cinnabar_gym/palettes/00.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_gym/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/01.pal b/data/tilesets/secondary/cinnabar_gym/palettes/01.pal new file mode 100644 index 000000000..69f3f0b9e --- /dev/null +++ b/data/tilesets/secondary/cinnabar_gym/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +180 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +238 246 238 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/02.pal b/data/tilesets/secondary/cinnabar_gym/palettes/02.pal new file mode 100644 index 000000000..330e35b02 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_gym/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +213 131 82 +156 205 246 +98 156 238 +57 123 222 +222 139 106 +189 98 74 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/03.pal b/data/tilesets/secondary/cinnabar_gym/palettes/03.pal new file mode 100644 index 000000000..eac8236f1 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_gym/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +148 148 148 +180 180 180 +255 255 255 +238 246 238 +222 238 222 +197 205 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/04.pal b/data/tilesets/secondary/cinnabar_gym/palettes/04.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_gym/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/05.pal b/data/tilesets/secondary/cinnabar_gym/palettes/05.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_gym/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/06.pal b/data/tilesets/secondary/cinnabar_gym/palettes/06.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_gym/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/07.pal b/data/tilesets/secondary/cinnabar_gym/palettes/07.pal new file mode 100644 index 000000000..5b659ef1b --- /dev/null +++ b/data/tilesets/secondary/cinnabar_gym/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +139 139 148 +180 156 172 +205 189 189 +230 222 189 +90 115 90 +131 197 115 +205 238 115 +123 82 74 +180 98 98 +255 139 74 +238 246 172 +255 230 74 +106 90 82 +255 0 255 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/08.pal b/data/tilesets/secondary/cinnabar_gym/palettes/08.pal new file mode 100644 index 000000000..f5a4ee678 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_gym/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +139 139 148 +205 189 189 +246 246 255 +148 131 180 +205 189 230 +123 98 255 +82 172 148 +255 98 98 +90 115 90 +131 197 115 +205 238 115 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/09.pal b/data/tilesets/secondary/cinnabar_gym/palettes/09.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_gym/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/1.pal b/data/tilesets/secondary/cinnabar_gym/palettes/1.pal deleted file mode 100644 index 69f3f0b9e..000000000 --- a/data/tilesets/secondary/cinnabar_gym/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -180 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -238 246 238 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/2.pal b/data/tilesets/secondary/cinnabar_gym/palettes/2.pal deleted file mode 100644 index 330e35b02..000000000 --- a/data/tilesets/secondary/cinnabar_gym/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -213 131 82 -156 205 246 -98 156 238 -57 123 222 -222 139 106 -189 98 74 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/3.pal b/data/tilesets/secondary/cinnabar_gym/palettes/3.pal deleted file mode 100644 index eac8236f1..000000000 --- a/data/tilesets/secondary/cinnabar_gym/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -148 148 148 -180 180 180 -255 255 255 -238 246 238 -222 238 222 -197 205 197 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/4.pal b/data/tilesets/secondary/cinnabar_gym/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/cinnabar_gym/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/5.pal b/data/tilesets/secondary/cinnabar_gym/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/cinnabar_gym/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/6.pal b/data/tilesets/secondary/cinnabar_gym/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/cinnabar_gym/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/7.pal b/data/tilesets/secondary/cinnabar_gym/palettes/7.pal deleted file mode 100644 index 5b659ef1b..000000000 --- a/data/tilesets/secondary/cinnabar_gym/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -139 139 148 -180 156 172 -205 189 189 -230 222 189 -90 115 90 -131 197 115 -205 238 115 -123 82 74 -180 98 98 -255 139 74 -238 246 172 -255 230 74 -106 90 82 -255 0 255 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/8.pal b/data/tilesets/secondary/cinnabar_gym/palettes/8.pal deleted file mode 100644 index f5a4ee678..000000000 --- a/data/tilesets/secondary/cinnabar_gym/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -139 139 148 -205 189 189 -246 246 255 -148 131 180 -205 189 230 -123 98 255 -82 172 148 -255 98 98 -90 115 90 -131 197 115 -205 238 115 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/9.pal b/data/tilesets/secondary/cinnabar_gym/palettes/9.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/cinnabar_gym/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/0.pal b/data/tilesets/secondary/cinnabar_island/palettes/0.pal deleted file mode 100644 index 9dcb673aa..000000000 --- a/data/tilesets/secondary/cinnabar_island/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -189 255 139 -131 213 98 -57 148 49 -57 82 0 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/00.pal b/data/tilesets/secondary/cinnabar_island/palettes/00.pal new file mode 100644 index 000000000..9dcb673aa --- /dev/null +++ b/data/tilesets/secondary/cinnabar_island/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +189 255 139 +131 213 98 +57 148 49 +57 82 0 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/01.pal b/data/tilesets/secondary/cinnabar_island/palettes/01.pal new file mode 100644 index 000000000..391d1e3d1 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_island/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 189 164 +189 148 139 +156 115 115 +123 82 82 +90 57 74 +115 205 164 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/02.pal b/data/tilesets/secondary/cinnabar_island/palettes/02.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_island/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/03.pal b/data/tilesets/secondary/cinnabar_island/palettes/03.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_island/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/04.pal b/data/tilesets/secondary/cinnabar_island/palettes/04.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_island/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/05.pal b/data/tilesets/secondary/cinnabar_island/palettes/05.pal new file mode 100644 index 000000000..3a2db72a7 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_island/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +222 205 131 +205 180 106 +180 139 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/06.pal b/data/tilesets/secondary/cinnabar_island/palettes/06.pal new file mode 100644 index 000000000..93518605a --- /dev/null +++ b/data/tilesets/secondary/cinnabar_island/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/07.pal b/data/tilesets/secondary/cinnabar_island/palettes/07.pal new file mode 100644 index 000000000..93518605a --- /dev/null +++ b/data/tilesets/secondary/cinnabar_island/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/08.pal b/data/tilesets/secondary/cinnabar_island/palettes/08.pal new file mode 100644 index 000000000..f734cd166 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_island/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +139 82 57 +164 106 82 +205 148 123 +222 164 139 +172 189 238 +213 222 246 +156 131 90 +189 164 115 +222 205 156 +255 238 189 +164 164 180 +82 82 106 +123 123 139 +205 205 222 +255 255 255 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/09.pal b/data/tilesets/secondary/cinnabar_island/palettes/09.pal new file mode 100644 index 000000000..ca26d1b08 --- /dev/null +++ b/data/tilesets/secondary/cinnabar_island/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 255 246 +230 230 189 +197 197 156 +172 172 131 +123 123 82 +65 74 106 +123 123 131 +123 123 131 +98 164 222 +74 131 197 +139 222 189 +106 189 156 +106 189 156 +74 156 123 +90 90 115 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/1.pal b/data/tilesets/secondary/cinnabar_island/palettes/1.pal deleted file mode 100644 index 391d1e3d1..000000000 --- a/data/tilesets/secondary/cinnabar_island/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 189 164 -189 148 139 -156 115 115 -123 82 82 -90 57 74 -115 205 164 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/2.pal b/data/tilesets/secondary/cinnabar_island/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/cinnabar_island/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/3.pal b/data/tilesets/secondary/cinnabar_island/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/secondary/cinnabar_island/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/4.pal b/data/tilesets/secondary/cinnabar_island/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/cinnabar_island/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/5.pal b/data/tilesets/secondary/cinnabar_island/palettes/5.pal deleted file mode 100644 index 3a2db72a7..000000000 --- a/data/tilesets/secondary/cinnabar_island/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -222 205 131 -205 180 106 -180 139 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/6.pal b/data/tilesets/secondary/cinnabar_island/palettes/6.pal deleted file mode 100644 index 93518605a..000000000 --- a/data/tilesets/secondary/cinnabar_island/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/7.pal b/data/tilesets/secondary/cinnabar_island/palettes/7.pal deleted file mode 100644 index 93518605a..000000000 --- a/data/tilesets/secondary/cinnabar_island/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/8.pal b/data/tilesets/secondary/cinnabar_island/palettes/8.pal deleted file mode 100644 index f734cd166..000000000 --- a/data/tilesets/secondary/cinnabar_island/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -139 82 57 -164 106 82 -205 148 123 -222 164 139 -172 189 238 -213 222 246 -156 131 90 -189 164 115 -222 205 156 -255 238 189 -164 164 180 -82 82 106 -123 123 139 -205 205 222 -255 255 255 diff --git a/data/tilesets/secondary/cinnabar_island/palettes/9.pal b/data/tilesets/secondary/cinnabar_island/palettes/9.pal deleted file mode 100644 index ca26d1b08..000000000 --- a/data/tilesets/secondary/cinnabar_island/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -255 255 246 -230 230 189 -197 197 156 -172 172 131 -123 123 82 -65 74 106 -123 123 131 -123 123 131 -98 164 222 -74 131 197 -139 222 189 -106 189 156 -106 189 156 -74 156 123 -90 90 115 diff --git a/data/tilesets/secondary/condominiums/palettes/0.pal b/data/tilesets/secondary/condominiums/palettes/0.pal deleted file mode 100644 index 5867e5ba6..000000000 --- a/data/tilesets/secondary/condominiums/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -156 213 255 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/condominiums/palettes/00.pal b/data/tilesets/secondary/condominiums/palettes/00.pal new file mode 100644 index 000000000..5867e5ba6 --- /dev/null +++ b/data/tilesets/secondary/condominiums/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +156 213 255 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/condominiums/palettes/01.pal b/data/tilesets/secondary/condominiums/palettes/01.pal new file mode 100644 index 000000000..66561f6d3 --- /dev/null +++ b/data/tilesets/secondary/condominiums/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +139 180 222 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/condominiums/palettes/02.pal b/data/tilesets/secondary/condominiums/palettes/02.pal new file mode 100644 index 000000000..87a022102 --- /dev/null +++ b/data/tilesets/secondary/condominiums/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +90 90 115 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/condominiums/palettes/03.pal b/data/tilesets/secondary/condominiums/palettes/03.pal new file mode 100644 index 000000000..783496dcd --- /dev/null +++ b/data/tilesets/secondary/condominiums/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +65 98 156 +90 123 180 +115 156 197 +222 213 131 +164 164 172 +205 205 213 +238 238 246 +106 172 115 +156 205 139 diff --git a/data/tilesets/secondary/condominiums/palettes/04.pal b/data/tilesets/secondary/condominiums/palettes/04.pal new file mode 100644 index 000000000..89eace605 --- /dev/null +++ b/data/tilesets/secondary/condominiums/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 238 246 +172 197 180 +197 222 205 +90 189 172 +246 238 156 +205 189 131 +189 164 123 +148 131 106 +106 106 106 +213 222 230 +238 180 115 diff --git a/data/tilesets/secondary/condominiums/palettes/05.pal b/data/tilesets/secondary/condominiums/palettes/05.pal new file mode 100644 index 000000000..c7780e5c7 --- /dev/null +++ b/data/tilesets/secondary/condominiums/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +213 222 222 +164 180 189 +255 0 255 +131 115 74 +213 213 148 +197 189 139 +172 156 115 +148 131 90 +197 197 205 +205 82 65 +0 0 0 diff --git a/data/tilesets/secondary/condominiums/palettes/06.pal b/data/tilesets/secondary/condominiums/palettes/06.pal new file mode 100644 index 000000000..1d08ce9a2 --- /dev/null +++ b/data/tilesets/secondary/condominiums/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/condominiums/palettes/07.pal b/data/tilesets/secondary/condominiums/palettes/07.pal new file mode 100644 index 000000000..35987db53 --- /dev/null +++ b/data/tilesets/secondary/condominiums/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +139 139 148 +180 180 164 +255 255 255 +205 197 106 +246 238 148 +255 255 222 +98 98 123 +238 238 238 +82 222 123 +131 255 164 +82 164 57 +230 139 98 +189 98 74 +213 213 213 diff --git a/data/tilesets/secondary/condominiums/palettes/08.pal b/data/tilesets/secondary/condominiums/palettes/08.pal new file mode 100644 index 000000000..7f33e006f --- /dev/null +++ b/data/tilesets/secondary/condominiums/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +148 148 164 +180 180 164 +255 255 255 +213 213 213 +106 156 164 +131 189 197 +172 222 230 +238 180 222 +180 115 164 +213 213 180 +255 0 255 +156 205 246 +98 156 238 diff --git a/data/tilesets/secondary/condominiums/palettes/09.pal b/data/tilesets/secondary/condominiums/palettes/09.pal new file mode 100644 index 000000000..75022050d --- /dev/null +++ b/data/tilesets/secondary/condominiums/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +148 148 164 +180 180 164 +255 255 255 +213 213 213 +148 205 180 +115 172 148 +106 148 139 +197 238 255 +172 213 255 +123 164 222 +98 139 189 +123 164 189 +148 189 238 diff --git a/data/tilesets/secondary/condominiums/palettes/1.pal b/data/tilesets/secondary/condominiums/palettes/1.pal deleted file mode 100644 index 66561f6d3..000000000 --- a/data/tilesets/secondary/condominiums/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -139 180 222 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/condominiums/palettes/2.pal b/data/tilesets/secondary/condominiums/palettes/2.pal deleted file mode 100644 index 87a022102..000000000 --- a/data/tilesets/secondary/condominiums/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -90 90 115 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/condominiums/palettes/3.pal b/data/tilesets/secondary/condominiums/palettes/3.pal deleted file mode 100644 index 783496dcd..000000000 --- a/data/tilesets/secondary/condominiums/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -65 98 156 -90 123 180 -115 156 197 -222 213 131 -164 164 172 -205 205 213 -238 238 246 -106 172 115 -156 205 139 diff --git a/data/tilesets/secondary/condominiums/palettes/4.pal b/data/tilesets/secondary/condominiums/palettes/4.pal deleted file mode 100644 index 89eace605..000000000 --- a/data/tilesets/secondary/condominiums/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 238 246 -172 197 180 -197 222 205 -90 189 172 -246 238 156 -205 189 131 -189 164 123 -148 131 106 -106 106 106 -213 222 230 -238 180 115 diff --git a/data/tilesets/secondary/condominiums/palettes/5.pal b/data/tilesets/secondary/condominiums/palettes/5.pal deleted file mode 100644 index c7780e5c7..000000000 --- a/data/tilesets/secondary/condominiums/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -213 222 222 -164 180 189 -255 0 255 -131 115 74 -213 213 148 -197 189 139 -172 156 115 -148 131 90 -197 197 205 -205 82 65 -0 0 0 diff --git a/data/tilesets/secondary/condominiums/palettes/6.pal b/data/tilesets/secondary/condominiums/palettes/6.pal deleted file mode 100644 index 1d08ce9a2..000000000 --- a/data/tilesets/secondary/condominiums/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/condominiums/palettes/7.pal b/data/tilesets/secondary/condominiums/palettes/7.pal deleted file mode 100644 index 35987db53..000000000 --- a/data/tilesets/secondary/condominiums/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -139 139 148 -180 180 164 -255 255 255 -205 197 106 -246 238 148 -255 255 222 -98 98 123 -238 238 238 -82 222 123 -131 255 164 -82 164 57 -230 139 98 -189 98 74 -213 213 213 diff --git a/data/tilesets/secondary/condominiums/palettes/8.pal b/data/tilesets/secondary/condominiums/palettes/8.pal deleted file mode 100644 index 7f33e006f..000000000 --- a/data/tilesets/secondary/condominiums/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -148 148 164 -180 180 164 -255 255 255 -213 213 213 -106 156 164 -131 189 197 -172 222 230 -238 180 222 -180 115 164 -213 213 180 -255 0 255 -156 205 246 -98 156 238 diff --git a/data/tilesets/secondary/condominiums/palettes/9.pal b/data/tilesets/secondary/condominiums/palettes/9.pal deleted file mode 100644 index 75022050d..000000000 --- a/data/tilesets/secondary/condominiums/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -148 148 164 -180 180 164 -255 255 255 -213 213 213 -148 205 180 -115 172 148 -106 148 139 -197 238 255 -172 213 255 -123 164 222 -98 139 189 -123 164 189 -148 189 238 diff --git a/data/tilesets/secondary/department_store/palettes/0.pal b/data/tilesets/secondary/department_store/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/department_store/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/department_store/palettes/00.pal b/data/tilesets/secondary/department_store/palettes/00.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/department_store/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/department_store/palettes/01.pal b/data/tilesets/secondary/department_store/palettes/01.pal new file mode 100644 index 000000000..30be2fbe3 --- /dev/null +++ b/data/tilesets/secondary/department_store/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/department_store/palettes/02.pal b/data/tilesets/secondary/department_store/palettes/02.pal new file mode 100644 index 000000000..cc3a9457d --- /dev/null +++ b/data/tilesets/secondary/department_store/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/department_store/palettes/03.pal b/data/tilesets/secondary/department_store/palettes/03.pal new file mode 100644 index 000000000..7ec794ae5 --- /dev/null +++ b/data/tilesets/secondary/department_store/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/department_store/palettes/04.pal b/data/tilesets/secondary/department_store/palettes/04.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/department_store/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/department_store/palettes/05.pal b/data/tilesets/secondary/department_store/palettes/05.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/department_store/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/department_store/palettes/06.pal b/data/tilesets/secondary/department_store/palettes/06.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/department_store/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/department_store/palettes/07.pal b/data/tilesets/secondary/department_store/palettes/07.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/department_store/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/department_store/palettes/08.pal b/data/tilesets/secondary/department_store/palettes/08.pal new file mode 100644 index 000000000..18480092b --- /dev/null +++ b/data/tilesets/secondary/department_store/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 222 156 +82 82 106 +115 123 131 +98 90 65 +139 123 82 +197 172 90 +230 230 238 +205 115 74 +238 172 82 +238 213 82 +131 189 57 +164 222 82 +156 139 172 +205 172 222 +213 205 230 +246 255 255 diff --git a/data/tilesets/secondary/department_store/palettes/09.pal b/data/tilesets/secondary/department_store/palettes/09.pal new file mode 100644 index 000000000..dd18b9d07 --- /dev/null +++ b/data/tilesets/secondary/department_store/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 222 156 +82 82 106 +131 131 131 +172 123 82 +205 131 65 +213 148 65 +205 148 82 +238 164 82 +238 180 82 +148 106 74 +189 197 213 +222 230 230 +156 172 172 +90 131 238 +106 164 255 +156 189 255 diff --git a/data/tilesets/secondary/department_store/palettes/1.pal b/data/tilesets/secondary/department_store/palettes/1.pal deleted file mode 100644 index 30be2fbe3..000000000 --- a/data/tilesets/secondary/department_store/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/department_store/palettes/2.pal b/data/tilesets/secondary/department_store/palettes/2.pal deleted file mode 100644 index cc3a9457d..000000000 --- a/data/tilesets/secondary/department_store/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/department_store/palettes/3.pal b/data/tilesets/secondary/department_store/palettes/3.pal deleted file mode 100644 index 7ec794ae5..000000000 --- a/data/tilesets/secondary/department_store/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/department_store/palettes/4.pal b/data/tilesets/secondary/department_store/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/department_store/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/department_store/palettes/5.pal b/data/tilesets/secondary/department_store/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/department_store/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/department_store/palettes/6.pal b/data/tilesets/secondary/department_store/palettes/6.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/department_store/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/department_store/palettes/7.pal b/data/tilesets/secondary/department_store/palettes/7.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/department_store/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/department_store/palettes/8.pal b/data/tilesets/secondary/department_store/palettes/8.pal deleted file mode 100644 index 18480092b..000000000 --- a/data/tilesets/secondary/department_store/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -139 222 156 -82 82 106 -115 123 131 -98 90 65 -139 123 82 -197 172 90 -230 230 238 -205 115 74 -238 172 82 -238 213 82 -131 189 57 -164 222 82 -156 139 172 -205 172 222 -213 205 230 -246 255 255 diff --git a/data/tilesets/secondary/department_store/palettes/9.pal b/data/tilesets/secondary/department_store/palettes/9.pal deleted file mode 100644 index dd18b9d07..000000000 --- a/data/tilesets/secondary/department_store/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -139 222 156 -82 82 106 -131 131 131 -172 123 82 -205 131 65 -213 148 65 -205 148 82 -238 164 82 -238 180 82 -148 106 74 -189 197 213 -222 230 230 -156 172 172 -90 131 238 -106 164 255 -156 189 255 diff --git a/data/tilesets/secondary/digletts_cave/palettes/0.pal b/data/tilesets/secondary/digletts_cave/palettes/0.pal deleted file mode 100644 index a3fab1c2f..000000000 --- a/data/tilesets/secondary/digletts_cave/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/digletts_cave/palettes/00.pal b/data/tilesets/secondary/digletts_cave/palettes/00.pal new file mode 100644 index 000000000..a3fab1c2f --- /dev/null +++ b/data/tilesets/secondary/digletts_cave/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/digletts_cave/palettes/01.pal b/data/tilesets/secondary/digletts_cave/palettes/01.pal new file mode 100644 index 000000000..d8a4e7757 --- /dev/null +++ b/data/tilesets/secondary/digletts_cave/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/digletts_cave/palettes/02.pal b/data/tilesets/secondary/digletts_cave/palettes/02.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/digletts_cave/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/digletts_cave/palettes/03.pal b/data/tilesets/secondary/digletts_cave/palettes/03.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/secondary/digletts_cave/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/digletts_cave/palettes/04.pal b/data/tilesets/secondary/digletts_cave/palettes/04.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/digletts_cave/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/digletts_cave/palettes/05.pal b/data/tilesets/secondary/digletts_cave/palettes/05.pal new file mode 100644 index 000000000..c5a653979 --- /dev/null +++ b/data/tilesets/secondary/digletts_cave/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/digletts_cave/palettes/06.pal b/data/tilesets/secondary/digletts_cave/palettes/06.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/digletts_cave/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/digletts_cave/palettes/07.pal b/data/tilesets/secondary/digletts_cave/palettes/07.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/digletts_cave/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/digletts_cave/palettes/08.pal b/data/tilesets/secondary/digletts_cave/palettes/08.pal new file mode 100644 index 000000000..74cbc54c6 --- /dev/null +++ b/data/tilesets/secondary/digletts_cave/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +197 172 123 +172 139 90 +148 106 65 +123 74 41 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +222 222 156 +189 189 123 +148 148 106 +115 106 90 +82 74 65 +57 49 41 +65 65 74 diff --git a/data/tilesets/secondary/digletts_cave/palettes/09.pal b/data/tilesets/secondary/digletts_cave/palettes/09.pal new file mode 100644 index 000000000..def7acffc --- /dev/null +++ b/data/tilesets/secondary/digletts_cave/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +197 172 123 +172 139 90 +148 106 65 +123 74 41 +164 180 230 +139 156 222 +98 106 139 +65 65 57 +255 0 255 +255 0 255 +65 65 74 +0 0 0 +98 139 197 +74 115 172 +57 98 156 diff --git a/data/tilesets/secondary/digletts_cave/palettes/1.pal b/data/tilesets/secondary/digletts_cave/palettes/1.pal deleted file mode 100644 index d8a4e7757..000000000 --- a/data/tilesets/secondary/digletts_cave/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/digletts_cave/palettes/2.pal b/data/tilesets/secondary/digletts_cave/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/digletts_cave/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/digletts_cave/palettes/3.pal b/data/tilesets/secondary/digletts_cave/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/secondary/digletts_cave/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/digletts_cave/palettes/4.pal b/data/tilesets/secondary/digletts_cave/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/digletts_cave/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/digletts_cave/palettes/5.pal b/data/tilesets/secondary/digletts_cave/palettes/5.pal deleted file mode 100644 index c5a653979..000000000 --- a/data/tilesets/secondary/digletts_cave/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/digletts_cave/palettes/6.pal b/data/tilesets/secondary/digletts_cave/palettes/6.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/digletts_cave/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/digletts_cave/palettes/7.pal b/data/tilesets/secondary/digletts_cave/palettes/7.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/digletts_cave/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/digletts_cave/palettes/8.pal b/data/tilesets/secondary/digletts_cave/palettes/8.pal deleted file mode 100644 index 74cbc54c6..000000000 --- a/data/tilesets/secondary/digletts_cave/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -197 172 123 -172 139 90 -148 106 65 -123 74 41 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -222 222 156 -189 189 123 -148 148 106 -115 106 90 -82 74 65 -57 49 41 -65 65 74 diff --git a/data/tilesets/secondary/digletts_cave/palettes/9.pal b/data/tilesets/secondary/digletts_cave/palettes/9.pal deleted file mode 100644 index def7acffc..000000000 --- a/data/tilesets/secondary/digletts_cave/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -197 172 123 -172 139 90 -148 106 65 -123 74 41 -164 180 230 -139 156 222 -98 106 139 -65 65 57 -255 0 255 -255 0 255 -65 65 74 -0 0 0 -98 139 197 -74 115 172 -57 98 156 diff --git a/data/tilesets/secondary/dummy1/palettes/0.pal b/data/tilesets/secondary/dummy1/palettes/0.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/dummy1/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/00.pal b/data/tilesets/secondary/dummy1/palettes/00.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy1/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/01.pal b/data/tilesets/secondary/dummy1/palettes/01.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy1/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/02.pal b/data/tilesets/secondary/dummy1/palettes/02.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy1/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/03.pal b/data/tilesets/secondary/dummy1/palettes/03.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy1/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/04.pal b/data/tilesets/secondary/dummy1/palettes/04.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy1/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/05.pal b/data/tilesets/secondary/dummy1/palettes/05.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy1/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/06.pal b/data/tilesets/secondary/dummy1/palettes/06.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy1/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/07.pal b/data/tilesets/secondary/dummy1/palettes/07.pal new file mode 100644 index 000000000..4172436d0 --- /dev/null +++ b/data/tilesets/secondary/dummy1/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +65 74 106 +246 246 255 +205 197 213 +156 156 164 +222 230 255 +172 205 213 +156 189 172 +189 230 148 +139 205 123 +106 131 98 +238 131 106 +205 106 106 +255 246 41 +255 205 148 +189 197 115 diff --git a/data/tilesets/secondary/dummy1/palettes/08.pal b/data/tilesets/secondary/dummy1/palettes/08.pal new file mode 100644 index 000000000..7fd087b3b --- /dev/null +++ b/data/tilesets/secondary/dummy1/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +65 74 106 +172 172 189 +222 213 205 +238 238 238 +123 139 74 +148 205 98 +205 246 123 +255 238 230 +222 222 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/09.pal b/data/tilesets/secondary/dummy1/palettes/09.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy1/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/1.pal b/data/tilesets/secondary/dummy1/palettes/1.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/dummy1/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/2.pal b/data/tilesets/secondary/dummy1/palettes/2.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/dummy1/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/3.pal b/data/tilesets/secondary/dummy1/palettes/3.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/dummy1/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/4.pal b/data/tilesets/secondary/dummy1/palettes/4.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/dummy1/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/5.pal b/data/tilesets/secondary/dummy1/palettes/5.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/dummy1/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/6.pal b/data/tilesets/secondary/dummy1/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/dummy1/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/7.pal b/data/tilesets/secondary/dummy1/palettes/7.pal deleted file mode 100644 index 4172436d0..000000000 --- a/data/tilesets/secondary/dummy1/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -65 74 106 -246 246 255 -205 197 213 -156 156 164 -222 230 255 -172 205 213 -156 189 172 -189 230 148 -139 205 123 -106 131 98 -238 131 106 -205 106 106 -255 246 41 -255 205 148 -189 197 115 diff --git a/data/tilesets/secondary/dummy1/palettes/8.pal b/data/tilesets/secondary/dummy1/palettes/8.pal deleted file mode 100644 index 7fd087b3b..000000000 --- a/data/tilesets/secondary/dummy1/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -65 74 106 -172 172 189 -222 213 205 -238 238 238 -123 139 74 -148 205 98 -205 246 123 -255 238 230 -222 222 189 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/dummy1/palettes/9.pal b/data/tilesets/secondary/dummy1/palettes/9.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/dummy1/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/dummy2/palettes/0.pal b/data/tilesets/secondary/dummy2/palettes/0.pal deleted file mode 100644 index 0fd74602e..000000000 --- a/data/tilesets/secondary/dummy2/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -24 41 82 -255 255 255 -222 230 238 -189 205 230 -156 180 222 -131 131 139 -98 98 123 -65 74 106 -189 189 131 -115 189 246 -98 172 238 -115 189 246 -98 164 222 -82 139 197 -74 115 172 -115 197 164 diff --git a/data/tilesets/secondary/dummy2/palettes/00.pal b/data/tilesets/secondary/dummy2/palettes/00.pal new file mode 100644 index 000000000..0fd74602e --- /dev/null +++ b/data/tilesets/secondary/dummy2/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 41 82 +255 255 255 +222 230 238 +189 205 230 +156 180 222 +131 131 139 +98 98 123 +65 74 106 +189 189 131 +115 189 246 +98 172 238 +115 189 246 +98 164 222 +82 139 197 +74 115 172 +115 197 164 diff --git a/data/tilesets/secondary/dummy2/palettes/01.pal b/data/tilesets/secondary/dummy2/palettes/01.pal new file mode 100644 index 000000000..3c6e40c2e --- /dev/null +++ b/data/tilesets/secondary/dummy2/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 41 82 +255 255 255 +222 230 238 +189 205 230 +156 180 222 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +115 189 246 +98 172 238 +255 189 131 +238 148 115 +222 106 98 +205 65 82 +115 197 164 diff --git a/data/tilesets/secondary/dummy2/palettes/02.pal b/data/tilesets/secondary/dummy2/palettes/02.pal new file mode 100644 index 000000000..4c41030f6 --- /dev/null +++ b/data/tilesets/secondary/dummy2/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 41 82 +180 255 131 +131 197 98 +57 139 49 +57 82 0 +222 148 115 +106 90 90 +164 98 90 +65 57 49 +255 197 148 +222 106 98 +205 65 82 +164 213 197 +115 197 164 +65 180 131 +24 164 106 diff --git a/data/tilesets/secondary/dummy2/palettes/03.pal b/data/tilesets/secondary/dummy2/palettes/03.pal new file mode 100644 index 000000000..5665ddc22 --- /dev/null +++ b/data/tilesets/secondary/dummy2/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 41 82 +255 255 255 +213 213 213 +189 189 189 +164 164 164 +131 131 139 +65 180 131 +164 213 197 +65 49 65 +238 213 205 +222 180 164 +189 148 139 +156 115 115 +131 90 90 +98 65 82 +115 197 164 diff --git a/data/tilesets/secondary/dummy2/palettes/04.pal b/data/tilesets/secondary/dummy2/palettes/04.pal new file mode 100644 index 000000000..d8051b7ba --- /dev/null +++ b/data/tilesets/secondary/dummy2/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 41 82 +255 255 255 +222 230 238 +255 0 255 +255 0 255 +255 0 255 +156 164 189 +82 106 213 +65 90 189 +57 82 156 +41 65 139 +172 197 230 +139 164 222 +106 131 213 +82 106 213 +115 197 164 diff --git a/data/tilesets/secondary/dummy2/palettes/05.pal b/data/tilesets/secondary/dummy2/palettes/05.pal new file mode 100644 index 000000000..4e684594c --- /dev/null +++ b/data/tilesets/secondary/dummy2/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 41 82 +255 255 255 +222 230 238 +189 205 230 +156 180 222 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +131 197 246 +106 180 222 +238 230 164 +222 205 131 +213 180 106 +205 156 82 +115 197 164 diff --git a/data/tilesets/secondary/dummy2/palettes/06.pal b/data/tilesets/secondary/dummy2/palettes/06.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/dummy2/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy2/palettes/07.pal b/data/tilesets/secondary/dummy2/palettes/07.pal new file mode 100644 index 000000000..2064b3bd2 --- /dev/null +++ b/data/tilesets/secondary/dummy2/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 255 255 +238 222 172 +230 156 98 +197 90 65 +65 74 106 +106 106 123 +131 90 49 +90 65 49 +57 57 57 +222 222 197 +172 180 148 +131 148 115 +106 123 65 +156 205 230 +156 156 156 diff --git a/data/tilesets/secondary/dummy2/palettes/08.pal b/data/tilesets/secondary/dummy2/palettes/08.pal new file mode 100644 index 000000000..42a3483c0 --- /dev/null +++ b/data/tilesets/secondary/dummy2/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 255 255 +213 222 246 +131 131 139 +98 98 123 +65 74 106 +164 205 189 +139 180 172 +115 156 139 +98 139 131 +189 172 180 +156 139 148 +230 106 57 +205 49 24 +148 57 24 +0 0 0 diff --git a/data/tilesets/secondary/dummy2/palettes/09.pal b/data/tilesets/secondary/dummy2/palettes/09.pal new file mode 100644 index 000000000..b06dfbda7 --- /dev/null +++ b/data/tilesets/secondary/dummy2/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 255 255 +213 222 246 +164 172 222 +98 98 123 +65 74 106 +98 98 123 +65 74 106 +115 123 164 +49 49 74 +189 238 180 +106 222 115 +74 180 98 +57 131 82 +131 197 230 +98 156 172 diff --git a/data/tilesets/secondary/dummy2/palettes/1.pal b/data/tilesets/secondary/dummy2/palettes/1.pal deleted file mode 100644 index 3c6e40c2e..000000000 --- a/data/tilesets/secondary/dummy2/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -24 41 82 -255 255 255 -222 230 238 -189 205 230 -156 180 222 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -115 189 246 -98 172 238 -255 189 131 -238 148 115 -222 106 98 -205 65 82 -115 197 164 diff --git a/data/tilesets/secondary/dummy2/palettes/2.pal b/data/tilesets/secondary/dummy2/palettes/2.pal deleted file mode 100644 index 4c41030f6..000000000 --- a/data/tilesets/secondary/dummy2/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -24 41 82 -180 255 131 -131 197 98 -57 139 49 -57 82 0 -222 148 115 -106 90 90 -164 98 90 -65 57 49 -255 197 148 -222 106 98 -205 65 82 -164 213 197 -115 197 164 -65 180 131 -24 164 106 diff --git a/data/tilesets/secondary/dummy2/palettes/3.pal b/data/tilesets/secondary/dummy2/palettes/3.pal deleted file mode 100644 index 5665ddc22..000000000 --- a/data/tilesets/secondary/dummy2/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -24 41 82 -255 255 255 -213 213 213 -189 189 189 -164 164 164 -131 131 139 -65 180 131 -164 213 197 -65 49 65 -238 213 205 -222 180 164 -189 148 139 -156 115 115 -131 90 90 -98 65 82 -115 197 164 diff --git a/data/tilesets/secondary/dummy2/palettes/4.pal b/data/tilesets/secondary/dummy2/palettes/4.pal deleted file mode 100644 index d8051b7ba..000000000 --- a/data/tilesets/secondary/dummy2/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -24 41 82 -255 255 255 -222 230 238 -255 0 255 -255 0 255 -255 0 255 -156 164 189 -82 106 213 -65 90 189 -57 82 156 -41 65 139 -172 197 230 -139 164 222 -106 131 213 -82 106 213 -115 197 164 diff --git a/data/tilesets/secondary/dummy2/palettes/5.pal b/data/tilesets/secondary/dummy2/palettes/5.pal deleted file mode 100644 index 4e684594c..000000000 --- a/data/tilesets/secondary/dummy2/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -24 41 82 -255 255 255 -222 230 238 -189 205 230 -156 180 222 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -131 197 246 -106 180 222 -238 230 164 -222 205 131 -213 180 106 -205 156 82 -115 197 164 diff --git a/data/tilesets/secondary/dummy2/palettes/6.pal b/data/tilesets/secondary/dummy2/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/dummy2/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/dummy2/palettes/7.pal b/data/tilesets/secondary/dummy2/palettes/7.pal deleted file mode 100644 index 2064b3bd2..000000000 --- a/data/tilesets/secondary/dummy2/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 255 255 -238 222 172 -230 156 98 -197 90 65 -65 74 106 -106 106 123 -131 90 49 -90 65 49 -57 57 57 -222 222 197 -172 180 148 -131 148 115 -106 123 65 -156 205 230 -156 156 156 diff --git a/data/tilesets/secondary/dummy2/palettes/8.pal b/data/tilesets/secondary/dummy2/palettes/8.pal deleted file mode 100644 index 42a3483c0..000000000 --- a/data/tilesets/secondary/dummy2/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 255 255 -213 222 246 -131 131 139 -98 98 123 -65 74 106 -164 205 189 -139 180 172 -115 156 139 -98 139 131 -189 172 180 -156 139 148 -230 106 57 -205 49 24 -148 57 24 -0 0 0 diff --git a/data/tilesets/secondary/dummy2/palettes/9.pal b/data/tilesets/secondary/dummy2/palettes/9.pal deleted file mode 100644 index b06dfbda7..000000000 --- a/data/tilesets/secondary/dummy2/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 255 255 -213 222 246 -164 172 222 -98 98 123 -65 74 106 -98 98 123 -65 74 106 -115 123 164 -49 49 74 -189 238 180 -106 222 115 -74 180 98 -57 131 82 -131 197 230 -98 156 172 diff --git a/data/tilesets/secondary/dummy3/palettes/0.pal b/data/tilesets/secondary/dummy3/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/dummy3/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/dummy3/palettes/00.pal b/data/tilesets/secondary/dummy3/palettes/00.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/dummy3/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/dummy3/palettes/01.pal b/data/tilesets/secondary/dummy3/palettes/01.pal new file mode 100644 index 000000000..d8a4e7757 --- /dev/null +++ b/data/tilesets/secondary/dummy3/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/dummy3/palettes/02.pal b/data/tilesets/secondary/dummy3/palettes/02.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/dummy3/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/dummy3/palettes/03.pal b/data/tilesets/secondary/dummy3/palettes/03.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/secondary/dummy3/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/dummy3/palettes/04.pal b/data/tilesets/secondary/dummy3/palettes/04.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/dummy3/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/dummy3/palettes/05.pal b/data/tilesets/secondary/dummy3/palettes/05.pal new file mode 100644 index 000000000..c5a653979 --- /dev/null +++ b/data/tilesets/secondary/dummy3/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/dummy3/palettes/06.pal b/data/tilesets/secondary/dummy3/palettes/06.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/dummy3/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy3/palettes/07.pal b/data/tilesets/secondary/dummy3/palettes/07.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/dummy3/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy3/palettes/08.pal b/data/tilesets/secondary/dummy3/palettes/08.pal new file mode 100644 index 000000000..6774e407f --- /dev/null +++ b/data/tilesets/secondary/dummy3/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +189 189 156 +172 172 139 +148 139 115 +123 115 90 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +222 197 189 +205 180 156 +189 148 139 +148 115 106 +115 65 74 +82 49 65 +90 90 98 diff --git a/data/tilesets/secondary/dummy3/palettes/09.pal b/data/tilesets/secondary/dummy3/palettes/09.pal new file mode 100644 index 000000000..3795f6c6a --- /dev/null +++ b/data/tilesets/secondary/dummy3/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 222 213 +189 189 156 +172 172 139 +148 139 115 +123 115 90 +255 238 164 +230 197 139 +205 172 123 +164 123 90 +148 115 74 +106 65 41 +74 74 57 +0 0 0 +98 139 197 +74 115 172 +57 98 156 diff --git a/data/tilesets/secondary/dummy3/palettes/1.pal b/data/tilesets/secondary/dummy3/palettes/1.pal deleted file mode 100644 index d8a4e7757..000000000 --- a/data/tilesets/secondary/dummy3/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/dummy3/palettes/2.pal b/data/tilesets/secondary/dummy3/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/dummy3/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/dummy3/palettes/3.pal b/data/tilesets/secondary/dummy3/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/secondary/dummy3/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/dummy3/palettes/4.pal b/data/tilesets/secondary/dummy3/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/dummy3/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/dummy3/palettes/5.pal b/data/tilesets/secondary/dummy3/palettes/5.pal deleted file mode 100644 index c5a653979..000000000 --- a/data/tilesets/secondary/dummy3/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/dummy3/palettes/6.pal b/data/tilesets/secondary/dummy3/palettes/6.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/dummy3/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/dummy3/palettes/7.pal b/data/tilesets/secondary/dummy3/palettes/7.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/dummy3/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/dummy3/palettes/8.pal b/data/tilesets/secondary/dummy3/palettes/8.pal deleted file mode 100644 index 6774e407f..000000000 --- a/data/tilesets/secondary/dummy3/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -189 189 156 -172 172 139 -148 139 115 -123 115 90 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -222 197 189 -205 180 156 -189 148 139 -148 115 106 -115 65 74 -82 49 65 -90 90 98 diff --git a/data/tilesets/secondary/dummy3/palettes/9.pal b/data/tilesets/secondary/dummy3/palettes/9.pal deleted file mode 100644 index 3795f6c6a..000000000 --- a/data/tilesets/secondary/dummy3/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 222 213 -189 189 156 -172 172 139 -148 139 115 -123 115 90 -255 238 164 -230 197 139 -205 172 123 -164 123 90 -148 115 74 -106 65 41 -74 74 57 -0 0 0 -98 139 197 -74 115 172 -57 98 156 diff --git a/data/tilesets/secondary/dummy4/palettes/0.pal b/data/tilesets/secondary/dummy4/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/dummy4/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/dummy4/palettes/00.pal b/data/tilesets/secondary/dummy4/palettes/00.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/dummy4/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/dummy4/palettes/01.pal b/data/tilesets/secondary/dummy4/palettes/01.pal new file mode 100644 index 000000000..d8a4e7757 --- /dev/null +++ b/data/tilesets/secondary/dummy4/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/dummy4/palettes/02.pal b/data/tilesets/secondary/dummy4/palettes/02.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/dummy4/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/dummy4/palettes/03.pal b/data/tilesets/secondary/dummy4/palettes/03.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/secondary/dummy4/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/dummy4/palettes/04.pal b/data/tilesets/secondary/dummy4/palettes/04.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/dummy4/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/dummy4/palettes/05.pal b/data/tilesets/secondary/dummy4/palettes/05.pal new file mode 100644 index 000000000..c5a653979 --- /dev/null +++ b/data/tilesets/secondary/dummy4/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/dummy4/palettes/06.pal b/data/tilesets/secondary/dummy4/palettes/06.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/dummy4/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy4/palettes/07.pal b/data/tilesets/secondary/dummy4/palettes/07.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/dummy4/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/dummy4/palettes/08.pal b/data/tilesets/secondary/dummy4/palettes/08.pal new file mode 100644 index 000000000..6774e407f --- /dev/null +++ b/data/tilesets/secondary/dummy4/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +189 189 156 +172 172 139 +148 139 115 +123 115 90 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +222 197 189 +205 180 156 +189 148 139 +148 115 106 +115 65 74 +82 49 65 +90 90 98 diff --git a/data/tilesets/secondary/dummy4/palettes/09.pal b/data/tilesets/secondary/dummy4/palettes/09.pal new file mode 100644 index 000000000..3795f6c6a --- /dev/null +++ b/data/tilesets/secondary/dummy4/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 222 213 +189 189 156 +172 172 139 +148 139 115 +123 115 90 +255 238 164 +230 197 139 +205 172 123 +164 123 90 +148 115 74 +106 65 41 +74 74 57 +0 0 0 +98 139 197 +74 115 172 +57 98 156 diff --git a/data/tilesets/secondary/dummy4/palettes/1.pal b/data/tilesets/secondary/dummy4/palettes/1.pal deleted file mode 100644 index d8a4e7757..000000000 --- a/data/tilesets/secondary/dummy4/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/dummy4/palettes/2.pal b/data/tilesets/secondary/dummy4/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/dummy4/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/dummy4/palettes/3.pal b/data/tilesets/secondary/dummy4/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/secondary/dummy4/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/dummy4/palettes/4.pal b/data/tilesets/secondary/dummy4/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/dummy4/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/dummy4/palettes/5.pal b/data/tilesets/secondary/dummy4/palettes/5.pal deleted file mode 100644 index c5a653979..000000000 --- a/data/tilesets/secondary/dummy4/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/dummy4/palettes/6.pal b/data/tilesets/secondary/dummy4/palettes/6.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/dummy4/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/dummy4/palettes/7.pal b/data/tilesets/secondary/dummy4/palettes/7.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/dummy4/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/dummy4/palettes/8.pal b/data/tilesets/secondary/dummy4/palettes/8.pal deleted file mode 100644 index 6774e407f..000000000 --- a/data/tilesets/secondary/dummy4/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -189 189 156 -172 172 139 -148 139 115 -123 115 90 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -222 197 189 -205 180 156 -189 148 139 -148 115 106 -115 65 74 -82 49 65 -90 90 98 diff --git a/data/tilesets/secondary/dummy4/palettes/9.pal b/data/tilesets/secondary/dummy4/palettes/9.pal deleted file mode 100644 index 3795f6c6a..000000000 --- a/data/tilesets/secondary/dummy4/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 222 213 -189 189 156 -172 172 139 -148 139 115 -123 115 90 -255 238 164 -230 197 139 -205 172 123 -164 123 90 -148 115 74 -106 65 41 -74 74 57 -0 0 0 -98 139 197 -74 115 172 -57 98 156 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/0.pal b/data/tilesets/secondary/fan_club_daycare/palettes/0.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/fan_club_daycare/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/00.pal b/data/tilesets/secondary/fan_club_daycare/palettes/00.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fan_club_daycare/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/01.pal b/data/tilesets/secondary/fan_club_daycare/palettes/01.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fan_club_daycare/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/02.pal b/data/tilesets/secondary/fan_club_daycare/palettes/02.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fan_club_daycare/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/03.pal b/data/tilesets/secondary/fan_club_daycare/palettes/03.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fan_club_daycare/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/04.pal b/data/tilesets/secondary/fan_club_daycare/palettes/04.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fan_club_daycare/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/05.pal b/data/tilesets/secondary/fan_club_daycare/palettes/05.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fan_club_daycare/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/06.pal b/data/tilesets/secondary/fan_club_daycare/palettes/06.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fan_club_daycare/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/07.pal b/data/tilesets/secondary/fan_club_daycare/palettes/07.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fan_club_daycare/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/08.pal b/data/tilesets/secondary/fan_club_daycare/palettes/08.pal new file mode 100644 index 000000000..4b7de8012 --- /dev/null +++ b/data/tilesets/secondary/fan_club_daycare/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 197 +82 82 106 +131 131 131 +131 115 90 +189 131 90 +205 156 90 +238 180 90 +172 172 131 +222 222 172 +172 180 205 +238 230 172 +255 255 246 +255 255 246 +197 205 222 +205 213 230 +230 230 246 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/09.pal b/data/tilesets/secondary/fan_club_daycare/palettes/09.pal new file mode 100644 index 000000000..8fe0861de --- /dev/null +++ b/data/tilesets/secondary/fan_club_daycare/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 197 +82 82 106 +131 131 131 +246 246 189 +180 180 139 +205 156 90 +230 230 131 +222 213 131 +205 205 115 +197 180 115 +255 0 255 +123 123 98 +156 156 98 +205 148 197 +90 164 205 +90 189 246 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/1.pal b/data/tilesets/secondary/fan_club_daycare/palettes/1.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/fan_club_daycare/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/2.pal b/data/tilesets/secondary/fan_club_daycare/palettes/2.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/fan_club_daycare/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/3.pal b/data/tilesets/secondary/fan_club_daycare/palettes/3.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/fan_club_daycare/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/4.pal b/data/tilesets/secondary/fan_club_daycare/palettes/4.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/fan_club_daycare/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/5.pal b/data/tilesets/secondary/fan_club_daycare/palettes/5.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/fan_club_daycare/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/6.pal b/data/tilesets/secondary/fan_club_daycare/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/fan_club_daycare/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/7.pal b/data/tilesets/secondary/fan_club_daycare/palettes/7.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/fan_club_daycare/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/8.pal b/data/tilesets/secondary/fan_club_daycare/palettes/8.pal deleted file mode 100644 index 4b7de8012..000000000 --- a/data/tilesets/secondary/fan_club_daycare/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 197 -82 82 106 -131 131 131 -131 115 90 -189 131 90 -205 156 90 -238 180 90 -172 172 131 -222 222 172 -172 180 205 -238 230 172 -255 255 246 -255 255 246 -197 205 222 -205 213 230 -230 230 246 diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/9.pal b/data/tilesets/secondary/fan_club_daycare/palettes/9.pal deleted file mode 100644 index 8fe0861de..000000000 --- a/data/tilesets/secondary/fan_club_daycare/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 197 -82 82 106 -131 131 131 -246 246 189 -180 180 139 -205 156 90 -230 230 131 -222 213 131 -205 205 115 -197 180 115 -255 0 255 -123 123 98 -156 156 98 -205 148 197 -90 164 205 -90 189 246 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/0.pal b/data/tilesets/secondary/fuchsia_city/palettes/0.pal deleted file mode 100644 index 5fb8bdb01..000000000 --- a/data/tilesets/secondary/fuchsia_city/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -189 255 139 -131 213 98 -57 139 49 -57 82 0 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/00.pal b/data/tilesets/secondary/fuchsia_city/palettes/00.pal new file mode 100644 index 000000000..5fb8bdb01 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_city/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +189 255 139 +131 213 98 +57 139 49 +57 82 0 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/01.pal b/data/tilesets/secondary/fuchsia_city/palettes/01.pal new file mode 100644 index 000000000..391d1e3d1 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_city/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 189 164 +189 148 139 +156 115 115 +123 82 82 +90 57 74 +115 205 164 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/02.pal b/data/tilesets/secondary/fuchsia_city/palettes/02.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_city/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/03.pal b/data/tilesets/secondary/fuchsia_city/palettes/03.pal new file mode 100644 index 000000000..9581f2cd8 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_city/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 131 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/04.pal b/data/tilesets/secondary/fuchsia_city/palettes/04.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_city/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/05.pal b/data/tilesets/secondary/fuchsia_city/palettes/05.pal new file mode 100644 index 000000000..3a2db72a7 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_city/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +222 205 131 +205 180 106 +180 139 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/06.pal b/data/tilesets/secondary/fuchsia_city/palettes/06.pal new file mode 100644 index 000000000..93518605a --- /dev/null +++ b/data/tilesets/secondary/fuchsia_city/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/07.pal b/data/tilesets/secondary/fuchsia_city/palettes/07.pal new file mode 100644 index 000000000..93518605a --- /dev/null +++ b/data/tilesets/secondary/fuchsia_city/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/08.pal b/data/tilesets/secondary/fuchsia_city/palettes/08.pal new file mode 100644 index 000000000..8a0a9a1e0 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_city/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +65 74 106 +123 123 131 +98 90 82 +115 106 98 +148 131 131 +180 156 131 +189 172 98 +213 205 131 +238 222 139 +90 106 164 +98 139 230 +115 205 255 +255 0 255 +255 0 255 +98 106 115 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/09.pal b/data/tilesets/secondary/fuchsia_city/palettes/09.pal new file mode 100644 index 000000000..d39bbb454 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_city/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +65 74 106 +123 123 131 +139 90 82 +189 123 115 +222 148 131 +255 197 156 +156 156 172 +189 197 213 +230 238 238 +49 98 90 +74 148 131 +82 197 148 +106 230 172 +164 238 172 +98 106 115 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/1.pal b/data/tilesets/secondary/fuchsia_city/palettes/1.pal deleted file mode 100644 index 391d1e3d1..000000000 --- a/data/tilesets/secondary/fuchsia_city/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 189 164 -189 148 139 -156 115 115 -123 82 82 -90 57 74 -115 205 164 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/2.pal b/data/tilesets/secondary/fuchsia_city/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/fuchsia_city/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/3.pal b/data/tilesets/secondary/fuchsia_city/palettes/3.pal deleted file mode 100644 index 9581f2cd8..000000000 --- a/data/tilesets/secondary/fuchsia_city/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 131 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/4.pal b/data/tilesets/secondary/fuchsia_city/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/fuchsia_city/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/5.pal b/data/tilesets/secondary/fuchsia_city/palettes/5.pal deleted file mode 100644 index 3a2db72a7..000000000 --- a/data/tilesets/secondary/fuchsia_city/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -222 205 131 -205 180 106 -180 139 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/6.pal b/data/tilesets/secondary/fuchsia_city/palettes/6.pal deleted file mode 100644 index 93518605a..000000000 --- a/data/tilesets/secondary/fuchsia_city/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/7.pal b/data/tilesets/secondary/fuchsia_city/palettes/7.pal deleted file mode 100644 index 93518605a..000000000 --- a/data/tilesets/secondary/fuchsia_city/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/8.pal b/data/tilesets/secondary/fuchsia_city/palettes/8.pal deleted file mode 100644 index 8a0a9a1e0..000000000 --- a/data/tilesets/secondary/fuchsia_city/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -65 74 106 -123 123 131 -98 90 82 -115 106 98 -148 131 131 -180 156 131 -189 172 98 -213 205 131 -238 222 139 -90 106 164 -98 139 230 -115 205 255 -255 0 255 -255 0 255 -98 106 115 diff --git a/data/tilesets/secondary/fuchsia_city/palettes/9.pal b/data/tilesets/secondary/fuchsia_city/palettes/9.pal deleted file mode 100644 index d39bbb454..000000000 --- a/data/tilesets/secondary/fuchsia_city/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -65 74 106 -123 123 131 -139 90 82 -189 123 115 -222 148 131 -255 197 156 -156 156 172 -189 197 213 -230 238 238 -49 98 90 -74 148 131 -82 197 148 -106 230 172 -164 238 172 -98 106 115 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/0.pal b/data/tilesets/secondary/fuchsia_gym/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/fuchsia_gym/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/00.pal b/data/tilesets/secondary/fuchsia_gym/palettes/00.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_gym/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/01.pal b/data/tilesets/secondary/fuchsia_gym/palettes/01.pal new file mode 100644 index 000000000..d99adafff --- /dev/null +++ b/data/tilesets/secondary/fuchsia_gym/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/02.pal b/data/tilesets/secondary/fuchsia_gym/palettes/02.pal new file mode 100644 index 000000000..cc3a9457d --- /dev/null +++ b/data/tilesets/secondary/fuchsia_gym/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/03.pal b/data/tilesets/secondary/fuchsia_gym/palettes/03.pal new file mode 100644 index 000000000..7ec794ae5 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_gym/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/04.pal b/data/tilesets/secondary/fuchsia_gym/palettes/04.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_gym/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/05.pal b/data/tilesets/secondary/fuchsia_gym/palettes/05.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_gym/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/06.pal b/data/tilesets/secondary/fuchsia_gym/palettes/06.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_gym/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/07.pal b/data/tilesets/secondary/fuchsia_gym/palettes/07.pal new file mode 100644 index 000000000..9020b628f --- /dev/null +++ b/data/tilesets/secondary/fuchsia_gym/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +156 131 57 +213 197 106 +246 238 148 +213 222 238 +222 230 255 +41 106 82 +57 131 115 +172 131 115 +197 156 148 +238 180 164 +180 139 123 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/08.pal b/data/tilesets/secondary/fuchsia_gym/palettes/08.pal new file mode 100644 index 000000000..1873ad439 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_gym/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +156 131 57 +213 197 106 +246 238 148 +156 205 246 +115 172 222 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/09.pal b/data/tilesets/secondary/fuchsia_gym/palettes/09.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/fuchsia_gym/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/1.pal b/data/tilesets/secondary/fuchsia_gym/palettes/1.pal deleted file mode 100644 index d99adafff..000000000 --- a/data/tilesets/secondary/fuchsia_gym/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/2.pal b/data/tilesets/secondary/fuchsia_gym/palettes/2.pal deleted file mode 100644 index cc3a9457d..000000000 --- a/data/tilesets/secondary/fuchsia_gym/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/3.pal b/data/tilesets/secondary/fuchsia_gym/palettes/3.pal deleted file mode 100644 index 7ec794ae5..000000000 --- a/data/tilesets/secondary/fuchsia_gym/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/4.pal b/data/tilesets/secondary/fuchsia_gym/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/fuchsia_gym/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/5.pal b/data/tilesets/secondary/fuchsia_gym/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/fuchsia_gym/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/6.pal b/data/tilesets/secondary/fuchsia_gym/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/fuchsia_gym/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/7.pal b/data/tilesets/secondary/fuchsia_gym/palettes/7.pal deleted file mode 100644 index 9020b628f..000000000 --- a/data/tilesets/secondary/fuchsia_gym/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -156 131 57 -213 197 106 -246 238 148 -213 222 238 -222 230 255 -41 106 82 -57 131 115 -172 131 115 -197 156 148 -238 180 164 -180 139 123 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/8.pal b/data/tilesets/secondary/fuchsia_gym/palettes/8.pal deleted file mode 100644 index 1873ad439..000000000 --- a/data/tilesets/secondary/fuchsia_gym/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -156 131 57 -213 197 106 -246 238 148 -156 205 246 -115 172 222 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/9.pal b/data/tilesets/secondary/fuchsia_gym/palettes/9.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/fuchsia_gym/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/game_corner/palettes/0.pal b/data/tilesets/secondary/game_corner/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/game_corner/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/game_corner/palettes/00.pal b/data/tilesets/secondary/game_corner/palettes/00.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/game_corner/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/game_corner/palettes/01.pal b/data/tilesets/secondary/game_corner/palettes/01.pal new file mode 100644 index 000000000..d99adafff --- /dev/null +++ b/data/tilesets/secondary/game_corner/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/game_corner/palettes/02.pal b/data/tilesets/secondary/game_corner/palettes/02.pal new file mode 100644 index 000000000..cc3a9457d --- /dev/null +++ b/data/tilesets/secondary/game_corner/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/game_corner/palettes/03.pal b/data/tilesets/secondary/game_corner/palettes/03.pal new file mode 100644 index 000000000..7ec794ae5 --- /dev/null +++ b/data/tilesets/secondary/game_corner/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/game_corner/palettes/04.pal b/data/tilesets/secondary/game_corner/palettes/04.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/game_corner/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/game_corner/palettes/05.pal b/data/tilesets/secondary/game_corner/palettes/05.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/game_corner/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/game_corner/palettes/06.pal b/data/tilesets/secondary/game_corner/palettes/06.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/game_corner/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/game_corner/palettes/07.pal b/data/tilesets/secondary/game_corner/palettes/07.pal new file mode 100644 index 000000000..b3612e537 --- /dev/null +++ b/data/tilesets/secondary/game_corner/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +131 131 131 +180 180 164 +255 255 255 +255 164 115 +255 222 189 +123 164 238 +172 205 238 +213 230 238 +164 255 180 +238 164 0 +139 90 197 +213 156 255 +255 255 148 +255 0 255 diff --git a/data/tilesets/secondary/game_corner/palettes/08.pal b/data/tilesets/secondary/game_corner/palettes/08.pal new file mode 100644 index 000000000..e58f94305 --- /dev/null +++ b/data/tilesets/secondary/game_corner/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 255 0 +82 82 106 +131 131 131 +180 180 164 +255 255 255 +255 255 123 +205 180 98 +246 230 172 +74 131 197 +139 197 255 +164 255 180 +238 246 246 +164 74 32 +213 115 57 +238 148 98 +255 189 98 diff --git a/data/tilesets/secondary/game_corner/palettes/09.pal b/data/tilesets/secondary/game_corner/palettes/09.pal new file mode 100644 index 000000000..75f1d81b5 --- /dev/null +++ b/data/tilesets/secondary/game_corner/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +255 0 255 +255 0 255 +255 255 255 +255 0 255 +131 172 238 +246 230 172 +82 180 172 +32 115 123 +255 148 115 +230 106 90 +90 213 156 +255 189 82 +16 123 255 +131 189 246 diff --git a/data/tilesets/secondary/game_corner/palettes/1.pal b/data/tilesets/secondary/game_corner/palettes/1.pal deleted file mode 100644 index d99adafff..000000000 --- a/data/tilesets/secondary/game_corner/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/game_corner/palettes/2.pal b/data/tilesets/secondary/game_corner/palettes/2.pal deleted file mode 100644 index cc3a9457d..000000000 --- a/data/tilesets/secondary/game_corner/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/game_corner/palettes/3.pal b/data/tilesets/secondary/game_corner/palettes/3.pal deleted file mode 100644 index 7ec794ae5..000000000 --- a/data/tilesets/secondary/game_corner/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/game_corner/palettes/4.pal b/data/tilesets/secondary/game_corner/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/game_corner/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/game_corner/palettes/5.pal b/data/tilesets/secondary/game_corner/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/game_corner/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/game_corner/palettes/6.pal b/data/tilesets/secondary/game_corner/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/game_corner/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/game_corner/palettes/7.pal b/data/tilesets/secondary/game_corner/palettes/7.pal deleted file mode 100644 index b3612e537..000000000 --- a/data/tilesets/secondary/game_corner/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -131 131 131 -180 180 164 -255 255 255 -255 164 115 -255 222 189 -123 164 238 -172 205 238 -213 230 238 -164 255 180 -238 164 0 -139 90 197 -213 156 255 -255 255 148 -255 0 255 diff --git a/data/tilesets/secondary/game_corner/palettes/8.pal b/data/tilesets/secondary/game_corner/palettes/8.pal deleted file mode 100644 index e58f94305..000000000 --- a/data/tilesets/secondary/game_corner/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 255 0 -82 82 106 -131 131 131 -180 180 164 -255 255 255 -255 255 123 -205 180 98 -246 230 172 -74 131 197 -139 197 255 -164 255 180 -238 246 246 -164 74 32 -213 115 57 -238 148 98 -255 189 98 diff --git a/data/tilesets/secondary/game_corner/palettes/9.pal b/data/tilesets/secondary/game_corner/palettes/9.pal deleted file mode 100644 index 75f1d81b5..000000000 --- a/data/tilesets/secondary/game_corner/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -255 0 255 -255 0 255 -255 255 255 -255 0 255 -131 172 238 -246 230 172 -82 180 172 -32 115 123 -255 148 115 -230 106 90 -90 213 156 -255 189 82 -16 123 255 -131 189 246 diff --git a/data/tilesets/secondary/generic_building1/palettes/0.pal b/data/tilesets/secondary/generic_building1/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/generic_building1/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/generic_building1/palettes/00.pal b/data/tilesets/secondary/generic_building1/palettes/00.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/generic_building1/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/generic_building1/palettes/01.pal b/data/tilesets/secondary/generic_building1/palettes/01.pal new file mode 100644 index 000000000..69f3f0b9e --- /dev/null +++ b/data/tilesets/secondary/generic_building1/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +180 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +238 246 238 diff --git a/data/tilesets/secondary/generic_building1/palettes/02.pal b/data/tilesets/secondary/generic_building1/palettes/02.pal new file mode 100644 index 000000000..c8ee236d7 --- /dev/null +++ b/data/tilesets/secondary/generic_building1/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +255 0 255 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/generic_building1/palettes/03.pal b/data/tilesets/secondary/generic_building1/palettes/03.pal new file mode 100644 index 000000000..b17dbb054 --- /dev/null +++ b/data/tilesets/secondary/generic_building1/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +164 164 164 +180 189 189 +255 255 255 +238 246 238 +213 230 222 +197 205 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/generic_building1/palettes/04.pal b/data/tilesets/secondary/generic_building1/palettes/04.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/generic_building1/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/generic_building1/palettes/05.pal b/data/tilesets/secondary/generic_building1/palettes/05.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/generic_building1/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/generic_building1/palettes/06.pal b/data/tilesets/secondary/generic_building1/palettes/06.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/generic_building1/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/generic_building1/palettes/07.pal b/data/tilesets/secondary/generic_building1/palettes/07.pal new file mode 100644 index 000000000..c1e7c3d5c --- /dev/null +++ b/data/tilesets/secondary/generic_building1/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 +90 0 255 diff --git a/data/tilesets/secondary/generic_building1/palettes/08.pal b/data/tilesets/secondary/generic_building1/palettes/08.pal new file mode 100644 index 000000000..18480092b --- /dev/null +++ b/data/tilesets/secondary/generic_building1/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 222 156 +82 82 106 +115 123 131 +98 90 65 +139 123 82 +197 172 90 +230 230 238 +205 115 74 +238 172 82 +238 213 82 +131 189 57 +164 222 82 +156 139 172 +205 172 222 +213 205 230 +246 255 255 diff --git a/data/tilesets/secondary/generic_building1/palettes/09.pal b/data/tilesets/secondary/generic_building1/palettes/09.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/generic_building1/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/generic_building1/palettes/1.pal b/data/tilesets/secondary/generic_building1/palettes/1.pal deleted file mode 100644 index 69f3f0b9e..000000000 --- a/data/tilesets/secondary/generic_building1/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -180 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -238 246 238 diff --git a/data/tilesets/secondary/generic_building1/palettes/2.pal b/data/tilesets/secondary/generic_building1/palettes/2.pal deleted file mode 100644 index c8ee236d7..000000000 --- a/data/tilesets/secondary/generic_building1/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -255 0 255 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/generic_building1/palettes/3.pal b/data/tilesets/secondary/generic_building1/palettes/3.pal deleted file mode 100644 index b17dbb054..000000000 --- a/data/tilesets/secondary/generic_building1/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -164 164 164 -180 189 189 -255 255 255 -238 246 238 -213 230 222 -197 205 197 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/generic_building1/palettes/4.pal b/data/tilesets/secondary/generic_building1/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/generic_building1/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/generic_building1/palettes/5.pal b/data/tilesets/secondary/generic_building1/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/generic_building1/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/generic_building1/palettes/6.pal b/data/tilesets/secondary/generic_building1/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/generic_building1/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/generic_building1/palettes/7.pal b/data/tilesets/secondary/generic_building1/palettes/7.pal deleted file mode 100644 index c1e7c3d5c..000000000 --- a/data/tilesets/secondary/generic_building1/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 -90 0 255 diff --git a/data/tilesets/secondary/generic_building1/palettes/8.pal b/data/tilesets/secondary/generic_building1/palettes/8.pal deleted file mode 100644 index 18480092b..000000000 --- a/data/tilesets/secondary/generic_building1/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -139 222 156 -82 82 106 -115 123 131 -98 90 65 -139 123 82 -197 172 90 -230 230 238 -205 115 74 -238 172 82 -238 213 82 -131 189 57 -164 222 82 -156 139 172 -205 172 222 -213 205 230 -246 255 255 diff --git a/data/tilesets/secondary/generic_building1/palettes/9.pal b/data/tilesets/secondary/generic_building1/palettes/9.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/generic_building1/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/generic_building2/palettes/0.pal b/data/tilesets/secondary/generic_building2/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/generic_building2/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/generic_building2/palettes/00.pal b/data/tilesets/secondary/generic_building2/palettes/00.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/generic_building2/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/generic_building2/palettes/01.pal b/data/tilesets/secondary/generic_building2/palettes/01.pal new file mode 100644 index 000000000..d99adafff --- /dev/null +++ b/data/tilesets/secondary/generic_building2/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/generic_building2/palettes/02.pal b/data/tilesets/secondary/generic_building2/palettes/02.pal new file mode 100644 index 000000000..cc3a9457d --- /dev/null +++ b/data/tilesets/secondary/generic_building2/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/generic_building2/palettes/03.pal b/data/tilesets/secondary/generic_building2/palettes/03.pal new file mode 100644 index 000000000..7ec794ae5 --- /dev/null +++ b/data/tilesets/secondary/generic_building2/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/generic_building2/palettes/04.pal b/data/tilesets/secondary/generic_building2/palettes/04.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/generic_building2/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/generic_building2/palettes/05.pal b/data/tilesets/secondary/generic_building2/palettes/05.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/generic_building2/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/generic_building2/palettes/06.pal b/data/tilesets/secondary/generic_building2/palettes/06.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/generic_building2/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/generic_building2/palettes/07.pal b/data/tilesets/secondary/generic_building2/palettes/07.pal new file mode 100644 index 000000000..c62a40b0d --- /dev/null +++ b/data/tilesets/secondary/generic_building2/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +148 172 139 +180 197 164 +213 222 197 +238 255 213 +115 156 180 +197 222 238 +123 197 189 +156 222 213 +213 255 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/generic_building2/palettes/08.pal b/data/tilesets/secondary/generic_building2/palettes/08.pal new file mode 100644 index 000000000..8c66b4998 --- /dev/null +++ b/data/tilesets/secondary/generic_building2/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +230 222 156 +189 98 74 +230 156 98 +213 205 156 +115 156 180 +246 238 189 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/generic_building2/palettes/09.pal b/data/tilesets/secondary/generic_building2/palettes/09.pal new file mode 100644 index 000000000..25d5d7019 --- /dev/null +++ b/data/tilesets/secondary/generic_building2/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +156 213 255 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +0 0 0 diff --git a/data/tilesets/secondary/generic_building2/palettes/1.pal b/data/tilesets/secondary/generic_building2/palettes/1.pal deleted file mode 100644 index d99adafff..000000000 --- a/data/tilesets/secondary/generic_building2/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/generic_building2/palettes/2.pal b/data/tilesets/secondary/generic_building2/palettes/2.pal deleted file mode 100644 index cc3a9457d..000000000 --- a/data/tilesets/secondary/generic_building2/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/generic_building2/palettes/3.pal b/data/tilesets/secondary/generic_building2/palettes/3.pal deleted file mode 100644 index 7ec794ae5..000000000 --- a/data/tilesets/secondary/generic_building2/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/generic_building2/palettes/4.pal b/data/tilesets/secondary/generic_building2/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/generic_building2/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/generic_building2/palettes/5.pal b/data/tilesets/secondary/generic_building2/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/generic_building2/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/generic_building2/palettes/6.pal b/data/tilesets/secondary/generic_building2/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/generic_building2/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/generic_building2/palettes/7.pal b/data/tilesets/secondary/generic_building2/palettes/7.pal deleted file mode 100644 index c62a40b0d..000000000 --- a/data/tilesets/secondary/generic_building2/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -148 172 139 -180 197 164 -213 222 197 -238 255 213 -115 156 180 -197 222 238 -123 197 189 -156 222 213 -213 255 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/generic_building2/palettes/8.pal b/data/tilesets/secondary/generic_building2/palettes/8.pal deleted file mode 100644 index 8c66b4998..000000000 --- a/data/tilesets/secondary/generic_building2/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -230 222 156 -189 98 74 -230 156 98 -213 205 156 -115 156 180 -246 238 189 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/generic_building2/palettes/9.pal b/data/tilesets/secondary/generic_building2/palettes/9.pal deleted file mode 100644 index 25d5d7019..000000000 --- a/data/tilesets/secondary/generic_building2/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -156 213 255 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -0 0 0 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/0.pal b/data/tilesets/secondary/hall_of_fame/palettes/0.pal deleted file mode 100644 index 8db07d418..000000000 --- a/data/tilesets/secondary/hall_of_fame/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/00.pal b/data/tilesets/secondary/hall_of_fame/palettes/00.pal new file mode 100644 index 000000000..8db07d418 --- /dev/null +++ b/data/tilesets/secondary/hall_of_fame/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/01.pal b/data/tilesets/secondary/hall_of_fame/palettes/01.pal new file mode 100644 index 000000000..66561f6d3 --- /dev/null +++ b/data/tilesets/secondary/hall_of_fame/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +139 180 222 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/02.pal b/data/tilesets/secondary/hall_of_fame/palettes/02.pal new file mode 100644 index 000000000..87a022102 --- /dev/null +++ b/data/tilesets/secondary/hall_of_fame/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +90 90 115 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/03.pal b/data/tilesets/secondary/hall_of_fame/palettes/03.pal new file mode 100644 index 000000000..783496dcd --- /dev/null +++ b/data/tilesets/secondary/hall_of_fame/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +65 98 156 +90 123 180 +115 156 197 +222 213 131 +164 164 172 +205 205 213 +238 238 246 +106 172 115 +156 205 139 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/04.pal b/data/tilesets/secondary/hall_of_fame/palettes/04.pal new file mode 100644 index 000000000..89eace605 --- /dev/null +++ b/data/tilesets/secondary/hall_of_fame/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 238 246 +172 197 180 +197 222 205 +90 189 172 +246 238 156 +205 189 131 +189 164 123 +148 131 106 +106 106 106 +213 222 230 +238 180 115 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/05.pal b/data/tilesets/secondary/hall_of_fame/palettes/05.pal new file mode 100644 index 000000000..c7780e5c7 --- /dev/null +++ b/data/tilesets/secondary/hall_of_fame/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +213 222 222 +164 180 189 +255 0 255 +131 115 74 +213 213 148 +197 189 139 +172 156 115 +148 131 90 +197 197 205 +205 82 65 +0 0 0 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/06.pal b/data/tilesets/secondary/hall_of_fame/palettes/06.pal new file mode 100644 index 000000000..1d08ce9a2 --- /dev/null +++ b/data/tilesets/secondary/hall_of_fame/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/07.pal b/data/tilesets/secondary/hall_of_fame/palettes/07.pal new file mode 100644 index 000000000..f0c97cf87 --- /dev/null +++ b/data/tilesets/secondary/hall_of_fame/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +156 189 255 +82 123 197 +49 90 156 +106 164 148 +82 139 123 +106 164 222 +222 230 148 +189 197 115 +90 148 197 +222 164 32 +189 230 255 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/08.pal b/data/tilesets/secondary/hall_of_fame/palettes/08.pal new file mode 100644 index 000000000..33b52bbbd --- /dev/null +++ b/data/tilesets/secondary/hall_of_fame/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +213 222 222 +180 197 213 +156 172 197 +230 106 90 +189 65 49 +255 131 115 +139 41 24 +197 255 205 +238 197 106 +255 255 213 +255 246 172 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/09.pal b/data/tilesets/secondary/hall_of_fame/palettes/09.pal new file mode 100644 index 000000000..3a2cf3b7a --- /dev/null +++ b/data/tilesets/secondary/hall_of_fame/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +139 222 148 +156 238 164 +197 255 205 +172 246 180 +238 238 197 +255 0 255 +255 0 255 +0 255 156 +189 65 49 +255 222 123 +246 197 0 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/1.pal b/data/tilesets/secondary/hall_of_fame/palettes/1.pal deleted file mode 100644 index 66561f6d3..000000000 --- a/data/tilesets/secondary/hall_of_fame/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -139 180 222 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/2.pal b/data/tilesets/secondary/hall_of_fame/palettes/2.pal deleted file mode 100644 index 87a022102..000000000 --- a/data/tilesets/secondary/hall_of_fame/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -90 90 115 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/3.pal b/data/tilesets/secondary/hall_of_fame/palettes/3.pal deleted file mode 100644 index 783496dcd..000000000 --- a/data/tilesets/secondary/hall_of_fame/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -65 98 156 -90 123 180 -115 156 197 -222 213 131 -164 164 172 -205 205 213 -238 238 246 -106 172 115 -156 205 139 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/4.pal b/data/tilesets/secondary/hall_of_fame/palettes/4.pal deleted file mode 100644 index 89eace605..000000000 --- a/data/tilesets/secondary/hall_of_fame/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 238 246 -172 197 180 -197 222 205 -90 189 172 -246 238 156 -205 189 131 -189 164 123 -148 131 106 -106 106 106 -213 222 230 -238 180 115 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/5.pal b/data/tilesets/secondary/hall_of_fame/palettes/5.pal deleted file mode 100644 index c7780e5c7..000000000 --- a/data/tilesets/secondary/hall_of_fame/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -213 222 222 -164 180 189 -255 0 255 -131 115 74 -213 213 148 -197 189 139 -172 156 115 -148 131 90 -197 197 205 -205 82 65 -0 0 0 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/6.pal b/data/tilesets/secondary/hall_of_fame/palettes/6.pal deleted file mode 100644 index 1d08ce9a2..000000000 --- a/data/tilesets/secondary/hall_of_fame/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/7.pal b/data/tilesets/secondary/hall_of_fame/palettes/7.pal deleted file mode 100644 index f0c97cf87..000000000 --- a/data/tilesets/secondary/hall_of_fame/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -156 189 255 -82 123 197 -49 90 156 -106 164 148 -82 139 123 -106 164 222 -222 230 148 -189 197 115 -90 148 197 -222 164 32 -189 230 255 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/8.pal b/data/tilesets/secondary/hall_of_fame/palettes/8.pal deleted file mode 100644 index 33b52bbbd..000000000 --- a/data/tilesets/secondary/hall_of_fame/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -213 222 222 -180 197 213 -156 172 197 -230 106 90 -189 65 49 -255 131 115 -139 41 24 -197 255 205 -238 197 106 -255 255 213 -255 246 172 diff --git a/data/tilesets/secondary/hall_of_fame/palettes/9.pal b/data/tilesets/secondary/hall_of_fame/palettes/9.pal deleted file mode 100644 index 3a2cf3b7a..000000000 --- a/data/tilesets/secondary/hall_of_fame/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -139 222 148 -156 238 164 -197 255 205 -172 246 180 -238 238 197 -255 0 255 -255 0 255 -0 255 156 -189 65 49 -255 222 123 -246 197 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/0.pal b/data/tilesets/secondary/hoenn_building/palettes/0.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/hoenn_building/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/00.pal b/data/tilesets/secondary/hoenn_building/palettes/00.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/hoenn_building/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/01.pal b/data/tilesets/secondary/hoenn_building/palettes/01.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/hoenn_building/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/02.pal b/data/tilesets/secondary/hoenn_building/palettes/02.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/hoenn_building/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/03.pal b/data/tilesets/secondary/hoenn_building/palettes/03.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/hoenn_building/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/04.pal b/data/tilesets/secondary/hoenn_building/palettes/04.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/hoenn_building/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/05.pal b/data/tilesets/secondary/hoenn_building/palettes/05.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/hoenn_building/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/06.pal b/data/tilesets/secondary/hoenn_building/palettes/06.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/hoenn_building/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/07.pal b/data/tilesets/secondary/hoenn_building/palettes/07.pal new file mode 100644 index 000000000..533778712 --- /dev/null +++ b/data/tilesets/secondary/hoenn_building/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +65 74 106 +139 139 139 +189 189 164 +255 255 255 +230 222 246 +255 238 213 +255 0 0 +115 115 164 +131 139 230 +164 164 255 +156 106 16 +115 115 139 +213 213 172 +222 172 82 +189 139 49 diff --git a/data/tilesets/secondary/hoenn_building/palettes/08.pal b/data/tilesets/secondary/hoenn_building/palettes/08.pal new file mode 100644 index 000000000..0b01f1a0f --- /dev/null +++ b/data/tilesets/secondary/hoenn_building/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +65 74 106 +139 139 148 +180 180 164 +255 255 255 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +172 90 49 +205 98 57 +246 139 98 +255 205 139 +255 0 0 +255 0 0 +255 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/09.pal b/data/tilesets/secondary/hoenn_building/palettes/09.pal new file mode 100644 index 000000000..371e5a211 --- /dev/null +++ b/data/tilesets/secondary/hoenn_building/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +65 74 106 +139 139 139 +189 189 164 +255 255 255 +230 222 246 +148 148 197 +189 189 246 +205 106 49 +246 180 49 +255 246 131 +255 0 0 +189 172 82 +213 205 98 +148 115 41 +172 139 57 diff --git a/data/tilesets/secondary/hoenn_building/palettes/1.pal b/data/tilesets/secondary/hoenn_building/palettes/1.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/hoenn_building/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/2.pal b/data/tilesets/secondary/hoenn_building/palettes/2.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/hoenn_building/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/3.pal b/data/tilesets/secondary/hoenn_building/palettes/3.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/hoenn_building/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/4.pal b/data/tilesets/secondary/hoenn_building/palettes/4.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/hoenn_building/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/5.pal b/data/tilesets/secondary/hoenn_building/palettes/5.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/hoenn_building/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/6.pal b/data/tilesets/secondary/hoenn_building/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/hoenn_building/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/7.pal b/data/tilesets/secondary/hoenn_building/palettes/7.pal deleted file mode 100644 index 533778712..000000000 --- a/data/tilesets/secondary/hoenn_building/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -65 74 106 -139 139 139 -189 189 164 -255 255 255 -230 222 246 -255 238 213 -255 0 0 -115 115 164 -131 139 230 -164 164 255 -156 106 16 -115 115 139 -213 213 172 -222 172 82 -189 139 49 diff --git a/data/tilesets/secondary/hoenn_building/palettes/8.pal b/data/tilesets/secondary/hoenn_building/palettes/8.pal deleted file mode 100644 index 0b01f1a0f..000000000 --- a/data/tilesets/secondary/hoenn_building/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -65 74 106 -139 139 148 -180 180 164 -255 255 255 -255 0 0 -255 0 0 -255 0 0 -255 0 0 -172 90 49 -205 98 57 -246 139 98 -255 205 139 -255 0 0 -255 0 0 -255 0 0 diff --git a/data/tilesets/secondary/hoenn_building/palettes/9.pal b/data/tilesets/secondary/hoenn_building/palettes/9.pal deleted file mode 100644 index 371e5a211..000000000 --- a/data/tilesets/secondary/hoenn_building/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -65 74 106 -139 139 139 -189 189 164 -255 255 255 -230 222 246 -148 148 197 -189 189 246 -205 106 49 -246 180 49 -255 246 131 -255 0 0 -189 172 82 -213 205 98 -148 115 41 -172 139 57 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/0.pal b/data/tilesets/secondary/indigo_plateau/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/indigo_plateau/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/00.pal b/data/tilesets/secondary/indigo_plateau/palettes/00.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/indigo_plateau/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/01.pal b/data/tilesets/secondary/indigo_plateau/palettes/01.pal new file mode 100644 index 000000000..cf1123812 --- /dev/null +++ b/data/tilesets/secondary/indigo_plateau/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/02.pal b/data/tilesets/secondary/indigo_plateau/palettes/02.pal new file mode 100644 index 000000000..372fb5d7c --- /dev/null +++ b/data/tilesets/secondary/indigo_plateau/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/03.pal b/data/tilesets/secondary/indigo_plateau/palettes/03.pal new file mode 100644 index 000000000..5a5e60211 --- /dev/null +++ b/data/tilesets/secondary/indigo_plateau/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/04.pal b/data/tilesets/secondary/indigo_plateau/palettes/04.pal new file mode 100644 index 000000000..229f9132c --- /dev/null +++ b/data/tilesets/secondary/indigo_plateau/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +222 230 255 +197 213 255 +164 197 238 +123 172 230 +90 148 197 +65 123 180 +90 164 205 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +32 98 139 +238 230 139 +222 197 139 +205 180 106 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/05.pal b/data/tilesets/secondary/indigo_plateau/palettes/05.pal new file mode 100644 index 000000000..215dd1272 --- /dev/null +++ b/data/tilesets/secondary/indigo_plateau/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/06.pal b/data/tilesets/secondary/indigo_plateau/palettes/06.pal new file mode 100644 index 000000000..7e7862a19 --- /dev/null +++ b/data/tilesets/secondary/indigo_plateau/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +222 230 255 +197 213 255 +164 197 238 +123 172 230 +41 82 164 +41 57 131 +74 123 197 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +32 98 139 +238 230 139 +222 197 139 +205 180 106 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/07.pal b/data/tilesets/secondary/indigo_plateau/palettes/07.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/indigo_plateau/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/08.pal b/data/tilesets/secondary/indigo_plateau/palettes/08.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/indigo_plateau/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/09.pal b/data/tilesets/secondary/indigo_plateau/palettes/09.pal new file mode 100644 index 000000000..3ff6139ac --- /dev/null +++ b/data/tilesets/secondary/indigo_plateau/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 205 65 +222 172 65 +180 98 0 +213 213 139 +189 189 115 +148 148 82 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/1.pal b/data/tilesets/secondary/indigo_plateau/palettes/1.pal deleted file mode 100644 index cf1123812..000000000 --- a/data/tilesets/secondary/indigo_plateau/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/2.pal b/data/tilesets/secondary/indigo_plateau/palettes/2.pal deleted file mode 100644 index 372fb5d7c..000000000 --- a/data/tilesets/secondary/indigo_plateau/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/3.pal b/data/tilesets/secondary/indigo_plateau/palettes/3.pal deleted file mode 100644 index 5a5e60211..000000000 --- a/data/tilesets/secondary/indigo_plateau/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/4.pal b/data/tilesets/secondary/indigo_plateau/palettes/4.pal deleted file mode 100644 index 229f9132c..000000000 --- a/data/tilesets/secondary/indigo_plateau/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -222 230 255 -197 213 255 -164 197 238 -123 172 230 -90 148 197 -65 123 180 -90 164 205 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -32 98 139 -238 230 139 -222 197 139 -205 180 106 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/5.pal b/data/tilesets/secondary/indigo_plateau/palettes/5.pal deleted file mode 100644 index 215dd1272..000000000 --- a/data/tilesets/secondary/indigo_plateau/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/6.pal b/data/tilesets/secondary/indigo_plateau/palettes/6.pal deleted file mode 100644 index 7e7862a19..000000000 --- a/data/tilesets/secondary/indigo_plateau/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -222 230 255 -197 213 255 -164 197 238 -123 172 230 -41 82 164 -41 57 131 -74 123 197 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -32 98 139 -238 230 139 -222 197 139 -205 180 106 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/7.pal b/data/tilesets/secondary/indigo_plateau/palettes/7.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/indigo_plateau/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/8.pal b/data/tilesets/secondary/indigo_plateau/palettes/8.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/indigo_plateau/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/indigo_plateau/palettes/9.pal b/data/tilesets/secondary/indigo_plateau/palettes/9.pal deleted file mode 100644 index 3ff6139ac..000000000 --- a/data/tilesets/secondary/indigo_plateau/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 205 65 -222 172 65 -180 98 0 -213 213 139 -189 189 115 -148 148 82 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/island_harbor/palettes/0.pal b/data/tilesets/secondary/island_harbor/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/island_harbor/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/island_harbor/palettes/00.pal b/data/tilesets/secondary/island_harbor/palettes/00.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/island_harbor/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/island_harbor/palettes/01.pal b/data/tilesets/secondary/island_harbor/palettes/01.pal new file mode 100644 index 000000000..22eb1667c --- /dev/null +++ b/data/tilesets/secondary/island_harbor/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +123 123 131 +65 49 65 +230 238 238 +90 189 139 +90 90 115 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/island_harbor/palettes/02.pal b/data/tilesets/secondary/island_harbor/palettes/02.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/island_harbor/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/island_harbor/palettes/03.pal b/data/tilesets/secondary/island_harbor/palettes/03.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/secondary/island_harbor/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/island_harbor/palettes/04.pal b/data/tilesets/secondary/island_harbor/palettes/04.pal new file mode 100644 index 000000000..5871a448c --- /dev/null +++ b/data/tilesets/secondary/island_harbor/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +230 246 255 +189 222 255 +139 189 255 +115 164 255 +65 139 222 +57 115 222 +82 148 230 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +49 115 197 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/island_harbor/palettes/05.pal b/data/tilesets/secondary/island_harbor/palettes/05.pal new file mode 100644 index 000000000..c5a653979 --- /dev/null +++ b/data/tilesets/secondary/island_harbor/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/island_harbor/palettes/06.pal b/data/tilesets/secondary/island_harbor/palettes/06.pal new file mode 100644 index 000000000..9bad44649 --- /dev/null +++ b/data/tilesets/secondary/island_harbor/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +205 230 246 +180 213 255 +123 180 246 +98 148 230 +65 123 189 +49 98 180 +82 131 222 +213 230 238 +172 189 205 +123 123 131 +90 90 115 +238 246 246 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/island_harbor/palettes/07.pal b/data/tilesets/secondary/island_harbor/palettes/07.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/island_harbor/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/island_harbor/palettes/08.pal b/data/tilesets/secondary/island_harbor/palettes/08.pal new file mode 100644 index 000000000..5c1251024 --- /dev/null +++ b/data/tilesets/secondary/island_harbor/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +172 172 164 +205 213 213 +180 189 189 +148 156 156 +106 115 115 +197 246 230 +106 205 164 +57 156 115 +222 106 98 +222 213 123 +255 180 148 +197 189 98 +238 246 255 diff --git a/data/tilesets/secondary/island_harbor/palettes/09.pal b/data/tilesets/secondary/island_harbor/palettes/09.pal new file mode 100644 index 000000000..c25501332 --- /dev/null +++ b/data/tilesets/secondary/island_harbor/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +65 123 180 +238 246 255 +222 230 238 +189 205 230 +156 164 189 +139 139 156 +98 98 123 +57 57 106 +197 98 98 +172 65 106 +32 74 156 +197 148 0 +246 213 24 +222 238 255 +255 255 255 +74 106 139 diff --git a/data/tilesets/secondary/island_harbor/palettes/1.pal b/data/tilesets/secondary/island_harbor/palettes/1.pal deleted file mode 100644 index 22eb1667c..000000000 --- a/data/tilesets/secondary/island_harbor/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -123 123 131 -65 49 65 -230 238 238 -90 189 139 -90 90 115 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/island_harbor/palettes/2.pal b/data/tilesets/secondary/island_harbor/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/island_harbor/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/island_harbor/palettes/3.pal b/data/tilesets/secondary/island_harbor/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/secondary/island_harbor/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/island_harbor/palettes/4.pal b/data/tilesets/secondary/island_harbor/palettes/4.pal deleted file mode 100644 index 5871a448c..000000000 --- a/data/tilesets/secondary/island_harbor/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -230 246 255 -189 222 255 -139 189 255 -115 164 255 -65 139 222 -57 115 222 -82 148 230 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -49 115 197 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/island_harbor/palettes/5.pal b/data/tilesets/secondary/island_harbor/palettes/5.pal deleted file mode 100644 index c5a653979..000000000 --- a/data/tilesets/secondary/island_harbor/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/island_harbor/palettes/6.pal b/data/tilesets/secondary/island_harbor/palettes/6.pal deleted file mode 100644 index 9bad44649..000000000 --- a/data/tilesets/secondary/island_harbor/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -205 230 246 -180 213 255 -123 180 246 -98 148 230 -65 123 189 -49 98 180 -82 131 222 -213 230 238 -172 189 205 -123 123 131 -90 90 115 -238 246 246 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/island_harbor/palettes/7.pal b/data/tilesets/secondary/island_harbor/palettes/7.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/island_harbor/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/island_harbor/palettes/8.pal b/data/tilesets/secondary/island_harbor/palettes/8.pal deleted file mode 100644 index 5c1251024..000000000 --- a/data/tilesets/secondary/island_harbor/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -172 172 164 -205 213 213 -180 189 189 -148 156 156 -106 115 115 -197 246 230 -106 205 164 -57 156 115 -222 106 98 -222 213 123 -255 180 148 -197 189 98 -238 246 255 diff --git a/data/tilesets/secondary/island_harbor/palettes/9.pal b/data/tilesets/secondary/island_harbor/palettes/9.pal deleted file mode 100644 index c25501332..000000000 --- a/data/tilesets/secondary/island_harbor/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -65 123 180 -238 246 255 -222 230 238 -189 205 230 -156 164 189 -139 139 156 -98 98 123 -57 57 106 -197 98 98 -172 65 106 -32 74 156 -197 148 0 -246 213 24 -222 238 255 -255 255 255 -74 106 139 diff --git a/data/tilesets/secondary/lab/palettes/0.pal b/data/tilesets/secondary/lab/palettes/0.pal deleted file mode 100644 index 9fc16da3b..000000000 --- a/data/tilesets/secondary/lab/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -238 238 246 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/lab/palettes/00.pal b/data/tilesets/secondary/lab/palettes/00.pal new file mode 100644 index 000000000..9fc16da3b --- /dev/null +++ b/data/tilesets/secondary/lab/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +238 238 246 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/lab/palettes/01.pal b/data/tilesets/secondary/lab/palettes/01.pal new file mode 100644 index 000000000..76403e6d6 --- /dev/null +++ b/data/tilesets/secondary/lab/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +139 180 222 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/lab/palettes/02.pal b/data/tilesets/secondary/lab/palettes/02.pal new file mode 100644 index 000000000..b1ecd71dc --- /dev/null +++ b/data/tilesets/secondary/lab/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +90 90 115 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/lab/palettes/03.pal b/data/tilesets/secondary/lab/palettes/03.pal new file mode 100644 index 000000000..43d9b60e3 --- /dev/null +++ b/data/tilesets/secondary/lab/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +65 98 156 +90 123 180 +115 156 197 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +106 172 115 +156 205 139 diff --git a/data/tilesets/secondary/lab/palettes/04.pal b/data/tilesets/secondary/lab/palettes/04.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/lab/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/lab/palettes/05.pal b/data/tilesets/secondary/lab/palettes/05.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/lab/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/lab/palettes/06.pal b/data/tilesets/secondary/lab/palettes/06.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/lab/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/lab/palettes/07.pal b/data/tilesets/secondary/lab/palettes/07.pal new file mode 100644 index 000000000..3d7f8bd89 --- /dev/null +++ b/data/tilesets/secondary/lab/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +139 131 148 +180 172 180 +189 197 213 +255 255 255 +255 205 139 +230 164 98 +197 131 65 +172 90 24 +82 148 197 +131 189 222 +189 230 255 +123 123 123 +197 180 74 +246 238 148 diff --git a/data/tilesets/secondary/lab/palettes/08.pal b/data/tilesets/secondary/lab/palettes/08.pal new file mode 100644 index 000000000..7fce49d06 --- /dev/null +++ b/data/tilesets/secondary/lab/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +139 131 148 +180 172 180 +189 197 213 +255 255 255 +222 222 180 +197 197 148 +156 156 106 +230 164 98 +172 90 24 +172 164 65 +139 123 24 +246 238 148 +0 0 0 +246 238 148 diff --git a/data/tilesets/secondary/lab/palettes/09.pal b/data/tilesets/secondary/lab/palettes/09.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/lab/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/lab/palettes/1.pal b/data/tilesets/secondary/lab/palettes/1.pal deleted file mode 100644 index 76403e6d6..000000000 --- a/data/tilesets/secondary/lab/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -139 180 222 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/lab/palettes/2.pal b/data/tilesets/secondary/lab/palettes/2.pal deleted file mode 100644 index b1ecd71dc..000000000 --- a/data/tilesets/secondary/lab/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -90 90 115 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/lab/palettes/3.pal b/data/tilesets/secondary/lab/palettes/3.pal deleted file mode 100644 index 43d9b60e3..000000000 --- a/data/tilesets/secondary/lab/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -65 98 156 -90 123 180 -115 156 197 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -106 172 115 -156 205 139 diff --git a/data/tilesets/secondary/lab/palettes/4.pal b/data/tilesets/secondary/lab/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/lab/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/lab/palettes/5.pal b/data/tilesets/secondary/lab/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/lab/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/lab/palettes/6.pal b/data/tilesets/secondary/lab/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/lab/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/lab/palettes/7.pal b/data/tilesets/secondary/lab/palettes/7.pal deleted file mode 100644 index 3d7f8bd89..000000000 --- a/data/tilesets/secondary/lab/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -139 131 148 -180 172 180 -189 197 213 -255 255 255 -255 205 139 -230 164 98 -197 131 65 -172 90 24 -82 148 197 -131 189 222 -189 230 255 -123 123 123 -197 180 74 -246 238 148 diff --git a/data/tilesets/secondary/lab/palettes/8.pal b/data/tilesets/secondary/lab/palettes/8.pal deleted file mode 100644 index 7fce49d06..000000000 --- a/data/tilesets/secondary/lab/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -139 131 148 -180 172 180 -189 197 213 -255 255 255 -222 222 180 -197 197 148 -156 156 106 -230 164 98 -172 90 24 -172 164 65 -139 123 24 -246 238 148 -0 0 0 -246 238 148 diff --git a/data/tilesets/secondary/lab/palettes/9.pal b/data/tilesets/secondary/lab/palettes/9.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/lab/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/lavender_town/palettes/0.pal b/data/tilesets/secondary/lavender_town/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/lavender_town/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/lavender_town/palettes/00.pal b/data/tilesets/secondary/lavender_town/palettes/00.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/lavender_town/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/lavender_town/palettes/01.pal b/data/tilesets/secondary/lavender_town/palettes/01.pal new file mode 100644 index 000000000..d8a4e7757 --- /dev/null +++ b/data/tilesets/secondary/lavender_town/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/lavender_town/palettes/02.pal b/data/tilesets/secondary/lavender_town/palettes/02.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/lavender_town/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/lavender_town/palettes/03.pal b/data/tilesets/secondary/lavender_town/palettes/03.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/secondary/lavender_town/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/lavender_town/palettes/04.pal b/data/tilesets/secondary/lavender_town/palettes/04.pal new file mode 100644 index 000000000..07dcd957c --- /dev/null +++ b/data/tilesets/secondary/lavender_town/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 255 255 +172 222 255 +148 189 238 +106 156 230 +57 148 197 +32 131 172 +82 148 213 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +230 213 148 +238 230 139 +222 197 139 +213 189 106 diff --git a/data/tilesets/secondary/lavender_town/palettes/05.pal b/data/tilesets/secondary/lavender_town/palettes/05.pal new file mode 100644 index 000000000..c5a653979 --- /dev/null +++ b/data/tilesets/secondary/lavender_town/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/lavender_town/palettes/06.pal b/data/tilesets/secondary/lavender_town/palettes/06.pal new file mode 100644 index 000000000..0dba59a72 --- /dev/null +++ b/data/tilesets/secondary/lavender_town/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +222 255 255 +172 222 255 +148 189 238 +106 156 230 +41 90 172 +41 57 148 +74 123 197 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +230 213 148 +238 230 139 +222 197 139 +213 189 106 diff --git a/data/tilesets/secondary/lavender_town/palettes/07.pal b/data/tilesets/secondary/lavender_town/palettes/07.pal new file mode 100644 index 000000000..93518605a --- /dev/null +++ b/data/tilesets/secondary/lavender_town/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/lavender_town/palettes/08.pal b/data/tilesets/secondary/lavender_town/palettes/08.pal new file mode 100644 index 000000000..376749664 --- /dev/null +++ b/data/tilesets/secondary/lavender_town/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +115 205 164 +148 164 180 +123 123 131 +65 74 106 +205 82 74 +172 32 41 +255 246 189 +238 230 156 +222 205 131 +189 164 90 +148 131 49 +123 90 24 +123 123 131 +65 74 106 +205 222 238 diff --git a/data/tilesets/secondary/lavender_town/palettes/09.pal b/data/tilesets/secondary/lavender_town/palettes/09.pal new file mode 100644 index 000000000..82b469a66 --- /dev/null +++ b/data/tilesets/secondary/lavender_town/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +255 255 255 +230 246 238 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +172 172 106 +213 213 148 +180 205 180 +148 180 148 +131 164 131 +106 139 106 +197 222 197 +139 172 139 +90 115 90 diff --git a/data/tilesets/secondary/lavender_town/palettes/1.pal b/data/tilesets/secondary/lavender_town/palettes/1.pal deleted file mode 100644 index d8a4e7757..000000000 --- a/data/tilesets/secondary/lavender_town/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/lavender_town/palettes/2.pal b/data/tilesets/secondary/lavender_town/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/lavender_town/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/lavender_town/palettes/3.pal b/data/tilesets/secondary/lavender_town/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/secondary/lavender_town/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/lavender_town/palettes/4.pal b/data/tilesets/secondary/lavender_town/palettes/4.pal deleted file mode 100644 index 07dcd957c..000000000 --- a/data/tilesets/secondary/lavender_town/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 255 255 -172 222 255 -148 189 238 -106 156 230 -57 148 197 -32 131 172 -82 148 213 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -230 213 148 -238 230 139 -222 197 139 -213 189 106 diff --git a/data/tilesets/secondary/lavender_town/palettes/5.pal b/data/tilesets/secondary/lavender_town/palettes/5.pal deleted file mode 100644 index c5a653979..000000000 --- a/data/tilesets/secondary/lavender_town/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/lavender_town/palettes/6.pal b/data/tilesets/secondary/lavender_town/palettes/6.pal deleted file mode 100644 index 0dba59a72..000000000 --- a/data/tilesets/secondary/lavender_town/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -222 255 255 -172 222 255 -148 189 238 -106 156 230 -41 90 172 -41 57 148 -74 123 197 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -230 213 148 -238 230 139 -222 197 139 -213 189 106 diff --git a/data/tilesets/secondary/lavender_town/palettes/7.pal b/data/tilesets/secondary/lavender_town/palettes/7.pal deleted file mode 100644 index 93518605a..000000000 --- a/data/tilesets/secondary/lavender_town/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/lavender_town/palettes/8.pal b/data/tilesets/secondary/lavender_town/palettes/8.pal deleted file mode 100644 index 376749664..000000000 --- a/data/tilesets/secondary/lavender_town/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -115 205 164 -148 164 180 -123 123 131 -65 74 106 -205 82 74 -172 32 41 -255 246 189 -238 230 156 -222 205 131 -189 164 90 -148 131 49 -123 90 24 -123 123 131 -65 74 106 -205 222 238 diff --git a/data/tilesets/secondary/lavender_town/palettes/9.pal b/data/tilesets/secondary/lavender_town/palettes/9.pal deleted file mode 100644 index 82b469a66..000000000 --- a/data/tilesets/secondary/lavender_town/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -255 255 255 -230 246 238 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -172 172 106 -213 213 148 -180 205 180 -148 180 148 -131 164 131 -106 139 106 -197 222 197 -139 172 139 -90 115 90 diff --git a/data/tilesets/secondary/mart/palettes/0.pal b/data/tilesets/secondary/mart/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/mart/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/mart/palettes/00.pal b/data/tilesets/secondary/mart/palettes/00.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/mart/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/mart/palettes/01.pal b/data/tilesets/secondary/mart/palettes/01.pal new file mode 100644 index 000000000..3a16a45c7 --- /dev/null +++ b/data/tilesets/secondary/mart/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +238 246 238 diff --git a/data/tilesets/secondary/mart/palettes/02.pal b/data/tilesets/secondary/mart/palettes/02.pal new file mode 100644 index 000000000..cc3a9457d --- /dev/null +++ b/data/tilesets/secondary/mart/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/mart/palettes/03.pal b/data/tilesets/secondary/mart/palettes/03.pal new file mode 100644 index 000000000..e1b56cd57 --- /dev/null +++ b/data/tilesets/secondary/mart/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +164 172 164 +180 189 189 +238 246 246 +238 246 238 +213 230 222 +197 205 197 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/mart/palettes/04.pal b/data/tilesets/secondary/mart/palettes/04.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/mart/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/mart/palettes/05.pal b/data/tilesets/secondary/mart/palettes/05.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/mart/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/mart/palettes/06.pal b/data/tilesets/secondary/mart/palettes/06.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/mart/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/mart/palettes/07.pal b/data/tilesets/secondary/mart/palettes/07.pal new file mode 100644 index 000000000..0a07057ec --- /dev/null +++ b/data/tilesets/secondary/mart/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/mart/palettes/08.pal b/data/tilesets/secondary/mart/palettes/08.pal new file mode 100644 index 000000000..06fcc911b --- /dev/null +++ b/data/tilesets/secondary/mart/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +115 189 139 +172 230 172 +205 246 205 +0 0 0 diff --git a/data/tilesets/secondary/mart/palettes/09.pal b/data/tilesets/secondary/mart/palettes/09.pal new file mode 100644 index 000000000..ea018609b --- /dev/null +++ b/data/tilesets/secondary/mart/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +164 172 164 +180 189 189 +238 246 246 +238 246 238 +213 230 222 +197 205 197 +255 0 255 +255 0 255 +156 205 255 +106 164 238 +74 139 230 +57 131 205 +41 98 189 +255 0 255 diff --git a/data/tilesets/secondary/mart/palettes/1.pal b/data/tilesets/secondary/mart/palettes/1.pal deleted file mode 100644 index 3a16a45c7..000000000 --- a/data/tilesets/secondary/mart/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -238 246 238 diff --git a/data/tilesets/secondary/mart/palettes/2.pal b/data/tilesets/secondary/mart/palettes/2.pal deleted file mode 100644 index cc3a9457d..000000000 --- a/data/tilesets/secondary/mart/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/mart/palettes/3.pal b/data/tilesets/secondary/mart/palettes/3.pal deleted file mode 100644 index e1b56cd57..000000000 --- a/data/tilesets/secondary/mart/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -164 172 164 -180 189 189 -238 246 246 -238 246 238 -213 230 222 -197 205 197 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/mart/palettes/4.pal b/data/tilesets/secondary/mart/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/mart/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/mart/palettes/5.pal b/data/tilesets/secondary/mart/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/mart/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/mart/palettes/6.pal b/data/tilesets/secondary/mart/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/mart/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/mart/palettes/7.pal b/data/tilesets/secondary/mart/palettes/7.pal deleted file mode 100644 index 0a07057ec..000000000 --- a/data/tilesets/secondary/mart/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/mart/palettes/8.pal b/data/tilesets/secondary/mart/palettes/8.pal deleted file mode 100644 index 06fcc911b..000000000 --- a/data/tilesets/secondary/mart/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -115 189 139 -172 230 172 -205 246 205 -0 0 0 diff --git a/data/tilesets/secondary/mart/palettes/9.pal b/data/tilesets/secondary/mart/palettes/9.pal deleted file mode 100644 index ea018609b..000000000 --- a/data/tilesets/secondary/mart/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -164 172 164 -180 189 189 -238 246 246 -238 246 238 -213 230 222 -197 205 197 -255 0 255 -255 0 255 -156 205 255 -106 164 238 -74 139 230 -57 131 205 -41 98 189 -255 0 255 diff --git a/data/tilesets/secondary/mt_ember/palettes/0.pal b/data/tilesets/secondary/mt_ember/palettes/0.pal deleted file mode 100644 index 30ff4070a..000000000 --- a/data/tilesets/secondary/mt_ember/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/mt_ember/palettes/00.pal b/data/tilesets/secondary/mt_ember/palettes/00.pal new file mode 100644 index 000000000..30ff4070a --- /dev/null +++ b/data/tilesets/secondary/mt_ember/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/mt_ember/palettes/01.pal b/data/tilesets/secondary/mt_ember/palettes/01.pal new file mode 100644 index 000000000..e15d979f1 --- /dev/null +++ b/data/tilesets/secondary/mt_ember/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +222 230 230 +197 205 213 +172 189 205 +123 123 131 +65 49 65 +230 238 238 +90 189 139 +90 90 115 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/mt_ember/palettes/02.pal b/data/tilesets/secondary/mt_ember/palettes/02.pal new file mode 100644 index 000000000..372fb5d7c --- /dev/null +++ b/data/tilesets/secondary/mt_ember/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/mt_ember/palettes/03.pal b/data/tilesets/secondary/mt_ember/palettes/03.pal new file mode 100644 index 000000000..973765509 --- /dev/null +++ b/data/tilesets/secondary/mt_ember/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/mt_ember/palettes/04.pal b/data/tilesets/secondary/mt_ember/palettes/04.pal new file mode 100644 index 000000000..91fdcabdf --- /dev/null +++ b/data/tilesets/secondary/mt_ember/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +213 238 255 +172 205 255 +139 180 238 +106 156 230 +74 139 189 +65 123 189 +82 139 205 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +49 115 172 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/mt_ember/palettes/05.pal b/data/tilesets/secondary/mt_ember/palettes/05.pal new file mode 100644 index 000000000..0edb843f5 --- /dev/null +++ b/data/tilesets/secondary/mt_ember/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/mt_ember/palettes/06.pal b/data/tilesets/secondary/mt_ember/palettes/06.pal new file mode 100644 index 000000000..32afdccbb --- /dev/null +++ b/data/tilesets/secondary/mt_ember/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +213 238 255 +172 205 255 +139 180 238 +106 156 230 +65 123 172 +41 98 156 +74 115 197 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +49 115 172 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/mt_ember/palettes/07.pal b/data/tilesets/secondary/mt_ember/palettes/07.pal new file mode 100644 index 000000000..fa9d5d633 --- /dev/null +++ b/data/tilesets/secondary/mt_ember/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +172 123 123 +139 98 98 +115 74 74 +90 49 49 +65 24 24 +41 0 0 +41 41 49 diff --git a/data/tilesets/secondary/mt_ember/palettes/08.pal b/data/tilesets/secondary/mt_ember/palettes/08.pal new file mode 100644 index 000000000..f4a797b87 --- /dev/null +++ b/data/tilesets/secondary/mt_ember/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +197 197 180 +172 172 156 +148 148 123 +123 123 106 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +213 172 172 +197 156 148 +172 123 123 +131 82 74 +115 49 49 +90 24 24 +90 90 98 diff --git a/data/tilesets/secondary/mt_ember/palettes/09.pal b/data/tilesets/secondary/mt_ember/palettes/09.pal new file mode 100644 index 000000000..0a2109195 --- /dev/null +++ b/data/tilesets/secondary/mt_ember/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +197 197 180 +172 172 156 +148 148 123 +123 123 106 +255 238 164 +230 197 139 +205 172 123 +164 123 90 +148 115 74 +106 65 41 +74 74 57 +0 0 0 +98 139 197 +74 115 172 +57 98 156 diff --git a/data/tilesets/secondary/mt_ember/palettes/1.pal b/data/tilesets/secondary/mt_ember/palettes/1.pal deleted file mode 100644 index e15d979f1..000000000 --- a/data/tilesets/secondary/mt_ember/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -222 230 230 -197 205 213 -172 189 205 -123 123 131 -65 49 65 -230 238 238 -90 189 139 -90 90 115 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/mt_ember/palettes/2.pal b/data/tilesets/secondary/mt_ember/palettes/2.pal deleted file mode 100644 index 372fb5d7c..000000000 --- a/data/tilesets/secondary/mt_ember/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/mt_ember/palettes/3.pal b/data/tilesets/secondary/mt_ember/palettes/3.pal deleted file mode 100644 index 973765509..000000000 --- a/data/tilesets/secondary/mt_ember/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/mt_ember/palettes/4.pal b/data/tilesets/secondary/mt_ember/palettes/4.pal deleted file mode 100644 index 91fdcabdf..000000000 --- a/data/tilesets/secondary/mt_ember/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -213 238 255 -172 205 255 -139 180 238 -106 156 230 -74 139 189 -65 123 189 -82 139 205 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -49 115 172 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/mt_ember/palettes/5.pal b/data/tilesets/secondary/mt_ember/palettes/5.pal deleted file mode 100644 index 0edb843f5..000000000 --- a/data/tilesets/secondary/mt_ember/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/mt_ember/palettes/6.pal b/data/tilesets/secondary/mt_ember/palettes/6.pal deleted file mode 100644 index 32afdccbb..000000000 --- a/data/tilesets/secondary/mt_ember/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -213 238 255 -172 205 255 -139 180 238 -106 156 230 -65 123 172 -41 98 156 -74 115 197 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -49 115 172 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/mt_ember/palettes/7.pal b/data/tilesets/secondary/mt_ember/palettes/7.pal deleted file mode 100644 index fa9d5d633..000000000 --- a/data/tilesets/secondary/mt_ember/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -172 123 123 -139 98 98 -115 74 74 -90 49 49 -65 24 24 -41 0 0 -41 41 49 diff --git a/data/tilesets/secondary/mt_ember/palettes/8.pal b/data/tilesets/secondary/mt_ember/palettes/8.pal deleted file mode 100644 index f4a797b87..000000000 --- a/data/tilesets/secondary/mt_ember/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -197 197 180 -172 172 156 -148 148 123 -123 123 106 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -213 172 172 -197 156 148 -172 123 123 -131 82 74 -115 49 49 -90 24 24 -90 90 98 diff --git a/data/tilesets/secondary/mt_ember/palettes/9.pal b/data/tilesets/secondary/mt_ember/palettes/9.pal deleted file mode 100644 index 0a2109195..000000000 --- a/data/tilesets/secondary/mt_ember/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -197 197 180 -172 172 156 -148 148 123 -123 123 106 -255 238 164 -230 197 139 -205 172 123 -164 123 90 -148 115 74 -106 65 41 -74 74 57 -0 0 0 -98 139 197 -74 115 172 -57 98 156 diff --git a/data/tilesets/secondary/museum/palettes/0.pal b/data/tilesets/secondary/museum/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/museum/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/museum/palettes/00.pal b/data/tilesets/secondary/museum/palettes/00.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/museum/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/museum/palettes/01.pal b/data/tilesets/secondary/museum/palettes/01.pal new file mode 100644 index 000000000..69f3f0b9e --- /dev/null +++ b/data/tilesets/secondary/museum/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +180 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +238 246 238 diff --git a/data/tilesets/secondary/museum/palettes/02.pal b/data/tilesets/secondary/museum/palettes/02.pal new file mode 100644 index 000000000..330e35b02 --- /dev/null +++ b/data/tilesets/secondary/museum/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +213 131 82 +156 205 246 +98 156 238 +57 123 222 +222 139 106 +189 98 74 diff --git a/data/tilesets/secondary/museum/palettes/03.pal b/data/tilesets/secondary/museum/palettes/03.pal new file mode 100644 index 000000000..1520bed0b --- /dev/null +++ b/data/tilesets/secondary/museum/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +148 148 148 +180 180 180 +255 255 255 +238 246 238 +222 238 222 +197 205 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +90 90 90 +115 106 98 +148 123 98 diff --git a/data/tilesets/secondary/museum/palettes/04.pal b/data/tilesets/secondary/museum/palettes/04.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/museum/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/museum/palettes/05.pal b/data/tilesets/secondary/museum/palettes/05.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/museum/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/museum/palettes/06.pal b/data/tilesets/secondary/museum/palettes/06.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/museum/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/museum/palettes/07.pal b/data/tilesets/secondary/museum/palettes/07.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/museum/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/museum/palettes/08.pal b/data/tilesets/secondary/museum/palettes/08.pal new file mode 100644 index 000000000..223737ab6 --- /dev/null +++ b/data/tilesets/secondary/museum/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +106 98 74 +139 123 74 +164 139 74 +222 205 74 +123 123 123 +189 197 205 +238 246 238 +98 90 98 +156 131 106 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/museum/palettes/09.pal b/data/tilesets/secondary/museum/palettes/09.pal new file mode 100644 index 000000000..6de173f90 --- /dev/null +++ b/data/tilesets/secondary/museum/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +98 98 74 +164 139 82 +222 205 74 +255 0 255 +255 0 255 +213 213 156 +222 230 172 +246 246 238 +90 90 98 +115 115 106 +156 131 106 +205 131 82 +238 164 106 diff --git a/data/tilesets/secondary/museum/palettes/1.pal b/data/tilesets/secondary/museum/palettes/1.pal deleted file mode 100644 index 69f3f0b9e..000000000 --- a/data/tilesets/secondary/museum/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -180 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -238 246 238 diff --git a/data/tilesets/secondary/museum/palettes/2.pal b/data/tilesets/secondary/museum/palettes/2.pal deleted file mode 100644 index 330e35b02..000000000 --- a/data/tilesets/secondary/museum/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -213 131 82 -156 205 246 -98 156 238 -57 123 222 -222 139 106 -189 98 74 diff --git a/data/tilesets/secondary/museum/palettes/3.pal b/data/tilesets/secondary/museum/palettes/3.pal deleted file mode 100644 index 1520bed0b..000000000 --- a/data/tilesets/secondary/museum/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -148 148 148 -180 180 180 -255 255 255 -238 246 238 -222 238 222 -197 205 197 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -90 90 90 -115 106 98 -148 123 98 diff --git a/data/tilesets/secondary/museum/palettes/4.pal b/data/tilesets/secondary/museum/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/museum/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/museum/palettes/5.pal b/data/tilesets/secondary/museum/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/museum/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/museum/palettes/6.pal b/data/tilesets/secondary/museum/palettes/6.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/museum/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/museum/palettes/7.pal b/data/tilesets/secondary/museum/palettes/7.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/museum/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/museum/palettes/8.pal b/data/tilesets/secondary/museum/palettes/8.pal deleted file mode 100644 index 223737ab6..000000000 --- a/data/tilesets/secondary/museum/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -106 98 74 -139 123 74 -164 139 74 -222 205 74 -123 123 123 -189 197 205 -238 246 238 -98 90 98 -156 131 106 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/museum/palettes/9.pal b/data/tilesets/secondary/museum/palettes/9.pal deleted file mode 100644 index 6de173f90..000000000 --- a/data/tilesets/secondary/museum/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -98 98 74 -164 139 82 -222 205 74 -255 0 255 -255 0 255 -213 213 156 -222 230 172 -246 246 238 -90 90 98 -115 115 106 -156 131 106 -205 131 82 -238 164 106 diff --git a/data/tilesets/secondary/navel_rock/palettes/0.pal b/data/tilesets/secondary/navel_rock/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/navel_rock/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/navel_rock/palettes/00.pal b/data/tilesets/secondary/navel_rock/palettes/00.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/navel_rock/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/navel_rock/palettes/01.pal b/data/tilesets/secondary/navel_rock/palettes/01.pal new file mode 100644 index 000000000..d8a4e7757 --- /dev/null +++ b/data/tilesets/secondary/navel_rock/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/navel_rock/palettes/02.pal b/data/tilesets/secondary/navel_rock/palettes/02.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/navel_rock/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/navel_rock/palettes/03.pal b/data/tilesets/secondary/navel_rock/palettes/03.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/secondary/navel_rock/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/navel_rock/palettes/04.pal b/data/tilesets/secondary/navel_rock/palettes/04.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/navel_rock/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/navel_rock/palettes/05.pal b/data/tilesets/secondary/navel_rock/palettes/05.pal new file mode 100644 index 000000000..c5a653979 --- /dev/null +++ b/data/tilesets/secondary/navel_rock/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/navel_rock/palettes/06.pal b/data/tilesets/secondary/navel_rock/palettes/06.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/navel_rock/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/navel_rock/palettes/07.pal b/data/tilesets/secondary/navel_rock/palettes/07.pal new file mode 100644 index 000000000..364379ad9 --- /dev/null +++ b/data/tilesets/secondary/navel_rock/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +255 0 255 +197 213 205 +180 197 189 +164 172 172 +131 148 139 +255 0 255 +246 205 74 +255 0 255 +180 189 197 +180 189 197 +189 197 197 +164 172 172 +131 139 139 +106 106 106 +90 90 82 diff --git a/data/tilesets/secondary/navel_rock/palettes/08.pal b/data/tilesets/secondary/navel_rock/palettes/08.pal new file mode 100644 index 000000000..102aaaf2c --- /dev/null +++ b/data/tilesets/secondary/navel_rock/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +255 0 255 +197 213 205 +180 197 189 +164 172 172 +131 148 139 +255 0 255 +255 0 255 +255 0 255 +255 255 255 +255 255 255 +246 246 238 +222 222 213 +189 189 180 +156 156 139 +98 98 90 diff --git a/data/tilesets/secondary/navel_rock/palettes/09.pal b/data/tilesets/secondary/navel_rock/palettes/09.pal new file mode 100644 index 000000000..91329f82e --- /dev/null +++ b/data/tilesets/secondary/navel_rock/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +238 238 164 +197 213 205 +180 197 189 +164 172 172 +205 205 106 +205 205 197 +172 172 90 +123 131 74 +82 90 32 +106 106 82 +74 74 74 +0 0 0 +98 139 197 +74 115 172 +57 98 156 diff --git a/data/tilesets/secondary/navel_rock/palettes/1.pal b/data/tilesets/secondary/navel_rock/palettes/1.pal deleted file mode 100644 index d8a4e7757..000000000 --- a/data/tilesets/secondary/navel_rock/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/navel_rock/palettes/2.pal b/data/tilesets/secondary/navel_rock/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/navel_rock/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/navel_rock/palettes/3.pal b/data/tilesets/secondary/navel_rock/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/secondary/navel_rock/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/navel_rock/palettes/4.pal b/data/tilesets/secondary/navel_rock/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/navel_rock/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/navel_rock/palettes/5.pal b/data/tilesets/secondary/navel_rock/palettes/5.pal deleted file mode 100644 index c5a653979..000000000 --- a/data/tilesets/secondary/navel_rock/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/navel_rock/palettes/6.pal b/data/tilesets/secondary/navel_rock/palettes/6.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/navel_rock/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/navel_rock/palettes/7.pal b/data/tilesets/secondary/navel_rock/palettes/7.pal deleted file mode 100644 index 364379ad9..000000000 --- a/data/tilesets/secondary/navel_rock/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -255 0 255 -197 213 205 -180 197 189 -164 172 172 -131 148 139 -255 0 255 -246 205 74 -255 0 255 -180 189 197 -180 189 197 -189 197 197 -164 172 172 -131 139 139 -106 106 106 -90 90 82 diff --git a/data/tilesets/secondary/navel_rock/palettes/8.pal b/data/tilesets/secondary/navel_rock/palettes/8.pal deleted file mode 100644 index 102aaaf2c..000000000 --- a/data/tilesets/secondary/navel_rock/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -255 0 255 -197 213 205 -180 197 189 -164 172 172 -131 148 139 -255 0 255 -255 0 255 -255 0 255 -255 255 255 -255 255 255 -246 246 238 -222 222 213 -189 189 180 -156 156 139 -98 98 90 diff --git a/data/tilesets/secondary/navel_rock/palettes/9.pal b/data/tilesets/secondary/navel_rock/palettes/9.pal deleted file mode 100644 index 91329f82e..000000000 --- a/data/tilesets/secondary/navel_rock/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -238 238 164 -197 213 205 -180 197 189 -164 172 172 -205 205 106 -205 205 197 -172 172 90 -123 131 74 -82 90 32 -106 106 82 -74 74 74 -0 0 0 -98 139 197 -74 115 172 -57 98 156 diff --git a/data/tilesets/secondary/pallet_town/palettes/0.pal b/data/tilesets/secondary/pallet_town/palettes/0.pal deleted file mode 100644 index 42246e9ea..000000000 --- a/data/tilesets/secondary/pallet_town/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 139 49 -57 82 0 -115 98 98 -65 57 49 -255 255 255 -139 213 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 189 139 -24 172 106 diff --git a/data/tilesets/secondary/pallet_town/palettes/00.pal b/data/tilesets/secondary/pallet_town/palettes/00.pal new file mode 100644 index 000000000..42246e9ea --- /dev/null +++ b/data/tilesets/secondary/pallet_town/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 139 49 +57 82 0 +115 98 98 +65 57 49 +255 255 255 +139 213 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 189 139 +24 172 106 diff --git a/data/tilesets/secondary/pallet_town/palettes/01.pal b/data/tilesets/secondary/pallet_town/palettes/01.pal new file mode 100644 index 000000000..28db536cb --- /dev/null +++ b/data/tilesets/secondary/pallet_town/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +238 238 238 +222 222 230 +172 189 205 +131 131 139 +65 49 65 +139 230 189 +74 205 131 +65 172 115 +238 213 197 +222 189 164 +189 148 139 +156 115 115 +123 82 82 +90 57 74 +115 205 164 diff --git a/data/tilesets/secondary/pallet_town/palettes/02.pal b/data/tilesets/secondary/pallet_town/palettes/02.pal new file mode 100644 index 000000000..937cec4da --- /dev/null +++ b/data/tilesets/secondary/pallet_town/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 41 82 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +115 82 74 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +197 172 139 diff --git a/data/tilesets/secondary/pallet_town/palettes/03.pal b/data/tilesets/secondary/pallet_town/palettes/03.pal new file mode 100644 index 000000000..6d1dfb5af --- /dev/null +++ b/data/tilesets/secondary/pallet_town/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 238 246 +189 139 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +172 32 41 diff --git a/data/tilesets/secondary/pallet_town/palettes/04.pal b/data/tilesets/secondary/pallet_town/palettes/04.pal new file mode 100644 index 000000000..cde020d4e --- /dev/null +++ b/data/tilesets/secondary/pallet_town/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +222 230 238 +230 213 164 +205 197 148 +222 180 164 +156 164 189 +82 106 213 +65 90 189 +57 82 156 +41 65 139 +172 197 230 +139 164 222 +106 131 213 +82 106 213 +189 148 139 diff --git a/data/tilesets/secondary/pallet_town/palettes/05.pal b/data/tilesets/secondary/pallet_town/palettes/05.pal new file mode 100644 index 000000000..bdcc7b8ed --- /dev/null +++ b/data/tilesets/secondary/pallet_town/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +238 222 164 +222 205 131 +205 180 106 +180 139 74 +238 230 172 +246 238 205 +222 205 131 +255 0 255 +65 189 139 +115 205 164 diff --git a/data/tilesets/secondary/pallet_town/palettes/06.pal b/data/tilesets/secondary/pallet_town/palettes/06.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pallet_town/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pallet_town/palettes/07.pal b/data/tilesets/secondary/pallet_town/palettes/07.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/pallet_town/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pallet_town/palettes/08.pal b/data/tilesets/secondary/pallet_town/palettes/08.pal new file mode 100644 index 000000000..dcecb9c40 --- /dev/null +++ b/data/tilesets/secondary/pallet_town/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +246 246 255 +222 230 246 +189 197 222 +156 172 189 +123 123 131 +90 90 115 +65 74 106 +156 205 246 +98 156 238 +57 123 222 +255 205 180 +246 164 131 +222 139 106 +189 98 74 +123 205 164 diff --git a/data/tilesets/secondary/pallet_town/palettes/09.pal b/data/tilesets/secondary/pallet_town/palettes/09.pal new file mode 100644 index 000000000..90bb77517 --- /dev/null +++ b/data/tilesets/secondary/pallet_town/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +246 246 255 +222 230 246 +189 197 222 +156 172 189 +123 123 131 +90 90 115 +65 74 106 +156 205 246 +98 156 238 +57 123 222 +246 238 197 +230 222 148 +213 189 106 +197 148 74 +222 205 123 diff --git a/data/tilesets/secondary/pallet_town/palettes/1.pal b/data/tilesets/secondary/pallet_town/palettes/1.pal deleted file mode 100644 index 28db536cb..000000000 --- a/data/tilesets/secondary/pallet_town/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -238 238 238 -222 222 230 -172 189 205 -131 131 139 -65 49 65 -139 230 189 -74 205 131 -65 172 115 -238 213 197 -222 189 164 -189 148 139 -156 115 115 -123 82 82 -90 57 74 -115 205 164 diff --git a/data/tilesets/secondary/pallet_town/palettes/2.pal b/data/tilesets/secondary/pallet_town/palettes/2.pal deleted file mode 100644 index 937cec4da..000000000 --- a/data/tilesets/secondary/pallet_town/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -24 41 82 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -115 82 74 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -197 172 139 diff --git a/data/tilesets/secondary/pallet_town/palettes/3.pal b/data/tilesets/secondary/pallet_town/palettes/3.pal deleted file mode 100644 index 6d1dfb5af..000000000 --- a/data/tilesets/secondary/pallet_town/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 238 246 -189 139 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -172 32 41 diff --git a/data/tilesets/secondary/pallet_town/palettes/4.pal b/data/tilesets/secondary/pallet_town/palettes/4.pal deleted file mode 100644 index cde020d4e..000000000 --- a/data/tilesets/secondary/pallet_town/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 255 255 -222 230 238 -230 213 164 -205 197 148 -222 180 164 -156 164 189 -82 106 213 -65 90 189 -57 82 156 -41 65 139 -172 197 230 -139 164 222 -106 131 213 -82 106 213 -189 148 139 diff --git a/data/tilesets/secondary/pallet_town/palettes/5.pal b/data/tilesets/secondary/pallet_town/palettes/5.pal deleted file mode 100644 index bdcc7b8ed..000000000 --- a/data/tilesets/secondary/pallet_town/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -238 222 164 -222 205 131 -205 180 106 -180 139 74 -238 230 172 -246 238 205 -222 205 131 -255 0 255 -65 189 139 -115 205 164 diff --git a/data/tilesets/secondary/pallet_town/palettes/6.pal b/data/tilesets/secondary/pallet_town/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/pallet_town/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/pallet_town/palettes/7.pal b/data/tilesets/secondary/pallet_town/palettes/7.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/pallet_town/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/pallet_town/palettes/8.pal b/data/tilesets/secondary/pallet_town/palettes/8.pal deleted file mode 100644 index dcecb9c40..000000000 --- a/data/tilesets/secondary/pallet_town/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -246 246 255 -222 230 246 -189 197 222 -156 172 189 -123 123 131 -90 90 115 -65 74 106 -156 205 246 -98 156 238 -57 123 222 -255 205 180 -246 164 131 -222 139 106 -189 98 74 -123 205 164 diff --git a/data/tilesets/secondary/pallet_town/palettes/9.pal b/data/tilesets/secondary/pallet_town/palettes/9.pal deleted file mode 100644 index 90bb77517..000000000 --- a/data/tilesets/secondary/pallet_town/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -246 246 255 -222 230 246 -189 197 222 -156 172 189 -123 123 131 -90 90 115 -65 74 106 -156 205 246 -98 156 238 -57 123 222 -246 238 197 -230 222 148 -213 189 106 -197 148 74 -222 205 123 diff --git a/data/tilesets/secondary/pewter_city/palettes/0.pal b/data/tilesets/secondary/pewter_city/palettes/0.pal deleted file mode 100644 index 620015e77..000000000 --- a/data/tilesets/secondary/pewter_city/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 139 49 -57 82 0 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/pewter_city/palettes/00.pal b/data/tilesets/secondary/pewter_city/palettes/00.pal new file mode 100644 index 000000000..620015e77 --- /dev/null +++ b/data/tilesets/secondary/pewter_city/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 139 49 +57 82 0 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/pewter_city/palettes/01.pal b/data/tilesets/secondary/pewter_city/palettes/01.pal new file mode 100644 index 000000000..60de8c7ad --- /dev/null +++ b/data/tilesets/secondary/pewter_city/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +255 0 255 +255 0 255 +238 213 197 +222 189 164 +189 148 139 +156 115 115 +123 82 82 +90 57 74 +115 205 164 diff --git a/data/tilesets/secondary/pewter_city/palettes/02.pal b/data/tilesets/secondary/pewter_city/palettes/02.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/pewter_city/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/pewter_city/palettes/03.pal b/data/tilesets/secondary/pewter_city/palettes/03.pal new file mode 100644 index 000000000..9581f2cd8 --- /dev/null +++ b/data/tilesets/secondary/pewter_city/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 131 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/pewter_city/palettes/04.pal b/data/tilesets/secondary/pewter_city/palettes/04.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/pewter_city/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/pewter_city/palettes/05.pal b/data/tilesets/secondary/pewter_city/palettes/05.pal new file mode 100644 index 000000000..3a2db72a7 --- /dev/null +++ b/data/tilesets/secondary/pewter_city/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +222 205 131 +205 180 106 +180 139 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/pewter_city/palettes/06.pal b/data/tilesets/secondary/pewter_city/palettes/06.pal new file mode 100644 index 000000000..93518605a --- /dev/null +++ b/data/tilesets/secondary/pewter_city/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/pewter_city/palettes/07.pal b/data/tilesets/secondary/pewter_city/palettes/07.pal new file mode 100644 index 000000000..93518605a --- /dev/null +++ b/data/tilesets/secondary/pewter_city/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/pewter_city/palettes/08.pal b/data/tilesets/secondary/pewter_city/palettes/08.pal new file mode 100644 index 000000000..d404706ab --- /dev/null +++ b/data/tilesets/secondary/pewter_city/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 41 82 +246 246 255 +230 238 255 +197 205 222 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 205 246 +98 156 238 +57 123 222 +222 106 98 +205 82 74 +222 230 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/pewter_city/palettes/09.pal b/data/tilesets/secondary/pewter_city/palettes/09.pal new file mode 100644 index 000000000..cacf892a6 --- /dev/null +++ b/data/tilesets/secondary/pewter_city/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 205 246 +98 156 238 +57 123 222 +222 197 139 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/pewter_city/palettes/1.pal b/data/tilesets/secondary/pewter_city/palettes/1.pal deleted file mode 100644 index 60de8c7ad..000000000 --- a/data/tilesets/secondary/pewter_city/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -255 0 255 -255 0 255 -238 213 197 -222 189 164 -189 148 139 -156 115 115 -123 82 82 -90 57 74 -115 205 164 diff --git a/data/tilesets/secondary/pewter_city/palettes/2.pal b/data/tilesets/secondary/pewter_city/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/pewter_city/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/pewter_city/palettes/3.pal b/data/tilesets/secondary/pewter_city/palettes/3.pal deleted file mode 100644 index 9581f2cd8..000000000 --- a/data/tilesets/secondary/pewter_city/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 131 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/pewter_city/palettes/4.pal b/data/tilesets/secondary/pewter_city/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/pewter_city/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/pewter_city/palettes/5.pal b/data/tilesets/secondary/pewter_city/palettes/5.pal deleted file mode 100644 index 3a2db72a7..000000000 --- a/data/tilesets/secondary/pewter_city/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -222 205 131 -205 180 106 -180 139 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/pewter_city/palettes/6.pal b/data/tilesets/secondary/pewter_city/palettes/6.pal deleted file mode 100644 index 93518605a..000000000 --- a/data/tilesets/secondary/pewter_city/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/pewter_city/palettes/7.pal b/data/tilesets/secondary/pewter_city/palettes/7.pal deleted file mode 100644 index 93518605a..000000000 --- a/data/tilesets/secondary/pewter_city/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/pewter_city/palettes/8.pal b/data/tilesets/secondary/pewter_city/palettes/8.pal deleted file mode 100644 index d404706ab..000000000 --- a/data/tilesets/secondary/pewter_city/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -24 41 82 -246 246 255 -230 238 255 -197 205 222 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 205 246 -98 156 238 -57 123 222 -222 106 98 -205 82 74 -222 230 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/pewter_city/palettes/9.pal b/data/tilesets/secondary/pewter_city/palettes/9.pal deleted file mode 100644 index cacf892a6..000000000 --- a/data/tilesets/secondary/pewter_city/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 205 246 -98 156 238 -57 123 222 -222 197 139 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/pewter_gym/palettes/0.pal b/data/tilesets/secondary/pewter_gym/palettes/0.pal deleted file mode 100644 index 8db07d418..000000000 --- a/data/tilesets/secondary/pewter_gym/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/pewter_gym/palettes/00.pal b/data/tilesets/secondary/pewter_gym/palettes/00.pal new file mode 100644 index 000000000..8db07d418 --- /dev/null +++ b/data/tilesets/secondary/pewter_gym/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/pewter_gym/palettes/01.pal b/data/tilesets/secondary/pewter_gym/palettes/01.pal new file mode 100644 index 000000000..66561f6d3 --- /dev/null +++ b/data/tilesets/secondary/pewter_gym/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +139 180 222 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/pewter_gym/palettes/02.pal b/data/tilesets/secondary/pewter_gym/palettes/02.pal new file mode 100644 index 000000000..87a022102 --- /dev/null +++ b/data/tilesets/secondary/pewter_gym/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +90 90 115 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/pewter_gym/palettes/03.pal b/data/tilesets/secondary/pewter_gym/palettes/03.pal new file mode 100644 index 000000000..783496dcd --- /dev/null +++ b/data/tilesets/secondary/pewter_gym/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +65 98 156 +90 123 180 +115 156 197 +222 213 131 +164 164 172 +205 205 213 +238 238 246 +106 172 115 +156 205 139 diff --git a/data/tilesets/secondary/pewter_gym/palettes/04.pal b/data/tilesets/secondary/pewter_gym/palettes/04.pal new file mode 100644 index 000000000..89eace605 --- /dev/null +++ b/data/tilesets/secondary/pewter_gym/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 238 246 +172 197 180 +197 222 205 +90 189 172 +246 238 156 +205 189 131 +189 164 123 +148 131 106 +106 106 106 +213 222 230 +238 180 115 diff --git a/data/tilesets/secondary/pewter_gym/palettes/05.pal b/data/tilesets/secondary/pewter_gym/palettes/05.pal new file mode 100644 index 000000000..0eef3df8e --- /dev/null +++ b/data/tilesets/secondary/pewter_gym/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +213 222 222 +164 180 189 +255 0 255 +131 115 74 +213 213 148 +197 189 139 +172 156 115 +148 131 90 +255 0 255 +255 0 255 +0 0 0 diff --git a/data/tilesets/secondary/pewter_gym/palettes/06.pal b/data/tilesets/secondary/pewter_gym/palettes/06.pal new file mode 100644 index 000000000..1d08ce9a2 --- /dev/null +++ b/data/tilesets/secondary/pewter_gym/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pewter_gym/palettes/07.pal b/data/tilesets/secondary/pewter_gym/palettes/07.pal new file mode 100644 index 000000000..34c0ddd17 --- /dev/null +++ b/data/tilesets/secondary/pewter_gym/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 131 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +82 82 106 +123 123 139 +205 205 197 +255 255 255 diff --git a/data/tilesets/secondary/pewter_gym/palettes/08.pal b/data/tilesets/secondary/pewter_gym/palettes/08.pal new file mode 100644 index 000000000..77e03a48c --- /dev/null +++ b/data/tilesets/secondary/pewter_gym/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +172 172 164 +222 213 139 +180 172 98 +156 148 82 +213 255 197 +164 230 148 +123 172 148 +148 213 164 +156 74 41 +180 90 65 +213 131 106 +238 164 139 +246 238 205 diff --git a/data/tilesets/secondary/pewter_gym/palettes/09.pal b/data/tilesets/secondary/pewter_gym/palettes/09.pal new file mode 100644 index 000000000..ef91ae987 --- /dev/null +++ b/data/tilesets/secondary/pewter_gym/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +172 172 164 +156 189 131 +222 205 115 +156 148 82 +123 106 57 +74 131 164 +98 172 205 +49 139 49 +106 205 164 +156 148 82 +115 164 106 +205 230 197 +238 255 238 diff --git a/data/tilesets/secondary/pewter_gym/palettes/1.pal b/data/tilesets/secondary/pewter_gym/palettes/1.pal deleted file mode 100644 index 66561f6d3..000000000 --- a/data/tilesets/secondary/pewter_gym/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -139 180 222 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/pewter_gym/palettes/2.pal b/data/tilesets/secondary/pewter_gym/palettes/2.pal deleted file mode 100644 index 87a022102..000000000 --- a/data/tilesets/secondary/pewter_gym/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -90 90 115 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/pewter_gym/palettes/3.pal b/data/tilesets/secondary/pewter_gym/palettes/3.pal deleted file mode 100644 index 783496dcd..000000000 --- a/data/tilesets/secondary/pewter_gym/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -65 98 156 -90 123 180 -115 156 197 -222 213 131 -164 164 172 -205 205 213 -238 238 246 -106 172 115 -156 205 139 diff --git a/data/tilesets/secondary/pewter_gym/palettes/4.pal b/data/tilesets/secondary/pewter_gym/palettes/4.pal deleted file mode 100644 index 89eace605..000000000 --- a/data/tilesets/secondary/pewter_gym/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 238 246 -172 197 180 -197 222 205 -90 189 172 -246 238 156 -205 189 131 -189 164 123 -148 131 106 -106 106 106 -213 222 230 -238 180 115 diff --git a/data/tilesets/secondary/pewter_gym/palettes/5.pal b/data/tilesets/secondary/pewter_gym/palettes/5.pal deleted file mode 100644 index 0eef3df8e..000000000 --- a/data/tilesets/secondary/pewter_gym/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -213 222 222 -164 180 189 -255 0 255 -131 115 74 -213 213 148 -197 189 139 -172 156 115 -148 131 90 -255 0 255 -255 0 255 -0 0 0 diff --git a/data/tilesets/secondary/pewter_gym/palettes/6.pal b/data/tilesets/secondary/pewter_gym/palettes/6.pal deleted file mode 100644 index 1d08ce9a2..000000000 --- a/data/tilesets/secondary/pewter_gym/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/pewter_gym/palettes/7.pal b/data/tilesets/secondary/pewter_gym/palettes/7.pal deleted file mode 100644 index 34c0ddd17..000000000 --- a/data/tilesets/secondary/pewter_gym/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -131 131 131 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -82 82 106 -123 123 139 -205 205 197 -255 255 255 diff --git a/data/tilesets/secondary/pewter_gym/palettes/8.pal b/data/tilesets/secondary/pewter_gym/palettes/8.pal deleted file mode 100644 index 77e03a48c..000000000 --- a/data/tilesets/secondary/pewter_gym/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -172 172 164 -222 213 139 -180 172 98 -156 148 82 -213 255 197 -164 230 148 -123 172 148 -148 213 164 -156 74 41 -180 90 65 -213 131 106 -238 164 139 -246 238 205 diff --git a/data/tilesets/secondary/pewter_gym/palettes/9.pal b/data/tilesets/secondary/pewter_gym/palettes/9.pal deleted file mode 100644 index ef91ae987..000000000 --- a/data/tilesets/secondary/pewter_gym/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -172 172 164 -156 189 131 -222 205 115 -156 148 82 -123 106 57 -74 131 164 -98 172 205 -49 139 49 -106 205 164 -156 148 82 -115 164 106 -205 230 197 -238 255 238 diff --git a/data/tilesets/secondary/pokemon_center/palettes/0.pal b/data/tilesets/secondary/pokemon_center/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/pokemon_center/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/pokemon_center/palettes/00.pal b/data/tilesets/secondary/pokemon_center/palettes/00.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/pokemon_center/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/pokemon_center/palettes/01.pal b/data/tilesets/secondary/pokemon_center/palettes/01.pal new file mode 100644 index 000000000..d99adafff --- /dev/null +++ b/data/tilesets/secondary/pokemon_center/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/pokemon_center/palettes/02.pal b/data/tilesets/secondary/pokemon_center/palettes/02.pal new file mode 100644 index 000000000..cc3a9457d --- /dev/null +++ b/data/tilesets/secondary/pokemon_center/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/pokemon_center/palettes/03.pal b/data/tilesets/secondary/pokemon_center/palettes/03.pal new file mode 100644 index 000000000..7ec794ae5 --- /dev/null +++ b/data/tilesets/secondary/pokemon_center/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/pokemon_center/palettes/04.pal b/data/tilesets/secondary/pokemon_center/palettes/04.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/pokemon_center/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_center/palettes/05.pal b/data/tilesets/secondary/pokemon_center/palettes/05.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/pokemon_center/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_center/palettes/06.pal b/data/tilesets/secondary/pokemon_center/palettes/06.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_center/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_center/palettes/07.pal b/data/tilesets/secondary/pokemon_center/palettes/07.pal new file mode 100644 index 000000000..27ca86ca3 --- /dev/null +++ b/data/tilesets/secondary/pokemon_center/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 222 205 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/pokemon_center/palettes/08.pal b/data/tilesets/secondary/pokemon_center/palettes/08.pal new file mode 100644 index 000000000..6b6a0f25f --- /dev/null +++ b/data/tilesets/secondary/pokemon_center/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +131 205 139 +230 189 115 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/pokemon_center/palettes/09.pal b/data/tilesets/secondary/pokemon_center/palettes/09.pal new file mode 100644 index 000000000..4b279ecf9 --- /dev/null +++ b/data/tilesets/secondary/pokemon_center/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 255 0 +82 82 106 +148 148 164 +205 189 197 +255 255 255 +189 148 49 +156 115 90 +197 238 148 +156 197 74 +106 164 41 +197 222 205 +139 180 172 +172 205 180 +123 123 139 +255 98 49 +238 222 164 diff --git a/data/tilesets/secondary/pokemon_center/palettes/1.pal b/data/tilesets/secondary/pokemon_center/palettes/1.pal deleted file mode 100644 index d99adafff..000000000 --- a/data/tilesets/secondary/pokemon_center/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/pokemon_center/palettes/2.pal b/data/tilesets/secondary/pokemon_center/palettes/2.pal deleted file mode 100644 index cc3a9457d..000000000 --- a/data/tilesets/secondary/pokemon_center/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/pokemon_center/palettes/3.pal b/data/tilesets/secondary/pokemon_center/palettes/3.pal deleted file mode 100644 index 7ec794ae5..000000000 --- a/data/tilesets/secondary/pokemon_center/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/pokemon_center/palettes/4.pal b/data/tilesets/secondary/pokemon_center/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/pokemon_center/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/pokemon_center/palettes/5.pal b/data/tilesets/secondary/pokemon_center/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/pokemon_center/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/pokemon_center/palettes/6.pal b/data/tilesets/secondary/pokemon_center/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/pokemon_center/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/pokemon_center/palettes/7.pal b/data/tilesets/secondary/pokemon_center/palettes/7.pal deleted file mode 100644 index 27ca86ca3..000000000 --- a/data/tilesets/secondary/pokemon_center/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -197 222 205 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/pokemon_center/palettes/8.pal b/data/tilesets/secondary/pokemon_center/palettes/8.pal deleted file mode 100644 index 6b6a0f25f..000000000 --- a/data/tilesets/secondary/pokemon_center/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -131 205 139 -230 189 115 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/pokemon_center/palettes/9.pal b/data/tilesets/secondary/pokemon_center/palettes/9.pal deleted file mode 100644 index 4b279ecf9..000000000 --- a/data/tilesets/secondary/pokemon_center/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 255 0 -82 82 106 -148 148 164 -205 189 197 -255 255 255 -189 148 49 -156 115 90 -197 238 148 -156 197 74 -106 164 41 -197 222 205 -139 180 172 -172 205 180 -123 123 139 -255 98 49 -238 222 164 diff --git a/data/tilesets/secondary/pokemon_league/palettes/0.pal b/data/tilesets/secondary/pokemon_league/palettes/0.pal deleted file mode 100644 index 8db07d418..000000000 --- a/data/tilesets/secondary/pokemon_league/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/pokemon_league/palettes/00.pal b/data/tilesets/secondary/pokemon_league/palettes/00.pal new file mode 100644 index 000000000..8db07d418 --- /dev/null +++ b/data/tilesets/secondary/pokemon_league/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/pokemon_league/palettes/01.pal b/data/tilesets/secondary/pokemon_league/palettes/01.pal new file mode 100644 index 000000000..fc945ef6c --- /dev/null +++ b/data/tilesets/secondary/pokemon_league/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +139 180 222 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/pokemon_league/palettes/02.pal b/data/tilesets/secondary/pokemon_league/palettes/02.pal new file mode 100644 index 000000000..87a022102 --- /dev/null +++ b/data/tilesets/secondary/pokemon_league/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +90 90 115 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/pokemon_league/palettes/03.pal b/data/tilesets/secondary/pokemon_league/palettes/03.pal new file mode 100644 index 000000000..783496dcd --- /dev/null +++ b/data/tilesets/secondary/pokemon_league/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +65 98 156 +90 123 180 +115 156 197 +222 213 131 +164 164 172 +205 205 213 +238 238 246 +106 172 115 +156 205 139 diff --git a/data/tilesets/secondary/pokemon_league/palettes/04.pal b/data/tilesets/secondary/pokemon_league/palettes/04.pal new file mode 100644 index 000000000..89eace605 --- /dev/null +++ b/data/tilesets/secondary/pokemon_league/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 238 246 +172 197 180 +197 222 205 +90 189 172 +246 238 156 +205 189 131 +189 164 123 +148 131 106 +106 106 106 +213 222 230 +238 180 115 diff --git a/data/tilesets/secondary/pokemon_league/palettes/05.pal b/data/tilesets/secondary/pokemon_league/palettes/05.pal new file mode 100644 index 000000000..34ef2f2d2 --- /dev/null +++ b/data/tilesets/secondary/pokemon_league/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +213 222 222 +164 180 189 +222 164 115 +131 115 74 +213 213 148 +197 189 139 +172 156 115 +148 131 90 +197 197 205 +205 82 65 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_league/palettes/06.pal b/data/tilesets/secondary/pokemon_league/palettes/06.pal new file mode 100644 index 000000000..1d08ce9a2 --- /dev/null +++ b/data/tilesets/secondary/pokemon_league/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_league/palettes/07.pal b/data/tilesets/secondary/pokemon_league/palettes/07.pal new file mode 100644 index 000000000..6528f9f75 --- /dev/null +++ b/data/tilesets/secondary/pokemon_league/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +82 82 106 +82 82 106 +82 82 106 +82 82 106 +82 82 106 +82 82 106 diff --git a/data/tilesets/secondary/pokemon_league/palettes/08.pal b/data/tilesets/secondary/pokemon_league/palettes/08.pal new file mode 100644 index 000000000..6b56cd49e --- /dev/null +++ b/data/tilesets/secondary/pokemon_league/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +255 255 255 +222 222 222 +106 115 115 +189 230 255 +123 205 255 +98 180 246 +49 139 213 +180 180 164 +172 213 222 +156 197 205 +180 156 222 +156 131 205 +139 197 230 +131 172 222 +98 148 197 diff --git a/data/tilesets/secondary/pokemon_league/palettes/09.pal b/data/tilesets/secondary/pokemon_league/palettes/09.pal new file mode 100644 index 000000000..5c2ed43a0 --- /dev/null +++ b/data/tilesets/secondary/pokemon_league/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +255 255 255 +222 222 222 +106 115 115 +222 230 238 +180 197 205 +148 164 180 +131 139 139 +238 238 238 +230 230 230 +213 213 213 +139 213 156 +123 189 139 +230 222 123 +213 205 106 +189 180 90 diff --git a/data/tilesets/secondary/pokemon_league/palettes/1.pal b/data/tilesets/secondary/pokemon_league/palettes/1.pal deleted file mode 100644 index fc945ef6c..000000000 --- a/data/tilesets/secondary/pokemon_league/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -139 180 222 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/pokemon_league/palettes/2.pal b/data/tilesets/secondary/pokemon_league/palettes/2.pal deleted file mode 100644 index 87a022102..000000000 --- a/data/tilesets/secondary/pokemon_league/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -90 90 115 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/pokemon_league/palettes/3.pal b/data/tilesets/secondary/pokemon_league/palettes/3.pal deleted file mode 100644 index 783496dcd..000000000 --- a/data/tilesets/secondary/pokemon_league/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -65 98 156 -90 123 180 -115 156 197 -222 213 131 -164 164 172 -205 205 213 -238 238 246 -106 172 115 -156 205 139 diff --git a/data/tilesets/secondary/pokemon_league/palettes/4.pal b/data/tilesets/secondary/pokemon_league/palettes/4.pal deleted file mode 100644 index 89eace605..000000000 --- a/data/tilesets/secondary/pokemon_league/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 238 246 -172 197 180 -197 222 205 -90 189 172 -246 238 156 -205 189 131 -189 164 123 -148 131 106 -106 106 106 -213 222 230 -238 180 115 diff --git a/data/tilesets/secondary/pokemon_league/palettes/5.pal b/data/tilesets/secondary/pokemon_league/palettes/5.pal deleted file mode 100644 index 34ef2f2d2..000000000 --- a/data/tilesets/secondary/pokemon_league/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -213 222 222 -164 180 189 -222 164 115 -131 115 74 -213 213 148 -197 189 139 -172 156 115 -148 131 90 -197 197 205 -205 82 65 -0 0 0 diff --git a/data/tilesets/secondary/pokemon_league/palettes/6.pal b/data/tilesets/secondary/pokemon_league/palettes/6.pal deleted file mode 100644 index 1d08ce9a2..000000000 --- a/data/tilesets/secondary/pokemon_league/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/pokemon_league/palettes/7.pal b/data/tilesets/secondary/pokemon_league/palettes/7.pal deleted file mode 100644 index 6528f9f75..000000000 --- a/data/tilesets/secondary/pokemon_league/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -255 74 0 -255 213 131 -230 164 98 -197 115 74 -164 82 65 -255 255 180 -189 189 115 -82 82 106 -82 82 106 -82 82 106 -82 82 106 -82 82 106 -82 82 106 diff --git a/data/tilesets/secondary/pokemon_league/palettes/8.pal b/data/tilesets/secondary/pokemon_league/palettes/8.pal deleted file mode 100644 index 6b56cd49e..000000000 --- a/data/tilesets/secondary/pokemon_league/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -255 255 255 -222 222 222 -106 115 115 -189 230 255 -123 205 255 -98 180 246 -49 139 213 -180 180 164 -172 213 222 -156 197 205 -180 156 222 -156 131 205 -139 197 230 -131 172 222 -98 148 197 diff --git a/data/tilesets/secondary/pokemon_league/palettes/9.pal b/data/tilesets/secondary/pokemon_league/palettes/9.pal deleted file mode 100644 index 5c2ed43a0..000000000 --- a/data/tilesets/secondary/pokemon_league/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -255 255 255 -222 222 222 -106 115 115 -222 230 238 -180 197 205 -148 164 180 -131 139 139 -238 238 238 -230 230 230 -213 213 213 -139 213 156 -123 189 139 -230 222 123 -213 205 106 -189 180 90 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/0.pal b/data/tilesets/secondary/pokemon_mansion/palettes/0.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/pokemon_mansion/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/00.pal b/data/tilesets/secondary/pokemon_mansion/palettes/00.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_mansion/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/01.pal b/data/tilesets/secondary/pokemon_mansion/palettes/01.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_mansion/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/02.pal b/data/tilesets/secondary/pokemon_mansion/palettes/02.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_mansion/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/03.pal b/data/tilesets/secondary/pokemon_mansion/palettes/03.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_mansion/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/04.pal b/data/tilesets/secondary/pokemon_mansion/palettes/04.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_mansion/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/05.pal b/data/tilesets/secondary/pokemon_mansion/palettes/05.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_mansion/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/06.pal b/data/tilesets/secondary/pokemon_mansion/palettes/06.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_mansion/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/07.pal b/data/tilesets/secondary/pokemon_mansion/palettes/07.pal new file mode 100644 index 000000000..4d22869cd --- /dev/null +++ b/data/tilesets/secondary/pokemon_mansion/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 148 +82 131 106 +131 180 156 +180 230 205 +180 0 0 +255 0 0 +148 148 156 +172 172 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +82 82 106 +123 123 139 +205 205 197 +255 255 255 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/08.pal b/data/tilesets/secondary/pokemon_mansion/palettes/08.pal new file mode 100644 index 000000000..2a9d791a4 --- /dev/null +++ b/data/tilesets/secondary/pokemon_mansion/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 148 +164 98 74 +222 148 123 +255 189 164 +139 82 57 +172 197 230 +213 222 238 +0 0 0 +0 0 0 +189 164 115 +0 0 0 +255 238 189 +82 82 106 +123 123 139 +205 205 197 +255 255 255 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/09.pal b/data/tilesets/secondary/pokemon_mansion/palettes/09.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_mansion/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/1.pal b/data/tilesets/secondary/pokemon_mansion/palettes/1.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/pokemon_mansion/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/2.pal b/data/tilesets/secondary/pokemon_mansion/palettes/2.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/pokemon_mansion/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/3.pal b/data/tilesets/secondary/pokemon_mansion/palettes/3.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/pokemon_mansion/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/4.pal b/data/tilesets/secondary/pokemon_mansion/palettes/4.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/pokemon_mansion/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/5.pal b/data/tilesets/secondary/pokemon_mansion/palettes/5.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/pokemon_mansion/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/6.pal b/data/tilesets/secondary/pokemon_mansion/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/pokemon_mansion/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/7.pal b/data/tilesets/secondary/pokemon_mansion/palettes/7.pal deleted file mode 100644 index 4d22869cd..000000000 --- a/data/tilesets/secondary/pokemon_mansion/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -148 148 148 -82 131 106 -131 180 156 -180 230 205 -180 0 0 -255 0 0 -148 148 156 -172 172 172 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -82 82 106 -123 123 139 -205 205 197 -255 255 255 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/8.pal b/data/tilesets/secondary/pokemon_mansion/palettes/8.pal deleted file mode 100644 index 2a9d791a4..000000000 --- a/data/tilesets/secondary/pokemon_mansion/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -148 148 148 -164 98 74 -222 148 123 -255 189 164 -139 82 57 -172 197 230 -213 222 238 -0 0 0 -0 0 0 -189 164 115 -0 0 0 -255 238 189 -82 82 106 -123 123 139 -205 205 197 -255 255 255 diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/9.pal b/data/tilesets/secondary/pokemon_mansion/palettes/9.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/pokemon_mansion/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/0.pal b/data/tilesets/secondary/pokemon_tower/palettes/0.pal deleted file mode 100644 index 8db07d418..000000000 --- a/data/tilesets/secondary/pokemon_tower/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/00.pal b/data/tilesets/secondary/pokemon_tower/palettes/00.pal new file mode 100644 index 000000000..8db07d418 --- /dev/null +++ b/data/tilesets/secondary/pokemon_tower/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/01.pal b/data/tilesets/secondary/pokemon_tower/palettes/01.pal new file mode 100644 index 000000000..30be2fbe3 --- /dev/null +++ b/data/tilesets/secondary/pokemon_tower/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/02.pal b/data/tilesets/secondary/pokemon_tower/palettes/02.pal new file mode 100644 index 000000000..e7c4b911a --- /dev/null +++ b/data/tilesets/secondary/pokemon_tower/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/03.pal b/data/tilesets/secondary/pokemon_tower/palettes/03.pal new file mode 100644 index 000000000..54b77e0c8 --- /dev/null +++ b/data/tilesets/secondary/pokemon_tower/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/04.pal b/data/tilesets/secondary/pokemon_tower/palettes/04.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/pokemon_tower/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/05.pal b/data/tilesets/secondary/pokemon_tower/palettes/05.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/pokemon_tower/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/06.pal b/data/tilesets/secondary/pokemon_tower/palettes/06.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/pokemon_tower/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/07.pal b/data/tilesets/secondary/pokemon_tower/palettes/07.pal new file mode 100644 index 000000000..241a2678c --- /dev/null +++ b/data/tilesets/secondary/pokemon_tower/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +115 115 115 +180 180 164 +238 238 246 +82 123 82 +90 131 90 +106 156 106 +131 172 131 +180 156 222 +106 82 156 +139 115 189 +213 189 255 +255 0 255 +65 106 65 +255 255 255 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/08.pal b/data/tilesets/secondary/pokemon_tower/palettes/08.pal new file mode 100644 index 000000000..ebd9e912c --- /dev/null +++ b/data/tilesets/secondary/pokemon_tower/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +115 115 115 +180 180 164 +238 238 246 +98 139 98 +106 156 106 +131 172 131 +148 189 148 +180 156 222 +205 139 32 +222 172 57 +246 238 164 +255 0 255 +82 123 82 +255 255 255 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/09.pal b/data/tilesets/secondary/pokemon_tower/palettes/09.pal new file mode 100644 index 000000000..51daf6701 --- /dev/null +++ b/data/tilesets/secondary/pokemon_tower/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +115 115 115 +180 180 164 +238 238 246 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +172 123 32 +238 189 74 +74 205 205 +164 255 255 +255 255 255 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/1.pal b/data/tilesets/secondary/pokemon_tower/palettes/1.pal deleted file mode 100644 index 30be2fbe3..000000000 --- a/data/tilesets/secondary/pokemon_tower/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/2.pal b/data/tilesets/secondary/pokemon_tower/palettes/2.pal deleted file mode 100644 index e7c4b911a..000000000 --- a/data/tilesets/secondary/pokemon_tower/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/3.pal b/data/tilesets/secondary/pokemon_tower/palettes/3.pal deleted file mode 100644 index 54b77e0c8..000000000 --- a/data/tilesets/secondary/pokemon_tower/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/4.pal b/data/tilesets/secondary/pokemon_tower/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/pokemon_tower/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/5.pal b/data/tilesets/secondary/pokemon_tower/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/pokemon_tower/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/6.pal b/data/tilesets/secondary/pokemon_tower/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/pokemon_tower/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/7.pal b/data/tilesets/secondary/pokemon_tower/palettes/7.pal deleted file mode 100644 index 241a2678c..000000000 --- a/data/tilesets/secondary/pokemon_tower/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -115 115 115 -180 180 164 -238 238 246 -82 123 82 -90 131 90 -106 156 106 -131 172 131 -180 156 222 -106 82 156 -139 115 189 -213 189 255 -255 0 255 -65 106 65 -255 255 255 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/8.pal b/data/tilesets/secondary/pokemon_tower/palettes/8.pal deleted file mode 100644 index ebd9e912c..000000000 --- a/data/tilesets/secondary/pokemon_tower/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -115 115 115 -180 180 164 -238 238 246 -98 139 98 -106 156 106 -131 172 131 -148 189 148 -180 156 222 -205 139 32 -222 172 57 -246 238 164 -255 0 255 -82 123 82 -255 255 255 diff --git a/data/tilesets/secondary/pokemon_tower/palettes/9.pal b/data/tilesets/secondary/pokemon_tower/palettes/9.pal deleted file mode 100644 index 51daf6701..000000000 --- a/data/tilesets/secondary/pokemon_tower/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -115 115 115 -180 180 164 -238 238 246 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -172 123 32 -238 189 74 -74 205 205 -164 255 255 -255 255 255 diff --git a/data/tilesets/secondary/power_plant/palettes/0.pal b/data/tilesets/secondary/power_plant/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/power_plant/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/power_plant/palettes/00.pal b/data/tilesets/secondary/power_plant/palettes/00.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/power_plant/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/power_plant/palettes/01.pal b/data/tilesets/secondary/power_plant/palettes/01.pal new file mode 100644 index 000000000..30be2fbe3 --- /dev/null +++ b/data/tilesets/secondary/power_plant/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/power_plant/palettes/02.pal b/data/tilesets/secondary/power_plant/palettes/02.pal new file mode 100644 index 000000000..e7c4b911a --- /dev/null +++ b/data/tilesets/secondary/power_plant/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/power_plant/palettes/03.pal b/data/tilesets/secondary/power_plant/palettes/03.pal new file mode 100644 index 000000000..54b77e0c8 --- /dev/null +++ b/data/tilesets/secondary/power_plant/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/power_plant/palettes/04.pal b/data/tilesets/secondary/power_plant/palettes/04.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/power_plant/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/power_plant/palettes/05.pal b/data/tilesets/secondary/power_plant/palettes/05.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/power_plant/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/power_plant/palettes/06.pal b/data/tilesets/secondary/power_plant/palettes/06.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/power_plant/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/power_plant/palettes/07.pal b/data/tilesets/secondary/power_plant/palettes/07.pal new file mode 100644 index 000000000..b69e6cfa4 --- /dev/null +++ b/data/tilesets/secondary/power_plant/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 205 156 +156 65 65 +57 106 16 +0 0 139 +98 123 156 +131 156 180 +164 189 213 +197 197 148 +213 205 172 +230 222 197 +164 156 164 +205 197 189 +82 82 106 +123 123 139 +246 238 222 +255 255 255 diff --git a/data/tilesets/secondary/power_plant/palettes/08.pal b/data/tilesets/secondary/power_plant/palettes/08.pal new file mode 100644 index 000000000..3cada9fa1 --- /dev/null +++ b/data/tilesets/secondary/power_plant/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 205 156 +180 180 90 +222 222 148 +246 246 180 +156 65 65 +222 131 131 +189 98 98 +255 0 255 +255 0 255 +255 0 255 +164 156 164 +205 197 189 +82 82 106 +123 123 139 +246 238 222 +255 255 255 diff --git a/data/tilesets/secondary/power_plant/palettes/09.pal b/data/tilesets/secondary/power_plant/palettes/09.pal new file mode 100644 index 000000000..2a1743eaa --- /dev/null +++ b/data/tilesets/secondary/power_plant/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 205 156 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/power_plant/palettes/1.pal b/data/tilesets/secondary/power_plant/palettes/1.pal deleted file mode 100644 index 30be2fbe3..000000000 --- a/data/tilesets/secondary/power_plant/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/power_plant/palettes/2.pal b/data/tilesets/secondary/power_plant/palettes/2.pal deleted file mode 100644 index e7c4b911a..000000000 --- a/data/tilesets/secondary/power_plant/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/power_plant/palettes/3.pal b/data/tilesets/secondary/power_plant/palettes/3.pal deleted file mode 100644 index 54b77e0c8..000000000 --- a/data/tilesets/secondary/power_plant/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/power_plant/palettes/4.pal b/data/tilesets/secondary/power_plant/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/power_plant/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/power_plant/palettes/5.pal b/data/tilesets/secondary/power_plant/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/power_plant/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/power_plant/palettes/6.pal b/data/tilesets/secondary/power_plant/palettes/6.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/power_plant/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/power_plant/palettes/7.pal b/data/tilesets/secondary/power_plant/palettes/7.pal deleted file mode 100644 index b69e6cfa4..000000000 --- a/data/tilesets/secondary/power_plant/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -156 205 156 -156 65 65 -57 106 16 -0 0 139 -98 123 156 -131 156 180 -164 189 213 -197 197 148 -213 205 172 -230 222 197 -164 156 164 -205 197 189 -82 82 106 -123 123 139 -246 238 222 -255 255 255 diff --git a/data/tilesets/secondary/power_plant/palettes/8.pal b/data/tilesets/secondary/power_plant/palettes/8.pal deleted file mode 100644 index 3cada9fa1..000000000 --- a/data/tilesets/secondary/power_plant/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -156 205 156 -180 180 90 -222 222 148 -246 246 180 -156 65 65 -222 131 131 -189 98 98 -255 0 255 -255 0 255 -255 0 255 -164 156 164 -205 197 189 -82 82 106 -123 123 139 -246 238 222 -255 255 255 diff --git a/data/tilesets/secondary/power_plant/palettes/9.pal b/data/tilesets/secondary/power_plant/palettes/9.pal deleted file mode 100644 index 2a1743eaa..000000000 --- a/data/tilesets/secondary/power_plant/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -156 205 156 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/0.pal b/data/tilesets/secondary/restaurant_hotel/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/restaurant_hotel/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/00.pal b/data/tilesets/secondary/restaurant_hotel/palettes/00.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/restaurant_hotel/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/01.pal b/data/tilesets/secondary/restaurant_hotel/palettes/01.pal new file mode 100644 index 000000000..30be2fbe3 --- /dev/null +++ b/data/tilesets/secondary/restaurant_hotel/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/02.pal b/data/tilesets/secondary/restaurant_hotel/palettes/02.pal new file mode 100644 index 000000000..e7c4b911a --- /dev/null +++ b/data/tilesets/secondary/restaurant_hotel/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/03.pal b/data/tilesets/secondary/restaurant_hotel/palettes/03.pal new file mode 100644 index 000000000..54b77e0c8 --- /dev/null +++ b/data/tilesets/secondary/restaurant_hotel/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/04.pal b/data/tilesets/secondary/restaurant_hotel/palettes/04.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/restaurant_hotel/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/05.pal b/data/tilesets/secondary/restaurant_hotel/palettes/05.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/restaurant_hotel/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/06.pal b/data/tilesets/secondary/restaurant_hotel/palettes/06.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/restaurant_hotel/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/07.pal b/data/tilesets/secondary/restaurant_hotel/palettes/07.pal new file mode 100644 index 000000000..5e3bac102 --- /dev/null +++ b/data/tilesets/secondary/restaurant_hotel/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +106 197 106 +255 205 90 +82 148 197 +189 230 255 +139 98 41 +156 123 65 +180 148 90 +205 172 115 +246 213 172 +205 106 90 +255 148 131 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/08.pal b/data/tilesets/secondary/restaurant_hotel/palettes/08.pal new file mode 100644 index 000000000..2257c0006 --- /dev/null +++ b/data/tilesets/secondary/restaurant_hotel/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +82 82 106 +131 131 139 +230 222 246 +255 255 255 +255 205 98 +255 255 148 +189 230 255 +180 148 90 +255 139 180 +197 180 131 +213 213 164 +238 238 213 +106 197 106 +205 106 90 +131 115 16 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/09.pal b/data/tilesets/secondary/restaurant_hotel/palettes/09.pal new file mode 100644 index 000000000..c06a049b0 --- /dev/null +++ b/data/tilesets/secondary/restaurant_hotel/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/1.pal b/data/tilesets/secondary/restaurant_hotel/palettes/1.pal deleted file mode 100644 index 30be2fbe3..000000000 --- a/data/tilesets/secondary/restaurant_hotel/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/2.pal b/data/tilesets/secondary/restaurant_hotel/palettes/2.pal deleted file mode 100644 index e7c4b911a..000000000 --- a/data/tilesets/secondary/restaurant_hotel/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/3.pal b/data/tilesets/secondary/restaurant_hotel/palettes/3.pal deleted file mode 100644 index 54b77e0c8..000000000 --- a/data/tilesets/secondary/restaurant_hotel/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/4.pal b/data/tilesets/secondary/restaurant_hotel/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/restaurant_hotel/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/5.pal b/data/tilesets/secondary/restaurant_hotel/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/restaurant_hotel/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/6.pal b/data/tilesets/secondary/restaurant_hotel/palettes/6.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/restaurant_hotel/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/7.pal b/data/tilesets/secondary/restaurant_hotel/palettes/7.pal deleted file mode 100644 index 5e3bac102..000000000 --- a/data/tilesets/secondary/restaurant_hotel/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -106 197 106 -255 205 90 -82 148 197 -189 230 255 -139 98 41 -156 123 65 -180 148 90 -205 172 115 -246 213 172 -205 106 90 -255 148 131 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/8.pal b/data/tilesets/secondary/restaurant_hotel/palettes/8.pal deleted file mode 100644 index 2257c0006..000000000 --- a/data/tilesets/secondary/restaurant_hotel/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -82 82 106 -131 131 139 -230 222 246 -255 255 255 -255 205 98 -255 255 148 -189 230 255 -180 148 90 -255 139 180 -197 180 131 -213 213 164 -238 238 213 -106 197 106 -205 106 90 -131 115 16 diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/9.pal b/data/tilesets/secondary/restaurant_hotel/palettes/9.pal deleted file mode 100644 index c06a049b0..000000000 --- a/data/tilesets/secondary/restaurant_hotel/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/0.pal b/data/tilesets/secondary/rock_tunnel/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/rock_tunnel/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/00.pal b/data/tilesets/secondary/rock_tunnel/palettes/00.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/rock_tunnel/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/01.pal b/data/tilesets/secondary/rock_tunnel/palettes/01.pal new file mode 100644 index 000000000..d8a4e7757 --- /dev/null +++ b/data/tilesets/secondary/rock_tunnel/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/02.pal b/data/tilesets/secondary/rock_tunnel/palettes/02.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/rock_tunnel/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/03.pal b/data/tilesets/secondary/rock_tunnel/palettes/03.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/secondary/rock_tunnel/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/04.pal b/data/tilesets/secondary/rock_tunnel/palettes/04.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/rock_tunnel/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/05.pal b/data/tilesets/secondary/rock_tunnel/palettes/05.pal new file mode 100644 index 000000000..c5a653979 --- /dev/null +++ b/data/tilesets/secondary/rock_tunnel/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/06.pal b/data/tilesets/secondary/rock_tunnel/palettes/06.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/rock_tunnel/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/07.pal b/data/tilesets/secondary/rock_tunnel/palettes/07.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/rock_tunnel/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/08.pal b/data/tilesets/secondary/rock_tunnel/palettes/08.pal new file mode 100644 index 000000000..34a637b1a --- /dev/null +++ b/data/tilesets/secondary/rock_tunnel/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +205 189 115 +172 172 115 +156 156 115 +131 131 115 +98 106 90 +255 0 255 +255 0 255 +255 0 255 +197 230 230 +180 213 213 +172 189 197 +131 156 156 +90 115 115 +74 82 82 +49 57 57 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/09.pal b/data/tilesets/secondary/rock_tunnel/palettes/09.pal new file mode 100644 index 000000000..f10a94f7c --- /dev/null +++ b/data/tilesets/secondary/rock_tunnel/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +205 189 115 +172 172 115 +156 156 115 +131 131 115 +238 222 123 +255 0 255 +222 180 57 +189 148 57 +148 115 74 +106 106 82 +74 74 74 +0 0 0 +98 139 197 +74 115 172 +57 98 156 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/1.pal b/data/tilesets/secondary/rock_tunnel/palettes/1.pal deleted file mode 100644 index d8a4e7757..000000000 --- a/data/tilesets/secondary/rock_tunnel/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/2.pal b/data/tilesets/secondary/rock_tunnel/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/rock_tunnel/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/3.pal b/data/tilesets/secondary/rock_tunnel/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/secondary/rock_tunnel/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/4.pal b/data/tilesets/secondary/rock_tunnel/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/rock_tunnel/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/5.pal b/data/tilesets/secondary/rock_tunnel/palettes/5.pal deleted file mode 100644 index c5a653979..000000000 --- a/data/tilesets/secondary/rock_tunnel/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/6.pal b/data/tilesets/secondary/rock_tunnel/palettes/6.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/rock_tunnel/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/7.pal b/data/tilesets/secondary/rock_tunnel/palettes/7.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/rock_tunnel/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/8.pal b/data/tilesets/secondary/rock_tunnel/palettes/8.pal deleted file mode 100644 index 34a637b1a..000000000 --- a/data/tilesets/secondary/rock_tunnel/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -205 189 115 -172 172 115 -156 156 115 -131 131 115 -98 106 90 -255 0 255 -255 0 255 -255 0 255 -197 230 230 -180 213 213 -172 189 197 -131 156 156 -90 115 115 -74 82 82 -49 57 57 diff --git a/data/tilesets/secondary/rock_tunnel/palettes/9.pal b/data/tilesets/secondary/rock_tunnel/palettes/9.pal deleted file mode 100644 index f10a94f7c..000000000 --- a/data/tilesets/secondary/rock_tunnel/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -205 189 115 -172 172 115 -156 156 115 -131 131 115 -238 222 123 -255 0 255 -222 180 57 -189 148 57 -148 115 74 -106 106 82 -74 74 74 -0 0 0 -98 139 197 -74 115 172 -57 98 156 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/0.pal b/data/tilesets/secondary/safari_zone_building/palettes/0.pal deleted file mode 100644 index 620015e77..000000000 --- a/data/tilesets/secondary/safari_zone_building/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 139 49 -57 82 0 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/00.pal b/data/tilesets/secondary/safari_zone_building/palettes/00.pal new file mode 100644 index 000000000..620015e77 --- /dev/null +++ b/data/tilesets/secondary/safari_zone_building/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 139 49 +57 82 0 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/01.pal b/data/tilesets/secondary/safari_zone_building/palettes/01.pal new file mode 100644 index 000000000..66561f6d3 --- /dev/null +++ b/data/tilesets/secondary/safari_zone_building/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +139 180 222 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/02.pal b/data/tilesets/secondary/safari_zone_building/palettes/02.pal new file mode 100644 index 000000000..ddec077d0 --- /dev/null +++ b/data/tilesets/secondary/safari_zone_building/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +115 82 74 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +197 172 139 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/03.pal b/data/tilesets/secondary/safari_zone_building/palettes/03.pal new file mode 100644 index 000000000..6d1dfb5af --- /dev/null +++ b/data/tilesets/secondary/safari_zone_building/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 238 246 +189 139 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +172 32 41 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/04.pal b/data/tilesets/secondary/safari_zone_building/palettes/04.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/safari_zone_building/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/05.pal b/data/tilesets/secondary/safari_zone_building/palettes/05.pal new file mode 100644 index 000000000..9de0ef422 --- /dev/null +++ b/data/tilesets/secondary/safari_zone_building/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +222 205 131 +205 180 106 +180 139 74 +238 238 164 +255 0 255 +255 0 255 +180 222 164 +131 213 164 +115 205 164 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/06.pal b/data/tilesets/secondary/safari_zone_building/palettes/06.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/safari_zone_building/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/07.pal b/data/tilesets/secondary/safari_zone_building/palettes/07.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/safari_zone_building/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/08.pal b/data/tilesets/secondary/safari_zone_building/palettes/08.pal new file mode 100644 index 000000000..eed6dbc35 --- /dev/null +++ b/data/tilesets/secondary/safari_zone_building/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +123 197 180 +74 74 90 +123 123 131 +189 197 189 +255 0 255 +205 222 222 +90 90 65 +131 115 74 +148 148 115 +189 189 131 +238 238 139 +238 238 246 +74 98 65 +74 156 65 +115 197 98 +156 230 98 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/09.pal b/data/tilesets/secondary/safari_zone_building/palettes/09.pal new file mode 100644 index 000000000..e9b93cfd2 --- /dev/null +++ b/data/tilesets/secondary/safari_zone_building/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +123 197 180 +74 74 90 +123 123 131 +205 213 213 +205 156 115 +238 172 115 +106 123 74 +156 148 98 +197 172 115 +222 205 139 +230 222 156 +90 90 49 +213 180 230 +164 139 197 +148 115 172 +123 98 131 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/1.pal b/data/tilesets/secondary/safari_zone_building/palettes/1.pal deleted file mode 100644 index 66561f6d3..000000000 --- a/data/tilesets/secondary/safari_zone_building/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -139 180 222 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/2.pal b/data/tilesets/secondary/safari_zone_building/palettes/2.pal deleted file mode 100644 index ddec077d0..000000000 --- a/data/tilesets/secondary/safari_zone_building/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -115 82 74 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -197 172 139 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/3.pal b/data/tilesets/secondary/safari_zone_building/palettes/3.pal deleted file mode 100644 index 6d1dfb5af..000000000 --- a/data/tilesets/secondary/safari_zone_building/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 238 246 -189 139 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -172 32 41 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/4.pal b/data/tilesets/secondary/safari_zone_building/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/safari_zone_building/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/5.pal b/data/tilesets/secondary/safari_zone_building/palettes/5.pal deleted file mode 100644 index 9de0ef422..000000000 --- a/data/tilesets/secondary/safari_zone_building/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -222 205 131 -205 180 106 -180 139 74 -238 238 164 -255 0 255 -255 0 255 -180 222 164 -131 213 164 -115 205 164 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/6.pal b/data/tilesets/secondary/safari_zone_building/palettes/6.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/safari_zone_building/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/7.pal b/data/tilesets/secondary/safari_zone_building/palettes/7.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/safari_zone_building/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/8.pal b/data/tilesets/secondary/safari_zone_building/palettes/8.pal deleted file mode 100644 index eed6dbc35..000000000 --- a/data/tilesets/secondary/safari_zone_building/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -123 197 180 -74 74 90 -123 123 131 -189 197 189 -255 0 255 -205 222 222 -90 90 65 -131 115 74 -148 148 115 -189 189 131 -238 238 139 -238 238 246 -74 98 65 -74 156 65 -115 197 98 -156 230 98 diff --git a/data/tilesets/secondary/safari_zone_building/palettes/9.pal b/data/tilesets/secondary/safari_zone_building/palettes/9.pal deleted file mode 100644 index e9b93cfd2..000000000 --- a/data/tilesets/secondary/safari_zone_building/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -123 197 180 -74 74 90 -123 123 131 -205 213 213 -205 156 115 -238 172 115 -106 123 74 -156 148 98 -197 172 115 -222 205 139 -230 222 156 -90 90 49 -213 180 230 -164 139 197 -148 115 172 -123 98 131 diff --git a/data/tilesets/secondary/saffron_city/palettes/0.pal b/data/tilesets/secondary/saffron_city/palettes/0.pal deleted file mode 100644 index 9dcb673aa..000000000 --- a/data/tilesets/secondary/saffron_city/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -189 255 139 -131 213 98 -57 148 49 -57 82 0 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/saffron_city/palettes/00.pal b/data/tilesets/secondary/saffron_city/palettes/00.pal new file mode 100644 index 000000000..9dcb673aa --- /dev/null +++ b/data/tilesets/secondary/saffron_city/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +189 255 139 +131 213 98 +57 148 49 +57 82 0 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/saffron_city/palettes/01.pal b/data/tilesets/secondary/saffron_city/palettes/01.pal new file mode 100644 index 000000000..391d1e3d1 --- /dev/null +++ b/data/tilesets/secondary/saffron_city/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 189 164 +189 148 139 +156 115 115 +123 82 82 +90 57 74 +115 205 164 diff --git a/data/tilesets/secondary/saffron_city/palettes/02.pal b/data/tilesets/secondary/saffron_city/palettes/02.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/saffron_city/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/saffron_city/palettes/03.pal b/data/tilesets/secondary/saffron_city/palettes/03.pal new file mode 100644 index 000000000..973765509 --- /dev/null +++ b/data/tilesets/secondary/saffron_city/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/saffron_city/palettes/04.pal b/data/tilesets/secondary/saffron_city/palettes/04.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/saffron_city/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/saffron_city/palettes/05.pal b/data/tilesets/secondary/saffron_city/palettes/05.pal new file mode 100644 index 000000000..3a2db72a7 --- /dev/null +++ b/data/tilesets/secondary/saffron_city/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +222 205 131 +205 180 106 +180 139 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/saffron_city/palettes/06.pal b/data/tilesets/secondary/saffron_city/palettes/06.pal new file mode 100644 index 000000000..93518605a --- /dev/null +++ b/data/tilesets/secondary/saffron_city/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/saffron_city/palettes/07.pal b/data/tilesets/secondary/saffron_city/palettes/07.pal new file mode 100644 index 000000000..93518605a --- /dev/null +++ b/data/tilesets/secondary/saffron_city/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/saffron_city/palettes/08.pal b/data/tilesets/secondary/saffron_city/palettes/08.pal new file mode 100644 index 000000000..b1e168855 --- /dev/null +++ b/data/tilesets/secondary/saffron_city/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +197 197 197 +222 222 230 +148 164 180 +123 123 131 +65 74 106 +246 246 255 +205 164 255 +164 131 205 +123 90 164 +255 0 255 +255 0 255 +255 0 255 +164 131 205 +205 164 255 +90 90 115 diff --git a/data/tilesets/secondary/saffron_city/palettes/09.pal b/data/tilesets/secondary/saffron_city/palettes/09.pal new file mode 100644 index 000000000..7a88fdbbf --- /dev/null +++ b/data/tilesets/secondary/saffron_city/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +255 255 255 +205 205 213 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 238 246 +255 238 139 +230 189 82 +238 148 115 +222 246 255 +172 230 255 +123 205 213 +197 106 74 diff --git a/data/tilesets/secondary/saffron_city/palettes/1.pal b/data/tilesets/secondary/saffron_city/palettes/1.pal deleted file mode 100644 index 391d1e3d1..000000000 --- a/data/tilesets/secondary/saffron_city/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 189 164 -189 148 139 -156 115 115 -123 82 82 -90 57 74 -115 205 164 diff --git a/data/tilesets/secondary/saffron_city/palettes/2.pal b/data/tilesets/secondary/saffron_city/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/saffron_city/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/saffron_city/palettes/3.pal b/data/tilesets/secondary/saffron_city/palettes/3.pal deleted file mode 100644 index 973765509..000000000 --- a/data/tilesets/secondary/saffron_city/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/saffron_city/palettes/4.pal b/data/tilesets/secondary/saffron_city/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/saffron_city/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/saffron_city/palettes/5.pal b/data/tilesets/secondary/saffron_city/palettes/5.pal deleted file mode 100644 index 3a2db72a7..000000000 --- a/data/tilesets/secondary/saffron_city/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -222 205 131 -205 180 106 -180 139 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/saffron_city/palettes/6.pal b/data/tilesets/secondary/saffron_city/palettes/6.pal deleted file mode 100644 index 93518605a..000000000 --- a/data/tilesets/secondary/saffron_city/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/saffron_city/palettes/7.pal b/data/tilesets/secondary/saffron_city/palettes/7.pal deleted file mode 100644 index 93518605a..000000000 --- a/data/tilesets/secondary/saffron_city/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/saffron_city/palettes/8.pal b/data/tilesets/secondary/saffron_city/palettes/8.pal deleted file mode 100644 index b1e168855..000000000 --- a/data/tilesets/secondary/saffron_city/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -197 197 197 -222 222 230 -148 164 180 -123 123 131 -65 74 106 -246 246 255 -205 164 255 -164 131 205 -123 90 164 -255 0 255 -255 0 255 -255 0 255 -164 131 205 -205 164 255 -90 90 115 diff --git a/data/tilesets/secondary/saffron_city/palettes/9.pal b/data/tilesets/secondary/saffron_city/palettes/9.pal deleted file mode 100644 index 7a88fdbbf..000000000 --- a/data/tilesets/secondary/saffron_city/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -255 255 255 -205 205 213 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 238 246 -255 238 139 -230 189 82 -238 148 115 -222 246 255 -172 230 255 -123 205 213 -197 106 74 diff --git a/data/tilesets/secondary/saffron_gym/palettes/0.pal b/data/tilesets/secondary/saffron_gym/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/saffron_gym/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/saffron_gym/palettes/00.pal b/data/tilesets/secondary/saffron_gym/palettes/00.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/saffron_gym/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/saffron_gym/palettes/01.pal b/data/tilesets/secondary/saffron_gym/palettes/01.pal new file mode 100644 index 000000000..3a16a45c7 --- /dev/null +++ b/data/tilesets/secondary/saffron_gym/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +238 246 238 diff --git a/data/tilesets/secondary/saffron_gym/palettes/02.pal b/data/tilesets/secondary/saffron_gym/palettes/02.pal new file mode 100644 index 000000000..c8ee236d7 --- /dev/null +++ b/data/tilesets/secondary/saffron_gym/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +255 0 255 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/saffron_gym/palettes/03.pal b/data/tilesets/secondary/saffron_gym/palettes/03.pal new file mode 100644 index 000000000..b17dbb054 --- /dev/null +++ b/data/tilesets/secondary/saffron_gym/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +164 164 164 +180 189 189 +255 255 255 +238 246 238 +213 230 222 +197 205 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/saffron_gym/palettes/04.pal b/data/tilesets/secondary/saffron_gym/palettes/04.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/saffron_gym/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/saffron_gym/palettes/05.pal b/data/tilesets/secondary/saffron_gym/palettes/05.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/saffron_gym/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/saffron_gym/palettes/06.pal b/data/tilesets/secondary/saffron_gym/palettes/06.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/saffron_gym/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/saffron_gym/palettes/07.pal b/data/tilesets/secondary/saffron_gym/palettes/07.pal new file mode 100644 index 000000000..c66eaedff --- /dev/null +++ b/data/tilesets/secondary/saffron_gym/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 131 +197 189 213 +255 255 255 +180 123 148 +230 139 230 +255 222 255 +213 213 222 +213 98 65 +246 139 106 +255 0 255 +255 0 255 +255 0 255 +205 246 255 +98 197 238 diff --git a/data/tilesets/secondary/saffron_gym/palettes/08.pal b/data/tilesets/secondary/saffron_gym/palettes/08.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/saffron_gym/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/saffron_gym/palettes/09.pal b/data/tilesets/secondary/saffron_gym/palettes/09.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/saffron_gym/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/saffron_gym/palettes/1.pal b/data/tilesets/secondary/saffron_gym/palettes/1.pal deleted file mode 100644 index 3a16a45c7..000000000 --- a/data/tilesets/secondary/saffron_gym/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -238 246 238 diff --git a/data/tilesets/secondary/saffron_gym/palettes/2.pal b/data/tilesets/secondary/saffron_gym/palettes/2.pal deleted file mode 100644 index c8ee236d7..000000000 --- a/data/tilesets/secondary/saffron_gym/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -255 0 255 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/saffron_gym/palettes/3.pal b/data/tilesets/secondary/saffron_gym/palettes/3.pal deleted file mode 100644 index b17dbb054..000000000 --- a/data/tilesets/secondary/saffron_gym/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -164 164 164 -180 189 189 -255 255 255 -238 246 238 -213 230 222 -197 205 197 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/saffron_gym/palettes/4.pal b/data/tilesets/secondary/saffron_gym/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/saffron_gym/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/saffron_gym/palettes/5.pal b/data/tilesets/secondary/saffron_gym/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/saffron_gym/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/saffron_gym/palettes/6.pal b/data/tilesets/secondary/saffron_gym/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/saffron_gym/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/saffron_gym/palettes/7.pal b/data/tilesets/secondary/saffron_gym/palettes/7.pal deleted file mode 100644 index c66eaedff..000000000 --- a/data/tilesets/secondary/saffron_gym/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 131 -197 189 213 -255 255 255 -180 123 148 -230 139 230 -255 222 255 -213 213 222 -213 98 65 -246 139 106 -255 0 255 -255 0 255 -255 0 255 -205 246 255 -98 197 238 diff --git a/data/tilesets/secondary/saffron_gym/palettes/8.pal b/data/tilesets/secondary/saffron_gym/palettes/8.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/saffron_gym/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/saffron_gym/palettes/9.pal b/data/tilesets/secondary/saffron_gym/palettes/9.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/saffron_gym/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/school/palettes/0.pal b/data/tilesets/secondary/school/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/school/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/school/palettes/00.pal b/data/tilesets/secondary/school/palettes/00.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/school/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/school/palettes/01.pal b/data/tilesets/secondary/school/palettes/01.pal new file mode 100644 index 000000000..30be2fbe3 --- /dev/null +++ b/data/tilesets/secondary/school/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/school/palettes/02.pal b/data/tilesets/secondary/school/palettes/02.pal new file mode 100644 index 000000000..e7c4b911a --- /dev/null +++ b/data/tilesets/secondary/school/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/school/palettes/03.pal b/data/tilesets/secondary/school/palettes/03.pal new file mode 100644 index 000000000..54b77e0c8 --- /dev/null +++ b/data/tilesets/secondary/school/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/school/palettes/04.pal b/data/tilesets/secondary/school/palettes/04.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/school/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/school/palettes/05.pal b/data/tilesets/secondary/school/palettes/05.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/school/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/school/palettes/06.pal b/data/tilesets/secondary/school/palettes/06.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/school/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/school/palettes/07.pal b/data/tilesets/secondary/school/palettes/07.pal new file mode 100644 index 000000000..6c1a5b096 --- /dev/null +++ b/data/tilesets/secondary/school/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +172 148 90 +213 189 131 +255 230 172 +255 255 98 +255 197 197 +98 156 74 +148 205 123 +98 156 172 +123 180 197 +156 205 222 +189 230 246 diff --git a/data/tilesets/secondary/school/palettes/08.pal b/data/tilesets/secondary/school/palettes/08.pal new file mode 100644 index 000000000..1557a55f0 --- /dev/null +++ b/data/tilesets/secondary/school/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +123 131 82 +139 148 82 +156 164 90 +172 180 106 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/school/palettes/09.pal b/data/tilesets/secondary/school/palettes/09.pal new file mode 100644 index 000000000..c06a049b0 --- /dev/null +++ b/data/tilesets/secondary/school/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/school/palettes/1.pal b/data/tilesets/secondary/school/palettes/1.pal deleted file mode 100644 index 30be2fbe3..000000000 --- a/data/tilesets/secondary/school/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/school/palettes/2.pal b/data/tilesets/secondary/school/palettes/2.pal deleted file mode 100644 index e7c4b911a..000000000 --- a/data/tilesets/secondary/school/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/school/palettes/3.pal b/data/tilesets/secondary/school/palettes/3.pal deleted file mode 100644 index 54b77e0c8..000000000 --- a/data/tilesets/secondary/school/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/school/palettes/4.pal b/data/tilesets/secondary/school/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/school/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/school/palettes/5.pal b/data/tilesets/secondary/school/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/school/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/school/palettes/6.pal b/data/tilesets/secondary/school/palettes/6.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/school/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/school/palettes/7.pal b/data/tilesets/secondary/school/palettes/7.pal deleted file mode 100644 index 6c1a5b096..000000000 --- a/data/tilesets/secondary/school/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -172 148 90 -213 189 131 -255 230 172 -255 255 98 -255 197 197 -98 156 74 -148 205 123 -98 156 172 -123 180 197 -156 205 222 -189 230 246 diff --git a/data/tilesets/secondary/school/palettes/8.pal b/data/tilesets/secondary/school/palettes/8.pal deleted file mode 100644 index 1557a55f0..000000000 --- a/data/tilesets/secondary/school/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -123 131 82 -139 148 82 -156 164 90 -172 180 106 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/school/palettes/9.pal b/data/tilesets/secondary/school/palettes/9.pal deleted file mode 100644 index c06a049b0..000000000 --- a/data/tilesets/secondary/school/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/sea_cottage/palettes/0.pal b/data/tilesets/secondary/sea_cottage/palettes/0.pal deleted file mode 100644 index ed708dd79..000000000 --- a/data/tilesets/secondary/sea_cottage/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 205 172 -189 255 139 -131 213 98 -57 148 49 -57 82 0 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/sea_cottage/palettes/00.pal b/data/tilesets/secondary/sea_cottage/palettes/00.pal new file mode 100644 index 000000000..ed708dd79 --- /dev/null +++ b/data/tilesets/secondary/sea_cottage/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 205 172 +189 255 139 +131 213 98 +57 148 49 +57 82 0 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/sea_cottage/palettes/01.pal b/data/tilesets/secondary/sea_cottage/palettes/01.pal new file mode 100644 index 000000000..4d2b48991 --- /dev/null +++ b/data/tilesets/secondary/sea_cottage/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 205 172 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 189 164 +189 148 139 +156 115 115 +123 82 82 +90 57 74 +115 205 164 diff --git a/data/tilesets/secondary/sea_cottage/palettes/02.pal b/data/tilesets/secondary/sea_cottage/palettes/02.pal new file mode 100644 index 000000000..878c13c95 --- /dev/null +++ b/data/tilesets/secondary/sea_cottage/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 205 172 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/sea_cottage/palettes/03.pal b/data/tilesets/secondary/sea_cottage/palettes/03.pal new file mode 100644 index 000000000..bed4c20c3 --- /dev/null +++ b/data/tilesets/secondary/sea_cottage/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 205 172 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/sea_cottage/palettes/04.pal b/data/tilesets/secondary/sea_cottage/palettes/04.pal new file mode 100644 index 000000000..b77ba3e87 --- /dev/null +++ b/data/tilesets/secondary/sea_cottage/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 205 172 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/sea_cottage/palettes/05.pal b/data/tilesets/secondary/sea_cottage/palettes/05.pal new file mode 100644 index 000000000..74a2a9ed0 --- /dev/null +++ b/data/tilesets/secondary/sea_cottage/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 205 172 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +222 205 131 +205 180 106 +180 139 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/sea_cottage/palettes/06.pal b/data/tilesets/secondary/sea_cottage/palettes/06.pal new file mode 100644 index 000000000..93518605a --- /dev/null +++ b/data/tilesets/secondary/sea_cottage/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/sea_cottage/palettes/07.pal b/data/tilesets/secondary/sea_cottage/palettes/07.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/sea_cottage/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/sea_cottage/palettes/08.pal b/data/tilesets/secondary/sea_cottage/palettes/08.pal new file mode 100644 index 000000000..370a3d2db --- /dev/null +++ b/data/tilesets/secondary/sea_cottage/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 205 172 +82 82 106 +131 131 131 +139 164 164 +164 189 189 +205 222 222 +205 238 238 +90 139 115 +139 148 115 +106 189 197 +82 180 106 +115 222 148 +148 246 180 +131 123 57 +197 106 74 +238 148 74 diff --git a/data/tilesets/secondary/sea_cottage/palettes/09.pal b/data/tilesets/secondary/sea_cottage/palettes/09.pal new file mode 100644 index 000000000..1193cc807 --- /dev/null +++ b/data/tilesets/secondary/sea_cottage/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 205 172 +82 82 106 +131 131 131 +98 106 148 +115 131 197 +139 164 230 +164 213 246 +197 197 197 +238 230 205 +255 0 255 +106 98 90 +131 115 90 +156 139 90 +131 139 90 +164 156 90 +189 172 90 diff --git a/data/tilesets/secondary/sea_cottage/palettes/1.pal b/data/tilesets/secondary/sea_cottage/palettes/1.pal deleted file mode 100644 index 4d2b48991..000000000 --- a/data/tilesets/secondary/sea_cottage/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 205 172 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 189 164 -189 148 139 -156 115 115 -123 82 82 -90 57 74 -115 205 164 diff --git a/data/tilesets/secondary/sea_cottage/palettes/2.pal b/data/tilesets/secondary/sea_cottage/palettes/2.pal deleted file mode 100644 index 878c13c95..000000000 --- a/data/tilesets/secondary/sea_cottage/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 205 172 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/sea_cottage/palettes/3.pal b/data/tilesets/secondary/sea_cottage/palettes/3.pal deleted file mode 100644 index bed4c20c3..000000000 --- a/data/tilesets/secondary/sea_cottage/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 205 172 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/sea_cottage/palettes/4.pal b/data/tilesets/secondary/sea_cottage/palettes/4.pal deleted file mode 100644 index b77ba3e87..000000000 --- a/data/tilesets/secondary/sea_cottage/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 205 172 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/sea_cottage/palettes/5.pal b/data/tilesets/secondary/sea_cottage/palettes/5.pal deleted file mode 100644 index 74a2a9ed0..000000000 --- a/data/tilesets/secondary/sea_cottage/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 205 172 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -222 205 131 -205 180 106 -180 139 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/sea_cottage/palettes/6.pal b/data/tilesets/secondary/sea_cottage/palettes/6.pal deleted file mode 100644 index 93518605a..000000000 --- a/data/tilesets/secondary/sea_cottage/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/sea_cottage/palettes/7.pal b/data/tilesets/secondary/sea_cottage/palettes/7.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/sea_cottage/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/sea_cottage/palettes/8.pal b/data/tilesets/secondary/sea_cottage/palettes/8.pal deleted file mode 100644 index 370a3d2db..000000000 --- a/data/tilesets/secondary/sea_cottage/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 205 172 -82 82 106 -131 131 131 -139 164 164 -164 189 189 -205 222 222 -205 238 238 -90 139 115 -139 148 115 -106 189 197 -82 180 106 -115 222 148 -148 246 180 -131 123 57 -197 106 74 -238 148 74 diff --git a/data/tilesets/secondary/sea_cottage/palettes/9.pal b/data/tilesets/secondary/sea_cottage/palettes/9.pal deleted file mode 100644 index 1193cc807..000000000 --- a/data/tilesets/secondary/sea_cottage/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 205 172 -82 82 106 -131 131 131 -98 106 148 -115 131 197 -139 164 230 -164 213 246 -197 197 197 -238 230 205 -255 0 255 -106 98 90 -131 115 90 -156 139 90 -131 139 90 -164 156 90 -189 172 90 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/0.pal b/data/tilesets/secondary/seafoam_islands/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/seafoam_islands/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/00.pal b/data/tilesets/secondary/seafoam_islands/palettes/00.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/seafoam_islands/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/01.pal b/data/tilesets/secondary/seafoam_islands/palettes/01.pal new file mode 100644 index 000000000..d8a4e7757 --- /dev/null +++ b/data/tilesets/secondary/seafoam_islands/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/02.pal b/data/tilesets/secondary/seafoam_islands/palettes/02.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/seafoam_islands/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/03.pal b/data/tilesets/secondary/seafoam_islands/palettes/03.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/secondary/seafoam_islands/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/04.pal b/data/tilesets/secondary/seafoam_islands/palettes/04.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/seafoam_islands/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/05.pal b/data/tilesets/secondary/seafoam_islands/palettes/05.pal new file mode 100644 index 000000000..c5a653979 --- /dev/null +++ b/data/tilesets/secondary/seafoam_islands/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/06.pal b/data/tilesets/secondary/seafoam_islands/palettes/06.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/seafoam_islands/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/07.pal b/data/tilesets/secondary/seafoam_islands/palettes/07.pal new file mode 100644 index 000000000..995731c23 --- /dev/null +++ b/data/tilesets/secondary/seafoam_islands/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/08.pal b/data/tilesets/secondary/seafoam_islands/palettes/08.pal new file mode 100644 index 000000000..d96f3f0fc --- /dev/null +++ b/data/tilesets/secondary/seafoam_islands/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +189 213 230 +189 197 230 +172 180 213 +148 156 172 +156 238 255 +164 246 255 +213 255 255 +205 230 238 +238 238 246 +180 205 238 +123 180 230 +90 156 197 +98 123 172 +82 98 131 +65 74 82 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/09.pal b/data/tilesets/secondary/seafoam_islands/palettes/09.pal new file mode 100644 index 000000000..1a1dc881b --- /dev/null +++ b/data/tilesets/secondary/seafoam_islands/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +189 213 230 +189 197 230 +172 180 213 +148 156 172 +255 238 164 +238 230 139 +230 205 90 +197 172 74 +156 123 57 +106 82 115 +65 57 74 +0 0 0 +98 139 197 +74 115 172 +57 98 156 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/1.pal b/data/tilesets/secondary/seafoam_islands/palettes/1.pal deleted file mode 100644 index d8a4e7757..000000000 --- a/data/tilesets/secondary/seafoam_islands/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/2.pal b/data/tilesets/secondary/seafoam_islands/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/seafoam_islands/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/3.pal b/data/tilesets/secondary/seafoam_islands/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/secondary/seafoam_islands/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/4.pal b/data/tilesets/secondary/seafoam_islands/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/seafoam_islands/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/5.pal b/data/tilesets/secondary/seafoam_islands/palettes/5.pal deleted file mode 100644 index c5a653979..000000000 --- a/data/tilesets/secondary/seafoam_islands/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/6.pal b/data/tilesets/secondary/seafoam_islands/palettes/6.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/seafoam_islands/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/7.pal b/data/tilesets/secondary/seafoam_islands/palettes/7.pal deleted file mode 100644 index 995731c23..000000000 --- a/data/tilesets/secondary/seafoam_islands/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/8.pal b/data/tilesets/secondary/seafoam_islands/palettes/8.pal deleted file mode 100644 index d96f3f0fc..000000000 --- a/data/tilesets/secondary/seafoam_islands/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -189 213 230 -189 197 230 -172 180 213 -148 156 172 -156 238 255 -164 246 255 -213 255 255 -205 230 238 -238 238 246 -180 205 238 -123 180 230 -90 156 197 -98 123 172 -82 98 131 -65 74 82 diff --git a/data/tilesets/secondary/seafoam_islands/palettes/9.pal b/data/tilesets/secondary/seafoam_islands/palettes/9.pal deleted file mode 100644 index 1a1dc881b..000000000 --- a/data/tilesets/secondary/seafoam_islands/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -189 213 230 -189 197 230 -172 180 213 -148 156 172 -255 238 164 -238 230 139 -230 205 90 -197 172 74 -156 123 57 -106 82 115 -65 57 74 -0 0 0 -98 139 197 -74 115 172 -57 98 156 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/0.pal b/data/tilesets/secondary/sevii_islands_123/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/sevii_islands_123/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/00.pal b/data/tilesets/secondary/sevii_islands_123/palettes/00.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_123/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/01.pal b/data/tilesets/secondary/sevii_islands_123/palettes/01.pal new file mode 100644 index 000000000..e15d979f1 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_123/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +222 230 230 +197 205 213 +172 189 205 +123 123 131 +65 49 65 +230 238 238 +90 189 139 +90 90 115 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/02.pal b/data/tilesets/secondary/sevii_islands_123/palettes/02.pal new file mode 100644 index 000000000..372fb5d7c --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_123/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/03.pal b/data/tilesets/secondary/sevii_islands_123/palettes/03.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_123/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/04.pal b/data/tilesets/secondary/sevii_islands_123/palettes/04.pal new file mode 100644 index 000000000..fca4a2623 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_123/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +213 238 255 +172 205 255 +139 180 238 +106 156 230 +74 139 189 +65 123 189 +82 139 205 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +49 115 172 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/05.pal b/data/tilesets/secondary/sevii_islands_123/palettes/05.pal new file mode 100644 index 000000000..09555ded5 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_123/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/06.pal b/data/tilesets/secondary/sevii_islands_123/palettes/06.pal new file mode 100644 index 000000000..f8ebbc6dc --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_123/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +213 238 255 +172 205 255 +139 180 238 +106 156 230 +65 123 172 +41 98 156 +74 115 197 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +49 115 172 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/07.pal b/data/tilesets/secondary/sevii_islands_123/palettes/07.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_123/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/08.pal b/data/tilesets/secondary/sevii_islands_123/palettes/08.pal new file mode 100644 index 000000000..4d9ab6348 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_123/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +131 197 164 +98 164 131 +123 123 131 +90 90 115 +65 74 106 +222 230 238 +197 213 230 +164 180 197 +255 222 255 +222 172 230 +172 123 189 +148 98 164 +115 65 131 +238 213 156 +205 189 123 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/09.pal b/data/tilesets/secondary/sevii_islands_123/palettes/09.pal new file mode 100644 index 000000000..b66fdcdbf --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_123/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +115 189 246 +98 164 222 +123 123 131 +90 90 115 +65 74 106 +246 246 213 +230 230 189 +189 189 148 +172 172 131 +156 156 115 +230 222 115 +246 156 115 +222 115 98 +131 230 180 +49 164 123 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/1.pal b/data/tilesets/secondary/sevii_islands_123/palettes/1.pal deleted file mode 100644 index e15d979f1..000000000 --- a/data/tilesets/secondary/sevii_islands_123/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -222 230 230 -197 205 213 -172 189 205 -123 123 131 -65 49 65 -230 238 238 -90 189 139 -90 90 115 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/2.pal b/data/tilesets/secondary/sevii_islands_123/palettes/2.pal deleted file mode 100644 index 372fb5d7c..000000000 --- a/data/tilesets/secondary/sevii_islands_123/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/3.pal b/data/tilesets/secondary/sevii_islands_123/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/secondary/sevii_islands_123/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/4.pal b/data/tilesets/secondary/sevii_islands_123/palettes/4.pal deleted file mode 100644 index fca4a2623..000000000 --- a/data/tilesets/secondary/sevii_islands_123/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -213 238 255 -172 205 255 -139 180 238 -106 156 230 -74 139 189 -65 123 189 -82 139 205 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -49 115 172 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/5.pal b/data/tilesets/secondary/sevii_islands_123/palettes/5.pal deleted file mode 100644 index 09555ded5..000000000 --- a/data/tilesets/secondary/sevii_islands_123/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/6.pal b/data/tilesets/secondary/sevii_islands_123/palettes/6.pal deleted file mode 100644 index f8ebbc6dc..000000000 --- a/data/tilesets/secondary/sevii_islands_123/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -213 238 255 -172 205 255 -139 180 238 -106 156 230 -65 123 172 -41 98 156 -74 115 197 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -49 115 172 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/7.pal b/data/tilesets/secondary/sevii_islands_123/palettes/7.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/sevii_islands_123/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/8.pal b/data/tilesets/secondary/sevii_islands_123/palettes/8.pal deleted file mode 100644 index 4d9ab6348..000000000 --- a/data/tilesets/secondary/sevii_islands_123/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -131 197 164 -98 164 131 -123 123 131 -90 90 115 -65 74 106 -222 230 238 -197 213 230 -164 180 197 -255 222 255 -222 172 230 -172 123 189 -148 98 164 -115 65 131 -238 213 156 -205 189 123 diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/9.pal b/data/tilesets/secondary/sevii_islands_123/palettes/9.pal deleted file mode 100644 index b66fdcdbf..000000000 --- a/data/tilesets/secondary/sevii_islands_123/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -115 189 246 -98 164 222 -123 123 131 -90 90 115 -65 74 106 -246 246 213 -230 230 189 -189 189 148 -172 172 131 -156 156 115 -230 222 115 -246 156 115 -222 115 98 -131 230 180 -49 164 123 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/0.pal b/data/tilesets/secondary/sevii_islands_45/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/sevii_islands_45/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/00.pal b/data/tilesets/secondary/sevii_islands_45/palettes/00.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_45/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/01.pal b/data/tilesets/secondary/sevii_islands_45/palettes/01.pal new file mode 100644 index 000000000..d8a4e7757 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_45/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/02.pal b/data/tilesets/secondary/sevii_islands_45/palettes/02.pal new file mode 100644 index 000000000..372fb5d7c --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_45/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/03.pal b/data/tilesets/secondary/sevii_islands_45/palettes/03.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_45/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/04.pal b/data/tilesets/secondary/sevii_islands_45/palettes/04.pal new file mode 100644 index 000000000..fca4a2623 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_45/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +213 238 255 +172 205 255 +139 180 238 +106 156 230 +74 139 189 +65 123 189 +82 139 205 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +49 115 172 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/05.pal b/data/tilesets/secondary/sevii_islands_45/palettes/05.pal new file mode 100644 index 000000000..09555ded5 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_45/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/06.pal b/data/tilesets/secondary/sevii_islands_45/palettes/06.pal new file mode 100644 index 000000000..f8ebbc6dc --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_45/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +213 238 255 +172 205 255 +139 180 238 +106 156 230 +65 123 172 +41 98 156 +74 115 197 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +49 115 172 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/07.pal b/data/tilesets/secondary/sevii_islands_45/palettes/07.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_45/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/08.pal b/data/tilesets/secondary/sevii_islands_45/palettes/08.pal new file mode 100644 index 000000000..4d9ab6348 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_45/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +131 197 164 +98 164 131 +123 123 131 +90 90 115 +65 74 106 +222 230 238 +197 213 230 +164 180 197 +255 222 255 +222 172 230 +172 123 189 +148 98 164 +115 65 131 +238 213 156 +205 189 123 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/09.pal b/data/tilesets/secondary/sevii_islands_45/palettes/09.pal new file mode 100644 index 000000000..5ac617b25 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_45/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +156 156 222 +255 238 189 +123 123 131 +90 90 115 +65 74 106 +222 230 238 +197 213 230 +164 180 197 +255 222 139 +230 172 98 +213 139 74 +197 115 49 +156 90 16 +115 189 246 +74 131 197 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/1.pal b/data/tilesets/secondary/sevii_islands_45/palettes/1.pal deleted file mode 100644 index d8a4e7757..000000000 --- a/data/tilesets/secondary/sevii_islands_45/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/2.pal b/data/tilesets/secondary/sevii_islands_45/palettes/2.pal deleted file mode 100644 index 372fb5d7c..000000000 --- a/data/tilesets/secondary/sevii_islands_45/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/3.pal b/data/tilesets/secondary/sevii_islands_45/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/secondary/sevii_islands_45/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/4.pal b/data/tilesets/secondary/sevii_islands_45/palettes/4.pal deleted file mode 100644 index fca4a2623..000000000 --- a/data/tilesets/secondary/sevii_islands_45/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -213 238 255 -172 205 255 -139 180 238 -106 156 230 -74 139 189 -65 123 189 -82 139 205 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -49 115 172 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/5.pal b/data/tilesets/secondary/sevii_islands_45/palettes/5.pal deleted file mode 100644 index 09555ded5..000000000 --- a/data/tilesets/secondary/sevii_islands_45/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/6.pal b/data/tilesets/secondary/sevii_islands_45/palettes/6.pal deleted file mode 100644 index f8ebbc6dc..000000000 --- a/data/tilesets/secondary/sevii_islands_45/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -213 238 255 -172 205 255 -139 180 238 -106 156 230 -65 123 172 -41 98 156 -74 115 197 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -49 115 172 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/7.pal b/data/tilesets/secondary/sevii_islands_45/palettes/7.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/sevii_islands_45/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/8.pal b/data/tilesets/secondary/sevii_islands_45/palettes/8.pal deleted file mode 100644 index 4d9ab6348..000000000 --- a/data/tilesets/secondary/sevii_islands_45/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -131 197 164 -98 164 131 -123 123 131 -90 90 115 -65 74 106 -222 230 238 -197 213 230 -164 180 197 -255 222 255 -222 172 230 -172 123 189 -148 98 164 -115 65 131 -238 213 156 -205 189 123 diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/9.pal b/data/tilesets/secondary/sevii_islands_45/palettes/9.pal deleted file mode 100644 index 5ac617b25..000000000 --- a/data/tilesets/secondary/sevii_islands_45/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -156 156 222 -255 238 189 -123 123 131 -90 90 115 -65 74 106 -222 230 238 -197 213 230 -164 180 197 -255 222 139 -230 172 98 -213 139 74 -197 115 49 -156 90 16 -115 189 246 -74 131 197 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/0.pal b/data/tilesets/secondary/sevii_islands_67/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/sevii_islands_67/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/00.pal b/data/tilesets/secondary/sevii_islands_67/palettes/00.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_67/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/01.pal b/data/tilesets/secondary/sevii_islands_67/palettes/01.pal new file mode 100644 index 000000000..09828f4f1 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_67/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +123 123 131 +32 49 57 +230 238 238 +90 189 139 +90 90 115 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +123 74 74 +90 57 65 +115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/02.pal b/data/tilesets/secondary/sevii_islands_67/palettes/02.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_67/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/03.pal b/data/tilesets/secondary/sevii_islands_67/palettes/03.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_67/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/04.pal b/data/tilesets/secondary/sevii_islands_67/palettes/04.pal new file mode 100644 index 000000000..5871a448c --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_67/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +230 246 255 +189 222 255 +139 189 255 +115 164 255 +65 139 222 +57 115 222 +82 148 230 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +49 115 197 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/05.pal b/data/tilesets/secondary/sevii_islands_67/palettes/05.pal new file mode 100644 index 000000000..c5a653979 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_67/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/06.pal b/data/tilesets/secondary/sevii_islands_67/palettes/06.pal new file mode 100644 index 000000000..9bad44649 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_67/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +205 230 246 +180 213 255 +123 180 246 +98 148 230 +65 123 189 +49 98 180 +82 131 222 +213 230 238 +172 189 205 +123 123 131 +90 90 115 +238 246 246 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/07.pal b/data/tilesets/secondary/sevii_islands_67/palettes/07.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_67/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/08.pal b/data/tilesets/secondary/sevii_islands_67/palettes/08.pal new file mode 100644 index 000000000..4d9ab6348 --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_67/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +131 197 164 +98 164 131 +123 123 131 +90 90 115 +65 74 106 +222 230 238 +197 213 230 +164 180 197 +255 222 255 +222 172 230 +172 123 189 +148 98 164 +115 65 131 +238 213 156 +205 189 123 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/09.pal b/data/tilesets/secondary/sevii_islands_67/palettes/09.pal new file mode 100644 index 000000000..edc5961bb --- /dev/null +++ b/data/tilesets/secondary/sevii_islands_67/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +238 246 255 +197 213 222 +139 156 172 +123 123 131 +90 90 115 +65 74 106 +115 172 246 +65 123 172 +49 90 139 +32 74 123 +189 230 164 +115 156 90 +148 131 74 +156 213 255 +98 164 230 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/1.pal b/data/tilesets/secondary/sevii_islands_67/palettes/1.pal deleted file mode 100644 index 09828f4f1..000000000 --- a/data/tilesets/secondary/sevii_islands_67/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -123 123 131 -32 49 57 -230 238 238 -90 189 139 -90 90 115 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -123 74 74 -90 57 65 -115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/2.pal b/data/tilesets/secondary/sevii_islands_67/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/sevii_islands_67/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/3.pal b/data/tilesets/secondary/sevii_islands_67/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/secondary/sevii_islands_67/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/4.pal b/data/tilesets/secondary/sevii_islands_67/palettes/4.pal deleted file mode 100644 index 5871a448c..000000000 --- a/data/tilesets/secondary/sevii_islands_67/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -230 246 255 -189 222 255 -139 189 255 -115 164 255 -65 139 222 -57 115 222 -82 148 230 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -49 115 197 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/5.pal b/data/tilesets/secondary/sevii_islands_67/palettes/5.pal deleted file mode 100644 index c5a653979..000000000 --- a/data/tilesets/secondary/sevii_islands_67/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/6.pal b/data/tilesets/secondary/sevii_islands_67/palettes/6.pal deleted file mode 100644 index 9bad44649..000000000 --- a/data/tilesets/secondary/sevii_islands_67/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -205 230 246 -180 213 255 -123 180 246 -98 148 230 -65 123 189 -49 98 180 -82 131 222 -213 230 238 -172 189 205 -123 123 131 -90 90 115 -238 246 246 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/7.pal b/data/tilesets/secondary/sevii_islands_67/palettes/7.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/sevii_islands_67/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/8.pal b/data/tilesets/secondary/sevii_islands_67/palettes/8.pal deleted file mode 100644 index 4d9ab6348..000000000 --- a/data/tilesets/secondary/sevii_islands_67/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -131 197 164 -98 164 131 -123 123 131 -90 90 115 -65 74 106 -222 230 238 -197 213 230 -164 180 197 -255 222 255 -222 172 230 -172 123 189 -148 98 164 -115 65 131 -238 213 156 -205 189 123 diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/9.pal b/data/tilesets/secondary/sevii_islands_67/palettes/9.pal deleted file mode 100644 index edc5961bb..000000000 --- a/data/tilesets/secondary/sevii_islands_67/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -238 246 255 -197 213 222 -139 156 172 -123 123 131 -90 90 115 -65 74 106 -115 172 246 -65 123 172 -49 90 139 -32 74 123 -189 230 164 -115 156 90 -148 131 74 -156 213 255 -98 164 230 diff --git a/data/tilesets/secondary/ss_anne/palettes/0.pal b/data/tilesets/secondary/ss_anne/palettes/0.pal deleted file mode 100644 index 28232d99e..000000000 --- a/data/tilesets/secondary/ss_anne/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/ss_anne/palettes/00.pal b/data/tilesets/secondary/ss_anne/palettes/00.pal new file mode 100644 index 000000000..28232d99e --- /dev/null +++ b/data/tilesets/secondary/ss_anne/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/ss_anne/palettes/01.pal b/data/tilesets/secondary/ss_anne/palettes/01.pal new file mode 100644 index 000000000..b43532470 --- /dev/null +++ b/data/tilesets/secondary/ss_anne/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/ss_anne/palettes/02.pal b/data/tilesets/secondary/ss_anne/palettes/02.pal new file mode 100644 index 000000000..e267ae90e --- /dev/null +++ b/data/tilesets/secondary/ss_anne/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/ss_anne/palettes/03.pal b/data/tilesets/secondary/ss_anne/palettes/03.pal new file mode 100644 index 000000000..503f22878 --- /dev/null +++ b/data/tilesets/secondary/ss_anne/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/ss_anne/palettes/04.pal b/data/tilesets/secondary/ss_anne/palettes/04.pal new file mode 100644 index 000000000..cdf1b6190 --- /dev/null +++ b/data/tilesets/secondary/ss_anne/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +222 255 255 +172 222 255 +148 189 238 +106 156 230 +57 148 197 +32 131 172 +82 148 213 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +230 213 148 +238 230 139 +222 197 139 +213 189 106 diff --git a/data/tilesets/secondary/ss_anne/palettes/05.pal b/data/tilesets/secondary/ss_anne/palettes/05.pal new file mode 100644 index 000000000..09555ded5 --- /dev/null +++ b/data/tilesets/secondary/ss_anne/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/ss_anne/palettes/06.pal b/data/tilesets/secondary/ss_anne/palettes/06.pal new file mode 100644 index 000000000..0dba59a72 --- /dev/null +++ b/data/tilesets/secondary/ss_anne/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +222 255 255 +172 222 255 +148 189 238 +106 156 230 +41 90 172 +41 57 148 +74 123 197 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +230 213 148 +238 230 139 +222 197 139 +213 189 106 diff --git a/data/tilesets/secondary/ss_anne/palettes/07.pal b/data/tilesets/secondary/ss_anne/palettes/07.pal new file mode 100644 index 000000000..e9848a1c0 --- /dev/null +++ b/data/tilesets/secondary/ss_anne/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 205 156 +82 82 106 +115 115 139 +148 148 172 +189 189 205 +222 222 230 +255 255 255 +180 180 74 +205 205 98 +255 255 98 +98 98 172 +131 131 213 +164 164 255 +131 98 41 +164 139 82 +205 180 123 diff --git a/data/tilesets/secondary/ss_anne/palettes/08.pal b/data/tilesets/secondary/ss_anne/palettes/08.pal new file mode 100644 index 000000000..b5c80c8f4 --- /dev/null +++ b/data/tilesets/secondary/ss_anne/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 205 156 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +90 156 57 +131 180 49 +172 205 49 +197 230 98 +222 255 148 +222 172 98 +255 197 98 +255 222 156 +131 98 41 +164 139 82 +205 180 123 diff --git a/data/tilesets/secondary/ss_anne/palettes/09.pal b/data/tilesets/secondary/ss_anne/palettes/09.pal new file mode 100644 index 000000000..b66b2399a --- /dev/null +++ b/data/tilesets/secondary/ss_anne/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 205 156 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +255 0 255 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +255 0 255 +255 0 255 +255 0 255 +131 98 41 +164 139 82 +205 180 123 diff --git a/data/tilesets/secondary/ss_anne/palettes/1.pal b/data/tilesets/secondary/ss_anne/palettes/1.pal deleted file mode 100644 index b43532470..000000000 --- a/data/tilesets/secondary/ss_anne/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/ss_anne/palettes/2.pal b/data/tilesets/secondary/ss_anne/palettes/2.pal deleted file mode 100644 index e267ae90e..000000000 --- a/data/tilesets/secondary/ss_anne/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/ss_anne/palettes/3.pal b/data/tilesets/secondary/ss_anne/palettes/3.pal deleted file mode 100644 index 503f22878..000000000 --- a/data/tilesets/secondary/ss_anne/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/ss_anne/palettes/4.pal b/data/tilesets/secondary/ss_anne/palettes/4.pal deleted file mode 100644 index cdf1b6190..000000000 --- a/data/tilesets/secondary/ss_anne/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -222 255 255 -172 222 255 -148 189 238 -106 156 230 -57 148 197 -32 131 172 -82 148 213 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -230 213 148 -238 230 139 -222 197 139 -213 189 106 diff --git a/data/tilesets/secondary/ss_anne/palettes/5.pal b/data/tilesets/secondary/ss_anne/palettes/5.pal deleted file mode 100644 index 09555ded5..000000000 --- a/data/tilesets/secondary/ss_anne/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/ss_anne/palettes/6.pal b/data/tilesets/secondary/ss_anne/palettes/6.pal deleted file mode 100644 index 0dba59a72..000000000 --- a/data/tilesets/secondary/ss_anne/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -222 255 255 -172 222 255 -148 189 238 -106 156 230 -41 90 172 -41 57 148 -74 123 197 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -230 213 148 -238 230 139 -222 197 139 -213 189 106 diff --git a/data/tilesets/secondary/ss_anne/palettes/7.pal b/data/tilesets/secondary/ss_anne/palettes/7.pal deleted file mode 100644 index e9848a1c0..000000000 --- a/data/tilesets/secondary/ss_anne/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -156 205 156 -82 82 106 -115 115 139 -148 148 172 -189 189 205 -222 222 230 -255 255 255 -180 180 74 -205 205 98 -255 255 98 -98 98 172 -131 131 213 -164 164 255 -131 98 41 -164 139 82 -205 180 123 diff --git a/data/tilesets/secondary/ss_anne/palettes/8.pal b/data/tilesets/secondary/ss_anne/palettes/8.pal deleted file mode 100644 index b5c80c8f4..000000000 --- a/data/tilesets/secondary/ss_anne/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -156 205 156 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -90 156 57 -131 180 49 -172 205 49 -197 230 98 -222 255 148 -222 172 98 -255 197 98 -255 222 156 -131 98 41 -164 139 82 -205 180 123 diff --git a/data/tilesets/secondary/ss_anne/palettes/9.pal b/data/tilesets/secondary/ss_anne/palettes/9.pal deleted file mode 100644 index b66b2399a..000000000 --- a/data/tilesets/secondary/ss_anne/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -156 205 156 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -255 0 255 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -255 0 255 -255 0 255 -255 0 255 -131 98 41 -164 139 82 -205 180 123 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/0.pal b/data/tilesets/secondary/tanoby_ruins/palettes/0.pal deleted file mode 100644 index 83b30fc17..000000000 --- a/data/tilesets/secondary/tanoby_ruins/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 172 82 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/00.pal b/data/tilesets/secondary/tanoby_ruins/palettes/00.pal new file mode 100644 index 000000000..83b30fc17 --- /dev/null +++ b/data/tilesets/secondary/tanoby_ruins/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 172 82 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/01.pal b/data/tilesets/secondary/tanoby_ruins/palettes/01.pal new file mode 100644 index 000000000..66561f6d3 --- /dev/null +++ b/data/tilesets/secondary/tanoby_ruins/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +139 180 222 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/02.pal b/data/tilesets/secondary/tanoby_ruins/palettes/02.pal new file mode 100644 index 000000000..87a022102 --- /dev/null +++ b/data/tilesets/secondary/tanoby_ruins/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +90 90 115 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/03.pal b/data/tilesets/secondary/tanoby_ruins/palettes/03.pal new file mode 100644 index 000000000..783496dcd --- /dev/null +++ b/data/tilesets/secondary/tanoby_ruins/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +65 98 156 +90 123 180 +115 156 197 +222 213 131 +164 164 172 +205 205 213 +238 238 246 +106 172 115 +156 205 139 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/04.pal b/data/tilesets/secondary/tanoby_ruins/palettes/04.pal new file mode 100644 index 000000000..89eace605 --- /dev/null +++ b/data/tilesets/secondary/tanoby_ruins/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 238 246 +172 197 180 +197 222 205 +90 189 172 +246 238 156 +205 189 131 +189 164 123 +148 131 106 +106 106 106 +213 222 230 +238 180 115 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/05.pal b/data/tilesets/secondary/tanoby_ruins/palettes/05.pal new file mode 100644 index 000000000..c7780e5c7 --- /dev/null +++ b/data/tilesets/secondary/tanoby_ruins/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +213 222 222 +164 180 189 +255 0 255 +131 115 74 +213 213 148 +197 189 139 +172 156 115 +148 131 90 +197 197 205 +205 82 65 +0 0 0 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/06.pal b/data/tilesets/secondary/tanoby_ruins/palettes/06.pal new file mode 100644 index 000000000..1d08ce9a2 --- /dev/null +++ b/data/tilesets/secondary/tanoby_ruins/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/07.pal b/data/tilesets/secondary/tanoby_ruins/palettes/07.pal new file mode 100644 index 000000000..dfa779635 --- /dev/null +++ b/data/tilesets/secondary/tanoby_ruins/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 172 82 +82 82 106 +131 131 131 +98 131 131 +139 172 172 +164 205 189 +98 106 131 +90 98 106 +98 156 197 +164 172 139 +139 156 139 +115 123 123 +205 213 156 +180 197 156 +164 172 156 +90 0 255 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/08.pal b/data/tilesets/secondary/tanoby_ruins/palettes/08.pal new file mode 100644 index 000000000..fd7d8a9d7 --- /dev/null +++ b/data/tilesets/secondary/tanoby_ruins/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 172 82 +82 82 106 +230 222 164 +156 148 90 +123 115 115 +205 197 106 +164 156 90 +189 172 90 +246 246 222 +238 238 164 +98 106 90 +205 213 156 +139 148 106 +98 98 106 +205 139 189 +213 148 74 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/09.pal b/data/tilesets/secondary/tanoby_ruins/palettes/09.pal new file mode 100644 index 000000000..0d43d6ef9 --- /dev/null +++ b/data/tilesets/secondary/tanoby_ruins/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 172 82 +82 82 106 +230 222 164 +156 148 90 +123 115 115 +205 197 106 +164 156 90 +189 172 90 +246 246 222 +238 238 164 +98 106 90 +205 213 156 +139 148 106 +98 98 106 +131 205 82 +230 213 82 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/1.pal b/data/tilesets/secondary/tanoby_ruins/palettes/1.pal deleted file mode 100644 index 66561f6d3..000000000 --- a/data/tilesets/secondary/tanoby_ruins/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -139 180 222 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/2.pal b/data/tilesets/secondary/tanoby_ruins/palettes/2.pal deleted file mode 100644 index 87a022102..000000000 --- a/data/tilesets/secondary/tanoby_ruins/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -90 90 115 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/3.pal b/data/tilesets/secondary/tanoby_ruins/palettes/3.pal deleted file mode 100644 index 783496dcd..000000000 --- a/data/tilesets/secondary/tanoby_ruins/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -65 98 156 -90 123 180 -115 156 197 -222 213 131 -164 164 172 -205 205 213 -238 238 246 -106 172 115 -156 205 139 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/4.pal b/data/tilesets/secondary/tanoby_ruins/palettes/4.pal deleted file mode 100644 index 89eace605..000000000 --- a/data/tilesets/secondary/tanoby_ruins/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 238 246 -172 197 180 -197 222 205 -90 189 172 -246 238 156 -205 189 131 -189 164 123 -148 131 106 -106 106 106 -213 222 230 -238 180 115 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/5.pal b/data/tilesets/secondary/tanoby_ruins/palettes/5.pal deleted file mode 100644 index c7780e5c7..000000000 --- a/data/tilesets/secondary/tanoby_ruins/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -213 222 222 -164 180 189 -255 0 255 -131 115 74 -213 213 148 -197 189 139 -172 156 115 -148 131 90 -197 197 205 -205 82 65 -0 0 0 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/6.pal b/data/tilesets/secondary/tanoby_ruins/palettes/6.pal deleted file mode 100644 index 1d08ce9a2..000000000 --- a/data/tilesets/secondary/tanoby_ruins/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/7.pal b/data/tilesets/secondary/tanoby_ruins/palettes/7.pal deleted file mode 100644 index dfa779635..000000000 --- a/data/tilesets/secondary/tanoby_ruins/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 172 82 -82 82 106 -131 131 131 -98 131 131 -139 172 172 -164 205 189 -98 106 131 -90 98 106 -98 156 197 -164 172 139 -139 156 139 -115 123 123 -205 213 156 -180 197 156 -164 172 156 -90 0 255 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/8.pal b/data/tilesets/secondary/tanoby_ruins/palettes/8.pal deleted file mode 100644 index fd7d8a9d7..000000000 --- a/data/tilesets/secondary/tanoby_ruins/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 172 82 -82 82 106 -230 222 164 -156 148 90 -123 115 115 -205 197 106 -164 156 90 -189 172 90 -246 246 222 -238 238 164 -98 106 90 -205 213 156 -139 148 106 -98 98 106 -205 139 189 -213 148 74 diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/9.pal b/data/tilesets/secondary/tanoby_ruins/palettes/9.pal deleted file mode 100644 index 0d43d6ef9..000000000 --- a/data/tilesets/secondary/tanoby_ruins/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 172 82 -82 82 106 -230 222 164 -156 148 90 -123 115 115 -205 197 106 -164 156 90 -189 172 90 -246 246 222 -238 238 164 -98 106 90 -205 213 156 -139 148 106 -98 98 106 -131 205 82 -230 213 82 diff --git a/data/tilesets/secondary/trainer_tower/palettes/0.pal b/data/tilesets/secondary/trainer_tower/palettes/0.pal deleted file mode 100644 index 8db07d418..000000000 --- a/data/tilesets/secondary/trainer_tower/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/trainer_tower/palettes/00.pal b/data/tilesets/secondary/trainer_tower/palettes/00.pal new file mode 100644 index 000000000..8db07d418 --- /dev/null +++ b/data/tilesets/secondary/trainer_tower/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/trainer_tower/palettes/01.pal b/data/tilesets/secondary/trainer_tower/palettes/01.pal new file mode 100644 index 000000000..66561f6d3 --- /dev/null +++ b/data/tilesets/secondary/trainer_tower/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +139 180 222 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/trainer_tower/palettes/02.pal b/data/tilesets/secondary/trainer_tower/palettes/02.pal new file mode 100644 index 000000000..87a022102 --- /dev/null +++ b/data/tilesets/secondary/trainer_tower/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +90 90 115 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/trainer_tower/palettes/03.pal b/data/tilesets/secondary/trainer_tower/palettes/03.pal new file mode 100644 index 000000000..783496dcd --- /dev/null +++ b/data/tilesets/secondary/trainer_tower/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +65 98 156 +90 123 180 +115 156 197 +222 213 131 +164 164 172 +205 205 213 +238 238 246 +106 172 115 +156 205 139 diff --git a/data/tilesets/secondary/trainer_tower/palettes/04.pal b/data/tilesets/secondary/trainer_tower/palettes/04.pal new file mode 100644 index 000000000..89eace605 --- /dev/null +++ b/data/tilesets/secondary/trainer_tower/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 238 246 +172 197 180 +197 222 205 +90 189 172 +246 238 156 +205 189 131 +189 164 123 +148 131 106 +106 106 106 +213 222 230 +238 180 115 diff --git a/data/tilesets/secondary/trainer_tower/palettes/05.pal b/data/tilesets/secondary/trainer_tower/palettes/05.pal new file mode 100644 index 000000000..c7780e5c7 --- /dev/null +++ b/data/tilesets/secondary/trainer_tower/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +213 222 222 +164 180 189 +255 0 255 +131 115 74 +213 213 148 +197 189 139 +172 156 115 +148 131 90 +197 197 205 +205 82 65 +0 0 0 diff --git a/data/tilesets/secondary/trainer_tower/palettes/06.pal b/data/tilesets/secondary/trainer_tower/palettes/06.pal new file mode 100644 index 000000000..1d08ce9a2 --- /dev/null +++ b/data/tilesets/secondary/trainer_tower/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/trainer_tower/palettes/07.pal b/data/tilesets/secondary/trainer_tower/palettes/07.pal new file mode 100644 index 000000000..edc5961bb --- /dev/null +++ b/data/tilesets/secondary/trainer_tower/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +238 246 255 +197 213 222 +139 156 172 +123 123 131 +90 90 115 +65 74 106 +115 172 246 +65 123 172 +49 90 139 +32 74 123 +189 230 164 +115 156 90 +148 131 74 +156 213 255 +98 164 230 diff --git a/data/tilesets/secondary/trainer_tower/palettes/08.pal b/data/tilesets/secondary/trainer_tower/palettes/08.pal new file mode 100644 index 000000000..317213c42 --- /dev/null +++ b/data/tilesets/secondary/trainer_tower/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +123 74 148 +148 106 180 +230 213 246 +205 172 213 +222 213 90 +197 189 65 +189 180 49 +172 164 32 +213 205 90 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/trainer_tower/palettes/09.pal b/data/tilesets/secondary/trainer_tower/palettes/09.pal new file mode 100644 index 000000000..19dc9a47e --- /dev/null +++ b/data/tilesets/secondary/trainer_tower/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +255 0 255 +255 131 115 +106 197 106 +164 255 180 +238 197 115 +213 131 74 +189 213 230 +123 156 180 +90 123 156 +156 180 205 +222 230 238 diff --git a/data/tilesets/secondary/trainer_tower/palettes/1.pal b/data/tilesets/secondary/trainer_tower/palettes/1.pal deleted file mode 100644 index 66561f6d3..000000000 --- a/data/tilesets/secondary/trainer_tower/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -139 180 222 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/trainer_tower/palettes/2.pal b/data/tilesets/secondary/trainer_tower/palettes/2.pal deleted file mode 100644 index 87a022102..000000000 --- a/data/tilesets/secondary/trainer_tower/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -90 90 115 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/trainer_tower/palettes/3.pal b/data/tilesets/secondary/trainer_tower/palettes/3.pal deleted file mode 100644 index 783496dcd..000000000 --- a/data/tilesets/secondary/trainer_tower/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -65 98 156 -90 123 180 -115 156 197 -222 213 131 -164 164 172 -205 205 213 -238 238 246 -106 172 115 -156 205 139 diff --git a/data/tilesets/secondary/trainer_tower/palettes/4.pal b/data/tilesets/secondary/trainer_tower/palettes/4.pal deleted file mode 100644 index 89eace605..000000000 --- a/data/tilesets/secondary/trainer_tower/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 238 246 -172 197 180 -197 222 205 -90 189 172 -246 238 156 -205 189 131 -189 164 123 -148 131 106 -106 106 106 -213 222 230 -238 180 115 diff --git a/data/tilesets/secondary/trainer_tower/palettes/5.pal b/data/tilesets/secondary/trainer_tower/palettes/5.pal deleted file mode 100644 index c7780e5c7..000000000 --- a/data/tilesets/secondary/trainer_tower/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -213 222 222 -164 180 189 -255 0 255 -131 115 74 -213 213 148 -197 189 139 -172 156 115 -148 131 90 -197 197 205 -205 82 65 -0 0 0 diff --git a/data/tilesets/secondary/trainer_tower/palettes/6.pal b/data/tilesets/secondary/trainer_tower/palettes/6.pal deleted file mode 100644 index 1d08ce9a2..000000000 --- a/data/tilesets/secondary/trainer_tower/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/trainer_tower/palettes/7.pal b/data/tilesets/secondary/trainer_tower/palettes/7.pal deleted file mode 100644 index edc5961bb..000000000 --- a/data/tilesets/secondary/trainer_tower/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -238 246 255 -197 213 222 -139 156 172 -123 123 131 -90 90 115 -65 74 106 -115 172 246 -65 123 172 -49 90 139 -32 74 123 -189 230 164 -115 156 90 -148 131 74 -156 213 255 -98 164 230 diff --git a/data/tilesets/secondary/trainer_tower/palettes/8.pal b/data/tilesets/secondary/trainer_tower/palettes/8.pal deleted file mode 100644 index 317213c42..000000000 --- a/data/tilesets/secondary/trainer_tower/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -123 74 148 -148 106 180 -230 213 246 -205 172 213 -222 213 90 -197 189 65 -189 180 49 -172 164 32 -213 205 90 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/trainer_tower/palettes/9.pal b/data/tilesets/secondary/trainer_tower/palettes/9.pal deleted file mode 100644 index 19dc9a47e..000000000 --- a/data/tilesets/secondary/trainer_tower/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -255 0 255 -255 131 115 -106 197 106 -164 255 180 -238 197 115 -213 131 74 -189 213 230 -123 156 180 -90 123 156 -156 180 205 -222 230 238 diff --git a/data/tilesets/secondary/underground_path/palettes/0.pal b/data/tilesets/secondary/underground_path/palettes/0.pal deleted file mode 100644 index 6d876039d..000000000 --- a/data/tilesets/secondary/underground_path/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/underground_path/palettes/00.pal b/data/tilesets/secondary/underground_path/palettes/00.pal new file mode 100644 index 000000000..6d876039d --- /dev/null +++ b/data/tilesets/secondary/underground_path/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/underground_path/palettes/01.pal b/data/tilesets/secondary/underground_path/palettes/01.pal new file mode 100644 index 000000000..66561f6d3 --- /dev/null +++ b/data/tilesets/secondary/underground_path/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +139 180 222 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +246 238 148 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/underground_path/palettes/02.pal b/data/tilesets/secondary/underground_path/palettes/02.pal new file mode 100644 index 000000000..87a022102 --- /dev/null +++ b/data/tilesets/secondary/underground_path/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +197 189 213 +255 255 255 +106 197 106 +230 213 123 +255 205 90 +255 238 197 +90 90 115 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/underground_path/palettes/03.pal b/data/tilesets/secondary/underground_path/palettes/03.pal new file mode 100644 index 000000000..783496dcd --- /dev/null +++ b/data/tilesets/secondary/underground_path/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 180 74 +255 246 131 +65 98 156 +90 123 180 +115 156 197 +222 213 131 +164 164 172 +205 205 213 +238 238 246 +106 172 115 +156 205 139 diff --git a/data/tilesets/secondary/underground_path/palettes/04.pal b/data/tilesets/secondary/underground_path/palettes/04.pal new file mode 100644 index 000000000..89eace605 --- /dev/null +++ b/data/tilesets/secondary/underground_path/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +230 238 246 +172 197 180 +197 222 205 +90 189 172 +246 238 156 +205 189 131 +189 164 123 +148 131 106 +106 106 106 +213 222 230 +238 180 115 diff --git a/data/tilesets/secondary/underground_path/palettes/05.pal b/data/tilesets/secondary/underground_path/palettes/05.pal new file mode 100644 index 000000000..0eef3df8e --- /dev/null +++ b/data/tilesets/secondary/underground_path/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +213 222 222 +164 180 189 +255 0 255 +131 115 74 +213 213 148 +197 189 139 +172 156 115 +148 131 90 +255 0 255 +255 0 255 +0 0 0 diff --git a/data/tilesets/secondary/underground_path/palettes/06.pal b/data/tilesets/secondary/underground_path/palettes/06.pal new file mode 100644 index 000000000..1d08ce9a2 --- /dev/null +++ b/data/tilesets/secondary/underground_path/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/underground_path/palettes/07.pal b/data/tilesets/secondary/underground_path/palettes/07.pal new file mode 100644 index 000000000..23e995640 --- /dev/null +++ b/data/tilesets/secondary/underground_path/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +148 148 156 +205 205 197 +148 139 90 +172 164 106 +197 189 131 +82 139 148 +115 164 172 +156 189 197 +180 90 74 +205 115 90 +238 156 123 diff --git a/data/tilesets/secondary/underground_path/palettes/08.pal b/data/tilesets/secondary/underground_path/palettes/08.pal new file mode 100644 index 000000000..3ce3570a1 --- /dev/null +++ b/data/tilesets/secondary/underground_path/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +82 82 106 +123 123 123 +172 172 164 +255 255 255 +255 255 156 +197 197 156 +172 172 139 +148 148 131 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/underground_path/palettes/09.pal b/data/tilesets/secondary/underground_path/palettes/09.pal new file mode 100644 index 000000000..e12b8edac --- /dev/null +++ b/data/tilesets/secondary/underground_path/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 189 115 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/underground_path/palettes/1.pal b/data/tilesets/secondary/underground_path/palettes/1.pal deleted file mode 100644 index 66561f6d3..000000000 --- a/data/tilesets/secondary/underground_path/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -139 180 222 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -246 238 148 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/underground_path/palettes/2.pal b/data/tilesets/secondary/underground_path/palettes/2.pal deleted file mode 100644 index 87a022102..000000000 --- a/data/tilesets/secondary/underground_path/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -197 189 213 -255 255 255 -106 197 106 -230 213 123 -255 205 90 -255 238 197 -90 90 115 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/underground_path/palettes/3.pal b/data/tilesets/secondary/underground_path/palettes/3.pal deleted file mode 100644 index 783496dcd..000000000 --- a/data/tilesets/secondary/underground_path/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 180 74 -255 246 131 -65 98 156 -90 123 180 -115 156 197 -222 213 131 -164 164 172 -205 205 213 -238 238 246 -106 172 115 -156 205 139 diff --git a/data/tilesets/secondary/underground_path/palettes/4.pal b/data/tilesets/secondary/underground_path/palettes/4.pal deleted file mode 100644 index 89eace605..000000000 --- a/data/tilesets/secondary/underground_path/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -230 238 246 -172 197 180 -197 222 205 -90 189 172 -246 238 156 -205 189 131 -189 164 123 -148 131 106 -106 106 106 -213 222 230 -238 180 115 diff --git a/data/tilesets/secondary/underground_path/palettes/5.pal b/data/tilesets/secondary/underground_path/palettes/5.pal deleted file mode 100644 index 0eef3df8e..000000000 --- a/data/tilesets/secondary/underground_path/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -213 222 222 -164 180 189 -255 0 255 -131 115 74 -213 213 148 -197 189 139 -172 156 115 -148 131 90 -255 0 255 -255 0 255 -0 0 0 diff --git a/data/tilesets/secondary/underground_path/palettes/6.pal b/data/tilesets/secondary/underground_path/palettes/6.pal deleted file mode 100644 index 1d08ce9a2..000000000 --- a/data/tilesets/secondary/underground_path/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 172 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/underground_path/palettes/7.pal b/data/tilesets/secondary/underground_path/palettes/7.pal deleted file mode 100644 index 23e995640..000000000 --- a/data/tilesets/secondary/underground_path/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -148 148 156 -205 205 197 -148 139 90 -172 164 106 -197 189 131 -82 139 148 -115 164 172 -156 189 197 -180 90 74 -205 115 90 -238 156 123 diff --git a/data/tilesets/secondary/underground_path/palettes/8.pal b/data/tilesets/secondary/underground_path/palettes/8.pal deleted file mode 100644 index 3ce3570a1..000000000 --- a/data/tilesets/secondary/underground_path/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -82 82 106 -123 123 123 -172 172 164 -255 255 255 -255 255 156 -197 197 156 -172 172 139 -148 148 131 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/underground_path/palettes/9.pal b/data/tilesets/secondary/underground_path/palettes/9.pal deleted file mode 100644 index e12b8edac..000000000 --- a/data/tilesets/secondary/underground_path/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -172 189 115 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/0.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/unused_gatehouse1/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/00.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/00.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse1/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/01.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/01.pal new file mode 100644 index 000000000..d99adafff --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse1/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/02.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/02.pal new file mode 100644 index 000000000..cc3a9457d --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse1/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/03.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/03.pal new file mode 100644 index 000000000..7ec794ae5 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse1/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/04.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/04.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse1/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/05.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/05.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse1/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/06.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/06.pal new file mode 100644 index 000000000..2903bb074 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse1/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +131 131 131 +180 180 164 +255 255 255 +189 164 82 +222 197 106 +230 222 156 +123 197 189 +156 222 213 +213 255 246 +255 0 255 +255 0 255 +213 131 65 +222 230 222 +246 238 189 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/07.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/07.pal new file mode 100644 index 000000000..c62a40b0d --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse1/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +148 172 139 +180 197 164 +213 222 197 +238 255 213 +115 156 180 +197 222 238 +123 197 189 +156 222 213 +213 255 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/08.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/08.pal new file mode 100644 index 000000000..8c66b4998 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse1/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +230 222 156 +189 98 74 +230 156 98 +213 205 156 +115 156 180 +246 238 189 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/09.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/09.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse1/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/1.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/1.pal deleted file mode 100644 index d99adafff..000000000 --- a/data/tilesets/secondary/unused_gatehouse1/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/2.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/2.pal deleted file mode 100644 index cc3a9457d..000000000 --- a/data/tilesets/secondary/unused_gatehouse1/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/3.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/3.pal deleted file mode 100644 index 7ec794ae5..000000000 --- a/data/tilesets/secondary/unused_gatehouse1/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/4.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/unused_gatehouse1/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/5.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/unused_gatehouse1/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/6.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/6.pal deleted file mode 100644 index 2903bb074..000000000 --- a/data/tilesets/secondary/unused_gatehouse1/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -131 131 131 -180 180 164 -255 255 255 -189 164 82 -222 197 106 -230 222 156 -123 197 189 -156 222 213 -213 255 246 -255 0 255 -255 0 255 -213 131 65 -222 230 222 -246 238 189 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/7.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/7.pal deleted file mode 100644 index c62a40b0d..000000000 --- a/data/tilesets/secondary/unused_gatehouse1/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -148 172 139 -180 197 164 -213 222 197 -238 255 213 -115 156 180 -197 222 238 -123 197 189 -156 222 213 -213 255 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/8.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/8.pal deleted file mode 100644 index 8c66b4998..000000000 --- a/data/tilesets/secondary/unused_gatehouse1/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -230 222 156 -189 98 74 -230 156 98 -213 205 156 -115 156 180 -246 238 189 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/9.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/9.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/unused_gatehouse1/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/0.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/unused_gatehouse2/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/00.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/00.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse2/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/01.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/01.pal new file mode 100644 index 000000000..d99adafff --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse2/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/02.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/02.pal new file mode 100644 index 000000000..cc3a9457d --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse2/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/03.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/03.pal new file mode 100644 index 000000000..7ec794ae5 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse2/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/04.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/04.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse2/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/05.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/05.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse2/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/06.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/06.pal new file mode 100644 index 000000000..2903bb074 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse2/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +131 131 131 +180 180 164 +255 255 255 +189 164 82 +222 197 106 +230 222 156 +123 197 189 +156 222 213 +213 255 246 +255 0 255 +255 0 255 +213 131 65 +222 230 222 +246 238 189 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/07.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/07.pal new file mode 100644 index 000000000..c62a40b0d --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse2/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +148 172 139 +180 197 164 +213 222 197 +238 255 213 +115 156 180 +197 222 238 +123 197 189 +156 222 213 +213 255 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/08.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/08.pal new file mode 100644 index 000000000..8c66b4998 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse2/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +230 222 156 +189 98 74 +230 156 98 +213 205 156 +115 156 180 +246 238 189 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/09.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/09.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/unused_gatehouse2/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/1.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/1.pal deleted file mode 100644 index d99adafff..000000000 --- a/data/tilesets/secondary/unused_gatehouse2/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/2.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/2.pal deleted file mode 100644 index cc3a9457d..000000000 --- a/data/tilesets/secondary/unused_gatehouse2/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/3.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/3.pal deleted file mode 100644 index 7ec794ae5..000000000 --- a/data/tilesets/secondary/unused_gatehouse2/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/4.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/unused_gatehouse2/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/5.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/unused_gatehouse2/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/6.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/6.pal deleted file mode 100644 index 2903bb074..000000000 --- a/data/tilesets/secondary/unused_gatehouse2/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -131 131 131 -180 180 164 -255 255 255 -189 164 82 -222 197 106 -230 222 156 -123 197 189 -156 222 213 -213 255 246 -255 0 255 -255 0 255 -213 131 65 -222 230 222 -246 238 189 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/7.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/7.pal deleted file mode 100644 index c62a40b0d..000000000 --- a/data/tilesets/secondary/unused_gatehouse2/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -148 172 139 -180 197 164 -213 222 197 -238 255 213 -115 156 180 -197 222 238 -123 197 189 -156 222 213 -213 255 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/8.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/8.pal deleted file mode 100644 index 8c66b4998..000000000 --- a/data/tilesets/secondary/unused_gatehouse2/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -230 222 156 -189 98 74 -230 156 98 -213 205 156 -115 156 180 -246 238 189 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/9.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/9.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/unused_gatehouse2/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/vermilion_city/palettes/0.pal b/data/tilesets/secondary/vermilion_city/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/vermilion_city/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/vermilion_city/palettes/00.pal b/data/tilesets/secondary/vermilion_city/palettes/00.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/vermilion_city/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/vermilion_city/palettes/01.pal b/data/tilesets/secondary/vermilion_city/palettes/01.pal new file mode 100644 index 000000000..09828f4f1 --- /dev/null +++ b/data/tilesets/secondary/vermilion_city/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +123 123 131 +32 49 57 +230 238 238 +90 189 139 +90 90 115 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +123 74 74 +90 57 65 +115 205 164 diff --git a/data/tilesets/secondary/vermilion_city/palettes/02.pal b/data/tilesets/secondary/vermilion_city/palettes/02.pal new file mode 100644 index 000000000..372fb5d7c --- /dev/null +++ b/data/tilesets/secondary/vermilion_city/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/vermilion_city/palettes/03.pal b/data/tilesets/secondary/vermilion_city/palettes/03.pal new file mode 100644 index 000000000..205c464c7 --- /dev/null +++ b/data/tilesets/secondary/vermilion_city/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/vermilion_city/palettes/04.pal b/data/tilesets/secondary/vermilion_city/palettes/04.pal new file mode 100644 index 000000000..5871a448c --- /dev/null +++ b/data/tilesets/secondary/vermilion_city/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +230 246 255 +189 222 255 +139 189 255 +115 164 255 +65 139 222 +57 115 222 +82 148 230 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +49 115 197 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/vermilion_city/palettes/05.pal b/data/tilesets/secondary/vermilion_city/palettes/05.pal new file mode 100644 index 000000000..c5a653979 --- /dev/null +++ b/data/tilesets/secondary/vermilion_city/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/vermilion_city/palettes/06.pal b/data/tilesets/secondary/vermilion_city/palettes/06.pal new file mode 100644 index 000000000..9bad44649 --- /dev/null +++ b/data/tilesets/secondary/vermilion_city/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +205 230 246 +180 213 255 +123 180 246 +98 148 230 +65 123 189 +49 98 180 +82 131 222 +213 230 238 +172 189 205 +123 123 131 +90 90 115 +238 246 246 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/tilesets/secondary/vermilion_city/palettes/07.pal b/data/tilesets/secondary/vermilion_city/palettes/07.pal new file mode 100644 index 000000000..17b1a0ed2 --- /dev/null +++ b/data/tilesets/secondary/vermilion_city/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/vermilion_city/palettes/08.pal b/data/tilesets/secondary/vermilion_city/palettes/08.pal new file mode 100644 index 000000000..7179b91bd --- /dev/null +++ b/data/tilesets/secondary/vermilion_city/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 246 172 +255 189 32 +222 156 0 +189 106 57 +123 123 131 +90 90 115 +65 74 106 +255 255 255 +205 205 222 +255 230 131 +238 205 123 +197 164 90 +131 164 197 +255 0 255 +180 156 49 diff --git a/data/tilesets/secondary/vermilion_city/palettes/09.pal b/data/tilesets/secondary/vermilion_city/palettes/09.pal new file mode 100644 index 000000000..746dac7da --- /dev/null +++ b/data/tilesets/secondary/vermilion_city/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +74 123 180 +90 164 213 +57 90 148 +213 148 49 +238 180 82 +205 205 222 +115 189 246 +74 131 197 diff --git a/data/tilesets/secondary/vermilion_city/palettes/1.pal b/data/tilesets/secondary/vermilion_city/palettes/1.pal deleted file mode 100644 index 09828f4f1..000000000 --- a/data/tilesets/secondary/vermilion_city/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -123 123 131 -32 49 57 -230 238 238 -90 189 139 -90 90 115 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -123 74 74 -90 57 65 -115 205 164 diff --git a/data/tilesets/secondary/vermilion_city/palettes/2.pal b/data/tilesets/secondary/vermilion_city/palettes/2.pal deleted file mode 100644 index 372fb5d7c..000000000 --- a/data/tilesets/secondary/vermilion_city/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/vermilion_city/palettes/3.pal b/data/tilesets/secondary/vermilion_city/palettes/3.pal deleted file mode 100644 index 205c464c7..000000000 --- a/data/tilesets/secondary/vermilion_city/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/vermilion_city/palettes/4.pal b/data/tilesets/secondary/vermilion_city/palettes/4.pal deleted file mode 100644 index 5871a448c..000000000 --- a/data/tilesets/secondary/vermilion_city/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -230 246 255 -189 222 255 -139 189 255 -115 164 255 -65 139 222 -57 115 222 -82 148 230 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -49 115 197 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/vermilion_city/palettes/5.pal b/data/tilesets/secondary/vermilion_city/palettes/5.pal deleted file mode 100644 index c5a653979..000000000 --- a/data/tilesets/secondary/vermilion_city/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/vermilion_city/palettes/6.pal b/data/tilesets/secondary/vermilion_city/palettes/6.pal deleted file mode 100644 index 9bad44649..000000000 --- a/data/tilesets/secondary/vermilion_city/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -205 230 246 -180 213 255 -123 180 246 -98 148 230 -65 123 189 -49 98 180 -82 131 222 -213 230 238 -172 189 205 -123 123 131 -90 90 115 -238 246 246 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/tilesets/secondary/vermilion_city/palettes/7.pal b/data/tilesets/secondary/vermilion_city/palettes/7.pal deleted file mode 100644 index 17b1a0ed2..000000000 --- a/data/tilesets/secondary/vermilion_city/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/vermilion_city/palettes/8.pal b/data/tilesets/secondary/vermilion_city/palettes/8.pal deleted file mode 100644 index 7179b91bd..000000000 --- a/data/tilesets/secondary/vermilion_city/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -255 246 172 -255 189 32 -222 156 0 -189 106 57 -123 123 131 -90 90 115 -65 74 106 -255 255 255 -205 205 222 -255 230 131 -238 205 123 -197 164 90 -131 164 197 -255 0 255 -180 156 49 diff --git a/data/tilesets/secondary/vermilion_city/palettes/9.pal b/data/tilesets/secondary/vermilion_city/palettes/9.pal deleted file mode 100644 index 746dac7da..000000000 --- a/data/tilesets/secondary/vermilion_city/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -74 123 180 -90 164 213 -57 90 148 -213 148 49 -238 180 82 -205 205 222 -115 189 246 -74 131 197 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/0.pal b/data/tilesets/secondary/vermilion_gym/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/vermilion_gym/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/00.pal b/data/tilesets/secondary/vermilion_gym/palettes/00.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/vermilion_gym/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/01.pal b/data/tilesets/secondary/vermilion_gym/palettes/01.pal new file mode 100644 index 000000000..d99adafff --- /dev/null +++ b/data/tilesets/secondary/vermilion_gym/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +90 131 180 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/02.pal b/data/tilesets/secondary/vermilion_gym/palettes/02.pal new file mode 100644 index 000000000..cc3a9457d --- /dev/null +++ b/data/tilesets/secondary/vermilion_gym/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +246 238 164 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/03.pal b/data/tilesets/secondary/vermilion_gym/palettes/03.pal new file mode 100644 index 000000000..7ec794ae5 --- /dev/null +++ b/data/tilesets/secondary/vermilion_gym/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +172 172 164 +255 255 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 172 +205 205 213 +238 238 246 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/04.pal b/data/tilesets/secondary/vermilion_gym/palettes/04.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/vermilion_gym/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/05.pal b/data/tilesets/secondary/vermilion_gym/palettes/05.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/vermilion_gym/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/06.pal b/data/tilesets/secondary/vermilion_gym/palettes/06.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/vermilion_gym/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/07.pal b/data/tilesets/secondary/vermilion_gym/palettes/07.pal new file mode 100644 index 000000000..efd64bcc5 --- /dev/null +++ b/data/tilesets/secondary/vermilion_gym/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +32 180 230 +172 255 230 +189 189 115 +238 222 164 +255 255 180 +205 82 65 +255 131 115 +189 180 106 +205 197 123 +222 222 148 +164 164 98 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/08.pal b/data/tilesets/secondary/vermilion_gym/palettes/08.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/vermilion_gym/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/09.pal b/data/tilesets/secondary/vermilion_gym/palettes/09.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/vermilion_gym/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/1.pal b/data/tilesets/secondary/vermilion_gym/palettes/1.pal deleted file mode 100644 index d99adafff..000000000 --- a/data/tilesets/secondary/vermilion_gym/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -90 131 180 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/2.pal b/data/tilesets/secondary/vermilion_gym/palettes/2.pal deleted file mode 100644 index cc3a9457d..000000000 --- a/data/tilesets/secondary/vermilion_gym/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -246 238 164 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/3.pal b/data/tilesets/secondary/vermilion_gym/palettes/3.pal deleted file mode 100644 index 7ec794ae5..000000000 --- a/data/tilesets/secondary/vermilion_gym/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -172 172 164 -255 255 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -164 164 172 -205 205 213 -238 238 246 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/4.pal b/data/tilesets/secondary/vermilion_gym/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/vermilion_gym/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/5.pal b/data/tilesets/secondary/vermilion_gym/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/vermilion_gym/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/6.pal b/data/tilesets/secondary/vermilion_gym/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/vermilion_gym/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/7.pal b/data/tilesets/secondary/vermilion_gym/palettes/7.pal deleted file mode 100644 index efd64bcc5..000000000 --- a/data/tilesets/secondary/vermilion_gym/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -32 180 230 -172 255 230 -189 189 115 -238 222 164 -255 255 180 -205 82 65 -255 131 115 -189 180 106 -205 197 123 -222 222 148 -164 164 98 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/8.pal b/data/tilesets/secondary/vermilion_gym/palettes/8.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/vermilion_gym/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/vermilion_gym/palettes/9.pal b/data/tilesets/secondary/vermilion_gym/palettes/9.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/vermilion_gym/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/viridian_city/palettes/0.pal b/data/tilesets/secondary/viridian_city/palettes/0.pal deleted file mode 100644 index 2f3f97d6f..000000000 --- a/data/tilesets/secondary/viridian_city/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 90 16 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/viridian_city/palettes/00.pal b/data/tilesets/secondary/viridian_city/palettes/00.pal new file mode 100644 index 000000000..2f3f97d6f --- /dev/null +++ b/data/tilesets/secondary/viridian_city/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 90 16 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/viridian_city/palettes/01.pal b/data/tilesets/secondary/viridian_city/palettes/01.pal new file mode 100644 index 000000000..cf1123812 --- /dev/null +++ b/data/tilesets/secondary/viridian_city/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 197 164 +189 148 139 +148 106 106 +115 65 74 +82 49 65 +115 205 164 diff --git a/data/tilesets/secondary/viridian_city/palettes/02.pal b/data/tilesets/secondary/viridian_city/palettes/02.pal new file mode 100644 index 000000000..372fb5d7c --- /dev/null +++ b/data/tilesets/secondary/viridian_city/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/viridian_city/palettes/03.pal b/data/tilesets/secondary/viridian_city/palettes/03.pal new file mode 100644 index 000000000..5a5e60211 --- /dev/null +++ b/data/tilesets/secondary/viridian_city/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/viridian_city/palettes/04.pal b/data/tilesets/secondary/viridian_city/palettes/04.pal new file mode 100644 index 000000000..229f9132c --- /dev/null +++ b/data/tilesets/secondary/viridian_city/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +222 230 255 +197 213 255 +164 197 238 +123 172 230 +90 148 197 +65 123 180 +90 164 205 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +32 98 139 +238 230 139 +222 197 139 +205 180 106 diff --git a/data/tilesets/secondary/viridian_city/palettes/05.pal b/data/tilesets/secondary/viridian_city/palettes/05.pal new file mode 100644 index 000000000..215dd1272 --- /dev/null +++ b/data/tilesets/secondary/viridian_city/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +213 197 131 +197 172 106 +172 148 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/viridian_city/palettes/06.pal b/data/tilesets/secondary/viridian_city/palettes/06.pal new file mode 100644 index 000000000..7e7862a19 --- /dev/null +++ b/data/tilesets/secondary/viridian_city/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +222 230 255 +197 213 255 +164 197 238 +123 172 230 +41 82 164 +41 57 131 +74 123 197 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +32 98 139 +238 230 139 +222 197 139 +205 180 106 diff --git a/data/tilesets/secondary/viridian_city/palettes/07.pal b/data/tilesets/secondary/viridian_city/palettes/07.pal new file mode 100644 index 000000000..93518605a --- /dev/null +++ b/data/tilesets/secondary/viridian_city/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/viridian_city/palettes/08.pal b/data/tilesets/secondary/viridian_city/palettes/08.pal new file mode 100644 index 000000000..219129eba --- /dev/null +++ b/data/tilesets/secondary/viridian_city/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +65 65 82 +74 74 90 +123 123 131 +106 139 205 +115 197 238 +164 230 238 +131 115 57 +180 172 65 +222 205 65 +246 246 205 +213 205 205 +90 90 115 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/viridian_city/palettes/09.pal b/data/tilesets/secondary/viridian_city/palettes/09.pal new file mode 100644 index 000000000..0aa2b58dc --- /dev/null +++ b/data/tilesets/secondary/viridian_city/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 205 65 +222 172 65 +180 98 0 +213 213 139 +189 189 115 +148 148 82 +255 0 255 +115 205 164 diff --git a/data/tilesets/secondary/viridian_city/palettes/1.pal b/data/tilesets/secondary/viridian_city/palettes/1.pal deleted file mode 100644 index cf1123812..000000000 --- a/data/tilesets/secondary/viridian_city/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 197 164 -189 148 139 -148 106 106 -115 65 74 -82 49 65 -115 205 164 diff --git a/data/tilesets/secondary/viridian_city/palettes/2.pal b/data/tilesets/secondary/viridian_city/palettes/2.pal deleted file mode 100644 index 372fb5d7c..000000000 --- a/data/tilesets/secondary/viridian_city/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/viridian_city/palettes/3.pal b/data/tilesets/secondary/viridian_city/palettes/3.pal deleted file mode 100644 index 5a5e60211..000000000 --- a/data/tilesets/secondary/viridian_city/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/viridian_city/palettes/4.pal b/data/tilesets/secondary/viridian_city/palettes/4.pal deleted file mode 100644 index 229f9132c..000000000 --- a/data/tilesets/secondary/viridian_city/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -222 230 255 -197 213 255 -164 197 238 -123 172 230 -90 148 197 -65 123 180 -90 164 205 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -32 98 139 -238 230 139 -222 197 139 -205 180 106 diff --git a/data/tilesets/secondary/viridian_city/palettes/5.pal b/data/tilesets/secondary/viridian_city/palettes/5.pal deleted file mode 100644 index 215dd1272..000000000 --- a/data/tilesets/secondary/viridian_city/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -213 197 131 -197 172 106 -172 148 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/viridian_city/palettes/6.pal b/data/tilesets/secondary/viridian_city/palettes/6.pal deleted file mode 100644 index 7e7862a19..000000000 --- a/data/tilesets/secondary/viridian_city/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -222 230 255 -197 213 255 -164 197 238 -123 172 230 -41 82 164 -41 57 131 -74 123 197 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -32 98 139 -238 230 139 -222 197 139 -205 180 106 diff --git a/data/tilesets/secondary/viridian_city/palettes/7.pal b/data/tilesets/secondary/viridian_city/palettes/7.pal deleted file mode 100644 index 93518605a..000000000 --- a/data/tilesets/secondary/viridian_city/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/viridian_city/palettes/8.pal b/data/tilesets/secondary/viridian_city/palettes/8.pal deleted file mode 100644 index 219129eba..000000000 --- a/data/tilesets/secondary/viridian_city/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -65 65 82 -74 74 90 -123 123 131 -106 139 205 -115 197 238 -164 230 238 -131 115 57 -180 172 65 -222 205 65 -246 246 205 -213 205 205 -90 90 115 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/viridian_city/palettes/9.pal b/data/tilesets/secondary/viridian_city/palettes/9.pal deleted file mode 100644 index 0aa2b58dc..000000000 --- a/data/tilesets/secondary/viridian_city/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 205 65 -222 172 65 -180 98 0 -213 213 139 -189 189 115 -148 148 82 -255 0 255 -115 205 164 diff --git a/data/tilesets/secondary/viridian_forest/palettes/0.pal b/data/tilesets/secondary/viridian_forest/palettes/0.pal deleted file mode 100644 index 7af5bb7d2..000000000 --- a/data/tilesets/secondary/viridian_forest/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 82 0 -115 98 98 -65 57 49 -255 0 255 -139 222 189 -255 197 115 -238 131 106 -197 49 65 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/viridian_forest/palettes/00.pal b/data/tilesets/secondary/viridian_forest/palettes/00.pal new file mode 100644 index 000000000..7af5bb7d2 --- /dev/null +++ b/data/tilesets/secondary/viridian_forest/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 82 0 +115 98 98 +65 57 49 +255 0 255 +139 222 189 +255 197 115 +238 131 106 +197 49 65 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/viridian_forest/palettes/01.pal b/data/tilesets/secondary/viridian_forest/palettes/01.pal new file mode 100644 index 000000000..391d1e3d1 --- /dev/null +++ b/data/tilesets/secondary/viridian_forest/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 230 +197 205 213 +172 189 205 +131 131 139 +65 49 65 +230 238 238 +90 189 139 +255 0 255 +238 213 197 +222 189 164 +189 148 139 +156 115 115 +123 82 82 +90 57 74 +115 205 164 diff --git a/data/tilesets/secondary/viridian_forest/palettes/02.pal b/data/tilesets/secondary/viridian_forest/palettes/02.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/viridian_forest/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +156 123 98 +197 172 139 +255 205 139 +238 148 115 +222 106 98 +205 82 74 +172 32 41 +74 131 197 diff --git a/data/tilesets/secondary/viridian_forest/palettes/03.pal b/data/tilesets/secondary/viridian_forest/palettes/03.pal new file mode 100644 index 000000000..9581f2cd8 --- /dev/null +++ b/data/tilesets/secondary/viridian_forest/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +205 222 238 +172 189 205 +148 164 180 +123 123 131 +90 90 115 +65 74 106 +230 222 131 +205 180 106 +156 213 255 +115 189 246 +98 164 222 +74 131 197 +49 98 164 +115 205 164 diff --git a/data/tilesets/secondary/viridian_forest/palettes/04.pal b/data/tilesets/secondary/viridian_forest/palettes/04.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/viridian_forest/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 172 +189 189 139 +156 156 106 +115 115 65 +255 255 213 +255 238 180 +238 222 156 +172 197 197 +148 189 189 +123 180 180 +230 246 255 +189 222 222 +172 213 222 +148 205 205 +255 255 255 diff --git a/data/tilesets/secondary/viridian_forest/palettes/05.pal b/data/tilesets/secondary/viridian_forest/palettes/05.pal new file mode 100644 index 000000000..3a2db72a7 --- /dev/null +++ b/data/tilesets/secondary/viridian_forest/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 230 238 +172 189 205 +123 123 131 +90 90 115 +65 74 106 +230 222 164 +222 205 131 +205 180 106 +180 139 74 +238 230 139 +222 197 139 +213 189 106 +189 230 164 +172 222 164 +115 205 164 diff --git a/data/tilesets/secondary/viridian_forest/palettes/06.pal b/data/tilesets/secondary/viridian_forest/palettes/06.pal new file mode 100644 index 000000000..93518605a --- /dev/null +++ b/data/tilesets/secondary/viridian_forest/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +0 0 255 diff --git a/data/tilesets/secondary/viridian_forest/palettes/07.pal b/data/tilesets/secondary/viridian_forest/palettes/07.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/viridian_forest/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/viridian_forest/palettes/08.pal b/data/tilesets/secondary/viridian_forest/palettes/08.pal new file mode 100644 index 000000000..650a35cc8 --- /dev/null +++ b/data/tilesets/secondary/viridian_forest/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +189 255 139 +131 213 98 +57 148 49 +57 82 0 +57 115 24 +98 65 74 +131 106 82 +65 57 49 +255 0 255 +255 0 255 +255 0 255 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/data/tilesets/secondary/viridian_forest/palettes/09.pal b/data/tilesets/secondary/viridian_forest/palettes/09.pal new file mode 100644 index 000000000..df2d04037 --- /dev/null +++ b/data/tilesets/secondary/viridian_forest/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +213 230 189 +57 172 131 +222 230 246 +230 172 123 +106 205 164 diff --git a/data/tilesets/secondary/viridian_forest/palettes/1.pal b/data/tilesets/secondary/viridian_forest/palettes/1.pal deleted file mode 100644 index 391d1e3d1..000000000 --- a/data/tilesets/secondary/viridian_forest/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 230 -197 205 213 -172 189 205 -131 131 139 -65 49 65 -230 238 238 -90 189 139 -255 0 255 -238 213 197 -222 189 164 -189 148 139 -156 115 115 -123 82 82 -90 57 74 -115 205 164 diff --git a/data/tilesets/secondary/viridian_forest/palettes/2.pal b/data/tilesets/secondary/viridian_forest/palettes/2.pal deleted file mode 100644 index 6b019b884..000000000 --- a/data/tilesets/secondary/viridian_forest/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -156 123 98 -197 172 139 -255 205 139 -238 148 115 -222 106 98 -205 82 74 -172 32 41 -74 131 197 diff --git a/data/tilesets/secondary/viridian_forest/palettes/3.pal b/data/tilesets/secondary/viridian_forest/palettes/3.pal deleted file mode 100644 index 9581f2cd8..000000000 --- a/data/tilesets/secondary/viridian_forest/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -205 222 238 -172 189 205 -148 164 180 -123 123 131 -90 90 115 -65 74 106 -230 222 131 -205 180 106 -156 213 255 -115 189 246 -98 164 222 -74 131 197 -49 98 164 -115 205 164 diff --git a/data/tilesets/secondary/viridian_forest/palettes/4.pal b/data/tilesets/secondary/viridian_forest/palettes/4.pal deleted file mode 100644 index 702db8a90..000000000 --- a/data/tilesets/secondary/viridian_forest/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 222 172 -189 189 139 -156 156 106 -115 115 65 -255 255 213 -255 238 180 -238 222 156 -172 197 197 -148 189 189 -123 180 180 -230 246 255 -189 222 222 -172 213 222 -148 205 205 -255 255 255 diff --git a/data/tilesets/secondary/viridian_forest/palettes/5.pal b/data/tilesets/secondary/viridian_forest/palettes/5.pal deleted file mode 100644 index 3a2db72a7..000000000 --- a/data/tilesets/secondary/viridian_forest/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -222 230 238 -172 189 205 -123 123 131 -90 90 115 -65 74 106 -230 222 164 -222 205 131 -205 180 106 -180 139 74 -238 230 139 -222 197 139 -213 189 106 -189 230 164 -172 222 164 -115 205 164 diff --git a/data/tilesets/secondary/viridian_forest/palettes/6.pal b/data/tilesets/secondary/viridian_forest/palettes/6.pal deleted file mode 100644 index 93518605a..000000000 --- a/data/tilesets/secondary/viridian_forest/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 -0 0 255 diff --git a/data/tilesets/secondary/viridian_forest/palettes/7.pal b/data/tilesets/secondary/viridian_forest/palettes/7.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/viridian_forest/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/viridian_forest/palettes/8.pal b/data/tilesets/secondary/viridian_forest/palettes/8.pal deleted file mode 100644 index 650a35cc8..000000000 --- a/data/tilesets/secondary/viridian_forest/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -189 255 139 -131 213 98 -57 148 49 -57 82 0 -57 115 24 -98 65 74 -131 106 82 -65 57 49 -255 0 255 -255 0 255 -255 0 255 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/data/tilesets/secondary/viridian_forest/palettes/9.pal b/data/tilesets/secondary/viridian_forest/palettes/9.pal deleted file mode 100644 index df2d04037..000000000 --- a/data/tilesets/secondary/viridian_forest/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 205 164 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -213 230 189 -57 172 131 -222 230 246 -230 172 123 -106 205 164 diff --git a/data/tilesets/secondary/viridian_gym/palettes/0.pal b/data/tilesets/secondary/viridian_gym/palettes/0.pal deleted file mode 100644 index 88e712348..000000000 --- a/data/tilesets/secondary/viridian_gym/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -32 32 57 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -172 148 65 -213 197 106 -246 238 148 -82 148 197 -172 205 246 -222 230 230 -106 197 106 -164 255 180 -205 82 65 -255 131 115 -148 148 139 diff --git a/data/tilesets/secondary/viridian_gym/palettes/00.pal b/data/tilesets/secondary/viridian_gym/palettes/00.pal new file mode 100644 index 000000000..88e712348 --- /dev/null +++ b/data/tilesets/secondary/viridian_gym/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 32 57 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +172 148 65 +213 197 106 +246 238 148 +82 148 197 +172 205 246 +222 230 230 +106 197 106 +164 255 180 +205 82 65 +255 131 115 +148 148 139 diff --git a/data/tilesets/secondary/viridian_gym/palettes/01.pal b/data/tilesets/secondary/viridian_gym/palettes/01.pal new file mode 100644 index 000000000..3a16a45c7 --- /dev/null +++ b/data/tilesets/secondary/viridian_gym/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +123 123 123 +180 180 164 +255 255 255 +197 197 148 +213 213 172 +189 230 255 +156 189 213 +131 115 16 +164 148 49 +197 180 74 +222 205 106 +255 230 156 +222 213 230 +238 246 238 diff --git a/data/tilesets/secondary/viridian_gym/palettes/02.pal b/data/tilesets/secondary/viridian_gym/palettes/02.pal new file mode 100644 index 000000000..c8ee236d7 --- /dev/null +++ b/data/tilesets/secondary/viridian_gym/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +131 131 139 +197 189 213 +255 255 255 +139 197 139 +230 213 123 +255 205 90 +255 238 197 +115 115 123 +230 238 246 +156 205 246 +98 156 238 +255 0 255 +230 139 98 +189 98 74 diff --git a/data/tilesets/secondary/viridian_gym/palettes/03.pal b/data/tilesets/secondary/viridian_gym/palettes/03.pal new file mode 100644 index 000000000..b17dbb054 --- /dev/null +++ b/data/tilesets/secondary/viridian_gym/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +82 82 106 +164 164 164 +180 189 189 +255 255 255 +238 246 238 +213 230 222 +197 205 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/viridian_gym/palettes/04.pal b/data/tilesets/secondary/viridian_gym/palettes/04.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/viridian_gym/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/viridian_gym/palettes/05.pal b/data/tilesets/secondary/viridian_gym/palettes/05.pal new file mode 100644 index 000000000..6f31ca776 --- /dev/null +++ b/data/tilesets/secondary/viridian_gym/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/viridian_gym/palettes/06.pal b/data/tilesets/secondary/viridian_gym/palettes/06.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/viridian_gym/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/viridian_gym/palettes/07.pal b/data/tilesets/secondary/viridian_gym/palettes/07.pal new file mode 100644 index 000000000..f55e52fe2 --- /dev/null +++ b/data/tilesets/secondary/viridian_gym/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +139 139 148 +197 189 213 +255 255 255 +205 197 106 +246 238 148 +255 255 222 +98 98 123 +238 238 238 +82 222 123 +131 255 164 +82 164 57 +255 0 255 +255 0 255 +172 106 74 diff --git a/data/tilesets/secondary/viridian_gym/palettes/08.pal b/data/tilesets/secondary/viridian_gym/palettes/08.pal new file mode 100644 index 000000000..3a7dbc274 --- /dev/null +++ b/data/tilesets/secondary/viridian_gym/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +82 82 106 +139 139 148 +197 189 213 +255 255 255 +222 222 238 +230 205 131 +189 197 82 +222 230 115 +238 230 148 +74 123 180 +131 131 139 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/tilesets/secondary/viridian_gym/palettes/09.pal b/data/tilesets/secondary/viridian_gym/palettes/09.pal new file mode 100644 index 000000000..6b0281bd6 --- /dev/null +++ b/data/tilesets/secondary/viridian_gym/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/viridian_gym/palettes/1.pal b/data/tilesets/secondary/viridian_gym/palettes/1.pal deleted file mode 100644 index 3a16a45c7..000000000 --- a/data/tilesets/secondary/viridian_gym/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -123 123 123 -180 180 164 -255 255 255 -197 197 148 -213 213 172 -189 230 255 -156 189 213 -131 115 16 -164 148 49 -197 180 74 -222 205 106 -255 230 156 -222 213 230 -238 246 238 diff --git a/data/tilesets/secondary/viridian_gym/palettes/2.pal b/data/tilesets/secondary/viridian_gym/palettes/2.pal deleted file mode 100644 index c8ee236d7..000000000 --- a/data/tilesets/secondary/viridian_gym/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -131 131 139 -197 189 213 -255 255 255 -139 197 139 -230 213 123 -255 205 90 -255 238 197 -115 115 123 -230 238 246 -156 205 246 -98 156 238 -255 0 255 -230 139 98 -189 98 74 diff --git a/data/tilesets/secondary/viridian_gym/palettes/3.pal b/data/tilesets/secondary/viridian_gym/palettes/3.pal deleted file mode 100644 index b17dbb054..000000000 --- a/data/tilesets/secondary/viridian_gym/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -82 82 106 -164 164 164 -180 189 189 -255 255 255 -238 246 238 -213 230 222 -197 205 197 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/viridian_gym/palettes/4.pal b/data/tilesets/secondary/viridian_gym/palettes/4.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/viridian_gym/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/viridian_gym/palettes/5.pal b/data/tilesets/secondary/viridian_gym/palettes/5.pal deleted file mode 100644 index 6f31ca776..000000000 --- a/data/tilesets/secondary/viridian_gym/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/viridian_gym/palettes/6.pal b/data/tilesets/secondary/viridian_gym/palettes/6.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/tilesets/secondary/viridian_gym/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/tilesets/secondary/viridian_gym/palettes/7.pal b/data/tilesets/secondary/viridian_gym/palettes/7.pal deleted file mode 100644 index f55e52fe2..000000000 --- a/data/tilesets/secondary/viridian_gym/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -139 139 148 -197 189 213 -255 255 255 -205 197 106 -246 238 148 -255 255 222 -98 98 123 -238 238 238 -82 222 123 -131 255 164 -82 164 57 -255 0 255 -255 0 255 -172 106 74 diff --git a/data/tilesets/secondary/viridian_gym/palettes/8.pal b/data/tilesets/secondary/viridian_gym/palettes/8.pal deleted file mode 100644 index 3a7dbc274..000000000 --- a/data/tilesets/secondary/viridian_gym/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -82 82 106 -139 139 148 -197 189 213 -255 255 255 -222 222 238 -230 205 131 -189 197 82 -222 230 115 -238 230 148 -74 123 180 -131 131 139 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/tilesets/secondary/viridian_gym/palettes/9.pal b/data/tilesets/secondary/viridian_gym/palettes/9.pal deleted file mode 100644 index 6b0281bd6..000000000 --- a/data/tilesets/secondary/viridian_gym/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -- cgit v1.2.3 From 890d85ff029feb6509bca88ba913580c5c0cd56c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 23 Feb 2020 16:26:33 -0500 Subject: battle_bg --- data/battle_bg.s | 583 ------------------------------------------------------- 1 file changed, 583 deletions(-) delete mode 100644 data/battle_bg.s (limited to 'data') diff --git a/data/battle_bg.s b/data/battle_bg.s deleted file mode 100644 index a6c67612e..000000000 --- a/data/battle_bg.s +++ /dev/null @@ -1,583 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -gUnknown_824829C:: @ 824829C - .byte 1, 2, 0 - - .align 2 -gOamData_82482A0:: - .4byte 0xc0000300, 0x00000000 - -gOamData_82482A8:: - .4byte 0xc0000300, 0x00000040 - -gUnknown_82482B0:: - obj_rot_scal_anim_frame 0x80, 0x80, 0, 0 - obj_rot_scal_anim_end - -gUnknown_82482C0:: - obj_rot_scal_anim_frame 0x80, 0x80, 0, 0 - obj_rot_scal_anim_frame 0x18, 0x18, 0, 0x80 - obj_rot_scal_anim_frame 0x18, 0x18, 0, 0x80 - obj_rot_scal_anim_end - -gAffineAnimTable_82482E0:: - .4byte gUnknown_82482B0 - .4byte gUnknown_82482C0 - -gUnknown_82482E8:: @ 82482E8 - spr_template 10000, 10000, gOamData_82482A0, gDummySpriteAnimTable, NULL, gAffineAnimTable_82482E0, nullsub_9 - -gUnknown_8248300:: @ 8248300 - spr_template 10000, 10000, gOamData_82482A8, gDummySpriteAnimTable, NULL, gAffineAnimTable_82482E0, nullsub_9 - -gUnknown_8248318:: @ 8248318 - obj_tiles gFile_graphics_battle_transitions_vs_sheet, 0x1000, 10000 - -gBattleBgTemplates:: @ 8248320 - .4byte 0x00000580 - @ { - @ .bg = 0, - @ .charBaseIndex = 0, - @ .mapBaseIndex = 24, - @ .screenSize = 2, - @ .paletteMode = 0, - @ .priority = 0, - @ .baseTile = 0x0000 - @ } - .4byte 0x000005c5 - @ { - @ .bg = 1, - @ .charBaseIndex = 1, - @ .mapBaseIndex = 28, - @ .screenSize = 2, - @ .paletteMode = 0, - @ .priority = 0, - @ .baseTile = 0x0000 - @ } - .4byte 0x000013e6 - @ { - @ .bg = 2, - @ .charBaseIndex = 1, - @ .mapBaseIndex = 30, - @ .screenSize = 1, - @ .paletteMode = 0, - @ .priority = 1, - @ .baseTile = 0x0000 - @ } - .4byte 0x000033ab - @ { - @ .bg = 3, - @ .charBaseIndex = 2, - @ .mapBaseIndex = 26, - @ .screenSize = 1, - @ .paletteMode = 0, - @ .priority = 3, - @ .baseTile = 0x0000 - @ } - -gUnknown_8248330:: @ 8248330 - .byte 0, 1, 15, 28, 4, 0 - .2byte 0x0090 - @ { - @ .bg = 0, - @ .tilemapLeft = 1, - @ .tilemapTop = 15, - @ .width = 28, - @ .height = 4, - @ .paletteNum = 0, - @ .baseBlock = 0x0090 - @ } - .byte 0, 1, 35, 14, 4, 0 - .2byte 0x01c0 - @ { - @ .bg = 0, - @ .tilemapLeft = 1, - @ .tilemapTop = 35, - @ .width = 14, - @ .height = 4, - @ .paletteNum = 0, - @ .baseBlock = 0x01c0 - @ } - .byte 0, 17, 35, 12, 4, 5 - .2byte 0x0190 - @ { - @ .bg = 0, - @ .tilemapLeft = 17, - @ .tilemapTop = 35, - @ .width = 12, - @ .height = 4, - @ .paletteNum = 5, - @ .baseBlock = 0x0190 - @ } - .byte 0, 2, 55, 8, 2, 5 - .2byte 0x0300 - @ { - @ .bg = 0, - @ .tilemapLeft = 2, - @ .tilemapTop = 55, - @ .width = 8, - @ .height = 2, - @ .paletteNum = 5, - @ .baseBlock = 0x0300 - @ } - .byte 0, 11, 55, 8, 2, 5 - .2byte 0x0310 - @ { - @ .bg = 0, - @ .tilemapLeft = 11, - @ .tilemapTop = 55, - @ .width = 8, - @ .height = 2, - @ .paletteNum = 5, - @ .baseBlock = 0x0310 - @ } - .byte 0, 2, 57, 8, 2, 5 - .2byte 0x0320 - @ { - @ .bg = 0, - @ .tilemapLeft = 2, - @ .tilemapTop = 57, - @ .width = 8, - @ .height = 2, - @ .paletteNum = 5, - @ .baseBlock = 0x0320 - @ } - .byte 0, 11, 57, 8, 2, 5 - .2byte 0x0330 - @ { - @ .bg = 0, - @ .tilemapLeft = 11, - @ .tilemapTop = 57, - @ .width = 8, - @ .height = 2, - @ .paletteNum = 5, - @ .baseBlock = 0x0330 - @ } - .byte 0, 21, 55, 3, 2, 5 - .2byte 0x0290 - @ { - @ .bg = 0, - @ .tilemapLeft = 21, - @ .tilemapTop = 55, - @ .width = 3, - @ .height = 2, - @ .paletteNum = 5, - @ .baseBlock = 0x0290 - @ } - .byte 0, 21, 57, 8, 2, 5 - .2byte 0x0296 - @ { - @ .bg = 0, - @ .tilemapLeft = 21, - @ .tilemapTop = 57, - @ .width = 8, - @ .height = 2, - @ .paletteNum = 5, - @ .baseBlock = 0x0296 - @ } - .byte 0, 24, 55, 5, 2, 5 - .2byte 0x02a6 - @ { - @ .bg = 0, - @ .tilemapLeft = 24, - @ .tilemapTop = 55, - @ .width = 5, - @ .height = 2, - @ .paletteNum = 5, - @ .baseBlock = 0x02a6 - @ } - .byte 0, 25, 57, 0, 0, 5 - .2byte 0x02b0 - @ { - @ .bg = 0, - @ .tilemapLeft = 25, - @ .tilemapTop = 57, - @ .width = 0, - @ .height = 0, - @ .paletteNum = 5, - @ .baseBlock = 0x02b0 - @ } - .byte 0, 21, 55, 8, 4, 5 - .2byte 0x02b0 - @ { - @ .bg = 0, - @ .tilemapLeft = 21, - @ .tilemapTop = 55, - @ .width = 8, - @ .height = 4, - @ .paletteNum = 5, - @ .baseBlock = 0x02b0 - @ } - .byte 1, 19, 8, 10, 11, 5 - .2byte 0x0100 - @ { - @ .bg = 1, - @ .tilemapLeft = 19, - @ .tilemapTop = 8, - @ .width = 10, - @ .height = 11, - @ .paletteNum = 5, - @ .baseBlock = 0x0100 - @ } - .byte 2, 18, 0, 12, 3, 6 - .2byte 0x016e - @ { - @ .bg = 2, - @ .tilemapLeft = 18, - @ .tilemapTop = 0, - @ .width = 12, - @ .height = 3, - @ .paletteNum = 6, - @ .baseBlock = 0x016e - @ } - .byte 0, 25, 9, 4, 4, 5 - .2byte 0x0100 - @ { - @ .bg = 0, - @ .tilemapLeft = 25, - @ .tilemapTop = 9, - @ .width = 4, - @ .height = 4, - @ .paletteNum = 5, - @ .baseBlock = 0x0100 - @ } - .byte 1, 2, 3, 7, 2, 5 - .2byte 0x0020 - @ { - @ .bg = 1, - @ .tilemapLeft = 2, - @ .tilemapTop = 3, - @ .width = 7, - @ .height = 2, - @ .paletteNum = 5, - @ .baseBlock = 0x0020 - @ } - .byte 2, 2, 3, 7, 2, 5 - .2byte 0x0040 - @ { - @ .bg = 2, - @ .tilemapLeft = 2, - @ .tilemapTop = 3, - @ .width = 7, - @ .height = 2, - @ .paletteNum = 5, - @ .baseBlock = 0x0040 - @ } - .byte 1, 2, 2, 7, 2, 5 - .2byte 0x0020 - @ { - @ .bg = 1, - @ .tilemapLeft = 2, - @ .tilemapTop = 2, - @ .width = 7, - @ .height = 2, - @ .paletteNum = 5, - @ .baseBlock = 0x0020 - @ } - .byte 2, 2, 2, 7, 2, 5 - .2byte 0x0040 - @ { - @ .bg = 2, - @ .tilemapLeft = 2, - @ .tilemapTop = 2, - @ .width = 7, - @ .height = 2, - @ .paletteNum = 5, - @ .baseBlock = 0x0040 - @ } - .byte 1, 2, 6, 7, 2, 5 - .2byte 0x0060 - @ { - @ .bg = 1, - @ .tilemapLeft = 2, - @ .tilemapTop = 6, - @ .width = 7, - @ .height = 2, - @ .paletteNum = 5, - @ .baseBlock = 0x0060 - @ } - .byte 2, 2, 6, 7, 2, 5 - .2byte 0x0080 - @ { - @ .bg = 2, - @ .tilemapLeft = 2, - @ .tilemapTop = 6, - @ .width = 7, - @ .height = 2, - @ .paletteNum = 5, - @ .baseBlock = 0x0080 - @ } - .byte 0, 11, 2, 8, 2, 0 - .2byte 0x00a0 - @ { - @ .bg = 0, - @ .tilemapLeft = 11, - @ .tilemapTop = 2, - @ .width = 8, - @ .height = 2, - @ .paletteNum = 0, - @ .baseBlock = 0x00a0 - @ } - .byte 0, 4, 2, 8, 2, 0 - .2byte 0x00a0 - @ { - @ .bg = 0, - @ .tilemapLeft = 4, - @ .tilemapTop = 2, - @ .width = 8, - @ .height = 2, - @ .paletteNum = 0, - @ .baseBlock = 0x00a0 - @ } - .byte 0, 19, 2, 8, 2, 0 - .2byte 0x00b0 - @ { - @ .bg = 0, - @ .tilemapLeft = 19, - @ .tilemapTop = 2, - @ .width = 8, - @ .height = 2, - @ .paletteNum = 0, - @ .baseBlock = 0x00b0 - @ } - .byte 0, 2, 15, 26, 4, 7 - .2byte 0x0090 - @ { - @ .bg = 0, - @ .tilemapLeft = 2, - @ .tilemapTop = 15, - @ .width = 26, - @ .height = 4, - @ .paletteNum = 7, - @ .baseBlock = 0x0090 - @ } - .byte 255, 0, 0, 0, 0, 0 - .2byte 0x0000 - @ { - @ .bg = 255, - @ .tilemapLeft = 0, - @ .tilemapTop = 0, - @ .width = 0, - @ .height = 0, - @ .paletteNum = 0, - @ .baseBlock = 0x0000 - @ } - -gUnknown_8248400:: @ 8248400 - .incbin "graphics/battle/unk_8248400.gbapal.lz" - -gUnknown_824844C:: @ 824844C - .incbin "graphics/battle/unk_824844C.4bpp.lz" - -gUnknown_82489A8:: @ 82489A8 - .incbin "graphics/battle/unk_82489A8.bin.lz" - -gUnknown_8248C68:: @ 8248C68 - .incbin "graphics/battle/unk_8248C68.4bpp.lz" - -gUnknown_8248F58:: @ 8248F58 - .incbin "graphics/battle/unk_8248F58.bin.lz" - -gUnknown_8249074:: @ 8249074 - .incbin "graphics/battle/unk_8249074.gbapal.lz" - -gUnknown_82490C4:: @ 82490C4 - .incbin "graphics/battle/unk_82490C4.4bpp.lz" - -gUnknown_8249620:: @ 8249620 - .incbin "graphics/battle/unk_8249620.bin.lz" - -gUnknown_82498DC:: @ 82498DC - .incbin "graphics/battle/unk_82498DC.4bpp.lz" - -gUnknown_8249E10:: @ 8249E10 - .incbin "graphics/battle/unk_8249E10.bin.lz" - -gUnknown_8249F98:: @ 8249F98 - .incbin "graphics/battle/unk_8249F98.gbapal.lz" - -gUnknown_8249FE4:: @ 8249FE4 - .incbin "graphics/battle/unk_8249FE4.4bpp.lz" - -gUnknown_824A37C:: @ 824A37C - .incbin "graphics/battle/unk_824A37C.bin.lz" - -gUnknown_824A618:: @ 824A618 - .incbin "graphics/battle/unk_824A618.4bpp.lz" - -gUnknown_824A844:: @ 824A844 - .incbin "graphics/battle/unk_824A844.bin.lz" - -gUnknown_824A940:: @ 824A940 - .incbin "graphics/battle/unk_824A940.gbapal.lz" - -gUnknown_824A990:: @ 824A990 - .incbin "graphics/battle/unk_824A990.4bpp.lz" - -gUnknown_824ACD0:: @ 824ACD0 - .incbin "graphics/battle/unk_824ACD0.bin.lz" - -gUnknown_824AF70:: @ 824AF70 - .incbin "graphics/battle/unk_824AF70.4bpp.lz" - -gUnknown_824B0DC:: @ 824B0DC - .incbin "graphics/battle/unk_824B0DC.bin.lz" - -gUnknown_824B19C:: @ 824B19C - .incbin "graphics/battle/unk_824B19C.gbapal.lz" - -gUnknown_824B1EC:: @ 824B1EC - .incbin "graphics/battle/unk_824B1EC.4bpp.lz" - -gUnknown_824B608:: @ 824B608 - .incbin "graphics/battle/unk_824B608.bin.lz" - -gUnknown_824B8A8:: @ 824B8A8 - .incbin "graphics/battle/unk_824B8A8.4bpp.lz" - -gUnknown_824BBE0:: @ 824BBE0 - .incbin "graphics/battle/unk_824BBE0.bin.lz" - -gUnknown_824BCE0:: @ 824BCE0 - .incbin "graphics/battle/unk_824BCE0.gbapal.lz" - -gUnknown_824BD38:: @ 824BD38 - .incbin "graphics/battle/unk_824BD38.4bpp.lz" - -gUnknown_824C07C:: @ 824C07C - .incbin "graphics/battle/unk_824C07C.bin.lz" - -gUnknown_824C314:: @ 824C314 - .incbin "graphics/battle/unk_824C314.4bpp.lz" - -gUnknown_824C520:: @ 824C520 - .incbin "graphics/battle/unk_824C520.bin.lz" - -gUnknown_824C5D8:: @ 824C5D8 - .incbin "graphics/battle/unk_824C5D8.gbapal.lz" - -gUnknown_824C624:: @ 824C624 - .incbin "graphics/battle/unk_824C624.4bpp.lz" - -gUnknown_824C958:: @ 824C958 - .incbin "graphics/battle/unk_824C958.bin.lz" - -gUnknown_824CBF8:: @ 824CBF8 - .incbin "graphics/battle/unk_824CBF8.4bpp.lz" - -gUnknown_824CEC8:: @ 824CEC8 - .incbin "graphics/battle/unk_824CEC8.bin.lz" - -gUnknown_824CF98:: @ 824CF98 - .incbin "graphics/battle/unk_824CF98.gbapal.lz" - -gUnknown_824CFEC:: @ 824CFEC - .incbin "graphics/battle/unk_824CFEC.4bpp.lz" - -gUnknown_824D418:: @ 824D418 - .incbin "graphics/battle/unk_824D418.bin.lz" - -gUnknown_824D6B8:: @ 824D6B8 - .incbin "graphics/battle/unk_824D6B8.4bpp.lz" - -gUnknown_824DC98:: @ 824DC98 - .incbin "graphics/battle/unk_824DC98.bin.lz" - -gUnknown_824DDF0:: @ 824DDF0 - .incbin "graphics/battle/unk_824DDF0.gbapal.lz" - -gUnknown_824DE34:: @ 824DE34 - .incbin "graphics/battle/unk_824DE34.4bpp.lz" - -gUnknown_824E16C:: @ 824E16C - .incbin "graphics/battle/unk_824E16C.bin.lz" - -gUnknown_824E410:: @ 824E410 - .incbin "graphics/battle/unk_824E410.4bpp.lz" - -gUnknown_824E490:: @ 824E490 - .incbin "graphics/battle/unk_824E490.bin.lz" - -gUnknown_824E528:: @ 824E528 - .incbin "graphics/battle/unk_824E528.gbapal.lz" - -gUnknown_824E56C:: @ 824E56C - .incbin "graphics/battle/unk_824E56C.gbapal.lz" - -gUnknown_824E5B8:: @ 824E5B8 - .incbin "graphics/battle/unk_824E5B8.gbapal.lz" - -gUnknown_824E604:: @ 824E604 - .incbin "graphics/battle/unk_824E604.gbapal.lz" - -gUnknown_824E650:: @ 824E650 - .incbin "graphics/battle/unk_824E650.gbapal.lz" - -gUnknown_824E6A4:: @ 824E6A4 - .incbin "graphics/battle/unk_824E6A4.gbapal.lz" - -gUnknown_824E6F0:: @ 824E6F0 - .incbin "graphics/battle/unk_824E6F0.gbapal.lz" - -gUnknown_824E740:: @ 824E740 - .incbin "graphics/battle/unk_824E740.gbapal.lz" - -gUnknown_824E78C:: @ 824E78C - .incbin "graphics/battle/unk_824E78C.gbapal.lz" - -gUnknown_824E7DC:: @ 824E7DC - .incbin "graphics/battle/unk_824E7DC.gbapal.lz" - -gUnknown_824E81C:: @ 824E81C - .incbin "graphics/battle/unk_824E81C.gbapal.lz" - -gUnknown_824E858:: @ 824E858 - .incbin "graphics/battle/unk_824E858.4bpp.lz" - -gUnknown_824EB90:: @ 824EB90 - .incbin "graphics/battle/unk_824EB90.bin.lz" - -gUnknown_824EE34:: @ 824EE34 - .4byte gUnknown_824844C, gUnknown_82489A8, gUnknown_8248C68, gUnknown_8248F58, gUnknown_8248400 - .4byte gUnknown_82490C4, gUnknown_8249620, gUnknown_82498DC, gUnknown_8249E10, gUnknown_8249074 - .4byte gUnknown_8249FE4, gUnknown_824A37C, gUnknown_824A618, gUnknown_824A844, gUnknown_8249F98 - .4byte gUnknown_824A990, gUnknown_824ACD0, gUnknown_824AF70, gUnknown_824B0DC, gUnknown_824A940 - .4byte gUnknown_824B1EC, gUnknown_824B608, gUnknown_824B8A8, gUnknown_824BBE0, gUnknown_824B19C - .4byte gUnknown_824BD38, gUnknown_824C07C, gUnknown_824C314, gUnknown_824C520, gUnknown_824BCE0 - .4byte gUnknown_824C624, gUnknown_824C958, gUnknown_824CBF8, gUnknown_824CEC8, gUnknown_824C5D8 - .4byte gUnknown_824CFEC, gUnknown_824D418, gUnknown_824D6B8, gUnknown_824DC98, gUnknown_824CF98 - .4byte gUnknown_824DE34, gUnknown_824E16C, gUnknown_824E410, gUnknown_824E490, gUnknown_824DDF0 - .4byte gUnknown_824DE34, gUnknown_824E16C, gUnknown_824E410, gUnknown_824E490, gUnknown_824E81C - .4byte gUnknown_824DE34, gUnknown_824E16C, gUnknown_824E410, gUnknown_824E490, gUnknown_824E528 - .4byte gUnknown_824DE34, gUnknown_824E16C, gUnknown_824E410, gUnknown_824E490, gUnknown_824E56C - .4byte gUnknown_824DE34, gUnknown_824E16C, gUnknown_824E410, gUnknown_824E490, gUnknown_824E5B8 - .4byte gUnknown_824E858, gUnknown_824EB90, gUnknown_824E410, gUnknown_824E490, gUnknown_824E604 - .4byte gUnknown_824E858, gUnknown_824EB90, gUnknown_824E410, gUnknown_824E490, gUnknown_824E650 - .4byte gUnknown_824E858, gUnknown_824EB90, gUnknown_824E410, gUnknown_824E490, gUnknown_824E6A4 - .4byte gUnknown_824E858, gUnknown_824EB90, gUnknown_824E410, gUnknown_824E490, gUnknown_824E6F0 - .4byte gUnknown_824E858, gUnknown_824EB90, gUnknown_824E410, gUnknown_824E490, gUnknown_824E740 - .4byte gUnknown_824E858, gUnknown_824EB90, gUnknown_824E410, gUnknown_824E490, gUnknown_824E78C - .4byte gUnknown_824E858, gUnknown_824EB90, gUnknown_824E410, gUnknown_824E490, gUnknown_824E7DC - -@ struct {u8; u8;} -gUnknown_824EFC4:: @ 824EFC4 - .byte 0x01, 0x0b - .align 2 - .byte 0x02, 0x0e - .align 2 - .byte 0x03, 0x0d - .align 2 - .byte 0x04, 0x0f - .align 2 - .byte 0x05, 0x10 - .align 2 - .byte 0x06, 0x11 - .align 2 - .byte 0x07, 0x12 - .align 2 - .byte 0x08, 0x0a - .align 2 -- cgit v1.2.3 From 1fc8db43b7254f7445b335cec22c7406edb1902d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 23 Feb 2020 17:00:12 -0500 Subject: Sync object event gfx constants --- data/event_scripts.s | 1 - data/field_player_avatar.s | 34 ++++++------- data/map_events.s | 1 - data/maps/BattleColosseum_2P/map.json | 2 +- data/maps/BirthIsland_Exterior/map.json | 4 +- data/maps/BirthIsland_Exterior/scripts.inc | 2 +- data/maps/BirthIsland_Harbor/map.json | 4 +- data/maps/CeladonCity/map.json | 30 +++++------ data/maps/CeladonCity_Condominiums_1F/map.json | 8 +-- data/maps/CeladonCity_Condominiums_3F/map.json | 8 +-- .../CeladonCity_Condominiums_RoofRoom/map.json | 4 +- data/maps/CeladonCity_DepartmentStore_1F/map.json | 2 +- data/maps/CeladonCity_DepartmentStore_2F/map.json | 8 +-- data/maps/CeladonCity_DepartmentStore_3F/map.json | 10 ++-- data/maps/CeladonCity_DepartmentStore_4F/map.json | 6 +-- data/maps/CeladonCity_DepartmentStore_5F/map.json | 8 +-- .../maps/CeladonCity_DepartmentStore_Roof/map.json | 4 +- data/maps/CeladonCity_GameCorner/map.json | 22 ++++---- .../maps/CeladonCity_GameCorner_PrizeRoom/map.json | 10 ++-- data/maps/CeladonCity_Gym/map.json | 22 ++++---- data/maps/CeladonCity_Hotel/map.json | 8 +-- data/maps/CeladonCity_House1/map.json | 6 +-- data/maps/CeladonCity_PokemonCenter_1F/map.json | 8 +-- data/maps/CeladonCity_PokemonCenter_2F/map.json | 8 +-- data/maps/CeladonCity_Restaurant/map.json | 10 ++-- data/maps/CeruleanCave_1F/map.json | 18 +++---- data/maps/CeruleanCave_2F/map.json | 26 +++++----- data/maps/CeruleanCave_B1F/map.json | 24 ++++----- data/maps/CeruleanCity/map.json | 24 ++++----- data/maps/CeruleanCity_BikeShop/map.json | 6 +-- data/maps/CeruleanCity_Gym/map.json | 8 +-- data/maps/CeruleanCity_House1/map.json | 2 +- data/maps/CeruleanCity_House2/map.json | 4 +- data/maps/CeruleanCity_House3/map.json | 4 +- data/maps/CeruleanCity_House4/map.json | 2 +- data/maps/CeruleanCity_House5/map.json | 2 +- data/maps/CeruleanCity_Mart/map.json | 6 +-- data/maps/CeruleanCity_PokemonCenter_1F/map.json | 10 ++-- data/maps/CeruleanCity_PokemonCenter_2F/map.json | 8 +-- data/maps/CinnabarIsland/map.json | 8 +-- data/maps/CinnabarIsland_Gym/map.json | 18 +++---- data/maps/CinnabarIsland_Mart/map.json | 6 +-- data/maps/CinnabarIsland_PokemonCenter_1F/map.json | 10 ++-- data/maps/CinnabarIsland_PokemonCenter_2F/map.json | 8 +-- .../CinnabarIsland_PokemonLab_Entrance/map.json | 2 +- .../map.json | 4 +- .../maps/CinnabarIsland_PokemonLab_Lounge/map.json | 6 +-- .../map.json | 4 +- data/maps/DiglettsCave_NorthEntrance/map.json | 2 +- data/maps/DiglettsCave_SouthEntrance/map.json | 2 +- data/maps/FiveIsland/map.json | 6 +-- data/maps/FiveIsland_Harbor/map.json | 4 +- data/maps/FiveIsland_House1/map.json | 2 +- data/maps/FiveIsland_House2/map.json | 2 +- data/maps/FiveIsland_LostCave_Room1/map.json | 2 +- data/maps/FiveIsland_LostCave_Room10/map.json | 4 +- data/maps/FiveIsland_LostCave_Room11/map.json | 2 +- data/maps/FiveIsland_LostCave_Room12/map.json | 2 +- data/maps/FiveIsland_LostCave_Room13/map.json | 2 +- data/maps/FiveIsland_LostCave_Room14/map.json | 2 +- data/maps/FiveIsland_LostCave_Room4/map.json | 2 +- data/maps/FiveIsland_Meadow/map.json | 14 +++--- data/maps/FiveIsland_MemorialPillar/map.json | 10 ++-- data/maps/FiveIsland_PokemonCenter_1F/map.json | 6 +-- data/maps/FiveIsland_PokemonCenter_2F/map.json | 8 +-- data/maps/FiveIsland_ResortGorgeous/map.json | 16 +++--- data/maps/FiveIsland_ResortGorgeous_House/map.json | 4 +- data/maps/FiveIsland_RocketWarehouse/map.json | 20 ++++---- data/maps/FiveIsland_WaterLabyrinth/map.json | 4 +- data/maps/FourIsland/map.json | 24 ++++----- data/maps/FourIsland_Harbor/map.json | 4 +- data/maps/FourIsland_House1/map.json | 4 +- data/maps/FourIsland_House2/map.json | 2 +- data/maps/FourIsland_IcefallCave_1F/map.json | 4 +- data/maps/FourIsland_IcefallCave_B1F/map.json | 4 +- data/maps/FourIsland_IcefallCave_Back/map.json | 8 +-- data/maps/FourIsland_LoreleisHouse/map.json | 30 +++++------ data/maps/FourIsland_Mart/map.json | 6 +-- data/maps/FourIsland_PokemonCenter_1F/map.json | 8 +-- data/maps/FourIsland_PokemonCenter_2F/map.json | 8 +-- data/maps/FourIsland_PokemonDayCare/map.json | 2 +- data/maps/FuchsiaCity/map.json | 32 ++++++------ data/maps/FuchsiaCity/scripts.inc | 4 +- data/maps/FuchsiaCity_Gym/map.json | 16 +++--- data/maps/FuchsiaCity_House1/map.json | 6 +-- data/maps/FuchsiaCity_House2/map.json | 2 +- data/maps/FuchsiaCity_House3/map.json | 2 +- data/maps/FuchsiaCity_Mart/map.json | 6 +-- data/maps/FuchsiaCity_PokemonCenter_1F/map.json | 8 +-- data/maps/FuchsiaCity_PokemonCenter_2F/map.json | 8 +-- data/maps/FuchsiaCity_SafariZone_Entrance/map.json | 4 +- data/maps/FuchsiaCity_SafariZone_Office/map.json | 8 +-- data/maps/FuchsiaCity_WardensHouse/map.json | 6 +-- data/maps/IndigoPlateau_Exterior/map.json | 4 +- data/maps/IndigoPlateau_PokemonCenter_1F/map.json | 12 ++--- data/maps/IndigoPlateau_PokemonCenter_2F/map.json | 8 +-- data/maps/LavenderTown/map.json | 6 +-- data/maps/LavenderTown_House1/map.json | 4 +- data/maps/LavenderTown_House2/map.json | 2 +- data/maps/LavenderTown_Mart/map.json | 8 +-- data/maps/LavenderTown_PokemonCenter_1F/map.json | 10 ++-- data/maps/LavenderTown_PokemonCenter_2F/map.json | 8 +-- .../LavenderTown_VolunteerPokemonHouse/map.json | 12 ++--- data/maps/MtEmber_Exterior/map.json | 40 +++++++-------- data/maps/MtEmber_RubyPath_1F/map.json | 10 ++-- data/maps/MtEmber_RubyPath_B1F/map.json | 8 +-- data/maps/MtEmber_RubyPath_B1F_Stairs/map.json | 2 +- data/maps/MtEmber_RubyPath_B2F/map.json | 14 +++--- data/maps/MtEmber_RubyPath_B2F_Stairs/map.json | 4 +- data/maps/MtEmber_RubyPath_B3F/map.json | 20 ++++---- data/maps/MtEmber_RubyPath_B5F/map.json | 2 +- data/maps/MtEmber_Summit/map.json | 10 ++-- data/maps/MtEmber_SummitPath_2F/map.json | 18 +++---- data/maps/MtMoon_1F/map.json | 28 +++++------ data/maps/MtMoon_B2F/map.json | 22 ++++---- data/maps/NavelRock_Base/map.json | 2 +- data/maps/NavelRock_Harbor/map.json | 4 +- data/maps/NavelRock_Summit/map.json | 2 +- data/maps/OneIsland/map.json | 6 +-- data/maps/OneIsland_Harbor/map.json | 4 +- data/maps/OneIsland_House1/map.json | 4 +- data/maps/OneIsland_House2/map.json | 2 +- data/maps/OneIsland_KindleRoad/map.json | 58 +++++++++++----------- data/maps/OneIsland_KindleRoad_EmberSpa/map.json | 12 ++--- data/maps/OneIsland_PokemonCenter_1F/map.json | 12 ++--- data/maps/OneIsland_PokemonCenter_2F/map.json | 8 +-- data/maps/OneIsland_TreasureBeach/map.json | 4 +- data/maps/PalletTown/map.json | 6 +-- data/maps/PalletTown_GarysHouse/map.json | 4 +- data/maps/PalletTown_PlayersHouse_1F/map.json | 2 +- data/maps/PalletTown_ProfessorOaksLab/map.json | 20 ++++---- data/maps/PewterCity/map.json | 14 +++--- data/maps/PewterCity_Gym/map.json | 6 +-- data/maps/PewterCity_House1/map.json | 6 +-- data/maps/PewterCity_House2/map.json | 4 +- data/maps/PewterCity_Mart/map.json | 6 +-- data/maps/PewterCity_Museum_1F/map.json | 12 ++--- data/maps/PewterCity_Museum_2F/map.json | 10 ++-- data/maps/PewterCity_PokemonCenter_1F/map.json | 14 +++--- data/maps/PewterCity_PokemonCenter_2F/map.json | 8 +-- data/maps/PokemonLeague_AgathasRoom/map.json | 2 +- data/maps/PokemonLeague_BrunosRoom/map.json | 2 +- data/maps/PokemonLeague_ChampionsRoom/map.json | 4 +- data/maps/PokemonLeague_HallOfFame/map.json | 2 +- data/maps/PokemonLeague_LancesRoom/map.json | 2 +- data/maps/PokemonLeague_LoreleisRoom/map.json | 2 +- data/maps/PokemonMansion_1F/map.json | 10 ++-- data/maps/PokemonMansion_2F/map.json | 8 +-- data/maps/PokemonMansion_3F/map.json | 8 +-- data/maps/PokemonMansion_B1F/map.json | 12 ++--- data/maps/PokemonTower_1F/map.json | 10 ++-- data/maps/PokemonTower_2F/map.json | 4 +- data/maps/PokemonTower_3F/map.json | 8 +-- data/maps/PokemonTower_4F/map.json | 12 ++--- data/maps/PokemonTower_5F/map.json | 14 +++--- data/maps/PokemonTower_6F/map.json | 10 ++-- data/maps/PokemonTower_7F/map.json | 8 +-- data/maps/PowerPlant/map.json | 16 +++--- data/maps/RecordCenter/map.json | 2 +- data/maps/RockTunnel_1F/map.json | 20 ++++---- data/maps/RockTunnel_B1F/map.json | 52 +++++++++---------- data/maps/RocketHideout_B1F/map.json | 14 +++--- data/maps/RocketHideout_B2F/map.json | 10 ++-- data/maps/RocketHideout_B3F/map.json | 10 ++-- data/maps/RocketHideout_B4F/map.json | 18 +++---- data/maps/Route1/map.json | 4 +- data/maps/Route10/map.json | 20 ++++---- data/maps/Route10_PokemonCenter_1F/map.json | 10 ++-- data/maps/Route10_PokemonCenter_2F/map.json | 8 +-- data/maps/Route11/map.json | 26 +++++----- data/maps/Route11_EastEntrance_1F/map.json | 4 +- data/maps/Route11_EastEntrance_2F/map.json | 4 +- data/maps/Route12/map.json | 28 +++++------ data/maps/Route12_FishingHouse/map.json | 2 +- data/maps/Route12_NorthEntrance_1F/map.json | 2 +- data/maps/Route12_NorthEntrance_2F/map.json | 2 +- data/maps/Route13/map.json | 22 ++++---- data/maps/Route14/map.json | 30 +++++------ data/maps/Route15/map.json | 28 +++++------ data/maps/Route15_WestEntrance_1F/map.json | 2 +- data/maps/Route15_WestEntrance_2F/map.json | 2 +- data/maps/Route16/map.json | 20 ++++---- data/maps/Route16_House/map.json | 4 +- data/maps/Route16_NorthEntrance_1F/map.json | 4 +- data/maps/Route16_NorthEntrance_2F/map.json | 6 +-- data/maps/Route17/map.json | 20 ++++---- data/maps/Route18/map.json | 6 +-- data/maps/Route18_EastEntrance_1F/map.json | 2 +- data/maps/Route18_EastEntrance_2F/map.json | 2 +- data/maps/Route19/map.json | 24 ++++----- data/maps/Route2/map.json | 14 +++--- data/maps/Route20/map.json | 22 ++++---- data/maps/Route21_North/map.json | 12 ++--- data/maps/Route21_South/map.json | 10 ++-- data/maps/Route22/map.json | 2 +- data/maps/Route22_NorthEntrance/map.json | 2 +- data/maps/Route23/map.json | 14 +++--- data/maps/Route24/map.json | 16 +++--- data/maps/Route25/map.json | 26 +++++----- data/maps/Route25_SeaCottage/map.json | 4 +- data/maps/Route2_EastBuilding/map.json | 4 +- data/maps/Route2_House/map.json | 4 +- .../Route2_ViridianForest_NorthEntrance/map.json | 6 +-- .../Route2_ViridianForest_SouthEntrance/map.json | 4 +- data/maps/Route3/map.json | 18 +++---- data/maps/Route4/map.json | 14 +++--- data/maps/Route4_PokemonCenter_1F/map.json | 12 ++--- data/maps/Route4_PokemonCenter_2F/map.json | 8 +-- data/maps/Route5_PokemonDayCare/map.json | 2 +- data/maps/Route5_SouthEntrance/map.json | 2 +- data/maps/Route6/map.json | 12 ++--- data/maps/Route6_NorthEntrance/map.json | 2 +- data/maps/Route7/map.json | 2 +- data/maps/Route7_EastEntrance/map.json | 2 +- data/maps/Route8/map.json | 30 +++++------ data/maps/Route8_WestEntrance/map.json | 2 +- data/maps/Route9/map.json | 24 ++++----- data/maps/SSAnne_1F_Corridor/map.json | 4 +- data/maps/SSAnne_1F_Room1/map.json | 2 +- data/maps/SSAnne_1F_Room2/map.json | 8 +-- data/maps/SSAnne_1F_Room3/map.json | 6 +-- data/maps/SSAnne_1F_Room4/map.json | 2 +- data/maps/SSAnne_1F_Room5/map.json | 2 +- data/maps/SSAnne_1F_Room6/map.json | 2 +- data/maps/SSAnne_1F_Room7/map.json | 2 +- data/maps/SSAnne_2F_Corridor/map.json | 4 +- data/maps/SSAnne_2F_Room1/map.json | 2 +- data/maps/SSAnne_2F_Room2/map.json | 6 +-- data/maps/SSAnne_2F_Room3/map.json | 4 +- data/maps/SSAnne_2F_Room4/map.json | 6 +-- data/maps/SSAnne_2F_Room5/map.json | 4 +- data/maps/SSAnne_2F_Room6/map.json | 4 +- data/maps/SSAnne_3F_Corridor/map.json | 2 +- data/maps/SSAnne_B1F_Room1/map.json | 4 +- data/maps/SSAnne_B1F_Room2/map.json | 4 +- data/maps/SSAnne_B1F_Room3/map.json | 4 +- data/maps/SSAnne_B1F_Room4/map.json | 4 +- data/maps/SSAnne_B1F_Room5/map.json | 6 +-- data/maps/SSAnne_CaptainsOffice/map.json | 2 +- data/maps/SSAnne_Deck/map.json | 10 ++-- data/maps/SSAnne_Exterior/map.json | 2 +- data/maps/SSAnne_Kitchen/map.json | 16 +++--- data/maps/SafariZone_Center/map.json | 2 +- data/maps/SafariZone_Center_RestHouse/map.json | 4 +- data/maps/SafariZone_East/map.json | 8 +-- data/maps/SafariZone_East_RestHouse/map.json | 6 +-- data/maps/SafariZone_North/map.json | 6 +-- data/maps/SafariZone_North_RestHouse/map.json | 8 +-- data/maps/SafariZone_SecretHouse/map.json | 2 +- data/maps/SafariZone_West/map.json | 8 +-- data/maps/SafariZone_West_RestHouse/map.json | 6 +-- data/maps/SaffronCity/map.json | 30 +++++------ data/maps/SaffronCity_CopycatsHouse_1F/map.json | 6 +-- data/maps/SaffronCity_CopycatsHouse_2F/map.json | 8 +-- data/maps/SaffronCity_Dojo/map.json | 14 +++--- data/maps/SaffronCity_Gym/map.json | 18 +++---- data/maps/SaffronCity_House/map.json | 8 +-- data/maps/SaffronCity_Mart/map.json | 6 +-- data/maps/SaffronCity_MrPsychicsHouse/map.json | 2 +- data/maps/SaffronCity_PokemonCenter_1F/map.json | 8 +-- data/maps/SaffronCity_PokemonCenter_2F/map.json | 8 +-- .../SaffronCity_PokemonTrainerFanClub/map.json | 16 +++--- data/maps/SeafoamIslands_1F/map.json | 6 +-- data/maps/SeafoamIslands_B1F/map.json | 8 +-- data/maps/SeafoamIslands_B2F/map.json | 6 +-- data/maps/SeafoamIslands_B3F/map.json | 12 ++--- data/maps/SeafoamIslands_B4F/map.json | 8 +-- data/maps/SevenIsland/map.json | 6 +-- data/maps/SevenIsland_Harbor/map.json | 4 +- data/maps/SevenIsland_House_Room1/map.json | 2 +- data/maps/SevenIsland_House_Room2/map.json | 2 +- data/maps/SevenIsland_Mart/map.json | 8 +-- data/maps/SevenIsland_PokemonCenter_1F/map.json | 8 +-- data/maps/SevenIsland_PokemonCenter_2F/map.json | 8 +-- data/maps/SevenIsland_SevaultCanyon/map.json | 40 +++++++-------- .../SevenIsland_SevaultCanyon_Entrance/map.json | 14 +++--- data/maps/SevenIsland_SevaultCanyon_House/map.json | 6 +-- .../SevenIsland_SevaultCanyon_TanobyKey/map.json | 14 +++--- data/maps/SevenIsland_TanobyRuins/map.json | 8 +-- data/maps/SevenIsland_TrainerTower/map.json | 4 +- data/maps/SilphCo_10F/map.json | 12 ++--- data/maps/SilphCo_11F/map.json | 12 ++--- data/maps/SilphCo_1F/map.json | 2 +- data/maps/SilphCo_2F/map.json | 10 ++-- data/maps/SilphCo_3F/map.json | 8 +-- data/maps/SilphCo_4F/map.json | 16 +++--- data/maps/SilphCo_5F/map.json | 18 +++---- data/maps/SilphCo_6F/map.json | 20 ++++---- data/maps/SilphCo_7F/map.json | 22 ++++---- data/maps/SilphCo_8F/map.json | 12 ++--- data/maps/SilphCo_9F/map.json | 8 +-- data/maps/SixIsland/map.json | 4 +- .../SixIsland_DottedHole_SapphireRoom/map.json | 4 +- data/maps/SixIsland_GreenPath/map.json | 2 +- data/maps/SixIsland_Harbor/map.json | 4 +- data/maps/SixIsland_House/map.json | 2 +- data/maps/SixIsland_Mart/map.json | 6 +-- data/maps/SixIsland_OutcastIsland/map.json | 14 +++--- data/maps/SixIsland_PatternBush/map.json | 24 ++++----- data/maps/SixIsland_PokemonCenter_1F/map.json | 8 +-- data/maps/SixIsland_PokemonCenter_2F/map.json | 8 +-- data/maps/SixIsland_RuinValley/map.json | 34 ++++++------- data/maps/SixIsland_WaterPath/map.json | 18 +++---- data/maps/SixIsland_WaterPath_House1/map.json | 2 +- data/maps/SixIsland_WaterPath_House2/map.json | 2 +- data/maps/ThreeIsland/map.json | 28 +++++------ data/maps/ThreeIsland_BerryForest/map.json | 28 +++++------ data/maps/ThreeIsland_BondBridge/map.json | 18 +++---- data/maps/ThreeIsland_DunsparceTunnel/map.json | 2 +- data/maps/ThreeIsland_Harbor/map.json | 4 +- data/maps/ThreeIsland_House1/map.json | 2 +- data/maps/ThreeIsland_House2/map.json | 4 +- data/maps/ThreeIsland_House3/map.json | 2 +- data/maps/ThreeIsland_House4/map.json | 4 +- data/maps/ThreeIsland_House5/map.json | 2 +- data/maps/ThreeIsland_Mart/map.json | 8 +-- data/maps/ThreeIsland_PokemonCenter_1F/map.json | 8 +-- data/maps/ThreeIsland_PokemonCenter_2F/map.json | 8 +-- data/maps/ThreeIsland_Port/map.json | 6 +-- data/maps/TradeCenter/map.json | 2 +- data/maps/TrainerTower_1F/map.json | 10 ++-- data/maps/TrainerTower_2F/map.json | 10 ++-- data/maps/TrainerTower_3F/map.json | 10 ++-- data/maps/TrainerTower_4F/map.json | 10 ++-- data/maps/TrainerTower_5F/map.json | 10 ++-- data/maps/TrainerTower_6F/map.json | 10 ++-- data/maps/TrainerTower_7F/map.json | 10 ++-- data/maps/TrainerTower_8F/map.json | 10 ++-- data/maps/TrainerTower_Lobby/map.json | 10 ++-- data/maps/TrainerTower_Roof/map.json | 2 +- data/maps/TwoIsland/map.json | 18 +++---- data/maps/TwoIsland_CapeBrink_House/map.json | 2 +- data/maps/TwoIsland_Harbor/map.json | 4 +- data/maps/TwoIsland_House/map.json | 2 +- data/maps/TwoIsland_JoyfulGameCorner/map.json | 8 +-- data/maps/TwoIsland_PokemonCenter_1F/map.json | 6 +-- data/maps/TwoIsland_PokemonCenter_2F/map.json | 8 +-- data/maps/UndergroundPath_EastEntrance/map.json | 2 +- data/maps/UndergroundPath_NorthEntrance/map.json | 2 +- data/maps/UndergroundPath_SouthEntrance/map.json | 2 +- data/maps/UndergroundPath_WestEntrance/map.json | 2 +- data/maps/UnionRoom/map.json | 18 +++---- data/maps/VermilionCity/map.json | 16 +++--- data/maps/VermilionCity_Gym/map.json | 10 ++-- data/maps/VermilionCity_House1/map.json | 2 +- data/maps/VermilionCity_House2/map.json | 2 +- data/maps/VermilionCity_House3/map.json | 8 +-- data/maps/VermilionCity_Mart/map.json | 6 +-- data/maps/VermilionCity_PokemonCenter_1F/map.json | 10 ++-- data/maps/VermilionCity_PokemonCenter_2F/map.json | 8 +-- data/maps/VermilionCity_PokemonFanClub/map.json | 12 ++--- data/maps/VictoryRoad_1F/map.json | 14 +++--- data/maps/VictoryRoad_2F/map.json | 26 +++++----- data/maps/VictoryRoad_3F/map.json | 24 ++++----- data/maps/ViridianCity/map.json | 18 +++---- data/maps/ViridianCity/scripts.inc | 6 +-- data/maps/ViridianCity_Gym/map.json | 20 ++++---- data/maps/ViridianCity_House1/map.json | 6 +-- data/maps/ViridianCity_House2/map.json | 4 +- data/maps/ViridianCity_Mart/map.json | 6 +-- data/maps/ViridianCity_PokemonCenter_1F/map.json | 8 +-- data/maps/ViridianCity_PokemonCenter_2F/map.json | 8 +-- data/maps/ViridianForest/map.json | 22 ++++---- 363 files changed, 1652 insertions(+), 1654 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index b787a52a5..f66b4da77 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -18,7 +18,6 @@ #include "constants/field_effects.h" #include "constants/trainers.h" #include "constants/trainer_tower.h" -#include "constants/object_events.h" #include "constants/fame_checker.h" #include "constants/seagallop.h" #include "constants/game_stat.h" diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s index c209c8501..be4036928 100644 --- a/data/field_player_avatar.s +++ b/data/field_player_avatar.s @@ -1,4 +1,4 @@ -#include "constants/object_events.h" +#include "constants/event_objects.h" .include "asm/macros.inc" .include "constants/constants.inc" .section .rodata @@ -64,30 +64,30 @@ gUnknown_835B864:: @ 835B864 .4byte MetatileBehavior_IsEastArrowWarp gUnknown_835B874:: @ 835B874 - .byte OBJECT_EVENT_GFX_RED_NORMAL, OBJECT_EVENT_GFX_GREEN_NORMAL - .byte OBJECT_EVENT_GFX_RED_BIKE, OBJECT_EVENT_GFX_GREEN_BIKE - .byte OBJECT_EVENT_GFX_RED_SURF, OBJECT_EVENT_GFX_GREEN_SURF - .byte OBJECT_EVENT_GFX_RED_ITEM, OBJECT_EVENT_GFX_GREEN_ITEM - .byte OBJECT_EVENT_GFX_RED_FISH, OBJECT_EVENT_GFX_GREEN_FISH - .byte OBJECT_EVENT_GFX_RED_ITEM_COPY, OBJECT_EVENT_GFX_GREEN_ITEM_COPY + .byte OBJ_EVENT_GFX_RED_NORMAL, OBJ_EVENT_GFX_GREEN_NORMAL + .byte OBJ_EVENT_GFX_RED_BIKE, OBJ_EVENT_GFX_GREEN_BIKE + .byte OBJ_EVENT_GFX_RED_SURF, OBJ_EVENT_GFX_GREEN_SURF + .byte OBJ_EVENT_GFX_RED_ITEM, OBJ_EVENT_GFX_GREEN_ITEM + .byte OBJ_EVENT_GFX_RED_FISH, OBJ_EVENT_GFX_GREEN_FISH + .byte OBJ_EVENT_GFX_RED_ITEM_COPY, OBJ_EVENT_GFX_GREEN_ITEM_COPY gUnknown_835B880:: @ 835B880 - .byte OBJECT_EVENT_GFX_RS_BRENDAN - .byte OBJECT_EVENT_GFX_RS_MAY + .byte OBJ_EVENT_GFX_RS_BRENDAN + .byte OBJ_EVENT_GFX_RS_MAY gUnknown_835B882:: @ 835B882 @ Male - .byte OBJECT_EVENT_GFX_RED_NORMAL, 0x01 - .byte OBJECT_EVENT_GFX_RED_BIKE, 0x02 - .byte OBJECT_EVENT_GFX_RED_SURF, 0x08 + .byte OBJ_EVENT_GFX_RED_NORMAL, 0x01 + .byte OBJ_EVENT_GFX_RED_BIKE, 0x02 + .byte OBJ_EVENT_GFX_RED_SURF, 0x08 @ Female - .byte OBJECT_EVENT_GFX_GREEN_NORMAL, 0x01 - .byte OBJECT_EVENT_GFX_GREEN_BIKE, 0x02 - .byte OBJECT_EVENT_GFX_GREEN_SURF, 0x08 + .byte OBJ_EVENT_GFX_GREEN_NORMAL, 0x01 + .byte OBJ_EVENT_GFX_GREEN_BIKE, 0x02 + .byte OBJ_EVENT_GFX_GREEN_SURF, 0x08 gUnknown_835B88E:: @ 835B88E - .byte OBJECT_EVENT_GFX_RED_VS_SEEKER - .byte OBJECT_EVENT_GFX_GREEN_VS_SEEKER + .byte OBJ_EVENT_GFX_RED_VS_SEEKER + .byte OBJ_EVENT_GFX_GREEN_VS_SEEKER gUnknown_835B890:: @ 835B890 .4byte MetatileBehavior_IsSouthArrowWarp diff --git a/data/map_events.s b/data/map_events.s index ce4d9efc3..62bd63b2e 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -10,7 +10,6 @@ #include "constants/vars.h" #include "constants/weather.h" @#include "constants/trainer_hill.h" -#include "constants/object_events.h" .include "asm/macros.inc" .include "constants/constants.inc" .include "constants/item_data_constants.inc" diff --git a/data/maps/BattleColosseum_2P/map.json b/data/maps/BattleColosseum_2P/map.json index d9d80e7e9..b2f6c9186 100644 --- a/data/maps/BattleColosseum_2P/map.json +++ b/data/maps/BattleColosseum_2P/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 9, "y": 3, "elevation": 3, diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index 5f8c86d9c..77bbc7ec0 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_METEORITE", + "graphics_id": "OBJ_EVENT_GFX_METEORITE", "x": 15, "y": 12, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_BIRTH_ISLAND_METEORITE" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 15, "y": 3, "elevation": 3, diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index d58a16b85..e2e75550a 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -10,7 +10,7 @@ BirthIsland_Exterior_OnReturnToField:: @ 8165213 BirthIsland_Exterior_OnTransition:: @ 8165217 setworldmapflag FLAG_WORLD_MAP_BIRTH_ISLAND_EXTERIOR - setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_DEOXYS_N + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_DEOXYS_N setvar VAR_DEOXYS_INTERACTION_STEP_COUNTER, 0 setvar VAR_DEOXYS_INTERACTION_NUM, 0 call_if_set FLAG_FOUGHT_DEOXYS, BirthIsland_Exterior_EventScript_HideDeoxysAndPuzzle diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index dfc063ad9..7f5ad6124 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", + "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index b9ed79113..f635220e1 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 48, "y": 15, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_CELADON_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 38, "y": 14, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_POLIWRATH", + "graphics_id": "OBJ_EVENT_GFX_POLIWRATH", "x": 36, "y": 14, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 11, "y": 18, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 18, "y": 22, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 30, "y": 24, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 26, "y": 19, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 38, "y": 31, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_HIDE_CELADON_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 9, "y": 30, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 52, "y": 22, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 40, "y": 35, "elevation": 0, @@ -170,7 +170,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 25, "y": 10, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "in_connection": true, "x": -7, "y": 21, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 3, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "FLAG_HIDE_CELADON_CITY_ETHER" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 47, "y": 24, "elevation": 3, diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json index 264fd2aa6..6887e5d59 100644 --- a/data/maps/CeladonCity_Condominiums_1F/map.json +++ b/data/maps/CeladonCity_Condominiums_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_MEOWTH", + "graphics_id": "OBJ_EVENT_GFX_MEOWTH", "x": 1, "y": 9, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CLEFAIRY", + "graphics_id": "OBJ_EVENT_GFX_CLEFAIRY", "x": 5, "y": 13, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_F", + "graphics_id": "OBJ_EVENT_GFX_NIDORAN_F", "x": 5, "y": 8, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 2, "y": 9, "elevation": 3, diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json index 89d78d255..90cded248 100644 --- a/data/maps/CeladonCity_Condominiums_3F/map.json +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 0, "y": 10, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 3, "y": 8, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 4, "y": 10, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 0, "y": 13, "elevation": 3, diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index 4b7c69e3a..a8aa69f77 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 3, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 3, "elevation": 0, diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json index beb73045e..fa5630be8 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", + "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 6, "y": 10, "elevation": 3, diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json index 31cf48f57..39b0f530b 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 5, "y": 10, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 1, "y": 8, "elevation": 0, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 1, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 11, "y": 6, "elevation": 3, diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json index 4948847ef..ac47d8ac5 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 10, "y": 9, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GBA_KID", + "graphics_id": "OBJ_EVENT_GFX_GBA_KID", "x": 11, "y": 6, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GBA_KID", + "graphics_id": "OBJ_EVENT_GFX_GBA_KID", "x": 4, "y": 9, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GBA_KID", + "graphics_id": "OBJ_EVENT_GFX_GBA_KID", "x": 1, "y": 9, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 9, "y": 14, "elevation": 3, diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json index 298d207c2..5d6cdb416 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 6, "y": 6, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 10, "y": 11, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 3, "y": 13, "elevation": 0, diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json index b2b31ef7f..5746f8363 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 11, "y": 6, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 6, "y": 8, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 1, "y": 7, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json index 861954bd3..7fed112f3 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 9, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 5, "y": 4, "elevation": 3, diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json index 1733a8f35..063e7e74a 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", + "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 4, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 6, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 1, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 1, "y": 8, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 4, "y": 7, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", + "graphics_id": "OBJ_EVENT_GFX_GYM_GUY", "x": 7, "y": 10, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 7, "y": 8, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 10, "y": 9, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 13, "y": 7, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 16, "y": 10, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 11, "y": 2, "elevation": 3, diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json index 9dcaf101a..298855844 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 2, "y": 6, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 6, "y": 7, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 4, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 6, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 2, "y": 2, "elevation": 3, diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json index ac88b5869..230a033bb 100644 --- a/data/maps/CeladonCity_Gym/map.json +++ b/data/maps/CeladonCity_Gym/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 3, "y": 11, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 9, "y": 10, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 10, "y": 7, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 2, "y": 6, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 5, "y": 4, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 7, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ERIKA", + "graphics_id": "OBJ_EVENT_GFX_ERIKA", "x": 6, "y": 4, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 8, "y": 7, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 6, "y": 8, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 3, "y": 5, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json index 964db9cab..66d15f518 100644 --- a/data/maps/CeladonCity_Hotel/map.json +++ b/data/maps/CeladonCity_Hotel/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 5, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 3, "y": 6, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 9, "y": 7, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 2, "y": 6, "elevation": 3, diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json index 37231d091..6201d5b3a 100644 --- a/data/maps/CeladonCity_House1/map.json +++ b/data/maps/CeladonCity_House1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 5, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 2, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 8, "y": 4, "elevation": 3, diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json index 58df64cf8..301f33056 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 4, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 10, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 12, "y": 5, "elevation": 3, diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json index 88dab9bec..83ded878c 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json index b84bbabd6..7d6df6b05 100644 --- a/data/maps/CeladonCity_Restaurant/map.json +++ b/data/maps/CeladonCity_Restaurant/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CHEF", + "graphics_id": "OBJ_EVENT_GFX_CHEF", "x": 12, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 11, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 9, "y": 4, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 1, "y": 2, "elevation": 0, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 3, "y": 7, "elevation": 0, diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json index beadaeab9..ee32088bc 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 3, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_NUGGET" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 16, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_FULL_RESTORE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 25, "y": 5, "elevation": 4, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_MAX_ELIXIR" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 21, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 13, "y": 21, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 20, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 14, "y": 20, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 11, "y": 21, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 18, "elevation": 3, diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json index 1390abd3d..a19dac4e7 100644 --- a/data/maps/CeruleanCave_2F/map.json +++ b/data/maps/CeruleanCave_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, "y": 18, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_PP_UP" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 16, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_ULTRA_BALL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 33, "y": 12, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_FULL_RESTORE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 33, "y": 10, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 33, "y": 9, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 25, "y": 11, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 28, "y": 20, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 30, "y": 20, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 13, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 23, "y": 16, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 13, "y": 6, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 12, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 10, "y": 20, "elevation": 3, diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json index 7dccb782c..cb873d731 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 9, "elevation": 4, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_ULTRA_BALL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 32, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_MAX_REVIVE" }, { - "graphics_id": "OBJECT_EVENT_GFX_MEWTWO", + "graphics_id": "OBJ_EVENT_GFX_MEWTWO", "x": 7, "y": 12, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_MEWTWO" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 37, "y": 1, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 38, "y": 2, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 35, "y": 1, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 37, "y": 4, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 35, "y": 5, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 2, "y": 2, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 6, "y": 1, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 3, "y": 4, "elevation": 3, diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index 25c2333e0..b9e7f6106 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -37,7 +37,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 31, "y": 12, "elevation": 3, @@ -50,7 +50,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 33, "y": 6, "elevation": 3, @@ -63,7 +63,7 @@ "flag": "FLAG_HIDE_CERULEAN_ROCKET" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 16, "y": 21, "elevation": 3, @@ -76,7 +76,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 9, "y": 23, "elevation": 3, @@ -89,7 +89,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SLOWBRO", + "graphics_id": "OBJ_EVENT_GFX_SLOWBRO", "x": 32, "y": 29, "elevation": 3, @@ -102,7 +102,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 33, "y": 29, "elevation": 3, @@ -115,7 +115,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 34, "y": 22, "elevation": 3, @@ -128,7 +128,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLUE", + "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 22, "y": 0, "elevation": 3, @@ -141,7 +141,7 @@ "flag": "FLAG_HIDE_CERULEAN_RIVAL" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 26, "y": 32, "elevation": 3, @@ -154,7 +154,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "in_connection": true, "x": 50, "y": 18, @@ -168,7 +168,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 12, "y": 30, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 1, "y": 13, "elevation": 3, diff --git a/data/maps/CeruleanCity_BikeShop/map.json b/data/maps/CeruleanCity_BikeShop/map.json index 4bf7375b8..1db90cc0f 100644 --- a/data/maps/CeruleanCity_BikeShop/map.json +++ b/data/maps/CeruleanCity_BikeShop/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 9, "y": 3, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 9, "y": 7, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/CeruleanCity_Gym/map.json b/data/maps/CeruleanCity_Gym/map.json index afe882548..551bc0d9a 100644 --- a/data/maps/CeruleanCity_Gym/map.json +++ b/data/maps/CeruleanCity_Gym/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 10, "y": 12, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 4, "y": 7, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MISTY", + "graphics_id": "OBJ_EVENT_GFX_MISTY", "x": 8, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", + "graphics_id": "OBJ_EVENT_GFX_GYM_GUY", "x": 7, "y": 16, "elevation": 3, diff --git a/data/maps/CeruleanCity_House1/map.json b/data/maps/CeruleanCity_House1/map.json index 0b1d03a40..7233d7c66 100644 --- a/data/maps/CeruleanCity_House1/map.json +++ b/data/maps/CeruleanCity_House1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/CeruleanCity_House2/map.json b/data/maps/CeruleanCity_House2/map.json index 69d20876a..8a36a82d3 100644 --- a/data/maps/CeruleanCity_House2/map.json +++ b/data/maps/CeruleanCity_House2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 1, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 7, "y": 6, "elevation": 3, diff --git a/data/maps/CeruleanCity_House3/map.json b/data/maps/CeruleanCity_House3/map.json index 33095af54..c9f6bd1b4 100644 --- a/data/maps/CeruleanCity_House3/map.json +++ b/data/maps/CeruleanCity_House3/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 2, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/CeruleanCity_House4/map.json b/data/maps/CeruleanCity_House4/map.json index 9c5a61b63..ea03d11d8 100644 --- a/data/maps/CeruleanCity_House4/map.json +++ b/data/maps/CeruleanCity_House4/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 5, "y": 3, "elevation": 3, diff --git a/data/maps/CeruleanCity_House5/map.json b/data/maps/CeruleanCity_House5/map.json index eae14c1e4..a1b7d870d 100644 --- a/data/maps/CeruleanCity_House5/map.json +++ b/data/maps/CeruleanCity_House5/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/CeruleanCity_Mart/map.json b/data/maps/CeruleanCity_Mart/map.json index e247e3cd4..05bdb8773 100644 --- a/data/maps/CeruleanCity_Mart/map.json +++ b/data/maps/CeruleanCity_Mart/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 9, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 1, "y": 7, "elevation": 3, diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json index dac0de4b5..fc302635f 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 12, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 5, "y": 4, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 4, "y": 8, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 3, "y": 3, "elevation": 3, diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json index 7eb69e6a4..e12bbcad6 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index 0c8fe0ac6..bd9c57435 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 14, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 11, "y": 11, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BILL", + "graphics_id": "OBJ_EVENT_GFX_BILL", "x": 20, "y": 7, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_CINNABAR_BILL" }, { - "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", + "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 23, "y": 7, "elevation": 1, diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json index 1afa900b9..efa247390 100644 --- a/data/maps/CinnabarIsland_Gym/map.json +++ b/data/maps/CinnabarIsland_Gym/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 25, "y": 11, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 25, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 17, "y": 5, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 16, "y": 11, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 16, "y": 18, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 4, "y": 19, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 4, "y": 11, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLAINE", + "graphics_id": "OBJ_EVENT_GFX_BLAINE", "x": 5, "y": 4, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", + "graphics_id": "OBJ_EVENT_GFX_GYM_GUY", "x": 24, "y": 20, "elevation": 3, diff --git a/data/maps/CinnabarIsland_Mart/map.json b/data/maps/CinnabarIsland_Mart/map.json index a02302367..67e4406ca 100644 --- a/data/maps/CinnabarIsland_Mart/map.json +++ b/data/maps/CinnabarIsland_Mart/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 6, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 8, "y": 2, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json index 06ecc5419..eb919ff85 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 2, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 9, "y": 7, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 14, "y": 6, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { - "graphics_id": "OBJECT_EVENT_GFX_BILL", + "graphics_id": "OBJ_EVENT_GFX_BILL", "x": 11, "y": 5, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json index c4bcde4e4..455c51e9e 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json index 4f446c65e..cd8a2df15 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 2, "y": 4, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json index cefc5bcc4..4fc85fce5 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 11, "y": 8, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 12, "y": 3, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json index 68d681613..e2f26713d 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 5, "y": 3, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 4, "y": 6, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 10, "y": 5, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json index 54015fcc3..38688647e 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 5, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 10, "y": 3, "elevation": 3, diff --git a/data/maps/DiglettsCave_NorthEntrance/map.json b/data/maps/DiglettsCave_NorthEntrance/map.json index 4427d4d17..9cf4e3093 100644 --- a/data/maps/DiglettsCave_NorthEntrance/map.json +++ b/data/maps/DiglettsCave_NorthEntrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/DiglettsCave_SouthEntrance/map.json b/data/maps/DiglettsCave_SouthEntrance/map.json index 591a998e3..77475f33c 100644 --- a/data/maps/DiglettsCave_SouthEntrance/map.json +++ b/data/maps/DiglettsCave_SouthEntrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index ae9611f97..cf40eae9e 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 8, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 16, "y": 10, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "in_connection": true, "x": 32, "y": 9, diff --git a/data/maps/FiveIsland_Harbor/map.json b/data/maps/FiveIsland_Harbor/map.json index bfbcfd8f6..4cbf533e1 100644 --- a/data/maps/FiveIsland_Harbor/map.json +++ b/data/maps/FiveIsland_Harbor/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", + "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/FiveIsland_House1/map.json b/data/maps/FiveIsland_House1/map.json index 8e8e974ba..d75fa598d 100644 --- a/data/maps/FiveIsland_House1/map.json +++ b/data/maps/FiveIsland_House1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 10, "y": 2, "elevation": 3, diff --git a/data/maps/FiveIsland_House2/map.json b/data/maps/FiveIsland_House2/map.json index a97c387d8..2a3c96e0c 100644 --- a/data/maps/FiveIsland_House2/map.json +++ b/data/maps/FiveIsland_House2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 2, "y": 3, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room1/map.json b/data/maps/FiveIsland_LostCave_Room1/map.json index fa79e4245..43b8fe08c 100644 --- a/data/maps/FiveIsland_LostCave_Room1/map.json +++ b/data/maps/FiveIsland_LostCave_Room1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 5, "y": 4, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json index f1c963b0e..fcd1d90d6 100644 --- a/data/maps/FiveIsland_LostCave_Room10/map.json +++ b/data/maps/FiveIsland_LostCave_Room10/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 5, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_LOST_CAVE_SELPHY" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 2, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json index 50ecf922f..77cb971ab 100644 --- a/data/maps/FiveIsland_LostCave_Room11/map.json +++ b/data/maps/FiveIsland_LostCave_Room11/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json index 5a8fef3d2..f5aeb1378 100644 --- a/data/maps/FiveIsland_LostCave_Room12/map.json +++ b/data/maps/FiveIsland_LostCave_Room12/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json index fc2dd61bf..b5c855413 100644 --- a/data/maps/FiveIsland_LostCave_Room13/map.json +++ b/data/maps/FiveIsland_LostCave_Room13/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json index 84cddd2ea..2e920267d 100644 --- a/data/maps/FiveIsland_LostCave_Room14/map.json +++ b/data/maps/FiveIsland_LostCave_Room14/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room4/map.json b/data/maps/FiveIsland_LostCave_Room4/map.json index 2035f850e..844d47ac4 100644 --- a/data/maps/FiveIsland_LostCave_Room4/map.json +++ b/data/maps/FiveIsland_LostCave_Room4/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 6, "y": 4, "elevation": 3, diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index ea727f86d..6546c6e5a 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_F", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_F", "x": 18, "y": 18, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 17, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 11, "y": 27, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 8, "y": 9, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 19, "y": 12, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 11, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_MEADOW_MAX_POTION" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 22, "elevation": 3, diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json index 68694d602..34edad014 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 8, "y": 44, "elevation": 4, @@ -35,7 +35,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 12, "y": 6, "elevation": 3, @@ -48,7 +48,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 14, "y": 17, "elevation": 3, @@ -61,7 +61,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 17, "y": 31, "elevation": 3, @@ -74,7 +74,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 47, "elevation": 3, diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json index 31986b11c..5bb403d1c 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 9, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHEF", + "graphics_id": "OBJ_EVENT_GFX_CHEF", "x": 4, "y": 8, "elevation": 3, diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json index 975a71c51..4ff0f3a83 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json index 868b8cda7..ecb514ff8 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 44, "y": 10, "elevation": 3, @@ -35,7 +35,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 33, "y": 12, "elevation": 3, @@ -48,7 +48,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 12, "y": 10, "elevation": 3, @@ -61,7 +61,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 23, "y": 9, "elevation": 3, @@ -74,7 +74,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 33, "y": 8, "elevation": 3, @@ -87,7 +87,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 33, "y": 3, "elevation": 3, @@ -100,7 +100,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 56, "y": 7, "elevation": 1, @@ -113,7 +113,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 39, "y": 9, "elevation": 3, diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json index 4ab961ce8..2c2563031 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 4, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index 96ff51d8c..6d6f5b7bc 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 15, "y": 11, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 17, "y": 15, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_F", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_F", "x": 27, "y": 16, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 25, "y": 11, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_F", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_F", "x": 6, "y": 6, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 27, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 25, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_BIG_PEARL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 3, "elevation": 0, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_TM36" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 16, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_PEARL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 5, "elevation": 3, diff --git a/data/maps/FiveIsland_WaterLabyrinth/map.json b/data/maps/FiveIsland_WaterLabyrinth/map.json index 78bfa06b4..627ee6b87 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/map.json +++ b/data/maps/FiveIsland_WaterLabyrinth/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 14, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 9, "y": 7, "elevation": 3, diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index 9a31449a1..ed72da60f 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 16, "y": 13, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_DODUO", + "graphics_id": "OBJ_EVENT_GFX_DODUO", "x": 12, "y": 9, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_F", + "graphics_id": "OBJ_EVENT_GFX_NIDORAN_F", "x": 13, "y": 7, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_M", + "graphics_id": "OBJ_EVENT_GFX_NIDORAN_M", "x": 14, "y": 7, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PSYDUCK", + "graphics_id": "OBJ_EVENT_GFX_PSYDUCK", "x": 17, "y": 9, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 26, "y": 19, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 11, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_FOUR_ISLAND_STAR_PIECE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 32, "y": 19, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_HIDE_FOUR_ISLAND_STARDUST" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLUE", + "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 8, "y": 25, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_HIDE_FOUR_ISLAND_RIVAL" }, { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 36, "y": 13, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 31, "y": 21, "elevation": 3, diff --git a/data/maps/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json index 0c7760b98..6cd0223da 100644 --- a/data/maps/FourIsland_Harbor/map.json +++ b/data/maps/FourIsland_Harbor/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", + "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json index 55889c185..3d4984879 100644 --- a/data/maps/FourIsland_House1/map.json +++ b/data/maps/FourIsland_House1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 8, "y": 3, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 9, "y": 3, "elevation": 3, diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json index b9ec87bc0..b83419325 100644 --- a/data/maps/FourIsland_House2/map.json +++ b/data/maps/FourIsland_House2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json index 7ecb022f9..5e126761e 100644 --- a/data/maps/FourIsland_IcefallCave_1F/map.json +++ b/data/maps/FourIsland_IcefallCave_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_1F_ULTRA_BALL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 16, "elevation": 3, diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json index c07a00e61..e93a3457a 100644 --- a/data/maps/FourIsland_IcefallCave_B1F/map.json +++ b/data/maps/FourIsland_IcefallCave_B1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 10, "y": 14, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_B1F_FULL_RESTORE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 21, "y": 7, "elevation": 3, diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json index f542cbfd9..c534c48f2 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 11, "y": 14, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 13, "y": 14, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_LORELEI", + "graphics_id": "OBJ_EVENT_GFX_LORELEI", "x": 12, "y": 16, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_ICEFALL_CAVE_LORELEI" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 10, "y": 15, "elevation": 3, diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json index 0b447056c..7dbe72a88 100644 --- a/data/maps/FourIsland_LoreleisHouse/map.json +++ b/data/maps/FourIsland_LoreleisHouse/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LORELEI", + "graphics_id": "OBJ_EVENT_GFX_LORELEI", "x": 7, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_LORELEI_IN_HER_HOUSE" }, { - "graphics_id": "OBJECT_EVENT_GFX_WIGGLYTUFF", + "graphics_id": "OBJ_EVENT_GFX_WIGGLYTUFF", "x": 0, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SEEL", + "graphics_id": "OBJ_EVENT_GFX_SEEL", "x": 10, "y": 3, "elevation": 0, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PIKACHU", + "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "x": 9, "y": 3, "elevation": 0, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SLOWPOKE", + "graphics_id": "OBJ_EVENT_GFX_SLOWPOKE", "x": 7, "y": 2, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SLOWBRO", + "graphics_id": "OBJ_EVENT_GFX_SLOWBRO", "x": 6, "y": 2, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PSYDUCK", + "graphics_id": "OBJ_EVENT_GFX_PSYDUCK", "x": 6, "y": 4, "elevation": 0, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MEOWTH", + "graphics_id": "OBJ_EVENT_GFX_MEOWTH", "x": 9, "y": 4, "elevation": 0, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_LORELEI_HOUSE_MEOWTH_DOLL" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANSEY", + "graphics_id": "OBJ_EVENT_GFX_CHANSEY", "x": 10, "y": 4, "elevation": 0, @@ -133,7 +133,7 @@ "flag": "FLAG_HIDE_LORELEI_HOUSE_CHANSEY_DOLL" }, { - "graphics_id": "OBJECT_EVENT_GFX_JIGGLYPUFF", + "graphics_id": "OBJ_EVENT_GFX_JIGGLYPUFF", "x": 0, "y": 3, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_HIDE_LORELEI_HOUSE_JIGGLYPUFF_DOLL" }, { - "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_F", + "graphics_id": "OBJ_EVENT_GFX_NIDORAN_F", "x": 0, "y": 5, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_F_DOLL" }, { - "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_M", + "graphics_id": "OBJ_EVENT_GFX_NIDORAN_M", "x": 1, "y": 5, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_M_DOLL" }, { - "graphics_id": "OBJECT_EVENT_GFX_PIDGEOT", + "graphics_id": "OBJ_EVENT_GFX_PIDGEOT", "x": 9, "y": 0, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_HIDE_LORELEIS_HOUSE_PIDGEOT_DOLL" }, { - "graphics_id": "OBJECT_EVENT_GFX_FEAROW", + "graphics_id": "OBJ_EVENT_GFX_FEAROW", "x": 10, "y": 0, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_HIDE_LORELEIS_HOUSE_FEAROW_DOLL" }, { - "graphics_id": "OBJECT_EVENT_GFX_LAPRAS_DOLL", + "graphics_id": "OBJ_EVENT_GFX_LAPRAS_DOLL", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json index 901bcf22d..f5820fef9 100644 --- a/data/maps/FourIsland_Mart/map.json +++ b/data/maps/FourIsland_Mart/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 6, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 8, "y": 3, "elevation": 3, diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json index f5a0751ae..a8bf5fa97 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/map.json +++ b/data/maps/FourIsland_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 10, "y": 6, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 5, "y": 5, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 2, "y": 2, "elevation": 3, diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json index 9818ab609..b6cdf9483 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/map.json +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/FourIsland_PokemonDayCare/map.json b/data/maps/FourIsland_PokemonDayCare/map.json index 3d380f53c..b026f7030 100644 --- a/data/maps/FourIsland_PokemonDayCare/map.json +++ b/data/maps/FourIsland_PokemonDayCare/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 2, "y": 2, "elevation": 3, diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index 5aeab97b9..da9946432 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -32,7 +32,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 37, "y": 17, "elevation": 3, @@ -45,7 +45,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SLOWPOKE", + "graphics_id": "OBJ_EVENT_GFX_SLOWPOKE", "x": 36, "y": 15, "elevation": 3, @@ -58,7 +58,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_VOLTORB", + "graphics_id": "OBJ_EVENT_GFX_VOLTORB", "x": 33, "y": 8, "elevation": 3, @@ -71,7 +71,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 33, "y": 11, "elevation": 3, @@ -84,7 +84,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANSEY", + "graphics_id": "OBJ_EVENT_GFX_CHANSEY", "x": 39, "y": 8, "elevation": 3, @@ -97,7 +97,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 14, "y": 15, "elevation": 3, @@ -110,7 +110,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LAPRAS", + "graphics_id": "OBJ_EVENT_GFX_LAPRAS", "x": 12, "y": 20, "elevation": 1, @@ -123,7 +123,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 36, "y": 20, "elevation": 3, @@ -136,7 +136,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 8, "y": 8, "elevation": 1, @@ -149,7 +149,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_KANGASKHAN", + "graphics_id": "OBJ_EVENT_GFX_KANGASKHAN", "x": 16, "y": 9, "elevation": 3, @@ -162,7 +162,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 30, "y": 10, "elevation": 3, @@ -175,7 +175,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 21, "y": 13, "elevation": 3, @@ -188,7 +188,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 32, "y": 16, "elevation": 3, @@ -201,7 +201,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 24, "y": 22, "elevation": 3, @@ -214,7 +214,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 15, "y": 11, "elevation": 3, @@ -227,7 +227,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 40, "y": 6, "elevation": 3, diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc index 5f0875db8..ee144bf4c 100644 --- a/data/maps/FuchsiaCity/scripts.inc +++ b/data/maps/FuchsiaCity/scripts.inc @@ -9,11 +9,11 @@ FuchsiaCity_OnTransition:: @ 8166D7B end FuchsicaCity_EventScript_SetOmanyteGfx:: @ 8166D91 - setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OMANYTE + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_OMANYTE return FuchsiaCity_EventScript_SetKabutoGfx:: @ 8166D97 - setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_KABUTO + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_KABUTO return FuchsiaCity_EventScript_LittleBoy:: @ 8166D9D diff --git a/data/maps/FuchsiaCity_Gym/map.json b/data/maps/FuchsiaCity_Gym/map.json index c07403503..c14782953 100644 --- a/data/maps/FuchsiaCity_Gym/map.json +++ b/data/maps/FuchsiaCity_Gym/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 12, "y": 16, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 2, "y": 9, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 11, "y": 11, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 13, "y": 4, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 4, "y": 6, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 2, "y": 16, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_KOGA", + "graphics_id": "OBJ_EVENT_GFX_KOGA", "x": 7, "y": 13, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", + "graphics_id": "OBJ_EVENT_GFX_GYM_GUY", "x": 11, "y": 19, "elevation": 3, diff --git a/data/maps/FuchsiaCity_House1/map.json b/data/maps/FuchsiaCity_House1/map.json index a45861216..f54074598 100644 --- a/data/maps/FuchsiaCity_House1/map.json +++ b/data/maps/FuchsiaCity_House1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 7, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 1, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 2, "y": 5, "elevation": 3, diff --git a/data/maps/FuchsiaCity_House2/map.json b/data/maps/FuchsiaCity_House2/map.json index b90a8e3cc..2d6516978 100644 --- a/data/maps/FuchsiaCity_House2/map.json +++ b/data/maps/FuchsiaCity_House2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/FuchsiaCity_House3/map.json b/data/maps/FuchsiaCity_House3/map.json index 8454ca7de..ac3b1ce35 100644 --- a/data/maps/FuchsiaCity_House3/map.json +++ b/data/maps/FuchsiaCity_House3/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/FuchsiaCity_Mart/map.json b/data/maps/FuchsiaCity_Mart/map.json index 6b8a28db2..64f2bfc92 100644 --- a/data/maps/FuchsiaCity_Mart/map.json +++ b/data/maps/FuchsiaCity_Mart/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 6, "y": 3, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 9, "y": 5, "elevation": 3, diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json index 7df358659..253b544ce 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 12, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 13, "y": 3, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 4, "y": 8, "elevation": 3, diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json index c2a20fb9e..c6069c491 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json index d10098769..b0e5ce5db 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 7, "y": 3, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/FuchsiaCity_SafariZone_Office/map.json b/data/maps/FuchsiaCity_SafariZone_Office/map.json index fc65b8308..eb5d1c326 100644 --- a/data/maps/FuchsiaCity_SafariZone_Office/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Office/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 2, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 12, "y": 3, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 6, "y": 4, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 10, "y": 8, "elevation": 3, diff --git a/data/maps/FuchsiaCity_WardensHouse/map.json b/data/maps/FuchsiaCity_WardensHouse/map.json index f6333f402..bf130d7e2 100644 --- a/data/maps/FuchsiaCity_WardensHouse/map.json +++ b/data/maps/FuchsiaCity_WardensHouse/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 3, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 11, "y": 6, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 5, "elevation": 3, diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json index 70c8e240c..1512276d4 100644 --- a/data/maps/IndigoPlateau_Exterior/map.json +++ b/data/maps/IndigoPlateau_Exterior/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BLUE", + "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 11, "y": 6, "elevation": 0, @@ -35,7 +35,7 @@ "flag": "FLAG_HIDE_CREDITS_RIVAL" }, { - "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK", + "graphics_id": "OBJ_EVENT_GFX_PROF_OAK", "x": 11, "y": 6, "elevation": 0, diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json index ff5e1b0ca..ec32e96ec 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 0, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 13, "y": 10, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", + "graphics_id": "OBJ_EVENT_GFX_GYM_GUY", "x": 7, "y": 14, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 5, "y": 3, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 23, "y": 13, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 16, "y": 15, "elevation": 3, diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json index 6eeb47d03..eaea7e788 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json index c3e98f4e9..5205e43e0 100644 --- a/data/maps/LavenderTown/map.json +++ b/data/maps/LavenderTown/map.json @@ -32,7 +32,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 19, "y": 10, "elevation": 3, @@ -45,7 +45,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 12, "y": 12, "elevation": 3, @@ -58,7 +58,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 10, "y": 7, "elevation": 3, diff --git a/data/maps/LavenderTown_House1/map.json b/data/maps/LavenderTown_House1/map.json index 23f767cad..79217f6b3 100644 --- a/data/maps/LavenderTown_House1/map.json +++ b/data/maps/LavenderTown_House1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 4, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUBONE", + "graphics_id": "OBJ_EVENT_GFX_CUBONE", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/LavenderTown_House2/map.json b/data/maps/LavenderTown_House2/map.json index 0318b07a8..cdd978063 100644 --- a/data/maps/LavenderTown_House2/map.json +++ b/data/maps/LavenderTown_House2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/LavenderTown_Mart/map.json b/data/maps/LavenderTown_Mart/map.json index 44e4fdb2f..8b80604c0 100644 --- a/data/maps/LavenderTown_Mart/map.json +++ b/data/maps/LavenderTown_Mart/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 6, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 9, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 9, "y": 5, "elevation": 3, diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json index 955d6f37c..7a5413d63 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 9, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 5, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 2, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 14, "y": 6, "elevation": 3, diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json index 0605f499a..89034ca3e 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json index e292b44e4..14781ded3 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_MR_FUJI", + "graphics_id": "OBJ_EVENT_GFX_MR_FUJI", "x": 3, "y": 3, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_POKEHOUSE_FUJI" }, { - "graphics_id": "OBJECT_EVENT_GFX_NIDORINO", + "graphics_id": "OBJ_EVENT_GFX_NIDORINO", "x": 1, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PSYDUCK", + "graphics_id": "OBJ_EVENT_GFX_PSYDUCK", "x": 9, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 9, "y": 5, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 3, "y": 5, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 7, "y": 2, "elevation": 3, diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index fcdf6edb2..2ffa70dbb 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 29, "y": 45, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 41, "y": 40, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 42, "y": 40, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "x": 22, "y": 35, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 15, "y": 28, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 14, "y": 42, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 29, "y": 41, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 30, "y": 42, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 22, "y": 45, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 17, "y": 46, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 36, "y": 14, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 34, "y": 14, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 36, "y": 15, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 35, "y": 14, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 35, "y": 17, "elevation": 3, @@ -211,7 +211,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 39, "elevation": 3, @@ -224,7 +224,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 19, "y": 40, "elevation": 3, @@ -237,7 +237,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 6, "elevation": 3, @@ -250,7 +250,7 @@ "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ULTRA_BALL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 38, "y": 10, "elevation": 3, @@ -263,7 +263,7 @@ "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_FIRE_STONE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 48, "y": 20, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json index e0f972558..3f6153369 100644 --- a/data/maps/MtEmber_RubyPath_1F/map.json +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 11, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 23, "y": 16, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 20, "y": 12, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 19, "y": 7, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 21, "y": 15, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json index 46362d54e..5a9ed2ccc 100644 --- a/data/maps/MtEmber_RubyPath_B1F/map.json +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 8, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 11, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 3, "y": 12, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 14, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json index 11ec64838..c7d4e2f34 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 2, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json index 29d74a5a6..4c83d7a9b 100644 --- a/data/maps/MtEmber_RubyPath_B2F/map.json +++ b/data/maps/MtEmber_RubyPath_B2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 9, "y": 3, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 12, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 12, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 8, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 8, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 5, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json index 47e9c1c87..375c6beb5 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 3, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index 698499402..29f75c76d 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 10, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 26, "y": 12, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 28, "y": 8, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 6, "y": 6, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 6, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 5, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 2, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 15, "y": 13, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json index 2d0964a1d..ccd53263e 100644 --- a/data/maps/MtEmber_RubyPath_B5F/map.json +++ b/data/maps/MtEmber_RubyPath_B5F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_RUBY", + "graphics_id": "OBJ_EVENT_GFX_RUBY", "x": 7, "y": 7, "elevation": 0, diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json index 3545b5ba2..286baa86a 100644 --- a/data/maps/MtEmber_Summit/map.json +++ b/data/maps/MtEmber_Summit/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_MOLTRES", + "graphics_id": "OBJ_EVENT_GFX_MOLTRES", "x": 9, "y": 6, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_MOLTRES" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 10, "y": 12, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 9, "y": 12, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 8, "y": 11, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 8, "y": 10, "elevation": 3, diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json index 02496f3e9..9698a5529 100644 --- a/data/maps/MtEmber_SummitPath_2F/map.json +++ b/data/maps/MtEmber_SummitPath_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 40, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 33, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 19, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 13, "y": 23, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 13, "y": 21, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 38, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 35, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 34, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 26, "elevation": 3, diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json index f5b829469..4bfd935f9 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 20, "y": 26, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 36, "y": 30, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 30, "y": 35, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 33, "y": 4, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 7, "y": 26, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 13, "y": 17, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 7, "y": 10, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 22, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_PARALYZE_HEAL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 35, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_TM09" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 32, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_POTION" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 42, "y": 35, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_RARE_CANDY" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 44, "y": 21, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_ESCAPE_ROPE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 2, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_MOON_STONE" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 42, "y": 7, "elevation": 3, diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index f0a3ba3a9..2dfe5c967 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FOSSIL", + "graphics_id": "OBJ_EVENT_GFX_FOSSIL", "x": 13, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_DOME_FOSSIL" }, { - "graphics_id": "OBJECT_EVENT_GFX_FOSSIL", + "graphics_id": "OBJ_EVENT_GFX_FOSSIL", "x": 14, "y": 7, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_HELIX_FOSSIL" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 13, "y": 11, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 37, "y": 21, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 12, "y": 20, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 35, "y": 12, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 18, "y": 27, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 30, "y": 26, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_MT_MOON_B2F_STAR_PIECE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 35, "y": 5, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_HIDE_MT_MOON_B2F_TM46" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 24, "y": 6, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_HIDE_MT_MOON_B2F_REVIVE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 11, "elevation": 3, diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json index 98d1145fc..ee229f592 100644 --- a/data/maps/NavelRock_Base/map.json +++ b/data/maps/NavelRock_Base/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LUGIA", + "graphics_id": "OBJ_EVENT_GFX_LUGIA", "x": 10, "y": 15, "elevation": 3, diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index 796f67e5f..cb4f1b2e3 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", + "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index 3c2f599d5..db1f961b4 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_HO_OH", + "graphics_id": "OBJ_EVENT_GFX_HO_OH", "x": 9, "y": 6, "elevation": 0, diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json index 06d8b7c6d..0fa530aa2 100644 --- a/data/maps/OneIsland/map.json +++ b/data/maps/OneIsland/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BILL", + "graphics_id": "OBJ_EVENT_GFX_BILL", "x": 12, "y": 16, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_ONE_ISLAND_BILL" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 16, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 13, "y": 9, "elevation": 3, diff --git a/data/maps/OneIsland_Harbor/map.json b/data/maps/OneIsland_Harbor/map.json index a505aa5d0..fd3210c7e 100644 --- a/data/maps/OneIsland_Harbor/map.json +++ b/data/maps/OneIsland_Harbor/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", + "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/OneIsland_House1/map.json b/data/maps/OneIsland_House1/map.json index 8ef48b424..6a8f21cfc 100644 --- a/data/maps/OneIsland_House1/map.json +++ b/data/maps/OneIsland_House1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/OneIsland_House2/map.json b/data/maps/OneIsland_House2/map.json index bb9b1da3f..c9ce2a7b0 100644 --- a/data/maps/OneIsland_House2/map.json +++ b/data/maps/OneIsland_House2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 9, "y": 4, "elevation": 3, diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index 01e5b92e7..83aa1eadc 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 11, "y": 32, "elevation": 1, @@ -35,7 +35,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_LAND", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_LAND", "x": 17, "y": 132, "elevation": 3, @@ -48,7 +48,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 7, "y": 39, "elevation": 1, @@ -61,7 +61,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_LAND", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_LAND", "x": 19, "y": 79, "elevation": 3, @@ -74,7 +74,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 15, "y": 25, "elevation": 3, @@ -87,7 +87,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "x": 9, "y": 53, "elevation": 3, @@ -100,7 +100,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "x": 18, "y": 105, "elevation": 4, @@ -113,7 +113,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 16, "y": 64, "elevation": 3, @@ -126,7 +126,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 11, "y": 64, "elevation": 3, @@ -139,7 +139,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 11, "y": 89, "elevation": 3, @@ -152,7 +152,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 9, "y": 108, "elevation": 3, @@ -165,7 +165,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 8, "y": 68, "elevation": 3, @@ -178,7 +178,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "x": 9, "y": 68, "elevation": 3, @@ -191,7 +191,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 8, "y": 104, "elevation": 3, @@ -204,7 +204,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 11, "y": 95, "elevation": 3, @@ -217,7 +217,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 12, "y": 96, "elevation": 3, @@ -230,7 +230,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 10, "y": 95, "elevation": 3, @@ -243,7 +243,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 105, "elevation": 3, @@ -256,7 +256,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 75, "elevation": 3, @@ -269,7 +269,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 84, "elevation": 3, @@ -282,7 +282,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 74, "elevation": 3, @@ -295,7 +295,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 73, "elevation": 3, @@ -308,7 +308,7 @@ "flag": "FLAG_TEMP_1C" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 111, "elevation": 4, @@ -321,7 +321,7 @@ "flag": "FLAG_TEMP_1D" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 10, "y": 86, "elevation": 3, @@ -334,7 +334,7 @@ "flag": "FLAG_TEMP_1E" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 110, "elevation": 3, @@ -347,7 +347,7 @@ "flag": "FLAG_TEMP_1F" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 112, "elevation": 4, @@ -360,7 +360,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 15, "y": 70, "elevation": 3, @@ -373,7 +373,7 @@ "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_ETHER" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 103, "elevation": 3, @@ -386,7 +386,7 @@ "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_MAX_REPEL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 18, "y": 114, "elevation": 4, diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json index 0a50424cb..3472ab348 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 11, "y": 13, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 15, "y": 11, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 6, "y": 8, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 20, "y": 7, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 10, "y": 5, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 11, "y": 20, "elevation": 3, diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index 07d68dfc1..08df3284c 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 5, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BILL", + "graphics_id": "OBJ_EVENT_GFX_BILL", "x": 14, "y": 6, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL" }, { - "graphics_id": "OBJECT_EVENT_GFX_CELIO", + "graphics_id": "OBJ_EVENT_GFX_CELIO", "x": 15, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_CELIO" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 6, "y": 8, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 3, "y": 7, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json index 5b20f3609..33bafe5f8 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/map.json +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/OneIsland_TreasureBeach/map.json b/data/maps/OneIsland_TreasureBeach/map.json index 2198e9b44..33eaf4781 100644 --- a/data/maps/OneIsland_TreasureBeach/map.json +++ b/data/maps/OneIsland_TreasureBeach/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 8, "y": 11, "elevation": 1, @@ -35,7 +35,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 13, "y": 20, "elevation": 3, diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 58924be03..6ebe51cc2 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 3, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 13, "y": 17, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK", + "graphics_id": "OBJ_EVENT_GFX_PROF_OAK", "x": 10, "y": 8, "elevation": 3, diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json index 6b44f7eb3..a1fb5c9c8 100644 --- a/data/maps/PalletTown_GarysHouse/map.json +++ b/data/maps/PalletTown_GarysHouse/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_DAISY", + "graphics_id": "OBJ_EVENT_GFX_DAISY", "x": 10, "y": 6, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_TOWN_MAP", + "graphics_id": "OBJ_EVENT_GFX_TOWN_MAP", "x": 6, "y": 4, "elevation": 3, diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json index 414766d99..ab8dabcf9 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/map.json +++ b/data/maps/PalletTown_PlayersHouse_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_MOM", + "graphics_id": "OBJ_EVENT_GFX_MOM", "x": 8, "y": 4, "elevation": 3, diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index 31e6014cb..fe8980b44 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 3, "y": 11, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", + "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 2, "y": 10, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 11, "y": 10, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK", + "graphics_id": "OBJ_EVENT_GFX_PROF_OAK", "x": 6, "y": 3, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_OAK_IN_HIS_LAB" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 4, "elevation": 0, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_BULBASAUR_BALL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, "y": 4, "elevation": 0, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_SQUIRTLE_BALL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 10, "y": 4, "elevation": 0, @@ -107,7 +107,7 @@ "flag": "FLAG_HIDE_CHARMANDER_BALL" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLUE", + "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 5, "y": 4, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_RIVAL_IN_LAB" }, { - "graphics_id": "OBJECT_EVENT_GFX_POKEDEX", + "graphics_id": "OBJ_EVENT_GFX_POKEDEX", "x": 4, "y": 1, "elevation": 0, @@ -133,7 +133,7 @@ "flag": "FLAG_HIDE_POKEDEX" }, { - "graphics_id": "OBJECT_EVENT_GFX_POKEDEX", + "graphics_id": "OBJ_EVENT_GFX_POKEDEX", "x": 5, "y": 1, "elevation": 0, diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index fb235f0c5..63d974e60 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 6, "y": 15, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 33, "y": 17, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_PEWTER_MUSEUM_GUIDE" }, { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 21, "y": 28, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 33, "y": 27, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 42, "y": 20, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_PEWTER_CITY_GYM_GUIDE" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 30, "y": 5, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 46, "y": 20, "elevation": 3, diff --git a/data/maps/PewterCity_Gym/map.json b/data/maps/PewterCity_Gym/map.json index 45c972196..c5009c369 100644 --- a/data/maps/PewterCity_Gym/map.json +++ b/data/maps/PewterCity_Gym/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BROCK", + "graphics_id": "OBJ_EVENT_GFX_BROCK", "x": 6, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 3, "y": 8, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", + "graphics_id": "OBJ_EVENT_GFX_GYM_GUY", "x": 7, "y": 12, "elevation": 3, diff --git a/data/maps/PewterCity_House1/map.json b/data/maps/PewterCity_House1/map.json index ca16f11a1..29c5ad3db 100644 --- a/data/maps/PewterCity_House1/map.json +++ b/data/maps/PewterCity_House1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 1, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 5, "y": 3, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_M", + "graphics_id": "OBJ_EVENT_GFX_NIDORAN_M", "x": 6, "y": 3, "elevation": 3, diff --git a/data/maps/PewterCity_House2/map.json b/data/maps/PewterCity_House2/map.json index 27fb0810c..5f22bc1d4 100644 --- a/data/maps/PewterCity_House2/map.json +++ b/data/maps/PewterCity_House2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 3, "y": 3, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 5, "y": 3, "elevation": 3, diff --git a/data/maps/PewterCity_Mart/map.json b/data/maps/PewterCity_Mart/map.json index 77983d9f3..233f0db8e 100644 --- a/data/maps/PewterCity_Mart/map.json +++ b/data/maps/PewterCity_Mart/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 8, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 6, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index ced7102e2..ab2389c02 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 16, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 2, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 21, "y": 3, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_AMBER", + "graphics_id": "OBJ_EVENT_GFX_OLD_AMBER", "x": 22, "y": 3, "elevation": 0, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_OLD_AMBER" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 26, "y": 4, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 26, "y": 7, "elevation": 3, diff --git a/data/maps/PewterCity_Museum_2F/map.json b/data/maps/PewterCity_Museum_2F/map.json index c7e1c8d8d..cce062e6d 100644 --- a/data/maps/PewterCity_Museum_2F/map.json +++ b/data/maps/PewterCity_Museum_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 10, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 4, "y": 9, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 0, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 15, "y": 8, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 16, "y": 8, "elevation": 3, diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json index e4858844c..61886cddc 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/map.json +++ b/data/maps/PewterCity_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_JIGGLYPUFF", + "graphics_id": "OBJ_EVENT_GFX_JIGGLYPUFF", "x": 2, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 4, "y": 8, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 1, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 13, "y": 2, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GBA_KID", + "graphics_id": "OBJ_EVENT_GFX_GBA_KID", "x": 10, "y": 7, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GBA_KID", + "graphics_id": "OBJ_EVENT_GFX_GBA_KID", "x": 14, "y": 6, "elevation": 3, diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json index 445b86eb3..b7ab4725e 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/map.json +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/PokemonLeague_AgathasRoom/map.json b/data/maps/PokemonLeague_AgathasRoom/map.json index 68dd0db42..f6434eed8 100644 --- a/data/maps/PokemonLeague_AgathasRoom/map.json +++ b/data/maps/PokemonLeague_AgathasRoom/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_AGATHA", + "graphics_id": "OBJ_EVENT_GFX_AGATHA", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json index 6153f4808..e7e98233f 100644 --- a/data/maps/PokemonLeague_BrunosRoom/map.json +++ b/data/maps/PokemonLeague_BrunosRoom/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BRUNO", + "graphics_id": "OBJ_EVENT_GFX_BRUNO", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json index f8e9422c3..c6dd72917 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/map.json +++ b/data/maps/PokemonLeague_ChampionsRoom/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BLUE", + "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 6, "y": 8, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK", + "graphics_id": "OBJ_EVENT_GFX_PROF_OAK", "x": 6, "y": 15, "elevation": 0, diff --git a/data/maps/PokemonLeague_HallOfFame/map.json b/data/maps/PokemonLeague_HallOfFame/map.json index 16c9d05ec..7ae0b20ed 100644 --- a/data/maps/PokemonLeague_HallOfFame/map.json +++ b/data/maps/PokemonLeague_HallOfFame/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK", + "graphics_id": "OBJ_EVENT_GFX_PROF_OAK", "x": 6, "y": 4, "elevation": 3, diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json index 332ed15b8..5ec8fbcc0 100644 --- a/data/maps/PokemonLeague_LancesRoom/map.json +++ b/data/maps/PokemonLeague_LancesRoom/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LANCE", + "graphics_id": "OBJ_EVENT_GFX_LANCE", "x": 6, "y": 8, "elevation": 3, diff --git a/data/maps/PokemonLeague_LoreleisRoom/map.json b/data/maps/PokemonLeague_LoreleisRoom/map.json index d308c7975..a46b2b859 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/map.json +++ b/data/maps/PokemonLeague_LoreleisRoom/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LORELEI", + "graphics_id": "OBJ_EVENT_GFX_LORELEI", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json index da4e01f1e..f3d8d7d17 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 22, "y": 24, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 32, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_1F_CARBOS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 22, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_1F_ESCAPE_ROPE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 15, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_1F_PROTEIN" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 8, "y": 8, "elevation": 3, diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json index 3701da351..17f1847ed 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 5, "y": 23, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 36, "y": 8, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_2F_CALCIUM" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 18, "y": 23, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_2F_ZINC" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 35, "y": 17, "elevation": 3, diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index e3d599d9f..368d261db 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 7, "y": 13, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 22, "y": 13, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, "y": 19, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_3F_MAX_POTION" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 32, "y": 6, "elevation": 3, diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index c4a876461..37cd7c276 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 21, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM22" }, { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 20, "y": 25, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 34, "y": 13, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 23, "y": 4, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM14" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 29, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_FULL_RESTORE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 7, "elevation": 3, diff --git a/data/maps/PokemonTower_1F/map.json b/data/maps/PokemonTower_1F/map.json index 0b6d23cd3..1630baa5a 100644 --- a/data/maps/PokemonTower_1F/map.json +++ b/data/maps/PokemonTower_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", + "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 18, "y": 13, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 18, "y": 7, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 15, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 7, "y": 8, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 8, "y": 12, "elevation": 3, diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json index 0d9b51490..22242eeb3 100644 --- a/data/maps/PokemonTower_2F/map.json +++ b/data/maps/PokemonTower_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BLUE", + "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 16, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_TOWER_RIVAL" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 3, "y": 7, "elevation": 0, diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json index 8f234e935..1f06677f1 100644 --- a/data/maps/PokemonTower_3F/map.json +++ b/data/maps/PokemonTower_3F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 10, "y": 14, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 9, "y": 9, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 12, "y": 4, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 2, "elevation": 3, diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json index 47ee6cc43..d6792d545 100644 --- a/data/maps/PokemonTower_4F/map.json +++ b/data/maps/PokemonTower_4F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 17, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 15, "y": 13, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 4, "y": 12, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 11, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_POKEMON_TOWER_4F_ELIXIR" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 11, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_POKEMON_TOWER_4F_AWAKENING" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 16, "elevation": 3, diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json index a1f0fc109..d421948e2 100644 --- a/data/maps/PokemonTower_5F/map.json +++ b/data/maps/PokemonTower_5F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 11, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 19, "y": 7, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 7, "y": 12, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 11, "y": 16, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 12, "y": 8, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 16, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_POKEMON_TOWER_5F_NUGGET" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 9, "elevation": 3, diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json index 7ef95333a..ef6aa1f39 100644 --- a/data/maps/PokemonTower_6F/map.json +++ b/data/maps/PokemonTower_6F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 13, "y": 10, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 18, "y": 6, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 9, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 15, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_POKEMON_TOWER_6F_RARE_CANDY" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 15, "y": 15, "elevation": 3, diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json index e01c53116..eb5d6675a 100644 --- a/data/maps/PokemonTower_7F/map.json +++ b/data/maps/PokemonTower_7F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_MR_FUJI", + "graphics_id": "OBJ_EVENT_GFX_MR_FUJI", "x": 11, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_TOWER_FUJI" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 9, "y": 10, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_TOWER_ROCKET_1" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 13, "y": 8, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_TOWER_ROCKET_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json index 18099fc15..70004aaa3 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 27, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_MAX_POTION" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 40, "y": 22, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_TM17" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 46, "y": 37, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_TM25" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 45, "y": 4, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_THUNDER_STONE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 22, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_ELIXIR" }, { - "graphics_id": "OBJECT_EVENT_GFX_ZAPDOS", + "graphics_id": "OBJ_EVENT_GFX_ZAPDOS", "x": 5, "y": 11, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_ZAPDOS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 36, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_ELECTRODE_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 30, "y": 38, "elevation": 3, diff --git a/data/maps/RecordCenter/map.json b/data/maps/RecordCenter/map.json index 0a1f10925..b57d12d1c 100644 --- a/data/maps/RecordCenter/map.json +++ b/data/maps/RecordCenter/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 10, "y": 5, "elevation": 0, diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index 6bb68f578..52ae9407e 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 26, "y": 28, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 39, "y": 27, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 45, "y": 24, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 20, "y": 17, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 5, "y": 20, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 7, "y": 5, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 27, "y": 10, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 37, "y": 5, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_REPEL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 33, "y": 22, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_PEARL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 22, "y": 22, "elevation": 3, diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index bebd68148..6d172a9f6 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 2, "y": 6, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 5, "y": 11, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 11, "y": 15, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 36, "y": 11, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 41, "y": 5, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 23, "y": 23, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 15, "y": 33, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 29, "y": 35, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 2, "y": 29, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 37, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_REVIVE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_MAX_ETHER" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 20, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 22, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 23, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 2, "y": 23, "elevation": 3, @@ -211,7 +211,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 39, "y": 26, "elevation": 3, @@ -224,7 +224,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 42, "y": 26, "elevation": 3, @@ -237,7 +237,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 43, "y": 28, "elevation": 3, @@ -250,7 +250,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 45, "y": 30, "elevation": 3, @@ -263,7 +263,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 45, "y": 33, "elevation": 3, @@ -276,7 +276,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 25, "y": 1, "elevation": 3, @@ -289,7 +289,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 27, "y": 4, "elevation": 3, @@ -302,7 +302,7 @@ "flag": "FLAG_TEMP_1C" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 23, "y": 2, "elevation": 3, @@ -315,7 +315,7 @@ "flag": "FLAG_TEMP_1D" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 26, "y": 2, "elevation": 3, @@ -328,7 +328,7 @@ "flag": "FLAG_TEMP_1E" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 24, "y": 7, "elevation": 3, @@ -341,7 +341,7 @@ "flag": "FLAG_TEMP_1F" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 27, "y": 6, "elevation": 3, diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json index b80daf9d5..87a45d250 100644 --- a/data/maps/RocketHideout_B1F/map.json +++ b/data/maps/RocketHideout_B1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 4, "y": 9, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 24, "y": 12, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 6, "y": 32, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 10, "y": 22, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 21, "y": 27, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 16, "elevation": 0, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B1F_ESCAPE_ROPE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 22, "elevation": 3, diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json index 5daefa002..e2693393a 100644 --- a/data/maps/RocketHideout_B2F/map.json +++ b/data/maps/RocketHideout_B2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 20, "y": 6, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 15, "y": 3, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_X_SPEED" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 5, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_MOON_STONE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 7, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_TM12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 14, "elevation": 3, diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json index 984757f1e..b6c4f9ab9 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 19, "y": 9, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 2, "y": 20, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 12, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_RARE_CANDY" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 14, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_TM21" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 24, "elevation": 3, diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index bd38e3b71..234dce9e6 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GIOVANNI", + "graphics_id": "OBJ_EVENT_GFX_GIOVANNI", "x": 19, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_HIDEOUT_GIOVANNI" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 20, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SILPH_SCOPE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 4, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_LIFT_KEY" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 19, "y": 14, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 16, "y": 14, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 6, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_TM49" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 14, "elevation": 0, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_MAX_ETHER" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 23, "elevation": 0, diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json index d8af63766..fab0ef1f1 100644 --- a/data/maps/Route1/map.json +++ b/data/maps/Route1/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 6, "y": 28, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 19, "y": 16, "elevation": 3, diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index df387492a..7c44db6d9 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 7, "y": 60, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 4, "y": 62, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 15, "y": 70, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 4, "y": 68, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 13, "y": 44, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 9, "y": 27, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 10, "y": 20, "elevation": 0, @@ -118,7 +118,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 10, "y": 22, "elevation": 0, @@ -131,7 +131,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 10, "y": 24, "elevation": 0, @@ -144,7 +144,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 10, "y": 26, "elevation": 0, diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json index 3003e5115..203ae9295 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 9, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 2, "y": 3, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 14, "y": 6, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 12, "y": 5, "elevation": 3, diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json index f9aae8494..4222d144e 100644 --- a/data/maps/Route10_PokemonCenter_2F/map.json +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json index b77d1d7d3..f7d261a8e 100644 --- a/data/maps/Route11/map.json +++ b/data/maps/Route11/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 19, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 16, "y": 17, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 31, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 28, "y": 10, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 38, "y": 15, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 50, "y": 4, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 42, "y": 8, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 50, "y": 14, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 57, "y": 16, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 32, "y": 18, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 42, "y": 12, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "FLAG_HIDE_ROUTE11_X_DEFEND" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 63, "y": 13, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "FLAG_HIDE_ROUTE11_GREAT_BALL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 3, "elevation": 3, diff --git a/data/maps/Route11_EastEntrance_1F/map.json b/data/maps/Route11_EastEntrance_1F/map.json index 9b8a3e36a..1746a2d9f 100644 --- a/data/maps/Route11_EastEntrance_1F/map.json +++ b/data/maps/Route11_EastEntrance_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 4, "y": 10, "elevation": 0, diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json index 6a38e9aad..5ac6eb2d3 100644 --- a/data/maps/Route11_EastEntrance_2F/map.json +++ b/data/maps/Route11_EastEntrance_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 7, "y": 3, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 2, "y": 6, "elevation": 3, diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index 656116cc2..c46c45f2f 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -32,7 +32,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 17, "y": 32, "elevation": 3, @@ -45,7 +45,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 9, "y": 40, "elevation": 3, @@ -58,7 +58,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 16, "y": 47, "elevation": 3, @@ -71,7 +71,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 13, "y": 59, "elevation": 3, @@ -84,7 +84,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SNORLAX", + "graphics_id": "OBJ_EVENT_GFX_SNORLAX", "x": 14, "y": 70, "elevation": 3, @@ -97,7 +97,7 @@ "flag": "FLAG_HIDE_ROUTE_12_SNORLAX" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 13, "y": 92, "elevation": 3, @@ -110,7 +110,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 10, "y": 99, "elevation": 3, @@ -123,7 +123,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 18, "y": 108, "elevation": 3, @@ -136,7 +136,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 11, "y": 100, "elevation": 3, @@ -149,7 +149,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 18, "y": 36, "elevation": 3, @@ -162,7 +162,7 @@ "flag": "FLAG_HIDE_ROUTE12_TM48" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, "y": 101, "elevation": 3, @@ -175,7 +175,7 @@ "flag": "FLAG_HIDE_ROUTE12_IRON" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 19, "y": 64, "elevation": 3, @@ -188,7 +188,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 19, "y": 63, "elevation": 3, @@ -201,7 +201,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 12, "y": 111, "elevation": 3, diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json index feab7038d..557dcb00c 100644 --- a/data/maps/Route12_FishingHouse/map.json +++ b/data/maps/Route12_FishingHouse/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/Route12_NorthEntrance_1F/map.json b/data/maps/Route12_NorthEntrance_1F/map.json index cbbd3261b..c4b7818db 100644 --- a/data/maps/Route12_NorthEntrance_1F/map.json +++ b/data/maps/Route12_NorthEntrance_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 1, "y": 5, "elevation": 3, diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json index ff83df1b3..220589706 100644 --- a/data/maps/Route12_NorthEntrance_2F/map.json +++ b/data/maps/Route12_NorthEntrance_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index 8386e6996..cd56c9244 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 62, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 63, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 54, "y": 11, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 42, "y": 7, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 43, "y": 7, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 35, "y": 10, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 29, "y": 11, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 9, "y": 14, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 16, "y": 5, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 14, "y": 8, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 44, "y": 5, "elevation": 3, diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index 13259af36..76c96e56c 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 7, "y": 37, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 18, "y": 35, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 10, "y": 14, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 16, "y": 16, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 7, "y": 31, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 7, "y": 34, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 8, "y": 9, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 7, "y": 6, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 10, "y": 37, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 18, "y": 47, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 7, "y": 26, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 12, "y": 35, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 1, "y": 47, "elevation": 3, @@ -196,7 +196,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 13, "y": 51, "elevation": 3, @@ -209,7 +209,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 12, "y": 51, "elevation": 3, diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index fc65f0932..cd0581a20 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 22, "y": 13, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 31, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 37, "y": 14, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 44, "y": 13, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 50, "y": 12, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 59, "y": 12, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 63, "y": 13, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 52, "y": 8, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 54, "y": 12, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 28, "y": 6, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 20, "y": 6, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "FLAG_HIDE_ROUTE15_TM18" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 39, "y": 7, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "x": 40, "y": 7, "elevation": 3, @@ -196,7 +196,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "in_connection": true, "x": 73, "y": 7, diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json index 0959512a2..39bf0cb41 100644 --- a/data/maps/Route15_WestEntrance_1F/map.json +++ b/data/maps/Route15_WestEntrance_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json index 1d21cd2b1..b11b7224a 100644 --- a/data/maps/Route15_WestEntrance_2F/map.json +++ b/data/maps/Route15_WestEntrance_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index 0dd47cbc6..45617a334 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 16, "y": 12, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 14, "y": 14, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 12, "y": 12, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 8, "y": 12, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 10, "y": 14, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 6, "y": 14, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 41, "y": 11, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 30, "y": 5, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 31, "y": 5, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SNORLAX", + "graphics_id": "OBJ_EVENT_GFX_SNORLAX", "x": 31, "y": 13, "elevation": 3, diff --git a/data/maps/Route16_House/map.json b/data/maps/Route16_House/map.json index dc0d416f4..ec7b219d3 100644 --- a/data/maps/Route16_House/map.json +++ b/data/maps/Route16_House/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 4, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FEAROW", + "graphics_id": "OBJ_EVENT_GFX_FEAROW", "x": 9, "y": 3, "elevation": 3, diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json index b9425a4a6..133fd5b09 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 6, "y": 8, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json index 551fb5e7a..03d205867 100644 --- a/data/maps/Route16_NorthEntrance_2F/map.json +++ b/data/maps/Route16_NorthEntrance_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 6, "y": 3, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 4, "y": 8, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 10, "y": 6, "elevation": 0, diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json index 1afe3a6bf..fd640db01 100644 --- a/data/maps/Route17/map.json +++ b/data/maps/Route17/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 4, "y": 18, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 11, "y": 15, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 15, "y": 24, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 18, "y": 41, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 7, "y": 38, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 2, "y": 61, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 21, "y": 61, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 18, "y": 94, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 16, "y": 134, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 4, "y": 116, "elevation": 3, diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json index 6dd7673de..86eb04352 100644 --- a/data/maps/Route18/map.json +++ b/data/maps/Route18/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 46, "y": 14, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 41, "y": 15, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 39, "y": 12, "elevation": 3, diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json index 741c391f7..9b1250ac4 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json index 052fe0215..b542ae540 100644 --- a/data/maps/Route18_EastEntrance_2F/map.json +++ b/data/maps/Route18_EastEntrance_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 5, "y": 3, "elevation": 3, diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json index abb670524..b25ce0fec 100644 --- a/data/maps/Route19/map.json +++ b/data/maps/Route19/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_LAND", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_LAND", "x": 15, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_LAND", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_LAND", "x": 10, "y": 9, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 12, "y": 17, "elevation": 1, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 18, "y": 33, "elevation": 1, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 8, "y": 27, "elevation": 1, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 16, "y": 22, "elevation": 1, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 11, "y": 47, "elevation": 1, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 14, "y": 48, "elevation": 1, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 12, "y": 49, "elevation": 1, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 9, "y": 48, "elevation": 1, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 8, "y": 41, "elevation": 1, @@ -170,7 +170,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_TUBER_M_1", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M_1", "x": 9, "y": 41, "elevation": 1, diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index 29563d779..720b484d8 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 16, "y": 62, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 15, "y": 69, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 11, "y": 13, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 18, "y": 26, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 54, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_ROUTE2_ETHER" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 64, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_ROUTE2_PARALYZE_HEAL" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "in_connection": true, "x": 6, "y": 85, diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json index e97d95544..7a4de5f4f 100644 --- a/data/maps/Route20/map.json +++ b/data/maps/Route20/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 8, "y": 11, "elevation": 1, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 16, "y": 14, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 34, "y": 7, "elevation": 1, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 43, "y": 9, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 23, "y": 10, "elevation": 1, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 73, "y": 16, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 111, "y": 9, "elevation": 1, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 106, "y": 11, "elevation": 1, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 93, "y": 10, "elevation": 1, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 54, "y": 11, "elevation": 1, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 69, "y": 3, "elevation": 3, diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json index 417ae692d..556dd9746 100644 --- a/data/maps/Route21_North/map.json +++ b/data/maps/Route21_North/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 7, "y": 27, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 16, "y": 26, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 12, "y": 44, "elevation": 1, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 14, "y": 35, "elevation": 1, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_TUBER_M_1", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M_1", "x": 15, "y": 35, "elevation": 1, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "in_connection": true, "x": 13, "y": -3, diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json index ef022d513..ef43a429b 100644 --- a/data/maps/Route21_South/map.json +++ b/data/maps/Route21_South/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 11, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 14, "y": 15, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 15, "y": 24, "elevation": 1, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 15, "y": 38, "elevation": 1, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 10, "y": 29, "elevation": 1, diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index 41aedc6e0..b4da63654 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BLUE", + "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 25, "y": 4, "elevation": 3, diff --git a/data/maps/Route22_NorthEntrance/map.json b/data/maps/Route22_NorthEntrance/map.json index 20414c25f..7e5e18115 100644 --- a/data/maps/Route22_NorthEntrance/map.json +++ b/data/maps/Route22_NorthEntrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 8, "y": 2, "elevation": 3, diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json index 145f20cf3..aeaa87f85 100644 --- a/data/maps/Route23/map.json +++ b/data/maps/Route23/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 15, "y": 149, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 8, "y": 140, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 14, "y": 123, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 16, "y": 112, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 10, "y": 94, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 14, "y": 61, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 6, "y": 35, "elevation": 3, diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index 5fa15ddb3..29b394c67 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 12, "y": 15, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_NUGGET_BRIDGE_ROCKET" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 12, "y": 19, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 10, "y": 22, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 12, "y": 25, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 10, "y": 28, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 12, "y": 31, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 5, "y": 21, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 4, "elevation": 3, diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index 88d68ca07..b36fe20cf 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 11, "y": 4, "elevation": 3, @@ -35,7 +35,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 18, "y": 2, "elevation": 3, @@ -48,7 +48,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 17, "y": 7, "elevation": 3, @@ -61,7 +61,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 22, "y": 4, "elevation": 3, @@ -74,7 +74,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 22, "y": 8, "elevation": 3, @@ -87,7 +87,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 27, "y": 9, "elevation": 3, @@ -100,7 +100,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 28, "y": 4, "elevation": 3, @@ -113,7 +113,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 36, "y": 4, "elevation": 3, @@ -126,7 +126,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 42, "y": 5, "elevation": 3, @@ -139,7 +139,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 2, "elevation": 3, @@ -152,7 +152,7 @@ "flag": "FLAG_HIDE_ROUTE25_TM43" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 30, "y": 3, "elevation": 3, @@ -165,7 +165,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 49, "y": 10, "elevation": 3, @@ -178,7 +178,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 49, "y": 11, "elevation": 3, diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json index 8e4ac79c6..94327ef65 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BILL", + "graphics_id": "OBJ_EVENT_GFX_BILL", "x": 7, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE" }, { - "graphics_id": "OBJECT_EVENT_GFX_CLEFAIRY", + "graphics_id": "OBJ_EVENT_GFX_CLEFAIRY", "x": 10, "y": 6, "elevation": 3, diff --git a/data/maps/Route2_EastBuilding/map.json b/data/maps/Route2_EastBuilding/map.json index 613f1d207..cb8c744ba 100644 --- a/data/maps/Route2_EastBuilding/map.json +++ b/data/maps/Route2_EastBuilding/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 4, "y": 6, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 10, "y": 3, "elevation": 3, diff --git a/data/maps/Route2_House/map.json b/data/maps/Route2_House/map.json index fdf66afb1..c47eeaf4a 100644 --- a/data/maps/Route2_House/map.json +++ b/data/maps/Route2_House/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 4, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GBA_KID", + "graphics_id": "OBJ_EVENT_GFX_GBA_KID", "x": 7, "y": 2, "elevation": 3, diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/map.json b/data/maps/Route2_ViridianForest_NorthEntrance/map.json index 478b3045e..c6d71095c 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 5, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 7, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 10, "y": 5, "elevation": 3, diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/map.json b/data/maps/Route2_ViridianForest_SouthEntrance/map.json index 17e756798..0e749a29f 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 10, "y": 6, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 4, "y": 7, "elevation": 3, diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index 7651e395a..1dbccf3ac 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 70, "y": 13, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 40, "y": 11, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 32, "y": 6, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 30, "y": 3, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 25, "y": 4, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 29, "y": 10, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 19, "y": 9, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 12, "y": 6, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 17, "y": 4, "elevation": 3, diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index 9728a5ca1..fc4c4b53c 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 9, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 75, "y": 3, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 67, "y": 5, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_ROUTE4_TM05" }, { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 15, "y": 14, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 47, "y": 3, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 50, "y": 3, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "in_connection": true, "x": 109, "y": 3, diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json index 5797e4600..b3f5a6740 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 1, "y": 3, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 12, "y": 5, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 5, "y": 4, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 14, "y": 4, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CLIPBOARD", + "graphics_id": "OBJ_EVENT_GFX_CLIPBOARD", "x": 12, "y": 6, "elevation": 0, diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index a71194174..2f8269dd9 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/Route5_PokemonDayCare/map.json b/data/maps/Route5_PokemonDayCare/map.json index 826c71624..502a50bd9 100644 --- a/data/maps/Route5_PokemonDayCare/map.json +++ b/data/maps/Route5_PokemonDayCare/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json index 5896d1664..94572a962 100644 --- a/data/maps/Route5_SouthEntrance/map.json +++ b/data/maps/Route5_SouthEntrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 1, "y": 5, "elevation": 3, diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index 4ff0dc898..349f35369 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 3, "y": 16, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 12, "y": 21, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 13, "y": 21, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 20, "y": 25, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 13, "y": 32, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 13, "y": 33, "elevation": 3, diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json index 40dd5c985..e13267a19 100644 --- a/data/maps/Route6_NorthEntrance/map.json +++ b/data/maps/Route6_NorthEntrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index 6aaffd6fc..09de5c2b8 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "in_connection": true, "x": -8, "y": 12, diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json index a311c8eee..21c5d82a6 100644 --- a/data/maps/Route7_EastEntrance/map.json +++ b/data/maps/Route7_EastEntrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index 144ae1d3f..6da585949 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 62, "y": 14, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 55, "y": 15, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 51, "y": 6, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 29, "y": 3, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 29, "y": 4, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 29, "y": 5, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 29, "y": 6, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 21, "y": 3, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 9, "y": 6, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 33, "y": 15, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 47, "y": 12, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 40, "y": 3, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 41, "y": 3, "elevation": 3, @@ -196,7 +196,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 14, "y": 16, "elevation": 3, @@ -209,7 +209,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 24, "y": 17, "elevation": 3, diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json index fc6c97792..b0ebba722 100644 --- a/data/maps/Route8_WestEntrance/map.json +++ b/data/maps/Route8_WestEntrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", + "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index 123be8d5a..7fbff394d 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 14, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 20, "y": 17, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 61, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 26, "y": 7, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 26, "y": 1, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 49, "y": 7, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 53, "y": 2, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 60, "y": 9, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 36, "y": 6, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 2, "y": 8, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 17, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "FLAG_HIDE_ROUTE9_TM40" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 65, "y": 17, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Corridor/map.json b/data/maps/SSAnne_1F_Corridor/map.json index 87d778a25..6aa5b3093 100644 --- a/data/maps/SSAnne_1F_Corridor/map.json +++ b/data/maps/SSAnne_1F_Corridor/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 18, "y": 8, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 12, "y": 9, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room1/map.json b/data/maps/SSAnne_1F_Room1/map.json index d018cc7a4..620977574 100644 --- a/data/maps/SSAnne_1F_Room1/map.json +++ b/data/maps/SSAnne_1F_Room1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 2, "y": 5, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json index 765612f48..28c48fec7 100644 --- a/data/maps/SSAnne_1F_Room2/map.json +++ b/data/maps/SSAnne_1F_Room2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 5, "y": 3, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 0, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 2, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 7, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room3/map.json b/data/maps/SSAnne_1F_Room3/map.json index e518ae50e..1d5bbe3fa 100644 --- a/data/maps/SSAnne_1F_Room3/map.json +++ b/data/maps/SSAnne_1F_Room3/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 3, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WIGGLYTUFF", + "graphics_id": "OBJ_EVENT_GFX_WIGGLYTUFF", "x": 4, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 0, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room4/map.json b/data/maps/SSAnne_1F_Room4/map.json index c11aa16b5..c4a4350e2 100644 --- a/data/maps/SSAnne_1F_Room4/map.json +++ b/data/maps/SSAnne_1F_Room4/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 2, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room5/map.json b/data/maps/SSAnne_1F_Room5/map.json index 51935aea2..8c35b38af 100644 --- a/data/maps/SSAnne_1F_Room5/map.json +++ b/data/maps/SSAnne_1F_Room5/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 2, "y": 6, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room6/map.json b/data/maps/SSAnne_1F_Room6/map.json index d6f0a1b44..3966857b9 100644 --- a/data/maps/SSAnne_1F_Room6/map.json +++ b/data/maps/SSAnne_1F_Room6/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 3, "y": 5, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room7/map.json b/data/maps/SSAnne_1F_Room7/map.json index 315d49099..7f0e7b733 100644 --- a/data/maps/SSAnne_1F_Room7/map.json +++ b/data/maps/SSAnne_1F_Room7/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 4, "y": 3, "elevation": 3, diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json index bb2df92ce..d355cfc4f 100644 --- a/data/maps/SSAnne_2F_Corridor/map.json +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BLUE", + "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 30, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SS_ANNE_RIVAL" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 2, "y": 7, "elevation": 3, diff --git a/data/maps/SSAnne_2F_Room1/map.json b/data/maps/SSAnne_2F_Room1/map.json index 6fbbde902..7ddd88682 100644 --- a/data/maps/SSAnne_2F_Room1/map.json +++ b/data/maps/SSAnne_2F_Room1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 1, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json index 1692afc23..8d53e1c37 100644 --- a/data/maps/SSAnne_2F_Room2/map.json +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 5, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 1, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 3, "elevation": 0, diff --git a/data/maps/SSAnne_2F_Room3/map.json b/data/maps/SSAnne_2F_Room3/map.json index 05ac70a4f..4143d53e5 100644 --- a/data/maps/SSAnne_2F_Room3/map.json +++ b/data/maps/SSAnne_2F_Room3/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 2, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 3, "y": 2, "elevation": 3, diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json index 116380880..fcbb580ae 100644 --- a/data/maps/SSAnne_2F_Room4/map.json +++ b/data/maps/SSAnne_2F_Room4/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 0, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 3, "y": 3, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_2F_Room5/map.json b/data/maps/SSAnne_2F_Room5/map.json index ca0c68072..b1994b17a 100644 --- a/data/maps/SSAnne_2F_Room5/map.json +++ b/data/maps/SSAnne_2F_Room5/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 5, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 3, "y": 5, "elevation": 3, diff --git a/data/maps/SSAnne_2F_Room6/map.json b/data/maps/SSAnne_2F_Room6/map.json index fe00765ab..2e5f08349 100644 --- a/data/maps/SSAnne_2F_Room6/map.json +++ b/data/maps/SSAnne_2F_Room6/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 1, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_3F_Corridor/map.json b/data/maps/SSAnne_3F_Corridor/map.json index fa9ad902a..5f3ed8cab 100644 --- a/data/maps/SSAnne_3F_Corridor/map.json +++ b/data/maps/SSAnne_3F_Corridor/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 10, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_B1F_Room1/map.json b/data/maps/SSAnne_B1F_Room1/map.json index 25286e3cc..ef9ccb433 100644 --- a/data/maps/SSAnne_B1F_Room1/map.json +++ b/data/maps/SSAnne_B1F_Room1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 5, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 3, "y": 2, "elevation": 3, diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json index bac380ea3..da783844a 100644 --- a/data/maps/SSAnne_B1F_Room2/map.json +++ b/data/maps/SSAnne_B1F_Room2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 3, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 2, "elevation": 3, diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json index e4fecec84..9c2d514d1 100644 --- a/data/maps/SSAnne_B1F_Room3/map.json +++ b/data/maps/SSAnne_B1F_Room3/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 4, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 5, "elevation": 3, diff --git a/data/maps/SSAnne_B1F_Room4/map.json b/data/maps/SSAnne_B1F_Room4/map.json index b72b8f2dd..eca95aa31 100644 --- a/data/maps/SSAnne_B1F_Room4/map.json +++ b/data/maps/SSAnne_B1F_Room4/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 3, "y": 3, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 2, "y": 6, "elevation": 3, diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json index 9f258f534..c19d4c7a0 100644 --- a/data/maps/SSAnne_B1F_Room5/map.json +++ b/data/maps/SSAnne_B1F_Room5/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 3, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MACHOKE", + "graphics_id": "OBJ_EVENT_GFX_MACHOKE", "x": 2, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 2, "elevation": 0, diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json index a87171f61..a514df616 100644 --- a/data/maps/SSAnne_CaptainsOffice/map.json +++ b/data/maps/SSAnne_CaptainsOffice/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CAPTAIN", + "graphics_id": "OBJ_EVENT_GFX_CAPTAIN", "x": 5, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_Deck/map.json b/data/maps/SSAnne_Deck/map.json index be784748a..3ad57f09b 100644 --- a/data/maps/SSAnne_Deck/map.json +++ b/data/maps/SSAnne_Deck/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 12, "y": 10, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 14, "y": 11, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 13, "y": 13, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 6, "y": 9, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 11, "y": 5, "elevation": 3, diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json index c37b2ac5c..b3805c4f6 100644 --- a/data/maps/SSAnne_Exterior/map.json +++ b/data/maps/SSAnne_Exterior/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SS_ANNE", + "graphics_id": "OBJ_EVENT_GFX_SS_ANNE", "x": 30, "y": 16, "elevation": 1, diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index d97f89317..d5ab6e972 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CHEF", + "graphics_id": "OBJ_EVENT_GFX_CHEF", "x": 1, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHEF", + "graphics_id": "OBJ_EVENT_GFX_CHEF", "x": 6, "y": 6, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHEF", + "graphics_id": "OBJ_EVENT_GFX_CHEF", "x": 10, "y": 4, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHEF", + "graphics_id": "OBJ_EVENT_GFX_CHEF", "x": 8, "y": 9, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHEF", + "graphics_id": "OBJ_EVENT_GFX_CHEF", "x": 14, "y": 5, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHEF", + "graphics_id": "OBJ_EVENT_GFX_CHEF", "x": 14, "y": 7, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHEF", + "graphics_id": "OBJ_EVENT_GFX_CHEF", "x": 14, "y": 9, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 10, "elevation": 3, diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json index cc2bd0e60..2b14d57d6 100644 --- a/data/maps/SafariZone_Center/map.json +++ b/data/maps/SafariZone_Center/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 24, "y": 15, "elevation": 3, diff --git a/data/maps/SafariZone_Center_RestHouse/map.json b/data/maps/SafariZone_Center_RestHouse/map.json index fd3453ef3..7f82c3533 100644 --- a/data/maps/SafariZone_Center_RestHouse/map.json +++ b/data/maps/SafariZone_Center_RestHouse/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 3, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 7, "y": 3, "elevation": 3, diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json index a7d35c6fa..a36d24a0e 100644 --- a/data/maps/SafariZone_East/map.json +++ b/data/maps/SafariZone_East/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 12, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_MAX_POTION" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 37, "y": 15, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_FULL_RESTORE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 18, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_TM11" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 36, "y": 17, "elevation": 4, diff --git a/data/maps/SafariZone_East_RestHouse/map.json b/data/maps/SafariZone_East_RestHouse/map.json index 12e13fbaa..4871abfde 100644 --- a/data/maps/SafariZone_East_RestHouse/map.json +++ b/data/maps/SafariZone_East_RestHouse/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 3, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 6, "y": 3, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 7, "y": 3, "elevation": 3, diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index a4a73f8e2..4c1a7049b 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 33, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_PROTEIN" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 28, "y": 9, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_TM47" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 17, "elevation": 3, diff --git a/data/maps/SafariZone_North_RestHouse/map.json b/data/maps/SafariZone_North_RestHouse/map.json index 98ac35b33..daf988506 100644 --- a/data/maps/SafariZone_North_RestHouse/map.json +++ b/data/maps/SafariZone_North_RestHouse/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 3, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 7, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 6, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 11, "y": 2, "elevation": 3, diff --git a/data/maps/SafariZone_SecretHouse/map.json b/data/maps/SafariZone_SecretHouse/map.json index cac992d41..9843d280f 100644 --- a/data/maps/SafariZone_SecretHouse/map.json +++ b/data/maps/SafariZone_SecretHouse/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json index 451f7e96d..d7b77f4bc 100644 --- a/data/maps/SafariZone_West/map.json +++ b/data/maps/SafariZone_West/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 28, "y": 14, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 13, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_TM32" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 16, "y": 27, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_MAX_POTION" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 24, "elevation": 3, diff --git a/data/maps/SafariZone_West_RestHouse/map.json b/data/maps/SafariZone_West_RestHouse/map.json index 4119d0714..f9da1257b 100644 --- a/data/maps/SafariZone_West_RestHouse/map.json +++ b/data/maps/SafariZone_West_RestHouse/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 3, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 2, "y": 2, "elevation": 0, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 7, "y": 3, "elevation": 3, diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index bfd629e91..5b61ffdd0 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -38,7 +38,7 @@ "connections_no_include": true, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 22, "y": 15, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 26, "y": 16, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 46, "y": 13, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 27, "y": 22, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 25, "y": 33, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 34, "y": 31, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 30, "y": 39, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 48, "y": 24, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 37, "y": 32, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 21, "y": 23, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 39, "y": 16, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 44, "y": 22, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "OBJECT_EVENT_GFX_PIDGEOT", + "graphics_id": "OBJ_EVENT_GFX_PIDGEOT", "x": 45, "y": 22, "elevation": 3, @@ -207,7 +207,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 32, "y": 39, "elevation": 3, @@ -220,7 +220,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "x": 47, "y": 24, "elevation": 3, diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/map.json b/data/maps/SaffronCity_CopycatsHouse_1F/map.json index 9ae377f7c..949574481 100644 --- a/data/maps/SaffronCity_CopycatsHouse_1F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 8, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 3, "y": 3, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANSEY", + "graphics_id": "OBJ_EVENT_GFX_CHANSEY", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/map.json b/data/maps/SaffronCity_CopycatsHouse_2F/map.json index 9460fd5ca..77b75f09d 100644 --- a/data/maps/SaffronCity_CopycatsHouse_2F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_DODUO", + "graphics_id": "OBJ_EVENT_GFX_DODUO", "x": 6, "y": 8, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PIKACHU", + "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "x": 4, "y": 6, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_JIGGLYPUFF", + "graphics_id": "OBJ_EVENT_GFX_JIGGLYPUFF", "x": 7, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index 8f747efd5..1d2e8e575 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 11, "y": 10, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 1, "y": 10, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 11, "y": 8, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 1, "y": 8, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 6, "y": 5, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 3, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_DOJO_HITMONLEE_BALL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 3, "elevation": 3, diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json index 24dd19564..d29379fc3 100644 --- a/data/maps/SaffronCity_Gym/map.json +++ b/data/maps/SaffronCity_Gym/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 24, "y": 18, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 24, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 4, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 14, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 4, "y": 10, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 4, "y": 18, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SABRINA", + "graphics_id": "OBJ_EVENT_GFX_SABRINA", "x": 14, "y": 11, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 24, "y": 10, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", + "graphics_id": "OBJ_EVENT_GFX_GYM_GUY", "x": 15, "y": 20, "elevation": 3, diff --git a/data/maps/SaffronCity_House/map.json b/data/maps/SaffronCity_House/map.json index df8e80208..02cef3897 100644 --- a/data/maps/SaffronCity_House/map.json +++ b/data/maps/SaffronCity_House/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_PIDGEY", + "graphics_id": "OBJ_EVENT_GFX_PIDGEY", "x": 0, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 4, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 6, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CLIPBOARD", + "graphics_id": "OBJ_EVENT_GFX_CLIPBOARD", "x": 5, "y": 4, "elevation": 0, diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json index 31374c459..64142a6c4 100644 --- a/data/maps/SaffronCity_Mart/map.json +++ b/data/maps/SaffronCity_Mart/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 1, "y": 7, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 9, "y": 5, "elevation": 3, diff --git a/data/maps/SaffronCity_MrPsychicsHouse/map.json b/data/maps/SaffronCity_MrPsychicsHouse/map.json index 62047365a..8cf965e59 100644 --- a/data/maps/SaffronCity_MrPsychicsHouse/map.json +++ b/data/maps/SaffronCity_MrPsychicsHouse/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json index 0744a0812..de944ec7c 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 14, "y": 6, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 4, "y": 4, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json index aeb3b40b6..4a28fd488 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index 764ae5897..cd96e018c 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "x": 7, "y": 13, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 6, "y": 11, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 3, "y": 13, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 3, "y": 12, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 9, "y": 11, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 7, "y": 12, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 9, "y": 12, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 5, "y": 11, "elevation": 3, diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json index fd9c6ca25..518817209 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 22, "y": 12, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_1" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 32, "y": 9, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 8, "elevation": 3, diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json index 528d46ae9..6091f5d8c 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 22, "y": 8, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_1" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 30, "y": 8, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 18, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B1F_WATER_STONE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 24, "y": 14, "elevation": 4, diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json index 5c7219195..b602137cc 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 22, "y": 8, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_1" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 30, "y": 8, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 18, "y": 15, "elevation": 3, diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json index 02f2224ff..fb01fff9c 100644 --- a/data/maps/SeafoamIslands_B3F/map.json +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 23, "y": 8, "elevation": 1, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_1" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 24, "y": 8, "elevation": 1, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 12, "y": 16, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_5" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 13, "y": 16, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_6" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 9, "y": 16, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_4" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 6, "y": 17, "elevation": 3, diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index eae9e0c51..b1f1f6908 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 8, "y": 18, "elevation": 1, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B4F_BOULDER_1" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 9, "y": 18, "elevation": 1, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B4F_BOULDER_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_ARTICUNO", + "graphics_id": "OBJ_EVENT_GFX_ARTICUNO", "x": 9, "y": 2, "elevation": 4, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_ARTICUNO" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 22, "y": 19, "elevation": 4, diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json index 065d2935d..c71782405 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 7, "y": 18, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 9, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 15, "y": 5, "elevation": 3, diff --git a/data/maps/SevenIsland_Harbor/map.json b/data/maps/SevenIsland_Harbor/map.json index 2a82fa1c1..5c1a8726a 100644 --- a/data/maps/SevenIsland_Harbor/map.json +++ b/data/maps/SevenIsland_Harbor/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", + "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json index 1251e6366..052d7fa31 100644 --- a/data/maps/SevenIsland_House_Room1/map.json +++ b/data/maps/SevenIsland_House_Room1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/SevenIsland_House_Room2/map.json b/data/maps/SevenIsland_House_Room2/map.json index 6309618e5..063535b54 100644 --- a/data/maps/SevenIsland_House_Room2/map.json +++ b/data/maps/SevenIsland_House_Room2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 6, "y": 5, "elevation": 0, diff --git a/data/maps/SevenIsland_Mart/map.json b/data/maps/SevenIsland_Mart/map.json index 8d1fcf724..16ff19533 100644 --- a/data/maps/SevenIsland_Mart/map.json +++ b/data/maps/SevenIsland_Mart/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 6, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 9, "y": 5, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 5, "y": 4, "elevation": 3, diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json index e1bb2ec18..522d68473 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 11, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 14, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json index e4249d7d5..5e9642ebb 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index b051ac85d..b9c1bc77e 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "x": 13, "y": 43, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 13, "y": 36, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 3, "y": 35, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 3, "y": 36, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 7, "y": 56, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 11, "y": 63, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 14, "y": 13, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 14, "y": 14, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 3, "y": 41, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 13, "y": 47, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 44, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 12, "y": 47, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 46, "elevation": 3, @@ -196,7 +196,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 16, "y": 47, "elevation": 3, @@ -209,7 +209,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 17, "y": 47, "elevation": 3, @@ -222,7 +222,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 11, "y": 31, "elevation": 3, @@ -235,7 +235,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 18, "y": 45, "elevation": 3, @@ -248,7 +248,7 @@ "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_KINGS_ROCK" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 38, "elevation": 3, @@ -261,7 +261,7 @@ "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_MAX_ELIXIR" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 23, "elevation": 3, @@ -274,7 +274,7 @@ "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_NUGGET" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 8, "y": 26, "elevation": 3, diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json index 3f164568a..75c09cc6f 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 12, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 3, "y": 34, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 4, "y": 34, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 11, "y": 26, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 10, "y": 26, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 11, "y": 17, "elevation": 5, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "in_connection": true, "x": 7, "y": -2, diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json index d58fdc0ce..9dd436790 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 2, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CHANSEY", + "graphics_id": "OBJ_EVENT_GFX_CHANSEY", "x": 4, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 4, "elevation": 0, diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index fee7f725a..a27961b23 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 7, "y": 6, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 8, "y": 6, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 8, "y": 9, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 6, "y": 10, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 8, "y": 10, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 6, "y": 9, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 6, "y": 6, "elevation": 3, diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json index 9955ca74f..37d70540c 100644 --- a/data/maps/SevenIsland_TanobyRuins/map.json +++ b/data/maps/SevenIsland_TanobyRuins/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 35, "y": 7, "elevation": 3, @@ -35,7 +35,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 121, "y": 11, "elevation": 3, @@ -48,7 +48,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 85, "y": 8, "elevation": 3, @@ -61,7 +61,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 85, "y": 5, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json index be28ff7b0..29095ad7e 100644 --- a/data/maps/SevenIsland_TrainerTower/map.json +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 56, "y": 26, "elevation": 3, @@ -35,7 +35,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 56, "y": 29, "elevation": 3, diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index df2883596..0e04a2f1c 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 2, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", + "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 10, "y": 17, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 0, "y": 13, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 15, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_SILPH_CO_10F_CARBOS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 15, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_SILPH_CO_10F_ULTRA_BALL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 17, "elevation": 3, diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index ad4efd4f0..458446a43 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 9, "y": 9, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", + "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 11, "y": 9, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GIOVANNI", + "graphics_id": "OBJ_EVENT_GFX_GIOVANNI", "x": 6, "y": 11, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 16, "y": 12, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 16, "y": 18, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_SILPH_CO_11F_ZINC" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 2, "y": 19, "elevation": 3, diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json index 68748ef13..59c9bf374 100644 --- a/data/maps/SilphCo_1F/map.json +++ b/data/maps/SilphCo_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", + "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 3, "y": 7, "elevation": 3, diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index 249c2faea..e3fb80764 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 29, "y": 12, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 28, "y": 18, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 20, "y": 14, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 5, "y": 19, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 10, "y": 4, "elevation": 0, diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index 9a0439095..ffe70afbf 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 25, "y": 9, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 31, "y": 13, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 4, "y": 12, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 10, "elevation": 3, diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index 63bdff97e..080e2649c 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 33, "y": 16, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 10, "y": 19, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 14, "y": 8, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 5, "y": 5, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 11, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_SILPH_CO_4F_MAX_REVIVE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 12, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_SILPH_CO_4F_ESCAPE_ROPE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 13, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_HIDE_SILPH_CO_4F_FULL_HEAL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 30, "y": 18, "elevation": 0, diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index c1890a062..0da89c2b1 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 35, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 23, "y": 13, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 16, "y": 13, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 11, "y": 6, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 9, "y": 21, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 9, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_SILPH_CO_5F_PROTEIN" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 18, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_HIDE_SILPH_CO_5F_TM01" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 22, "y": 21, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_SILPH_CO_5F_CARD_KEY" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 2, "y": 7, "elevation": 3, diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index 5c27ff76a..c895f1d4b 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 21, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 23, "y": 9, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", + "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 24, "y": 9, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 22, "y": 13, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 14, "y": 9, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", + "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 16, "y": 12, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 9, "y": 11, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 14, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_SILPH_CO_6F_HP_UP" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 17, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_HIDE_SILPH_CO_6F_X_SPECIAL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 18, "y": 17, "elevation": 3, diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index ef3630954..261335452 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BLUE", + "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 2, "y": 6, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SILPH_RIVAL" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 0, "y": 7, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 24, "y": 5, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 24, "y": 15, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 13, "y": 4, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", + "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 10, "y": 10, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 13, "y": 14, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 9, "y": 14, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 3, "y": 13, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 12, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_HIDE_SILPH_CO_7F_CALCIUM" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 30, "y": 11, "elevation": 3, diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index db566d2dd..1f5ed77ca 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 28, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 10, "y": 17, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 9, "y": 4, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", + "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 2, "y": 5, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 24, "y": 8, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_SILPH_CO_8F_IRON" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 29, "y": 9, "elevation": 3, diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json index f8bbd2b69..7cbb1c15d 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 26, "y": 16, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 15, "y": 18, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 2, "y": 16, "elevation": 0, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json index e26f7bf49..ec8c1ffe3 100644 --- a/data/maps/SixIsland/map.json +++ b/data/maps/SixIsland/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 10, "y": 15, "elevation": 3, @@ -35,7 +35,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 15, "y": 13, "elevation": 3, diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json index 19782a330..5ae17361a 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SAPPHIRE", + "graphics_id": "OBJ_EVENT_GFX_SAPPHIRE", "x": 7, "y": 7, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SAPPHIRE" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 5, "y": 9, "elevation": 3, diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json index 35d4cfb3f..ff6ad2c51 100644 --- a/data/maps/SixIsland_GreenPath/map.json +++ b/data/maps/SixIsland_GreenPath/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 11, "y": 8, "elevation": 3, diff --git a/data/maps/SixIsland_Harbor/map.json b/data/maps/SixIsland_Harbor/map.json index feb7ada29..e303ff025 100644 --- a/data/maps/SixIsland_Harbor/map.json +++ b/data/maps/SixIsland_Harbor/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", + "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/SixIsland_House/map.json b/data/maps/SixIsland_House/map.json index 67f1d4f31..2747a0cf0 100644 --- a/data/maps/SixIsland_House/map.json +++ b/data/maps/SixIsland_House/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/SixIsland_Mart/map.json b/data/maps/SixIsland_Mart/map.json index b366a1d17..e208da76c 100644 --- a/data/maps/SixIsland_Mart/map.json +++ b/data/maps/SixIsland_Mart/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 8, "y": 3, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 7, "y": 7, "elevation": 3, diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json index 3498c7f3f..14828c8eb 100644 --- a/data/maps/SixIsland_OutcastIsland/map.json +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", + "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 9, "y": 24, "elevation": 3, @@ -35,7 +35,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 12, "y": 15, "elevation": 3, @@ -48,7 +48,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 13, "y": 34, "elevation": 1, @@ -61,7 +61,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 14, "y": 61, "elevation": 1, @@ -74,7 +74,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 10, "y": 44, "elevation": 1, @@ -87,7 +87,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_TUBER_M_1", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M_1", "x": 11, "y": 44, "elevation": 1, @@ -100,7 +100,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 16, "elevation": 3, diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json index 8354730a5..e0d100f6c 100644 --- a/data/maps/SixIsland_PatternBush/map.json +++ b/data/maps/SixIsland_PatternBush/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 48, "y": 15, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 10, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 51, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 12, "y": 13, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 37, "y": 23, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 32, "y": 5, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 52, "y": 20, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 8, "y": 21, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 39, "y": 6, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 3, "y": 9, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 19, "y": 24, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 30, "y": 19, "elevation": 3, diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json index 2d14e64af..c866b4299 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/map.json +++ b/data/maps/SixIsland_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLUE", + "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 5, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_SIX_ISLAND_POKECENTER_RIVAL" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 13, "y": 3, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 12, "y": 5, "elevation": 3, diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json index ce44fdfd2..5150e22fb 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/map.json +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index 5020e7380..f800f0d0d 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 24, "y": 25, "elevation": 3, @@ -35,7 +35,7 @@ "flag": "FLAG_HIDE_RUIN_VALLEY_SCIENTIST" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 32, "y": 11, "elevation": 5, @@ -48,7 +48,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 33, "y": 16, "elevation": 5, @@ -61,7 +61,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 31, "y": 24, "elevation": 5, @@ -74,7 +74,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 14, "y": 10, "elevation": 5, @@ -87,7 +87,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 21, "y": 29, "elevation": 5, @@ -100,7 +100,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 17, "y": 10, "elevation": 5, @@ -113,7 +113,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 17, "y": 12, "elevation": 5, @@ -126,7 +126,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 18, "y": 11, "elevation": 5, @@ -139,7 +139,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 6, "y": 33, "elevation": 3, @@ -152,7 +152,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 6, "y": 34, "elevation": 3, @@ -165,7 +165,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 41, "y": 32, "elevation": 3, @@ -178,7 +178,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 41, "y": 33, "elevation": 3, @@ -191,7 +191,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 42, "y": 33, "elevation": 3, @@ -204,7 +204,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 33, "elevation": 3, @@ -217,7 +217,7 @@ "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_HP_UP" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 11, "elevation": 5, @@ -230,7 +230,7 @@ "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_FULL_RESTORE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 43, "y": 32, "elevation": 3, diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json index befdd7949..97e30aa5c 100644 --- a/data/maps/SixIsland_WaterPath/map.json +++ b/data/maps/SixIsland_WaterPath/map.json @@ -32,7 +32,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 12, "y": 13, "elevation": 3, @@ -45,7 +45,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 11, "y": 52, "elevation": 3, @@ -58,7 +58,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 13, "y": 35, "elevation": 1, @@ -71,7 +71,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 15, "y": 45, "elevation": 1, @@ -84,7 +84,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 6, "y": 21, "elevation": 3, @@ -97,7 +97,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 7, "y": 21, "elevation": 3, @@ -110,7 +110,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 11, "y": 76, "elevation": 3, @@ -123,7 +123,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 19, "elevation": 0, @@ -136,7 +136,7 @@ "flag": "FLAG_HIDE_SIX_ISLAND_WATER_PATH_ELIXIR" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 87, "elevation": 3, diff --git a/data/maps/SixIsland_WaterPath_House1/map.json b/data/maps/SixIsland_WaterPath_House1/map.json index c65f54deb..84a650469 100644 --- a/data/maps/SixIsland_WaterPath_House1/map.json +++ b/data/maps/SixIsland_WaterPath_House1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 3, "y": 4, "elevation": 3, diff --git a/data/maps/SixIsland_WaterPath_House2/map.json b/data/maps/SixIsland_WaterPath_House2/map.json index e53676524..9dcdbd976 100644 --- a/data/maps/SixIsland_WaterPath_House2/map.json +++ b/data/maps/SixIsland_WaterPath_House2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index f9ed4394b..9ccf2b29d 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 7, "y": 24, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 8, "y": 23, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 8, "y": 24, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_LONE_BIKER" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 9, "y": 23, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 9, "y": 24, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 10, "y": 22, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 10, "y": 24, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 11, "y": 23, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 20, "y": 7, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 18, "y": 17, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_ZINC" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 15, "y": 7, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 14, "y": 14, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_DODUO", + "graphics_id": "OBJ_EVENT_GFX_DODUO", "x": 15, "y": 14, "elevation": 3, @@ -196,7 +196,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 15, "y": 31, "elevation": 3, diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index ce8a868ef..446dc2074 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 4, "y": 8, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_LOSTELLE_IN_BERRY_FOREST" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 12, "y": 11, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 19, "y": 7, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 23, "y": 17, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 38, "y": 23, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 44, "y": 23, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 44, "y": 29, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 16, "y": 43, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 17, "y": 39, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 14, "y": 39, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 11, "y": 39, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 5, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_MAX_ETHER" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 11, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_FULL_HEAL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 43, "elevation": 3, diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json index fa674ecd9..e4e05fb76 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 27, "y": 10, "elevation": 3, @@ -35,7 +35,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 68, "y": 10, "elevation": 3, @@ -48,7 +48,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_TUBER_F", + "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 33, "y": 13, "elevation": 3, @@ -61,7 +61,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_TUBER_F", + "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 50, "y": 11, "elevation": 3, @@ -74,7 +74,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 36, "y": 4, "elevation": 1, @@ -87,7 +87,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 77, "y": 5, "elevation": 3, @@ -100,7 +100,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 78, "y": 5, "elevation": 3, @@ -113,7 +113,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 72, "y": 8, "elevation": 3, @@ -126,7 +126,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 86, "y": 13, "elevation": 3, diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json index 3570c9e17..dca4bacd8 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/map.json +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 23, "y": 2, "elevation": 3, diff --git a/data/maps/ThreeIsland_Harbor/map.json b/data/maps/ThreeIsland_Harbor/map.json index 7bd2aa8e5..5864be00c 100644 --- a/data/maps/ThreeIsland_Harbor/map.json +++ b/data/maps/ThreeIsland_Harbor/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", + "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json index 7d7384735..2174a571d 100644 --- a/data/maps/ThreeIsland_House1/map.json +++ b/data/maps/ThreeIsland_House1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 3, "y": 4, "elevation": 0, diff --git a/data/maps/ThreeIsland_House2/map.json b/data/maps/ThreeIsland_House2/map.json index 2ba098fd0..a2fc4f7e3 100644 --- a/data/maps/ThreeIsland_House2/map.json +++ b/data/maps/ThreeIsland_House2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 4, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/ThreeIsland_House3/map.json b/data/maps/ThreeIsland_House3/map.json index 0de23d4a8..684e06a68 100644 --- a/data/maps/ThreeIsland_House3/map.json +++ b/data/maps/ThreeIsland_House3/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 8, "y": 2, "elevation": 3, diff --git a/data/maps/ThreeIsland_House4/map.json b/data/maps/ThreeIsland_House4/map.json index 6a45fb357..c8aae0640 100644 --- a/data/maps/ThreeIsland_House4/map.json +++ b/data/maps/ThreeIsland_House4/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 7, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 6, "y": 3, "elevation": 3, diff --git a/data/maps/ThreeIsland_House5/map.json b/data/maps/ThreeIsland_House5/map.json index a774260f0..209fca3f8 100644 --- a/data/maps/ThreeIsland_House5/map.json +++ b/data/maps/ThreeIsland_House5/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 2, "y": 5, "elevation": 3, diff --git a/data/maps/ThreeIsland_Mart/map.json b/data/maps/ThreeIsland_Mart/map.json index 7a89a37b1..84c4d70c5 100644 --- a/data/maps/ThreeIsland_Mart/map.json +++ b/data/maps/ThreeIsland_Mart/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 2, "y": 7, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 7, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json index 070879098..65c74d9d8 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 12, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 3, "y": 4, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 11, "y": 5, "elevation": 3, diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json index 4941fe37a..7ee060727 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json index 10469dc61..40b6fab36 100644 --- a/data/maps/ThreeIsland_Port/map.json +++ b/data/maps/ThreeIsland_Port/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 14, "y": 9, "elevation": 3, @@ -35,7 +35,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 8, "y": 8, "elevation": 3, @@ -48,7 +48,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 13, "y": 10, "elevation": 3, diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index f4c54c987..8e740b6c0 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/TrainerTower_1F/map.json b/data/maps/TrainerTower_1F/map.json index 20d83f19f..f8f793a1f 100644 --- a/data/maps/TrainerTower_1F/map.json +++ b/data/maps/TrainerTower_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 11, "y": 10, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 10, "y": 10, "elevation": 3, diff --git a/data/maps/TrainerTower_2F/map.json b/data/maps/TrainerTower_2F/map.json index 9d60b2650..aa02b2212 100644 --- a/data/maps/TrainerTower_2F/map.json +++ b/data/maps/TrainerTower_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/TrainerTower_3F/map.json b/data/maps/TrainerTower_3F/map.json index a53c516b8..5dcbb119d 100644 --- a/data/maps/TrainerTower_3F/map.json +++ b/data/maps/TrainerTower_3F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/TrainerTower_4F/map.json b/data/maps/TrainerTower_4F/map.json index 04378d0a4..b040ed8cb 100644 --- a/data/maps/TrainerTower_4F/map.json +++ b/data/maps/TrainerTower_4F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/TrainerTower_5F/map.json b/data/maps/TrainerTower_5F/map.json index 569eaf978..45c0cf33c 100644 --- a/data/maps/TrainerTower_5F/map.json +++ b/data/maps/TrainerTower_5F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/TrainerTower_6F/map.json b/data/maps/TrainerTower_6F/map.json index 128bb457a..23c4ff2bd 100644 --- a/data/maps/TrainerTower_6F/map.json +++ b/data/maps/TrainerTower_6F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/TrainerTower_7F/map.json b/data/maps/TrainerTower_7F/map.json index 62e1bbe84..e6cb51f97 100644 --- a/data/maps/TrainerTower_7F/map.json +++ b/data/maps/TrainerTower_7F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/TrainerTower_8F/map.json b/data/maps/TrainerTower_8F/map.json index 125751b98..2becc2697 100644 --- a/data/maps/TrainerTower_8F/map.json +++ b/data/maps/TrainerTower_8F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/TrainerTower_Lobby/map.json b/data/maps/TrainerTower_Lobby/map.json index da2cdb07f..e0ee44722 100644 --- a/data/maps/TrainerTower_Lobby/map.json +++ b/data/maps/TrainerTower_Lobby/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 4, "y": 9, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 14, "y": 9, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 11, "y": 7, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 12, "y": 13, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 2, "y": 12, "elevation": 3, diff --git a/data/maps/TrainerTower_Roof/map.json b/data/maps/TrainerTower_Roof/map.json index 985f2f186..c4ced59b3 100644 --- a/data/maps/TrainerTower_Roof/map.json +++ b/data/maps/TrainerTower_Roof/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 20dd0f53e..668886176 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 28, "y": 4, "elevation": 3, @@ -35,7 +35,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 31, "y": 6, "elevation": 3, @@ -48,7 +48,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_WOMAN" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 30, "y": 11, "elevation": 3, @@ -61,7 +61,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_BEAUTY" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 26, "y": 5, "elevation": 3, @@ -74,7 +74,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 27, "y": 6, "elevation": 3, @@ -87,7 +87,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_SUPER_NERD" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 30, "y": 16, "elevation": 3, @@ -100,7 +100,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 39, "y": 16, "elevation": 3, @@ -113,7 +113,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_REVIVE" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 37, "y": 12, "elevation": 3, @@ -126,7 +126,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 24, "y": 12, "elevation": 3, diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json index 5de5be5fa..fbe574cdc 100644 --- a/data/maps/TwoIsland_CapeBrink_House/map.json +++ b/data/maps/TwoIsland_CapeBrink_House/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", + "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/TwoIsland_Harbor/map.json b/data/maps/TwoIsland_Harbor/map.json index 694c644f3..076ea39f7 100644 --- a/data/maps/TwoIsland_Harbor/map.json +++ b/data/maps/TwoIsland_Harbor/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", + "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/TwoIsland_House/map.json b/data/maps/TwoIsland_House/map.json index da5033107..2f45c143f 100644 --- a/data/maps/TwoIsland_House/map.json +++ b/data/maps/TwoIsland_House/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index f8c3e8446..d15bc7d3b 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 5, "y": 5, "elevation": 1, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 5, "y": 8, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_GAME_CORNER_BIKER" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 6, "y": 5, "elevation": 1, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 4, "y": 2, "elevation": 3, diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json index 96da34e0b..7001ab1cc 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GBA_KID", + "graphics_id": "OBJ_EVENT_GFX_GBA_KID", "x": 11, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json index 726bcfe11..24dcc7a4a 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/UndergroundPath_EastEntrance/map.json b/data/maps/UndergroundPath_EastEntrance/map.json index eee3d31bf..7e24aa5c8 100644 --- a/data/maps/UndergroundPath_EastEntrance/map.json +++ b/data/maps/UndergroundPath_EastEntrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 5, "y": 6, "elevation": 3, diff --git a/data/maps/UndergroundPath_NorthEntrance/map.json b/data/maps/UndergroundPath_NorthEntrance/map.json index 6052b6192..e5514fc1f 100644 --- a/data/maps/UndergroundPath_NorthEntrance/map.json +++ b/data/maps/UndergroundPath_NorthEntrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 5, "y": 6, "elevation": 3, diff --git a/data/maps/UndergroundPath_SouthEntrance/map.json b/data/maps/UndergroundPath_SouthEntrance/map.json index ec8a01a32..70ec3cd4e 100644 --- a/data/maps/UndergroundPath_SouthEntrance/map.json +++ b/data/maps/UndergroundPath_SouthEntrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 5, "y": 6, "elevation": 3, diff --git a/data/maps/UndergroundPath_WestEntrance/map.json b/data/maps/UndergroundPath_WestEntrance/map.json index 6fae45cf2..4f5ee081a 100644 --- a/data/maps/UndergroundPath_WestEntrance/map.json +++ b/data/maps/UndergroundPath_WestEntrance/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 5, "y": 6, "elevation": 3, diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json index f46654c7b..cfc872f08 100644 --- a/data/maps/UnionRoom/map.json +++ b/data/maps/UnionRoom/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 3, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 1, "y": 8, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_4" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 7, "y": 8, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_8" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 1, "y": 4, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_7" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 7, "y": 4, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_6" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 13, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_5" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 6, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_3" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 13, "y": 8, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_2" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 4, "y": 6, "elevation": 3, diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index faf8f70f5..52e167ea7 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 22, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 17, "y": 9, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 36, "y": 10, "elevation": 0, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MACHOP", + "graphics_id": "OBJ_EVENT_GFX_MACHOP", "x": 35, "y": 11, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 31, "y": 30, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 24, "y": 33, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 19, "y": 24, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 25, "y": 7, "elevation": 3, diff --git a/data/maps/VermilionCity_Gym/map.json b/data/maps/VermilionCity_Gym/map.json index 4b0325bc1..eab43a7f5 100644 --- a/data/maps/VermilionCity_Gym/map.json +++ b/data/maps/VermilionCity_Gym/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LT_SURGE", + "graphics_id": "OBJ_EVENT_GFX_LT_SURGE", "x": 5, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 2, "y": 11, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 13, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", + "graphics_id": "OBJ_EVENT_GFX_GYM_GUY", "x": 4, "y": 17, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 7, "y": 8, "elevation": 3, diff --git a/data/maps/VermilionCity_House1/map.json b/data/maps/VermilionCity_House1/map.json index 6ec3be3f9..2e1269e8d 100644 --- a/data/maps/VermilionCity_House1/map.json +++ b/data/maps/VermilionCity_House1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FISHER", + "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 4, "y": 5, "elevation": 3, diff --git a/data/maps/VermilionCity_House2/map.json b/data/maps/VermilionCity_House2/map.json index c22ef4744..4b8cd7cdd 100644 --- a/data/maps/VermilionCity_House2/map.json +++ b/data/maps/VermilionCity_House2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/VermilionCity_House3/map.json b/data/maps/VermilionCity_House3/map.json index fdbb6bd3e..c5cd83671 100644 --- a/data/maps/VermilionCity_House3/map.json +++ b/data/maps/VermilionCity_House3/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 7, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PIDGEY", + "graphics_id": "OBJ_EVENT_GFX_PIDGEY", "x": 2, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CLIPBOARD", + "graphics_id": "OBJ_EVENT_GFX_CLIPBOARD", "x": 6, "y": 4, "elevation": 0, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 2, "y": 4, "elevation": 3, diff --git a/data/maps/VermilionCity_Mart/map.json b/data/maps/VermilionCity_Mart/map.json index dfff61410..415d0eb48 100644 --- a/data/maps/VermilionCity_Mart/map.json +++ b/data/maps/VermilionCity_Mart/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 4, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 9, "y": 4, "elevation": 3, diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json index 595761c4f..74feb74fb 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 4, "y": 8, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 12, "y": 5, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 14, "y": 4, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 6, "y": 4, "elevation": 3, diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json index 00e7ce529..fdc77b9a7 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json index 521e0c99f..4bf91321f 100644 --- a/data/maps/VermilionCity_PokemonFanClub/map.json +++ b/data/maps/VermilionCity_PokemonFanClub/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 5, "y": 4, "elevation": 4, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", + "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 6, "y": 4, "elevation": 4, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PIKACHU", + "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "x": 7, "y": 6, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SEEL", + "graphics_id": "OBJ_EVENT_GFX_SEEL", "x": 4, "y": 6, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 4, "y": 5, "elevation": 0, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 7, "y": 5, "elevation": 0, diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 21d57ae5e..f6c6811d1 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 5, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 14, "y": 6, "elevation": 4, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 3, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_1F_RARE_CANDY" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 1, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_1F_TM02" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 7, "y": 18, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 4, "y": 12, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 16, "y": 3, "elevation": 3, diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index 764f448aa..184187cf3 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 7, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 20, "y": 11, "elevation": 4, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 31, "y": 16, "elevation": 4, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 26, "y": 6, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 36, "y": 5, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 6, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_GUARD_SPEC" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 40, "y": 7, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM07" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 25, "y": 13, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_FULL_HEAL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 13, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM37" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 8, "y": 7, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 6, "y": 17, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 33, "y": 19, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_BOULDER" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 40, "y": 9, "elevation": 3, diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index a5985e5fc..76ea5245c 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 40, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 21, "y": 5, "elevation": 4, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 10, "y": 17, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 11, "y": 16, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 38, "y": 7, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_3F_MAX_REVIVE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 9, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_3F_TM50" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 19, "y": 15, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 33, "y": 18, "elevation": 0, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_3F_BOULDER" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 35, "y": 13, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 32, "y": 5, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 38, "y": 13, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 39, "y": 13, "elevation": 3, diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index d9895c6b0..616e511ee 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -32,7 +32,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 8, "y": 26, "elevation": 3, @@ -45,7 +45,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 11, "y": 24, "elevation": 3, @@ -58,7 +58,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 34, "y": 11, "elevation": 3, @@ -71,7 +71,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 21, "y": 6, "elevation": 3, @@ -84,7 +84,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 20, "y": 12, "elevation": 3, @@ -97,7 +97,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 33, "y": 26, "elevation": 3, @@ -110,7 +110,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 16, "y": 22, "elevation": 3, @@ -123,7 +123,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 18, "y": 5, "elevation": 3, @@ -136,7 +136,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 5, "elevation": 3, diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 4fb140b24..9e4f8f5c7 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -17,17 +17,17 @@ ViridianCity_OnTransition:: @ 81658D9 end ViridianCity_EventScript_SetOldManNormal:: @ 8165909 - setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OLD_MAN_1 + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_OLD_MAN_1 return ViridianCity_EventScript_SetOldManStandingByRoad:: @ 816590F - setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OLD_MAN_1 + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_OLD_MAN_1 setobjectxyperm LOCALID_TUTORIAL_MAN, 21, 8 setobjectmovementtype LOCALID_TUTORIAL_MAN, MOVEMENT_TYPE_LOOK_AROUND return ViridianCity_EventScript_SetOldManBlockingRoad:: @ 8165920 - setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OLD_MAN_LYING_DOWN + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_OLD_MAN_LYING_DOWN setobjectxyperm LOCALID_TUTORIAL_MAN, 21, 11 setobjectmovementtype LOCALID_TUTORIAL_MAN, MOVEMENT_TYPE_FACE_DOWN return diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json index f1188d2c0..0cc83f420 100644 --- a/data/maps/ViridianCity_Gym/map.json +++ b/data/maps/ViridianCity_Gym/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 10, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 12, "y": 10, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 11, "y": 14, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 10, "y": 10, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MAN", + "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 2, "y": 21, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 3, "y": 11, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 6, "y": 8, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GIOVANNI", + "graphics_id": "OBJ_EVENT_GFX_GIOVANNI", "x": 2, "y": 2, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_VIRIDIAN_GIOVANNI" }, { - "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", + "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 13, "y": 7, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", + "graphics_id": "OBJ_EVENT_GFX_GYM_GUY", "x": 16, "y": 20, "elevation": 3, diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House1/map.json index 29f185b71..0b6247f93 100644 --- a/data/maps/ViridianCity_House1/map.json +++ b/data/maps/ViridianCity_House1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", + "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 7, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 2, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SPEAROW", + "graphics_id": "OBJ_EVENT_GFX_SPEAROW", "x": 6, "y": 6, "elevation": 3, diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_House2/map.json index b5e65bbad..c770669e5 100644 --- a/data/maps/ViridianCity_House2/map.json +++ b/data/maps/ViridianCity_House2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 4, "y": 5, "elevation": 3, diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json index 7b3de99b6..d650bfda6 100644 --- a/data/maps/ViridianCity_Mart/map.json +++ b/data/maps/ViridianCity_Mart/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 6, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 9, "y": 5, "elevation": 3, diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json index 780087d1b..d46b11f2c 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 12, "y": 5, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 4, "y": 7, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 2, "y": 3, "elevation": 3, diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json index 967493db5..76084ff0a 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index 8a92127ae..a11b85a94 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 29, "y": 58, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 45, "y": 58, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 47, "y": 45, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 47, "y": 29, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 7, "y": 22, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 41, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POKE_BALL" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 40, "y": 21, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_HIDE_VIRIDIAN_FOREST_ANTIDOTE" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 21, "y": 34, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POTION" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 43, "y": 6, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 16, "y": 5, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 49, "y": 60, "elevation": 3, -- cgit v1.2.3 From d1b1709ef967c13408846c45b0daf9be46045598 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 24 Feb 2020 13:28:45 -0500 Subject: Document Routes 15-19 scripts --- data/event_scripts.s | 6 +- data/maps/Route15/map.json | 26 +- data/maps/Route15/scripts.inc | 4 +- data/maps/Route15/text.inc | 78 +-- data/maps/Route15_WestEntrance_1F/map.json | 2 +- data/maps/Route15_WestEntrance_1F/scripts.inc | 4 +- data/maps/Route15_WestEntrance_1F/text.inc | 2 +- data/maps/Route15_WestEntrance_2F/map.json | 6 +- data/maps/Route15_WestEntrance_2F/scripts.inc | 36 +- data/maps/Route15_WestEntrance_2F/text.inc | 12 +- data/maps/Route16/map.json | 16 +- data/maps/Route16/scripts.inc | 8 +- data/maps/Route16/text.inc | 52 +- data/maps/Route16_House/map.json | 4 +- data/maps/Route16_House/scripts.inc | 24 +- data/maps/Route16_House/text.inc | 10 +- data/maps/Route16_NorthEntrance_1F/map.json | 26 +- data/maps/Route16_NorthEntrance_1F/scripts.inc | 74 +-- data/maps/Route16_NorthEntrance_1F/text.inc | 8 +- data/maps/Route16_NorthEntrance_2F/map.json | 10 +- data/maps/Route16_NorthEntrance_2F/scripts.inc | 44 +- data/maps/Route16_NorthEntrance_2F/text.inc | 16 +- data/maps/Route17/map.json | 32 +- data/maps/Route17/scripts.inc | 24 +- data/maps/Route17/text.inc | 72 +-- data/maps/Route18/map.json | 10 +- data/maps/Route18/scripts.inc | 16 +- data/maps/Route18/text.inc | 22 +- data/maps/Route18_EastEntrance_1F/map.json | 24 +- data/maps/Route18_EastEntrance_1F/scripts.inc | 70 +-- data/maps/Route18_EastEntrance_1F/text.inc | 6 +- data/maps/Route18_EastEntrance_2F/map.json | 6 +- data/maps/Route18_EastEntrance_2F/scripts.inc | 24 +- data/maps/Route18_EastEntrance_2F/text.inc | 4 +- data/maps/Route19/map.json | 26 +- data/maps/Route19/scripts.inc | 4 +- data/maps/Route19/text.inc | 78 +-- data/scripts/trainers.inc | 630 ++++++++++++------------- data/text/trainers.inc | 90 ++-- 39 files changed, 804 insertions(+), 802 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index f66b4da77..3867cf0d7 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1330,16 +1330,14 @@ EventScript_SetResultFalse:: @ 81A77B0 setvar VAR_RESULT, FALSE return -Route16_NorthEntrance_1F_EventScript_1A77B6:: @ 81A77B6 -Route18_EastEntrance_1F_EventScript_1A77B6:: @ 81A77B6 +EventScript_SetExitingCyclingRoad:: @ 81A77B6 lockall clearflag FLAG_SYS_ON_CYCLING_ROAD setvar VAR_MAP_SCENE_ROUTE16, 0 releaseall end -Route16_NorthEntrance_1F_EventScript_1A77C1:: @ 81A77C1 -Route18_EastEntrance_1F_EventScript_1A77C1:: @ 81A77C1 +EventScript_SetEnteringCyclingRoad:: @ 81A77C1 lockall setvar VAR_MAP_SCENE_ROUTE16, 1 releaseall diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index cd0581a20..ef6dee02a 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route15_EventScript_1AAD67", + "script": "Route15_EventScript_Yazmin", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route15_EventScript_1AACEB", + "script": "Route15_EventScript_Edwin", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route15_EventScript_1AAD29", + "script": "Route15_EventScript_Chester", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route15_EventScript_1AADA5", + "script": "Route15_EventScript_Kindra", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route15_EventScript_1AACAD", + "script": "Route15_EventScript_Olivia", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route15_EventScript_1AAC31", + "script": "Route15_EventScript_Alex", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route15_EventScript_1AABF3", + "script": "Route15_EventScript_Ernest", "flag": "0" }, { @@ -127,7 +127,7 @@ "movement_range_y": 4, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route15_EventScript_1AADE3", + "script": "Route15_EventScript_Becky", "flag": "0" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route15_EventScript_1AAC6F", + "script": "Route15_EventScript_Grace", "flag": "0" }, { @@ -153,7 +153,7 @@ "movement_range_y": 4, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route15_EventScript_1AAE21", + "script": "Route15_EventScript_Celia", "flag": "0" }, { @@ -179,7 +179,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route15_EventScript_1AAEA5", + "script": "Route15_EventScript_Ron", "flag": "0" }, { @@ -192,7 +192,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route15_EventScript_1AAE5F", + "script": "Route15_EventScript_Mya", "flag": "0" }, { @@ -233,7 +233,7 @@ "x": 41, "y": 11, "elevation": 0, - "script": "Route15_EventScript_1680DC" + "script": "Route15_EventScript_RouteSign" } ] } diff --git a/data/maps/Route15/scripts.inc b/data/maps/Route15/scripts.inc index 40890250c..85d24e49b 100644 --- a/data/maps/Route15/scripts.inc +++ b/data/maps/Route15/scripts.inc @@ -1,6 +1,6 @@ Route15_MapScripts:: @ 81680DB .byte 0 -Route15_EventScript_1680DC:: @ 81680DC - msgbox gUnknown_8186A77, MSGBOX_SIGN +Route15_EventScript_RouteSign:: @ 81680DC + msgbox Route15_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route15/text.inc b/data/maps/Route15/text.inc index 33c60e7dc..be3e38e6c 100644 --- a/data/maps/Route15/text.inc +++ b/data/maps/Route15/text.inc @@ -1,154 +1,154 @@ -Text_18650B:: @ 818650B +Route15_Text_KindraIntro:: @ 818650B .string "I just got some POKéMON in trades.\n" .string "Can I try them out on you?$" -Text_186549:: @ 8186549 +Route15_Text_KindraDefeat:: @ 8186549 .string "Not good enough!$" -Text_18655A:: @ 818655A +Route15_Text_KindraPostBattle:: @ 818655A .string "You can't change the nickname of\n" .string "any POKéMON you get in a trade.\p" .string "Only the Original TRAINER can get\n" .string "the nickname changed.$" -Text_1865D3:: @ 81865D3 +Route15_Text_BeckyIntro:: @ 81865D3 .string "You look gentle, so I think I can\n" .string "beat you.\p" .string "I'll give it a go!$" -Text_186612:: @ 8186612 +Route15_Text_BeckyDefeat:: @ 8186612 .string "No, wrong!$" -Text_18661D:: @ 818661D +Route15_Text_BeckyPostBattle:: @ 818661D .string "I'm afraid of BIKERS. They look so\n" .string "ugly and mean!$" -Text_18664F:: @ 818664F +Route15_Text_EdwinIntro:: @ 818664F .string "When I whistle, I can summon bird\n" .string "POKéMON.$" -Text_18667A:: @ 818667A +Route15_Text_EdwinDefeat:: @ 818667A .string "Ow!\n" .string "That's tragic!$" -Text_18668D:: @ 818668D +Route15_Text_EdwinPostBattle:: @ 818668D .string "Maybe I'm not cut out for battles.\n" .string "I'm not the right type, I guess.$" -Text_1866D1:: @ 81866D1 +Route15_Text_ChesterIntro:: @ 81866D1 .string "Hmm? My birds are shivering!\n" .string "You're good, aren't you?$" -Text_186707:: @ 8186707 +Route15_Text_ChesterDefeat:: @ 8186707 .string "Just as I thought!$" -Text_18671A:: @ 818671A +Route15_Text_ChesterPostBattle:: @ 818671A .string "This is so obvious, you should know\n" .string "this, but…\p" .string "Moves like EARTHQUAKE and FISSURE\n" .string "have no effect on bird POKéMON.$" -Text_18678B:: @ 818678B +Route15_Text_GraceIntro:: @ 818678B .string "Oh, you're a little cutie!\n" .string "So like a darling POKéMON!$" -Text_1867C1:: @ 81867C1 +Route15_Text_GraceDefeat:: @ 81867C1 .string "You looked so cute, too!$" -Text_1867DA:: @ 81867DA +Route15_Text_GracePostBattle:: @ 81867DA .string "I forgive you.\n" .string "I can take it.\l" .string "I'm a big girl now.$" -Text_18680C:: @ 818680C +Route15_Text_OliviaIntro:: @ 818680C .string "I raise POKéMON for protection\n" .string "because I live alone.$" -Text_186841:: @ 8186841 +Route15_Text_OliviaDefeat:: @ 8186841 .string "POKéMON isn't about winning or\n" .string "losing for me.$" -Text_18686F:: @ 818686F +Route15_Text_OliviaPostBattle:: @ 818686F .string "I love having my POKéMON greet me\n" .string "when I get home.\p" .string "It's so reassuring.$" -Text_1868B6:: @ 81868B6 +Route15_Text_ErnestIntro:: @ 81868B6 .string "Hey, kid! C'mon!\n" .string "I just got these off some loser!$" -Text_1868E8:: @ 81868E8 +Route15_Text_ErnestDefeat:: @ 81868E8 .string "Why not?$" -Text_1868F1:: @ 81868F1 +Route15_Text_ErnestPostBattle:: @ 81868F1 .string "Life's too short.\n" .string "It's cool to live as an outlaw.\l" .string "TEAM ROCKET RULES!$" -Text_186936:: @ 8186936 +Route15_Text_AlexIntro:: @ 8186936 .string "Fork over all your cash when you\n" .string "lose to me, kid!$" -Text_186968:: @ 8186968 +Route15_Text_AlexDefeat:: @ 8186968 .string "That can't be true!$" -Text_18697C:: @ 818697C +Route15_Text_AlexPostBattle:: @ 818697C .string "I was just joking about the money.\n" .string "Don't take me all serious.$" -Text_1869BA:: @ 81869BA +Route15_Text_CeliaIntro:: @ 81869BA .string "What's cool and happening?\n" .string "Trading POKéMON!$" -Text_1869E6:: @ 81869E6 +Route15_Text_CeliaDefeat:: @ 81869E6 .string "I said trade!$" -Text_1869F4:: @ 81869F4 +Route15_Text_CeliaPostBattle:: @ 81869F4 .string "I trade POKéMON with my friends\n" .string "all the time.$" -Text_186A22:: @ 8186A22 +Route15_Text_YazminIntro:: @ 8186A22 .string "Want to play with my POKéMON?$" -Text_186A40:: @ 8186A40 +Route15_Text_YazminDefeat:: @ 8186A40 .string "I was too impatient!$" -Text_186A55:: @ 8186A55 +Route15_Text_YazminPostBattle:: @ 8186A55 .string "I'll go train with weaker people.$" -gUnknown_8186A77:: @ 8186A77 +Route15_Text_RouteSign:: @ 8186A77 .string "ROUTE 15\n" .string "West to FUCHSIA CITY$" -Text_186A95:: @ 8186A95 +Route15_Text_MyaIntro:: @ 8186A95 .string "MYA: You're perfect.\n" .string "Help me train my little brother?$" -Text_186ACB:: @ 8186ACB +Route15_Text_MyaDefeat:: @ 8186ACB .string "MYA: RON, you have to focus!\n" .string "Concentrate on what you're doing!$" -Text_186B0A:: @ 8186B0A +Route15_Text_MyaPostBattle:: @ 8186B0A .string "MYA: Okay, we'll turn it up.\n" .string "I'll add to our training menu!$" -Text_186B46:: @ 8186B46 +Route15_Text_MyaNotEnoughMons:: @ 8186B46 .string "MYA: Do you want to challenge us?\n" .string "You'll need two POKéMON, though.$" -Text_186B89:: @ 8186B89 +Route15_Text_RonIntro:: @ 8186B89 .string "RON: My sister gets scary when we\n" .string "lose.$" -Text_186BB1:: @ 8186BB1 +Route15_Text_RonDefeat:: @ 8186BB1 .string "RON: Oh, no, no…\n" .string "Sis, I'm sorry!$" -Text_186BD2:: @ 8186BD2 +Route15_Text_RonPostBattle:: @ 8186BD2 .string "RON: Oh, bleah…\n" .string "I wish I had a nice sister…$" -Text_186BFE:: @ 8186BFE +Route15_Text_RonNotEnoughMons:: @ 8186BFE .string "RON: Did you want to battle with\n" .string "my sister and me?\p" .string "You need two POKéMON, then.$" diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json index 39bf0cb41..fb1f9cacd 100644 --- a/data/maps/Route15_WestEntrance_1F/map.json +++ b/data/maps/Route15_WestEntrance_1F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route15_WestEntrance_1F_EventScript_170089", + "script": "Route15_WestEntrance_1F_EventScript_Guard", "flag": "0" } ], diff --git a/data/maps/Route15_WestEntrance_1F/scripts.inc b/data/maps/Route15_WestEntrance_1F/scripts.inc index 9f753e6c9..222be2356 100644 --- a/data/maps/Route15_WestEntrance_1F/scripts.inc +++ b/data/maps/Route15_WestEntrance_1F/scripts.inc @@ -1,6 +1,6 @@ Route15_WestEntrance_1F_MapScripts:: @ 8170088 .byte 0 -Route15_WestEntrance_1F_EventScript_170089:: @ 8170089 - msgbox gUnknown_819F560, MSGBOX_NPC +Route15_WestEntrance_1F_EventScript_Guard:: @ 8170089 + msgbox Route15_WestEntrance_1F_Text_OaksAideCameByHere, MSGBOX_NPC end diff --git a/data/maps/Route15_WestEntrance_1F/text.inc b/data/maps/Route15_WestEntrance_1F/text.inc index e843e10a8..6cdbe8a2a 100644 --- a/data/maps/Route15_WestEntrance_1F/text.inc +++ b/data/maps/Route15_WestEntrance_1F/text.inc @@ -1,4 +1,4 @@ -gUnknown_819F560:: @ 819F560 +Route15_WestEntrance_1F_Text_OaksAideCameByHere:: @ 819F560 .string "Are you the kid who's working on\n" .string "a POKéDEX?\p" .string "PROF. OAK's AIDE came by here.$" diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json index b11b7224a..8317b4d84 100644 --- a/data/maps/Route15_WestEntrance_2F/map.json +++ b/data/maps/Route15_WestEntrance_2F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route15_WestEntrance_2F_EventScript_1700B9", + "script": "Route15_WestEntrance_2F_EventScript_Aide", "flag": "0" } ], @@ -45,14 +45,14 @@ "x": 4, "y": 1, "elevation": 0, - "script": "Route15_WestEntrance_2F_EventScript_170093" + "script": "Route15_WestEntrance_2F_EventScript_LeftBinoculars" }, { "type": "bg_event_type_0", "x": 8, "y": 1, "elevation": 0, - "script": "Route15_WestEntrance_2F_EventScript_1700B0" + "script": "Route15_WestEntrance_2F_EventScript_RightBinoculars" } ] } diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index 088a65876..851ceb07f 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -1,9 +1,11 @@ +.equ REQUIRED_CAUGHT_MONS, 50 + Route15_WestEntrance_2F_MapScripts:: @ 8170092 .byte 0 -Route15_WestEntrance_2F_EventScript_170093:: @ 8170093 +Route15_WestEntrance_2F_EventScript_LeftBinoculars:: @ 8170093 lockall - msgbox gUnknown_819F79C + msgbox Route15_WestEntrance_2F_Text_LargeShiningBird drawmonpic SPECIES_ARTICUNO, 10, 3 delay 20 waitbuttonpress @@ -13,40 +15,40 @@ Route15_WestEntrance_2F_EventScript_170093:: @ 8170093 releaseall end -Route15_WestEntrance_2F_EventScript_1700B0:: @ 81700B0 - msgbox gUnknown_819F7F8, MSGBOX_SIGN +Route15_WestEntrance_2F_EventScript_RightBinoculars:: @ 81700B0 + msgbox Route15_WestEntrance_2F_Text_SmallIslandOnHorizon, MSGBOX_SIGN end -Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 +Route15_WestEntrance_2F_EventScript_Aide:: @ 81700B9 lock faceplayer - call EventScript_170145 - goto_if_set FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE, EventScript_17013B - msgbox gUnknown_819F5AB, MSGBOX_YESNO + call Route15_WestEntrance_2F_EventScript_GetAideRequestInfo + goto_if_set FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE, Route15_WestEntrance_2F_EventScript_AlreadyGotExpShare + msgbox Route15_WestEntrance_2F_Text_GiveItemIfCaughtEnough, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq Aide_EventScript_DeclineCheckMons setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 - call EventScript_170145 - compare VAR_0x8006, 50 + call Route15_WestEntrance_2F_EventScript_GetAideRequestInfo + compare VAR_0x8006, REQUIRED_CAUGHT_MONS goto_if_lt Aide_EventScript_HaventCaughtEnough - msgbox gUnknown_819F6AA + msgbox Route15_WestEntrance_2F_Text_GreatHereYouGo checkitemspace ITEM_EXP_SHARE, 1 compare VAR_RESULT, FALSE goto_if_eq Aide_EventScript_NoRoomForItem - giveitem_msg gUnknown_819F6FD, ITEM_EXP_SHARE + giveitem_msg Route15_WestEntrance_2F_Text_ReceivedItemFromAide, ITEM_EXP_SHARE setflag FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE - msgbox gUnknown_819F71F + msgbox Route15_WestEntrance_2F_Text_ExplainExpShare release end -EventScript_17013B:: @ 817013B - msgbox gUnknown_819F71F +Route15_WestEntrance_2F_EventScript_AlreadyGotExpShare:: @ 817013B + msgbox Route15_WestEntrance_2F_Text_ExplainExpShare release end -EventScript_170145:: @ 8170145 - getnumberstring 0, 50 +Route15_WestEntrance_2F_EventScript_GetAideRequestInfo:: @ 8170145 + getnumberstring 0, REQUIRED_CAUGHT_MONS getitemname 1, ITEM_EXP_SHARE return diff --git a/data/maps/Route15_WestEntrance_2F/text.inc b/data/maps/Route15_WestEntrance_2F/text.inc index e5518b8e2..c3c9866eb 100644 --- a/data/maps/Route15_WestEntrance_2F/text.inc +++ b/data/maps/Route15_WestEntrance_2F/text.inc @@ -1,4 +1,4 @@ -gUnknown_819F5AB:: @ 819F5AB +Route15_WestEntrance_2F_Text_GiveItemIfCaughtEnough:: @ 819F5AB .string "Hi! Remember me?\n" .string "I'm one of PROF. OAK's AIDES.\p" .string "If your POKéDEX has complete data\n" @@ -10,30 +10,30 @@ gUnknown_819F5AB:: @ 819F5AB .string "Have you gathered data on at least\n" .string "{STR_VAR_1} kinds of POKéMON?$" -gUnknown_819F6AA:: @ 819F6AA +Route15_WestEntrance_2F_Text_GreatHereYouGo:: @ 819F6AA .string "Great! You have caught or owned\n" .string "{STR_VAR_3} kinds of POKéMON!\p" .string "Congratulations!\n" .string "Here you go!$" -gUnknown_819F6FD:: @ 819F6FD +Route15_WestEntrance_2F_Text_ReceivedItemFromAide:: @ 819F6FD .string "{PLAYER} received the {STR_VAR_2}\n" .string "from the AIDE.$" -gUnknown_819F71F:: @ 819F71F +Route15_WestEntrance_2F_Text_ExplainExpShare:: @ 819F71F .string "EXP. SHARE is an item to be held\n" .string "by a POKéMON.\p" .string "The POKéMON will receive a share\n" .string "of the EXP. Points without having\l" .string "to battle.$" -gUnknown_819F79C:: @ 819F79C +Route15_WestEntrance_2F_Text_LargeShiningBird:: @ 819F79C .string "Let's see what the binoculars have\n" .string "to show…\p" .string "A large, shining bird is flying\n" .string "toward the sea.$" -gUnknown_819F7F8:: @ 819F7F8 +Route15_WestEntrance_2F_Text_SmallIslandOnHorizon:: @ 819F7F8 .string "Let's see what the binoculars have\n" .string "to show…\p" .string "It looks like a small island on\n" diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index 45617a334..b88cbe12c 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route16_EventScript_1AAEEB", + "script": "Route16_EventScript_Lao", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route16_EventScript_1AAFA5", + "script": "Route16_EventScript_Koji", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route16_EventScript_1AAFE3", + "script": "Route16_EventScript_Luke", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route16_EventScript_1AAF67", + "script": "Route16_EventScript_Ruben", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route16_EventScript_1AAF29", + "script": "Route16_EventScript_Hideo", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route16_EventScript_1AB021", + "script": "Route16_EventScript_Camron", "flag": "0" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route16_EventScript_1AB0A5", + "script": "Route16_EventScript_Lea", "flag": "0" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route16_EventScript_1AB05F", + "script": "Route16_EventScript_Jed", "flag": "0" }, { diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index 1d7c6657c..27a5efccc 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -14,18 +14,18 @@ Route16_EventScript_RemoveSnorlax:: @ 81680FF Route16_OnTransition:: @ 8168103 compare VAR_MAP_SCENE_ROUTE16, 1 - call_if_eq Route16_EventScript_EnterCyclingRoad + call_if_eq Route16_OnTransitionCyclingRoad end -Route16_EventScript_EnterCyclingRoad:: @ 816810F +Route16_OnTransitionCyclingRoad:: @ 816810F setflag FLAG_SYS_ON_CYCLING_ROAD return Route16_OnWarp:: @ 8168113 - map_script_2 VAR_MAP_SCENE_ROUTE16, 1, Route16_EventScript_WarpIntoCyclingRoad + map_script_2 VAR_MAP_SCENE_ROUTE16, 1, Route16_OnWarpCyclingRoad .2byte 0 -Route16_EventScript_WarpIntoCyclingRoad:: @ 816811D +Route16_OnWarpCyclingRoad:: @ 816811D special Special_ForcePlayerOntoBike end diff --git a/data/maps/Route16/text.inc b/data/maps/Route16/text.inc index 5131934b1..ca3507cc7 100644 --- a/data/maps/Route16/text.inc +++ b/data/maps/Route16/text.inc @@ -1,66 +1,66 @@ -Text_186C4D:: @ 8186C4D +Route16_Text_LaoIntro:: @ 8186C4D .string "What do you want?$" -Text_186C5F:: @ 8186C5F +Route16_Text_LaoDefeat:: @ 8186C5F .string "Don't you dare laugh!$" -Text_186C75:: @ 8186C75 +Route16_Text_LaoPostBattle:: @ 8186C75 .string "We like just hanging here.\n" .string "What's it to you?$" -Text_186CA2:: @ 8186CA2 +Route16_Text_KojiIntro:: @ 8186CA2 .string "Nice BIKE!\n" .string "Hand it over!$" -Text_186CBB:: @ 8186CBB +Route16_Text_KojiDefeat:: @ 8186CBB .string "Knockout!$" -Text_186CC5:: @ 8186CC5 +Route16_Text_KojiPostBattle:: @ 8186CC5 .string "Forget it, who needs your BIKE!$" -Text_186CE5:: @ 8186CE5 +Route16_Text_LukeIntro:: @ 8186CE5 .string "Come out and play, little mouse!$" -Text_186D06:: @ 8186D06 +Route16_Text_LukeDefeat:: @ 8186D06 .string "You little rat!$" -Text_186D16:: @ 8186D16 +Route16_Text_LukePostBattle:: @ 8186D16 .string "I hate losing!\n" .string "Get out of my face!$" -Text_186D39:: @ 8186D39 +Route16_Text_HideoIntro:: @ 8186D39 .string "Hey, you just bumped me!$" -Text_186D52:: @ 8186D52 +Route16_Text_HideoDefeat:: @ 8186D52 .string "Kaboom!$" -Text_186D5A:: @ 8186D5A +Route16_Text_HideoPostBattle:: @ 8186D5A .string "We'll always be hanging around here\n" .string "even if you don't like it.\p" .string "You can detour to VERMILION from\n" .string "FUCHSIA going along the coast.$" -Text_186DD9:: @ 8186DD9 +Route16_Text_CamronIntro:: @ 8186DD9 .string "I'm feeling hungry and mean!\n" .string "I need a punching bag!$" -Text_186E0D:: @ 8186E0D +Route16_Text_CamronDefeat:: @ 8186E0D .string "Bad, bad, bad!$" -Text_186E1C:: @ 8186E1C +Route16_Text_CamronPostBattle:: @ 8186E1C .string "If I'm going to have POKéMON, they\n" .string "may as well be ferocious.\p" .string "I'd use them to leave my enemies\n" .string "in tatters.$" -Text_186E86:: @ 8186E86 +Route16_Text_RubenIntro:: @ 8186E86 .string "Hey, there!\n" .string "Let's have ourselves a good time!$" -Text_186EB4:: @ 8186EB4 +Route16_Text_RubenDefeat:: @ 8186EB4 .string "Don't make me mad!$" -Text_186EC7:: @ 8186EC7 +Route16_Text_RubenPostBattle:: @ 8186EC7 .string "I get my kicks by harassing people\n" .string "with my stinking POKéMON.\p" .string "They're great for startling people.\n" @@ -78,35 +78,35 @@ Route16_Text_RouteSign:: @ 8186F98 .string "ROUTE 16\n" .string "CELADON CITY - FUCHSIA CITY$" -Text_186FBD:: @ 8186FBD +Route16_Text_JedIntro:: @ 8186FBD .string "JED: Our love knows no bounds.\n" .string "We're in love and we show it!$" -Text_186FFA:: @ 8186FFA +Route16_Text_JedDefeat:: @ 8186FFA .string "JED: Oh, no!\n" .string "My love has seen me as a loser!$" -Text_187027:: @ 8187027 +Route16_Text_JedPostBattle:: @ 8187027 .string "JED: Listen, LEA.\n" .string "You need to focus less on me.$" -Text_187057:: @ 8187057 +Route16_Text_JedNotEnoughMons:: @ 8187057 .string "JED: You have just one POKéMON?\n" .string "Is there no love in your heart?$" -Text_187097:: @ 8187097 +Route16_Text_LeaIntro:: @ 8187097 .string "LEA: Sometimes, the intensity of\n" .string "our love scares me.$" -Text_1870CC:: @ 81870CC +Route16_Text_LeaDefeat:: @ 81870CC .string "LEA: Ohh! But JED looks cool\n" .string "even in a loss!$" -Text_1870F9:: @ 81870F9 +Route16_Text_LeaPostBattle:: @ 81870F9 .string "LEA: Ehehe, I'm sorry.\n" .string "JED is so cool.$" -Text_187120:: @ 8187120 +Route16_Text_LeaNotEnoughMons:: @ 8187120 .string "LEA: Oh, you don't have two\n" .string "POKéMON with you?\p" .string "Doesn't it feel lonely for you or\n" diff --git a/data/maps/Route16_House/map.json b/data/maps/Route16_House/map.json index ec7b219d3..3421f6eba 100644 --- a/data/maps/Route16_House/map.json +++ b/data/maps/Route16_House/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route16_House_EventScript_17014F", + "script": "Route16_House_EventScript_Woman", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route16_House_EventScript_1701AF", + "script": "Route16_House_EventScript_Fearow", "flag": "0" } ], diff --git a/data/maps/Route16_House/scripts.inc b/data/maps/Route16_House/scripts.inc index 94ed9b932..baf6fcc32 100644 --- a/data/maps/Route16_House/scripts.inc +++ b/data/maps/Route16_House/scripts.inc @@ -1,36 +1,36 @@ Route16_House_MapScripts:: @ 817014E .byte 0 -Route16_House_EventScript_17014F:: @ 817014F +Route16_House_EventScript_Woman:: @ 817014F lock faceplayer - goto_if_set FLAG_GOT_HM02, EventScript_1701A5 - msgbox gUnknown_819F851 + goto_if_set FLAG_GOT_HM02, Route16_House_EventScript_AlreadyGotHM02 + msgbox Route16_House_Text_FoundMySecretRetreat checkitemspace ITEM_HM02, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_17019B - giveitem_msg gUnknown_819F8C0, ITEM_HM02 - msgbox gUnknown_819F8E0 + goto_if_eq Route16_House_EventScript_NoRoomForHM02 + giveitem_msg Route16_House_Text_ReceivedHM02FromGirl, ITEM_HM02 + msgbox Route16_House_Text_ExplainHM02 setflag FLAG_GOT_HM02 release end -EventScript_17019B:: @ 817019B - msgbox gUnknown_819F92D +Route16_House_EventScript_NoRoomForHM02:: @ 817019B + msgbox Route16_House_Text_DontHaveAnyRoomForThis release end -EventScript_1701A5:: @ 81701A5 - msgbox gUnknown_819F8E0 +Route16_House_EventScript_AlreadyGotHM02:: @ 81701A5 + msgbox Route16_House_Text_ExplainHM02 release end -Route16_House_EventScript_1701AF:: @ 81701AF +Route16_House_EventScript_Fearow:: @ 81701AF lock faceplayer waitse playmoncry SPECIES_FEAROW, 0 - msgbox gUnknown_819F94F + msgbox Route16_House_Text_Fearow waitmoncry release end diff --git a/data/maps/Route16_House/text.inc b/data/maps/Route16_House/text.inc index 136cf9604..2cdfe38d9 100644 --- a/data/maps/Route16_House/text.inc +++ b/data/maps/Route16_House/text.inc @@ -1,21 +1,21 @@ -gUnknown_819F851:: @ 819F851 +Route16_House_Text_FoundMySecretRetreat:: @ 819F851 .string "Oh, dear.\n" .string "You've found my secret retreat.\p" .string "Please don't tell anyone I'm here.\n" .string "I'll make it up to you with this!$" -gUnknown_819F8C0:: @ 819F8C0 +Route16_House_Text_ReceivedHM02FromGirl:: @ 819F8C0 .string "{PLAYER} received HM02\n" .string "from the girl.$" -gUnknown_819F8E0:: @ 819F8E0 +Route16_House_Text_ExplainHM02:: @ 819F8E0 .string "HM02 is FLY.\n" .string "It's a wonderfully convenient move.\p" .string "Please, put it to good use.$" -gUnknown_819F92D:: @ 819F92D +Route16_House_Text_DontHaveAnyRoomForThis:: @ 819F92D .string "You don't have any room for this.$" -gUnknown_819F94F:: @ 819F94F +Route16_House_Text_Fearow:: @ 819F94F .string "FEAROW: Kyueen!$" diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json index 133fd5b09..515800a2c 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route16_NorthEntrance_1F_EventScript_1701DB", + "script": "Route16_NorthEntrance_1F_EventScript_Guard", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route16_NorthEntrance_1F_EventScript_1702B5", + "script": "Route16_NorthEntrance_1F_EventScript_OldMan", "flag": "0" } ], @@ -87,7 +87,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 1, - "script": "Route16_NorthEntrance_1F_EventScript_1A77B6" + "script": "EventScript_SetExitingCyclingRoad" }, { "type": "trigger", @@ -96,7 +96,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 0, - "script": "Route16_NorthEntrance_1F_EventScript_1A77C1" + "script": "EventScript_SetEnteringCyclingRoad" }, { "type": "trigger", @@ -105,7 +105,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": 0, - "script": "Route16_NorthEntrance_1F_EventScript_1701E4" + "script": "Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerTop" }, { "type": "trigger", @@ -114,7 +114,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": 0, - "script": "Route16_NorthEntrance_1F_EventScript_1701F0" + "script": "Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMidTop" }, { "type": "trigger", @@ -123,7 +123,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 0, - "script": "Route16_NorthEntrance_1F_EventScript_1A77C1" + "script": "EventScript_SetEnteringCyclingRoad" }, { "type": "trigger", @@ -132,7 +132,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 0, - "script": "Route16_NorthEntrance_1F_EventScript_1A77C1" + "script": "EventScript_SetEnteringCyclingRoad" }, { "type": "trigger", @@ -141,7 +141,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 1, - "script": "Route16_NorthEntrance_1F_EventScript_1A77B6" + "script": "EventScript_SetExitingCyclingRoad" }, { "type": "trigger", @@ -150,7 +150,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 1, - "script": "Route16_NorthEntrance_1F_EventScript_1A77B6" + "script": "EventScript_SetExitingCyclingRoad" }, { "type": "trigger", @@ -159,7 +159,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": 0, - "script": "Route16_NorthEntrance_1F_EventScript_1701FC" + "script": "Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMid" }, { "type": "trigger", @@ -168,7 +168,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": 0, - "script": "Route16_NorthEntrance_1F_EventScript_170208" + "script": "Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMidBottom" }, { "type": "trigger", @@ -177,7 +177,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": 0, - "script": "Route16_NorthEntrance_1F_EventScript_170214" + "script": "Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerBottom" } ], "bg_events": [] diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc index a99a1ec18..d00ba5805 100644 --- a/data/maps/Route16_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc @@ -4,115 +4,115 @@ Route16_NorthEntrance_1F_MapScripts:: @ 81701C2 Route16_NorthEntrance_1F_OnTransition:: @ 81701C8 clearflag FLAG_SYS_ON_CYCLING_ROAD - call_if_set FLAG_GOT_BICYCLE, EventScript_1701D5 + call_if_set FLAG_GOT_BICYCLE, Route16_NorthEntrance_1F_EventScript_DisableNeedBikeTrigger end -EventScript_1701D5:: @ 81701D5 +Route16_NorthEntrance_1F_EventScript_DisableNeedBikeTrigger:: @ 81701D5 setvar VAR_TEMP_1, 1 return -Route16_NorthEntrance_1F_EventScript_1701DB:: @ 81701DB - msgbox gUnknown_819F98B, MSGBOX_NPC +Route16_NorthEntrance_1F_EventScript_Guard:: @ 81701DB + msgbox Route16_NorthEntrance_1F_Text_CyclingRoadIsDownhillCourse, MSGBOX_NPC end -Route16_NorthEntrance_1F_EventScript_1701E4:: @ 81701E4 +Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerTop:: @ 81701E4 lockall setvar VAR_0x8008, 0 - goto EventScript_170220 + goto Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger end -Route16_NorthEntrance_1F_EventScript_1701F0:: @ 81701F0 +Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMidTop:: @ 81701F0 lockall setvar VAR_0x8008, 1 - goto EventScript_170220 + goto Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger end -Route16_NorthEntrance_1F_EventScript_1701FC:: @ 81701FC +Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMid:: @ 81701FC lockall setvar VAR_0x8008, 2 - goto EventScript_170220 + goto Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger end -Route16_NorthEntrance_1F_EventScript_170208:: @ 8170208 +Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMidBottom:: @ 8170208 lockall setvar VAR_0x8008, 3 - goto EventScript_170220 + goto Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger end -Route16_NorthEntrance_1F_EventScript_170214:: @ 8170214 +Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerBottom:: @ 8170214 lockall setvar VAR_0x8008, 4 - goto EventScript_170220 + goto Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger end -EventScript_170220:: @ 8170220 +Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger:: @ 8170220 textcolor 0 - msgbox gUnknown_819F9CC + msgbox Route16_NorthEntrance_1F_Text_ExcuseMeWaitUp closemessage applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 compare VAR_0x8008, 1 - call_if_eq EventScript_170279 + call_if_eq Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidTop compare VAR_0x8008, 2 - call_if_eq EventScript_170284 + call_if_eq Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMid compare VAR_0x8008, 3 - call_if_eq EventScript_17028F + call_if_eq Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidBottom compare VAR_0x8008, 4 - call_if_eq EventScript_17029A - msgbox gUnknown_819F95F + call_if_eq Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterBottom + msgbox Route16_NorthEntrance_1F_Text_NoPedestriansOnCyclingRoad closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1702B3 + applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkRight waitmovement 0 releaseall end -EventScript_170279:: @ 8170279 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1702A5 +Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidTop:: @ 8170279 + applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp waitmovement 0 return -EventScript_170284:: @ 8170284 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1702A7 +Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMid:: @ 8170284 + applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp2 waitmovement 0 return -EventScript_17028F:: @ 817028F - applymovement OBJ_EVENT_ID_PLAYER, Movement_1702AA +Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidBottom:: @ 817028F + applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp3 waitmovement 0 return -EventScript_17029A:: @ 817029A - applymovement OBJ_EVENT_ID_PLAYER, Movement_1702AE +Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterBottom:: @ 817029A + applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp4 waitmovement 0 return -Movement_1702A5:: @ 81702A5 +Route16_NorthEntrance_1F_Movement_WalkUp:: @ 81702A5 walk_up step_end -Movement_1702A7:: @ 81702A7 +Route16_NorthEntrance_1F_Movement_WalkUp2:: @ 81702A7 walk_up walk_up step_end -Movement_1702AA:: @ 81702AA +Route16_NorthEntrance_1F_Movement_WalkUp3:: @ 81702AA walk_up walk_up walk_up step_end -Movement_1702AE:: @ 81702AE +Route16_NorthEntrance_1F_Movement_WalkUp4:: @ 81702AE walk_up walk_up walk_up walk_up step_end -Movement_1702B3:: @ 81702B3 +Route16_NorthEntrance_1F_Movement_WalkRight:: @ 81702B3 walk_right step_end -Route16_NorthEntrance_1F_EventScript_1702B5:: @ 81702B5 - msgbox gUnknown_819F9E8, MSGBOX_NPC +Route16_NorthEntrance_1F_EventScript_OldMan:: @ 81702B5 + msgbox Route16_NorthEntrance_1F_Text_HowdYouGetInGoodEffort, MSGBOX_NPC end diff --git a/data/maps/Route16_NorthEntrance_1F/text.inc b/data/maps/Route16_NorthEntrance_1F/text.inc index 8cc60117c..156e93bfa 100644 --- a/data/maps/Route16_NorthEntrance_1F/text.inc +++ b/data/maps/Route16_NorthEntrance_1F/text.inc @@ -1,16 +1,16 @@ -gUnknown_819F95F:: @ 819F95F +Route16_NorthEntrance_1F_Text_NoPedestriansOnCyclingRoad:: @ 819F95F .string "No pedestrians are allowed on\n" .string "CYCLING ROAD!$" -gUnknown_819F98B:: @ 819F98B +Route16_NorthEntrance_1F_Text_CyclingRoadIsDownhillCourse:: @ 819F98B .string "CYCLING ROAD is a downhill course\n" .string "by the sea. It's a great ride.$" -gUnknown_819F9CC:: @ 819F9CC +Route16_NorthEntrance_1F_Text_ExcuseMeWaitUp:: @ 819F9CC .string "Excuse me!\n" .string "Wait up, please!$" -gUnknown_819F9E8:: @ 819F9E8 +Route16_NorthEntrance_1F_Text_HowdYouGetInGoodEffort:: @ 819F9E8 .string "How'd you get in?\n" .string "Good effort!$" diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json index 03d205867..103929172 100644 --- a/data/maps/Route16_NorthEntrance_2F/map.json +++ b/data/maps/Route16_NorthEntrance_2F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route16_NorthEntrance_2F_EventScript_1702BF", + "script": "Route16_NorthEntrance_2F_EventScript_LittleBoy", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route16_NorthEntrance_2F_EventScript_1702C8", + "script": "Route16_NorthEntrance_2F_EventScript_LittleGirl", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route16_NorthEntrance_2F_EventScript_1702E3", + "script": "Route16_NorthEntrance_2F_EventScript_Aide", "flag": "0" } ], @@ -71,14 +71,14 @@ "x": 4, "y": 1, "elevation": 0, - "script": "Route16_NorthEntrance_2F_EventScript_1702D1" + "script": "Route16_NorthEntrance_2F_EventScript_LeftBinoculars" }, { "type": "bg_event_type_0", "x": 8, "y": 1, "elevation": 0, - "script": "Route16_NorthEntrance_2F_EventScript_1702DA" + "script": "Route16_NorthEntrance_2F_EventScript_RightBinoculars" } ] } diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc index 7ccba34c8..0843978f2 100644 --- a/data/maps/Route16_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -1,52 +1,54 @@ +.equ REQUIRED_CAUGHT_MONS, 40 + Route16_NorthEntrance_2F_MapScripts:: @ 81702BE .byte 0 -Route16_NorthEntrance_2F_EventScript_1702BF:: @ 81702BF - msgbox gUnknown_819FA07, MSGBOX_NPC +Route16_NorthEntrance_2F_EventScript_LittleBoy:: @ 81702BF + msgbox Route16_NorthEntrance_2F_Text_OnBikeRideWithGirlfriend, MSGBOX_NPC end -Route16_NorthEntrance_2F_EventScript_1702C8:: @ 81702C8 - msgbox gUnknown_819FA41, MSGBOX_NPC +Route16_NorthEntrance_2F_EventScript_LittleGirl:: @ 81702C8 + msgbox Route16_NorthEntrance_2F_Text_RidingTogetherOnNewBikes, MSGBOX_NPC end -Route16_NorthEntrance_2F_EventScript_1702D1:: @ 81702D1 - msgbox gUnknown_819FA6F, MSGBOX_SIGN +Route16_NorthEntrance_2F_EventScript_LeftBinoculars:: @ 81702D1 + msgbox Route16_NorthEntrance_2F_Text_ItsCeladonDeptStore, MSGBOX_SIGN end -Route16_NorthEntrance_2F_EventScript_1702DA:: @ 81702DA - msgbox gUnknown_819FAB9, MSGBOX_SIGN +Route16_NorthEntrance_2F_EventScript_RightBinoculars:: @ 81702DA + msgbox Route16_NorthEntrance_2F_Text_LongPathOverWater, MSGBOX_SIGN end -Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 +Route16_NorthEntrance_2F_EventScript_Aide:: @ 81702E3 lock faceplayer - call EventScript_17036F - goto_if_set FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE, EventScript_170365 - msgbox gUnknown_819FB0E, MSGBOX_YESNO + call Route16_NorthEntrance_2F_EventScript_GetAideRequestInfo + goto_if_set FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE, Route16_NorthEntrance_2F_EventScript_AlreadyGotAmuletCoin + msgbox Route16_NorthEntrance_2F_Text_GiveAmuletCoinIfCaught40, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq Aide_EventScript_DeclineCheckMons setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 - call EventScript_17036F - compare VAR_0x8006, 40 + call Route16_NorthEntrance_2F_EventScript_GetAideRequestInfo + compare VAR_0x8006, REQUIRED_CAUGHT_MONS goto_if_lt Aide_EventScript_HaventCaughtEnough - msgbox gUnknown_819FC15 + msgbox Route16_NorthEntrance_2F_Text_GreatHereYouGo checkitemspace ITEM_AMULET_COIN, 1 compare VAR_RESULT, FALSE goto_if_eq Aide_EventScript_NoRoomForItem - giveitem_msg gUnknown_819FC68, ITEM_AMULET_COIN + giveitem_msg Route16_NorthEntrance_2F_Text_ReceivedAmuletCoinFromAide, ITEM_AMULET_COIN setflag FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE - msgbox gUnknown_819FC93 + msgbox Route16_NorthEntrance_2F_Text_ExplainAmuletCoin release end -EventScript_170365:: @ 8170365 - msgbox gUnknown_819FC93 +Route16_NorthEntrance_2F_EventScript_AlreadyGotAmuletCoin:: @ 8170365 + msgbox Route16_NorthEntrance_2F_Text_ExplainAmuletCoin release end -EventScript_17036F:: @ 817036F - getnumberstring 0, 40 +Route16_NorthEntrance_2F_EventScript_GetAideRequestInfo:: @ 817036F + getnumberstring 0, REQUIRED_CAUGHT_MONS getitemname 1, ITEM_AMULET_COIN return diff --git a/data/maps/Route16_NorthEntrance_2F/text.inc b/data/maps/Route16_NorthEntrance_2F/text.inc index 4839bfe8a..37c518fb4 100644 --- a/data/maps/Route16_NorthEntrance_2F/text.inc +++ b/data/maps/Route16_NorthEntrance_2F/text.inc @@ -1,23 +1,23 @@ -gUnknown_819FA07:: @ 819FA07 +Route16_NorthEntrance_2F_Text_OnBikeRideWithGirlfriend:: @ 819FA07 .string "I'm on a relaxing ride on my new\n" .string "bike with my girlfriend.$" -gUnknown_819FA41:: @ 819FA41 +Route16_NorthEntrance_2F_Text_RidingTogetherOnNewBikes:: @ 819FA41 .string "We're going riding together on our\n" .string "new bikes.$" -gUnknown_819FA6F:: @ 819FA6F +Route16_NorthEntrance_2F_Text_ItsCeladonDeptStore:: @ 819FA6F .string "Let's see what the binoculars have\n" .string "to show…\p" .string "It's the CELADON DEPT. STORE!$" -gUnknown_819FAB9:: @ 819FAB9 +Route16_NorthEntrance_2F_Text_LongPathOverWater:: @ 819FAB9 .string "Let's see what the binoculars have\n" .string "to show…\p" .string "There's a long path over water far\n" .string "away.$" -gUnknown_819FB0E:: @ 819FB0E +Route16_NorthEntrance_2F_Text_GiveAmuletCoinIfCaught40:: @ 819FB0E .string "Hi! Remember me?\n" .string "I'm one of PROF. OAK's AIDES.\p" .string "If your POKéDEX has complete data\n" @@ -29,17 +29,17 @@ gUnknown_819FB0E:: @ 819FB0E .string "Have you gathered data on at least\n" .string "40 kinds of POKéMON?$" -gUnknown_819FC15:: @ 819FC15 +Route16_NorthEntrance_2F_Text_GreatHereYouGo:: @ 819FC15 .string "Great! You have caught or owned\n" .string "{STR_VAR_3} kinds of POKéMON!\p" .string "Congratulations!\n" .string "Here you go!$" -gUnknown_819FC68:: @ 819FC68 +Route16_NorthEntrance_2F_Text_ReceivedAmuletCoinFromAide:: @ 819FC68 .string "{PLAYER} received the AMULET COIN\n" .string "from the AIDE.$" -gUnknown_819FC93:: @ 819FC93 +Route16_NorthEntrance_2F_Text_ExplainAmuletCoin:: @ 819FC93 .string "An AMULET COIN is an item to be\n" .string "held by a POKéMON.\p" .string "If the POKéMON appears in a winning\n" diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json index fd640db01..43ec14e88 100644 --- a/data/maps/Route17/map.json +++ b/data/maps/Route17/map.json @@ -36,7 +36,7 @@ "movement_range_y": 6, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route17_EventScript_1AB319", + "script": "Route17_EventScript_Virgil", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 5, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route17_EventScript_1AB221", + "script": "Route17_EventScript_Isaiah", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 2, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route17_EventScript_1AB1E3", + "script": "Route17_EventScript_Raul", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 5, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route17_EventScript_1AB129", + "script": "Route17_EventScript_Nikolas", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route17_EventScript_1AB0EB", + "script": "Route17_EventScript_Billy", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route17_EventScript_1AB29D", + "script": "Route17_EventScript_Jamal", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route17_EventScript_1AB25F", + "script": "Route17_EventScript_Zeek", "flag": "0" }, { @@ -127,7 +127,7 @@ "movement_range_y": 5, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route17_EventScript_1AB2DB", + "script": "Route17_EventScript_Corey", "flag": "0" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route17_EventScript_1AB1A5", + "script": "Route17_EventScript_William", "flag": "0" }, { @@ -153,7 +153,7 @@ "movement_range_y": 5, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route17_EventScript_1AB167", + "script": "Route17_EventScript_Jaxon", "flag": "0" } ], @@ -165,42 +165,42 @@ "x": 12, "y": 97, "elevation": 0, - "script": "Route17_EventScript_1681DB" + "script": "Route17_EventScript_RouteSign" }, { "type": "bg_event_type_0", "x": 12, "y": 83, "elevation": 0, - "script": "Route17_EventScript_1681D2" + "script": "Route17_EventScript_TrainerTips2" }, { "type": "bg_event_type_0", "x": 12, "y": 68, "elevation": 0, - "script": "Route17_EventScript_1681C9" + "script": "Route17_EventScript_TrainerTips1" }, { "type": "bg_event_type_0", "x": 12, "y": 53, "elevation": 0, - "script": "Route17_EventScript_1681C0" + "script": "Route17_EventScript_ItemsNotice" }, { "type": "bg_event_type_0", "x": 12, "y": 125, "elevation": 3, - "script": "Route17_EventScript_1681E4" + "script": "Route17_EventScript_BallsNotice" }, { "type": "bg_event_type_0", "x": 11, "y": 157, "elevation": 0, - "script": "Route17_EventScript_1681ED" + "script": "Route17_EventScript_CyclingRoadSign" }, { "type": "hidden_item", diff --git a/data/maps/Route17/scripts.inc b/data/maps/Route17/scripts.inc index 8633ab23e..787e68e04 100644 --- a/data/maps/Route17/scripts.inc +++ b/data/maps/Route17/scripts.inc @@ -1,26 +1,26 @@ Route17_MapScripts:: @ 81681BF .byte 0 -Route17_EventScript_1681C0:: @ 81681C0 - msgbox gUnknown_81874E4, MSGBOX_SIGN +Route17_EventScript_ItemsNotice:: @ 81681C0 + msgbox Route17_Text_WatchOutForDiscardedItems, MSGBOX_SIGN end -Route17_EventScript_1681C9:: @ 81681C9 - msgbox gUnknown_8187512, MSGBOX_SIGN +Route17_EventScript_TrainerTips1:: @ 81681C9 + msgbox Route17_Text_SameSpeciesGrowDifferentRates, MSGBOX_SIGN end -Route17_EventScript_1681D2:: @ 81681D2 - msgbox gUnknown_818757B, MSGBOX_SIGN +Route17_EventScript_TrainerTips2:: @ 81681D2 + msgbox Route17_Text_PressBToStayInPlace, MSGBOX_SIGN end -Route17_EventScript_1681DB:: @ 81681DB - msgbox gUnknown_81875BE, MSGBOX_SIGN +Route17_EventScript_RouteSign:: @ 81681DB + msgbox Route17_Text_RouteSign, MSGBOX_SIGN end -Route17_EventScript_1681E4:: @ 81681E4 - msgbox gUnknown_81875E3, MSGBOX_SIGN +Route17_EventScript_BallsNotice:: @ 81681E4 + msgbox Route17_Text_DontThrowGameThrowBalls, MSGBOX_SIGN end -Route17_EventScript_1681ED:: @ 81681ED - msgbox gUnknown_8187622, MSGBOX_SIGN +Route17_EventScript_CyclingRoadSign:: @ 81681ED + msgbox Route17_Text_CyclingRoadSign, MSGBOX_SIGN end diff --git a/data/maps/Route17/text.inc b/data/maps/Route17/text.inc index eff5f0726..21d7978a3 100644 --- a/data/maps/Route17/text.inc +++ b/data/maps/Route17/text.inc @@ -1,131 +1,131 @@ -Text_18717E:: @ 818717E +Route17_Text_RaulIntro:: @ 818717E .string "There's no getting rich quick in\n" .string "battling kids.$" -Text_1871AE:: @ 81871AE +Route17_Text_RaulDefeat:: @ 81871AE .string "Burned out!$" -Text_1871BA:: @ 81871BA +Route17_Text_RaulPostBattle:: @ 81871BA .string "You can find good stuff lying\n" .string "around on CYCLING ROAD.\p" .string "There's good money in picking them\n" .string "up and selling them.$" -Text_187228:: @ 8187228 +Route17_Text_IsaiahIntro:: @ 8187228 .string "I'm mighty proud of my bod, kiddo.\n" .string "Come on!$" -Text_187254:: @ 8187254 +Route17_Text_IsaiahDefeat:: @ 8187254 .string "Whoo!$" -Text_18725A:: @ 818725A +Route17_Text_IsaiahPostBattle:: @ 818725A .string "I could belly-bump you outta\n" .string "here!$" -Text_18727D:: @ 818727D +Route17_Text_VirgilIntro:: @ 818727D .string "You heading to FUCHSIA?$" -Text_187295:: @ 8187295 +Route17_Text_VirgilDefeat:: @ 8187295 .string "Crash and burn!$" -Text_1872A5:: @ 81872A5 +Route17_Text_VirgilPostBattle:: @ 81872A5 .string "I love racing downhill!$" -Text_1872BD:: @ 81872BD +Route17_Text_BillyIntro:: @ 81872BD .string "We're BIKERS!\n" .string "We rule the roads, man!$" -Text_1872E3:: @ 81872E3 +Route17_Text_BillyDefeat:: @ 81872E3 .string "Smoked!$" -Text_1872EB:: @ 81872EB +Route17_Text_BillyPostBattle:: @ 81872EB .string "Are you looking for adventure?$" -Text_18730A:: @ 818730A +Route17_Text_NikolasIntro:: @ 818730A .string "Let VOLTORB electrify you!$" -Text_187325:: @ 8187325 +Route17_Text_NikolasDefeat:: @ 8187325 .string "Grounded out!$" -Text_187333:: @ 8187333 +Route17_Text_NikolasPostBattle:: @ 8187333 .string "I got my VOLTORB at the abandoned\n" .string "POWER PLANT.$" -Text_187362:: @ 8187362 +Route17_Text_ZeekIntro:: @ 8187362 .string "I leveled up my POKéMON, but it\n" .string "won't evolve. Why?$" -Text_187395:: @ 8187395 +Route17_Text_ZeekDefeat:: @ 8187395 .string "Why, you!$" -Text_18739F:: @ 818739F +Route17_Text_ZeekPostBattle:: @ 818739F .string "Maybe some POKéMON need element\n" .string "STONES to evolve.$" -Text_1873D1:: @ 81873D1 +Route17_Text_JamalIntro:: @ 81873D1 .string "I need a little exercise!$" -Text_1873EB:: @ 81873EB +Route17_Text_JamalDefeat:: @ 81873EB .string "Whew!\n" .string "Good workout!$" -Text_1873FF:: @ 81873FF +Route17_Text_JamalPostBattle:: @ 81873FF .string "I'm sure I lost weight there!$" -Text_18741D:: @ 818741D +Route17_Text_CoreyIntro:: @ 818741D .string "Be a rebel!$" -Text_187429:: @ 8187429 +Route17_Text_CoreyDefeat:: @ 8187429 .string "Aaaargh!$" -Text_187432:: @ 8187432 +Route17_Text_CoreyPostBattle:: @ 8187432 .string "Be ready to fight for your beliefs!$" -Text_187456:: @ 8187456 +Route17_Text_JaxonIntro:: @ 8187456 .string "Nice BIKE!\n" .string "How's it handle?$" -Text_187472:: @ 8187472 +Route17_Text_JaxonDefeat:: @ 8187472 .string "Shoot!$" -Text_187479:: @ 8187479 +Route17_Text_JaxonPostBattle:: @ 8187479 .string "The slope makes it hard to steer.$" -Text_18749B:: @ 818749B +Route17_Text_WilliamIntro:: @ 818749B .string "Get lost, kid!\n" .string "I'm bushed!$" -Text_1874B6:: @ 81874B6 +Route17_Text_WilliamDefeat:: @ 81874B6 .string "Are you satisfied?$" -Text_1874C9:: @ 81874C9 +Route17_Text_WilliamPostBattle:: @ 81874C9 .string "I need to catch a few z's!$" -gUnknown_81874E4:: @ 81874E4 +Route17_Text_WatchOutForDiscardedItems:: @ 81874E4 .string "It's a notice.\p" .string "Watch out for discarded items.$" -gUnknown_8187512:: @ 8187512 +Route17_Text_SameSpeciesGrowDifferentRates:: @ 8187512 .string "TRAINER TIPS\p" .string "All POKéMON are unique.\p" .string "Even POKéMON of the same species\n" .string "and level grow at different rates.$" -gUnknown_818757B:: @ 818757B +Route17_Text_PressBToStayInPlace:: @ 818757B .string "TRAINER TIPS\p" .string "Press the B Button to stay in place\n" .string "while on a slope.$" -gUnknown_81875BE:: @ 81875BE +Route17_Text_RouteSign:: @ 81875BE .string "ROUTE 17\n" .string "CELADON CITY - FUCHSIA CITY$" -gUnknown_81875E3:: @ 81875E3 +Route17_Text_DontThrowGameThrowBalls:: @ 81875E3 .string "It's a notice!\p" .string "Don't throw the game, throw POKé\n" .string "BALLS instead!$" -gUnknown_8187622:: @ 8187622 +Route17_Text_CyclingRoadSign:: @ 8187622 .string "CYCLING ROAD\n" .string "Slope ends here!$" diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json index 86eb04352..6976a7570 100644 --- a/data/maps/Route18/map.json +++ b/data/maps/Route18/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route18_EventScript_1AB3D3", + "script": "Route18_EventScript_Jacob", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route18_EventScript_1AB395", + "script": "Route18_EventScript_Ramiro", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "Route18_EventScript_1AB357", + "script": "Route18_EventScript_Wilton", "flag": "0" } ], @@ -89,14 +89,14 @@ "x": 37, "y": 7, "elevation": 0, - "script": "Route18_EventScript_168228" + "script": "Route18_EventScript_CyclingRoadSign" }, { "type": "bg_event_type_0", "x": 52, "y": 7, "elevation": 0, - "script": "Route18_EventScript_16821F" + "script": "Route18_EventScript_RouteSign" } ] } diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc index 25fda03c2..43d2b029e 100644 --- a/data/maps/Route18/scripts.inc +++ b/data/maps/Route18/scripts.inc @@ -5,25 +5,25 @@ Route18_MapScripts:: @ 81681F6 Route18_OnTransition:: @ 8168201 compare VAR_MAP_SCENE_ROUTE16, 1 - call_if_eq EventScript_16820D + call_if_eq Route18_OnTransitionCyclingRoad end -EventScript_16820D:: @ 816820D +Route18_OnTransitionCyclingRoad:: @ 816820D setflag FLAG_SYS_ON_CYCLING_ROAD return Route18_OnWarp:: @ 8168211 - map_script_2 VAR_MAP_SCENE_ROUTE16, 1, EventScript_16821B + map_script_2 VAR_MAP_SCENE_ROUTE16, 1, Route18_OnWarpCyclingRoad .2byte 0 -EventScript_16821B:: @ 816821B +Route18_OnWarpCyclingRoad:: @ 816821B special Special_ForcePlayerOntoBike end -Route18_EventScript_16821F:: @ 816821F - msgbox gUnknown_8187757, MSGBOX_SIGN +Route18_EventScript_RouteSign:: @ 816821F + msgbox Route18_Text_RouteSign, MSGBOX_SIGN end -Route18_EventScript_168228:: @ 8168228 - msgbox gUnknown_818777C, MSGBOX_SIGN +Route18_EventScript_CyclingRoadSign:: @ 8168228 + msgbox Route18_Text_CyclingRoadSign, MSGBOX_SIGN end diff --git a/data/maps/Route18/text.inc b/data/maps/Route18/text.inc index c22a6360a..107804cfb 100644 --- a/data/maps/Route18/text.inc +++ b/data/maps/Route18/text.inc @@ -1,40 +1,40 @@ -Text_187640:: @ 8187640 +Route18_Text_WiltonIntro:: @ 8187640 .string "I always check every grassy area\n" .string "for new POKéMON.$" -Text_187672:: @ 8187672 +Route18_Text_WiltonDefeat:: @ 8187672 .string "Tch!$" -Text_187677:: @ 8187677 +Route18_Text_WiltonPostBattle:: @ 8187677 .string "I wish I had a BIKE!$" -Text_18768C:: @ 818768C +Route18_Text_RamiroIntro:: @ 818768C .string "Kurukkoo!\n" .string "How do you like my birdcall?$" -Text_1876B3:: @ 81876B3 +Route18_Text_RamiroDefeat:: @ 81876B3 .string "I had to bug you!$" -Text_1876C5:: @ 81876C5 +Route18_Text_RamiroPostBattle:: @ 81876C5 .string "I collect sea POKéMON on weekends\n" .string "because the sea is so close.$" -Text_187704:: @ 8187704 +Route18_Text_JacobIntro:: @ 8187704 .string "This is my turf!\n" .string "Get out of here!$" -Text_187726:: @ 8187726 +Route18_Text_JacobDefeat:: @ 8187726 .string "Darn!$" -Text_18772C:: @ 818772C +Route18_Text_JacobPostBattle:: @ 818772C .string "This is my fave area for catching\n" .string "POKéMON.$" -gUnknown_8187757:: @ 8187757 +Route18_Text_RouteSign:: @ 8187757 .string "ROUTE 18\n" .string "CELADON CITY - FUCHSIA CITY$" -gUnknown_818777C:: @ 818777C +Route18_Text_CyclingRoadSign:: @ 818777C .string "CYCLING ROAD\n" .string "No pedestrians permitted!$" diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json index 9b1250ac4..c7c04b124 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route18_EastEntrance_1F_EventScript_170391", + "script": "Route18_EastEntrance_1F_EventScript_Guard", "flag": "0" } ], @@ -60,7 +60,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 0, - "script": "Route18_EastEntrance_1F_EventScript_1A77C1" + "script": "EventScript_SetEnteringCyclingRoad" }, { "type": "trigger", @@ -69,7 +69,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": 0, - "script": "Route18_EastEntrance_1F_EventScript_17039A" + "script": "Route18_EastEntrance_1F_EventScript_NeedBikeTriggerTop" }, { "type": "trigger", @@ -78,7 +78,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": 0, - "script": "Route18_EastEntrance_1F_EventScript_1703A6" + "script": "Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMidTop" }, { "type": "trigger", @@ -87,7 +87,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": 0, - "script": "Route18_EastEntrance_1F_EventScript_1703B2" + "script": "Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMid" }, { "type": "trigger", @@ -96,7 +96,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": 0, - "script": "Route18_EastEntrance_1F_EventScript_1703BE" + "script": "Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMidBottom" }, { "type": "trigger", @@ -105,7 +105,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": 0, - "script": "Route18_EastEntrance_1F_EventScript_1703CA" + "script": "Route18_EastEntrance_1F_EventScript_NeedBikeTriggerBottom" }, { "type": "trigger", @@ -114,7 +114,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 1, - "script": "Route18_EastEntrance_1F_EventScript_1A77B6" + "script": "EventScript_SetExitingCyclingRoad" }, { "type": "trigger", @@ -123,7 +123,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 1, - "script": "Route18_EastEntrance_1F_EventScript_1A77B6" + "script": "EventScript_SetExitingCyclingRoad" }, { "type": "trigger", @@ -132,7 +132,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 1, - "script": "Route18_EastEntrance_1F_EventScript_1A77B6" + "script": "EventScript_SetExitingCyclingRoad" }, { "type": "trigger", @@ -141,7 +141,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 0, - "script": "Route18_EastEntrance_1F_EventScript_1A77C1" + "script": "EventScript_SetEnteringCyclingRoad" }, { "type": "trigger", @@ -150,7 +150,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 0, - "script": "Route18_EastEntrance_1F_EventScript_1A77C1" + "script": "EventScript_SetEnteringCyclingRoad" } ], "bg_events": [] diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc index e49eb285f..0a6b3b56f 100644 --- a/data/maps/Route18_EastEntrance_1F/scripts.inc +++ b/data/maps/Route18_EastEntrance_1F/scripts.inc @@ -4,111 +4,111 @@ Route18_EastEntrance_1F_MapScripts:: @ 8170378 Route18_EastEntrance_1F_OnTransition:: @ 817037E clearflag FLAG_SYS_ON_CYCLING_ROAD - call_if_set FLAG_GOT_BICYCLE, EventScript_17038B + call_if_set FLAG_GOT_BICYCLE, Route18_EastEntrance_1F_EventScript_DisableNeedBikeTrigger end -EventScript_17038B:: @ 817038B +Route18_EastEntrance_1F_EventScript_DisableNeedBikeTrigger:: @ 817038B setvar VAR_TEMP_1, 1 return -Route18_EastEntrance_1F_EventScript_170391:: @ 8170391 - msgbox gUnknown_819FD3A, MSGBOX_NPC +Route18_EastEntrance_1F_EventScript_Guard:: @ 8170391 + msgbox Route18_EastEntrance_1F_Text_CyclingRoadAllUphillFromHere, MSGBOX_NPC end -Route18_EastEntrance_1F_EventScript_17039A:: @ 817039A +Route18_EastEntrance_1F_EventScript_NeedBikeTriggerTop:: @ 817039A lockall setvar VAR_0x8008, 0 - goto EventScript_1703D6 + goto Route18_EastEntrance_1F_EventScript_NeedBikeTrigger end -Route18_EastEntrance_1F_EventScript_1703A6:: @ 81703A6 +Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMidTop:: @ 81703A6 lockall setvar VAR_0x8008, 1 - goto EventScript_1703D6 + goto Route18_EastEntrance_1F_EventScript_NeedBikeTrigger end -Route18_EastEntrance_1F_EventScript_1703B2:: @ 81703B2 +Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMid:: @ 81703B2 lockall setvar VAR_0x8008, 2 - goto EventScript_1703D6 + goto Route18_EastEntrance_1F_EventScript_NeedBikeTrigger end -Route18_EastEntrance_1F_EventScript_1703BE:: @ 81703BE +Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMidBottom:: @ 81703BE lockall setvar VAR_0x8008, 3 - goto EventScript_1703D6 + goto Route18_EastEntrance_1F_EventScript_NeedBikeTrigger end -Route18_EastEntrance_1F_EventScript_1703CA:: @ 81703CA +Route18_EastEntrance_1F_EventScript_NeedBikeTriggerBottom:: @ 81703CA lockall setvar VAR_0x8008, 4 - goto EventScript_1703D6 + goto Route18_EastEntrance_1F_EventScript_NeedBikeTrigger end -EventScript_1703D6:: @ 81703D6 +Route18_EastEntrance_1F_EventScript_NeedBikeTrigger:: @ 81703D6 textcolor 0 - msgbox gUnknown_819FD60 + msgbox Route18_EastEntrance_1F_Text_ExcuseMe closemessage applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 compare VAR_0x8008, 1 - call_if_eq EventScript_17042F + call_if_eq Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidTop compare VAR_0x8008, 2 - call_if_eq EventScript_17043A + call_if_eq Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMid compare VAR_0x8008, 3 - call_if_eq EventScript_170445 + call_if_eq Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidBottom compare VAR_0x8008, 4 - call_if_eq EventScript_170450 - msgbox gUnknown_819FD0C + call_if_eq Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterBottom + msgbox Route18_EastEntrance_1F_Text_NeedBicycleForCyclingRoad closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_170469 + applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkRight waitmovement 0 releaseall end -EventScript_17042F:: @ 817042F - applymovement OBJ_EVENT_ID_PLAYER, Movement_17045B +Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidTop:: @ 817042F + applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp waitmovement 0 return -EventScript_17043A:: @ 817043A - applymovement OBJ_EVENT_ID_PLAYER, Movement_17045D +Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMid:: @ 817043A + applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp2 waitmovement 0 return -EventScript_170445:: @ 8170445 - applymovement OBJ_EVENT_ID_PLAYER, Movement_170460 +Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidBottom:: @ 8170445 + applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp3 waitmovement 0 return -EventScript_170450:: @ 8170450 - applymovement OBJ_EVENT_ID_PLAYER, Movement_170464 +Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterBottom:: @ 8170450 + applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp4 waitmovement 0 return -Movement_17045B:: @ 817045B +Route18_EastEntrance_1F_Movement_WalkUp:: @ 817045B walk_up step_end -Movement_17045D:: @ 817045D +Route18_EastEntrance_1F_Movement_WalkUp2:: @ 817045D walk_up walk_up step_end -Movement_170460:: @ 8170460 +Route18_EastEntrance_1F_Movement_WalkUp3:: @ 8170460 walk_up walk_up walk_up step_end -Movement_170464:: @ 8170464 +Route18_EastEntrance_1F_Movement_WalkUp4:: @ 8170464 walk_up walk_up walk_up walk_up step_end -Movement_170469:: @ 8170469 +Route18_EastEntrance_1F_Movement_WalkRight:: @ 8170469 walk_right step_end diff --git a/data/maps/Route18_EastEntrance_1F/text.inc b/data/maps/Route18_EastEntrance_1F/text.inc index 5de293cba..9551d993f 100644 --- a/data/maps/Route18_EastEntrance_1F/text.inc +++ b/data/maps/Route18_EastEntrance_1F/text.inc @@ -1,11 +1,11 @@ -gUnknown_819FD0C:: @ 819FD0C +Route18_EastEntrance_1F_Text_NeedBicycleForCyclingRoad:: @ 819FD0C .string "You need a BICYCLE to go out on\n" .string "CYCLING ROAD!$" -gUnknown_819FD3A:: @ 819FD3A +Route18_EastEntrance_1F_Text_CyclingRoadAllUphillFromHere:: @ 819FD3A .string "CYCLING ROAD is all uphill from\n" .string "here.$" -gUnknown_819FD60:: @ 819FD60 +Route18_EastEntrance_1F_Text_ExcuseMe:: @ 819FD60 .string "Excuse me!$" diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json index b542ae540..c5c7b0853 100644 --- a/data/maps/Route18_EastEntrance_2F/map.json +++ b/data/maps/Route18_EastEntrance_2F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route18_EastEntrance_2F_EventScript_17047E", + "script": "Route18_EastEntrance_2F_EventScript_Haden", "flag": "0" } ], @@ -45,14 +45,14 @@ "x": 4, "y": 1, "elevation": 0, - "script": "Route18_EastEntrance_2F_EventScript_17046C" + "script": "Route18_EastEntrance_2F_EventScript_LeftBinoculars" }, { "type": "bg_event_type_0", "x": 8, "y": 1, "elevation": 0, - "script": "Route18_EastEntrance_2F_EventScript_170475" + "script": "Route18_EastEntrance_2F_EventScript_RightBinoculars" } ] } diff --git a/data/maps/Route18_EastEntrance_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc index ed29859ab..910f238e4 100644 --- a/data/maps/Route18_EastEntrance_2F/scripts.inc +++ b/data/maps/Route18_EastEntrance_2F/scripts.inc @@ -1,47 +1,47 @@ Route18_EastEntrance_2F_MapScripts:: @ 817046B .byte 0 -Route18_EastEntrance_2F_EventScript_17046C:: @ 817046C - msgbox gUnknown_819FD6B, MSGBOX_SIGN +Route18_EastEntrance_2F_EventScript_LeftBinoculars:: @ 817046C + msgbox Route18_EastEntrance_2F_Text_PalletTownInWest, MSGBOX_SIGN end -Route18_EastEntrance_2F_EventScript_170475:: @ 8170475 - msgbox gUnknown_819FDB3, MSGBOX_SIGN +Route18_EastEntrance_2F_EventScript_RightBinoculars:: @ 8170475 + msgbox Route18_EastEntrance_2F_Text_PeopleSwimming, MSGBOX_SIGN end -Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E +Route18_EastEntrance_2F_EventScript_Haden:: @ 817047E lock faceplayer setvar VAR_0x8008, INGAME_TRADE_LICKITUNG call EventScript_GetInGameTradeSpeciesInfo - goto_if_set FLAG_DID_MARC_TRADE, EventScript_1704F0 + goto_if_set FLAG_DID_MARC_TRADE, Route18_EastEntrance_2F_EventScript_AlreadyTraded msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1704D8 + goto_if_eq Route18_EastEntrance_2F_EventScript_DeclineTrade call EventScript_ChooseMonForInGameTrade compare VAR_0x8004, PARTY_SIZE - goto_if_ge EventScript_1704D8 + goto_if_ge Route18_EastEntrance_2F_EventScript_DeclineTrade call EventScript_GetInGameTradeSpecies compare VAR_RESULT, VAR_0x8009 - goto_if_ne EventScript_1704E2 + goto_if_ne Route18_EastEntrance_2F_EventScript_NotRequestedMon call EventScript_DoInGameTrade msgbox Trade_Text_HeyThanks setflag FLAG_DID_MARC_TRADE release end -EventScript_1704D8:: @ 81704D8 +Route18_EastEntrance_2F_EventScript_DeclineTrade:: @ 81704D8 msgbox Trade_Text_AwwOhWell release end -EventScript_1704E2:: @ 81704E2 +Route18_EastEntrance_2F_EventScript_NotRequestedMon:: @ 81704E2 getspeciesname 0, VAR_0x8009 msgbox Trade_Text_WhatThatsNoMon release end -EventScript_1704F0:: @ 81704F0 +Route18_EastEntrance_2F_EventScript_AlreadyTraded:: @ 81704F0 msgbox Trade_Text_IsntMyOldMonGreat release end diff --git a/data/maps/Route18_EastEntrance_2F/text.inc b/data/maps/Route18_EastEntrance_2F/text.inc index 8a479371c..aac533f71 100644 --- a/data/maps/Route18_EastEntrance_2F/text.inc +++ b/data/maps/Route18_EastEntrance_2F/text.inc @@ -1,9 +1,9 @@ -gUnknown_819FD6B:: @ 819FD6B +Route18_EastEntrance_2F_Text_PalletTownInWest:: @ 819FD6B .string "Let's see what the binoculars have\n" .string "to show…\p" .string "PALLET TOWN is in the west.$" -gUnknown_819FDB3:: @ 819FDB3 +Route18_EastEntrance_2F_Text_PeopleSwimming:: @ 819FDB3 .string "Let's see what the binoculars have\n" .string "to show…\p" .string "There are people swimming.$" diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json index b25ce0fec..d8f35ad21 100644 --- a/data/maps/Route19/map.json +++ b/data/maps/Route19/map.json @@ -36,7 +36,7 @@ "movement_range_y": 3, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route19_EventScript_1AB44F", + "script": "Route19_EventScript_Reece", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route19_EventScript_1AB411", + "script": "Route19_EventScript_Richard", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route19_EventScript_1AB547", + "script": "Route19_EventScript_Tony", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 3, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route19_EventScript_1AB48D", + "script": "Route19_EventScript_Matthew", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 2, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route19_EventScript_1AB4CB", + "script": "Route19_EventScript_Douglas", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "Route19_EventScript_1AB509", + "script": "Route19_EventScript_David", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route19_EventScript_1AB585", + "script": "Route19_EventScript_Axle", "flag": "0" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route19_EventScript_1AB601", + "script": "Route19_EventScript_Alice", "flag": "0" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route19_EventScript_1AB63F", + "script": "Route19_EventScript_Connie", "flag": "0" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route19_EventScript_1AB5C3", + "script": "Route19_EventScript_Anya", "flag": "0" }, { @@ -166,7 +166,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route19_EventScript_1AB67D", + "script": "Route19_EventScript_Lia", "flag": "0" }, { @@ -179,7 +179,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route19_EventScript_1AB6C3", + "script": "Route19_EventScript_Luc", "flag": "0" } ], @@ -191,7 +191,7 @@ "x": 13, "y": 12, "elevation": 0, - "script": "Route19_EventScript_168232" + "script": "Route19_EventScript_RouteSign" } ] } diff --git a/data/maps/Route19/scripts.inc b/data/maps/Route19/scripts.inc index 16d6e4669..10b361e83 100644 --- a/data/maps/Route19/scripts.inc +++ b/data/maps/Route19/scripts.inc @@ -1,6 +1,6 @@ Route19_MapScripts:: @ 8168231 .byte 0 -Route19_EventScript_168232:: @ 8168232 - msgbox gUnknown_8187C06, MSGBOX_SIGN +Route19_EventScript_RouteSign:: @ 8168232 + msgbox Route19_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route19/text.inc b/data/maps/Route19/text.inc index 7d399f364..a414146b4 100644 --- a/data/maps/Route19/text.inc +++ b/data/maps/Route19/text.inc @@ -1,154 +1,154 @@ -Text_1877A3:: @ 81877A3 +Route19_Text_RichardIntro:: @ 81877A3 .string "I have to exercise and warm up\n" .string "before going out for a swim.$" -Text_1877DF:: @ 81877DF +Route19_Text_RichardDefeat:: @ 81877DF .string "All warmed up!$" -Text_1877EE:: @ 81877EE +Route19_Text_RichardPostBattle:: @ 81877EE .string "Thanks, kid!\n" .string "I'm ready for a swim.$" -Text_187811:: @ 8187811 +Route19_Text_ReeceIntro:: @ 8187811 .string "Wait! Slow down!\n" .string "You'll have a heart attack!$" -Text_18783E:: @ 818783E +Route19_Text_ReeceDefeat:: @ 818783E .string "Ooh!\n" .string "That's chilly!$" -Text_187852:: @ 8187852 +Route19_Text_ReecePostBattle:: @ 8187852 .string "Watch out for TENTACOOL.\n" .string "They sting so painfully.$" -Text_187884:: @ 8187884 +Route19_Text_MatthewIntro:: @ 8187884 .string "I love swimming!\n" .string "What about you?$" -Text_1878A5:: @ 81878A5 +Route19_Text_MatthewDefeat:: @ 81878A5 .string "Belly flop!$" -Text_1878B1:: @ 81878B1 +Route19_Text_MatthewPostBattle:: @ 81878B1 .string "I can beat even marine POKéMON\n" .string "at swimming.$" -Text_1878DD:: @ 81878DD +Route19_Text_DouglasIntro:: @ 81878DD .string "What's beyond the horizon?$" -Text_1878F8:: @ 81878F8 +Route19_Text_DouglasDefeat:: @ 81878F8 .string "Glub!$" -Text_1878FE:: @ 81878FE +Route19_Text_DouglasPostBattle:: @ 81878FE .string "I see a couple of islands over\n" .string "yonder!$" -Text_187925:: @ 8187925 +Route19_Text_DavidIntro:: @ 8187925 .string "I tried diving for POKéMON, but it\n" .string "was a no-go.$" -Text_187955:: @ 8187955 +Route19_Text_DavidDefeat:: @ 8187955 .string "Help!$" -Text_18795B:: @ 818795B +Route19_Text_DavidPostBattle:: @ 818795B .string "I guess you have to fish for sea\n" .string "POKéMON.$" -Text_187985:: @ 8187985 +Route19_Text_TonyIntro:: @ 8187985 .string "I look at the sea to forget all\n" .string "the bad things that happened.$" -Text_1879C3:: @ 81879C3 +Route19_Text_TonyDefeat:: @ 81879C3 .string "Ooh!\n" .string "Traumatic!$" -Text_1879D3:: @ 81879D3 +Route19_Text_TonyPostBattle:: @ 81879D3 .string "I'm looking at the sea to forget\n" .string "the bad thing that happened!$" -Text_187A11:: @ 8187A11 +Route19_Text_AnyaIntro:: @ 8187A11 .string "Oh, I just love your ride!\n" .string "Can I have it if I win?$" -Text_187A44:: @ 8187A44 +Route19_Text_AnyaDefeat:: @ 8187A44 .string "Oh! I lost!$" -Text_187A50:: @ 8187A50 +Route19_Text_AnyaPostBattle:: @ 8187A50 .string "It's still a long way to go to\n" .string "SEAFOAM ISLANDS…\p" .string "I want to go back to FUCHSIA…$" -Text_187A9E:: @ 8187A9E +Route19_Text_AliceIntro:: @ 8187A9E .string "Swimming's great!\n" .string "Sunburns aren't!$" -Text_187AC1:: @ 8187AC1 +Route19_Text_AliceDefeat:: @ 8187AC1 .string "Shocker!$" -Text_187ACA:: @ 8187ACA +Route19_Text_AlicePostBattle:: @ 8187ACA .string "My boyfriend wanted to swim to\n" .string "SEAFOAM ISLANDS.$" -Text_187AFA:: @ 8187AFA +Route19_Text_AxleIntro:: @ 8187AFA .string "Ahoy, there!\n" .string "These waters are treacherous!$" -Text_187B25:: @ 8187B25 +Route19_Text_AxleDefeat:: @ 8187B25 .string "Ooh!\n" .string "Dangerous!$" -Text_187B35:: @ 8187B35 +Route19_Text_AxlePostBattle:: @ 8187B35 .string "M-my legs! They cramped up!\n" .string "Glub, glub…$" -Text_187B5D:: @ 8187B5D +Route19_Text_ConnieIntro:: @ 8187B5D .string "I swam here with my friends…\n" .string "I'm tired…$" -Text_187B85:: @ 8187B85 +Route19_Text_ConnieDefeat:: @ 8187B85 .string "I'm exhausted…$" -Text_187B94:: @ 8187B94 +Route19_Text_ConniePostBattle:: @ 8187B94 .string "If I were to ride a POKéMON on\n" .string "the sea, I'd like a LAPRAS.\p" .string "LAPRAS is so big, I bet it\n" .string "would keep me dry on water.$" -gUnknown_8187C06:: @ 8187C06 +Route19_Text_RouteSign:: @ 8187C06 .string "SEA ROUTE 19\n" .string "FUCHSIA CITY - SEAFOAM ISLANDS$" -Text_187C32:: @ 8187C32 +Route19_Text_LiaIntro:: @ 8187C32 .string "LIA: I'm looking after my brother.\n" .string "He just became a TRAINER.$" -Text_187C6F:: @ 8187C6F +Route19_Text_LiaDefeat:: @ 8187C6F .string "LIA: That's no way to treat my\n" .string "little brother!$" -Text_187C9E:: @ 8187C9E +Route19_Text_LiaPostBattle:: @ 8187C9E .string "LIA: Do you have a younger\n" .string "brother?\p" .string "I hope you're teaching him all\n" .string "sorts of things.$" -Text_187CF2:: @ 8187CF2 +Route19_Text_LiaNotEnoughMons:: @ 8187CF2 .string "LIA: I want to battle together\n" .string "with my little brother.\p" .string "Don't you have two POKéMON?$" -Text_187D45:: @ 8187D45 +Route19_Text_LucIntro:: @ 8187D45 .string "LUC: My big sis taught me how\n" .string "to swim and train POKéMON.$" -Text_187D7E:: @ 8187D7E +Route19_Text_LucDefeat:: @ 8187D7E .string "LUC: Oh, wow!\n" .string "Someone tougher than my big sis!$" -Text_187DAD:: @ 8187DAD +Route19_Text_LucPostBattle:: @ 8187DAD .string "LUC: My big sis is strong and nice.\n" .string "I think she's awesome!$" -Text_187DE8:: @ 8187DE8 +Route19_Text_LucNotEnoughMons:: @ 8187DE8 .string "LUC: I don't want to if I can't\n" .string "battle you with my big sis.\p" .string "Don't you have two POKéMON?$" diff --git a/data/scripts/trainers.inc b/data/scripts/trainers.inc index 3d5f60008..00ec94504 100644 --- a/data/scripts/trainers.inc +++ b/data/scripts/trainers.inc @@ -1285,589 +1285,589 @@ Route14_EventScript_JanRematch:: @ 81AABD8 msgbox Route14_Text_JanPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_1AABF3:: @ 81AABF3 - trainerbattle_single TRAINER_BIKER_ERNEST, Text_1868B6, Text_1868E8 +Route15_EventScript_Ernest:: @ 81AABF3 + trainerbattle_single TRAINER_BIKER_ERNEST, Route15_Text_ErnestIntro, Route15_Text_ErnestDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AAC1A - msgbox Text_1868F1, MSGBOX_AUTOCLOSE + goto_if_eq Route15_EventScript_ErnestRematch + msgbox Route15_Text_ErnestPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAC1A:: @ 81AAC1A - trainerbattle_rematch TRAINER_BIKER_ERNEST, Text_1C27E7, Text_1868E8 - msgbox Text_1868F1, MSGBOX_AUTOCLOSE +Route15_EventScript_ErnestRematch:: @ 81AAC1A + trainerbattle_rematch TRAINER_BIKER_ERNEST, Route15_Text_ErnestRematchIntro, Route15_Text_ErnestDefeat + msgbox Route15_Text_ErnestPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_1AAC31:: @ 81AAC31 - trainerbattle_single TRAINER_BIKER_ALEX, Text_186936, Text_186968 +Route15_EventScript_Alex:: @ 81AAC31 + trainerbattle_single TRAINER_BIKER_ALEX, Route15_Text_AlexIntro, Route15_Text_AlexDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AAC58 - msgbox Text_18697C, MSGBOX_AUTOCLOSE + goto_if_eq Route15_EventScript_AlexRematch + msgbox Route15_Text_AlexPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAC58:: @ 81AAC58 - trainerbattle_rematch TRAINER_BIKER_ALEX, Text_1C2814, Text_186968 - msgbox Text_18697C, MSGBOX_AUTOCLOSE +Route15_EventScript_AlexRematch:: @ 81AAC58 + trainerbattle_rematch TRAINER_BIKER_ALEX, Route15_Text_AlexRematchIntro, Route15_Text_AlexDefeat + msgbox Route15_Text_AlexPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_1AAC6F:: @ 81AAC6F - trainerbattle_single TRAINER_BEAUTY_GRACE, Text_18678B, Text_1867C1 +Route15_EventScript_Grace:: @ 81AAC6F + trainerbattle_single TRAINER_BEAUTY_GRACE, Route15_Text_GraceIntro, Route15_Text_GraceDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AAC96 - msgbox Text_1867DA, MSGBOX_AUTOCLOSE + goto_if_eq Route15_EventScript_GraceRematch + msgbox Route15_Text_GracePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAC96:: @ 81AAC96 - trainerbattle_rematch TRAINER_BEAUTY_GRACE, Text_1C2753, Text_1867C1 - msgbox Text_1867DA, MSGBOX_AUTOCLOSE +Route15_EventScript_GraceRematch:: @ 81AAC96 + trainerbattle_rematch TRAINER_BEAUTY_GRACE, Route15_Text_GraceRematchIntro, Route15_Text_GraceDefeat + msgbox Route15_Text_GracePostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_1AACAD:: @ 81AACAD - trainerbattle_single TRAINER_BEAUTY_OLIVIA, Text_18680C, Text_186841 +Route15_EventScript_Olivia:: @ 81AACAD + trainerbattle_single TRAINER_BEAUTY_OLIVIA, Route15_Text_OliviaIntro, Route15_Text_OliviaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AACD4 - msgbox Text_18686F, MSGBOX_AUTOCLOSE + goto_if_eq Route15_EventScript_OliviaRematch + msgbox Route15_Text_OliviaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AACD4:: @ 81AACD4 - trainerbattle_rematch TRAINER_BEAUTY_OLIVIA, Text_1C279D, Text_186841 - msgbox Text_18686F, MSGBOX_AUTOCLOSE +Route15_EventScript_OliviaRematch:: @ 81AACD4 + trainerbattle_rematch TRAINER_BEAUTY_OLIVIA, Route15_Text_OliviaRematchIntro, Route15_Text_OliviaDefeat + msgbox Route15_Text_OliviaPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_1AACEB:: @ 81AACEB - trainerbattle_single TRAINER_BIRD_KEEPER_EDWIN, Text_18664F, Text_18667A +Route15_EventScript_Edwin:: @ 81AACEB + trainerbattle_single TRAINER_BIRD_KEEPER_EDWIN, Route15_Text_EdwinIntro, Route15_Text_EdwinDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AAD12 - msgbox Text_18668D, MSGBOX_AUTOCLOSE + goto_if_eq Route15_EventScript_EdwinRematch + msgbox Route15_Text_EdwinPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAD12:: @ 81AAD12 - trainerbattle_rematch TRAINER_BIRD_KEEPER_EDWIN, Text_1C26D3, Text_18667A - msgbox Text_18668D, MSGBOX_AUTOCLOSE +Route15_EventScript_EdwinRematch:: @ 81AAD12 + trainerbattle_rematch TRAINER_BIRD_KEEPER_EDWIN, Route15_Text_EdwinRematchIntro, Route15_Text_EdwinDefeat + msgbox Route15_Text_EdwinPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_1AAD29:: @ 81AAD29 - trainerbattle_single TRAINER_BIRD_KEEPER_CHESTER, Text_1866D1, Text_186707 +Route15_EventScript_Chester:: @ 81AAD29 + trainerbattle_single TRAINER_BIRD_KEEPER_CHESTER, Route15_Text_ChesterIntro, Route15_Text_ChesterDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AAD50 - msgbox Text_18671A, MSGBOX_AUTOCLOSE + goto_if_eq Route15_EventScript_ChesterRematch + msgbox Route15_Text_ChesterPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAD50:: @ 81AAD50 - trainerbattle_rematch TRAINER_BIRD_KEEPER_CHESTER, Text_1C2717, Text_186707 - msgbox Text_18671A, MSGBOX_AUTOCLOSE +Route15_EventScript_ChesterRematch:: @ 81AAD50 + trainerbattle_rematch TRAINER_BIRD_KEEPER_CHESTER, Route15_Text_ChesterRematchIntro, Route15_Text_ChesterDefeat + msgbox Route15_Text_ChesterPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_1AAD67:: @ 81AAD67 - trainerbattle_single TRAINER_PICNICKER_YAZMIN, Text_186A22, Text_186A40 +Route15_EventScript_Yazmin:: @ 81AAD67 + trainerbattle_single TRAINER_PICNICKER_YAZMIN, Route15_Text_YazminIntro, Route15_Text_YazminDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AAD8E - msgbox Text_186A55, MSGBOX_AUTOCLOSE + goto_if_eq Route15_EventScript_YazminRematch + msgbox Route15_Text_YazminPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAD8E:: @ 81AAD8E - trainerbattle_rematch TRAINER_PICNICKER_YAZMIN, Text_1C287D, Text_186A40 - msgbox Text_186A55, MSGBOX_AUTOCLOSE +Route15_EventScript_YazminRematch:: @ 81AAD8E + trainerbattle_rematch TRAINER_PICNICKER_YAZMIN, Route15_Text_YazminRematchIntro, Route15_Text_YazminDefeat + msgbox Route15_Text_YazminPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_1AADA5:: @ 81AADA5 - trainerbattle_single TRAINER_PICNICKER_KINDRA, Text_18650B, Text_186549 +Route15_EventScript_Kindra:: @ 81AADA5 + trainerbattle_single TRAINER_PICNICKER_KINDRA, Route15_Text_KindraIntro, Route15_Text_KindraDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AADCC - msgbox Text_18655A, MSGBOX_AUTOCLOSE + goto_if_eq Route15_EventScript_KindraRematch + msgbox Route15_Text_KindraPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AADCC:: @ 81AADCC - trainerbattle_rematch TRAINER_PICNICKER_KINDRA, Text_1C2650, Text_186549 - msgbox Text_18655A, MSGBOX_AUTOCLOSE +Route15_EventScript_KindraRematch:: @ 81AADCC + trainerbattle_rematch TRAINER_PICNICKER_KINDRA, Route15_Text_KindraRematchIntro, Route15_Text_KindraDefeat + msgbox Route15_Text_KindraPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_1AADE3:: @ 81AADE3 - trainerbattle_single TRAINER_PICNICKER_BECKY, Text_1865D3, Text_186612 +Route15_EventScript_Becky:: @ 81AADE3 + trainerbattle_single TRAINER_PICNICKER_BECKY, Route15_Text_BeckyIntro, Route15_Text_BeckyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AAE0A - msgbox Text_18661D, MSGBOX_AUTOCLOSE + goto_if_eq Route15_EventScript_BeckyRematch + msgbox Route15_Text_BeckyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAE0A:: @ 81AAE0A - trainerbattle_rematch TRAINER_PICNICKER_BECKY, Text_1C268D, Text_186612 - msgbox Text_18661D, MSGBOX_AUTOCLOSE +Route15_EventScript_BeckyRematch:: @ 81AAE0A + trainerbattle_rematch TRAINER_PICNICKER_BECKY, Route15_Text_BeckyRematchIntro, Route15_Text_BeckyDefeat + msgbox Route15_Text_BeckyPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_1AAE21:: @ 81AAE21 - trainerbattle_single TRAINER_PICNICKER_CELIA, Text_1869BA, Text_1869E6 +Route15_EventScript_Celia:: @ 81AAE21 + trainerbattle_single TRAINER_PICNICKER_CELIA, Route15_Text_CeliaIntro, Route15_Text_CeliaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AAE48 - msgbox Text_1869F4, MSGBOX_AUTOCLOSE + goto_if_eq Route15_EventScript_CeliaRematch + msgbox Route15_Text_CeliaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAE48:: @ 81AAE48 - trainerbattle_rematch TRAINER_PICNICKER_CELIA, Text_1C2846, Text_1869E6 - msgbox Text_1869F4, MSGBOX_AUTOCLOSE +Route15_EventScript_CeliaRematch:: @ 81AAE48 + trainerbattle_rematch TRAINER_PICNICKER_CELIA, Route15_Text_CeliaRematchIntro, Route15_Text_CeliaDefeat + msgbox Route15_Text_CeliaPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_1AAE5F:: @ 81AAE5F - trainerbattle_double TRAINER_CRUSH_KIN_RON_MYA, Text_186A95, Text_186ACB, Text_186B46 +Route15_EventScript_Mya:: @ 81AAE5F + trainerbattle_double TRAINER_CRUSH_KIN_RON_MYA, Route15_Text_MyaIntro, Route15_Text_MyaDefeat, Route15_Text_MyaNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AAE8A - msgbox Text_186B0A, MSGBOX_AUTOCLOSE + goto_if_eq Route15_EventScript_MyaRematch + msgbox Route15_Text_MyaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAE8A:: @ 81AAE8A - trainerbattle_rematch_double TRAINER_CRUSH_KIN_RON_MYA, Text_1C28A1, Text_186ACB, Text_186B46 - msgbox Text_186B0A, MSGBOX_AUTOCLOSE +Route15_EventScript_MyaRematch:: @ 81AAE8A + trainerbattle_rematch_double TRAINER_CRUSH_KIN_RON_MYA, Route15_Text_MyaRematchIntro, Route15_Text_MyaDefeat, Route15_Text_MyaNotEnoughMons + msgbox Route15_Text_MyaPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_1AAEA5:: @ 81AAEA5 - trainerbattle_double TRAINER_CRUSH_KIN_RON_MYA, Text_186B89, Text_186BB1, Text_186BFE +Route15_EventScript_Ron:: @ 81AAEA5 + trainerbattle_double TRAINER_CRUSH_KIN_RON_MYA, Route15_Text_RonIntro, Route15_Text_RonDefeat, Route15_Text_RonNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AAED0 - msgbox Text_186BD2, MSGBOX_AUTOCLOSE + goto_if_eq Route15_EventScript_RonRematch + msgbox Route15_Text_RonPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAED0:: @ 81AAED0 - trainerbattle_rematch_double TRAINER_CRUSH_KIN_RON_MYA, Text_1C28EC, Text_186BB1, Text_186BFE - msgbox Text_186BD2, MSGBOX_AUTOCLOSE +Route15_EventScript_RonRematch:: @ 81AAED0 + trainerbattle_rematch_double TRAINER_CRUSH_KIN_RON_MYA, Route15_Text_RonRematchIntro, Route15_Text_RonDefeat, Route15_Text_RonNotEnoughMons + msgbox Route15_Text_RonPostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_1AAEEB:: @ 81AAEEB - trainerbattle_single TRAINER_BIKER_LAO, Text_186C4D, Text_186C5F +Route16_EventScript_Lao:: @ 81AAEEB + trainerbattle_single TRAINER_BIKER_LAO, Route16_Text_LaoIntro, Route16_Text_LaoDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AAF12 - msgbox Text_186C75, MSGBOX_AUTOCLOSE + goto_if_eq Route16_EventScript_LaoRematch + msgbox Route16_Text_LaoPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAF12:: @ 81AAF12 - trainerbattle_rematch TRAINER_BIKER_LAO, Text_1C2913, Text_186C5F - msgbox Text_186C75, MSGBOX_AUTOCLOSE +Route16_EventScript_LaoRematch:: @ 81AAF12 + trainerbattle_rematch TRAINER_BIKER_LAO, Route16_Text_LaoRematchIntro, Route16_Text_LaoDefeat + msgbox Route16_Text_LaoPostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_1AAF29:: @ 81AAF29 - trainerbattle_single TRAINER_BIKER_HIDEO, Text_186D39, Text_186D52 +Route16_EventScript_Hideo:: @ 81AAF29 + trainerbattle_single TRAINER_BIKER_HIDEO, Route16_Text_HideoIntro, Route16_Text_HideoDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AAF50 - msgbox Text_186D5A, MSGBOX_AUTOCLOSE + goto_if_eq Route16_EventScript_HideoRematch + msgbox Route16_Text_HideoPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAF50:: @ 81AAF50 - trainerbattle_rematch TRAINER_BIKER_HIDEO, Text_1C297B, Text_186D52 - msgbox Text_186D5A, MSGBOX_AUTOCLOSE +Route16_EventScript_HideoRematch:: @ 81AAF50 + trainerbattle_rematch TRAINER_BIKER_HIDEO, Route16_Text_HideoRematchIntro, Route16_Text_HideoDefeat + msgbox Route16_Text_HideoPostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_1AAF67:: @ 81AAF67 - trainerbattle_single TRAINER_BIKER_RUBEN, Text_186E86, Text_186EB4 +Route16_EventScript_Ruben:: @ 81AAF67 + trainerbattle_single TRAINER_BIKER_RUBEN, Route16_Text_RubenIntro, Route16_Text_RubenDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AAF8E - msgbox Text_186EC7, MSGBOX_AUTOCLOSE + goto_if_eq Route16_EventScript_RubenRematch + msgbox Route16_Text_RubenPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAF8E:: @ 81AAF8E - trainerbattle_rematch TRAINER_BIKER_RUBEN, Text_1C29EB, Text_186EB4 - msgbox Text_186EC7, MSGBOX_AUTOCLOSE +Route16_EventScript_RubenRematch:: @ 81AAF8E + trainerbattle_rematch TRAINER_BIKER_RUBEN, Route16_Text_RubenRematchIntro, Route16_Text_RubenDefeat + msgbox Route16_Text_RubenPostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_1AAFA5:: @ 81AAFA5 - trainerbattle_single TRAINER_CUE_BALL_KOJI, Text_186CA2, Text_186CBB +Route16_EventScript_Koji:: @ 81AAFA5 + trainerbattle_single TRAINER_CUE_BALL_KOJI, Route16_Text_KojiIntro, Route16_Text_KojiDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AAFCC - msgbox Text_186CC5, MSGBOX_AUTOCLOSE + goto_if_eq Route16_EventScript_KojiRematch + msgbox Route16_Text_KojiPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AAFCC:: @ 81AAFCC - trainerbattle_rematch TRAINER_CUE_BALL_KOJI, Text_1C2925, Text_186CBB - msgbox Text_186CC5, MSGBOX_AUTOCLOSE +Route16_EventScript_KojiRematch:: @ 81AAFCC + trainerbattle_rematch TRAINER_CUE_BALL_KOJI, Route16_Text_KojiRematchIntro, Route16_Text_KojiDefeat + msgbox Route16_Text_KojiPostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_1AAFE3:: @ 81AAFE3 - trainerbattle_single TRAINER_CUE_BALL_LUKE, Text_186CE5, Text_186D06 +Route16_EventScript_Luke:: @ 81AAFE3 + trainerbattle_single TRAINER_CUE_BALL_LUKE, Route16_Text_LukeIntro, Route16_Text_LukeDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB00A - msgbox Text_186D16, MSGBOX_AUTOCLOSE + goto_if_eq Route16_EventScript_LukeRematch + msgbox Route16_Text_LukePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB00A:: @ 81AB00A - trainerbattle_rematch TRAINER_CUE_BALL_LUKE, Text_1C2944, Text_186D06 - msgbox Text_186D16, MSGBOX_AUTOCLOSE +Route16_EventScript_LukeRematch:: @ 81AB00A + trainerbattle_rematch TRAINER_CUE_BALL_LUKE, Route16_Text_LukeRematchIntro, Route16_Text_LukeDefeat + msgbox Route16_Text_LukePostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_1AB021:: @ 81AB021 - trainerbattle_single TRAINER_CUE_BALL_CAMRON, Text_186DD9, Text_186E0D +Route16_EventScript_Camron:: @ 81AB021 + trainerbattle_single TRAINER_CUE_BALL_CAMRON, Route16_Text_CamronIntro, Route16_Text_CamronDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB048 - msgbox Text_186E1C, MSGBOX_AUTOCLOSE + goto_if_eq Route16_EventScript_CamronRematch + msgbox Route16_Text_CamronPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB048:: @ 81AB048 - trainerbattle_rematch TRAINER_CUE_BALL_CAMRON, Text_1C29B0, Text_186E0D - msgbox Text_186E1C, MSGBOX_AUTOCLOSE +Route16_EventScript_CamronRematch:: @ 81AB048 + trainerbattle_rematch TRAINER_CUE_BALL_CAMRON, Route16_Text_CamronRematchIntro, Route16_Text_CamronDefeat + msgbox Route16_Text_CamronPostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_1AB05F:: @ 81AB05F - trainerbattle_double TRAINER_YOUNG_COUPLE_LEA_JED, Text_186FBD, Text_186FFA, Text_187057 +Route16_EventScript_Jed:: @ 81AB05F + trainerbattle_double TRAINER_YOUNG_COUPLE_LEA_JED, Route16_Text_JedIntro, Route16_Text_JedDefeat, Route16_Text_JedNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB08A - msgbox Text_187027, MSGBOX_AUTOCLOSE + goto_if_eq Route16_EventScript_JedRematch + msgbox Route16_Text_JedPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB08A:: @ 81AB08A - trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_LEA_JED, Text_1C2A19, Text_186FFA, Text_187057 - msgbox Text_187027, MSGBOX_AUTOCLOSE +Route16_EventScript_JedRematch:: @ 81AB08A + trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_LEA_JED, Route16_Text_JedRematchIntro, Route16_Text_JedDefeat, Route16_Text_JedNotEnoughMons + msgbox Route16_Text_JedPostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_1AB0A5:: @ 81AB0A5 - trainerbattle_double TRAINER_YOUNG_COUPLE_LEA_JED, Text_187097, Text_1870CC, Text_187120 +Route16_EventScript_Lea:: @ 81AB0A5 + trainerbattle_double TRAINER_YOUNG_COUPLE_LEA_JED, Route16_Text_LeaIntro, Route16_Text_LeaDefeat, Route16_Text_LeaNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB0D0 - msgbox Text_1870F9, MSGBOX_AUTOCLOSE + goto_if_eq Route16_EventScript_LeaRematch + msgbox Route16_Text_LeaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB0D0:: @ 81AB0D0 - trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_LEA_JED, Text_1C2A53, Text_1870CC, Text_187120 - msgbox Text_1870F9, MSGBOX_AUTOCLOSE +Route16_EventScript_LeaRematch:: @ 81AB0D0 + trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_LEA_JED, Route16_Text_LeaRematchIntro, Route16_Text_LeaDefeat, Route16_Text_LeaNotEnoughMons + msgbox Route16_Text_LeaPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_1AB0EB:: @ 81AB0EB - trainerbattle_single TRAINER_BIKER_BILLY, Text_1872BD, Text_1872E3 +Route17_EventScript_Billy:: @ 81AB0EB + trainerbattle_single TRAINER_BIKER_BILLY, Route17_Text_BillyIntro, Route17_Text_BillyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB112 - msgbox Text_1872EB, MSGBOX_AUTOCLOSE + goto_if_eq Route17_EventScript_BillyRematch + msgbox Route17_Text_BillyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB112:: @ 81AB112 - trainerbattle_rematch TRAINER_BIKER_BILLY, Text_1C2B06, Text_1872E3 - msgbox Text_1872EB, MSGBOX_AUTOCLOSE +Route17_EventScript_BillyRematch:: @ 81AB112 + trainerbattle_rematch TRAINER_BIKER_BILLY, Route17_Text_BillyRematchIntro, Route17_Text_BillyDefeat + msgbox Route17_Text_BillyPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_1AB129:: @ 81AB129 - trainerbattle_single TRAINER_BIKER_NIKOLAS, Text_18730A, Text_187325 +Route17_EventScript_Nikolas:: @ 81AB129 + trainerbattle_single TRAINER_BIKER_NIKOLAS, Route17_Text_NikolasIntro, Route17_Text_NikolasDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB150 - msgbox Text_187333, MSGBOX_AUTOCLOSE + goto_if_eq Route17_EventScript_NikolasRematch + msgbox Route17_Text_NikolasPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB150:: @ 81AB150 - trainerbattle_rematch TRAINER_BIKER_NIKOLAS, Text_1C2B2C, Text_187325 - msgbox Text_187333, MSGBOX_AUTOCLOSE +Route17_EventScript_NikolasRematch:: @ 81AB150 + trainerbattle_rematch TRAINER_BIKER_NIKOLAS, Route17_Text_NikolasRematchIntro, Route17_Text_NikolasDefeat + msgbox Route17_Text_NikolasPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_1AB167:: @ 81AB167 - trainerbattle_single TRAINER_BIKER_JAXON, Text_187456, Text_187472 +Route17_EventScript_Jaxon:: @ 81AB167 + trainerbattle_single TRAINER_BIKER_JAXON, Route17_Text_JaxonIntro, Route17_Text_JaxonDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB18E - msgbox Text_187479, MSGBOX_AUTOCLOSE + goto_if_eq Route17_EventScript_JaxonRematch + msgbox Route17_Text_JaxonPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB18E:: @ 81AB18E - trainerbattle_rematch TRAINER_BIKER_JAXON, Text_1C2BE6, Text_187472 - msgbox Text_187479, MSGBOX_AUTOCLOSE +Route17_EventScript_JaxonRematch:: @ 81AB18E + trainerbattle_rematch TRAINER_BIKER_JAXON, Route17_Text_JaxonRematchIntro, Route17_Text_JaxonDefeat + msgbox Route17_Text_JaxonPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_1AB1A5:: @ 81AB1A5 - trainerbattle_single TRAINER_BIKER_WILLIAM, Text_18749B, Text_1874B6 +Route17_EventScript_William:: @ 81AB1A5 + trainerbattle_single TRAINER_BIKER_WILLIAM, Route17_Text_WilliamIntro, Route17_Text_WilliamDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB1CC - msgbox Text_1874C9, MSGBOX_AUTOCLOSE + goto_if_eq Route17_EventScript_WilliamRematch + msgbox Route17_Text_WilliamPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB1CC:: @ 81AB1CC - trainerbattle_rematch TRAINER_BIKER_WILLIAM, Text_1C2C10, Text_1874B6 - msgbox Text_1874C9, MSGBOX_AUTOCLOSE +Route17_EventScript_WilliamRematch:: @ 81AB1CC + trainerbattle_rematch TRAINER_BIKER_WILLIAM, Route17_Text_WilliamRematchIntro, Route17_Text_WilliamDefeat + msgbox Route17_Text_WilliamPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_1AB1E3:: @ 81AB1E3 - trainerbattle_single TRAINER_CUE_BALL_RAUL, Text_18717E, Text_1871AE +Route17_EventScript_Raul:: @ 81AB1E3 + trainerbattle_single TRAINER_CUE_BALL_RAUL, Route17_Text_RaulIntro, Route17_Text_RaulDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB20A - msgbox Text_1871BA, MSGBOX_AUTOCLOSE + goto_if_eq Route17_EventScript_RaulRematch + msgbox Route17_Text_RaulPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB20A:: @ 81AB20A - trainerbattle_rematch TRAINER_CUE_BALL_RAUL, Text_1C2A88, Text_1871AE - msgbox Text_1871BA, MSGBOX_AUTOCLOSE +Route17_EventScript_RaulRematch:: @ 81AB20A + trainerbattle_rematch TRAINER_CUE_BALL_RAUL, Route17_Text_RaulRematchIntro, Route17_Text_RaulDefeat + msgbox Route17_Text_RaulPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_1AB221:: @ 81AB221 - trainerbattle_single TRAINER_CUE_BALL_ISAIAH, Text_187228, Text_187254 +Route17_EventScript_Isaiah:: @ 81AB221 + trainerbattle_single TRAINER_CUE_BALL_ISAIAH, Route17_Text_IsaiahIntro, Route17_Text_IsaiahDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB248 - msgbox Text_18725A, MSGBOX_AUTOCLOSE + goto_if_eq Route17_EventScript_IsaiahRematch + msgbox Route17_Text_IsaiahPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB248:: @ 81AB248 - trainerbattle_rematch TRAINER_CUE_BALL_ISAIAH, Text_1C2AC4, Text_187254 - msgbox Text_18725A, MSGBOX_AUTOCLOSE +Route17_EventScript_IsaiahRematch:: @ 81AB248 + trainerbattle_rematch TRAINER_CUE_BALL_ISAIAH, Route17_Text_IsaiahRematchIntro, Route17_Text_IsaiahDefeat + msgbox Route17_Text_IsaiahPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_1AB25F:: @ 81AB25F - trainerbattle_single TRAINER_CUE_BALL_ZEEK, Text_187362, Text_187395 +Route17_EventScript_Zeek:: @ 81AB25F + trainerbattle_single TRAINER_CUE_BALL_ZEEK, Route17_Text_ZeekIntro, Route17_Text_ZeekDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB286 - msgbox Text_18739F, MSGBOX_AUTOCLOSE + goto_if_eq Route17_EventScript_ZeekRematch + msgbox Route17_Text_ZeekPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB286:: @ 81AB286 - trainerbattle_rematch TRAINER_CUE_BALL_ZEEK, Text_1C2B5E, Text_187395 - msgbox Text_18739F, MSGBOX_AUTOCLOSE +Route17_EventScript_ZeekRematch:: @ 81AB286 + trainerbattle_rematch TRAINER_CUE_BALL_ZEEK, Route17_Text_ZeekRematchIntro, Route17_Text_ZeekDefeat + msgbox Route17_Text_ZeekPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_1AB29D:: @ 81AB29D - trainerbattle_single TRAINER_CUE_BALL_JAMAL, Text_1873D1, Text_1873EB +Route17_EventScript_Jamal:: @ 81AB29D + trainerbattle_single TRAINER_CUE_BALL_JAMAL, Route17_Text_JamalIntro, Route17_Text_JamalDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB2C4 - msgbox Text_1873FF, MSGBOX_AUTOCLOSE + goto_if_eq Route17_EventScript_JamalRematch + msgbox Route17_Text_JamalPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB2C4:: @ 81AB2C4 - trainerbattle_rematch TRAINER_CUE_BALL_JAMAL, Text_1C2B9C, Text_1873EB - msgbox Text_1873FF, MSGBOX_AUTOCLOSE +Route17_EventScript_JamalRematch:: @ 81AB2C4 + trainerbattle_rematch TRAINER_CUE_BALL_JAMAL, Route17_Text_JamalRematchIntro, Route17_Text_JamalDefeat + msgbox Route17_Text_JamalPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_1AB2DB:: @ 81AB2DB - trainerbattle_single TRAINER_CUE_BALL_COREY, Text_18741D, Text_187429 +Route17_EventScript_Corey:: @ 81AB2DB + trainerbattle_single TRAINER_CUE_BALL_COREY, Route17_Text_CoreyIntro, Route17_Text_CoreyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB302 - msgbox Text_187432, MSGBOX_AUTOCLOSE + goto_if_eq Route17_EventScript_CoreyRematch + msgbox Route17_Text_CoreyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB302:: @ 81AB302 - trainerbattle_rematch TRAINER_CUE_BALL_COREY, Text_1C2BDA, Text_187429 - msgbox Text_187432, MSGBOX_AUTOCLOSE +Route17_EventScript_CoreyRematch:: @ 81AB302 + trainerbattle_rematch TRAINER_CUE_BALL_COREY, Route17_Text_CoreyRematchIntro, Route17_Text_CoreyDefeat + msgbox Route17_Text_CoreyPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_1AB319:: @ 81AB319 - trainerbattle_single TRAINER_BIKER_VIRGIL, Text_18727D, Text_187295 +Route17_EventScript_Virgil:: @ 81AB319 + trainerbattle_single TRAINER_BIKER_VIRGIL, Route17_Text_VirgilIntro, Route17_Text_VirgilDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB340 - msgbox Text_1872A5, MSGBOX_AUTOCLOSE + goto_if_eq Route17_EventScript_VirgilRematch + msgbox Route17_Text_VirgilPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB340:: @ 81AB340 - trainerbattle_rematch TRAINER_BIKER_VIRGIL, Text_1C2AF0, Text_187295 - msgbox Text_1872A5, MSGBOX_AUTOCLOSE +Route17_EventScript_VirgilRematch:: @ 81AB340 + trainerbattle_rematch TRAINER_BIKER_VIRGIL, Route17_Text_VirgilRematchIntro, Route17_Text_VirgilDefeat + msgbox Route17_Text_VirgilPostBattle, MSGBOX_AUTOCLOSE end -Route18_EventScript_1AB357:: @ 81AB357 - trainerbattle_single TRAINER_BIRD_KEEPER_WILTON, Text_187640, Text_187672 +Route18_EventScript_Wilton:: @ 81AB357 + trainerbattle_single TRAINER_BIRD_KEEPER_WILTON, Route18_Text_WiltonIntro, Route18_Text_WiltonDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB37E - msgbox Text_187677, MSGBOX_AUTOCLOSE + goto_if_eq Route18_EventScript_WiltonRematch + msgbox Route18_Text_WiltonPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB37E:: @ 81AB37E - trainerbattle_rematch TRAINER_BIRD_KEEPER_WILTON, Text_1C2C2B, Text_187672 - msgbox Text_187677, MSGBOX_AUTOCLOSE +Route18_EventScript_WiltonRematch:: @ 81AB37E + trainerbattle_rematch TRAINER_BIRD_KEEPER_WILTON, Route18_Text_WiltonRematchIntro, Route18_Text_WiltonDefeat + msgbox Route18_Text_WiltonPostBattle, MSGBOX_AUTOCLOSE end -Route18_EventScript_1AB395:: @ 81AB395 - trainerbattle_single TRAINER_BIRD_KEEPER_RAMIRO, Text_18768C, Text_1876B3 +Route18_EventScript_Ramiro:: @ 81AB395 + trainerbattle_single TRAINER_BIRD_KEEPER_RAMIRO, Route18_Text_RamiroIntro, Route18_Text_RamiroDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB3BC - msgbox Text_1876C5, MSGBOX_AUTOCLOSE + goto_if_eq Route18_EventScript_RamiroRematch + msgbox Route18_Text_RamiroPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB3BC:: @ 81AB3BC - trainerbattle_rematch TRAINER_BIRD_KEEPER_RAMIRO, Text_1C2C7B, Text_1876B3 - msgbox Text_1876C5, MSGBOX_AUTOCLOSE +Route18_EventScript_RamiroRematch:: @ 81AB3BC + trainerbattle_rematch TRAINER_BIRD_KEEPER_RAMIRO, Route18_Text_RamiroRematchIntro, Route18_Text_RamiroDefeat + msgbox Route18_Text_RamiroPostBattle, MSGBOX_AUTOCLOSE end -Route18_EventScript_1AB3D3:: @ 81AB3D3 - trainerbattle_single TRAINER_BIRD_KEEPER_JACOB, Text_187704, Text_187726 +Route18_EventScript_Jacob:: @ 81AB3D3 + trainerbattle_single TRAINER_BIRD_KEEPER_JACOB, Route18_Text_JacobIntro, Route18_Text_JacobDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB3FA - msgbox Text_18772C, MSGBOX_AUTOCLOSE + goto_if_eq Route18_EventScript_JacobRematch + msgbox Route18_Text_JacobPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB3FA:: @ 81AB3FA - trainerbattle_rematch TRAINER_BIRD_KEEPER_JACOB, Text_1C2CA8, Text_187726 - msgbox Text_18772C, MSGBOX_AUTOCLOSE +Route18_EventScript_JacobRematch:: @ 81AB3FA + trainerbattle_rematch TRAINER_BIRD_KEEPER_JACOB, Route18_Text_JacobRematchIntro, Route18_Text_JacobDefeat + msgbox Route18_Text_JacobPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_1AB411:: @ 81AB411 - trainerbattle_single TRAINER_SWIMMER_MALE_RICHARD, Text_1877A3, Text_1877DF +Route19_EventScript_Richard:: @ 81AB411 + trainerbattle_single TRAINER_SWIMMER_MALE_RICHARD, Route19_Text_RichardIntro, Route19_Text_RichardDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB438 - msgbox Text_1877EE, MSGBOX_AUTOCLOSE + goto_if_eq Route19_EventScript_RichardRematch + msgbox Route19_Text_RichardPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB438:: @ 81AB438 - trainerbattle_rematch TRAINER_SWIMMER_MALE_RICHARD, Text_1C2CEE, Text_1877DF - msgbox Text_1877EE, MSGBOX_AUTOCLOSE +Route19_EventScript_RichardRematch:: @ 81AB438 + trainerbattle_rematch TRAINER_SWIMMER_MALE_RICHARD, Route19_Text_RichardRematchIntro, Route19_Text_RichardDefeat + msgbox Route19_Text_RichardPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_1AB44F:: @ 81AB44F - trainerbattle_single TRAINER_SWIMMER_MALE_REECE, Text_187811, Text_18783E +Route19_EventScript_Reece:: @ 81AB44F + trainerbattle_single TRAINER_SWIMMER_MALE_REECE, Route19_Text_ReeceIntro, Route19_Text_ReeceDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB476 - msgbox Text_187852, MSGBOX_AUTOCLOSE + goto_if_eq Route19_EventScript_ReeceRematch + msgbox Route19_Text_ReecePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB476:: @ 81AB476 - trainerbattle_rematch TRAINER_SWIMMER_MALE_REECE, Text_1C2D19, Text_18783E - msgbox Text_187852, MSGBOX_AUTOCLOSE +Route19_EventScript_ReeceRematch:: @ 81AB476 + trainerbattle_rematch TRAINER_SWIMMER_MALE_REECE, Route19_Text_ReeceRematchIntro, Route19_Text_ReeceDefeat + msgbox Route19_Text_ReecePostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_1AB48D:: @ 81AB48D - trainerbattle_single TRAINER_SWIMMER_MALE_MATTHEW, Text_187884, Text_1878A5 +Route19_EventScript_Matthew:: @ 81AB48D + trainerbattle_single TRAINER_SWIMMER_MALE_MATTHEW, Route19_Text_MatthewIntro, Route19_Text_MatthewDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB4B4 - msgbox Text_1878B1, MSGBOX_AUTOCLOSE + goto_if_eq Route19_EventScript_MatthewRematch + msgbox Route19_Text_MatthewPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB4B4:: @ 81AB4B4 - trainerbattle_rematch TRAINER_SWIMMER_MALE_MATTHEW, Text_1C2D4B, Text_1878A5 - msgbox Text_1878B1, MSGBOX_AUTOCLOSE +Route19_EventScript_MatthewRematch:: @ 81AB4B4 + trainerbattle_rematch TRAINER_SWIMMER_MALE_MATTHEW, Route19_Text_MatthewRematchIntro, Route19_Text_MatthewDefeat + msgbox Route19_Text_MatthewPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_1AB4CB:: @ 81AB4CB - trainerbattle_single TRAINER_SWIMMER_MALE_DOUGLAS, Text_1878DD, Text_1878F8 +Route19_EventScript_Douglas:: @ 81AB4CB + trainerbattle_single TRAINER_SWIMMER_MALE_DOUGLAS, Route19_Text_DouglasIntro, Route19_Text_DouglasDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB4F2 - msgbox Text_1878FE, MSGBOX_AUTOCLOSE + goto_if_eq Route19_EventScript_DouglasRematch + msgbox Route19_Text_DouglasPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB4F2:: @ 81AB4F2 - trainerbattle_rematch TRAINER_SWIMMER_MALE_DOUGLAS, Text_1C2D7D, Text_1878F8 - msgbox Text_1878FE, MSGBOX_AUTOCLOSE +Route19_EventScript_DouglasRematch:: @ 81AB4F2 + trainerbattle_rematch TRAINER_SWIMMER_MALE_DOUGLAS, Route19_Text_DouglasRematchIntro, Route19_Text_DouglasDefeat + msgbox Route19_Text_DouglasPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_1AB509:: @ 81AB509 - trainerbattle_single TRAINER_SWIMMER_MALE_DAVID, Text_187925, Text_187955 +Route19_EventScript_David:: @ 81AB509 + trainerbattle_single TRAINER_SWIMMER_MALE_DAVID, Route19_Text_DavidIntro, Route19_Text_DavidDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB530 - msgbox Text_18795B, MSGBOX_AUTOCLOSE + goto_if_eq Route19_EventScript_DavidRematch + msgbox Route19_Text_DavidPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB530:: @ 81AB530 - trainerbattle_rematch TRAINER_SWIMMER_MALE_DAVID, Text_1C2DA7, Text_187955 - msgbox Text_18795B, MSGBOX_AUTOCLOSE +Route19_EventScript_DavidRematch:: @ 81AB530 + trainerbattle_rematch TRAINER_SWIMMER_MALE_DAVID, Route19_Text_DavidRematchIntro, Route19_Text_DavidDefeat + msgbox Route19_Text_DavidPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_1AB547:: @ 81AB547 - trainerbattle_single TRAINER_SWIMMER_MALE_TONY, Text_187985, Text_1879C3 +Route19_EventScript_Tony:: @ 81AB547 + trainerbattle_single TRAINER_SWIMMER_MALE_TONY, Route19_Text_TonyIntro, Route19_Text_TonyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB56E - msgbox Text_1879D3, MSGBOX_AUTOCLOSE + goto_if_eq Route19_EventScript_TonyRematch + msgbox Route19_Text_TonyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB56E:: @ 81AB56E - trainerbattle_rematch TRAINER_SWIMMER_MALE_TONY, Text_1C2DE9, Text_1879C3 - msgbox Text_1879D3, MSGBOX_AUTOCLOSE +Route19_EventScript_TonyRematch:: @ 81AB56E + trainerbattle_rematch TRAINER_SWIMMER_MALE_TONY, Route19_Text_TonyRematchIntro, Route19_Text_TonyDefeat + msgbox Route19_Text_TonyPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_1AB585:: @ 81AB585 - trainerbattle_single TRAINER_SWIMMER_MALE_AXLE, Text_187AFA, Text_187B25 +Route19_EventScript_Axle:: @ 81AB585 + trainerbattle_single TRAINER_SWIMMER_MALE_AXLE, Route19_Text_AxleIntro, Route19_Text_AxleDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB5AC - msgbox Text_187B35, MSGBOX_AUTOCLOSE + goto_if_eq Route19_EventScript_AxleRematch + msgbox Route19_Text_AxlePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB5AC:: @ 81AB5AC - trainerbattle_rematch TRAINER_SWIMMER_MALE_AXLE, Text_1C2EC0, Text_187B25 - msgbox Text_187B35, MSGBOX_AUTOCLOSE +Route19_EventScript_AxleRematch:: @ 81AB5AC + trainerbattle_rematch TRAINER_SWIMMER_MALE_AXLE, Route19_Text_AxleRematchIntro, Route19_Text_AxleDefeat + msgbox Route19_Text_AxlePostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_1AB5C3:: @ 81AB5C3 - trainerbattle_single TRAINER_SWIMMER_FEMALE_ANYA, Text_187A11, Text_187A44 +Route19_EventScript_Anya:: @ 81AB5C3 + trainerbattle_single TRAINER_SWIMMER_FEMALE_ANYA, Route19_Text_AnyaIntro, Route19_Text_AnyaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB5EA - msgbox Text_187A50, MSGBOX_AUTOCLOSE + goto_if_eq Route19_EventScript_AnyaRematch + msgbox Route19_Text_AnyaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB5EA:: @ 81AB5EA - trainerbattle_rematch TRAINER_SWIMMER_FEMALE_ANYA, Text_1C2E4A, Text_187A44 - msgbox Text_187A50, MSGBOX_AUTOCLOSE +Route19_EventScript_AnyaRematch:: @ 81AB5EA + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_ANYA, Route19_Text_AnyaRematchIntro, Route19_Text_AnyaDefeat + msgbox Route19_Text_AnyaPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_1AB601:: @ 81AB601 - trainerbattle_single TRAINER_SWIMMER_FEMALE_ALICE, Text_187A9E, Text_187AC1 +Route19_EventScript_Alice:: @ 81AB601 + trainerbattle_single TRAINER_SWIMMER_FEMALE_ALICE, Route19_Text_AliceIntro, Route19_Text_AliceDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB628 - msgbox Text_187ACA, MSGBOX_AUTOCLOSE + goto_if_eq Route19_EventScript_AliceRematch + msgbox Route19_Text_AlicePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB628:: @ 81AB628 - trainerbattle_rematch TRAINER_SWIMMER_FEMALE_ALICE, Text_1C2E9D, Text_187AC1 - msgbox Text_187ACA, MSGBOX_AUTOCLOSE +Route19_EventScript_AliceRematch:: @ 81AB628 + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_ALICE, Route19_Text_AliceRematchIntro, Route19_Text_AliceDefeat + msgbox Route19_Text_AlicePostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_1AB63F:: @ 81AB63F - trainerbattle_single TRAINER_SWIMMER_FEMALE_CONNIE, Text_187B5D, Text_187B85 +Route19_EventScript_Connie:: @ 81AB63F + trainerbattle_single TRAINER_SWIMMER_FEMALE_CONNIE, Route19_Text_ConnieIntro, Route19_Text_ConnieDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB666 - msgbox Text_187B94, MSGBOX_AUTOCLOSE + goto_if_eq Route19_EventScript_ConnieRematch + msgbox Route19_Text_ConniePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB666:: @ 81AB666 - trainerbattle_rematch TRAINER_SWIMMER_FEMALE_CONNIE, Text_1C2EFC, Text_187B85 - msgbox Text_187B94, MSGBOX_AUTOCLOSE +Route19_EventScript_ConnieRematch:: @ 81AB666 + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_CONNIE, Route19_Text_ConnieRematchIntro, Route19_Text_ConnieDefeat + msgbox Route19_Text_ConniePostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_1AB67D:: @ 81AB67D - trainerbattle_double TRAINER_SIS_AND_BRO_LIA_LUC, Text_187C32, Text_187C6F, Text_187CF2 +Route19_EventScript_Lia:: @ 81AB67D + trainerbattle_double TRAINER_SIS_AND_BRO_LIA_LUC, Route19_Text_LiaIntro, Route19_Text_LiaDefeat, Route19_Text_LiaNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB6A8 - msgbox Text_187C9E, MSGBOX_AUTOCLOSE + goto_if_eq Route19_EventScript_LiaRematch + msgbox Route19_Text_LiaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB6A8:: @ 81AB6A8 - trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIA_LUC, Text_1C2F41, Text_187C6F, Text_187CF2 - msgbox Text_187C9E, MSGBOX_AUTOCLOSE +Route19_EventScript_LiaRematch:: @ 81AB6A8 + trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIA_LUC, Route19_Text_LiaRematchIntro, Route19_Text_LiaDefeat, Route19_Text_LiaNotEnoughMons + msgbox Route19_Text_LiaPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_1AB6C3:: @ 81AB6C3 - trainerbattle_double TRAINER_SIS_AND_BRO_LIA_LUC, Text_187D45, Text_187D7E, Text_187DE8 +Route19_EventScript_Luc:: @ 81AB6C3 + trainerbattle_double TRAINER_SIS_AND_BRO_LIA_LUC, Route19_Text_LucIntro, Route19_Text_LucDefeat, Route19_Text_LucNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB6EE - msgbox Text_187DAD, MSGBOX_AUTOCLOSE + goto_if_eq Route19_EventScript_LucRematch + msgbox Route19_Text_LucPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB6EE:: @ 81AB6EE - trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIA_LUC, Text_1C2FAE, Text_187D7E, Text_187DE8 - msgbox Text_187DAD, MSGBOX_AUTOCLOSE +Route19_EventScript_LucRematch:: @ 81AB6EE + trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIA_LUC, Route19_Text_LucRematchIntro, Route19_Text_LucDefeat, Route19_Text_LucNotEnoughMons + msgbox Route19_Text_LucPostBattle, MSGBOX_AUTOCLOSE end Route20_EventScript_1AB709:: @ 81AB709 diff --git a/data/text/trainers.inc b/data/text/trainers.inc index 1d3d373af..2a5faa8c1 100644 --- a/data/text/trainers.inc +++ b/data/text/trainers.inc @@ -367,194 +367,194 @@ Route14_Text_JanRematchIntro:: @ 81C261B .string "JAN: KIRI, here we go!\n" .string "Let's win for sure this time!$" -Text_1C2650:: @ 81C2650 +Route15_Text_KindraRematchIntro:: @ 81C2650 .string "I'm going to keep battling with the\n" .string "POKéMON I got in trades.$" -Text_1C268D:: @ 81C268D +Route15_Text_BeckyRematchIntro:: @ 81C268D .string "You look gentle, so I think I can\n" .string "beat you.\p" .string "I'll give it one more go!$" -Text_1C26D3:: @ 81C26D3 +Route15_Text_EdwinRematchIntro:: @ 81C26D3 .string "When I whistle, bird POKéMON\n" .string "gather around.\p" .string "They're amazingly cute!$" -Text_1C2717:: @ 81C2717 +Route15_Text_ChesterRematchIntro:: @ 81C2717 .string "Hmm? My birds are shivering!\n" .string "Wait, aren't you that TRAINER…$" -Text_1C2753:: @ 81C2753 +Route15_Text_GraceRematchIntro:: @ 81C2753 .string "Oh, you're a little cutie!\n" .string "So like a darling POKéMON!\l" .string "I remember you now!$" -Text_1C279D:: @ 81C279D +Route15_Text_OliviaRematchIntro:: @ 81C279D .string "I raise POKéMON for protection\n" .string "because I live alone.\p" .string "That hasn't changed.$" -Text_1C27E7:: @ 81C27E7 +Route15_Text_ErnestRematchIntro:: @ 81C27E7 .string "Hey, kid! C'mon!\n" .string "I got these off some loser!$" -Text_1C2814:: @ 81C2814 +Route15_Text_AlexRematchIntro:: @ 81C2814 .string "Fork over all your cash when you\n" .string "lose to me, kid!$" -Text_1C2846:: @ 81C2846 +Route15_Text_CeliaRematchIntro:: @ 81C2846 .string "What's cool and happening?\n" .string "Trading POKéMON, of course.$" -Text_1C287D:: @ 81C287D +Route15_Text_YazminRematchIntro:: @ 81C287D .string "Want to play with my POKéMON\n" .string "again?$" -Text_1C28A1:: @ 81C28A1 +Route15_Text_MyaRematchIntro:: @ 81C28A1 .string "MYA: Hi, we keep meeting,\n" .string "don't we?\p" .string "Help me train my little brother\n" .string "again?$" -Text_1C28EC:: @ 81C28EC +Route15_Text_RonRematchIntro:: @ 81C28EC .string "RON: My sister's gotten more\n" .string "powerful…$" -Text_1C2913:: @ 81C2913 +Route16_Text_LaoRematchIntro:: @ 81C2913 .string "What do you want?$" -Text_1C2925:: @ 81C2925 +Route16_Text_KojiRematchIntro:: @ 81C2925 .string "Nice BIKE!\n" .string "Hand it over quick!$" -Text_1C2944:: @ 81C2944 +Route16_Text_LukeRematchIntro:: @ 81C2944 .string "Come out and play, little mouse.\n" .string "I'll treat you right!$" -Text_1C297B:: @ 81C297B +Route16_Text_HideoRematchIntro:: @ 81C297B .string "Hey, wait a second!\n" .string "Don't call me and then run away!$" -Text_1C29B0:: @ 81C29B0 +Route16_Text_CamronRematchIntro:: @ 81C29B0 .string "I'm feeling hungry and mean!\n" .string "I really need a punching bag!$" -Text_1C29EB:: @ 81C29EB +Route16_Text_RubenRematchIntro:: @ 81C29EB .string "Hey, there!\n" .string "We'll have ourselves a good time!$" -Text_1C2A19:: @ 81C2A19 +Route16_Text_JedRematchIntro:: @ 81C2A19 .string "JED: Are you here to see our\n" .string "love, which knows no bounds?$" -Text_1C2A53:: @ 81C2A53 +Route16_Text_LeaRematchIntro:: @ 81C2A53 .string "LEA: Sometimes, the intensity of\n" .string "our love scares me.$" -Text_1C2A88:: @ 81C2A88 +Route17_Text_RaulRematchIntro:: @ 81C2A88 .string "I told you, there's no getting rich\n" .string "quick in battling kids.$" -Text_1C2AC4:: @ 81C2AC4 +Route17_Text_IsaiahRematchIntro:: @ 81C2AC4 .string "I'm mighty proud of my bod, kiddo.\n" .string "Come on!$" -Text_1C2AF0:: @ 81C2AF0 +Route17_Text_VirgilRematchIntro:: @ 81C2AF0 .string "You out for a stroll?$" -Text_1C2B06:: @ 81C2B06 +Route17_Text_BillyRematchIntro:: @ 81C2B06 .string "We're BIKERS!\n" .string "We rule the roads, man!$" -Text_1C2B2C:: @ 81C2B2C +Route17_Text_NikolasRematchIntro:: @ 81C2B2C .string "VOLTORB's going to seriously\n" .string "electrify you today!$" -Text_1C2B5E:: @ 81C2B5E +Route17_Text_ZeekRematchIntro:: @ 81C2B5E .string "I leveled up my POKéMON, but it\n" .string "absolutely won't evolve. Why?$" -Text_1C2B9C:: @ 81C2B9C +Route17_Text_JamalRematchIntro:: @ 81C2B9C .string "Gaah! I really need to exercise\n" .string "and seriously trim some flab!$" -Text_1C2BDA:: @ 81C2BDA +Route17_Text_CoreyRematchIntro:: @ 81C2BDA .string "Be a rebel!$" -Text_1C2BE6:: @ 81C2BE6 +Route17_Text_JaxonRematchIntro:: @ 81C2BE6 .string "Yep, that's a nice BIKE!\n" .string "How's it handle?$" -Text_1C2C10:: @ 81C2C10 +Route17_Text_WilliamRematchIntro:: @ 81C2C10 .string "Get lost, kid!\n" .string "I'm bushed!$" -Text_1C2C2B:: @ 81C2C2B +Route18_Text_WiltonRematchIntro:: @ 81C2C2B .string "I've been checking every grassy\n" .string "area for new POKéMON.\p" .string "But it's not always easy…$" -Text_1C2C7B:: @ 81C2C7B +Route18_Text_RamiroRematchIntro:: @ 81C2C7B .string "Koorukukukoo!\n" .string "Is my birdcall getting better?$" -Text_1C2CA8:: @ 81C2CA8 +Route18_Text_JacobRematchIntro:: @ 81C2CA8 .string "I warned you before, this is my\n" .string "turf!\p" .string "I don't want you coming around.$" -Text_1C2CEE:: @ 81C2CEE +Route19_Text_RichardRematchIntro:: @ 81C2CEE .string "I'm almost warmed up to go\n" .string "out for a swim.$" -Text_1C2D19:: @ 81C2D19 +Route19_Text_ReeceRematchIntro:: @ 81C2D19 .string "Wait! Slow down!\n" .string "What if you have a heart attack?$" -Text_1C2D4B:: @ 81C2D4B +Route19_Text_MatthewRematchIntro:: @ 81C2D4B .string "I love swimming!\n" .string "I guess you're the surfing type.$" -Text_1C2D7D:: @ 81C2D7D +Route19_Text_DouglasRematchIntro:: @ 81C2D7D .string "What's beyond the horizon?\n" .string "Have you seen?$" -Text_1C2DA7:: @ 81C2DA7 +Route19_Text_DavidRematchIntro:: @ 81C2DA7 .string "I tried diving for POKéMON again,\n" .string "but it was a no-go like before.$" -Text_1C2DE9:: @ 81C2DE9 +Route19_Text_TonyRematchIntro:: @ 81C2DE9 .string "I look at the sea to forget all\n" .string "the bad things that happened.\p" .string "…Like losing to you the last time!$" -Text_1C2E4A:: @ 81C2E4A +Route19_Text_AnyaRematchIntro:: @ 81C2E4A .string "You always get to ride your\n" .string "POKéMON…\p" .string "It looks so relaxing.\n" .string "Can I have it if I win?$" -Text_1C2E9D:: @ 81C2E9D +Route19_Text_AliceRematchIntro:: @ 81C2E9D .string "Swimming's great!\n" .string "Sunburns aren't!$" -Text_1C2EC0:: @ 81C2EC0 +Route19_Text_AxleRematchIntro:: @ 81C2EC0 .string "These waters are treacherous!\n" .string "You shouldn't come back here!$" -Text_1C2EFC:: @ 81C2EFC +Route19_Text_ConnieRematchIntro:: @ 81C2EFC .string "I swam here with my friends…\n" .string "I'm tired…\l" .string "Must we really battle again?$" -Text_1C2F41:: @ 81C2F41 +Route19_Text_LiaRematchIntro:: @ 81C2F41 .string "LIA: You know my brother just\n" .string "became a TRAINER, right?\p" .string "I want to make him better, so I\n" .string "need your help again.$" -Text_1C2FAE:: @ 81C2FAE +Route19_Text_LucRematchIntro:: @ 81C2FAE .string "LUC: My big sis taught me all\n" .string "about POKéMON.\p" .string "I wonder if I'm better?$" -- cgit v1.2.3 From 52da723afb01a8d175604ea317c054cf44f44a70 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 25 Feb 2020 01:19:17 -0500 Subject: Document Routes 20-21, 24-25 scripts --- data/maps/Route20/map.json | 26 +- data/maps/Route20/scripts.inc | 12 +- data/maps/Route20/text.inc | 64 ++-- data/maps/Route21_North/map.json | 10 +- data/maps/Route21_North/text.inc | 31 +- data/maps/Route21_South/map.json | 10 +- data/maps/Route21_South/text.inc | 46 +-- data/maps/Route24/map.json | 18 +- data/maps/Route24/scripts.inc | 54 ++-- data/maps/Route24/text.inc | 77 ++++- data/maps/Route25/map.json | 24 +- data/maps/Route25/scripts.inc | 8 +- data/maps/Route25/text.inc | 126 ++------ data/maps/Route25_SeaCottage/map.json | 6 +- data/maps/Route25_SeaCottage/scripts.inc | 217 +++++++------- data/maps/Route25_SeaCottage/text.inc | 30 +- data/scripts/fame_checker.inc | 8 +- data/scripts/trainers.inc | 490 +++++++++++++++---------------- data/text/trainers.inc | 70 ++--- 19 files changed, 670 insertions(+), 657 deletions(-) (limited to 'data') diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json index 7a4de5f4f..04f110847 100644 --- a/data/maps/Route20/map.json +++ b/data/maps/Route20/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route20_EventScript_1AB83F", + "script": "Route20_EventScript_Melissa", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route20_EventScript_1AB8F9", + "script": "Route20_EventScript_Missy", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route20_EventScript_1AB801", + "script": "Route20_EventScript_Nora", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route20_EventScript_1AB8BB", + "script": "Route20_EventScript_Roger", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 4, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route20_EventScript_1AB747", + "script": "Route20_EventScript_Dean", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route20_EventScript_1AB937", + "script": "Route20_EventScript_Irene", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 3, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route20_EventScript_1AB709", + "script": "Route20_EventScript_Barry", "flag": "0" }, { @@ -127,7 +127,7 @@ "movement_range_y": 3, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route20_EventScript_1AB785", + "script": "Route20_EventScript_Darrin", "flag": "0" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route20_EventScript_1AB87D", + "script": "Route20_EventScript_Shirley", "flag": "0" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route20_EventScript_1AB7C3", + "script": "Route20_EventScript_Tiffany", "flag": "0" }, { @@ -166,7 +166,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route20_EventScript_1ACE36", + "script": "Route20_EventScript_Camper", "flag": "0" } ], @@ -193,14 +193,14 @@ "x": 68, "y": 14, "elevation": 0, - "script": "Route20_EventScript_168280" + "script": "Route20_EventScript_SeafoamIslandsSign" }, { "type": "bg_event_type_0", "x": 64, "y": 8, "elevation": 0, - "script": "Route20_EventScript_168280" + "script": "Route20_EventScript_SeafoamIslandsSign" }, { "type": "hidden_item", diff --git a/data/maps/Route20/scripts.inc b/data/maps/Route20/scripts.inc index a034c3610..7ef352f82 100644 --- a/data/maps/Route20/scripts.inc +++ b/data/maps/Route20/scripts.inc @@ -3,11 +3,11 @@ Route20_MapScripts:: @ 816823B .byte 0 Route20_OnTransition:: @ 8168241 - call_if_unset FLAG_STOPPED_SEAFOAM_B3F_CURRENT, EventScript_168254 - call_if_unset FLAG_STOPPED_SEAFOAM_B4F_CURRENT, EventScript_16826D + call_if_unset FLAG_STOPPED_SEAFOAM_B3F_CURRENT, Route20_EventScript_ResetSeafoamBouldersForB3F + call_if_unset FLAG_STOPPED_SEAFOAM_B4F_CURRENT, Route20_EventScript_ResetSeafoamBouldersForB4F end -EventScript_168254:: @ 8168254 +Route20_EventScript_ResetSeafoamBouldersForB3F:: @ 8168254 clearflag FLAG_HIDE_SEAFOAM_1F_BOULDER_1 clearflag FLAG_HIDE_SEAFOAM_1F_BOULDER_2 setflag FLAG_HIDE_SEAFOAM_B1F_BOULDER_1 @@ -18,7 +18,7 @@ EventScript_168254:: @ 8168254 setflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 return -EventScript_16826D:: @ 816826D +Route20_EventScript_ResetSeafoamBouldersForB4F:: @ 816826D clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_3 clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_4 clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_5 @@ -27,6 +27,6 @@ EventScript_16826D:: @ 816826D setflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 return -Route20_EventScript_168280:: @ 8168280 - msgbox gUnknown_81882D1, MSGBOX_SIGN +Route20_EventScript_SeafoamIslandsSign:: @ 8168280 + msgbox Route20_Text_SeafoamIslands, MSGBOX_SIGN end diff --git a/data/maps/Route20/text.inc b/data/maps/Route20/text.inc index 3abceaeba..5ca372ef6 100644 --- a/data/maps/Route20/text.inc +++ b/data/maps/Route20/text.inc @@ -1,119 +1,119 @@ -Text_187E40:: @ 8187E40 +Route20_Text_BarryIntro:: @ 8187E40 .string "The water is shallow here.\n" .string "There are many people swimming.$" -Text_187E7B:: @ 8187E7B +Route20_Text_BarryDefeat:: @ 8187E7B .string "Splash!$" -Text_187E83:: @ 8187E83 +Route20_Text_BarryPostBattle:: @ 8187E83 .string "I wish I could ride my POKéMON.\n" .string "I bet you're not tired.$" -Text_187EBB:: @ 8187EBB +Route20_Text_ShirleyIntro:: @ 8187EBB .string "SEAFOAM is a quiet getaway.\n" .string "I'm vacationing here.$" -Text_187EED:: @ 8187EED +Route20_Text_ShirleyDefeat:: @ 8187EED .string "Quit it!$" -Text_187EF6:: @ 8187EF6 +Route20_Text_ShirleyPostBattle:: @ 8187EF6 .string "There's a huge cavern underneath\n" .string "this island.$" -Text_187F24:: @ 8187F24 +Route20_Text_TiffanyIntro:: @ 8187F24 .string "I love floating with the fishes\n" .string "here among the waves.$" -Text_187F5A:: @ 8187F5A +Route20_Text_TiffanyDefeat:: @ 8187F5A .string "Yowch!$" -Text_187F61:: @ 8187F61 +Route20_Text_TiffanyPostBattle:: @ 8187F61 .string "Want to float with me?$" -Text_187F78:: @ 8187F78 +Route20_Text_IreneIntro:: @ 8187F78 .string "Are you on vacation, too?$" -Text_187F92:: @ 8187F92 +Route20_Text_IreneDefeat:: @ 8187F92 .string "No mercy at all!$" -Text_187FA3:: @ 8187FA3 +Route20_Text_IrenePostBattle:: @ 8187FA3 .string "SEAFOAM used to be a single island\n" .string "in the distant past.$" -Text_187FDB:: @ 8187FDB +Route20_Text_DeanIntro:: @ 8187FDB .string "Check out my buff physique!$" -Text_187FF7:: @ 8187FF7 +Route20_Text_DeanDefeat:: @ 8187FF7 .string "Wimpy!$" -Text_187FFE:: @ 8187FFE +Route20_Text_DeanPostBattle:: @ 8187FFE .string "I should've been buffing up my\n" .string "POKéMON, not me!$" -Text_18802E:: @ 818802E +Route20_Text_DarrinIntro:: @ 818802E .string "Why are you riding a POKéMON?\n" .string "Can't you swim?$" -Text_18805C:: @ 818805C +Route20_Text_DarrinDefeat:: @ 818805C .string "Ouch!\n" .string "Torpedoed!$" -Text_18806D:: @ 818806D +Route20_Text_DarrinPostBattle:: @ 818806D .string "Riding a POKéMON sure looks fun!$" -Text_18808E:: @ 818808E +Route20_Text_RogerIntro:: @ 818808E .string "I rode my bird POKéMON here.$" -Text_1880AB:: @ 81880AB +Route20_Text_RogerDefeat:: @ 81880AB .string "Oh, no!\n" .string "Now what am I to do?$" -Text_1880C8:: @ 81880C8 +Route20_Text_RogerPostBattle:: @ 81880C8 .string "My birds are exhausted.\n" .string "They can't FLY me back!$" -Text_1880F8:: @ 81880F8 +Route20_Text_NoraIntro:: @ 81880F8 .string "My boyfriend gave me big pearls.$" -Text_188119:: @ 8188119 +Route20_Text_NoraDefeat:: @ 8188119 .string "Oh, no!\n" .string "My pearls were in them!$" -Text_188139:: @ 8188139 +Route20_Text_NoraPostBattle:: @ 8188139 .string "Will my pearls grow bigger inside\n" .string "CLOYSTER?$" -Text_188165:: @ 8188165 +Route20_Text_MissyIntro:: @ 8188165 .string "I swam here from CINNABAR ISLAND.\n" .string "It wasn't easy, I tell you.$" -Text_1881A3:: @ 81881A3 +Route20_Text_MissyDefeat:: @ 81881A3 .string "I'm so disappointed!$" -Text_1881B8:: @ 81881B8 +Route20_Text_MissyPostBattle:: @ 81881B8 .string "POKéMON have taken over an\n" .string "abandoned mansion on CINNABAR.\p" .string "They call it the POKéMON MANSION\n" .string "now.$" -Text_188218:: @ 8188218 +Route20_Text_MelissaIntro:: @ 8188218 .string "CINNABAR, in the west, has a LAB\n" .string "for POKéMON.\p" .string "My daddy works there.$" -Text_18825C:: @ 818825C +Route20_Text_MelissaDefeat:: @ 818825C .string "Wait!\n" .string "You're supposed to wait!$" -Text_18827B:: @ 818827B +Route20_Text_MelissaPostBattle:: @ 818827B .string "CINNABAR is a volcanic island.\p" .string "I heard it rose out of the sea\n" .string "when a volcano erupted.$" -gUnknown_81882D1:: @ 81882D1 +Route20_Text_SeafoamIslands:: @ 81882D1 .string "SEAFOAM ISLANDS$" -Text_1882E1:: @ 81882E1 +Route20_Text_MistyTrainsHere:: @ 81882E1 .string "Strong TRAINERS and WATER POKéMON\n" .string "are common sights in these parts.\p" .string "They say that MISTY of the\n" diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json index 556dd9746..05b91c5d3 100644 --- a/data/maps/Route21_North/map.json +++ b/data/maps/Route21_North/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "Route21_North_EventScript_1AB975", + "script": "Route21_North_EventScript_Ronald", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "Route21_North_EventScript_1AB9F1", + "script": "Route21_North_EventScript_Wade", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 2, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route21_North_EventScript_1ABA6D", + "script": "Route21_North_EventScript_Spencer", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route21_North_EventScript_1ABB65", + "script": "Route21_North_EventScript_Lil", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route21_North_EventScript_1ABBAB", + "script": "Route21_North_EventScript_Ian", "flag": "0" }, { diff --git a/data/maps/Route21_North/text.inc b/data/maps/Route21_North/text.inc index ad1ec12d3..67b93c175 100644 --- a/data/maps/Route21_North/text.inc +++ b/data/maps/Route21_North/text.inc @@ -1,42 +1,49 @@ -Text_18835A:: @ 818835A +Route21_North_Text_RonaldIntro:: @ 818835A .string "You want to know if the fish are\n" .string "biting?$" -Text_188383:: @ 8188383 +Route21_North_Text_RonaldDefeat:: @ 8188383 .string "Dang!$" -Text_188389:: @ 8188389 +Route21_North_Text_RonaldPostBattle:: @ 8188389 .string "I can't catch anything good.\n" .string "Not one good POKéMON to be had!$" -Text_1883C6:: @ 81883C6 +Route21_North_Text_WadeIntro:: @ 81883C6 .string "I got a big haul!\n" .string "Wanna go for it?$" -Text_1883E9:: @ 81883E9 +Route21_North_Text_WadeDefeat:: @ 81883E9 .string "Heheh, MAGIKARP just don't make\n" .string "the grade, do they?$" -Text_18841D:: @ 818841D +Route21_North_Text_WadePostBattle:: @ 818841D .string "I seem to only catch MAGIKARP!$" -Text_18843C:: @ 818843C +Route21_North_Text_SpencerIntro:: @ 818843C .string "The sea cleanses my body and soul!$" -Text_18845F:: @ 818845F +Route21_North_Text_SpencerDefeat:: @ 818845F .string "Ayah!$" -Text_188465:: @ 8188465 +Route21_North_Text_SpencerPostBattle:: @ 8188465 .string "The sea is great and all, but I\n" .string "like the mountains, too.$" -Text_18849E:: @ 818849E +@ Below is the battle text for the Cue Ball that was on Route 21 in Gen 1. +@ This trainer wasnt used in Gen 3 so their text goes unused/untranslated +@ English translations from RB are listed + +@ "What's wrong with me swimming?" +Route21_North_Text_CueBallIntro:: @ 818849E .string "おれだって　たまには\n" .string "およぎに　くるぜ！$" -Text_1884B3:: @ 81884B3 +@ "Cheap shot!" +Route21_North_Text_CueBallDefeat:: @ 81884B3 .string "ぐわわ！$" -Text_1884B8:: @ 81884B8 +@ "I look like what? A studded inner tube? Get lost!" +Route21_North_Text_CueBallPostBattle:: @ 81884B8 .string "うきやすそう　だと？\n" .string "うるせー　おおきな　おせわだッ！$" diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json index ef43a429b..8e9398b68 100644 --- a/data/maps/Route21_South/map.json +++ b/data/maps/Route21_South/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "Route21_South_EventScript_1AB9B3", + "script": "Route21_South_EventScript_Claude", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "Route21_South_EventScript_1ABA2F", + "script": "Route21_South_EventScript_Nolan", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route21_South_EventScript_1ABAAB", + "script": "Route21_South_EventScript_Jack", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route21_South_EventScript_1ABAE9", + "script": "Route21_South_EventScript_Jerome", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 2, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route21_South_EventScript_1ABB27", + "script": "Route21_South_EventScript_Roland", "flag": "0" } ], diff --git a/data/maps/Route21_South/text.inc b/data/maps/Route21_South/text.inc index 8700006ef..255c1eaed 100644 --- a/data/maps/Route21_South/text.inc +++ b/data/maps/Route21_South/text.inc @@ -1,87 +1,87 @@ -Text_1884D4:: @ 81884D4 +Route21_South_Text_JackIntro:: @ 81884D4 .string "I caught my POKéMON at sea.$" -Text_1884F0:: @ 81884F0 +Route21_South_Text_JackDefeat:: @ 81884F0 .string "Diver!!\n" .string "Down!!$" -Text_1884FF:: @ 81884FF +Route21_South_Text_JackPostBattle:: @ 81884FF .string "Where'd you catch your POKéMON?$" -Text_18851F:: @ 818851F +Route21_South_Text_JeromeIntro:: @ 818851F .string "Right now, I'm in a triathlon meet.$" -Text_188543:: @ 8188543 +Route21_South_Text_JeromeDefeat:: @ 8188543 .string "Pant…\n" .string "Pant… Pant…$" -Text_188555:: @ 8188555 +Route21_South_Text_JeromePostBattle:: @ 8188555 .string "I'm beat! But, I still have the\n" .string "bike race and marathon left!$" -Text_188592:: @ 8188592 +Route21_South_Text_RolandIntro:: @ 8188592 .string "Ahh!\n" .string "Feel the sun and the wind!$" -Text_1885B2:: @ 81885B2 +Route21_South_Text_RolandDefeat:: @ 81885B2 .string "Yow!\n" .string "I lost!$" -Text_1885BF:: @ 81885BF +Route21_South_Text_RolandPostBattle:: @ 81885BF .string "I'm sunburnt to a crisp!$" -Text_1885D8:: @ 81885D8 +Route21_South_Text_ClaudeIntro:: @ 81885D8 .string "Hey, don't scare away the fish!$" -Text_1885F8:: @ 81885F8 +Route21_South_Text_ClaudeDefeat:: @ 81885F8 .string "Sorry! I'm just so frustrated from\n" .string "not catching anything.$" -Text_188632:: @ 8188632 +Route21_South_Text_ClaudePostBattle:: @ 8188632 .string "Sheesh, I haven't caught a thing.\n" .string "Could this place actually be a\l" .string "giant pool or something?$" -Text_18868C:: @ 818868C +Route21_South_Text_NolanIntro:: @ 818868C .string "Keep me company till I get a hit.$" -Text_1886AE:: @ 81886AE +Route21_South_Text_NolanDefeat:: @ 81886AE .string "That burned some time.$" -Text_1886C5:: @ 81886C5 +Route21_South_Text_NolanPostBattle:: @ 81886C5 .string "Oh wait!\n" .string "I got a bite! Yeah!$" -Text_1886E2:: @ 81886E2 +Route21_North_Text_LilIntro:: @ 81886E2 .string "LIL: Huh? A battle?\n" .string "IAN, can't you do it alone?$" -Text_188712:: @ 8188712 +Route21_North_Text_LilDefeat:: @ 8188712 .string "LIL: Oh, see?\n" .string "We lost. Happy now?$" -Text_188734:: @ 8188734 +Route21_North_Text_LilPostBattle:: @ 8188734 .string "LIL: I'm tired.\n" .string "Can't we go home already?$" -Text_18875E:: @ 818875E +Route21_North_Text_LilNotEnoughMons:: @ 818875E .string "LIL: Huh? A battle?\n" .string "I can't be bothered to do it alone.\l" .string "Bring two POKéMON, won't you?$" -Text_1887B4:: @ 81887B4 +Route21_North_Text_IanIntro:: @ 81887B4 .string "IAN: My sis doesn't get enough\n" .string "exercise, so I made her come.$" -Text_1887F1:: @ 81887F1 +Route21_North_Text_IanDefeat:: @ 81887F1 .string "IAN: Awww, Sis!\n" .string "Get it together!$" -Text_188812:: @ 8188812 +Route21_North_Text_IanPostBattle:: @ 8188812 .string "IAN: Come on, Sis!\p" .string "You're not going to lose weight\n" .string "like this!$" -Text_188850:: @ 8188850 +Route21_North_Text_IanNotEnoughMons:: @ 8188850 .string "IAN: We want a two-on-two battle.\n" .string "So can you bring two POKéMON?$" diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index 29b394c67..a12005d3f 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route24_EventScript_168620", + "script": "Route24_EventScript_Rocket", "flag": "FLAG_HIDE_NUGGET_BRIDGE_ROCKET" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route24_EventScript_1A972D", + "script": "Route24_EventScript_Ethan", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route24_EventScript_1A9673", + "script": "Route24_EventScript_Reli", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route24_EventScript_1A95F7", + "script": "Route24_EventScript_Timmy", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route24_EventScript_1A96B1", + "script": "Route24_EventScript_Ali", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route24_EventScript_1A9635", + "script": "Route24_EventScript_Cale", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route24_EventScript_1A96EF", + "script": "Route24_EventScript_Shane", "flag": "0" }, { @@ -140,7 +140,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE24", "var_value": 0, - "script": "Route24_EventScript_168660" + "script": "Route24_EventScript_RocketTriggerLeft" }, { "type": "trigger", @@ -149,7 +149,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE24", "var_value": 0, - "script": "Route24_EventScript_16866C" + "script": "Route24_EventScript_RocketTriggerRight" } ], "bg_events": [ diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index e30913e52..e21bf114c 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -1,42 +1,42 @@ Route24_MapScripts:: @ 816861F .byte 0 -Route24_EventScript_168620:: @ 8168620 +Route24_EventScript_Rocket:: @ 8168620 lock faceplayer compare VAR_MAP_SCENE_ROUTE24, 1 - goto_if_eq EventScript_168656 - msgbox gUnknown_8188C3C + goto_if_eq Route24_EventScript_RocketPostBattle + msgbox Route24_Text_JustEarnedFabulousPrize checkitemspace ITEM_NUGGET, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16864C - call EventScript_1686B9 + goto_if_eq Route24_EventScript_NoRoomForNugget + call Route24_EventScript_ReceiveNugget release end -EventScript_16864C:: @ 816864C - msgbox gUnknown_8188CC2 +Route24_EventScript_NoRoomForNugget:: @ 816864C + msgbox Route24_Text_YouDontHaveAnyRoom release end -EventScript_168656:: @ 8168656 - msgbox gUnknown_8188DF1 +Route24_EventScript_RocketPostBattle:: @ 8168656 + msgbox Route24_Text_YoudBecomeTopRocketLeader release end -Route24_EventScript_168660:: @ 8168660 +Route24_EventScript_RocketTriggerLeft:: @ 8168660 lockall setvar VAR_TEMP_1, 0 - goto EventScript_168678 + goto Route24_EventScript_RocketTrigger end -Route24_EventScript_16866C:: @ 816866C +Route24_EventScript_RocketTriggerRight:: @ 816866C lockall setvar VAR_TEMP_1, 1 - goto EventScript_168678 + goto Route24_EventScript_RocketTrigger end -EventScript_168678:: @ 8168678 +Route24_EventScript_RocketTrigger:: @ 8168678 textcolor 0 compare VAR_TEMP_1, 0 call_if_eq EventScript_1686FD @@ -44,28 +44,28 @@ EventScript_168678:: @ 8168678 call_if_eq EventScript_168708 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox gUnknown_8188C3C + msgbox Route24_Text_JustEarnedFabulousPrize checkitemspace ITEM_NUGGET, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_168713 - call EventScript_1686B9 + call Route24_EventScript_ReceiveNugget releaseall end -EventScript_1686B9:: @ 81686B9 - giveitem_msg gUnknown_8188C93, ITEM_NUGGET - message Text_188CDB +Route24_EventScript_ReceiveNugget:: @ 81686B9 + giveitem_msg Route24_Text_ReceivedNuggetFromMysteryTrainer, ITEM_NUGGET + message Route24_Text_JoinTeamRocket waitmessage playbgm MUS_ROCKET, 0 waitbuttonpress setvar VAR_LAST_TALKED, 1 - trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_6, Text_188DDC - msgbox gUnknown_8188DF1 + trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_6, Route24_Text_RocketDefeat + msgbox Route24_Text_YoudBecomeTopRocketLeader setvar VAR_MAP_SCENE_ROUTE24, 1 return EventScript_1686FD:: @ 81686FD - applymovement 1, Movement_16873E + applymovement 1, Route24_Movement_WalkLeft waitmovement 0 return @@ -75,9 +75,9 @@ EventScript_168708:: @ 8168708 return EventScript_168713:: @ 8168713 - msgbox gUnknown_8188CC2 + msgbox Route24_Text_YouDontHaveAnyRoom closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_168743 + applymovement OBJ_EVENT_ID_PLAYER, Route24_Movement_WalkDown waitmovement 0 compare VAR_TEMP_1, 0 call_if_eq EventScript_168733 @@ -89,7 +89,7 @@ EventScript_168733:: @ 8168733 waitmovement 0 return -Movement_16873E:: @ 816873E +Route24_Movement_WalkLeft:: @ 816873E walk_left step_end @@ -98,6 +98,6 @@ Movement_168740:: @ 8168740 walk_in_place_fastest_left step_end -Movement_168743:: @ 8168743 +Route24_Movement_WalkDown:: @ 8168743 walk_down step_end diff --git a/data/maps/Route24/text.inc b/data/maps/Route24/text.inc index 04ef64ea5..7b9d09e6f 100644 --- a/data/maps/Route24/text.inc +++ b/data/maps/Route24/text.inc @@ -1,16 +1,16 @@ -gUnknown_8188C3C:: @ 8188C3C +Route24_Text_JustEarnedFabulousPrize:: @ 8188C3C .string "Congratulations! You beat our\n" .string "five contest TRAINERS!\p" .string "You just earned a fabulous prize!$" -gUnknown_8188C93:: @ 8188C93 +Route24_Text_ReceivedNuggetFromMysteryTrainer:: @ 8188C93 .string "{PLAYER} received a NUGGET\n" .string "from the mystery TRAINER!$" -gUnknown_8188CC2:: @ 8188CC2 +Route24_Text_YouDontHaveAnyRoom:: @ 8188CC2 .string "You don't have any room!$" -Text_188CDB:: @ 8188CDB +Route24_Text_JoinTeamRocket:: @ 8188CDB .string "By the way, how would you like to\n" .string "join TEAM ROCKET?\p" .string "We're a group of professional\n" @@ -23,13 +23,78 @@ Text_188CDB:: @ 8188CDB .string "I'll make you an offer you can't\n" .string "refuse!$" -Text_188DDC:: @ 8188DDC +Route24_Text_RocketDefeat:: @ 8188DDC .string "Arrgh!\n" .string "You are good!$" -gUnknown_8188DF1:: @ 8188DF1 +Route24_Text_YoudBecomeTopRocketLeader:: @ 8188DF1 .string "With your ability, you'd become\n" .string "a top leader in TEAM ROCKET.\p" .string "Come on, think of the opportunity!\n" .string "Don't let this chance go to waste.$" +Route24_Text_ShaneIntro:: @ 8188E74 + .string "I saw your feat from the grass!$" + +Route24_Text_ShaneDefeat:: @ 8188E94 + .string "I thought not!$" + +Route24_Text_ShanePostBattle:: @ 8188EA3 + .string "I hid because the people on the\n" + .string "bridge frightened me.$" + +Route24_Text_EthanIntro:: @ 8188ED9 + .string "Okay! I'm No. 5!\n" + .string "I'll stomp you!$" + +Route24_Text_EthanDefeat:: @ 8188EFA + .string "Whoa!\n" + .string "Too much!$" + +Route24_Text_EthanPostBattle:: @ 8188F0A + .string "I did my best. I have no regrets!$" + +Route24_Text_ReliIntro:: @ 8188F2C + .string "I'm No. 4!\n" + .string "Getting tired?$" + +Route24_Text_ReliDefeat:: @ 8188F46 + .string "I lost, too!$" + +Route24_Text_ReliPostBattle:: @ 8188F53 + .string "I did my best, so I've no regrets!$" + +Route24_Text_TimmyIntro:: @ 8188F76 + .string "Here's No. 3!\n" + .string "I won't be easy!$" + +Route24_Text_TimmyDefeat:: @ 8188F95 + .string "Ow!\n" + .string "Stomped flat!$" + +Route24_Text_TimmyPostBattle:: @ 8188FA7 + .string "I did my best. I have no regrets!$" + +Route24_Text_AliIntro:: @ 8188FC9 + .string "I'm second!\n" + .string "Now it's serious!$" + +Route24_Text_AliDefeat:: @ 8188FE7 + .string "How could I lose?$" + +Route24_Text_AliPostBattle:: @ 8188FF9 + .string "I did my best. I have no regrets!$" + +Route24_Text_CaleIntro:: @ 818901B + .string "People call this the NUGGET\n" + .string "BRIDGE!\p" + .string "Beat us five TRAINERS and win\n" + .string "a fabulous prize!\p" + .string "Think you got what it takes?$" + +Route24_Text_CaleDefeat:: @ 818908C + .string "Whoo!\n" + .string "Good stuff!$" + +Route24_Text_CalePostBattle:: @ 818909E + .string "I did my best. I have no regrets!$" diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index b36fe20cf..eee743a54 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -31,7 +31,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route25_EventScript_1A98A1", + "script": "Route25_EventScript_Franklin", "flag": "0" }, { @@ -44,7 +44,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route25_EventScript_1A976B", + "script": "Route25_EventScript_Joey", "flag": "0" }, { @@ -57,7 +57,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route25_EventScript_1A991D", + "script": "Route25_EventScript_Wayne", "flag": "0" }, { @@ -70,7 +70,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route25_EventScript_1A97A9", + "script": "Route25_EventScript_Dan", "flag": "0" }, { @@ -83,7 +83,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route25_EventScript_1A9825", + "script": "Route25_EventScript_Kelsey", "flag": "0" }, { @@ -96,7 +96,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route25_EventScript_1A98DF", + "script": "Route25_EventScript_Nob", "flag": "0" }, { @@ -109,7 +109,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route25_EventScript_1A995B", + "script": "Route25_EventScript_Flint", "flag": "0" }, { @@ -122,7 +122,7 @@ "movement_range_y": 3, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route25_EventScript_1A97E7", + "script": "Route25_EventScript_Chad", "flag": "0" }, { @@ -135,7 +135,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route25_EventScript_1A9863", + "script": "Route25_EventScript_Haley", "flag": "0" }, { @@ -174,7 +174,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route25_EventScript_1ACE4F", + "script": "Route25_EventScript_Beauty", "flag": "0" }, { @@ -187,7 +187,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route25_EventScript_16874F", + "script": "Route25_EventScript_Man", "flag": "0" } ], @@ -207,7 +207,7 @@ "x": 48, "y": 4, "elevation": 0, - "script": "Route25_EventScript_168746" + "script": "Route25_EventScript_SeaCottageSign" }, { "type": "hidden_item", diff --git a/data/maps/Route25/scripts.inc b/data/maps/Route25/scripts.inc index d214cdbf6..4dc03b3e9 100644 --- a/data/maps/Route25/scripts.inc +++ b/data/maps/Route25/scripts.inc @@ -1,10 +1,10 @@ Route25_MapScripts:: @ 8168745 .byte 0 -Route25_EventScript_168746:: @ 8168746 - msgbox gUnknown_818954C, MSGBOX_SIGN +Route25_EventScript_SeaCottageSign:: @ 8168746 + msgbox Route25_Text_SeaCottageSign, MSGBOX_SIGN end -Route25_EventScript_16874F:: @ 816874F - msgbox gUnknown_81895C2, MSGBOX_NPC +Route25_EventScript_Man:: @ 816874F + msgbox Route25_Text_AreYouHereAlone, MSGBOX_NPC end diff --git a/data/maps/Route25/text.inc b/data/maps/Route25/text.inc index cdc124108..56bf3df94 100644 --- a/data/maps/Route25/text.inc +++ b/data/maps/Route25/text.inc @@ -1,184 +1,118 @@ -Text_188E74:: @ 8188E74 - .string "I saw your feat from the grass!$" - -Text_188E94:: @ 8188E94 - .string "I thought not!$" - -Text_188EA3:: @ 8188EA3 - .string "I hid because the people on the\n" - .string "bridge frightened me.$" - -Text_188ED9:: @ 8188ED9 - .string "Okay! I'm No. 5!\n" - .string "I'll stomp you!$" - -Text_188EFA:: @ 8188EFA - .string "Whoa!\n" - .string "Too much!$" - -Text_188F0A:: @ 8188F0A - .string "I did my best. I have no regrets!$" - -Text_188F2C:: @ 8188F2C - .string "I'm No. 4!\n" - .string "Getting tired?$" - -Text_188F46:: @ 8188F46 - .string "I lost, too!$" - -Text_188F53:: @ 8188F53 - .string "I did my best, so I've no regrets!$" - -Text_188F76:: @ 8188F76 - .string "Here's No. 3!\n" - .string "I won't be easy!$" - -Text_188F95:: @ 8188F95 - .string "Ow!\n" - .string "Stomped flat!$" - -Text_188FA7:: @ 8188FA7 - .string "I did my best. I have no regrets!$" - -Text_188FC9:: @ 8188FC9 - .string "I'm second!\n" - .string "Now it's serious!$" - -Text_188FE7:: @ 8188FE7 - .string "How could I lose?$" - -Text_188FF9:: @ 8188FF9 - .string "I did my best. I have no regrets!$" - -Text_18901B:: @ 818901B - .string "People call this the NUGGET\n" - .string "BRIDGE!\p" - .string "Beat us five TRAINERS and win\n" - .string "a fabulous prize!\p" - .string "Think you got what it takes?$" - -Text_18908C:: @ 818908C - .string "Whoo!\n" - .string "Good stuff!$" - -Text_18909E:: @ 818909E - .string "I did my best. I have no regrets!$" - -Text_1890C0:: @ 81890C0 +Route25_Text_JoeyIntro:: @ 81890C0 .string "Local TRAINERS come here to\n" .string "practice.$" -Text_1890E6:: @ 81890E6 +Route25_Text_JoeyDefeat:: @ 81890E6 .string "You're decent.$" -Text_1890F5:: @ 81890F5 +Route25_Text_JoeyPostBattle:: @ 81890F5 .string "All POKéMON have weaknesses.\n" .string "Even the strongest ones.\p" .string "That's why it's best to raise\n" .string "POKéMON of different types.$" -Text_189165:: @ 8189165 +Route25_Text_DanIntro:: @ 8189165 .string "Dad took me to a great party on\n" .string "the S.S. ANNE at VERMILION CITY.$" -Text_1891A6:: @ 81891A6 +Route25_Text_DanDefeat:: @ 81891A6 .string "I'm not mad!$" -Text_1891B3:: @ 81891B3 +Route25_Text_DanPostBattle:: @ 81891B3 .string "On the S.S. ANNE, I saw TRAINERS\n" .string "from around the world.$" -Text_1891EB:: @ 81891EB +Route25_Text_FlintIntro:: @ 81891EB .string "I'm a cool guy.\n" .string "I've got a girlfriend!$" -Text_189212:: @ 8189212 +Route25_Text_FlintDefeat:: @ 8189212 .string "Aww, darn…$" -Text_18921D:: @ 818921D +Route25_Text_FlintPostBattle:: @ 818921D .string "Oh, well.\n" .string "My girlfriend will cheer me up.$" -Text_189247:: @ 8189247 +Route25_Text_KelseyIntro:: @ 8189247 .string "Hi!\n" .string "My boyfriend is cool!$" -Text_189261:: @ 8189261 +Route25_Text_KelseyDefeat:: @ 8189261 .string "My conditioning isn't the best…$" -Text_189281:: @ 8189281 +Route25_Text_KelseyPostBattle:: @ 8189281 .string "I wish my boyfriend was as good\n" .string "as you.$" -Text_1892A9:: @ 81892A9 +Route25_Text_ChadIntro:: @ 81892A9 .string "I had this feeling…\n" .string "I knew I had to battle you!$" -Text_1892D9:: @ 81892D9 +Route25_Text_ChadDefeat:: @ 81892D9 .string "I knew I'd lose, too!$" -Text_1892EF:: @ 81892EF +Route25_Text_ChadPostBattle:: @ 81892EF .string "If your POKéMON gets confused,\n" .string "switch it out.\p" .string "That's a good tactic.$" -Text_189333:: @ 8189333 +Route25_Text_HaleyIntro:: @ 8189333 .string "My friend has many cute POKéMON.\n" .string "I'm so jealous!$" -Text_189364:: @ 8189364 +Route25_Text_HaleyDefeat:: @ 8189364 .string "I'm not so jealous!$" -Text_189378:: @ 8189378 +Route25_Text_HaleyPostBattle:: @ 8189378 .string "You came from MT. MOON?\n" .string "May I have a CLEFAIRY?$" -Text_1893A7:: @ 81893A7 +Route25_Text_FranklinIntro:: @ 81893A7 .string "I just got down from MT. MOON,\n" .string "but I've still got gas in the tank!$" -Text_1893EA:: @ 81893EA +Route25_Text_FranklinDefeat:: @ 81893EA .string "You worked hard!$" -Text_1893FB:: @ 81893FB +Route25_Text_FranklinPostBattle:: @ 81893FB .string "Drat!\n" .string "A ZUBAT bit me back in that cave.$" -Text_189423:: @ 8189423 +Route25_Text_NobIntro:: @ 8189423 .string "I'm off to see a POKéMANIAC's\n" .string "collection at the cape.$" -Text_189459:: @ 8189459 +Route25_Text_NobDefeat:: @ 8189459 .string "You done got me, and real good,\n" .string "too!$" -Text_18947E:: @ 818947E +Route25_Text_NobPostBattle:: @ 818947E .string "The POKéMANIAC sure lives up to\n" .string "his name.\p" .string "His collection includes many rare\n" .string "species of POKéMON.$" -Text_1894DE:: @ 81894DE +Route25_Text_WayneIntro:: @ 81894DE .string "You're going to see BILL?\n" .string "First, we battle!$" -Text_18950A:: @ 818950A +Route25_Text_WayneDefeat:: @ 818950A .string "You're something.$" -Text_18951C:: @ 818951C +Route25_Text_WaynePostBattle:: @ 818951C .string "The trail below is a shortcut to\n" .string "CERULEAN CITY.$" -gUnknown_818954C:: @ 818954C +Route25_Text_SeaCottageSign:: @ 818954C .string "SEA COTTAGE\n" .string "BILL lives here!$" -Text_189569:: @ 8189569 +Route25_Text_MistyHighHopesAboutThisPlace:: @ 8189569 .string "This cape is a famous date spot.\p" .string "MISTY, the GYM LEADER, has high\n" .string "hopes about this place.$" -gUnknown_81895C2:: @ 81895C2 +Route25_Text_AreYouHereAlone:: @ 81895C2 .string "Hello, are you here alone?\p" .string "If you're out at CERULEAN's cape…\n" .string "Well, it should be as a couple.$" diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json index 94327ef65..e8ac1df8d 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route25_SeaCottage_EventScript_17054B", + "script": "Route25_SeaCottage_EventScript_Bill", "flag": "FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route25_SeaCottage_EventScript_17054B", + "script": "Route25_SeaCottage_EventScript_Bill", "flag": "FLAG_HIDE_BILL_CLEFAIRY" } ], @@ -72,7 +72,7 @@ "x": 4, "y": 5, "elevation": 0, - "script": "Route25_SeaCottage_EventScript_1706DD" + "script": "Route25_SeaCottage_EventScript_Computer" } ] } diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index ed5aca2c8..8bfa00a21 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -1,143 +1,150 @@ +.equ LOCALID_BILL_HUMAN, 1 +.equ LOCALID_BILL_CLEFAIRY, 2 + +.equ BILL_IN_TELEPORTER, FLAG_TEMP_2 +.equ RETURN_AFTER_SS_TICKET, FLAG_TEMP_3 + Route25_SeaCottage_MapScripts:: @ 8170523 map_script MAP_SCRIPT_ON_TRANSITION, Route25_SeaCottage_OnTransition .byte 0 Route25_SeaCottage_OnTransition:: @ 8170529 - call_if_unset FLAG_HELPED_BILL_IN_SEA_COTTAGE, EventScript_17053C + call_if_unset FLAG_HELPED_BILL_IN_SEA_COTTAGE, Route25_SeaCottage_EventScript_HideClefairyBill call_if_set FLAG_GOT_SS_TICKET, EventScript_170547 end -EventScript_17053C:: @ 817053C +Route25_SeaCottage_EventScript_HideClefairyBill:: @ 817053C clearflag FLAG_HIDE_BILL_CLEFAIRY - setobjectxyperm 1, 3, 3 + setobjectxyperm LOCALID_BILL_HUMAN, 3, 3 return EventScript_170547:: @ 8170547 - setflag FLAG_TEMP_3 + setflag RETURN_AFTER_SS_TICKET return -Route25_SeaCottage_EventScript_17054B:: @ 817054B +Route25_SeaCottage_EventScript_Bill:: @ 817054B lock faceplayer - goto_if_set FLAG_TEMP_3, EventScript_1706C8 - goto_if_set FLAG_GOT_SS_TICKET, EventScript_170640 - goto_if_set FLAG_HELPED_BILL_IN_SEA_COTTAGE, EventScript_17064A + goto_if_set RETURN_AFTER_SS_TICKET, Route25_SeaCottage_EventScript_BillGoLookAtPC + goto_if_set FLAG_GOT_SS_TICKET, Route25_SeaCottage_EventScript_BillGoToSSAnne + goto_if_set FLAG_HELPED_BILL_IN_SEA_COTTAGE, Route25_SeaCottage_EventScript_BillGiveSSTicket checkplayergender compare VAR_RESULT, MALE - goto_if_eq EventScript_170580 + goto_if_eq Route25_SeaCottage_EventScript_BillAskForHelpMale compare VAR_RESULT, FEMALE - goto_if_eq EventScript_17058E + goto_if_eq Route25_SeaCottage_EventScript_BillAskForHelpFemale end -EventScript_170580:: @ 8170580 - msgbox gUnknown_819FDFA, MSGBOX_YESNO - goto EventScript_17059C +Route25_SeaCottage_EventScript_BillAskForHelpMale:: @ 8170580 + msgbox Route25_SeaCottage_Text_ImBillHelpMeOutPal, MSGBOX_YESNO + goto Route25_SeaCottage_EventScript_BillAskForHelp end -EventScript_17058E:: @ 817058E - msgbox gUnknown_819FEE6, MSGBOX_YESNO - goto EventScript_17059C +Route25_SeaCottage_EventScript_BillAskForHelpFemale:: @ 817058E + msgbox Route25_SeaCottage_Text_ImBillHelpMeOutLady, MSGBOX_YESNO + goto Route25_SeaCottage_EventScript_BillAskForHelp end -EventScript_17059C:: @ 817059C +Route25_SeaCottage_EventScript_BillAskForHelp:: @ 817059C compare VAR_RESULT, NO - call_if_eq EventScript_170600 - msgbox gUnknown_819FFD3 + call_if_eq Route25_SeaCottage_EventScript_DeclineHelpBill + msgbox Route25_SeaCottage_Text_RunCellSeparationOnPC closemessage delay 10 compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_17062A + call_if_eq Route25_SeaCottage_EventScript_BillWalkToTeleporterSouth compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_170635 + call_if_eq Route25_SeaCottage_EventScript_BillWalkToTeleporter compare VAR_FACING, DIR_WEST - call_if_eq EventScript_170635 + call_if_eq Route25_SeaCottage_EventScript_BillWalkToTeleporter compare VAR_FACING, DIR_EAST - call_if_eq EventScript_170635 + call_if_eq Route25_SeaCottage_EventScript_BillWalkToTeleporter opendoor 10, 3 waitdooranim - applymovement 2, Movement_1706DB + applymovement LOCALID_BILL_CLEFAIRY, Route25_SeaCottage_Movement_BillEnterTeleporter waitmovement 0 - removeobject 2 + removeobject LOCALID_BILL_CLEFAIRY playse SE_C_MAKU_D closedoor 10, 3 waitdooranim - setflag FLAG_TEMP_2 + setflag BILL_IN_TELEPORTER release end -EventScript_170600:: @ 8170600 +@ Just returns after message, execution continues as if player had said yes +Route25_SeaCottage_EventScript_DeclineHelpBill:: @ 8170600 checkplayergender compare VAR_RESULT, MALE - call_if_eq EventScript_170618 + call_if_eq Route25_SeaCottage_EventScript_DeclineHelpBillMale compare VAR_RESULT, FEMALE - call_if_eq EventScript_170621 + call_if_eq Route25_SeaCottage_EventScript_DeclineHelpBillFemale return -EventScript_170618:: @ 8170618 - msgbox gUnknown_81A0035 +Route25_SeaCottage_EventScript_DeclineHelpBillMale:: @ 8170618 + msgbox Route25_SeaCottage_Text_NoPleaseChief return -EventScript_170621:: @ 8170621 - msgbox gUnknown_81A00B6 +Route25_SeaCottage_EventScript_DeclineHelpBillFemale:: @ 8170621 + msgbox Route25_SeaCottage_Text_NoPleaseBeautiful return -EventScript_17062A:: @ 817062A - applymovement 2, Movement_1706D5 +Route25_SeaCottage_EventScript_BillWalkToTeleporterSouth:: @ 817062A + applymovement LOCALID_BILL_CLEFAIRY, Route25_SeaCottage_Movement_BillWalkToTeleporterSouth waitmovement 0 return -EventScript_170635:: @ 8170635 - applymovement 2, Movement_1706D2 +Route25_SeaCottage_EventScript_BillWalkToTeleporter:: @ 8170635 + applymovement LOCALID_BILL_CLEFAIRY, Route25_SeaCottage_Movement_BillWalkToTeleporter waitmovement 0 return -EventScript_170640:: @ 8170640 - msgbox gUnknown_81A02CF +Route25_SeaCottage_EventScript_BillGoToSSAnne:: @ 8170640 + msgbox Route25_SeaCottage_Text_SSAnnePartyYouGoInstead release end -EventScript_17064A:: @ 817064A +Route25_SeaCottage_EventScript_BillGiveSSTicket:: @ 817064A famechecker FAMECHECKER_BILL, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 checkplayergender compare VAR_RESULT, MALE - call_if_eq EventScript_1706AC + call_if_eq Route25_SeaCottage_EventScript_BillThanksMale compare VAR_RESULT, FEMALE - call_if_eq EventScript_1706B5 + call_if_eq Route25_SeaCottage_EventScript_BillThanksFemale checkitemspace ITEM_SS_TICKET, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_1706BE - giveitem_msg gUnknown_81A028E, ITEM_SS_TICKET, 1, MUS_FAN5 + goto_if_eq Route25_SeaCottage_EventScript_NoRoomForSSTicket + giveitem_msg Route25_SeaCottage_Text_ReceivedSSTicketFromBill, ITEM_SS_TICKET, 1, MUS_FAN5 setflag FLAG_GOT_SS_TICKET_DUP setflag FLAG_HIDE_NUGGET_BRIDGE_ROCKET setflag FLAG_GOT_SS_TICKET setflag FLAG_SYS_NOT_SOMEONES_PC - goto EventScript_170640 + goto Route25_SeaCottage_EventScript_BillGoToSSAnne end -EventScript_1706AC:: @ 81706AC - msgbox gUnknown_81A013B +Route25_SeaCottage_EventScript_BillThanksMale:: @ 81706AC + msgbox Route25_SeaCottage_Text_ThanksBudTakeThis return -EventScript_1706B5:: @ 81706B5 - msgbox gUnknown_81A01E4 +Route25_SeaCottage_EventScript_BillThanksFemale:: @ 81706B5 + msgbox Route25_SeaCottage_Text_ThanksLadyTakeThis return -EventScript_1706BE:: @ 81706BE - msgbox gUnknown_81A02B4 +Route25_SeaCottage_EventScript_NoRoomForSSTicket:: @ 81706BE + msgbox Route25_SeaCottage_Text_YouveGotTooMuchStuff release end -EventScript_1706C8:: @ 81706C8 - msgbox gUnknown_81A03AB +Route25_SeaCottage_EventScript_BillGoLookAtPC:: @ 81706C8 + msgbox Route25_SeaCottage_Text_CheckOutRareMonsOnPC release end -Movement_1706D2:: @ 81706D2 +Route25_SeaCottage_Movement_BillWalkToTeleporter:: @ 81706D2 walk_up walk_up step_end -Movement_1706D5:: @ 81706D5 +Route25_SeaCottage_Movement_BillWalkToTeleporterSouth:: @ 81706D5 walk_right walk_up walk_up @@ -145,26 +152,26 @@ Movement_1706D5:: @ 81706D5 walk_in_place_fastest_up step_end -Movement_1706DB:: @ 81706DB +Route25_SeaCottage_Movement_BillEnterTeleporter:: @ 81706DB walk_up step_end -Route25_SeaCottage_EventScript_1706DD:: @ 81706DD +Route25_SeaCottage_EventScript_Computer:: @ 81706DD lockall - goto_if_set FLAG_TEMP_3, EventScript_1707CA - goto_if_set FLAG_TEMP_2, EventScript_1706FA - msgbox gUnknown_81A0402 + goto_if_set RETURN_AFTER_SS_TICKET, Route25_SeaCottage_EventScript_OpenBillsMonList + goto_if_set BILL_IN_TELEPORTER, Route25_SeaCottage_EventScript_RunCellSeparator + msgbox Route25_SeaCottage_Text_TeleporterIsDisplayed releaseall end -EventScript_1706FA:: @ 81706FA +Route25_SeaCottage_EventScript_RunCellSeparator:: @ 81706FA fadeoutbgm 0 - msgbox gUnknown_81A042D + msgbox Route25_SeaCottage_Text_InitiatedTeleportersCellSeparator closemessage - clearflag FLAG_TEMP_2 + clearflag BILL_IN_TELEPORTER setflag FLAG_HELPED_BILL_IN_SEA_COTTAGE special SpawnCameraObject - applymovement OBJ_EVENT_ID_CAMERA, Movement_1707BE + applymovement OBJ_EVENT_ID_CAMERA, Route25_SeaCottage_Movement_CameraPanToTeleporters waitmovement 0 delay 35 playse SE_PIN @@ -172,58 +179,58 @@ EventScript_1706FA:: @ 81706FA setvar VAR_0x8004, 0 special sub_809C4A8 delay 10 - call EventScript_1707B6 - call EventScript_1707B6 - call EventScript_1707B6 - call EventScript_1707B6 - call EventScript_1707B6 - call EventScript_1707B6 - call EventScript_1707B6 + call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE + call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE + call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE + call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE + call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE + call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE + call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE setvar VAR_0x8004, 1 special sub_809C4A8 playse SE_TK_WARPIN special sub_809C5FC waitse - call EventScript_1707B6 - call EventScript_1707B6 - call EventScript_1707B6 - call EventScript_1707B6 - call EventScript_1707B6 + call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE + call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE + call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE + call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE + call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE opendoor 3, 3 waitdooranim fadeinbgm 0 - addobject 1 + addobject LOCALID_BILL_HUMAN clearflag FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE delay 50 playfanfare MUS_FANFA1 - applymovement 1, Movement_170888 + applymovement LOCALID_BILL_HUMAN, Route25_SeaCottage_Movement_BillExitTeleporter waitmovement 0 waitfanfare - applymovement OBJ_EVENT_ID_CAMERA, Movement_1707C3 + applymovement OBJ_EVENT_ID_CAMERA, Route25_SeaCottage_Movement_CameraPanBackFromTeleporters waitmovement 0 playse SE_C_MAKU_D closedoor 3, 3 waitdooranim - applymovement 1, Movement_170881 + applymovement LOCALID_BILL_HUMAN, Route25_SeaCottage_Movement_BillWalkToMiddleOfRoom waitmovement 0 special RemoveCameraObject releaseall end -EventScript_1707B6:: @ 81707B6 +Route25_SeaCottage_EventScript_PlayTeleporterBeepSE:: @ 81707B6 playse SE_BOWA waitse delay 20 return -Movement_1707BE:: @ 81707BE +Route25_SeaCottage_Movement_CameraPanToTeleporters:: @ 81707BE walk_up walk_up walk_right walk_right step_end -Movement_1707C3:: @ 81707C3 +Route25_SeaCottage_Movement_CameraPanBackFromTeleporters:: @ 81707C3 delay_16 delay_16 walk_down @@ -232,65 +239,65 @@ Movement_1707C3:: @ 81707C3 walk_left step_end -EventScript_1707CA:: @ 81707CA - msgbox gUnknown_81A045B - goto EventScript_1707D8 +Route25_SeaCottage_EventScript_OpenBillsMonList:: @ 81707CA + msgbox Route25_SeaCottage_Text_BillsFavoriteMonList + goto Route25_SeaCottage_EventScript_BillsMonList end -EventScript_1707D8:: @ 81707D8 - message Text_1A0479 +Route25_SeaCottage_EventScript_BillsMonList:: @ 81707D8 + message Route25_SeaCottage_Text_SeeWhichMon waitmessage multichoice 0, 0, MULTICHOICE_EEVEELUTIONS, FALSE switch VAR_RESULT - case 0, EventScript_17082B - case 1, EventScript_170840 - case 2, EventScript_170855 - case 3, EventScript_17086A - case 4, EventScript_17087F - case 127, EventScript_17087F + case 0, Route25_SeaCottage_EventScript_ViewEevee + case 1, Route25_SeaCottage_EventScript_ViewFlareon + case 2, Route25_SeaCottage_EventScript_ViewJolteon + case 3, Route25_SeaCottage_EventScript_ViewVaporeon + case 4, Route25_SeaCottage_EventScript_ExitBillsMonList + case 127, Route25_SeaCottage_EventScript_ExitBillsMonList end -EventScript_17082B:: @ 817082B +Route25_SeaCottage_EventScript_ViewEevee:: @ 817082B drawmonpic SPECIES_EEVEE, 10, 3 waitbuttonpress erasemonpic setvar VAR_0x8004, SPECIES_EEVEE special Special_SetSeenMon - goto EventScript_1707D8 + goto Route25_SeaCottage_EventScript_BillsMonList end -EventScript_170840:: @ 8170840 +Route25_SeaCottage_EventScript_ViewFlareon:: @ 8170840 drawmonpic SPECIES_FLAREON, 10, 3 waitbuttonpress erasemonpic setvar VAR_0x8004, SPECIES_FLAREON special Special_SetSeenMon - goto EventScript_1707D8 + goto Route25_SeaCottage_EventScript_BillsMonList end -EventScript_170855:: @ 8170855 +Route25_SeaCottage_EventScript_ViewJolteon:: @ 8170855 drawmonpic SPECIES_JOLTEON, 10, 3 waitbuttonpress erasemonpic setvar VAR_0x8004, SPECIES_JOLTEON special Special_SetSeenMon - goto EventScript_1707D8 + goto Route25_SeaCottage_EventScript_BillsMonList end -EventScript_17086A:: @ 817086A +Route25_SeaCottage_EventScript_ViewVaporeon:: @ 817086A drawmonpic SPECIES_VAPOREON, 10, 3 waitbuttonpress erasemonpic setvar VAR_0x8004, SPECIES_VAPOREON special Special_SetSeenMon - goto EventScript_1707D8 + goto Route25_SeaCottage_EventScript_BillsMonList end -EventScript_17087F:: @ 817087F +Route25_SeaCottage_EventScript_ExitBillsMonList:: @ 817087F releaseall end -Movement_170881:: @ 8170881 +Route25_SeaCottage_Movement_BillWalkToMiddleOfRoom:: @ 8170881 walk_right walk_right walk_right @@ -299,6 +306,6 @@ Movement_170881:: @ 8170881 walk_down step_end -Movement_170888:: @ 8170888 +Route25_SeaCottage_Movement_BillExitTeleporter:: @ 8170888 walk_down step_end diff --git a/data/maps/Route25_SeaCottage/text.inc b/data/maps/Route25_SeaCottage/text.inc index 6ecacdd89..9fd189426 100644 --- a/data/maps/Route25_SeaCottage/text.inc +++ b/data/maps/Route25_SeaCottage/text.inc @@ -1,4 +1,4 @@ -gUnknown_819FDFA:: @ 819FDFA +Route25_SeaCottage_Text_ImBillHelpMeOutPal:: @ 819FDFA .string "Hiya! I'm a POKéMON…\n" .string "…No I'm not!\p" .string "Call me BILL!\n" @@ -11,7 +11,7 @@ gUnknown_819FDFA:: @ 819FDFA .string "So, how about it?\n" .string "Help me out here!$" -gUnknown_819FEE6:: @ 819FEE6 +Route25_SeaCottage_Text_ImBillHelpMeOutLady:: @ 819FEE6 .string "Hiya! I'm a POKéMON…\n" .string "…No I'm not!\p" .string "Call me BILL!\n" @@ -24,13 +24,13 @@ gUnknown_819FEE6:: @ 819FEE6 .string "So, how about it?\n" .string "Help me out here!$" -gUnknown_819FFD3:: @ 819FFD3 +Route25_SeaCottage_Text_RunCellSeparationOnPC:: @ 819FFD3 .string "Wait till I get inside the\n" .string "TELEPORTER.\p" .string "When I do, go to my PC and run\n" .string "the Cell Separation System.$" -gUnknown_81A0035:: @ 81A0035 +Route25_SeaCottage_Text_NoPleaseChief:: @ 81A0035 .string "No!?\n" .string "Now don't be so cold!\p" .string "Come on, you gotta help a guy in\n" @@ -40,7 +40,7 @@ gUnknown_81A0035:: @ 81A0035 .string "Okay?\l" .string "All right!$" -gUnknown_81A00B6:: @ 81A00B6 +Route25_SeaCottage_Text_NoPleaseBeautiful:: @ 81A00B6 .string "No!?\n" .string "Now don't be so cold!\p" .string "Come on, you gotta help a guy in\n" @@ -50,7 +50,7 @@ gUnknown_81A00B6:: @ 81A00B6 .string "Okay?\l" .string "All right!$" -gUnknown_81A013B:: @ 81A013B +Route25_SeaCottage_Text_ThanksBudTakeThis:: @ 81A013B .string "BILL: Yeehah!\n" .string "Thanks, bud! I owe you one!\p" .string "So, did you come to see my\n" @@ -60,7 +60,7 @@ gUnknown_81A013B:: @ 81A013B .string "I've got to thank you…\n" .string "Oh, here, maybe this'll do.$" -gUnknown_81A01E4:: @ 81A01E4 +Route25_SeaCottage_Text_ThanksLadyTakeThis:: @ 81A01E4 .string "BILL: Yeehah!\n" .string "Thanks, lady! I owe you one!\p" .string "So, did you come to see my\n" @@ -70,14 +70,14 @@ gUnknown_81A01E4:: @ 81A01E4 .string "I've got to thank you…\n" .string "Oh, here, maybe this'll do.$" -gUnknown_81A028E:: @ 81A028E +Route25_SeaCottage_Text_ReceivedSSTicketFromBill:: @ 81A028E .string "{PLAYER} received an S.S. TICKET\n" .string "from BILL.$" -gUnknown_81A02B4:: @ 81A02B4 +Route25_SeaCottage_Text_YouveGotTooMuchStuff:: @ 81A02B4 .string "You've got too much stuff!$" -gUnknown_81A02CF:: @ 81A02CF +Route25_SeaCottage_Text_SSAnnePartyYouGoInstead:: @ 81A02CF .string "That cruise ship S.S. ANNE is in\n" .string "VERMILION CITY.\p" .string "I hear there are lots of TRAINERS\n" @@ -87,22 +87,22 @@ gUnknown_81A02CF:: @ 81A02CF .string "Why don't you go instead of me?\n" .string "Go on and have a good time.$" -gUnknown_81A03AB:: @ 81A03AB +Route25_SeaCottage_Text_CheckOutRareMonsOnPC:: @ 81A03AB .string "BILL: Feel like checking out some\n" .string "of my rare POKéMON on my PC?\p" .string "Go on, check out my PC.$" -gUnknown_81A0402:: @ 81A0402 +Route25_SeaCottage_Text_TeleporterIsDisplayed:: @ 81A0402 .string "TELEPORTER is displayed on the PC\n" .string "monitor.$" -gUnknown_81A042D:: @ 81A042D +Route25_SeaCottage_Text_InitiatedTeleportersCellSeparator:: @ 81A042D .string "{PLAYER} initiated the TELEPORTER's\n" .string "Cell Separator.$" -gUnknown_81A045B:: @ 81A045B +Route25_SeaCottage_Text_BillsFavoriteMonList:: @ 81A045B .string "BILL's favorite POKéMON list!$" -Text_1A0479:: @ 81A0479 +Route25_SeaCottage_Text_SeeWhichMon:: @ 81A0479 .string "Which POKéMON do you want to see?$" diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index 67d34232c..c844cc115 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -59,19 +59,19 @@ PewterCity_Museum_1F_EventScript_PokemonJournalBrock:: @ 81ACE1C releaseall end -Route20_EventScript_1ACE36:: @ 81ACE36 +Route20_EventScript_Camper:: @ 81ACE36 lock faceplayer famechecker FAMECHECKER_MISTY, 3 - msgbox Text_1882E1 + msgbox Route20_Text_MistyTrainsHere release end -Route25_EventScript_1ACE4F:: @ 81ACE4F +Route25_EventScript_Beauty:: @ 81ACE4F lock faceplayer famechecker FAMECHECKER_MISTY, 4 - msgbox Text_189569 + msgbox Route25_Text_MistyHighHopesAboutThisPlace release end diff --git a/data/scripts/trainers.inc b/data/scripts/trainers.inc index 3d5f60008..d89d5a110 100644 --- a/data/scripts/trainers.inc +++ b/data/scripts/trainers.inc @@ -115,199 +115,199 @@ Route4_EventScript_CrissyRematch:: @ 81A95E0 msgbox Route4_Text_CrissyPostBattle, MSGBOX_AUTOCLOSE end -Route24_EventScript_1A95F7:: @ 81A95F7 - trainerbattle_single TRAINER_YOUNGSTER_TIMMY, Text_188F76, Text_188F95 +Route24_EventScript_Timmy:: @ 81A95F7 + trainerbattle_single TRAINER_YOUNGSTER_TIMMY, Route24_Text_TimmyIntro, Route24_Text_TimmyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A961E - msgbox Text_188FA7, MSGBOX_AUTOCLOSE + goto_if_eq Route24_EventScript_TimmyRematch + msgbox Route24_Text_TimmyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A961E:: @ 81A961E - trainerbattle_rematch TRAINER_YOUNGSTER_TIMMY, Text_1C3657, Text_188F95 - msgbox Text_188FA7, MSGBOX_AUTOCLOSE +Route24_EventScript_TimmyRematch:: @ 81A961E + trainerbattle_rematch TRAINER_YOUNGSTER_TIMMY, Route24_Text_TimmyRematchIntro, Route24_Text_TimmyDefeat + msgbox Route24_Text_TimmyPostBattle, MSGBOX_AUTOCLOSE end -Route24_EventScript_1A9635:: @ 81A9635 - trainerbattle_single TRAINER_BUG_CATCHER_CALE, Text_18901B, Text_18908C +Route24_EventScript_Cale:: @ 81A9635 + trainerbattle_single TRAINER_BUG_CATCHER_CALE, Route24_Text_CaleIntro, Route24_Text_CaleDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A965C - msgbox Text_18909E, MSGBOX_AUTOCLOSE + goto_if_eq Route24_EventScript_CaleRematch + msgbox Route24_Text_CalePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A965C:: @ 81A965C - trainerbattle_rematch TRAINER_BUG_CATCHER_CALE, Text_1C36DA, Text_18908C - msgbox Text_18909E, MSGBOX_AUTOCLOSE +Route24_EventScript_CaleRematch:: @ 81A965C + trainerbattle_rematch TRAINER_BUG_CATCHER_CALE, Route24_Text_CaleRematchIntro, Route24_Text_CaleDefeat + msgbox Route24_Text_CalePostBattle, MSGBOX_AUTOCLOSE end -Route24_EventScript_1A9673:: @ 81A9673 - trainerbattle_single TRAINER_LASS_RELI, Text_188F2C, Text_188F46 +Route24_EventScript_Reli:: @ 81A9673 + trainerbattle_single TRAINER_LASS_RELI, Route24_Text_ReliIntro, Route24_Text_ReliDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A969A - msgbox Text_188F53, MSGBOX_AUTOCLOSE + goto_if_eq Route24_EventScript_ReliRematch + msgbox Route24_Text_ReliPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A969A:: @ 81A969A - trainerbattle_rematch TRAINER_LASS_RELI, Text_1C3624, Text_188F46 - msgbox Text_188F53, MSGBOX_AUTOCLOSE +Route24_EventScript_ReliRematch:: @ 81A969A + trainerbattle_rematch TRAINER_LASS_RELI, Route24_Text_ReliRematchIntro, Route24_Text_ReliDefeat + msgbox Route24_Text_ReliPostBattle, MSGBOX_AUTOCLOSE end -Route24_EventScript_1A96B1:: @ 81A96B1 - trainerbattle_single TRAINER_LASS_ALI, Text_188FC9, Text_188FE7 +Route24_EventScript_Ali:: @ 81A96B1 + trainerbattle_single TRAINER_LASS_ALI, Route24_Text_AliIntro, Route24_Text_AliDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A96D8 - msgbox Text_188FF9, MSGBOX_AUTOCLOSE + goto_if_eq Route24_EventScript_AliRematch + msgbox Route24_Text_AliPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A96D8:: @ 81A96D8 - trainerbattle_rematch TRAINER_LASS_ALI, Text_1C3685, Text_188FE7 - msgbox Text_188FF9, MSGBOX_AUTOCLOSE +Route24_EventScript_AliRematch:: @ 81A96D8 + trainerbattle_rematch TRAINER_LASS_ALI, Route24_Text_AliRematchIntro, Route24_Text_AliDefeat + msgbox Route24_Text_AliPostBattle, MSGBOX_AUTOCLOSE end -Route24_EventScript_1A96EF:: @ 81A96EF - trainerbattle_single TRAINER_CAMPER_SHANE, Text_188E74, Text_188E94 +Route24_EventScript_Shane:: @ 81A96EF + trainerbattle_single TRAINER_CAMPER_SHANE, Route24_Text_ShaneIntro, Route24_Text_ShaneDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A9716 - msgbox Text_188EA3, MSGBOX_AUTOCLOSE + goto_if_eq Route24_EventScript_ShaneRematch + msgbox Route24_Text_ShanePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9716:: @ 81A9716 - trainerbattle_rematch TRAINER_CAMPER_SHANE, Text_1C35EE, Text_188E94 - msgbox Text_188EA3, MSGBOX_AUTOCLOSE +Route24_EventScript_ShaneRematch:: @ 81A9716 + trainerbattle_rematch TRAINER_CAMPER_SHANE, Route24_Text_ShaneRematchIntro, Route24_Text_ShaneDefeat + msgbox Route24_Text_ShanePostBattle, MSGBOX_AUTOCLOSE end -Route24_EventScript_1A972D:: @ 81A972D - trainerbattle_single TRAINER_CAMPER_ETHAN, Text_188ED9, Text_188EFA +Route24_EventScript_Ethan:: @ 81A972D + trainerbattle_single TRAINER_CAMPER_ETHAN, Route24_Text_EthanIntro, Route24_Text_EthanDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A9754 - msgbox Text_188F0A, MSGBOX_AUTOCLOSE + goto_if_eq Route24_EventScript_EthanRematch + msgbox Route24_Text_EthanPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9754:: @ 81A9754 - trainerbattle_rematch TRAINER_CAMPER_ETHAN, Text_1C360E, Text_188EFA - msgbox Text_188F0A, MSGBOX_AUTOCLOSE +Route24_EventScript_EthanRematch:: @ 81A9754 + trainerbattle_rematch TRAINER_CAMPER_ETHAN, Route24_Text_EthanRematchIntro, Route24_Text_EthanDefeat + msgbox Route24_Text_EthanPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_1A976B:: @ 81A976B - trainerbattle_single TRAINER_YOUNGSTER_JOEY, Text_1890C0, Text_1890E6 +Route25_EventScript_Joey:: @ 81A976B + trainerbattle_single TRAINER_YOUNGSTER_JOEY, Route25_Text_JoeyIntro, Route25_Text_JoeyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A9792 - msgbox Text_1890F5, MSGBOX_AUTOCLOSE + goto_if_eq Route25_EventScript_JoeyRematch + msgbox Route25_Text_JoeyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9792:: @ 81A9792 - trainerbattle_rematch TRAINER_YOUNGSTER_JOEY, Text_1C33E7, Text_1890E6 - msgbox Text_1890F5, MSGBOX_AUTOCLOSE +Route25_EventScript_JoeyRematch:: @ 81A9792 + trainerbattle_rematch TRAINER_YOUNGSTER_JOEY, Route25_Text_JoeyRematchIntro, Route25_Text_JoeyDefeat + msgbox Route25_Text_JoeyPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_1A97A9:: @ 81A97A9 - trainerbattle_single TRAINER_YOUNGSTER_DAN, Text_189165, Text_1891A6 +Route25_EventScript_Dan:: @ 81A97A9 + trainerbattle_single TRAINER_YOUNGSTER_DAN, Route25_Text_DanIntro, Route25_Text_DanDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A97D0 - msgbox Text_1891B3, MSGBOX_AUTOCLOSE + goto_if_eq Route25_EventScript_DanRematch + msgbox Route25_Text_DanPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A97D0:: @ 81A97D0 - trainerbattle_rematch TRAINER_YOUNGSTER_DAN, Text_1C3404, Text_1891A6 - msgbox Text_1891B3, MSGBOX_AUTOCLOSE +Route25_EventScript_DanRematch:: @ 81A97D0 + trainerbattle_rematch TRAINER_YOUNGSTER_DAN, Route25_Text_DanRematchIntro, Route25_Text_DanDefeat + msgbox Route25_Text_DanPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_1A97E7:: @ 81A97E7 - trainerbattle_single TRAINER_YOUNGSTER_CHAD, Text_1892A9, Text_1892D9 +Route25_EventScript_Chad:: @ 81A97E7 + trainerbattle_single TRAINER_YOUNGSTER_CHAD, Route25_Text_ChadIntro, Route25_Text_ChadDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A980E - msgbox Text_1892EF, MSGBOX_AUTOCLOSE + goto_if_eq Route25_EventScript_ChadRematch + msgbox Route25_Text_ChadPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A980E:: @ 81A980E - trainerbattle_rematch TRAINER_YOUNGSTER_CHAD, Text_1C34D4, Text_1892D9 - msgbox Text_1892EF, MSGBOX_AUTOCLOSE +Route25_EventScript_ChadRematch:: @ 81A980E + trainerbattle_rematch TRAINER_YOUNGSTER_CHAD, Route25_Text_ChadRematchIntro, Route25_Text_ChadDefeat + msgbox Route25_Text_ChadPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_1A9825:: @ 81A9825 - trainerbattle_single TRAINER_PICNICKER_KELSEY, Text_189247, Text_189261 +Route25_EventScript_Kelsey:: @ 81A9825 + trainerbattle_single TRAINER_PICNICKER_KELSEY, Route25_Text_KelseyIntro, Route25_Text_KelseyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A984C - msgbox Text_189281, MSGBOX_AUTOCLOSE + goto_if_eq Route25_EventScript_KelseyRematch + msgbox Route25_Text_KelseyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A984C:: @ 81A984C - trainerbattle_rematch TRAINER_PICNICKER_KELSEY, Text_1C349C, Text_189261 - msgbox Text_189281, MSGBOX_AUTOCLOSE +Route25_EventScript_KelseyRematch:: @ 81A984C + trainerbattle_rematch TRAINER_PICNICKER_KELSEY, Route25_Text_KelseyRematchIntro, Route25_Text_KelseyDefeat + msgbox Route25_Text_KelseyPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_1A9863:: @ 81A9863 - trainerbattle_single TRAINER_LASS_HALEY, Text_189333, Text_189364 +Route25_EventScript_Haley:: @ 81A9863 + trainerbattle_single TRAINER_LASS_HALEY, Route25_Text_HaleyIntro, Route25_Text_HaleyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A988A - msgbox Text_189378, MSGBOX_AUTOCLOSE + goto_if_eq Route25_EventScript_HaleyRematch + msgbox Route25_Text_HaleyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A988A:: @ 81A988A - trainerbattle_rematch TRAINER_LASS_HALEY, Text_1C350A, Text_189364 - msgbox Text_189378, MSGBOX_AUTOCLOSE +Route25_EventScript_HaleyRematch:: @ 81A988A + trainerbattle_rematch TRAINER_LASS_HALEY, Route25_Text_HaleyRematchIntro, Route25_Text_HaleyDefeat + msgbox Route25_Text_HaleyPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_1A98A1:: @ 81A98A1 - trainerbattle_single TRAINER_HIKER_FRANKLIN, Text_1893A7, Text_1893EA +Route25_EventScript_Franklin:: @ 81A98A1 + trainerbattle_single TRAINER_HIKER_FRANKLIN, Route25_Text_FranklinIntro, Route25_Text_FranklinDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A98C8 - msgbox Text_1893FB, MSGBOX_AUTOCLOSE + goto_if_eq Route25_EventScript_FranklinRematch + msgbox Route25_Text_FranklinPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A98C8:: @ 81A98C8 - trainerbattle_rematch TRAINER_HIKER_FRANKLIN, Text_1C353B, Text_1893EA - msgbox Text_1893FB, MSGBOX_AUTOCLOSE +Route25_EventScript_FranklinRematch:: @ 81A98C8 + trainerbattle_rematch TRAINER_HIKER_FRANKLIN, Route25_Text_FranklinRematchIntro, Route25_Text_FranklinDefeat + msgbox Route25_Text_FranklinPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_1A98DF:: @ 81A98DF - trainerbattle_single TRAINER_HIKER_NOB, Text_189423, Text_189459 +Route25_EventScript_Nob:: @ 81A98DF + trainerbattle_single TRAINER_HIKER_NOB, Route25_Text_NobIntro, Route25_Text_NobDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A9906 - msgbox Text_18947E, MSGBOX_AUTOCLOSE + goto_if_eq Route25_EventScript_NobRematch + msgbox Route25_Text_NobPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9906:: @ 81A9906 - trainerbattle_rematch TRAINER_HIKER_NOB, Text_1C357E, Text_189459 - msgbox Text_18947E, MSGBOX_AUTOCLOSE +Route25_EventScript_NobRematch:: @ 81A9906 + trainerbattle_rematch TRAINER_HIKER_NOB, Route25_Text_NobRematchIntro, Route25_Text_NobDefeat + msgbox Route25_Text_NobPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_1A991D:: @ 81A991D - trainerbattle_single TRAINER_HIKER_WAYNE, Text_1894DE, Text_18950A +Route25_EventScript_Wayne:: @ 81A991D + trainerbattle_single TRAINER_HIKER_WAYNE, Route25_Text_WayneIntro, Route25_Text_WayneDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A9944 - msgbox Text_18951C, MSGBOX_AUTOCLOSE + goto_if_eq Route25_EventScript_WayneRematch + msgbox Route25_Text_WaynePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9944:: @ 81A9944 - trainerbattle_rematch TRAINER_HIKER_WAYNE, Text_1C35BC, Text_18950A - msgbox Text_18951C, MSGBOX_AUTOCLOSE +Route25_EventScript_WayneRematch:: @ 81A9944 + trainerbattle_rematch TRAINER_HIKER_WAYNE, Route25_Text_WayneRematchIntro, Route25_Text_WayneDefeat + msgbox Route25_Text_WaynePostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_1A995B:: @ 81A995B - trainerbattle_single TRAINER_CAMPER_FLINT, Text_1891EB, Text_189212 +Route25_EventScript_Flint:: @ 81A995B + trainerbattle_single TRAINER_CAMPER_FLINT, Route25_Text_FlintIntro, Route25_Text_FlintDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A9982 - msgbox Text_18921D, MSGBOX_AUTOCLOSE + goto_if_eq Route25_EventScript_FlintRematch + msgbox Route25_Text_FlintPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1A9982:: @ 81A9982 - trainerbattle_rematch TRAINER_CAMPER_FLINT, Text_1C3445, Text_189212 - msgbox Text_18921D, MSGBOX_AUTOCLOSE +Route25_EventScript_FlintRematch:: @ 81A9982 + trainerbattle_rematch TRAINER_CAMPER_FLINT, Route25_Text_FlintRematchIntro, Route25_Text_FlintDefeat + msgbox Route25_Text_FlintPostBattle, MSGBOX_AUTOCLOSE end Route6_EventScript_Keigo:: @ 81A9999 @@ -1870,264 +1870,264 @@ EventScript_1AB6EE:: @ 81AB6EE msgbox Text_187DAD, MSGBOX_AUTOCLOSE end -Route20_EventScript_1AB709:: @ 81AB709 - trainerbattle_single TRAINER_SWIMMER_MALE_BARRY, Text_187E40, Text_187E7B +Route20_EventScript_Barry:: @ 81AB709 + trainerbattle_single TRAINER_SWIMMER_MALE_BARRY, Route20_Text_BarryIntro, Route20_Text_BarryDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB730 - msgbox Text_187E83, MSGBOX_AUTOCLOSE + goto_if_eq Route20_EventScript_BarryRematch + msgbox Route20_Text_BarryPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB730:: @ 81AB730 - trainerbattle_rematch TRAINER_SWIMMER_MALE_BARRY, Text_1C2FF3, Text_187E7B - msgbox Text_187E83, MSGBOX_AUTOCLOSE +Route20_EventScript_BarryRematch:: @ 81AB730 + trainerbattle_rematch TRAINER_SWIMMER_MALE_BARRY, Route20_Text_BarryRematchIntro, Route20_Text_BarryDefeat + msgbox Route20_Text_BarryPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_1AB747:: @ 81AB747 - trainerbattle_single TRAINER_SWIMMER_MALE_DEAN, Text_187FDB, Text_187FF7 +Route20_EventScript_Dean:: @ 81AB747 + trainerbattle_single TRAINER_SWIMMER_MALE_DEAN, Route20_Text_DeanIntro, Route20_Text_DeanDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB76E - msgbox Text_187FFE, MSGBOX_AUTOCLOSE + goto_if_eq Route20_EventScript_DeanRematch + msgbox Route20_Text_DeanPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB76E:: @ 81AB76E - trainerbattle_rematch TRAINER_SWIMMER_MALE_DEAN, Text_1C30B0, Text_187FF7 - msgbox Text_187FFE, MSGBOX_AUTOCLOSE +Route20_EventScript_DeanRematch:: @ 81AB76E + trainerbattle_rematch TRAINER_SWIMMER_MALE_DEAN, Route20_Text_DeanRematchIntro, Route20_Text_DeanDefeat + msgbox Route20_Text_DeanPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_1AB785:: @ 81AB785 - trainerbattle_single TRAINER_SWIMMER_MALE_DARRIN, Text_18802E, Text_18805C +Route20_EventScript_Darrin:: @ 81AB785 + trainerbattle_single TRAINER_SWIMMER_MALE_DARRIN, Route20_Text_DarrinIntro, Route20_Text_DarrinDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB7AC - msgbox Text_18806D, MSGBOX_AUTOCLOSE + goto_if_eq Route20_EventScript_DarrinRematch + msgbox Route20_Text_DarrinPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB7AC:: @ 81AB7AC - trainerbattle_rematch TRAINER_SWIMMER_MALE_DARRIN, Text_1C30ED, Text_18805C - msgbox Text_18806D, MSGBOX_AUTOCLOSE +Route20_EventScript_DarrinRematch:: @ 81AB7AC + trainerbattle_rematch TRAINER_SWIMMER_MALE_DARRIN, Route20_Text_DarrinRematchIntro, Route20_Text_DarrinDefeat + msgbox Route20_Text_DarrinPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_1AB7C3:: @ 81AB7C3 - trainerbattle_single TRAINER_SWIMMER_FEMALE_TIFFANY, Text_187F24, Text_187F5A +Route20_EventScript_Tiffany:: @ 81AB7C3 + trainerbattle_single TRAINER_SWIMMER_FEMALE_TIFFANY, Route20_Text_TiffanyIntro, Route20_Text_TiffanyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB7EA - msgbox Text_187F61, MSGBOX_AUTOCLOSE + goto_if_eq Route20_EventScript_TiffanyRematch + msgbox Route20_Text_TiffanyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB7EA:: @ 81AB7EA - trainerbattle_rematch TRAINER_SWIMMER_FEMALE_TIFFANY, Text_1C305F, Text_187F5A - msgbox Text_187F61, MSGBOX_AUTOCLOSE +Route20_EventScript_TiffanyRematch:: @ 81AB7EA + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_TIFFANY, Route20_Text_TiffanyRematchIntro, Route20_Text_TiffanyDefeat + msgbox Route20_Text_TiffanyPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_1AB801:: @ 81AB801 - trainerbattle_single TRAINER_SWIMMER_FEMALE_NORA, Text_1880F8, Text_188119 +Route20_EventScript_Nora:: @ 81AB801 + trainerbattle_single TRAINER_SWIMMER_FEMALE_NORA, Route20_Text_NoraIntro, Route20_Text_NoraDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB828 - msgbox Text_188139, MSGBOX_AUTOCLOSE + goto_if_eq Route20_EventScript_NoraRematch + msgbox Route20_Text_NoraPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB828:: @ 81AB828 - trainerbattle_rematch TRAINER_SWIMMER_FEMALE_NORA, Text_1C3149, Text_188119 - msgbox Text_188139, MSGBOX_AUTOCLOSE +Route20_EventScript_NoraRematch:: @ 81AB828 + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_NORA, Route20_Text_NoraRematchIntro, Route20_Text_NoraDefeat + msgbox Route20_Text_NoraPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_1AB83F:: @ 81AB83F - trainerbattle_single TRAINER_SWIMMER_FEMALE_MELISSA, Text_188218, Text_18825C +Route20_EventScript_Melissa:: @ 81AB83F + trainerbattle_single TRAINER_SWIMMER_FEMALE_MELISSA, Route20_Text_MelissaIntro, Route20_Text_MelissaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB866 - msgbox Text_18827B, MSGBOX_AUTOCLOSE + goto_if_eq Route20_EventScript_MelissaRematch + msgbox Route20_Text_MelissaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB866:: @ 81AB866 - trainerbattle_rematch TRAINER_SWIMMER_FEMALE_MELISSA, Text_1C31C4, Text_18825C - msgbox Text_18827B, MSGBOX_AUTOCLOSE +Route20_EventScript_MelissaRematch:: @ 81AB866 + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_MELISSA, Route20_Text_MelissaRematchIntro, Route20_Text_MelissaDefeat + msgbox Route20_Text_MelissaPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_1AB87D:: @ 81AB87D - trainerbattle_single TRAINER_SWIMMER_FEMALE_SHIRLEY, Text_187EBB, Text_187EED +Route20_EventScript_Shirley:: @ 81AB87D + trainerbattle_single TRAINER_SWIMMER_FEMALE_SHIRLEY, Route20_Text_ShirleyIntro, Route20_Text_ShirleyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB8A4 - msgbox Text_187EF6, MSGBOX_AUTOCLOSE + goto_if_eq Route20_EventScript_ShirleyRematch + msgbox Route20_Text_ShirleyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB8A4:: @ 81AB8A4 - trainerbattle_rematch TRAINER_SWIMMER_FEMALE_SHIRLEY, Text_1C302E, Text_187EED - msgbox Text_187EF6, MSGBOX_AUTOCLOSE +Route20_EventScript_ShirleyRematch:: @ 81AB8A4 + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_SHIRLEY, Route20_Text_ShirleyRematchIntro, Route20_Text_ShirleyDefeat + msgbox Route20_Text_ShirleyPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_1AB8BB:: @ 81AB8BB - trainerbattle_single TRAINER_BIRD_KEEPER_ROGER, Text_18808E, Text_1880AB +Route20_EventScript_Roger:: @ 81AB8BB + trainerbattle_single TRAINER_BIRD_KEEPER_ROGER, Route20_Text_RogerIntro, Route20_Text_RogerDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB8E2 - msgbox Text_1880C8, MSGBOX_AUTOCLOSE + goto_if_eq Route20_EventScript_RogerRematch + msgbox Route20_Text_RogerPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB8E2:: @ 81AB8E2 - trainerbattle_rematch TRAINER_BIRD_KEEPER_ROGER, Text_1C312C, Text_1880AB - msgbox Text_1880C8, MSGBOX_AUTOCLOSE +Route20_EventScript_RogerRematch:: @ 81AB8E2 + trainerbattle_rematch TRAINER_BIRD_KEEPER_ROGER, Route20_Text_RogerRematchIntro, Route20_Text_RogerDefeat + msgbox Route20_Text_RogerPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_1AB8F9:: @ 81AB8F9 - trainerbattle_single TRAINER_PICNICKER_MISSY, Text_188165, Text_1881A3 +Route20_EventScript_Missy:: @ 81AB8F9 + trainerbattle_single TRAINER_PICNICKER_MISSY, Route20_Text_MissyIntro, Route20_Text_MissyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB920 - msgbox Text_1881B8, MSGBOX_AUTOCLOSE + goto_if_eq Route20_EventScript_MissyRematch + msgbox Route20_Text_MissyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB920:: @ 81AB920 - trainerbattle_rematch TRAINER_PICNICKER_MISSY, Text_1C3185, Text_1881A3 - msgbox Text_1881B8, MSGBOX_AUTOCLOSE +Route20_EventScript_MissyRematch:: @ 81AB920 + trainerbattle_rematch TRAINER_PICNICKER_MISSY, Route20_Text_MissyRematchIntro, Route20_Text_MissyDefeat + msgbox Route20_Text_MissyPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_1AB937:: @ 81AB937 - trainerbattle_single TRAINER_PICNICKER_IRENE, Text_187F78, Text_187F92 +Route20_EventScript_Irene:: @ 81AB937 + trainerbattle_single TRAINER_PICNICKER_IRENE, Route20_Text_IreneIntro, Route20_Text_IreneDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB95E - msgbox Text_187FA3, MSGBOX_AUTOCLOSE + goto_if_eq Route20_EventScript_IreneRematch + msgbox Route20_Text_IrenePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB95E:: @ 81AB95E - trainerbattle_rematch TRAINER_PICNICKER_IRENE, Text_1C3095, Text_187F92 - msgbox Text_187FA3, MSGBOX_AUTOCLOSE +Route20_EventScript_IreneRematch:: @ 81AB95E + trainerbattle_rematch TRAINER_PICNICKER_IRENE, Route20_Text_IreneRematchIntro, Route20_Text_IreneDefeat + msgbox Route20_Text_IrenePostBattle, MSGBOX_AUTOCLOSE end -Route21_North_EventScript_1AB975:: @ 81AB975 - trainerbattle_single TRAINER_FISHERMAN_RONALD, Text_18835A, Text_188383 +Route21_North_EventScript_Ronald:: @ 81AB975 + trainerbattle_single TRAINER_FISHERMAN_RONALD, Route21_North_Text_RonaldIntro, Route21_North_Text_RonaldDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB99C - msgbox Text_188389, MSGBOX_AUTOCLOSE + goto_if_eq Route21_North_EventScript_RonaldRematch + msgbox Route21_North_Text_RonaldPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB99C:: @ 81AB99C - trainerbattle_rematch TRAINER_FISHERMAN_RONALD, Text_1C3208, Text_188383 - msgbox Text_188389, MSGBOX_AUTOCLOSE +Route21_North_EventScript_RonaldRematch:: @ 81AB99C + trainerbattle_rematch TRAINER_FISHERMAN_RONALD, Route21_North_Text_RonaldRematchIntro, Route21_North_Text_RonaldDefeat + msgbox Route21_North_Text_RonaldPostBattle, MSGBOX_AUTOCLOSE end -Route21_South_EventScript_1AB9B3:: @ 81AB9B3 - trainerbattle_single TRAINER_FISHERMAN_CLAUDE, Text_1885D8, Text_1885F8 +Route21_South_EventScript_Claude:: @ 81AB9B3 + trainerbattle_single TRAINER_FISHERMAN_CLAUDE, Route21_South_Text_ClaudeIntro, Route21_South_Text_ClaudeDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AB9DA - msgbox Text_188632, MSGBOX_AUTOCLOSE + goto_if_eq Route21_South_EventScript_ClaudeRematch + msgbox Route21_South_Text_ClaudePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AB9DA:: @ 81AB9DA - trainerbattle_rematch TRAINER_FISHERMAN_CLAUDE, Text_1C331D, Text_1885F8 - msgbox Text_188632, MSGBOX_AUTOCLOSE +Route21_South_EventScript_ClaudeRematch:: @ 81AB9DA + trainerbattle_rematch TRAINER_FISHERMAN_CLAUDE, Route21_South_Text_ClaudeRematchIntro, Route21_South_Text_ClaudeDefeat + msgbox Route21_South_Text_ClaudePostBattle, MSGBOX_AUTOCLOSE end -Route21_North_EventScript_1AB9F1:: @ 81AB9F1 - trainerbattle_single TRAINER_FISHERMAN_WADE, Text_1883C6, Text_1883E9 +Route21_North_EventScript_Wade:: @ 81AB9F1 + trainerbattle_single TRAINER_FISHERMAN_WADE, Route21_North_Text_WadeIntro, Route21_North_Text_WadeDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABA18 - msgbox Text_18841D, MSGBOX_AUTOCLOSE + goto_if_eq Route21_North_EventScript_WadeRematch + msgbox Route21_North_Text_WadePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABA18:: @ 81ABA18 - trainerbattle_rematch TRAINER_FISHERMAN_WADE, Text_1C3231, Text_1883E9 - msgbox Text_18841D, MSGBOX_AUTOCLOSE +Route21_North_EventScript_WadeRematch:: @ 81ABA18 + trainerbattle_rematch TRAINER_FISHERMAN_WADE, Route21_North_Text_WadeRematchIntro, Route21_North_Text_WadeDefeat + msgbox Route21_North_Text_WadePostBattle, MSGBOX_AUTOCLOSE end -Route21_South_EventScript_1ABA2F:: @ 81ABA2F - trainerbattle_single TRAINER_FISHERMAN_NOLAN, Text_18868C, Text_1886AE +Route21_South_EventScript_Nolan:: @ 81ABA2F + trainerbattle_single TRAINER_FISHERMAN_NOLAN, Route21_South_Text_NolanIntro, Route21_South_Text_NolanDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABA56 - msgbox Text_1886C5, MSGBOX_AUTOCLOSE + goto_if_eq Route21_South_EventScript_NolanRematch + msgbox Route21_South_Text_NolanPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABA56:: @ 81ABA56 - trainerbattle_rematch TRAINER_FISHERMAN_NOLAN, Text_1C3356, Text_1886AE - msgbox Text_1886C5, MSGBOX_AUTOCLOSE +Route21_South_EventScript_NolanRematch:: @ 81ABA56 + trainerbattle_rematch TRAINER_FISHERMAN_NOLAN, Route21_South_Text_NolanRematchIntro, Route21_South_Text_NolanDefeat + msgbox Route21_South_Text_NolanPostBattle, MSGBOX_AUTOCLOSE end -Route21_North_EventScript_1ABA6D:: @ 81ABA6D - trainerbattle_single TRAINER_SWIMMER_MALE_SPENCER, Text_18843C, Text_18845F +Route21_North_EventScript_Spencer:: @ 81ABA6D + trainerbattle_single TRAINER_SWIMMER_MALE_SPENCER, Route21_North_Text_SpencerIntro, Route21_North_Text_SpencerDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABA94 - msgbox Text_188465, MSGBOX_AUTOCLOSE + goto_if_eq Route21_North_EventScript_SpencerRematch + msgbox Route21_North_Text_SpencerPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABA94:: @ 81ABA94 - trainerbattle_rematch TRAINER_SWIMMER_MALE_SPENCER, Text_1C3264, Text_18845F - msgbox Text_188465, MSGBOX_AUTOCLOSE +Route21_North_EventScript_SpencerRematch:: @ 81ABA94 + trainerbattle_rematch TRAINER_SWIMMER_MALE_SPENCER, Route21_North_Text_SpencerRematchIntro, Route21_North_Text_SpencerDefeat + msgbox Route21_North_Text_SpencerPostBattle, MSGBOX_AUTOCLOSE end -Route21_South_EventScript_1ABAAB:: @ 81ABAAB - trainerbattle_single TRAINER_SWIMMER_MALE_JACK, Text_1884D4, Text_1884F0 +Route21_South_EventScript_Jack:: @ 81ABAAB + trainerbattle_single TRAINER_SWIMMER_MALE_JACK, Route21_South_Text_JackIntro, Route21_South_Text_JackDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABAD2 - msgbox Text_1884FF, MSGBOX_AUTOCLOSE + goto_if_eq Route21_South_EventScript_JackRematch + msgbox Route21_South_Text_JackPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABAD2:: @ 81ABAD2 - trainerbattle_rematch TRAINER_SWIMMER_MALE_JACK, Text_1C3298, Text_1884F0 - msgbox Text_1884FF, MSGBOX_AUTOCLOSE +Route21_South_EventScript_JackRematch:: @ 81ABAD2 + trainerbattle_rematch TRAINER_SWIMMER_MALE_JACK, Route21_South_Text_JackRematchIntro, Route21_South_Text_JackDefeat + msgbox Route21_South_Text_JackPostBattle, MSGBOX_AUTOCLOSE end -Route21_South_EventScript_1ABAE9:: @ 81ABAE9 - trainerbattle_single TRAINER_SWIMMER_MALE_JEROME, Text_18851F, Text_188543 +Route21_South_EventScript_Jerome:: @ 81ABAE9 + trainerbattle_single TRAINER_SWIMMER_MALE_JEROME, Route21_South_Text_JeromeIntro, Route21_South_Text_JeromeDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABB10 - msgbox Text_188555, MSGBOX_AUTOCLOSE + goto_if_eq Route21_South_EventScript_JeromeRematch + msgbox Route21_South_Text_JeromePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABB10:: @ 81ABB10 - trainerbattle_rematch TRAINER_SWIMMER_MALE_JEROME, Text_1C32D3, Text_188543 - msgbox Text_188555, MSGBOX_AUTOCLOSE +Route21_South_EventScript_JeromeRematch:: @ 81ABB10 + trainerbattle_rematch TRAINER_SWIMMER_MALE_JEROME, Route21_South_Text_JeromeRematchIntro, Route21_South_Text_JeromeDefeat + msgbox Route21_South_Text_JeromePostBattle, MSGBOX_AUTOCLOSE end -Route21_South_EventScript_1ABB27:: @ 81ABB27 - trainerbattle_single TRAINER_SWIMMER_MALE_ROLAND, Text_188592, Text_1885B2 +Route21_South_EventScript_Roland:: @ 81ABB27 + trainerbattle_single TRAINER_SWIMMER_MALE_ROLAND, Route21_South_Text_RolandIntro, Route21_South_Text_RolandDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABB4E - msgbox Text_1885BF, MSGBOX_AUTOCLOSE + goto_if_eq Route21_South_EventScript_RolandRematch + msgbox Route21_South_Text_RolandPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABB4E:: @ 81ABB4E - trainerbattle_rematch TRAINER_SWIMMER_MALE_ROLAND, Text_1C32FD, Text_1885B2 - msgbox Text_1885BF, MSGBOX_AUTOCLOSE +Route21_South_EventScript_RolandRematch:: @ 81ABB4E + trainerbattle_rematch TRAINER_SWIMMER_MALE_ROLAND, Route21_South_Text_RolandRematchIntro, Route21_South_Text_RolandDefeat + msgbox Route21_South_Text_RolandPostBattle, MSGBOX_AUTOCLOSE end -Route21_North_EventScript_1ABB65:: @ 81ABB65 - trainerbattle_double TRAINER_SIS_AND_BRO_LIL_IAN, Text_1886E2, Text_188712, Text_18875E +Route21_North_EventScript_Lil:: @ 81ABB65 + trainerbattle_double TRAINER_SIS_AND_BRO_LIL_IAN, Route21_North_Text_LilIntro, Route21_North_Text_LilDefeat, Route21_North_Text_LilNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABB90 - msgbox Text_188734, MSGBOX_AUTOCLOSE + goto_if_eq Route21_North_EventScript_LilRematch + msgbox Route21_North_Text_LilPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABB90:: @ 81ABB90 - trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIL_IAN, Text_1C3378, Text_188712, Text_18875E - msgbox Text_188734, MSGBOX_AUTOCLOSE +Route21_North_EventScript_LilRematch:: @ 81ABB90 + trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIL_IAN, Route21_North_Text_LilRematchIntro, Route21_North_Text_LilDefeat, Route21_North_Text_LilNotEnoughMons + msgbox Route21_North_Text_LilPostBattle, MSGBOX_AUTOCLOSE end -Route21_North_EventScript_1ABBAB:: @ 81ABBAB - trainerbattle_double TRAINER_SIS_AND_BRO_LIL_IAN, Text_1887B4, Text_1887F1, Text_188850 +Route21_North_EventScript_Ian:: @ 81ABBAB + trainerbattle_double TRAINER_SIS_AND_BRO_LIL_IAN, Route21_North_Text_IanIntro, Route21_North_Text_IanDefeat, Route21_North_Text_IanNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABBD6 - msgbox Text_188812, MSGBOX_AUTOCLOSE + goto_if_eq Route21_North_EventScript_IanRematch + msgbox Route21_North_Text_IanPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABBD6:: @ 81ABBD6 - trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIL_IAN, Text_1C33AE, Text_1887F1, Text_188850 - msgbox Text_188812, MSGBOX_AUTOCLOSE +Route21_North_EventScript_IanRematch:: @ 81ABBD6 + trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIL_IAN, Route21_North_Text_IanRematchIntro, Route21_North_Text_IanDefeat, Route21_North_Text_IanNotEnoughMons + msgbox Route21_North_Text_IanPostBattle, MSGBOX_AUTOCLOSE end OneIsland_KindleRoad_EventScript_1ABBF1:: @ 81ABBF1 diff --git a/data/text/trainers.inc b/data/text/trainers.inc index 1d3d373af..94b41ba41 100644 --- a/data/text/trainers.inc +++ b/data/text/trainers.inc @@ -559,147 +559,147 @@ Text_1C2FAE:: @ 81C2FAE .string "about POKéMON.\p" .string "I wonder if I'm better?$" -Text_1C2FF3:: @ 81C2FF3 +Route20_Text_BarryRematchIntro:: @ 81C2FF3 .string "The water is shallow here.\n" .string "There are many people swimming.$" -Text_1C302E:: @ 81C302E +Route20_Text_ShirleyRematchIntro:: @ 81C302E .string "Are you jealous that I'm\n" .string "vacationing on SEAFOAM?$" -Text_1C305F:: @ 81C305F +Route20_Text_TiffanyRematchIntro:: @ 81C305F .string "I love floating with the fishes\n" .string "here among the waves.$" -Text_1C3095:: @ 81C3095 +Route20_Text_IreneRematchIntro:: @ 81C3095 .string "Were you on vacation, too?$" -Text_1C30B0:: @ 81C30B0 +Route20_Text_DeanRematchIntro:: @ 81C30B0 .string "Check out my physique!\p" .string "It's even more buff than ever\n" .string "before!$" -Text_1C30ED:: @ 81C30ED +Route20_Text_DarrinRematchIntro:: @ 81C30ED .string "Why are you riding a POKéMON?\n" .string "Haven't you learned to swim yet?$" -Text_1C312C:: @ 81C312C +Route20_Text_RogerRematchIntro:: @ 81C312C .string "I rode my bird POKéMON here.$" -Text_1C3149:: @ 81C3149 +Route20_Text_NoraRematchIntro:: @ 81C3149 .string "My boyfriend gave me big pearls.\n" .string "And, they've grown bigger!$" -Text_1C3185:: @ 81C3185 +Route20_Text_MissyRematchIntro:: @ 81C3185 .string "I swam here from CINNABAR ISLAND.\n" .string "It wasn't easy, like I said.$" -Text_1C31C4:: @ 81C31C4 +Route20_Text_MelissaRematchIntro:: @ 81C31C4 .string "CINNABAR, in the west, has a LAB\n" .string "for POKéMON.\p" .string "My daddy works there.$" -Text_1C3208:: @ 81C3208 +Route21_North_Text_RonaldRematchIntro:: @ 81C3208 .string "You want to know if the fish are\n" .string "biting?$" -Text_1C3231:: @ 81C3231 +Route21_North_Text_WadeRematchIntro:: @ 81C3231 .string "I got a big haul again!\n" .string "Wanna go for it once more?$" -Text_1C3264:: @ 81C3264 +Route21_North_Text_SpencerRematchIntro:: @ 81C3264 .string "The sea cleanses my body and soul!$" Text_1C3287:: @ 81C3287 .string "きょうも　およぎに\n" .string "きちまったぜ$" -Text_1C3298:: @ 81C3298 +Route21_South_Text_JackRematchIntro:: @ 81C3298 .string "I caught my POKéMON at sea.\n" .string "And that's where I train them.$" -Text_1C32D3:: @ 81C32D3 +Route21_South_Text_JeromeRematchIntro:: @ 81C32D3 .string "Right now, I'm in another triathlon\n" .string "meet!$" -Text_1C32FD:: @ 81C32FD +Route21_South_Text_RolandRematchIntro:: @ 81C32FD .string "Ahh!\n" .string "Feel the sun and the wind!$" -Text_1C331D:: @ 81C331D +Route21_South_Text_ClaudeRematchIntro:: @ 81C331D .string "Hey, cut it out already.\n" .string "You always scare away the fish!$" -Text_1C3356:: @ 81C3356 +Route21_South_Text_NolanRematchIntro:: @ 81C3356 .string "Keep me company till I get a hit.$" -Text_1C3378:: @ 81C3378 +Route21_North_Text_LilRematchIntro:: @ 81C3378 .string "LIL: Huh? A battle again?\n" .string "IAN, can't you do it alone?$" -Text_1C33AE:: @ 81C33AE +Route21_North_Text_IanRematchIntro:: @ 81C33AE .string "IAN: My sis is still a slob.\n" .string "Help me get her into shape!$" -Text_1C33E7:: @ 81C33E7 +Route25_Text_JoeyRematchIntro:: @ 81C33E7 .string "I won't lose while I'm here!$" -Text_1C3404:: @ 81C3404 +Route25_Text_DanRematchIntro:: @ 81C3404 .string "Dad took me to a great party on\n" .string "the S.S. ANNE at VERMILION CITY.$" -Text_1C3445:: @ 81C3445 +Route25_Text_FlintRematchIntro:: @ 81C3445 .string "I'm a cool guy.\n" .string "I've got a girlfriend!\p" .string "I'll show her how cool I am for\n" .string "sure this time!$" -Text_1C349C:: @ 81C349C +Route25_Text_KelseyRematchIntro:: @ 81C349C .string "Hi!\n" .string "My boyfriend is cool!\l" .string "My conditioning's good today!$" -Text_1C34D4:: @ 81C34D4 +Route25_Text_ChadRematchIntro:: @ 81C34D4 .string "I had this feeling…\n" .string "I knew I had to battle you again!$" -Text_1C350A:: @ 81C350A +Route25_Text_HaleyRematchIntro:: @ 81C350A .string "My friend has many cute POKéMON.\n" .string "I'm so jealous!$" -Text_1C353B:: @ 81C353B +Route25_Text_FranklinRematchIntro:: @ 81C353B .string "I just trained up on MT. MOON,\n" .string "but I've still got gas in the tank!$" -Text_1C357E:: @ 81C357E +Route25_Text_NobRematchIntro:: @ 81C357E .string "A POKéMANIAC lives on the cape.\n" .string "Have you seen his collection?$" -Text_1C35BC:: @ 81C35BC +Route25_Text_WayneRematchIntro:: @ 81C35BC .string "You're going to see BILL again?\n" .string "First, we battle!$" -Text_1C35EE:: @ 81C35EE +Route24_Text_ShaneRematchIntro:: @ 81C35EE .string "I saw your feat from the grass!$" -Text_1C360E:: @ 81C360E +Route24_Text_EthanRematchIntro:: @ 81C360E .string "Okay!\n" .string "I'll stomp you!$" -Text_1C3624:: @ 81C3624 +Route24_Text_ReliRematchIntro:: @ 81C3624 .string "You always look so busy…\n" .string "Aren't you getting tired?$" -Text_1C3657:: @ 81C3657 +Route24_Text_TimmyRematchIntro:: @ 81C3657 .string "You really must love coming to\n" .string "NUGGET BRIDGE.$" -Text_1C3685:: @ 81C3685 +Route24_Text_AliRematchIntro:: @ 81C3685 .string "The time we battled…\p" .string "Even though I was the second in\n" .string "line, I was the best, wasn't I?$" -Text_1C36DA:: @ 81C36DA +Route24_Text_CaleRematchIntro:: @ 81C36DA .string "People call this the NUGGET\n" .string "BRIDGE!\p" .string "You've already beaten us, so you're\n" -- cgit v1.2.3 From 15dbc5895968847ce6b558180c18d84b867702dc Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 25 Feb 2020 02:45:33 -0500 Subject: Document teleporter and escalator anim --- data/maps/Route25_SeaCottage/scripts.inc | 6 +++--- data/specials.inc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'data') diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 8bfa00a21..02464c191 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -177,7 +177,7 @@ Route25_SeaCottage_EventScript_RunCellSeparator:: @ 81706FA playse SE_PIN waitse setvar VAR_0x8004, 0 - special sub_809C4A8 + special AnimateTeleporterHousing delay 10 call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE @@ -187,9 +187,9 @@ Route25_SeaCottage_EventScript_RunCellSeparator:: @ 81706FA call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE setvar VAR_0x8004, 1 - special sub_809C4A8 + special AnimateTeleporterHousing playse SE_TK_WARPIN - special sub_809C5FC + special AnimateTeleporterCable waitse call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE diff --git a/data/specials.inc b/data/specials.inc index 4ed38160d..19ea756a7 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -445,9 +445,9 @@ gSpecials:: @ 815FD60 def_special Special_BrailleCursorToggle def_special Script_ResetUnionRoomTrade def_special Special_PlayerPartyContainsSpeciesWithPlayerID - def_special sub_809C4A8 + def_special AnimateTeleporterHousing def_special IsDodrioInParty - def_special sub_809C5FC + def_special AnimateTeleporterCable def_special Special_InitElevatorFloorSelectMenuPos def_special Special_ComputeLoreleiDollCollection def_special Special_LoopWingFlapSound -- cgit v1.2.3 From 20118dbc3126813dd382222706b58e8882b4218b Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 25 Feb 2020 02:53:14 -0500 Subject: Finish Route 24/25 --- data/maps/Route24/scripts.inc | 36 +++++++++++++++++--------------- data/maps/Route25_SeaCottage/scripts.inc | 4 ++-- 2 files changed, 21 insertions(+), 19 deletions(-) (limited to 'data') diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index e21bf114c..7a22f64e8 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -1,3 +1,5 @@ +.equ LOCALID_ROCKET, 1 + Route24_MapScripts:: @ 816861F .byte 0 @@ -10,7 +12,7 @@ Route24_EventScript_Rocket:: @ 8168620 checkitemspace ITEM_NUGGET, 1 compare VAR_RESULT, FALSE goto_if_eq Route24_EventScript_NoRoomForNugget - call Route24_EventScript_ReceiveNugget + call Route24_EventScript_BattleRocket release end @@ -39,61 +41,61 @@ Route24_EventScript_RocketTriggerRight:: @ 816866C Route24_EventScript_RocketTrigger:: @ 8168678 textcolor 0 compare VAR_TEMP_1, 0 - call_if_eq EventScript_1686FD + call_if_eq Route24_EventScript_RocketApproachPlayer compare VAR_TEMP_1, 1 - call_if_eq EventScript_168708 + call_if_eq Route24_EventScript_RocketMotionToPlayer applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 msgbox Route24_Text_JustEarnedFabulousPrize checkitemspace ITEM_NUGGET, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_168713 - call Route24_EventScript_ReceiveNugget + goto_if_eq Route24_EventScript_NoRoomForNuggetTrigger + call Route24_EventScript_BattleRocket releaseall end -Route24_EventScript_ReceiveNugget:: @ 81686B9 +Route24_EventScript_BattleRocket:: @ 81686B9 giveitem_msg Route24_Text_ReceivedNuggetFromMysteryTrainer, ITEM_NUGGET message Route24_Text_JoinTeamRocket waitmessage playbgm MUS_ROCKET, 0 waitbuttonpress - setvar VAR_LAST_TALKED, 1 + setvar VAR_LAST_TALKED, LOCALID_ROCKET trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_6, Route24_Text_RocketDefeat msgbox Route24_Text_YoudBecomeTopRocketLeader setvar VAR_MAP_SCENE_ROUTE24, 1 return -EventScript_1686FD:: @ 81686FD - applymovement 1, Route24_Movement_WalkLeft +Route24_EventScript_RocketApproachPlayer:: @ 81686FD + applymovement LOCALID_ROCKET, Route24_Movement_RocketApproachPlayer waitmovement 0 return -EventScript_168708:: @ 8168708 - applymovement 1, Movement_WalkInPlaceFastestLeft +Route24_EventScript_RocketMotionToPlayer:: @ 8168708 + applymovement LOCALID_ROCKET, Movement_WalkInPlaceFastestLeft waitmovement 0 return -EventScript_168713:: @ 8168713 +Route24_EventScript_NoRoomForNuggetTrigger:: @ 8168713 msgbox Route24_Text_YouDontHaveAnyRoom closemessage applymovement OBJ_EVENT_ID_PLAYER, Route24_Movement_WalkDown waitmovement 0 compare VAR_TEMP_1, 0 - call_if_eq EventScript_168733 + call_if_eq Route24_EventScript_RocketWalkBackToPos release end -EventScript_168733:: @ 8168733 - applymovement 1, Movement_168740 +Route24_EventScript_RocketWalkBackToPos:: @ 8168733 + applymovement LOCALID_ROCKET, Route24_Movement_RocketWalkBackToPos waitmovement 0 return -Route24_Movement_WalkLeft:: @ 816873E +Route24_Movement_RocketApproachPlayer:: @ 816873E walk_left step_end -Movement_168740:: @ 8168740 +Route24_Movement_RocketWalkBackToPos:: @ 8168740 walk_right walk_in_place_fastest_left step_end diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 02464c191..57c724c29 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -10,7 +10,7 @@ Route25_SeaCottage_MapScripts:: @ 8170523 Route25_SeaCottage_OnTransition:: @ 8170529 call_if_unset FLAG_HELPED_BILL_IN_SEA_COTTAGE, Route25_SeaCottage_EventScript_HideClefairyBill - call_if_set FLAG_GOT_SS_TICKET, EventScript_170547 + call_if_set FLAG_GOT_SS_TICKET, Route25_SeaCottage_EventScript_SetReturnedAfterSSTicket end Route25_SeaCottage_EventScript_HideClefairyBill:: @ 817053C @@ -18,7 +18,7 @@ Route25_SeaCottage_EventScript_HideClefairyBill:: @ 817053C setobjectxyperm LOCALID_BILL_HUMAN, 3, 3 return -EventScript_170547:: @ 8170547 +Route25_SeaCottage_EventScript_SetReturnedAfterSSTicket:: @ 8170547 setflag RETURN_AFTER_SS_TICKET return -- cgit v1.2.3 From 44c9109c2a04fbbf01268f53f0f4a57174563fb1 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 19 Feb 2020 12:17:16 -0500 Subject: Document Pallet Town scripts --- data/event_scripts.s | 29 +- data/maps/PalletTown/map.json | 20 +- data/maps/PalletTown/scripts.inc | 307 +++---- data/maps/PalletTown/text.inc | 24 +- data/maps/PalletTown_GarysHouse/map.json | 10 +- data/maps/PalletTown_GarysHouse/scripts.inc | 153 ++-- data/maps/PalletTown_GarysHouse/text.inc | 48 +- data/maps/PalletTown_PlayersHouse_1F/map.json | 4 +- data/maps/PalletTown_PlayersHouse_1F/scripts.inc | 43 +- data/maps/PalletTown_PlayersHouse_1F/text.inc | 14 +- data/maps/PalletTown_PlayersHouse_2F/map.json | 6 +- data/maps/PalletTown_PlayersHouse_2F/scripts.inc | 19 +- data/maps/PalletTown_PlayersHouse_2F/text.inc | 4 +- data/maps/PalletTown_ProfessorOaksLab/map.json | 40 +- data/maps/PalletTown_ProfessorOaksLab/scripts.inc | 1020 +++++++++++---------- data/maps/PalletTown_ProfessorOaksLab/text.inc | 118 +-- data/scripts/pc.inc | 2 +- data/scripts/pokedex_rating.inc | 58 +- data/text/pokedex_rating.inc | 50 +- data/text/sign_lady.inc | 30 + 20 files changed, 994 insertions(+), 1005 deletions(-) create mode 100644 data/text/sign_lady.inc (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index b787a52a5..671e2436c 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1620,34 +1620,7 @@ Text_1ACD45:: @ 81ACD45 .include "data/scripts/fame_checker.inc" .include "data/text/fame_checker.inc" - -gUnknown_81B1C8B:: @ 81B1C8B - .string "Hmm…\n" - .string "Is that right…$" - -gUnknown_81B1C9F:: @ 81B1C9F - .string "Oh!\n" - .string "Look, look!$" - -gUnknown_81B1CAF:: @ 81B1CAF - .string "Read it, read it!$" - -gUnknown_81B1CC1:: @ 81B1CC1 - .string "TRAINER TIPS\p" - .string "Press START to open the MENU!$" - -gUnknown_81B1CEC:: @ 81B1CEC - .string "Signs are useful, aren't they?$" - -gUnknown_81B1D0B:: @ 81B1D0B - .string "Look, look!\p" - .string "I copied what it said on one of\n" - .string "those TRAINER TIPS signs!$" - -gUnknown_81B1D51:: @ 81B1D51 - .string "TRAINER TIPS!\p" - .string "Press START to open the MENU!$" - + .include "data/text/sign_lady.inc" .include "data/text/trainer_card.inc" .include "data/scripts/trainer_card.inc" .include "data/text/help_system.inc" diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 58924be03..054580b13 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -36,7 +36,7 @@ "movement_range_y": 4, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_EventScript_16575C", + "script": "PalletTown_EventScript_SignLady", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 2, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_EventScript_16582F", + "script": "PalletTown_EventScript_FatMan", "flag": "0" }, { @@ -97,7 +97,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_PALLET_TOWN_OAK", "var_value": 0, - "script": "PalletTown_EventScript_1655ED" + "script": "PalletTown_EventScript_OakTriggerLeft" }, { "type": "trigger", @@ -106,7 +106,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_PALLET_TOWN_OAK", "var_value": 0, - "script": "PalletTown_EventScript_1655F9" + "script": "PalletTown_EventScript_OakTriggerRight" }, { "type": "trigger", @@ -115,7 +115,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": 1, - "script": "PalletTown_EventScript_16587B" + "script": "PalletTown_EventScript_SignLadyTrigger" } ], "bg_events": [ @@ -124,35 +124,35 @@ "x": 16, "y": 16, "elevation": 0, - "script": "PalletTown_EventScript_165838" + "script": "PalletTown_EventScript_OaksLabSign" }, { "type": "bg_event_type_0", "x": 4, "y": 7, "elevation": 0, - "script": "PalletTown_EventScript_165850" + "script": "PalletTown_EventScript_PlayersHouseSign" }, { "type": "bg_event_type_0", "x": 13, "y": 7, "elevation": 0, - "script": "PalletTown_EventScript_165859" + "script": "PalletTown_EventScript_RivalsHouseSign" }, { "type": "bg_event_type_0", "x": 9, "y": 11, "elevation": 0, - "script": "PalletTown_EventScript_165862" + "script": "PalletTown_EventScript_TownSign" }, { "type": "bg_event_type_0", "x": 5, "y": 14, "elevation": 0, - "script": "PalletTown_EventScript_16586B" + "script": "PalletTown_EventScript_TrainerTips" } ] } diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 9fd73f882..77fb4cb8c 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -1,3 +1,8 @@ +.equ LOCALID_SIGN_LADY, 1 +.equ LOCALID_PROF_OAK, 3 + +.equ SIGN_LADY_READY, VAR_TEMP_2 + PalletTown_MapScripts:: @ 816545A map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, PalletTown_OnFrame @@ -5,50 +10,51 @@ PalletTown_MapScripts:: @ 816545A PalletTown_OnTransition:: @ 8165465 setworldmapflag FLAG_WORLD_MAP_PALLET_TOWN - call_if_set FLAG_PALLET_LADY_NOT_BLOCKING_SIGN, EventScript_165488 + call_if_set FLAG_PALLET_LADY_NOT_BLOCKING_SIGN, PalletTown_EventScript_TryReadySignLady compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 0 - call_if_eq EventScript_1654A8 + call_if_eq PalletTown_EventScript_SetSignLadyPos compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 - call_if_eq EventScript_1654A2 + call_if_eq PalletTown_EventScript_SetSignLadyDone end -EventScript_165488:: @ 8165488 +PalletTown_EventScript_TryReadySignLady:: @ 8165488 goto_if_unset FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN, EventScript_Return compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 goto_if_ge EventScript_Return setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 return -EventScript_1654A2:: @ 81654A2 +PalletTown_EventScript_SetSignLadyDone:: @ 81654A2 setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 2 return -EventScript_1654A8:: @ 81654A8 - goto_if_set FLAG_PALLET_LADY_NOT_BLOCKING_SIGN, EventScript_1654BD - setobjectxyperm 1, 5, 15 - setobjectmovementtype 1, 7 +PalletTown_EventScript_SetSignLadyPos:: @ 81654A8 + goto_if_set FLAG_PALLET_LADY_NOT_BLOCKING_SIGN, PalletTown_EventScript_MoveSignLadyToRouteEntrance + setobjectxyperm LOCALID_SIGN_LADY, 5, 15 + setobjectmovementtype LOCALID_SIGN_LADY, MOVEMENT_TYPE_FACE_UP return -EventScript_1654BD:: @ 81654BD - setobjectxyperm 1, 12, 2 - setobjectmovementtype 1, 8 - setvar VAR_TEMP_2, 1 +PalletTown_EventScript_MoveSignLadyToRouteEntrance:: @ 81654BD + setobjectxyperm LOCALID_SIGN_LADY, 12, 2 + setobjectmovementtype LOCALID_SIGN_LADY, MOVEMENT_TYPE_FACE_DOWN + setvar SIGN_LADY_READY, TRUE return PalletTown_OnFrame:: @ 81654CE - map_script_2 VAR_MAP_SCENE_PALLET_TOWN_OAK, 2, EventScript_1654D8 + map_script_2 VAR_MAP_SCENE_PALLET_TOWN_OAK, 2, PalletTown_EventScript_OakRatingScene .2byte 0 -EventScript_1654D8:: @ 81654D8 +@ Oak approaches player after exiting their house post Elite Four to check if they should receieve the National Dex +PalletTown_EventScript_OakRatingScene:: @ 81654D8 lockall textcolor 0 - setobjectxyperm 3, 14, 14 - setobjectmovementtype 3, 9 - addobject 3 - applymovement 3, Movement_1655AF + setobjectxyperm LOCALID_PROF_OAK, 14, 14 + setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_LEFT + addobject LOCALID_PROF_OAK + applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToPlayersDoor waitmovement 0 - goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, EventScript_1655A1 - msgbox gUnknown_817D8BF + goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, PalletTown_EventScript_NotBeenToOneIslandYet + msgbox PalletTown_Text_OakLetMeSeePokedex setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount copyvar VAR_0x8008, VAR_0x8005 @@ -56,17 +62,17 @@ EventScript_1654D8:: @ 81654D8 getnumberstring 0, VAR_0x8008 getnumberstring 1, VAR_0x8009 compare VAR_0x8009, 60 - goto_if_lt EventScript_165593 - msgbox gUnknown_817D9AA + goto_if_lt PalletTown_EventScript_NotEnoughMonsForNationalDex + msgbox PalletTown_Text_CaughtXImpressiveFollowMe closemessage playbgm MUS_ANNAI, 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1655DD - applymovement 3, Movement_1655CC + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerWalkToLabFromHouse + applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToLabFromHouse waitmovement 0 opendoor 16, 13 waitdooranim - applymovement 3, Movement_16572E - applymovement OBJ_EVENT_ID_PLAYER, Movement_165758 + applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterLab + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerEnterLab waitmovement 0 closedoor 16, 13 waitdooranim @@ -78,26 +84,26 @@ EventScript_1654D8:: @ 81654D8 releaseall end -EventScript_16557E:: @ 816557E +PalletTown_EventScript_EndOakRatingScene:: @ 816557E closemessage - applymovement 3, Movement_1655BE + applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakExit waitmovement 0 - removeobject 3 + removeobject LOCALID_PROF_OAK setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 3 releaseall end -EventScript_165593:: @ 8165593 - msgbox gUnknown_817D925 - goto EventScript_16557E +PalletTown_EventScript_NotEnoughMonsForNationalDex:: @ 8165593 + msgbox PalletTown_Text_CaughtXPuttingInHonestEffort + goto PalletTown_EventScript_EndOakRatingScene end -EventScript_1655A1:: @ 81655A1 - msgbox gUnknown_817DA16 - goto EventScript_16557E +PalletTown_EventScript_NotBeenToOneIslandYet:: @ 81655A1 + msgbox PalletTown_Text_OakYouEnjoyingTraveling + goto PalletTown_EventScript_EndOakRatingScene end -Movement_1655AF:: @ 81655AF +PalletTown_Movement_OakWalkToPlayersDoor:: @ 81655AF walk_left walk_left walk_left @@ -114,7 +120,7 @@ Movement_1655AF:: @ 81655AF walk_in_place_fastest_up step_end -Movement_1655BE:: @ 81655BE +PalletTown_Movement_OakExit:: @ 81655BE walk_right walk_right walk_right @@ -130,7 +136,7 @@ Movement_1655BE:: @ 81655BE walk_right step_end -Movement_1655CC:: @ 81655CC +PalletTown_Movement_OakWalkToLabFromHouse:: @ 81655CC walk_right walk_right walk_right @@ -149,7 +155,7 @@ Movement_1655CC:: @ 81655CC walk_in_place_fastest_up step_end -Movement_1655DD:: @ 81655DD +PalletTown_Movement_PlayerWalkToLabFromHouse:: @ 81655DD walk_down walk_right walk_right @@ -167,24 +173,24 @@ Movement_1655DD:: @ 81655DD walk_right step_end -PalletTown_EventScript_1655ED:: @ 81655ED +PalletTown_EventScript_OakTriggerLeft:: @ 81655ED lockall setvar VAR_TEMP_1, 0 - goto EventScript_165605 + goto PalletTown_EventScript_OakTrigger end -PalletTown_EventScript_1655F9:: @ 81655F9 +PalletTown_EventScript_OakTriggerRight:: @ 81655F9 lockall setvar VAR_TEMP_1, 1 - goto EventScript_165605 + goto PalletTown_EventScript_OakTrigger end -EventScript_165605:: @ 8165605 +PalletTown_EventScript_OakTrigger:: @ 8165605 famechecker FAMECHECKER_OAK, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 textcolor 0 delay 30 playbgm MUS_OHKIDO, 0 - message Text_17D72C + message PalletTown_Text_OakDontGoOut waitmessage delay 85 closemessage @@ -194,23 +200,23 @@ EventScript_165605:: @ 8165605 applymovement OBJ_EVENT_ID_PLAYER, Movement_ExclamationMark waitmovement 0 delay 30 - addobject 3 + addobject LOCALID_PROF_OAK compare VAR_TEMP_1, 0 - call_if_eq EventScript_1656B8 + call_if_eq PalletTown_EventScript_OakEnterLeft compare VAR_TEMP_1, 1 - call_if_eq EventScript_1656C3 + call_if_eq PalletTown_EventScript_OakEnterRight delay 30 - msgbox gUnknown_817D74A + msgbox PalletTown_Text_OakGrassUnsafeNeedMon closemessage delay 30 compare VAR_TEMP_1, 0 - call_if_eq EventScript_1656CE + call_if_eq PalletTown_EventScript_OakLeadPlayerToLabLeft compare VAR_TEMP_1, 1 - call_if_eq EventScript_1656E0 + call_if_eq PalletTown_EventScript_OakLeadPlayerToLabRight opendoor 16, 13 waitdooranim - applymovement 3, Movement_16572E - applymovement OBJ_EVENT_ID_PLAYER, Movement_165758 + applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterLab + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerEnterLab waitmovement 0 closedoor 16, 13 waitdooranim @@ -224,29 +230,29 @@ EventScript_165605:: @ 8165605 releaseall end -EventScript_1656B8:: @ 81656B8 - applymovement 3, Movement_1656F2 +PalletTown_EventScript_OakEnterLeft:: @ 81656B8 + applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterLeft waitmovement 0 return -EventScript_1656C3:: @ 81656C3 - applymovement 3, Movement_1656FB +PalletTown_EventScript_OakEnterRight:: @ 81656C3 + applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterRight waitmovement 0 return -EventScript_1656CE:: @ 81656CE - applymovement 3, Movement_165705 - applymovement OBJ_EVENT_ID_PLAYER, Movement_165731 +PalletTown_EventScript_OakLeadPlayerToLabLeft:: @ 81656CE + applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToLabLeft + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerWalkToLabLeft waitmovement 0 return -EventScript_1656E0:: @ 81656E0 - applymovement 3, Movement_165719 - applymovement OBJ_EVENT_ID_PLAYER, Movement_165744 +PalletTown_EventScript_OakLeadPlayerToLabRight:: @ 81656E0 + applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToLabRight + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerWalkToLabRight waitmovement 0 return -Movement_1656F2:: @ 81656F2 +PalletTown_Movement_OakEnterLeft:: @ 81656F2 walk_up walk_up walk_right @@ -257,7 +263,7 @@ Movement_1656F2:: @ 81656F2 walk_up step_end -Movement_1656FB:: @ 81656FB +PalletTown_Movement_OakEnterRight:: @ 81656FB walk_right walk_up walk_up @@ -269,8 +275,7 @@ Movement_1656FB:: @ 81656FB walk_up step_end -Movement_165705:: @ 8165705 - walk_down + .macro walk_to_lab walk_left walk_down walk_down @@ -287,214 +292,174 @@ Movement_165705:: @ 8165705 walk_right walk_right walk_right + .endm + +PalletTown_Movement_OakWalkToLabLeft:: @ 8165705 + walk_down + walk_to_lab walk_right walk_in_place_fastest_up step_end -Movement_165719:: @ 8165719 +PalletTown_Movement_OakWalkToLabRight:: @ 8165719 walk_down walk_left - walk_left - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_right - walk_right - walk_right - walk_right + walk_to_lab walk_right walk_in_place_fastest_up step_end -Movement_16572E:: @ 816572E +PalletTown_Movement_OakEnterLab:: @ 816572E walk_up set_invisible step_end -Movement_165731:: @ 8165731 - walk_down - walk_down - walk_left - walk_down - walk_down - walk_down +PalletTown_Movement_PlayerWalkToLabLeft:: @ 8165731 walk_down walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_right - walk_right - walk_right - walk_right + walk_to_lab step_end -Movement_165744:: @ 8165744 +PalletTown_Movement_PlayerWalkToLabRight:: @ 8165744 walk_down walk_down walk_left - walk_left - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_down - walk_right - walk_right - walk_right - walk_right + walk_to_lab step_end -Movement_165758:: @ 8165758 +PalletTown_Movement_PlayerEnterLab:: @ 8165758 walk_right walk_up set_invisible step_end -PalletTown_EventScript_16575C:: @ 816575C +PalletTown_EventScript_SignLady:: @ 816575C lock compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 2 - goto_if_eq EventScript_1657ED + goto_if_eq PalletTown_EventScript_SignLadyDone compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 - goto_if_eq EventScript_165815 - compare VAR_TEMP_2, 1 - goto_if_eq EventScript_1658C2 - goto_if_set FLAG_TEMP_2, EventScript_165801 - msgbox gUnknown_81B1C8B - applymovement 1, Movement_FacePlayer + goto_if_eq PalletTown_EventScript_SignLadyJustShowedSign + compare SIGN_LADY_READY, TRUE + goto_if_eq PalletTown_EventScript_SignLadyStartShowSign + goto_if_set FLAG_TEMP_2, PalletTown_EventScript_SignLadyGoReadSign + msgbox PalletTown_Text_HmmIsThatRight + applymovement LOCALID_SIGN_LADY, Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement 1, Movement_ExclamationMark + applymovement LOCALID_SIGN_LADY, Movement_ExclamationMark waitmovement 0 - applymovement 1, Movement_Delay48 + applymovement LOCALID_SIGN_LADY, Movement_Delay48 waitmovement 0 - msgbox gUnknown_81B1C9F + msgbox PalletTown_Text_OhLookLook closemessage compare VAR_FACING, DIR_EAST - call_if_eq EventScript_1657D7 + call_if_eq PalletTown_EventScript_SignLadyMoveOutOfWayRight compare VAR_FACING, DIR_EAST - call_if_ne EventScript_1657E2 + call_if_ne PalletTown_EventScript_SignLadyMoveOutOfWayLeft moveobjectoffscreen 1 setflag FLAG_TEMP_2 release end -EventScript_1657D7:: @ 81657D7 - applymovement 1, Movement_165829 +PalletTown_EventScript_SignLadyMoveOutOfWayRight:: @ 81657D7 + applymovement LOCALID_SIGN_LADY, PalletTown_Movement_SignLadyMoveOutOfWayRight waitmovement 0 return -EventScript_1657E2:: @ 81657E2 - applymovement 1, Movement_16582C +PalletTown_EventScript_SignLadyMoveOutOfWayLeft:: @ 81657E2 + applymovement LOCALID_SIGN_LADY, PalletTown_Movement_SignLadyMoveOutOfWayLeft waitmovement 0 return -EventScript_1657ED:: @ 81657ED - applymovement 1, Movement_FacePlayer +PalletTown_EventScript_SignLadyDone:: @ 81657ED + applymovement LOCALID_SIGN_LADY, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_817D7C8 + msgbox PalletTown_Text_RaisingMonsToo release end -EventScript_165801:: @ 8165801 - applymovement 1, Movement_FacePlayer +PalletTown_EventScript_SignLadyGoReadSign:: @ 8165801 + applymovement LOCALID_SIGN_LADY, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_81B1CAF + msgbox PalletTown_Text_ReadItReadIt release end -EventScript_165815:: @ 8165815 - applymovement 1, Movement_FacePlayer +PalletTown_EventScript_SignLadyJustShowedSign:: @ 8165815 + applymovement LOCALID_SIGN_LADY, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_81B1CEC + msgbox PalletTown_Text_SignsAreUsefulArentThey release end -Movement_165829:: @ 8165829 +PalletTown_Movement_SignLadyMoveOutOfWayRight:: @ 8165829 walk_right walk_in_place_fastest_left step_end -Movement_16582C:: @ 816582C +PalletTown_Movement_SignLadyMoveOutOfWayLeft:: @ 816582C walk_left walk_in_place_fastest_right step_end -PalletTown_EventScript_16582F:: @ 816582F - msgbox gUnknown_817D80D, MSGBOX_NPC +PalletTown_EventScript_FatMan:: @ 816582F + msgbox PalletTown_Text_CanStoreItemsAndMonsInPC, MSGBOX_NPC end -PalletTown_EventScript_165838:: @ 8165838 +PalletTown_EventScript_OaksLabSign:: @ 8165838 lockall famechecker FAMECHECKER_OAK, 0 - msgbox gUnknown_817D866 + msgbox PalletTown_Text_OakPokemonResearchLab releaseall end -PalletTown_EventScript_165850:: @ 8165850 - msgbox gUnknown_817D87F, MSGBOX_SIGN +PalletTown_EventScript_PlayersHouseSign:: @ 8165850 + msgbox PalletTown_Text_PlayersHouse, MSGBOX_SIGN end -PalletTown_EventScript_165859:: @ 8165859 - msgbox gUnknown_817D88A, MSGBOX_SIGN +PalletTown_EventScript_RivalsHouseSign:: @ 8165859 + msgbox PalletTown_Text_RivalsHouse, MSGBOX_SIGN end -PalletTown_EventScript_165862:: @ 8165862 - msgbox gUnknown_817D895, MSGBOX_SIGN +PalletTown_EventScript_TownSign:: @ 8165862 + msgbox PalletTown_Text_TownSign, MSGBOX_SIGN end -PalletTown_EventScript_16586B:: @ 816586B +PalletTown_EventScript_TrainerTips:: @ 816586B lockall - msgbox gUnknown_81B1CC1 + msgbox PalletTown_Text_PressStartToOpenMenu setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 releaseall end -PalletTown_EventScript_16587B:: @ 816587B +PalletTown_EventScript_SignLadyTrigger:: @ 816587B lockall - applymovement 1, Movement_WalkInPlaceFastestRight + applymovement LOCALID_SIGN_LADY, Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 - call EventScript_165894 + call PalletTown_EventScript_SignLadyShowSign releaseall end -EventScript_165894:: @ 8165894 +PalletTown_EventScript_SignLadyShowSign:: @ 8165894 textcolor 1 - msgbox gUnknown_81B1D0B + msgbox PalletTown_Text_LookCopiedTrainerTipsSign closemessage delay 20 textcolor 3 setflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 - setvar VAR_TEMP_2, 0 + setvar SIGN_LADY_READY, FALSE special sub_80699E0 special sub_80699BC signmsg - msgbox gUnknown_81B1D51 + msgbox PalletTown_Text_PressStartToOpenMenuCopy normalmsg return -EventScript_1658C2:: @ 81658C2 - applymovement 1, Movement_FacePlayer +PalletTown_EventScript_SignLadyStartShowSign:: @ 81658C2 + applymovement LOCALID_SIGN_LADY, Movement_FacePlayer waitmovement 0 - call EventScript_165894 + call PalletTown_EventScript_SignLadyShowSign release end diff --git a/data/maps/PalletTown/text.inc b/data/maps/PalletTown/text.inc index ad476a541..5ed553ce2 100644 --- a/data/maps/PalletTown/text.inc +++ b/data/maps/PalletTown/text.inc @@ -1,8 +1,8 @@ -Text_17D72C:: @ 817D72C +PalletTown_Text_OakDontGoOut:: @ 817D72C .string "OAK: Hey! Wait!\n" .string "Don't go out!$" -gUnknown_817D74A:: @ 817D74A +PalletTown_Text_OakGrassUnsafeNeedMon:: @ 817D74A .string "OAK: It's unsafe!\n" .string "Wild POKéMON live in tall grass!\p" .string "You need your own POKéMON for\n" @@ -10,30 +10,30 @@ gUnknown_817D74A:: @ 817D74A .string "I know!\n" .string "Here, come with me!$" -gUnknown_817D7C8:: @ 817D7C8 +PalletTown_Text_RaisingMonsToo:: @ 817D7C8 .string "I'm raising POKéMON, too.\p" .string "When they get strong, they can\n" .string "protect me.$" -gUnknown_817D80D:: @ 817D80D +PalletTown_Text_CanStoreItemsAndMonsInPC:: @ 817D80D .string "Technology is incredible!\p" .string "You can now store and recall items\n" .string "and POKéMON as data via PC.$" -gUnknown_817D866:: @ 817D866 +PalletTown_Text_OakPokemonResearchLab:: @ 817D866 .string "OAK POKéMON RESEARCH LAB$" -gUnknown_817D87F:: @ 817D87F +PalletTown_Text_PlayersHouse:: @ 817D87F .string "{PLAYER}'s house$" -gUnknown_817D88A:: @ 817D88A +PalletTown_Text_RivalsHouse:: @ 817D88A .string "{RIVAL}'s house$" -gUnknown_817D895:: @ 817D895 +PalletTown_Text_TownSign:: @ 817D895 .string "PALLET TOWN\n" .string "Shades of your journey await!$" -gUnknown_817D8BF:: @ 817D8BF +PalletTown_Text_OakLetMeSeePokedex:: @ 817D8BF .string "OAK: Ah, {PLAYER}!\n" .string "You're back, are you?\p" .string "How much have you filled in your\n" @@ -41,14 +41,14 @@ gUnknown_817D8BF:: @ 817D8BF .string "May I see it?\p" .string "Let's see…$" -gUnknown_817D925:: @ 817D925 +PalletTown_Text_CaughtXPuttingInHonestEffort:: @ 817D925 .string "You've caught {STR_VAR_2}…\p" .string "Hm, it looks as if you're putting\n" .string "in an honest effort.\p" .string "When you manage to fill it some\n" .string "more, come show me, please.$" -gUnknown_817D9AA:: @ 817D9AA +PalletTown_Text_CaughtXImpressiveFollowMe:: @ 817D9AA .string "You've caught… {STR_VAR_2}!?\n" .string "Now, this is impressive!\p" .string "There's something I wanted to ask\n" @@ -56,7 +56,7 @@ gUnknown_817D9AA:: @ 817D9AA .string "Come.\n" .string "Follow me.$" -gUnknown_817DA16:: @ 817DA16 +PalletTown_Text_OakYouEnjoyingTraveling:: @ 817DA16 .string "OAK: Ah, {PLAYER}!\n" .string "You seem to be enjoying traveling.\p" .string "Knowing you, {PLAYER}, I can easily\n" diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json index 6b44f7eb3..f4d46bac8 100644 --- a/data/maps/PalletTown_GarysHouse/map.json +++ b/data/maps/PalletTown_GarysHouse/map.json @@ -25,7 +25,7 @@ "movement_range_y": 3, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_GarysHouse_EventScript_168D56", + "script": "PalletTown_GarysHouse_EventScript_Daisy", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_GarysHouse_EventScript_168F63", + "script": "PalletTown_GarysHouse_EventScript_TownMap", "flag": "FLAG_HIDE_TOWN_MAP" } ], @@ -72,21 +72,21 @@ "x": 12, "y": 1, "elevation": 0, - "script": "PalletTown_GarysHouse_EventScript_168F6C" + "script": "PalletTown_GarysHouse_EventScript_Bookshelf" }, { "type": "bg_event_type_0", "x": 11, "y": 1, "elevation": 0, - "script": "PalletTown_GarysHouse_EventScript_168F6C" + "script": "PalletTown_GarysHouse_EventScript_Bookshelf" }, { "type": "bg_event_type_0", "x": 9, "y": 1, "elevation": 0, - "script": "PalletTown_GarysHouse_EventScript_168F75" + "script": "PalletTown_GarysHouse_EventScript_Picture" } ] } diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index 2059a2f58..a64dff1a9 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -1,67 +1,72 @@ +.equ LOCALID_DAISY, 1 +.equ LOCALID_TOWN_MAP, 2 + +.equ RECEIVED_TOWN_MAP, VAR_TEMP_1 + PalletTown_GarysHouse_MapScripts:: @ 8168D27 map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_GarysHouse_OnTransition .byte 0 PalletTown_GarysHouse_OnTransition:: @ 8168D2D compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if_lt EventScript_168D44 + call_if_lt PalletTown_GarysHouse_EventScript_MoveDaisyToTable compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if_ge EventScript_168D50 + call_if_ge PalletTown_GarysHouse_EventScript_AlreadyReceivedTownMap end -EventScript_168D44:: @ 8168D44 - setobjectmovementtype 1, 10 - setobjectxyperm 1, 5, 4 +PalletTown_GarysHouse_EventScript_MoveDaisyToTable:: @ 8168D44 + setobjectmovementtype LOCALID_DAISY, MOVEMENT_TYPE_FACE_RIGHT + setobjectxyperm LOCALID_DAISY, 5, 4 return -EventScript_168D50:: @ 8168D50 - setvar VAR_TEMP_1, 1 +PalletTown_GarysHouse_EventScript_AlreadyReceivedTownMap:: @ 8168D50 + setvar RECEIVED_TOWN_MAP, TRUE return -PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56 +PalletTown_GarysHouse_EventScript_Daisy:: @ 8168D56 lock faceplayer famechecker FAMECHECKER_DAISY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_168DB9 - compare VAR_TEMP_1, 1 - goto_if_eq EventScript_168EEC + goto_if_set FLAG_SYS_GAME_CLEAR, PalletTown_GarysHouse_EventScript_GroomMon + compare RECEIVED_TOWN_MAP, TRUE + goto_if_eq PalletTown_GarysHouse_EventScript_PleaseGiveMonsRest compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - goto_if_eq EventScript_168F59 + goto_if_eq PalletTown_GarysHouse_EventScript_ExplainTownMap compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 1 - goto_if_eq EventScript_168EF6 + goto_if_eq PalletTown_GarysHouse_EventScript_GiveTownMap compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 - goto_if_ge EventScript_168DAF - msgbox gUnknown_818D58C + goto_if_ge PalletTown_GarysHouse_EventScript_HeardBattledRival + msgbox PalletTown_GarysHouse_Text_HiBrothersAtLab closemessage - applymovement 1, Movement_FaceOriginalDirection + applymovement LOCALID_DAISY, Movement_FaceOriginalDirection waitmovement 0 release end -EventScript_168DAF:: @ 8168DAF - msgbox gUnknown_818D5C4 +PalletTown_GarysHouse_EventScript_HeardBattledRival:: @ 8168DAF + msgbox PalletTown_GarysHouse_Text_HeardYouBattledRival release end -EventScript_168DB9:: @ 8168DB9 +PalletTown_GarysHouse_EventScript_GroomMon:: @ 8168DB9 goto_if_questlog EventScript_ReleaseEnd special sub_8112364 compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500 - goto_if_lt EventScript_168E46 - msgbox gUnknown_818D7D3, MSGBOX_YESNO + goto_if_lt PalletTown_GarysHouse_EventScript_RateMonFriendship + msgbox PalletTown_GarysHouse_Text_LikeMeToGroomMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_168E3C - msgbox gUnknown_818D8B2 + goto_if_eq PalletTown_GarysHouse_EventScript_DeclineGrooming + msgbox PalletTown_GarysHouse_Text_GroomWhichOne special Special_ChooseMonFromParty waitstate lock faceplayer - compare VAR_0x8004, 6 - goto_if_ge EventScript_168E3C + compare VAR_0x8004, PARTY_SIZE + goto_if_ge PalletTown_GarysHouse_EventScript_DeclineGrooming specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004 compare VAR_RESULT, SPECIES_EGG - goto_if_eq EventScript_168E32 - msgbox gUnknown_818D8CC + goto_if_eq PalletTown_GarysHouse_EventScript_CantGroomEgg + msgbox PalletTown_GarysHouse_Text_LookingNiceInNoTime closemessage fadescreen FADE_TO_BLACK playfanfare MUS_ME_ASA @@ -69,109 +74,109 @@ EventScript_168DB9:: @ 8168DB9 special Special_DaisyMassageServices fadescreen FADE_FROM_BLACK special Special_GetMonNickname - msgbox gUnknown_818D8FE + msgbox PalletTown_GarysHouse_Text_ThereYouGoAllDone release end -EventScript_168E32:: @ 8168E32 - msgbox gUnknown_818D97B +PalletTown_GarysHouse_EventScript_CantGroomEgg:: @ 8168E32 + msgbox PalletTown_GarysHouse_Text_CantGroomAnEgg release end -EventScript_168E3C:: @ 8168E3C - msgbox gUnknown_818D875 +PalletTown_GarysHouse_EventScript_DeclineGrooming:: @ 8168E3C + msgbox PalletTown_GarysHouse_Text_DontNeedAnyGrooming release end -EventScript_168E46:: @ 8168E46 - msgbox gUnknown_818D9A5 +PalletTown_GarysHouse_EventScript_RateMonFriendship:: @ 8168E46 + msgbox PalletTown_GarysHouse_Text_MayISeeFirstMon specialvar VAR_RESULT, Special_GetLeadMonFriendship switch VAR_RESULT - case 0, EventScript_168EA6 - case 1, EventScript_168EB0 - case 2, EventScript_168EBA - case 3, EventScript_168EC4 - case 4, EventScript_168ECE - case 5, EventScript_168ED8 - case 6, EventScript_168EE2 + case 0, PalletTown_GarysHouse_EventScript_MonFriendshipLowest + case 1, PalletTown_GarysHouse_EventScript_MonFriendshipLower + case 2, PalletTown_GarysHouse_EventScript_MonFriendshipLow + case 3, PalletTown_GarysHouse_EventScript_MonFriendshipMid + case 4, PalletTown_GarysHouse_EventScript_MonFriendshipHigh + case 5, PalletTown_GarysHouse_EventScript_MonFriendshipHigher + case 6, PalletTown_GarysHouse_EventScript_MonFriendshipHighest end -EventScript_168EA6:: @ 8168EA6 - msgbox gUnknown_818DBDD +PalletTown_GarysHouse_EventScript_MonFriendshipLowest:: @ 8168EA6 + msgbox PalletTown_GarysHouse_Text_WhyWouldMonHateYouSoMuch release end -EventScript_168EB0:: @ 8168EB0 - msgbox gUnknown_818DB88 +PalletTown_GarysHouse_EventScript_MonFriendshipLower:: @ 8168EB0 + msgbox PalletTown_GarysHouse_Text_DontLikeWayItGlaresAtYou release end -EventScript_168EBA:: @ 8168EBA - msgbox gUnknown_818DB2E +PalletTown_GarysHouse_EventScript_MonFriendshipLow:: @ 8168EBA + msgbox PalletTown_GarysHouse_Text_NotFamiliarWithYouYet release end -EventScript_168EC4:: @ 8168EC4 - msgbox gUnknown_818DAF3 +PalletTown_GarysHouse_EventScript_MonFriendshipMid:: @ 8168EC4 + msgbox PalletTown_GarysHouse_Text_ItsWarmingUpToYou release end -EventScript_168ECE:: @ 8168ECE - msgbox gUnknown_818DABE +PalletTown_GarysHouse_EventScript_MonFriendshipHigh:: @ 8168ECE + msgbox PalletTown_GarysHouse_Text_ItsQuiteFriendly release end -EventScript_168ED8:: @ 8168ED8 - msgbox gUnknown_818DA73 +PalletTown_GarysHouse_EventScript_MonFriendshipHigher:: @ 8168ED8 + msgbox PalletTown_GarysHouse_Text_ItLooksVeryHappy release end -EventScript_168EE2:: @ 8168EE2 - msgbox gUnknown_818DA16 +PalletTown_GarysHouse_EventScript_MonFriendshipHighest:: @ 8168EE2 + msgbox PalletTown_GarysHouse_Text_CouldntLoveYouMore release end -EventScript_168EEC:: @ 8168EEC - msgbox gUnknown_818D701 +PalletTown_GarysHouse_EventScript_PleaseGiveMonsRest:: @ 8168EEC + msgbox PalletTown_GarysHouse_Text_PleaseGiveMonsRest release end -EventScript_168EF6:: @ 8168EF6 - msgbox gUnknown_818D60A +PalletTown_GarysHouse_EventScript_GiveTownMap:: @ 8168EF6 + msgbox PalletTown_GarysHouse_Text_ErrandForGrandpaThisWillHelp closemessage checkitemspace ITEM_TOWN_MAP, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_168F4F - applymovement 1, Movement_WalkInPlaceFastestRight + goto_if_eq PalletTown_GarysHouse_EventScript_NoRoomForTownMap + applymovement LOCALID_DAISY, Movement_WalkInPlaceFastestRight waitmovement 0 - removeobject 2 + removeobject LOCALID_TOWN_MAP setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 delay 15 - applymovement 1, Movement_FacePlayer + applymovement LOCALID_DAISY, Movement_FacePlayer waitmovement 0 delay 12 - giveitem_msg gUnknown_818D661, ITEM_TOWN_MAP, 1, MUS_FAN5 + giveitem_msg PalletTown_GarysHouse_Text_ReceivedTownMapFromDaisy, ITEM_TOWN_MAP, 1, MUS_FAN5 release end -EventScript_168F4F:: @ 8168F4F - msgbox gUnknown_818D684 +PalletTown_GarysHouse_EventScript_NoRoomForTownMap:: @ 8168F4F + msgbox PalletTown_GarysHouse_Text_DontHaveSpaceForThis release end -EventScript_168F59:: @ 8168F59 - msgbox gUnknown_818D6AF +PalletTown_GarysHouse_EventScript_ExplainTownMap:: @ 8168F59 + msgbox PalletTown_GarysHouse_Text_ExplainTownMap release end -PalletTown_GarysHouse_EventScript_168F63:: @ 8168F63 - msgbox gUnknown_818D763, MSGBOX_NPC +PalletTown_GarysHouse_EventScript_TownMap:: @ 8168F63 + msgbox PalletTown_GarysHouse_Text_ItsBigMapOfKanto, MSGBOX_NPC end -PalletTown_GarysHouse_EventScript_168F6C:: @ 8168F6C - msgbox gUnknown_818D7A1, MSGBOX_SIGN +PalletTown_GarysHouse_EventScript_Bookshelf:: @ 8168F6C + msgbox PalletTown_GarysHouse_Text_ShelvesCrammedFullOfBooks, MSGBOX_SIGN end -PalletTown_GarysHouse_EventScript_168F75:: @ 8168F75 - msgbox gUnknown_818DC47, MSGBOX_SIGN +PalletTown_GarysHouse_EventScript_Picture:: @ 8168F75 + msgbox PalletTown_GarysHouse_Text_LovelyAndSweetClefairy, MSGBOX_SIGN end diff --git a/data/maps/PalletTown_GarysHouse/text.inc b/data/maps/PalletTown_GarysHouse/text.inc index 92d05fbef..38e3adbdc 100644 --- a/data/maps/PalletTown_GarysHouse/text.inc +++ b/data/maps/PalletTown_GarysHouse/text.inc @@ -1,47 +1,47 @@ -gUnknown_818D58C:: @ 818D58C +PalletTown_GarysHouse_Text_HiBrothersAtLab:: @ 818D58C .string "DAISY: Hi, {PLAYER}!\p" .string "My brother, {RIVAL}, is out at\n" .string "Grandpa's LAB.$" -gUnknown_818D5C4:: @ 818D5C4 +PalletTown_GarysHouse_Text_HeardYouBattledRival:: @ 818D5C4 .string "DAISY: {PLAYER}, I heard you had\n" .string "a battle against {RIVAL}.\p" .string "I wish I'd seen that!$" -gUnknown_818D60A:: @ 818D60A +PalletTown_GarysHouse_Text_ErrandForGrandpaThisWillHelp:: @ 818D60A .string "Grandpa asked you to run an\n" .string "errand?\p" .string "Gee, that's lazy of him.\n" .string "Here, this will help you.$" -gUnknown_818D661:: @ 818D661 +PalletTown_GarysHouse_Text_ReceivedTownMapFromDaisy:: @ 818D661 .string "{PLAYER} received a TOWN MAP\n" .string "from DAISY.$" -gUnknown_818D684:: @ 818D684 +PalletTown_GarysHouse_Text_DontHaveSpaceForThis:: @ 818D684 .string "You don't have space for this in\n" .string "your BAG.$" -gUnknown_818D6AF:: @ 818D6AF +PalletTown_GarysHouse_Text_ExplainTownMap:: @ 818D6AF .string "You can use the TOWN MAP to find\n" .string "out where you are, or check the\l" .string "names of places.$" -gUnknown_818D701:: @ 818D701 +PalletTown_GarysHouse_Text_PleaseGiveMonsRest:: @ 818D701 .string "DAISY: Just like people, POKéMON\n" .string "are living things.\p" .string "When they get tired, please give\n" .string "them a rest.$" -gUnknown_818D763:: @ 818D763 +PalletTown_GarysHouse_Text_ItsBigMapOfKanto:: @ 818D763 .string "It's a big map of the KANTO region.\n" .string "Now this would be useful!$" -gUnknown_818D7A1:: @ 818D7A1 +PalletTown_GarysHouse_Text_ShelvesCrammedFullOfBooks:: @ 818D7A1 .string "The shelves are crammed full of\n" .string "books on POKéMON.$" -gUnknown_818D7D3:: @ 818D7D3 +PalletTown_GarysHouse_Text_LikeMeToGroomMon:: @ 818D7D3 .string "DAISY: Hi, {PLAYER}!\n" .string "Good timing.\p" .string "I'm about to have some tea.\n" @@ -50,72 +50,72 @@ gUnknown_818D7D3:: @ 818D7D3 .string "Your POKéMON are a little dirty.\p" .string "Would you like me to groom one?$" -gUnknown_818D875:: @ 818D875 +PalletTown_GarysHouse_Text_DontNeedAnyGrooming:: @ 818D875 .string "You don't need any grooming done?\n" .string "Okay, we'll just have tea.$" -gUnknown_818D8B2:: @ 818D8B2 +PalletTown_GarysHouse_Text_GroomWhichOne:: @ 818D8B2 .string "Which one should I groom?$" -gUnknown_818D8CC:: @ 818D8CC +PalletTown_GarysHouse_Text_LookingNiceInNoTime:: @ 818D8CC .string "DAISY: Okay, I'll get it looking\n" .string "nice in no time.$" -gUnknown_818D8FE:: @ 818D8FE +PalletTown_GarysHouse_Text_ThereYouGoAllDone:: @ 818D8FE .string "{SIZE}Á{STR_VAR_1} looks dreamily content…\p" .string "{SIZE}ÈDAISY: There you go! All done.\n" .string "See? Doesn't it look nice?\p" .string "Giggle…\n" .string "It's such a cute POKéMON.$" -gUnknown_818D97B:: @ 818D97B +PalletTown_GarysHouse_Text_CantGroomAnEgg:: @ 818D97B .string "Oh, sorry. I honestly can't\n" .string "groom an EGG.$" -gUnknown_818D9A5:: @ 818D9A5 +PalletTown_GarysHouse_Text_MayISeeFirstMon:: @ 818D9A5 .string "DAISY: Your POKéMON grow to love\n" .string "you if you raise them with love.\p" .string "For example, {PLAYER}, may I see\n" .string "your first POKéMON?$" -gUnknown_818DA16:: @ 818DA16 +PalletTown_GarysHouse_Text_CouldntLoveYouMore:: @ 818DA16 .string "It couldn't possibly love you\n" .string "any more than it does now.\p" .string "Your POKéMON is happy beyond\n" .string "words.$" -gUnknown_818DA73:: @ 818DA73 +PalletTown_GarysHouse_Text_ItLooksVeryHappy:: @ 818DA73 .string "It looks very happy.\p" .string "I wish {RIVAL} could see this and\n" .string "learn something from it.$" -gUnknown_818DABE:: @ 818DABE +PalletTown_GarysHouse_Text_ItsQuiteFriendly:: @ 818DABE .string "It's quite friendly with you.\n" .string "Keep being good to it!$" -gUnknown_818DAF3:: @ 818DAF3 +PalletTown_GarysHouse_Text_ItsWarmingUpToYou:: @ 818DAF3 .string "It's warming up to you.\n" .string "Trust must be growing between you.$" -gUnknown_818DB2E:: @ 818DB2E +PalletTown_GarysHouse_Text_NotFamiliarWithYouYet:: @ 818DB2E .string "It's not quite familiar with you\n" .string "yet.\p" .string "POKéMON are all quite wary when\n" .string "you first get them.$" -gUnknown_818DB88:: @ 818DB88 +PalletTown_GarysHouse_Text_DontLikeWayItGlaresAtYou:: @ 818DB88 .string "{PLAYER}, I don't like the way it\n" .string "glares at you.\p" .string "Could you try being a little nicer\n" .string "to it?$" -gUnknown_818DBDD:: @ 818DBDD +PalletTown_GarysHouse_Text_WhyWouldMonHateYouSoMuch:: @ 818DBDD .string "…Um, it's not easy for me to say\n" .string "this, but…\p" .string "Is there some reason why your\n" .string "POKéMON would hate you so much?$" -gUnknown_818DC47:: @ 818DC47 +PalletTown_GarysHouse_Text_LovelyAndSweetClefairy:: @ 818DC47 .string "“The lovely and sweet\n" .string "CLEFAIRY”$" diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json index 414766d99..f4e7cc175 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/map.json +++ b/data/maps/PalletTown_PlayersHouse_1F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_PlayersHouse_1F_EventScript_168C09", + "script": "PalletTown_PlayersHouse_1F_EventScript_Mom", "flag": "0" } ], @@ -66,7 +66,7 @@ "x": 6, "y": 1, "elevation": 0, - "script": "PalletTown_PlayersHouse_1F_EventScript_168C62" + "script": "PalletTown_PlayersHouse_1F_EventScript_TV" } ] } diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc index 6dc0a1a47..0fa5219aa 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc @@ -1,58 +1,59 @@ PalletTown_PlayersHouse_1F_MapScripts:: @ 8168C08 .byte 0 -PalletTown_PlayersHouse_1F_EventScript_168C09:: @ 8168C09 +PalletTown_PlayersHouse_1F_EventScript_Mom:: @ 8168C09 lock faceplayer - goto_if_set FLAG_BEAT_RIVAL_IN_OAKS_LAB, EventScript_168C4A + goto_if_set FLAG_BEAT_RIVAL_IN_OAKS_LAB, PalletTown_PlayersHouse_1F_EventScript_MomHeal checkplayergender compare VAR_RESULT, MALE - call_if_eq EventScript_168C38 + call_if_eq PalletTown_PlayersHouse_1F_EventScript_MomOakLookingForYouMale compare VAR_RESULT, FEMALE - call_if_eq EventScript_168C41 + call_if_eq PalletTown_PlayersHouse_1F_EventScript_MomOakLookingForYouFemale closemessage applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end -EventScript_168C38:: @ 8168C38 - msgbox gUnknown_818D2F0 +PalletTown_PlayersHouse_1F_EventScript_MomOakLookingForYouMale:: @ 8168C38 + msgbox PalletTown_PlayersHouse_1F_Text_AllBoysLeaveOakLookingForYou return -EventScript_168C41:: @ 8168C41 - msgbox gUnknown_818D360 +PalletTown_PlayersHouse_1F_EventScript_MomOakLookingForYouFemale:: @ 8168C41 + msgbox PalletTown_PlayersHouse_1F_Text_AllGirlsLeaveOakLookingForYou return -EventScript_168C4A:: @ 8168C4A - msgbox gUnknown_818D3D1 +PalletTown_PlayersHouse_1F_EventScript_MomHeal:: @ 8168C4A + msgbox PalletTown_PlayersHouse_1F_Text_YouShouldTakeQuickRest closemessage call EventScript_OutOfCenterPartyHeal - msgbox gUnknown_818D3F8 + msgbox PalletTown_PlayersHouse_1F_Text_LookingGreatTakeCare release end -PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62 +@ Displays special text if interacted with from side or back (which are normally inaccessible) +PalletTown_PlayersHouse_1F_EventScript_TV:: @ 8168C62 lockall compare VAR_FACING, DIR_NORTH - goto_if_eq EventScript_168C78 - msgbox gUnknown_818D4F9 + goto_if_eq PalletTown_PlayersHouse_1F_EventScript_TVScreen + msgbox PalletTown_PlayersHouse_1F_Text_OopsWrongSide releaseall end -EventScript_168C78:: @ 8168C78 +PalletTown_PlayersHouse_1F_EventScript_TVScreen:: @ 8168C78 checkplayergender compare VAR_RESULT, MALE - call_if_eq EventScript_168C91 + call_if_eq PalletTown_PlayersHouse_1F_EventScript_TVScreenMale compare VAR_RESULT, FEMALE - call_if_eq EventScript_168C9A + call_if_eq PalletTown_PlayersHouse_1F_EventScript_TVScreenFemale releaseall end -EventScript_168C91:: @ 8168C91 - msgbox gUnknown_818D43E +PalletTown_PlayersHouse_1F_EventScript_TVScreenMale:: @ 8168C91 + msgbox PalletTown_PlayersHouse_1F_Text_MovieOnTVFourBoysOnRailroad return -EventScript_168C9A:: @ 8168C9A - msgbox gUnknown_818D492 +PalletTown_PlayersHouse_1F_EventScript_TVScreenFemale:: @ 8168C9A + msgbox PalletTown_PlayersHouse_1F_Text_MovieOnTVGirlOnBrickRoad return diff --git a/data/maps/PalletTown_PlayersHouse_1F/text.inc b/data/maps/PalletTown_PlayersHouse_1F/text.inc index ba40d1729..baa31b38d 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/text.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/text.inc @@ -1,38 +1,38 @@ -gUnknown_818D2F0:: @ 818D2F0 +PalletTown_PlayersHouse_1F_Text_AllBoysLeaveOakLookingForYou:: @ 818D2F0 .string "MOM: …Right.\n" .string "All boys leave home someday.\l" .string "It said so on TV.\p" .string "Oh, yes. PROF. OAK, next door, was\n" .string "looking for you.$" -gUnknown_818D360:: @ 818D360 +PalletTown_PlayersHouse_1F_Text_AllGirlsLeaveOakLookingForYou:: @ 818D360 .string "MOM: …Right.\n" .string "All girls dream of traveling.\l" .string "It said so on TV.\p" .string "Oh, yes. PROF. OAK, next door, was\n" .string "looking for you.$" -gUnknown_818D3D1:: @ 818D3D1 +PalletTown_PlayersHouse_1F_Text_YouShouldTakeQuickRest:: @ 818D3D1 .string "MOM: {PLAYER}!\n" .string "You should take a quick rest.$" -gUnknown_818D3F8:: @ 818D3F8 +PalletTown_PlayersHouse_1F_Text_LookingGreatTakeCare:: @ 818D3F8 .string "MOM: Oh, good! You and your\n" .string "POKéMON are looking great.\l" .string "Take care now!$" -gUnknown_818D43E:: @ 818D43E +PalletTown_PlayersHouse_1F_Text_MovieOnTVFourBoysOnRailroad:: @ 818D43E .string "There's a movie on TV.\n" .string "Four boys are walking on railroad\l" .string "tracks.\p" .string "…I better go, too.$" -gUnknown_818D492:: @ 818D492 +PalletTown_PlayersHouse_1F_Text_MovieOnTVGirlOnBrickRoad:: @ 818D492 .string "There's a movie on TV.\n" .string "A girl with her hair in pigtails is\l" .string "walking up a brick road.\p" .string "…I better go, too.$" -gUnknown_818D4F9:: @ 818D4F9 +PalletTown_PlayersHouse_1F_Text_OopsWrongSide:: @ 818D4F9 .string "Oops, wrong side…$" diff --git a/data/maps/PalletTown_PlayersHouse_2F/map.json b/data/maps/PalletTown_PlayersHouse_2F/map.json index 67befec6c..8d6f9fa57 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/map.json +++ b/data/maps/PalletTown_PlayersHouse_2F/map.json @@ -31,21 +31,21 @@ "x": 6, "y": 5, "elevation": 3, - "script": "PalletTown_PlayersHouse_2F_EventScript_168CD2" + "script": "PalletTown_PlayersHouse_2F_EventScript_NES" }, { "type": "bg_event_type_0", "x": 1, "y": 1, "elevation": 0, - "script": "PalletTown_PlayersHouse_2F_EventScript_168CE4" + "script": "PalletTown_PlayersHouse_2F_EventScript_PC" }, { "type": "bg_event_type_0", "x": 11, "y": 1, "elevation": 0, - "script": "PalletTown_PlayersHouse_2F_EventScript_168CDB" + "script": "PalletTown_PlayersHouse_2F_EventScript_Sign" } ] } diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index 7e8c8ee73..de44c733a 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -5,32 +5,31 @@ PalletTown_PlayersHouse_2F_MapScripts:: @ 8168CA3 PalletTown_PlayersHouse_2F_OnTransition:: @ 8168CAE compare VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0 - call_if_eq EventScript_168CBA + call_if_eq PalletTown_PlayersHouse_2F_EventScript_SetRespawn end -EventScript_168CBA:: @ 8168CBA +PalletTown_PlayersHouse_2F_EventScript_SetRespawn:: @ 8168CBA setrespawn SPAWN_PALLET_TOWN return PalletTown_PlayersHouse_2F_OnWarp:: @ 8168CBE - map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0, EventScript_168CC8 + map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0, PalletTown_PlayersHouse_2F_FirstWarpIn .2byte 0 -EventScript_168CC8:: @ 8168CC8 +PalletTown_PlayersHouse_2F_FirstWarpIn:: @ 8168CC8 turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH setvar VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 1 end -PalletTown_PlayersHouse_2F_EventScript_168CD2:: @ 8168CD2 - msgbox gUnknown_818D50B, MSGBOX_SIGN +PalletTown_PlayersHouse_2F_EventScript_NES:: @ 8168CD2 + msgbox PalletTown_PlayersHouse_2F_Text_PlayedWithNES, MSGBOX_SIGN end -PalletTown_PlayersHouse_2F_EventScript_168CDB:: @ 8168CDB - msgbox gUnknown_818D53B, MSGBOX_SIGN +PalletTown_PlayersHouse_2F_EventScript_Sign:: @ 8168CDB + msgbox PalletTown_PlayersHouse_2F_Text_PressLRForHelp, MSGBOX_SIGN end -gUnknown_8168CE4:: @ 8168CE4 -PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4 +PalletTown_PlayersHouse_2F_EventScript_PC:: @ 8168CE4 goto_if_questlog EventScript_ReleaseEnd lockall setvar VAR_0x8004, 32 diff --git a/data/maps/PalletTown_PlayersHouse_2F/text.inc b/data/maps/PalletTown_PlayersHouse_2F/text.inc index e6c794231..cb7a68dce 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/text.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/text.inc @@ -1,9 +1,9 @@ -gUnknown_818D50B:: @ 818D50B +PalletTown_PlayersHouse_2F_Text_PlayedWithNES:: @ 818D50B .string "{PLAYER} played with the NES.\p" .string "…Okay!\n" .string "It's time to go!$" -gUnknown_818D53B:: @ 818D53B +PalletTown_PlayersHouse_2F_Text_PressLRForHelp:: @ 818D53B .string "It's a posted notice…\p" .string "If you're confused, ask for HELP!\n" .string "Press the L or R Button!$" diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index 31e6014cb..4e72c8909 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -25,7 +25,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_ProfessorOaksLab_EventScript_169DEE", + "script": "PalletTown_ProfessorOaksLab_EventScript_Aide1", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 4, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_ProfessorOaksLab_EventScript_169E46", + "script": "PalletTown_ProfessorOaksLab_EventScript_Aide3", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_ProfessorOaksLab_EventScript_169E1A", + "script": "PalletTown_ProfessorOaksLab_EventScript_Aide2", "flag": "0" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_ProfessorOaksLab_EventScript_169595", + "script": "PalletTown_ProfessorOaksLab_EventScript_ProfOak", "flag": "FLAG_HIDE_OAK_IN_HIS_LAB" }, { @@ -77,7 +77,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_ProfessorOaksLab_EventScript_169BAB", + "script": "PalletTown_ProfessorOaksLab_EventScript_BulbasaurBall", "flag": "FLAG_HIDE_BULBASAUR_BALL" }, { @@ -90,7 +90,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_ProfessorOaksLab_EventScript_169D78", + "script": "PalletTown_ProfessorOaksLab_EventScript_SquirtleBall", "flag": "FLAG_HIDE_SQUIRTLE_BALL" }, { @@ -103,7 +103,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_ProfessorOaksLab_EventScript_169DAE", + "script": "PalletTown_ProfessorOaksLab_EventScript_CharmanderBall", "flag": "FLAG_HIDE_CHARMANDER_BALL" }, { @@ -116,7 +116,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_ProfessorOaksLab_EventScript_16955F", + "script": "PalletTown_ProfessorOaksLab_EventScript_Rival", "flag": "FLAG_HIDE_RIVAL_IN_LAB" }, { @@ -129,7 +129,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_ProfessorOaksLab_EventScript_169E5F", + "script": "PalletTown_ProfessorOaksLab_EventScript_Pokedex", "flag": "FLAG_HIDE_POKEDEX" }, { @@ -142,7 +142,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PalletTown_ProfessorOaksLab_EventScript_169E5F", + "script": "PalletTown_ProfessorOaksLab_EventScript_Pokedex", "flag": "FLAG_HIDE_POKEDEX" } ], @@ -177,7 +177,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", "var_value": 2, - "script": "PalletTown_ProfessorOaksLab_EventScript_1692C3" + "script": "PalletTown_ProfessorOaksLab_EventScript_LeaveStarterSceneTrigger" }, { "type": "trigger", @@ -186,7 +186,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", "var_value": 2, - "script": "PalletTown_ProfessorOaksLab_EventScript_1692C3" + "script": "PalletTown_ProfessorOaksLab_EventScript_LeaveStarterSceneTrigger" }, { "type": "trigger", @@ -195,7 +195,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", "var_value": 2, - "script": "PalletTown_ProfessorOaksLab_EventScript_1692C3" + "script": "PalletTown_ProfessorOaksLab_EventScript_LeaveStarterSceneTrigger" }, { "type": "trigger", @@ -204,7 +204,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", "var_value": 3, - "script": "PalletTown_ProfessorOaksLab_EventScript_1692E7" + "script": "PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerLeft" }, { "type": "trigger", @@ -213,7 +213,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", "var_value": 3, - "script": "PalletTown_ProfessorOaksLab_EventScript_1692F3" + "script": "PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerMid" }, { "type": "trigger", @@ -222,7 +222,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", "var_value": 3, - "script": "PalletTown_ProfessorOaksLab_EventScript_1692FF" + "script": "PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerRight" } ], "bg_events": [ @@ -231,28 +231,28 @@ "x": 2, "y": 1, "elevation": 0, - "script": "PalletTown_ProfessorOaksLab_EventScript_169E68" + "script": "PalletTown_ProfessorOaksLab_EventScript_Computer" }, { "type": "bg_event_type_0", "x": 3, "y": 1, "elevation": 0, - "script": "PalletTown_ProfessorOaksLab_EventScript_169E68" + "script": "PalletTown_ProfessorOaksLab_EventScript_Computer" }, { "type": "bg_event_type_0", "x": 6, "y": 1, "elevation": 0, - "script": "PalletTown_ProfessorOaksLab_EventScript_169E71" + "script": "PalletTown_ProfessorOaksLab_EventScript_LeftSign" }, { "type": "bg_event_type_0", "x": 7, "y": 1, "elevation": 0, - "script": "PalletTown_ProfessorOaksLab_EventScript_169E7A" + "script": "PalletTown_ProfessorOaksLab_EventScript_RightSign" } ] } diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 0e466abd3..19518f6e7 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -1,3 +1,18 @@ +.equ LOCALID_PROF_OAK, 4 +.equ LOCALID_BULBASAUR_BALL, 5 +.equ LOCALID_SQUIRTLE_BALL, 6 +.equ LOCALID_CHARMANDER_BALL, 7 +.equ LOCALID_RIVAL, 8 +.equ LOCALID_POKEDEX_1, 9 +.equ LOCALID_POKEDEX_2, 10 + +.equ PLAYER_STARTER_NUM, VAR_TEMP_1 +.equ PLAYER_STARTER_SPECIES, VAR_TEMP_2 +.equ RIVAL_STARTER_SPECIES, VAR_TEMP_3 +.equ RIVAL_STARTER_ID, VAR_TEMP_4 + +.equ SHOWED_OAK_COMPLETE_DEX, FLAG_TEMP_2 + PalletTown_ProfessorOaksLab_MapScripts:: @ 8168F7E map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_ProfessorOaksLab_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PalletTown_ProfessorOaksLab_OnWarp @@ -7,194 +22,194 @@ PalletTown_ProfessorOaksLab_MapScripts:: @ 8168F7E PalletTown_ProfessorOaksLab_OnTransition:: @ 8168F8E setflag FLAG_VISITED_OAKS_LAB compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 - call_if_eq EventScript_168FC6 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_ReadyOakForStarterScene compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7 - call_if_eq EventScript_168FD5 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_ReadyOakForNationalDexScene compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 - call_if_eq EventScript_168FC0 - call_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, EventScript_168FBC + call_if_eq PalletTown_ProfessorOaksLab_EventScript_SetNationalDexSceneFinished + call_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, PalletTown_ProfessorOaksLab_EventScript_SetSkipPokeBallCheck end -EventScript_168FBC:: @ 8168FBC +PalletTown_ProfessorOaksLab_EventScript_SetSkipPokeBallCheck:: @ 8168FBC setflag FLAG_OAK_SKIP_22_RIVAL_CHECK return -EventScript_168FC0:: @ 8168FC0 +PalletTown_ProfessorOaksLab_EventScript_SetNationalDexSceneFinished:: @ 8168FC0 setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9 return -EventScript_168FC6:: @ 8168FC6 - setobjectxyperm 4, 6, 11 - setobjectmovementtype 4, 7 +PalletTown_ProfessorOaksLab_EventScript_ReadyOakForStarterScene:: @ 8168FC6 + setobjectxyperm LOCALID_PROF_OAK, 6, 11 + setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_UP savebgm MUS_OHKIDO return -EventScript_168FD5:: @ 8168FD5 - setobjectxyperm 4, 6, 11 - setobjectmovementtype 4, 7 +PalletTown_ProfessorOaksLab_EventScript_ReadyOakForNationalDexScene:: @ 8168FD5 + setobjectxyperm LOCALID_PROF_OAK, 6, 11 + setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_UP return PalletTown_ProfessorOaksLab_OnWarp:: @ 8168FE1 - map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, EventScript_168FEB + map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, PalletTown_ProfessorOaksLab_EventScript_ReadyPlayerForStarterScene .2byte 0 -EventScript_168FEB:: @ 8168FEB +PalletTown_ProfessorOaksLab_EventScript_ReadyPlayerForStarterScene:: @ 8168FEB turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end PalletTown_ProfessorOaksLab_OnFrame:: @ 8168FF0 - map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, EventScript_16923E - map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7, EventScript_169002 + map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, PalletTown_ProfessorOaksLab_ChooseStarterScene + map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7, PalletTown_ProfessorOaksLab_EventScript_EnterForNationalDexScene .2byte 0 -EventScript_169002:: @ 8169002 +PalletTown_ProfessorOaksLab_EventScript_EnterForNationalDexScene:: @ 8169002 lockall setvar VAR_FACING, DIR_NORTH textcolor 0 - applymovement 4, Movement_1692B0 + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakEnter waitmovement 0 - removeobject 4 - setobjectxyperm 4, 6, 3 - setobjectmovementtype 4, 8 + removeobject LOCALID_PROF_OAK + setobjectxyperm LOCALID_PROF_OAK, 6, 3 + setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_DOWN clearflag FLAG_HIDE_OAK_IN_HIS_LAB - applymovement OBJ_EVENT_ID_PLAYER, Movement_1692B7 + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter waitmovement 0 - goto EventScript_169035 + goto PalletTown_ProfessorOaksLab_EventScript_NationalDexScene end -EventScript_169035:: @ 8169035 - msgbox gUnknown_818EE60 +PalletTown_ProfessorOaksLab_EventScript_NationalDexScene:: @ 8169035 + msgbox PalletTown_ProfessorOaksLab_Text_OakSightingsOfRareMons closemessage compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_169174 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_1691BB + call_if_eq PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_169194 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest compare VAR_FACING, DIR_WEST - call_if_eq EventScript_169194 - msgbox gUnknown_818EF59 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest + msgbox PalletTown_ProfessorOaksLab_Text_RivalJustLetMeHandleEverything fadedefaultbgm - msgbox gUnknown_818F004 + msgbox PalletTown_ProfessorOaksLab_Text_OakNeedYourHelpTooNeedToSeePokedexes compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_1691DB + call_if_eq PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakNorth compare VAR_FACING, DIR_WEST - call_if_eq EventScript_1691E6 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakWest textcolor 3 - msgbox gUnknown_818F062 + msgbox PalletTown_ProfessorOaksLab_Text_OakTookBothPokedexUnits closemessage call EventScript_1A6675 compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_1691F1 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_1691FC + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_169215 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskEast compare VAR_FACING, DIR_WEST - call_if_eq EventScript_169227 - addobject 9 - addobject 10 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskWest + addobject LOCALID_POKEDEX_1 + addobject LOCALID_POKEDEX_2 delay 30 - msgbox gUnknown_818F085 + msgbox PalletTown_ProfessorOaksLab_Text_OakNowTheseUnitsCanRecordMoreData closemessage - removeobject 9 - removeobject 10 + removeobject LOCALID_POKEDEX_1 + removeobject LOCALID_POKEDEX_2 delay 30 compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_169845 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_169850 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_16985B + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverEast compare VAR_FACING, DIR_WEST - call_if_eq EventScript_16986D + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverWest textcolor 3 playfanfare MUS_FAN5 - message Text_18F0E8 + message PalletTown_ProfessorOaksLab_Text_PlayersPokedexWasUpgraded waitmessage waitfanfare call EventScript_1A6675 special EnableNationalPokedex - msgbox gUnknown_818F103 - msgbox gUnknown_818F1DB + msgbox PalletTown_ProfessorOaksLab_Text_OakMustReallyWorkToFillPokedex + msgbox PalletTown_ProfessorOaksLab_Text_RivalIllCompleteThePokedex closemessage playbgm MUS_RIVAL2, 0 compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_169B69 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_169B7B + call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExit compare VAR_FACING, DIR_EAST - call_if_eq EventScript_169B7B + call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExit compare VAR_FACING, DIR_WEST - call_if_eq EventScript_169B7B - removeobject 8 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExit + removeobject LOCALID_RIVAL fadedefaultbgm setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 releaseall end -EventScript_169174:: @ 8169174 - setobjectxyperm 8, 5, 10 - addobject 8 +PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterNorth:: @ 8169174 + setobjectxyperm LOCALID_RIVAL, 5, 10 + addobject LOCALID_RIVAL playbgm MUS_RIVAL1, 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_169B94 - applymovement 8, Movement_169B9D + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 return -EventScript_169194:: @ 8169194 - setobjectxyperm 8, 6, 10 - addobject 8 +PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest:: @ 8169194 + setobjectxyperm LOCALID_RIVAL, 6, 10 + addobject LOCALID_RIVAL playbgm MUS_RIVAL1, 0 - applymovement 4, Movement_WalkInPlaceFastestDown - applymovement OBJ_EVENT_ID_PLAYER, Movement_169B91 - applymovement 8, Movement_169B9D + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 return -EventScript_1691BB:: @ 81691BB - setobjectxyperm 8, 6, 10 - addobject 8 +PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterSouth:: @ 81691BB + setobjectxyperm LOCALID_RIVAL, 6, 10 + addobject LOCALID_RIVAL playbgm MUS_RIVAL1, 0 - applymovement 4, Movement_WalkInPlaceFastestDown - applymovement 8, Movement_169B9D + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 return -EventScript_1691DB:: @ 81691DB +PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakNorth:: @ 81691DB applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return -EventScript_1691E6:: @ 81691E6 +PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakWest:: @ 81691E6 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return -EventScript_1691F1:: @ 81691F1 - applymovement 4, Movement_169232 +PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskNorth:: @ 81691F1 + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk waitmovement 0 return -EventScript_1691FC:: @ 81691FC - applymovement 4, Movement_169238 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1698C7 - applymovement 8, Movement_1698C7 - waitmovement 4 +PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskSouth:: @ 81691FC + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDeskSouth + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk + waitmovement LOCALID_PROF_OAK return -EventScript_169215:: @ 8169215 - applymovement 4, Movement_169232 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1698C3 - waitmovement 4 +PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskEast:: @ 8169215 + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast + waitmovement LOCALID_PROF_OAK return -EventScript_169227:: @ 8169227 - applymovement 4, Movement_169232 +PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskWest:: @ 8169227 + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk waitmovement 0 return -Movement_169232:: @ 8169232 +PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk:: @ 8169232 walk_up walk_left walk_in_place_fastest_up @@ -202,7 +217,7 @@ Movement_169232:: @ 8169232 delay_4 step_end -Movement_169238:: @ 8169238 +PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDeskSouth:: @ 8169238 walk_left walk_left walk_up @@ -210,37 +225,37 @@ Movement_169238:: @ 8169238 delay_4 step_end -EventScript_16923E:: @ 816923E +PalletTown_ProfessorOaksLab_ChooseStarterScene:: @ 816923E lockall textcolor 0 - applymovement 4, Movement_1692B0 + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakEnter waitmovement 0 - removeobject 4 - setobjectxyperm 4, 6, 3 - setobjectmovementtype 4, 8 + removeobject LOCALID_PROF_OAK + setobjectxyperm LOCALID_PROF_OAK, 6, 3 + setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_DOWN clearflag FLAG_HIDE_OAK_IN_HIS_LAB - applymovement OBJ_EVENT_ID_PLAYER, Movement_1692B7 + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter waitmovement 0 - applymovement 8, Movement_WalkInPlaceFastestUp + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestUp waitmovement 0 clearflag FLAG_SPECIAL_FLAG_0x4001 savebgm SE_STOP fadedefaultbgm - msgbox gUnknown_818DC94 + msgbox PalletTown_ProfessorOaksLab_Text_RivalFedUpWithWaiting closemessage delay 60 - msgbox gUnknown_818DFBC + msgbox PalletTown_ProfessorOaksLab_Text_OakThreeMonsChooseOne closemessage delay 30 - applymovement 8, Movement_1692C0 + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalReact waitmovement 0 - msgbox gUnknown_818DCB9 - msgbox gUnknown_818E0EA + msgbox PalletTown_ProfessorOaksLab_Text_RivalNoFairWhatAboutMe + msgbox PalletTown_ProfessorOaksLab_Text_OakBePatientRival setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 releaseall end -Movement_1692B0:: @ 81692B0 +PalletTown_ProfessorOaksLab_Movement_OakEnter:: @ 81692B0 walk_up walk_up walk_up @@ -249,7 +264,7 @@ Movement_1692B0:: @ 81692B0 walk_up step_end -Movement_1692B7:: @ 81692B7 +PalletTown_ProfessorOaksLab_Movement_PlayerEnter:: @ 81692B7 walk_up walk_up walk_up @@ -260,97 +275,101 @@ Movement_1692B7:: @ 81692B7 walk_up step_end -Movement_1692C0:: @ 81692C0 +PalletTown_ProfessorOaksLab_Movement_RivalReact:: @ 81692C0 walk_in_place_up walk_in_place_up step_end -PalletTown_ProfessorOaksLab_EventScript_1692C3:: @ 81692C3 +PalletTown_ProfessorOaksLab_EventScript_LeaveStarterSceneTrigger:: @ 81692C3 lockall textcolor 0 - applymovement 4, Movement_FaceDown + applymovement LOCALID_PROF_OAK, Movement_FaceDown waitmovement 0 - msgbox gUnknown_818E177 + msgbox PalletTown_ProfessorOaksLab_Text_OakHeyDontGoAwayYet closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1692E5 + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWalkUp waitmovement 0 releaseall end -Movement_1692E5:: @ 81692E5 +PalletTown_ProfessorOaksLab_Movement_PlayerWalkUp:: @ 81692E5 walk_up step_end -PalletTown_ProfessorOaksLab_EventScript_1692E7:: @ 81692E7 +PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerLeft:: @ 81692E7 lockall setvar VAR_TEMP_2, 1 - goto EventScript_16930B + goto PalletTown_ProfessorOaksLab_EventScript_RivalBattle end -PalletTown_ProfessorOaksLab_EventScript_1692F3:: @ 81692F3 +PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerMid:: @ 81692F3 lockall setvar VAR_TEMP_2, 2 - goto EventScript_16930B + goto PalletTown_ProfessorOaksLab_EventScript_RivalBattle end -PalletTown_ProfessorOaksLab_EventScript_1692FF:: @ 81692FF +PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerRight:: @ 81692FF lockall setvar VAR_TEMP_2, 3 - goto EventScript_16930B + goto PalletTown_ProfessorOaksLab_EventScript_RivalBattle end -EventScript_16930B:: @ 816930B +PalletTown_ProfessorOaksLab_EventScript_RivalBattle:: @ 816930B textcolor 0 playbgm MUS_RIVAL1, 0 - applymovement 8, Movement_WalkInPlaceFastestDown + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox gUnknown_818DDA4 + msgbox PalletTown_ProfessorOaksLab_Text_RivalLetsCheckOutMons closemessage - applymovement 4, Movement_FaceDown + applymovement LOCALID_PROF_OAK, Movement_FaceDown waitmovement 0 compare VAR_STARTER_MON, 0 - goto_if_eq EventScript_1693D2 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmander compare VAR_STARTER_MON, 1 - goto_if_eq EventScript_16944D + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaur compare VAR_STARTER_MON, 2 - goto_if_eq EventScript_16935A + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtle end -EventScript_16935A:: @ 816935A +@ The scripts for the rival approaching the player for battle are a bit bloated because +@ both the player and rival can be in 3 different positions, so theres 9 different approaches +@ NOTE: Names below refer to the Rival's mon (e.g. for RivalBattleSquirtle, player has Charmander) + +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtle:: @ 816935A compare VAR_TEMP_2, 1 - goto_if_eq EventScript_16937C + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleLeft compare VAR_TEMP_2, 2 - goto_if_eq EventScript_16938C + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleMid compare VAR_TEMP_2, 3 - goto_if_eq EventScript_16939C + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleRight end -EventScript_16937C:: @ 816937C - applymovement 8, Movement_1693C0 +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleLeft:: @ 816937C + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleLeft waitmovement 0 - goto EventScript_1693AC + goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleSquirtle end -EventScript_16938C:: @ 816938C - applymovement 8, Movement_1693C7 +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleMid:: @ 816938C + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleMid waitmovement 0 - goto EventScript_1693AC + goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleSquirtle end -EventScript_16939C:: @ 816939C - applymovement 8, Movement_1693CD +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleRight:: @ 816939C + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleRight waitmovement 0 - goto EventScript_1693AC + goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleSquirtle end -EventScript_1693AC:: @ 81693AC - trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, RIVAL_BATTLE_TUTORIAL, Text_18DDEA, Text_RivalVictory - goto EventScript_1694C2 +PalletTown_ProfessorOaksLab_EventScript_RivalBattleSquirtle:: @ 81693AC + trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, RIVAL_BATTLE_TUTORIAL, PalletTown_ProfessorOaksLab_Text_RivalDefeat, Text_RivalVictory + goto PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle end -Movement_1693C0:: @ 81693C0 +PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleLeft:: @ 81693C0 walk_left walk_left walk_left @@ -359,7 +378,7 @@ Movement_1693C0:: @ 81693C0 walk_down step_end -Movement_1693C7:: @ 81693C7 +PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleMid:: @ 81693C7 walk_left walk_left walk_left @@ -367,46 +386,46 @@ Movement_1693C7:: @ 81693C7 walk_down step_end -Movement_1693CD:: @ 81693CD +PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleRight:: @ 81693CD walk_left walk_left walk_down walk_down step_end -EventScript_1693D2:: @ 81693D2 +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmander:: @ 81693D2 compare VAR_TEMP_2, 1 - goto_if_eq EventScript_1693F4 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderLeft compare VAR_TEMP_2, 2 - goto_if_eq EventScript_169404 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderMid compare VAR_TEMP_2, 3 - goto_if_eq EventScript_169414 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderRight end -EventScript_1693F4:: @ 81693F4 - applymovement 8, Movement_169438 +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderLeft:: @ 81693F4 + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderLeft waitmovement 0 - goto EventScript_169424 + goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleCharmander end -EventScript_169404:: @ 8169404 - applymovement 8, Movement_169440 +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderMid:: @ 8169404 + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderMid waitmovement 0 - goto EventScript_169424 + goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleCharmander end -EventScript_169414:: @ 8169414 - applymovement 8, Movement_169447 +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderRight:: @ 8169414 + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderRight waitmovement 0 - goto EventScript_169424 + goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleCharmander end -EventScript_169424:: @ 8169424 - trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_CHARMANDER, RIVAL_BATTLE_TUTORIAL, Text_18DDEA, Text_RivalVictory - goto EventScript_1694C2 +PalletTown_ProfessorOaksLab_EventScript_RivalBattleCharmander:: @ 8169424 + trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_CHARMANDER, RIVAL_BATTLE_TUTORIAL, PalletTown_ProfessorOaksLab_Text_RivalDefeat, Text_RivalVictory + goto PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle end -Movement_169438:: @ 8169438 +PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderLeft:: @ 8169438 walk_left walk_left walk_left @@ -416,7 +435,7 @@ Movement_169438:: @ 8169438 walk_down step_end -Movement_169440:: @ 8169440 +PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderMid:: @ 8169440 walk_left walk_left walk_left @@ -425,7 +444,7 @@ Movement_169440:: @ 8169440 walk_down step_end -Movement_169447:: @ 8169447 +PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderRight:: @ 8169447 walk_left walk_left walk_left @@ -433,39 +452,39 @@ Movement_169447:: @ 8169447 walk_down step_end -EventScript_16944D:: @ 816944D +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaur:: @ 816944D compare VAR_TEMP_2, 1 - goto_if_eq EventScript_16946F + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurLeft compare VAR_TEMP_2, 2 - goto_if_eq EventScript_16947F + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurMid compare VAR_TEMP_2, 3 - goto_if_eq EventScript_16948F + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurRight end -EventScript_16946F:: @ 816946F - applymovement 8, Movement_1694B3 +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurLeft:: @ 816946F + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurLeft waitmovement 0 - goto EventScript_16949F + goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleBulbasaur end -EventScript_16947F:: @ 816947F - applymovement 8, Movement_1694B9 +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurMid:: @ 816947F + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurMid waitmovement 0 - goto EventScript_16949F + goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleBulbasaur end -EventScript_16948F:: @ 816948F - applymovement 8, Movement_1694BE +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurRight:: @ 816948F + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurRight waitmovement 0 - goto EventScript_16949F + goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleBulbasaur end -EventScript_16949F:: @ 816949F - trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_BULBASAUR, RIVAL_BATTLE_TUTORIAL, Text_18DDEA, Text_RivalVictory - goto EventScript_1694C2 +PalletTown_ProfessorOaksLab_EventScript_RivalBattleBulbasaur:: @ 816949F + trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_BULBASAUR, RIVAL_BATTLE_TUTORIAL, PalletTown_ProfessorOaksLab_Text_RivalDefeat, Text_RivalVictory + goto PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle end -Movement_1694B3:: @ 81694B3 +PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurLeft:: @ 81694B3 walk_left walk_left walk_left @@ -473,31 +492,31 @@ Movement_1694B3:: @ 81694B3 walk_down step_end -Movement_1694B9:: @ 81694B9 +PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurMid:: @ 81694B9 walk_left walk_left walk_down walk_down step_end -Movement_1694BE:: @ 81694BE +PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurRight:: @ 81694BE walk_left walk_down walk_down step_end -EventScript_1694C2:: @ 81694C2 +PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle:: @ 81694C2 special HealPlayerParty - msgbox gUnknown_818DE38 + msgbox PalletTown_ProfessorOaksLab_Text_RivalGoToughenMyMon closemessage playbgm MUS_RIVAL2, 0 compare VAR_TEMP_2, 1 - call_if_eq EventScript_169504 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleLeft compare VAR_TEMP_2, 2 - call_if_eq EventScript_169516 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleMid compare VAR_TEMP_2, 3 - call_if_eq EventScript_169528 - removeobject 8 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleRight + removeobject LOCALID_RIVAL playse SE_KAIDAN fadedefaultbgm setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4 @@ -505,25 +524,25 @@ EventScript_1694C2:: @ 81694C2 releaseall end -EventScript_169504:: @ 8169504 - applymovement 8, Movement_16953A - applymovement OBJ_EVENT_ID_PLAYER, Movement_169553 - waitmovement 8 +PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleLeft:: @ 8169504 + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleLeft + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle + waitmovement LOCALID_RIVAL return -EventScript_169516:: @ 8169516 - applymovement 8, Movement_16954A - applymovement OBJ_EVENT_ID_PLAYER, Movement_169553 - waitmovement 8 +PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleMid:: @ 8169516 + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleMid + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle + waitmovement LOCALID_RIVAL return -EventScript_169528:: @ 8169528 - applymovement 8, Movement_169542 - applymovement OBJ_EVENT_ID_PLAYER, Movement_169559 - waitmovement 8 +PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleRight:: @ 8169528 + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleRight + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattleRight + waitmovement LOCALID_RIVAL return -Movement_16953A:: @ 816953A +PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleLeft:: @ 816953A walk_right walk_down walk_down @@ -533,7 +552,7 @@ Movement_16953A:: @ 816953A delay_8 step_end -Movement_169542:: @ 8169542 +PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleRight:: @ 8169542 walk_left walk_down walk_down @@ -543,7 +562,7 @@ Movement_169542:: @ 8169542 delay_8 step_end -Movement_16954A:: @ 816954A +PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleMid:: @ 816954A walk_right walk_down walk_down @@ -554,7 +573,7 @@ Movement_16954A:: @ 816954A delay_8 step_end -Movement_169553:: @ 8169553 +PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle:: @ 8169553 delay_16 delay_8 walk_in_place_fastest_right @@ -562,7 +581,7 @@ Movement_169553:: @ 8169553 walk_in_place_fastest_down step_end -Movement_169559:: @ 8169559 +PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattleRight:: @ 8169559 delay_16 delay_8 walk_in_place_fastest_left @@ -570,168 +589,168 @@ Movement_169559:: @ 8169559 walk_in_place_fastest_down step_end -PalletTown_ProfessorOaksLab_EventScript_16955F:: @ 816955F +PalletTown_ProfessorOaksLab_EventScript_Rival:: @ 816955F lock faceplayer compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if_eq EventScript_16958B + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalChoseStarter compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if_eq EventScript_169581 - msgbox gUnknown_818DC67 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalWaitingForStarter + msgbox PalletTown_ProfessorOaksLab_Text_RivalGrampsIsntAround release end -EventScript_169581:: @ 8169581 - msgbox gUnknown_818DCE2 +PalletTown_ProfessorOaksLab_EventScript_RivalWaitingForStarter:: @ 8169581 + msgbox PalletTown_ProfessorOaksLab_Text_RivalGoChoosePlayer release end -EventScript_16958B:: @ 816958B - msgbox gUnknown_818DD75 +PalletTown_ProfessorOaksLab_EventScript_RivalChoseStarter:: @ 816958B + msgbox PalletTown_ProfessorOaksLab_Text_RivalMyMonLooksTougher release end -PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595 +PalletTown_ProfessorOaksLab_EventScript_ProfOak:: @ 8169595 lock faceplayer - goto_if_set FLAG_TEMP_2, EventScript_169600 + goto_if_set SHOWED_OAK_COMPLETE_DEX, PalletTown_ProfessorOaksLab_EventScript_OakJustShownCompleteDex compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9 - goto_if_eq EventScript_169903 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RatePokedex compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 - goto_if_eq EventScript_169A6E - goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_1699CE + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait + goto_if_set FLAG_SYS_GAME_CLEAR, PalletTown_ProfessorOaksLab_EventScript_TryStartNationalDexScene compare VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1 - goto_if_eq EventScript_169903 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RatePokedex compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 - goto_if_eq EventScript_1698D6 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RatePokedexOrTryGiveBalls compare VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 - goto_if_ge EventScript_16961E + goto_if_ge PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4 - goto_if_eq EventScript_169614 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBattleMonForItToGrow compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if_eq EventScript_16960A - msgbox gUnknown_818E116 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_OakCanReachNextTownWithMon + msgbox PalletTown_ProfessorOaksLab_Text_OakWhichOneWillYouChoose release end -EventScript_169600:: @ 8169600 - msgbox gUnknown_81A72AD +PalletTown_ProfessorOaksLab_EventScript_OakJustShownCompleteDex:: @ 8169600 + msgbox PokedexRating_Text_ThankYouMadeDreamReality release end -EventScript_16960A:: @ 816960A - msgbox gUnknown_818E330 +PalletTown_ProfessorOaksLab_EventScript_OakCanReachNextTownWithMon:: @ 816960A + msgbox PalletTown_ProfessorOaksLab_Text_OakCanReachNextTownWithMon release end -EventScript_169614:: @ 8169614 - msgbox gUnknown_818E3AD +PalletTown_ProfessorOaksLab_EventScript_OakBattleMonForItToGrow:: @ 8169614 + msgbox PalletTown_ProfessorOaksLab_Text_OakBattleMonForItToGrow release end -EventScript_16961E:: @ 816961E - msgbox gUnknown_818E405 +PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: @ 816961E + msgbox PalletTown_ProfessorOaksLab_Text_OakHaveSomethingForMe textcolor 3 playfanfare MUS_ME_WAZA - message Text_18E4AF + message PalletTown_ProfessorOaksLab_Text_DeliveredOaksParcel waitmessage waitfanfare call EventScript_1A6675 removeitem ITEM_OAKS_PARCEL, 1 - msgbox gUnknown_818E4CA + msgbox PalletTown_ProfessorOaksLab_Text_OakCustomBallIOrdered playbgm MUS_RIVAL1, 0 - msgbox gUnknown_818DE8D + msgbox PalletTown_ProfessorOaksLab_Text_RivalGramps closemessage compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_169A82 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_169AC1 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_169A9E + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest compare VAR_FACING, DIR_WEST - call_if_eq EventScript_169A9E + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest fadedefaultbgm - msgbox gUnknown_818DE99 + msgbox PalletTown_ProfessorOaksLab_Text_RivalWhatDidYouCallMeFor closemessage delay 30 playse SE_PIN - applymovement 4, Movement_ExclamationMark + applymovement LOCALID_PROF_OAK, Movement_ExclamationMark waitmovement 0 - applymovement 4, Movement_Delay48 + applymovement LOCALID_PROF_OAK, Movement_Delay48 waitmovement 0 compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_169ADD + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_169B14 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalEast compare VAR_FACING, DIR_WEST - call_if_eq EventScript_169AF5 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalWest compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_169B86 - msgbox gUnknown_818E508 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalNorth + msgbox PalletTown_ProfessorOaksLab_Text_OakHaveRequestForYouTwo closemessage compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_169882 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_16988D + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_1698A6 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskEast compare VAR_FACING, DIR_WEST - call_if_eq EventScript_1698B8 - msgbox gUnknown_818E536 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskWest + msgbox PalletTown_ProfessorOaksLab_Text_OakPokedexOnDesk closemessage delay 40 - msgbox gUnknown_818E5C5 + msgbox PalletTown_ProfessorOaksLab_Text_OakTakeTheseWithYou closemessage - applymovement 4, Movement_WalkInPlaceFastestUp + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestUp waitmovement 0 - removeobject 9 + removeobject LOCALID_POKEDEX_1 delay 10 - removeobject 10 + removeobject LOCALID_POKEDEX_2 delay 25 compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_169845 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_169850 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_16985B + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverEast compare VAR_FACING, DIR_WEST - call_if_eq EventScript_16986D + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverWest delay 10 textcolor 3 playfanfare MUS_FAN5 - message Text_18E5EA + message PalletTown_ProfessorOaksLab_Text_ReceivedPokedexFromOak waitmessage waitfanfare call EventScript_1A6675 setflag FLAG_SYS_POKEDEX_GET special sub_810B810 setvar VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 1 - msgbox gUnknown_818E612 - giveitem_msg gUnknown_818E6B3, ITEM_POKE_BALL, 5 - msgbox gUnknown_818E6D0 + msgbox PalletTown_ProfessorOaksLab_Text_OakCatchMonsForDataTakeThese + giveitem_msg PalletTown_ProfessorOaksLab_Text_ReceivedFivePokeBalls, ITEM_POKE_BALL, 5 + msgbox PalletTown_ProfessorOaksLab_Text_OakExplainCatching famechecker FAMECHECKER_OAK, 1 - msgbox gUnknown_818E784 - msgbox gUnknown_818DEC8 + msgbox PalletTown_ProfessorOaksLab_Text_OakCompleteMonGuideWasMyDream + msgbox PalletTown_ProfessorOaksLab_Text_RivalLeaveItToMeGramps compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_169B33 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_169B45 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_169B57 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerEastWest compare VAR_FACING, DIR_WEST - call_if_eq EventScript_169B57 - msgbox gUnknown_818DEF3 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerEastWest + msgbox PalletTown_ProfessorOaksLab_Text_RivalTellSisNotToGiveYouMap closemessage playbgm MUS_RIVAL2, 0 compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_169B69 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_169B7B + call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExit compare VAR_FACING, DIR_EAST - call_if_eq EventScript_169B7B + call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExit compare VAR_FACING, DIR_WEST - call_if_eq EventScript_169B7B - removeobject 8 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExit + removeobject LOCALID_RIVAL fadedefaultbgm setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 2 @@ -741,86 +760,86 @@ EventScript_16961E:: @ 816961E release end -EventScript_169845:: @ 8169845 - applymovement 4, Movement_16987C +PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverNorth:: @ 8169845 + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver waitmovement 0 return -EventScript_169850:: @ 8169850 - applymovement 4, Movement_16987F +PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverSouth:: @ 8169850 + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOverSouth waitmovement 0 return -EventScript_16985B:: @ 816985B - applymovement 4, Movement_16987C - applymovement OBJ_EVENT_ID_PLAYER, Movement_169878 +PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverEast:: @ 816985B + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerFaceOakForDexEast waitmovement 0 return -EventScript_16986D:: @ 816986D - applymovement 4, Movement_16987C +PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverWest:: @ 816986D + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver waitmovement 0 return -Movement_169878:: @ 8169878 +PalletTown_ProfessorOaksLab_Movement_PlayerFaceOakForDexEast:: @ 8169878 delay_16 delay_8 walk_in_place_fastest_right step_end -Movement_16987C:: @ 816987C +PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver:: @ 816987C walk_right walk_down step_end -Movement_16987F:: @ 816987F +PalletTown_ProfessorOaksLab_Movement_OakBringDexesOverSouth:: @ 816987F walk_down walk_right step_end -EventScript_169882:: @ 8169882 - applymovement 4, Movement_1698CB +PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskNorth:: @ 8169882 + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk waitmovement 0 return -EventScript_16988D:: @ 816988D - applymovement 4, Movement_1698D0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1698C7 - applymovement 8, Movement_1698C7 - waitmovement 4 +PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskSouth:: @ 816988D + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDeskSouth + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk + waitmovement LOCALID_PROF_OAK return -EventScript_1698A6:: @ 81698A6 - applymovement 4, Movement_1698CB - applymovement OBJ_EVENT_ID_PLAYER, Movement_1698C3 - waitmovement 4 +PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskEast:: @ 81698A6 + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast + waitmovement LOCALID_PROF_OAK return -EventScript_1698B8:: @ 81698B8 - applymovement 4, Movement_1698CB +PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskWest:: @ 81698B8 + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk waitmovement 0 return -Movement_1698C3:: @ 81698C3 +PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast:: @ 81698C3 delay_16 delay_8 walk_in_place_fastest_up step_end -Movement_1698C7:: @ 81698C7 +PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk:: @ 81698C7 delay_16 delay_8 walk_in_place_fastest_left step_end -Movement_1698CB:: @ 81698CB +PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk:: @ 81698CB walk_up walk_left delay_16 walk_in_place_fastest_down step_end -Movement_1698D0:: @ 81698D0 +PalletTown_ProfessorOaksLab_Movement_OakWalkToDeskSouth:: @ 81698D0 walk_left walk_left walk_up @@ -828,67 +847,67 @@ Movement_1698D0:: @ 81698D0 walk_in_place_fastest_right step_end -EventScript_1698D6:: @ 81698D6 +PalletTown_ProfessorOaksLab_EventScript_RatePokedexOrTryGiveBalls:: @ 81698D6 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount copyvar VAR_0x8008, VAR_0x8005 copyvar VAR_0x8009, VAR_0x8006 getnumberstring 0, VAR_0x8008 getnumberstring 1, VAR_0x8009 - compare VAR_0x8009, 1 - goto_if_eq EventScript_1699FB - goto EventScript_169903 + compare VAR_0x8009, 1 @ Player only has starter + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_CheckIfPlayerNeedsBalls + goto PalletTown_ProfessorOaksLab_EventScript_RatePokedex end -EventScript_169903:: @ 8169903 - call ProfOak_EventScript_RatePokedexInPerson - goto_if_set FLAG_OAK_SAW_DEX_COMPLETION, EventScript_169913 +PalletTown_ProfessorOaksLab_EventScript_RatePokedex:: @ 8169903 + call PokedexRating_EventScript_RateInPerson + goto_if_set FLAG_OAK_SAW_DEX_COMPLETION, PalletTown_ProfessorOaksLab_EventScript_DexCompleted release end -EventScript_169913:: @ 8169913 +PalletTown_ProfessorOaksLab_EventScript_DexCompleted:: @ 8169913 closemessage delay 40 - message Text_1A7291 + message PokedexRating_Text_Wroooaaarrr waitmessage compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_169964 + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakExcitedNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_16996F + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakExcitedSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_16997A + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakExcitedEast compare VAR_FACING, DIR_WEST - call_if_eq EventScript_169985 - applymovement 4, Movement_FacePlayer + call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakExcitedWest + applymovement LOCALID_PROF_OAK, Movement_FacePlayer waitmovement 0 closemessage delay 70 - msgbox gUnknown_81A72AD - setflag FLAG_TEMP_2 + msgbox PokedexRating_Text_ThankYouMadeDreamReality + setflag SHOWED_OAK_COMPLETE_DEX release end -EventScript_169964:: @ 8169964 - applymovement 4, Movement_169990 +PalletTown_ProfessorOaksLab_EventScript_OakExcitedNorth:: @ 8169964 + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedNorth waitmovement 0 return -EventScript_16996F:: @ 816996F - applymovement 4, Movement_169997 +PalletTown_ProfessorOaksLab_EventScript_OakExcitedSouth:: @ 816996F + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedSouth waitmovement 0 return -EventScript_16997A:: @ 816997A - applymovement 4, Movement_16999E +PalletTown_ProfessorOaksLab_EventScript_OakExcitedEast:: @ 816997A + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedEast waitmovement 0 return -EventScript_169985:: @ 8169985 - applymovement 4, Movement_1699A5 +PalletTown_ProfessorOaksLab_EventScript_OakExcitedWest:: @ 8169985 + applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedWest waitmovement 0 return -Movement_169990:: @ 8169990 +PalletTown_ProfessorOaksLab_Movement_OakExcitedNorth:: @ 8169990 walk_in_place_down walk_in_place_fast_down walk_in_place_down @@ -897,7 +916,7 @@ Movement_169990:: @ 8169990 walk_in_place_down step_end -Movement_169997:: @ 8169997 +PalletTown_ProfessorOaksLab_Movement_OakExcitedSouth:: @ 8169997 walk_in_place_up walk_in_place_fast_up walk_in_place_up @@ -906,7 +925,7 @@ Movement_169997:: @ 8169997 walk_in_place_up step_end -Movement_16999E:: @ 816999E +PalletTown_ProfessorOaksLab_Movement_OakExcitedEast:: @ 816999E walk_in_place_left walk_in_place_fast_left walk_in_place_left @@ -915,7 +934,7 @@ Movement_16999E:: @ 816999E walk_in_place_left step_end -Movement_1699A5:: @ 81699A5 +PalletTown_ProfessorOaksLab_Movement_OakExcitedWest:: @ 81699A5 walk_in_place_right walk_in_place_fast_right walk_in_place_right @@ -924,6 +943,7 @@ Movement_1699A5:: @ 81699A5 walk_in_place_right step_end +@ Unused Movement_1699AC:: @ 81699AC walk_left walk_in_place_fastest_down @@ -951,6 +971,7 @@ Movement_1699AC:: @ 81699AC walk_left step_end +@ Unused Movement_1699C5: walk_up walk_down @@ -962,146 +983,146 @@ Movement_1699C5: delay_16 step_end -EventScript_1699CE:: @ 81699CE - call ProfOak_EventScript_RatePokedexInPerson +PalletTown_ProfessorOaksLab_EventScript_TryStartNationalDexScene:: @ 81699CE + call PokedexRating_EventScript_RateInPerson closemessage compare VAR_0x8009, 60 - goto_if_lt EventScript_1699F9 - goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, EventScript_1699F9 + goto_if_lt PalletTown_ProfessorOaksLab_EventScript_DontStartNationalDexScene + goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, PalletTown_ProfessorOaksLab_EventScript_DontStartNationalDexScene delay 30 - msgbox gUnknown_818EDF5 - goto EventScript_169035 + msgbox PalletTown_ProfessorOaksLab_Text_OakFavorToAskYouPlayer + goto PalletTown_ProfessorOaksLab_EventScript_NationalDexScene end -EventScript_1699F9:: @ 81699F9 +PalletTown_ProfessorOaksLab_EventScript_DontStartNationalDexScene:: @ 81699F9 release end -EventScript_1699FB:: @ 81699FB +PalletTown_ProfessorOaksLab_EventScript_CheckIfPlayerNeedsBalls:: @ 81699FB goto_if_questlog EventScript_ReleaseEnd special sub_8112364 - goto_if_set FLAG_OAK_SKIP_22_RIVAL_CHECK, EventScript_169A6E - goto_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, EventScript_169A78 + goto_if_set FLAG_OAK_SKIP_22_RIVAL_CHECK, PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait + goto_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, PalletTown_ProfessorOaksLab_EventScript_PlayerAlreadyGotBalls checkitem ITEM_POKE_BALL, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_169A34 - goto EventScript_169A6E + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_PlayerOutOfBalls + goto PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait end -EventScript_169A34:: @ 8169A34 +PalletTown_ProfessorOaksLab_EventScript_PlayerOutOfBalls:: @ 8169A34 compare VAR_MAP_SCENE_ROUTE22, 2 - goto_if_ge EventScript_169A45 - goto EventScript_169A6E + goto_if_ge PalletTown_ProfessorOaksLab_EventScript_GivePlayerMoreBalls + goto PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait end -EventScript_169A45:: @ 8169A45 - msgbox gUnknown_818E89C - giveitem_msg gUnknown_818E6B3, ITEM_POKE_BALL, 5 +PalletTown_ProfessorOaksLab_EventScript_GivePlayerMoreBalls:: @ 8169A45 + msgbox PalletTown_ProfessorOaksLab_Text_OakAddedNothingToPokedex + giveitem_msg PalletTown_ProfessorOaksLab_Text_ReceivedFivePokeBalls, ITEM_POKE_BALL, 5 setflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL release end -EventScript_169A6E:: @ 8169A6E - msgbox gUnknown_818E871 +PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait:: @ 8169A6E + msgbox PalletTown_ProfessorOaksLab_Text_OakMonsAroundWorldWait release end -EventScript_169A78:: @ 8169A78 - msgbox gUnknown_818E98E +PalletTown_ProfessorOaksLab_EventScript_PlayerAlreadyGotBalls:: @ 8169A78 + msgbox PalletTown_ProfessorOaksLab_Text_OakComeSeeMeSometime release end -EventScript_169A82:: @ 8169A82 - setobjectxyperm 8, 5, 10 - addobject 8 - applymovement OBJ_EVENT_ID_PLAYER, Movement_169B94 - applymovement 8, Movement_169B9D +PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterNorth:: @ 8169A82 + setobjectxyperm LOCALID_RIVAL, 5, 10 + addobject LOCALID_RIVAL + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 return -EventScript_169A9E:: @ 8169A9E - setobjectxyperm 8, 6, 10 - addobject 8 - applymovement 4, Movement_WalkInPlaceFastestDown - applymovement OBJ_EVENT_ID_PLAYER, Movement_169B91 - applymovement 8, Movement_169B9D +PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest:: @ 8169A9E + setobjectxyperm LOCALID_RIVAL, 6, 10 + addobject LOCALID_RIVAL + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 return -EventScript_169AC1:: @ 8169AC1 - setobjectxyperm 8, 6, 10 - addobject 8 - applymovement 4, Movement_WalkInPlaceFastestDown - applymovement 8, Movement_169B9D +PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterSouth:: @ 8169AC1 + setobjectxyperm LOCALID_RIVAL, 6, 10 + addobject LOCALID_RIVAL + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 return -EventScript_169ADD:: @ 8169ADD - applymovement 4, Movement_FacePlayer +PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalSouth:: @ 8169ADD + applymovement LOCALID_PROF_OAK, Movement_FacePlayer waitmovement 0 delay 15 - applymovement 4, Movement_WalkInPlaceFastestDown + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown waitmovement 0 return -EventScript_169AF5:: @ 8169AF5 - applymovement 4, Movement_FacePlayer +PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalWest:: @ 8169AF5 + applymovement LOCALID_PROF_OAK, Movement_FacePlayer waitmovement 0 delay 15 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft - applymovement 4, Movement_WalkInPlaceFastestDown + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown waitmovement 0 return -EventScript_169B14:: @ 8169B14 - applymovement 4, Movement_FacePlayer +PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalEast:: @ 8169B14 + applymovement LOCALID_PROF_OAK, Movement_FacePlayer waitmovement 0 delay 15 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight - applymovement 4, Movement_WalkInPlaceFastestDown + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown waitmovement 0 return -EventScript_169B33:: @ 8169B33 - applymovement 8, Movement_FacePlayer +PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerNorth:: @ 8169B33 + applymovement LOCALID_RIVAL, Movement_FacePlayer applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return -EventScript_169B45:: @ 8169B45 - applymovement 8, Movement_WalkInPlaceFastestUp +PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerSouth:: @ 8169B45 + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return -EventScript_169B57:: @ 8169B57 - applymovement 8, Movement_FacePlayer +PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerEastWest:: @ 8169B57 + applymovement LOCALID_RIVAL, Movement_FacePlayer applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return -EventScript_169B69:: @ 8169B69 - applymovement OBJ_EVENT_ID_PLAYER, Movement_169B91 - applymovement 8, Movement_169BA4 +PalletTown_ProfessorOaksLab_EventScript_RivalExitNorth:: @ 8169B69 + applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExit waitmovement 0 return -EventScript_169B7B:: @ 8169B7B - applymovement 8, Movement_169BA4 +PalletTown_ProfessorOaksLab_EventScript_RivalExit:: @ 8169B7B + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExit waitmovement 0 return -EventScript_169B86:: @ 8169B86 +PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalNorth:: @ 8169B86 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return -Movement_169B91:: @ 8169B91 +PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest:: @ 8169B91 delay_4 walk_in_place_fastest_down step_end -Movement_169B94:: @ 8169B94 +PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth:: @ 8169B94 walk_in_place_fastest_down delay_16 delay_16 @@ -1112,7 +1133,7 @@ Movement_169B94:: @ 8169B94 walk_in_place_fastest_left step_end -Movement_169B9D:: @ 8169B9D +PalletTown_ProfessorOaksLab_Movement_RivalEnter:: @ 8169B9D walk_up walk_up walk_up @@ -1121,7 +1142,7 @@ Movement_169B9D:: @ 8169B9D walk_up step_end -Movement_169BA4:: @ 8169BA4 +PalletTown_ProfessorOaksLab_Movement_RivalExit:: @ 8169BA4 walk_down walk_down walk_down @@ -1130,79 +1151,74 @@ Movement_169BA4:: @ 8169BA4 walk_down step_end - .equ VAR_OAKSLAB_PLAYER_STARTER_NO, VAR_TEMP_1 - .equ VAR_OAKSLAB_PLAYER_STARTER_SPECIES, VAR_TEMP_2 - .equ VAR_OAKSLAB_RIVAL_STARTER_SPECIES, VAR_TEMP_3 - .equ VAR_OAKSLAB_RIVAL_STARTER_OBJID, VAR_TEMP_4 - -PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB +PalletTown_ProfessorOaksLab_EventScript_BulbasaurBall:: @ 8169BAB lock faceplayer - setvar VAR_OAKSLAB_PLAYER_STARTER_NO, 0 - setvar VAR_OAKSLAB_PLAYER_STARTER_SPECIES, SPECIES_BULBASAUR - setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_CHARMANDER - setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 7 + setvar PLAYER_STARTER_NUM, 0 + setvar PLAYER_STARTER_SPECIES, SPECIES_BULBASAUR + setvar RIVAL_STARTER_SPECIES, SPECIES_CHARMANDER + setvar RIVAL_STARTER_ID, LOCALID_CHARMANDER_BALL compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if_ge EventScript_169DE4 + goto_if_ge PalletTown_ProfessorOaksLab_EventScript_LastPokeBall compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if_eq EventScript_169BE1 - msgbox gUnknown_818EA19 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice + msgbox PalletTown_ProfessorOaksLab_Text_ThoseArePokeBalls release end -EventScript_169BE1:: @ 8169BE1 - applymovement 4, Movement_FaceRight +PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice:: @ 8169BE1 + applymovement LOCALID_PROF_OAK, Movement_FaceRight waitmovement 0 - drawmonpic VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 10, 3 + drawmonpic PLAYER_STARTER_SPECIES, 10, 3 textcolor 0 - compare VAR_OAKSLAB_PLAYER_STARTER_NO, 0 - goto_if_eq EventScript_OakDescribesBulbasaur - compare VAR_OAKSLAB_PLAYER_STARTER_NO, 1 - goto_if_eq EventScript_OakDescribesCharmander - compare VAR_OAKSLAB_PLAYER_STARTER_NO, 2 - goto_if_eq EventScript_OakDescribesSquirtle + compare PLAYER_STARTER_NUM, 0 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmBulbasaur + compare PLAYER_STARTER_NUM, 1 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmCharmander + compare PLAYER_STARTER_NUM, 2 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmSquirtle end -EventScript_OakDescribesBulbasaur:: @ 8169C14 - msgbox gUnknown_818E272, MSGBOX_YESNO +PalletTown_ProfessorOaksLab_EventScript_ConfirmBulbasaur:: @ 8169C14 + msgbox PalletTown_ProfessorOaksLab_Text_OakChoosingBulbasaur, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_ThisPokeIsRealyEnergetic + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ChoseStarter compare VAR_RESULT, NO - goto_if_eq EventScript_DeclinedStarter + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter end -EventScript_OakDescribesCharmander:: @ 8169C33 - msgbox gUnknown_818E207, MSGBOX_YESNO +PalletTown_ProfessorOaksLab_EventScript_ConfirmCharmander:: @ 8169C33 + msgbox PalletTown_ProfessorOaksLab_Text_OakChoosingSquirtle, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_ThisPokeIsRealyEnergetic + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ChoseStarter compare VAR_RESULT, NO - goto_if_eq EventScript_DeclinedStarter + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter end -EventScript_OakDescribesSquirtle:: @ 8169C52 - msgbox gUnknown_818E194, MSGBOX_YESNO +PalletTown_ProfessorOaksLab_EventScript_ConfirmSquirtle:: @ 8169C52 + msgbox PalletTown_ProfessorOaksLab_Text_OakChoosingCharmander, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_ThisPokeIsRealyEnergetic + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ChoseStarter compare VAR_RESULT, NO - goto_if_eq EventScript_DeclinedStarter + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter end -EventScript_DeclinedStarter:: @ 8169C71 +PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter:: @ 8169C71 erasemonpic release end -EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74 +PalletTown_ProfessorOaksLab_EventScript_ChoseStarter:: @ 8169C74 erasemonpic removeobject VAR_LAST_TALKED - msgbox gUnknown_818E2E5 + msgbox PalletTown_ProfessorOaksLab_Text_OakThisMonIsEnergetic call EventScript_1A6675 setflag FLAG_SYS_POKEMON_GET setflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN - givemon VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 5, ITEM_NONE - copyvar VAR_STARTER_MON, VAR_OAKSLAB_PLAYER_STARTER_NO - getspeciesname 0, VAR_OAKSLAB_PLAYER_STARTER_SPECIES - message Text_18E30D + givemon PLAYER_STARTER_SPECIES, 5, ITEM_NONE + copyvar VAR_STARTER_MON, PLAYER_STARTER_NUM + getspeciesname 0, PLAYER_STARTER_SPECIES + message PalletTown_ProfessorOaksLab_Text_ReceivedMonFromOak waitmessage playfanfare MUS_FAN5 waitfanfare @@ -1210,63 +1226,63 @@ EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74 compare VAR_RESULT, YES goto_if_eq EventScript_GiveNicknameToStarter compare VAR_RESULT, NO - goto_if_eq EventScript_SkipGiveNicknameToStarter + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalPicksStarter end EventScript_GiveNicknameToStarter:: @ 8169CCC setvar VAR_0x8004, 0 call EventScript_ChangePokemonNickname - goto EventScript_SkipGiveNicknameToStarter + goto PalletTown_ProfessorOaksLab_EventScript_RivalPicksStarter end -EventScript_SkipGiveNicknameToStarter:: @ 8169CDC +PalletTown_ProfessorOaksLab_EventScript_RivalPicksStarter:: @ 8169CDC closemessage - compare VAR_OAKSLAB_PLAYER_STARTER_NO, 0 - goto_if_eq EventScript_RivalWalksToCharmander - compare VAR_OAKSLAB_PLAYER_STARTER_NO, 1 - goto_if_eq EventScript_RivalWalksToSquirtle - compare VAR_OAKSLAB_PLAYER_STARTER_NO, 2 - goto_if_eq EventScript_RivalWalksToBulbasaur + compare PLAYER_STARTER_NUM, 0 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalWalksToCharmander + compare PLAYER_STARTER_NUM, 1 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalWalksToSquirtle + compare PLAYER_STARTER_NUM, 2 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalWalksToBulbasaur end -EventScript_RivalWalksToCharmander:: @ 8169CFF - applymovement 8, Movement_RivalWalksToCharmander +PalletTown_ProfessorOaksLab_EventScript_RivalWalksToCharmander:: @ 8169CFF + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToCharmander waitmovement 0 - goto Movement_RivalTakesHisStarter + goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter end -EventScript_RivalWalksToBulbasaur:: @ 8169D0F - applymovement 8, Movement_RivalWalksToBulbasaur +PalletTown_ProfessorOaksLab_EventScript_RivalWalksToBulbasaur:: @ 8169D0F + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur waitmovement 0 - goto Movement_RivalTakesHisStarter + goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter end -EventScript_RivalWalksToSquirtle:: @ 8169D1F - applymovement 8, Movement_RivalWalksToSquirtle +PalletTown_ProfessorOaksLab_EventScript_RivalWalksToSquirtle:: @ 8169D1F + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToSquirtle waitmovement 0 - goto Movement_RivalTakesHisStarter + goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter end -Movement_RivalTakesHisStarter:: @ 8169D2F +PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter:: @ 8169D2F textcolor 0 - msgbox gUnknown_818DD34 - removeobject VAR_OAKSLAB_RIVAL_STARTER_OBJID + msgbox PalletTown_ProfessorOaksLab_Text_RivalIllTakeThisOneThen + removeobject RIVAL_STARTER_ID textcolor 3 - getspeciesname 0, VAR_OAKSLAB_RIVAL_STARTER_SPECIES - message Text_18DD52 + getspeciesname 0, RIVAL_STARTER_SPECIES + message PalletTown_ProfessorOaksLab_Text_RivalReceivedMonFromOak waitmessage playfanfare MUS_FAN5 waitfanfare setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - call_if_set FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN, EventScript_169D5C + call_if_set FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN, PalletTown_ProfessorOaksLab_EventScript_ReadyEndSignLadyScene release end -EventScript_169D5C:: @ 8169D5C +PalletTown_ProfessorOaksLab_EventScript_ReadyEndSignLadyScene:: @ 8169D5C setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 return -Movement_RivalWalksToCharmander:: @ 8169D62 +PalletTown_ProfessorOaksLab_Movement_RivalWalksToCharmander:: @ 8169D62 walk_down walk_down walk_right @@ -1277,7 +1293,7 @@ Movement_RivalWalksToCharmander:: @ 8169D62 walk_up step_end -Movement_RivalWalksToBulbasaur:: @ 8169D6B +PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur:: @ 8169D6B walk_down walk_right walk_right @@ -1286,7 +1302,7 @@ Movement_RivalWalksToBulbasaur:: @ 8169D6B walk_in_place_fastest_up step_end -Movement_RivalWalksToSquirtle:: @ 8169D72 +PalletTown_ProfessorOaksLab_Movement_RivalWalksToSquirtle:: @ 8169D72 walk_down walk_right walk_right @@ -1294,98 +1310,98 @@ Movement_RivalWalksToSquirtle:: @ 8169D72 walk_in_place_fastest_up step_end -PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78 +PalletTown_ProfessorOaksLab_EventScript_SquirtleBall:: @ 8169D78 lock faceplayer - setvar VAR_OAKSLAB_PLAYER_STARTER_NO, 1 - setvar VAR_OAKSLAB_PLAYER_STARTER_SPECIES, SPECIES_SQUIRTLE - setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_BULBASAUR - setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 5 + setvar PLAYER_STARTER_NUM, 1 + setvar PLAYER_STARTER_SPECIES, SPECIES_SQUIRTLE + setvar RIVAL_STARTER_SPECIES, SPECIES_BULBASAUR + setvar RIVAL_STARTER_ID, LOCALID_BULBASAUR_BALL compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if_ge EventScript_169DE4 + goto_if_ge PalletTown_ProfessorOaksLab_EventScript_LastPokeBall compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if_eq EventScript_169BE1 - msgbox gUnknown_818EA19 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice + msgbox PalletTown_ProfessorOaksLab_Text_ThoseArePokeBalls release end -PalletTown_ProfessorOaksLab_EventScript_169DAE:: @ 8169DAE +PalletTown_ProfessorOaksLab_EventScript_CharmanderBall:: @ 8169DAE lock faceplayer - setvar VAR_OAKSLAB_PLAYER_STARTER_NO, 2 - setvar VAR_OAKSLAB_PLAYER_STARTER_SPECIES, SPECIES_CHARMANDER - setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_SQUIRTLE - setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 6 + setvar PLAYER_STARTER_NUM, 2 + setvar PLAYER_STARTER_SPECIES, SPECIES_CHARMANDER + setvar RIVAL_STARTER_SPECIES, SPECIES_SQUIRTLE + setvar RIVAL_STARTER_ID, LOCALID_SQUIRTLE_BALL compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if_ge EventScript_169DE4 + goto_if_ge PalletTown_ProfessorOaksLab_EventScript_LastPokeBall compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if_eq EventScript_169BE1 - msgbox gUnknown_818EA19 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice + msgbox PalletTown_ProfessorOaksLab_Text_ThoseArePokeBalls release end -EventScript_169DE4:: @ 8169DE4 - msgbox gUnknown_818EA45 +PalletTown_ProfessorOaksLab_EventScript_LastPokeBall:: @ 8169DE4 + msgbox PalletTown_ProfessorOaksLab_Text_OaksLastMon release end -PalletTown_ProfessorOaksLab_EventScript_169DEE:: @ 8169DEE +PalletTown_ProfessorOaksLab_EventScript_Aide1:: @ 8169DEE lock faceplayer - goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_169E03 - msgbox gUnknown_818EBE6 + goto_if_set FLAG_SYS_GAME_CLEAR, PalletTown_ProfessorOaksLab_EventScript_Aide1GameClear + msgbox PalletTown_ProfessorOaksLab_Text_StudyAsOaksAide release end -EventScript_169E03:: @ 8169E03 +PalletTown_ProfessorOaksLab_EventScript_Aide1GameClear:: @ 8169E03 famechecker FAMECHECKER_OAK, 5 - msgbox gUnknown_818ED15 + msgbox PalletTown_ProfessorOaksLab_Text_OakIsGoingToHaveRadioShow release end -PalletTown_ProfessorOaksLab_EventScript_169E1A:: @ 8169E1A +PalletTown_ProfessorOaksLab_EventScript_Aide2:: @ 8169E1A lock faceplayer - goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_169E2F - msgbox gUnknown_818EBE6 + goto_if_set FLAG_SYS_GAME_CLEAR, PalletTown_ProfessorOaksLab_EventScript_Aide2GameClear + msgbox PalletTown_ProfessorOaksLab_Text_StudyAsOaksAide release end -EventScript_169E2F:: @ 8169E2F +PalletTown_ProfessorOaksLab_EventScript_Aide2GameClear:: @ 8169E2F famechecker FAMECHECKER_DAISY, 0 - msgbox gUnknown_818EC0B + msgbox PalletTown_ProfessorOaksLab_Text_DaisyWillGroomMons release end -PalletTown_ProfessorOaksLab_EventScript_169E46:: @ 8169E46 +PalletTown_ProfessorOaksLab_EventScript_Aide3:: @ 8169E46 lock faceplayer famechecker FAMECHECKER_OAK, 2 - msgbox gUnknown_818ED81 + msgbox PalletTown_ProfessorOaksLab_Text_OakIsAuthorityOnMons release end -PalletTown_ProfessorOaksLab_EventScript_169E5F:: @ 8169E5F - msgbox gUnknown_818E9E5, MSGBOX_NPC +PalletTown_ProfessorOaksLab_EventScript_Pokedex:: @ 8169E5F + msgbox PalletTown_ProfessorOaksLab_Text_BlankEncyclopedia, MSGBOX_NPC end -PalletTown_ProfessorOaksLab_EventScript_169E68:: @ 8169E68 - msgbox gUnknown_818EAF4, MSGBOX_SIGN +PalletTown_ProfessorOaksLab_EventScript_Computer:: @ 8169E68 + msgbox PalletTown_ProfessorOaksLab_Text_EmailMessage, MSGBOX_SIGN end -PalletTown_ProfessorOaksLab_EventScript_169E71:: @ 8169E71 - msgbox gUnknown_818EA66, MSGBOX_SIGN +PalletTown_ProfessorOaksLab_EventScript_LeftSign:: @ 8169E71 + msgbox PalletTown_ProfessorOaksLab_Text_PressStartToOpenMenu, MSGBOX_SIGN end -PalletTown_ProfessorOaksLab_EventScript_169E7A:: @ 8169E7A +PalletTown_ProfessorOaksLab_EventScript_RightSign:: @ 8169E7A lockall compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 - goto_if_ge EventScript_169E90 - msgbox gUnknown_818EA84 + goto_if_ge PalletTown_ProfessorOaksLab_EventScript_RightSignAlt + msgbox PalletTown_ProfessorOaksLab_Text_SaveOptionInMenu releaseall end -EventScript_169E90:: @ 8169E90 - msgbox gUnknown_818EAB6 +PalletTown_ProfessorOaksLab_EventScript_RightSignAlt:: @ 8169E90 + msgbox PalletTown_ProfessorOaksLab_Text_AllMonTypesHaveStrongAndWeakPoints releaseall end diff --git a/data/maps/PalletTown_ProfessorOaksLab/text.inc b/data/maps/PalletTown_ProfessorOaksLab/text.inc index e437d4b39..ad7e8b7a1 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/text.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/text.inc @@ -1,37 +1,37 @@ -gUnknown_818DC67:: @ 818DC67 +PalletTown_ProfessorOaksLab_Text_RivalGrampsIsntAround:: @ 818DC67 .string "{RIVAL}: What, it's only {PLAYER}?\n" .string "Gramps isn't around.$" -gUnknown_818DC94:: @ 818DC94 +PalletTown_ProfessorOaksLab_Text_RivalFedUpWithWaiting:: @ 818DC94 .string "{RIVAL}: Gramps!\n" .string "I'm fed up with waiting!$" -gUnknown_818DCB9:: @ 818DCB9 +PalletTown_ProfessorOaksLab_Text_RivalNoFairWhatAboutMe:: @ 818DCB9 .string "{RIVAL}: Hey! Gramps! No fair!\n" .string "What about me?$" -gUnknown_818DCE2:: @ 818DCE2 +PalletTown_ProfessorOaksLab_Text_RivalGoChoosePlayer:: @ 818DCE2 .string "{RIVAL}: Heh, I don't need to be\n" .string "greedy like you. I'm mature!\p" .string "Go ahead and choose, {PLAYER}!$" -gUnknown_818DD34:: @ 818DD34 +PalletTown_ProfessorOaksLab_Text_RivalIllTakeThisOneThen:: @ 818DD34 .string "{RIVAL}: I'll take this one, then!$" -Text_18DD52:: @ 818DD52 +PalletTown_ProfessorOaksLab_Text_RivalReceivedMonFromOak:: @ 818DD52 .string "{RIVAL} received the {STR_VAR_1}\n" .string "from PROF. OAK!$" -gUnknown_818DD75:: @ 818DD75 +PalletTown_ProfessorOaksLab_Text_RivalMyMonLooksTougher:: @ 818DD75 .string "{RIVAL}: My POKéMON looks a lot\n" .string "tougher than yours.$" -gUnknown_818DDA4:: @ 818DDA4 +PalletTown_ProfessorOaksLab_Text_RivalLetsCheckOutMons:: @ 818DDA4 .string "{RIVAL}: Wait, {PLAYER}!\n" .string "Let's check out our POKéMON!\p" .string "Come on, I'll take you on!$" -Text_18DDEA:: @ 818DDEA +PalletTown_ProfessorOaksLab_Text_RivalDefeat:: @ 818DDEA .string "WHAT?\n" .string "Unbelievable!\l" .string "I picked the wrong POKéMON!$" @@ -41,24 +41,24 @@ Text_RivalVictory:: @ 818DE1A .string "{RIVAL}: Yeah!\n" .string "Am I great or what?$" -gUnknown_818DE38:: @ 818DE38 +PalletTown_ProfessorOaksLab_Text_RivalGoToughenMyMon:: @ 818DE38 .string "{RIVAL}: Okay! I'll make my\n" .string "POKéMON battle to toughen it up!\p" .string "{PLAYER}! Gramps!\n" .string "Smell you later!$" -gUnknown_818DE8D:: @ 818DE8D +PalletTown_ProfessorOaksLab_Text_RivalGramps:: @ 818DE8D .string "{RIVAL}: Gramps!$" -gUnknown_818DE99:: @ 818DE99 +PalletTown_ProfessorOaksLab_Text_RivalWhatDidYouCallMeFor:: @ 818DE99 .string "{RIVAL}: I almost forgot!\n" .string "What did you call me for?$" -gUnknown_818DEC8:: @ 818DEC8 +PalletTown_ProfessorOaksLab_Text_RivalLeaveItToMeGramps:: @ 818DEC8 .string "{RIVAL}: All right, Gramps!\n" .string "Leave it all to me!$" -gUnknown_818DEF3:: @ 818DEF3 +PalletTown_ProfessorOaksLab_Text_RivalTellSisNotToGiveYouMap:: @ 818DEF3 .string "{PLAYER}, I hate to say it, but you\n" .string "won't be necessary for this.\p" .string "I know! I'll borrow a TOWN MAP\n" @@ -68,7 +68,7 @@ gUnknown_818DEF3:: @ 818DEF3 .string "Don't bother coming around to\n" .string "my place after this!$" -gUnknown_818DFBC:: @ 818DFBC +PalletTown_ProfessorOaksLab_Text_OakThreeMonsChooseOne:: @ 818DFBC .string "OAK: {RIVAL}?\n" .string "Let me think…\p" .string "Oh, that's right, I told you to\n" @@ -85,59 +85,59 @@ gUnknown_818DFBC:: @ 818DFBC .string "You can have one.\n" .string "Go on, choose!$" -gUnknown_818E0EA:: @ 818E0EA +PalletTown_ProfessorOaksLab_Text_OakBePatientRival:: @ 818E0EA .string "OAK: Be patient, {RIVAL}.\n" .string "You can have one, too!$" -gUnknown_818E116:: @ 818E116 +PalletTown_ProfessorOaksLab_Text_OakWhichOneWillYouChoose:: @ 818E116 .string "OAK: Now, {PLAYER}.\p" .string "Inside those three POKé BALLS are\n" .string "POKéMON.\p" .string "Which one will you choose for\n" .string "yourself?$" -gUnknown_818E177:: @ 818E177 +PalletTown_ProfessorOaksLab_Text_OakHeyDontGoAwayYet:: @ 818E177 .string "OAK: Hey!\n" .string "Don't go away yet!$" -gUnknown_818E194:: @ 818E194 +PalletTown_ProfessorOaksLab_Text_OakChoosingCharmander:: @ 818E194 .string "Ah! CHARMANDER is your choice.\n" .string "You should raise it patiently.\p" .string "So, {PLAYER}, you're claiming the\n" .string "FIRE POKéMON CHARMANDER?$" -gUnknown_818E207:: @ 818E207 +PalletTown_ProfessorOaksLab_Text_OakChoosingSquirtle:: @ 818E207 .string "Hm! SQUIRTLE is your choice.\n" .string "It's one worth raising.\p" .string "So, {PLAYER}, you've decided on the\n" .string "WATER POKéMON SQUIRTLE?$" -gUnknown_818E272:: @ 818E272 +PalletTown_ProfessorOaksLab_Text_OakChoosingBulbasaur:: @ 818E272 .string "I see! BULBASAUR is your choice.\n" .string "It's very easy to raise.\p" .string "So, {PLAYER}, you want to go with\n" .string "the GRASS POKéMON BULBASAUR?$" -gUnknown_818E2E5:: @ 818E2E5 +PalletTown_ProfessorOaksLab_Text_OakThisMonIsEnergetic:: @ 818E2E5 .string "This POKéMON is really quite\n" .string "energetic!$" -Text_18E30D:: @ 818E30D +PalletTown_ProfessorOaksLab_Text_ReceivedMonFromOak:: @ 818E30D .string "{PLAYER} received the {STR_VAR_1}\n" .string "from PROF. OAK!$" -gUnknown_818E330:: @ 818E330 +PalletTown_ProfessorOaksLab_Text_OakCanReachNextTownWithMon:: @ 818E330 .string "OAK: If a wild POKéMON appears,\n" .string "your POKéMON can battle it.\p" .string "With it at your side, you should be\n" .string "able to reach the next town.$" -gUnknown_818E3AD:: @ 818E3AD +PalletTown_ProfessorOaksLab_Text_OakBattleMonForItToGrow:: @ 818E3AD .string "OAK: {PLAYER}, raise your young\n" .string "POKéMON by making it battle.\p" .string "It has to battle for it to grow.$" -gUnknown_818E405:: @ 818E405 +PalletTown_ProfessorOaksLab_Text_OakHaveSomethingForMe:: @ 818E405 .string "OAK: Oh, {PLAYER}!\n" .string "How is my old POKéMON?\p" .string "Well, it seems to be growing more\n" @@ -147,35 +147,35 @@ gUnknown_818E405:: @ 818E405 .string "What's that?\n" .string "You have something for me?$" -Text_18E4AF:: @ 818E4AF +PalletTown_ProfessorOaksLab_Text_DeliveredOaksParcel:: @ 818E4AF .string "{PLAYER} delivered OAK'S PARCEL.$" -gUnknown_818E4CA:: @ 818E4CA +PalletTown_ProfessorOaksLab_Text_OakCustomBallIOrdered:: @ 818E4CA .string "Ah! \n" .string "It's the custom POKé BALL!\p" .string "I had it on order.\n" .string "Thank you!$" -gUnknown_818E508:: @ 818E508 +PalletTown_ProfessorOaksLab_Text_OakHaveRequestForYouTwo:: @ 818E508 .string "OAK: Oh, right!\n" .string "I have a request for you two.$" -gUnknown_818E536:: @ 818E536 +PalletTown_ProfessorOaksLab_Text_OakPokedexOnDesk:: @ 818E536 .string "On the desk there is my invention,\n" .string "the POKéDEX!\p" .string "It automatically records data on\n" .string "POKéMON you've seen or caught.\p" .string "It's a high-tech encyclopedia!$" -gUnknown_818E5C5:: @ 818E5C5 +PalletTown_ProfessorOaksLab_Text_OakTakeTheseWithYou:: @ 818E5C5 .string "OAK: {PLAYER} and {RIVAL}.\n" .string "Take these with you.$" -Text_18E5EA:: @ 818E5EA +PalletTown_ProfessorOaksLab_Text_ReceivedPokedexFromOak:: @ 818E5EA .string "{PLAYER} received the POKéDEX\n" .string "from PROF. OAK.$" -gUnknown_818E612:: @ 818E612 +PalletTown_ProfessorOaksLab_Text_OakCatchMonsForDataTakeThese:: @ 818E612 .string "OAK: You can't get detailed data\n" .string "on POKéMON by just seeing them.\p" .string "You must catch them to obtain\n" @@ -183,10 +183,10 @@ gUnknown_818E612:: @ 818E612 .string "So, here are some tools for\n" .string "catching wild POKéMON.$" -gUnknown_818E6B3:: @ 818E6B3 +PalletTown_ProfessorOaksLab_Text_ReceivedFivePokeBalls:: @ 818E6B3 .string "{PLAYER} received five POKé BALLS.$" -gUnknown_818E6D0:: @ 818E6D0 +PalletTown_ProfessorOaksLab_Text_OakExplainCatching:: @ 818E6D0 .string "When a wild POKéMON appears,\n" .string "it's fair game.\p" .string "Just throw a POKé BALL at it and\n" @@ -195,7 +195,7 @@ gUnknown_818E6D0:: @ 818E6D0 .string "A healthy POKéMON can escape.\n" .string "You have to be lucky!$" -gUnknown_818E784:: @ 818E784 +PalletTown_ProfessorOaksLab_Text_OakCompleteMonGuideWasMyDream:: @ 818E784 .string "To make a complete guide on all\n" .string "the POKéMON in the world…\p" .string "That was my dream!\p" @@ -207,11 +207,11 @@ gUnknown_818E784:: @ 818E784 .string "This is a great undertaking in\n" .string "POKéMON history!$" -gUnknown_818E871:: @ 818E871 +PalletTown_ProfessorOaksLab_Text_OakMonsAroundWorldWait:: @ 818E871 .string "POKéMON around the world wait for\n" .string "you, {PLAYER}!$" -gUnknown_818E89C:: @ 818E89C +PalletTown_ProfessorOaksLab_Text_OakAddedNothingToPokedex:: @ 818E89C .string "Ah, {PLAYER}!\n" .string "How is your POKéDEX shaping up?\p" .string "{RIVAL} has already caught some\n" @@ -223,34 +223,34 @@ gUnknown_818E89C:: @ 818E89C .string "I'll give you these, so do try a\n" .string "little harder.$" -gUnknown_818E98E:: @ 818E98E +PalletTown_ProfessorOaksLab_Text_OakComeSeeMeSometime:: @ 818E98E .string "OAK: Come see me sometime.\p" .string "After all, I want to know how your\n" .string "POKéDEX is coming along.$" -gUnknown_818E9E5:: @ 818E9E5 +PalletTown_ProfessorOaksLab_Text_BlankEncyclopedia:: @ 818E9E5 .string "It's like an encyclopedia, but the\n" .string "pages are blank.$" -gUnknown_818EA19:: @ 818EA19 +PalletTown_ProfessorOaksLab_Text_ThoseArePokeBalls:: @ 818EA19 .string "Those are POKé BALLS.\n" .string "They contain POKéMON!$" -gUnknown_818EA45:: @ 818EA45 +PalletTown_ProfessorOaksLab_Text_OaksLastMon:: @ 818EA45 .string "That's PROF. OAK's last POKéMON.$" -gUnknown_818EA66:: @ 818EA66 +PalletTown_ProfessorOaksLab_Text_PressStartToOpenMenu:: @ 818EA66 .string "Press START to open the MENU!$" -gUnknown_818EA84:: @ 818EA84 +PalletTown_ProfessorOaksLab_Text_SaveOptionInMenu:: @ 818EA84 .string "The SAVE option is on the MENU.\n" .string "Use it regularly.$" -gUnknown_818EAB6:: @ 818EAB6 +PalletTown_ProfessorOaksLab_Text_AllMonTypesHaveStrongAndWeakPoints:: @ 818EAB6 .string "All POKéMON types have strong and\n" .string "weak points against others.$" -gUnknown_818EAF4:: @ 818EAF4 +PalletTown_ProfessorOaksLab_Text_EmailMessage:: @ 818EAF4 .string "There's an e-mail message here.\p" .string "…\p" .string "Finally!\n" @@ -264,11 +264,11 @@ gUnknown_818EAF4:: @ 818EAF4 .string "PROF. OAK, please visit us!\n" .string "…$" -gUnknown_818EBE6:: @ 818EBE6 +PalletTown_ProfessorOaksLab_Text_StudyAsOaksAide:: @ 818EBE6 .string "I study POKéMON as PROF. OAK's\n" .string "AIDE.$" -gUnknown_818EC0B:: @ 818EC0B +PalletTown_ProfessorOaksLab_Text_DaisyWillGroomMons:: @ 818EC0B .string "Hi, {PLAYER}. I bet you've become\n" .string "good friends with your POKéMON.\p" .string "By the way, did you know about\n" @@ -280,25 +280,25 @@ gUnknown_818EC0B:: @ 818EC0B .string "This is a secret, so please don't\n" .string "tell anyone.$" -gUnknown_818ED15:: @ 818ED15 +PalletTown_ProfessorOaksLab_Text_OakIsGoingToHaveRadioShow:: @ 818ED15 .string "PROF. OAK is going to have his own\n" .string "radio show soon.\p" .string "The program will be called PROF.\n" .string "OAK's POKéMON SEMINAR.$" -gUnknown_818ED81:: @ 818ED81 +PalletTown_ProfessorOaksLab_Text_OakIsAuthorityOnMons:: @ 818ED81 .string "PROF. OAK may not look like much,\n" .string "but he's the authority on POKéMON.\p" .string "Many POKéMON TRAINERS hold him in\n" .string "high regard.$" -gUnknown_818EDF5:: @ 818EDF5 +PalletTown_ProfessorOaksLab_Text_OakFavorToAskYouPlayer:: @ 818EDF5 .string "Ah, now this is excellent!\p" .string "{PLAYER}, I have another important\n" .string "favor to ask of you.\p" .string "I need you to listen closely.$" -gUnknown_818EE60:: @ 818EE60 +PalletTown_ProfessorOaksLab_Text_OakSightingsOfRareMons:: @ 818EE60 .string "Recently, there have been sightings\n" .string "of many rare POKéMON species.\p" .string "I'm talking about POKéMON that\n" @@ -308,7 +308,7 @@ gUnknown_818EE60:: @ 818EE60 .string "Since I can't do it, {PLAYER}, I'd\n" .string "like you to go in my place.$" -gUnknown_818EF59:: @ 818EF59 +PalletTown_ProfessorOaksLab_Text_RivalJustLetMeHandleEverything:: @ 818EF59 .string "{RIVAL}: Hey, I heard that!\p" .string "Gramps, what's with favoring\n" .string "{PLAYER} over me all the time?\p" @@ -317,27 +317,27 @@ gUnknown_818EF59:: @ 818EF59 .string "You should just let me handle\n" .string "everything.$" -gUnknown_818F004:: @ 818F004 +PalletTown_ProfessorOaksLab_Text_OakNeedYourHelpTooNeedToSeePokedexes:: @ 818F004 .string "OAK: I know, I know.\n" .string "Of course I need your help, too.\p" .string "Now, I need to see both your\n" .string "POKéDEXES.$" -gUnknown_818F062:: @ 818F062 +PalletTown_ProfessorOaksLab_Text_OakTookBothPokedexUnits:: @ 818F062 .string "PROF. OAK took both POKéDEX\n" .string "units.$" -gUnknown_818F085:: @ 818F085 +PalletTown_ProfessorOaksLab_Text_OakNowTheseUnitsCanRecordMoreData:: @ 818F085 .string "… … … … … …\p" .string "… … … … … …\p" .string "…And that's done!\p" .string "Now these units can record data on\n" .string "a lot more POKéMON.$" -Text_18F0E8:: @ 818F0E8 +PalletTown_ProfessorOaksLab_Text_PlayersPokedexWasUpgraded:: @ 818F0E8 .string "{PLAYER}'s POKéDEX was upgraded!$" -gUnknown_818F103:: @ 818F103 +PalletTown_ProfessorOaksLab_Text_OakMustReallyWorkToFillPokedex:: @ 818F103 .string "Now, {PLAYER} and {RIVAL}!\p" .string "This time, you really must work\n" .string "towards filling your POKéDEXES.\p" @@ -346,7 +346,7 @@ gUnknown_818F103:: @ 818F103 .string "Truly, this is a monumentally great\n" .string "undertaking in POKéMON history!$" -gUnknown_818F1DB:: @ 818F1DB +PalletTown_ProfessorOaksLab_Text_RivalIllCompleteThePokedex:: @ 818F1DB .string "{RIVAL}: Gramps, calm down.\n" .string "Don't get so excited.\p" .string "I'll get the POKéDEX completed,\n" diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc index 6e266bdfc..6dc544270 100644 --- a/data/scripts/pc.inc +++ b/data/scripts/pc.inc @@ -90,7 +90,7 @@ EventScript_AccessProfOaksPC:: @ 81A6A7A compare VAR_RESULT, NO goto_if_eq EventScript_ExitOaksPC setflag FLAG_OAKS_RATING_IS_VIA_PC - call ProfOak_EventScript_RatePokedex + call PokedexRating_EventScript_Rate clearflag FLAG_OAKS_RATING_IS_VIA_PC goto EventScript_ExitOaksPC end diff --git a/data/scripts/pokedex_rating.inc b/data/scripts/pokedex_rating.inc index 4a3d39042..8d313d200 100644 --- a/data/scripts/pokedex_rating.inc +++ b/data/scripts/pokedex_rating.inc @@ -1,40 +1,40 @@ -ProfOak_EventScript_RatePokedexInPerson:: @ 81A737B +PokedexRating_EventScript_RateInPerson:: @ 81A737B goto_if_questlog EventScript_ReleaseEnd special sub_8112364 - call_if_set FLAG_OAK_SAW_DEX_COMPLETION, ProfOak_EventScript_DexCompleteIntro - call_if_unset FLAG_OAK_SAW_DEX_COMPLETION, ProfOak_EventScript_NormalIntro - call ProfOak_EventScript_RatePokedex + call_if_set FLAG_OAK_SAW_DEX_COMPLETION, PokedexRating_EventScript_DexCompleteIntro + call_if_unset FLAG_OAK_SAW_DEX_COMPLETION, PokedexRating_EventScript_NormalIntro + call PokedexRating_EventScript_Rate return -ProfOak_EventScript_DexCompleteIntro:: @ 81A73A4 - msgbox Text_LoveSeeingYourPokedex +PokedexRating_EventScript_DexCompleteIntro:: @ 81A73A4 + msgbox PokedexRating_Text_LoveSeeingYourPokedex return -ProfOak_EventScript_NormalIntro:: @ 81A73AD - msgbox Text_HowIsPokedexComingAlong +PokedexRating_EventScript_NormalIntro:: @ 81A73AD + msgbox PokedexRating_Text_HowIsPokedexComingAlong return -ProfOak_EventScript_ShowRatingMsg:: @ 81A73B6 +PokedexRating_EventScript_ShowRatingMsg:: @ 81A73B6 copyvar VAR_0x8004, VAR_0x8009 special Special_GetProfOaksRatingMessage waitmessage compare VAR_RESULT, FALSE - call_if_eq ProfOak_EventScript_RatingFanfare + call_if_eq PokedexRating_EventScript_NormalFanfare compare VAR_RESULT, TRUE - call_if_eq ProfOak_EventScript_DexCompleteFanfare + call_if_eq PokedexRating_EventScript_DexCompleteFanfare waitfanfare waitbuttonpress return -ProfOak_EventScript_RatingFanfare:: @ 81A73D8 +PokedexRating_EventScript_NormalFanfare:: @ 81A73D8 playfanfare MUS_FAN2 return -ProfOak_EventScript_DexCompleteFanfare:: @ 81A73DC +PokedexRating_EventScript_DexCompleteFanfare:: @ 81A73DC playfanfare MUS_FANFA5 return -ProfOak_EventScript_RatePokedex:: @ 81A73E0 +PokedexRating_EventScript_Rate:: @ 81A73E0 setvar VAR_0x8004, 31 special HelpSystem_BackupSomeVariable special Special_SetSomeVariable @@ -45,40 +45,40 @@ ProfOak_EventScript_RatePokedex:: @ 81A73E0 copyvar VAR_0x800A, VAR_RESULT getnumberstring 0, VAR_0x8008 @ Num Kanto Seen getnumberstring 1, VAR_0x8009 @ Num Kanto Caught - msgbox Text_YouveSeenXAndOwnedYMons - call_if_unset FLAG_OAKS_RATING_IS_VIA_PC, ProfOak_EventScript_SetTextColor - call ProfOak_EventScript_ShowRatingMsg + msgbox PokedexRating_Text_SeenXOwnedY + call_if_unset FLAG_OAKS_RATING_IS_VIA_PC, PokedexRating_EventScript_SetTextColor + call PokedexRating_EventScript_ShowRatingMsg compare VAR_0x800A, FALSE - goto_if_eq ProfOak_EventScript_EndRatePokedex @ National Dex not enabled + goto_if_eq PokedexRating_EventScript_EndRating @ National Dex not enabled setvar VAR_0x8004, 1 specialvar VAR_RESULT, Special_GetPokedexCount copyvar VAR_0x8008, VAR_0x8005 copyvar VAR_0x8009, VAR_0x8006 getnumberstring 0, VAR_0x8008 @ Num National Seen getnumberstring 1, VAR_0x8009 @ Num National Caught - msgbox Text_AndNationalDexSeenXOwnedY + msgbox PokedexRating_Text_NationalDexSeenXOwnedY specialvar VAR_RESULT, HasAllMons compare VAR_RESULT, FALSE - goto_if_eq ProfOak_EventScript_DexIncomplete + goto_if_eq PokedexRating_EventScript_DexIncomplete compare VAR_RESULT, TRUE - goto_if_eq ProfOak_EventScript_DexComplete + goto_if_eq PokedexRating_EventScript_DexComplete end -ProfOak_EventScript_SetTextColor:: @ 81A746D +PokedexRating_EventScript_SetTextColor:: @ 81A746D textcolor 0 return -ProfOak_EventScript_DexIncomplete:: @ 81A7470 - msgbox Text_LookForwardToFilledNationalDex - goto ProfOak_EventScript_EndRatePokedex +PokedexRating_EventScript_DexIncomplete:: @ 81A7470 + msgbox PokedexRating_Text_LookForwardToFilledNationalDex + goto PokedexRating_EventScript_EndRating end -ProfOak_EventScript_DexComplete:: @ 81A747E +PokedexRating_EventScript_DexComplete:: @ 81A747E setflag FLAG_OAK_SAW_DEX_COMPLETION - msgbox Text_YouveCompletedDex - goto ProfOak_EventScript_EndRatePokedex + msgbox PokedexRating_Text_YouveCompletedDex + goto PokedexRating_EventScript_EndRating end -ProfOak_EventScript_EndRatePokedex:: @ 81A748F +PokedexRating_EventScript_EndRating:: @ 81A748F special HelpSystem_RestoreSomeVariable return diff --git a/data/text/pokedex_rating.inc b/data/text/pokedex_rating.inc index 306cd5225..a31f9f171 100644 --- a/data/text/pokedex_rating.inc +++ b/data/text/pokedex_rating.inc @@ -1,119 +1,119 @@ -Text_HowIsPokedexComingAlong:: @ 81A6C51 +PokedexRating_Text_HowIsPokedexComingAlong:: @ 81A6C51 .string "OAK: Good to see you!\n" .string "How is your POKéDEX coming along?\p" .string "Here, let me take a look.$" -Text_YouveSeenXAndOwnedYMons:: @ 81A6CA3 +PokedexRating_Text_SeenXOwnedY:: @ 81A6CA3 .string "The amount of progress you've made\n" .string "on your POKéDEX is:\p" .string "{STR_VAR_1} POKéMON seen and\n" .string "{STR_VAR_2} POKéMON owned.\p" .string "{SIZE}ÁPROF. OAK's rating:$" -gUnknown_81A6D17:: @ 81A6D17 +PokedexRating_Text_LessThan10:: @ 81A6D17 .string "You still have lots to do.\p" .string "Go into every patch of grass you\n" .string "see and look for POKéMON!$" -gUnknown_81A6D6D:: @ 81A6D6D +PokedexRating_Text_LessThan20:: @ 81A6D6D .string "It looks as if you're getting on\n" .string "the right track!\p" .string "I've given one of my AIDES a FLASH\n" .string "HM. Make sure you go get it!$" -gUnknown_81A6DDF:: @ 81A6DDF +PokedexRating_Text_LessThan30:: @ 81A6DDF .string "Your POKéDEX could use a bit more\n" .string "volume still!\p" .string "Try to catch other species of\n" .string "POKéMON!$" -gUnknown_81A6E36:: @ 81A6E36 +PokedexRating_Text_LessThan40:: @ 81A6E36 .string "Good, it's apparent that you're\n" .string "trying hard!\p" .string "I've given one of my AIDES an\n" .string "ITEMFINDER. Be sure to collect it!$" -gUnknown_81A6EA4:: @ 81A6EA4 +PokedexRating_Text_LessThan50:: @ 81A6EA4 .string "Your POKéDEX is coming along quite\n" .string "well!\p" .string "I've given one of my AIDES an\n" .string "AMULET COIN. Be sure to get it!$" -gUnknown_81A6F0B:: @ 81A6F0B +PokedexRating_Text_LessThan60:: @ 81A6F0B .string "Ah, you've finally topped 50\n" .string "species!\p" .string "I've given one of my AIDES an EXP.\n" .string "SHARE. Be sure to go get it!$" -gUnknown_81A6F71:: @ 81A6F71 +PokedexRating_Text_LessThan70:: @ 81A6F71 .string "Hoho! This is turning into quite the\n" .string "respectable POKéDEX!$" -gUnknown_81A6FAB:: @ 81A6FAB +PokedexRating_Text_LessThan80:: @ 81A6FAB .string "Very good!\p" .string "I think you'll collect even more\n" .string "POKéMON by going fishing!$" -gUnknown_81A6FF1:: @ 81A6FF1 +PokedexRating_Text_LessThan90:: @ 81A6FF1 .string "Wonderful! Let me guess… You\n" .string "like to collect things, don't you?$" -gUnknown_81A7031:: @ 81A7031 +PokedexRating_Text_LessThan100:: @ 81A7031 .string "I'm impressed!\n" .string "It must have been difficult to do!$" -gUnknown_81A7063:: @ 81A7063 +PokedexRating_Text_LessThan110:: @ 81A7063 .string "You've finally hit 100 species!\n" .string "I can't believe how good you are!$" -gUnknown_81A70A5:: @ 81A70A5 +PokedexRating_Text_LessThan120:: @ 81A70A5 .string "You even have the evolved forms\n" .string "of POKéMON! Super!$" -gUnknown_81A70D8:: @ 81A70D8 +PokedexRating_Text_LessThan130:: @ 81A70D8 .string "Excellent! Trade with friends to\n" .string "get some more!$" -gUnknown_81A7108:: @ 81A7108 +PokedexRating_Text_LessThan140:: @ 81A7108 .string "Outstanding!\n" .string "You've become a real pro at this!$" -gUnknown_81A7137:: @ 81A7137 +PokedexRating_Text_LessThan150:: @ 81A7137 .string "I have nothing left to say!\n" .string "You're the POKéMON PROFESSOR now!$" -gUnknown_81A7175:: @ 81A7175 +PokedexRating_Text_Complete:: @ 81A7175 .string "Your POKéDEX is entirely complete!\n" .string "Congratulations!!$" -Text_AndNationalDexSeenXOwnedY:: @ 81A71AA +PokedexRating_Text_NationalDexSeenXOwnedY:: @ 81A71AA .string "And your NATIONAL POKéDEX is:\p" .string "{STR_VAR_1} POKéMON seen and\n" .string "{STR_VAR_2} POKéMON owned.$" -Text_LookForwardToFilledNationalDex:: @ 81A71EE +PokedexRating_Text_LookForwardToFilledNationalDex:: @ 81A71EE .string "I'll be looking forward to seeing\n" .string "you fill the NATIONAL POKéDEX!$" -Text_YouveCompletedDex:: @ 81A722F +PokedexRating_Text_YouveCompletedDex:: @ 81A722F .string "Finally…\p" .string "You've finally completed the\n" .string "POKéDEX!\p" .string "It's magnificent!\n" .string "Truly, this is a fantastic feat!$" -Text_1A7291:: @ 81A7291 +PokedexRating_Text_Wroooaaarrr:: @ 81A7291 .string "Wroooooooaaaaaarrrr!$" -Text_1A72A6:: @ 81A72A6 +PokedexRating_Text_HaHa:: @ 81A72A6 .string "はあ はあ‥$" -gUnknown_81A72AD:: @ 81A72AD +PokedexRating_Text_ThankYouMadeDreamReality:: @ 81A72AD .string "Thank you, {PLAYER}!\n" .string "Sincerely, thank you!\l" .string "You've made my dream a reality!$" -Text_LoveSeeingYourPokedex:: @ 81A72F2 +PokedexRating_Text_LoveSeeingYourPokedex:: @ 81A72F2 .string "OAK: Ah, welcome!\p" .string "Tell me, how is your POKéDEX\n" .string "coming along?\p" diff --git a/data/text/sign_lady.inc b/data/text/sign_lady.inc new file mode 100644 index 000000000..1c6d1c8f1 --- /dev/null +++ b/data/text/sign_lady.inc @@ -0,0 +1,30 @@ +@ For the NPC in Pallet Town that talks about the Trainer Tips sign + +PalletTown_Text_HmmIsThatRight:: @ 81B1C8B + .string "Hmm…\n" + .string "Is that right…$" + +PalletTown_Text_OhLookLook:: @ 81B1C9F + .string "Oh!\n" + .string "Look, look!$" + +PalletTown_Text_ReadItReadIt:: @ 81B1CAF + .string "Read it, read it!$" + +@ Used by sign +PalletTown_Text_PressStartToOpenMenu:: @ 81B1CC1 + .string "TRAINER TIPS\p" + .string "Press START to open the MENU!$" + +PalletTown_Text_SignsAreUsefulArentThey:: @ 81B1CEC + .string "Signs are useful, aren't they?$" + +PalletTown_Text_LookCopiedTrainerTipsSign:: @ 81B1D0B + .string "Look, look!\p" + .string "I copied what it said on one of\n" + .string "those TRAINER TIPS signs!$" + +@ Used by NPC +PalletTown_Text_PressStartToOpenMenuCopy:: @ 81B1D51 + .string "TRAINER TIPS!\p" + .string "Press START to open the MENU!$" -- cgit v1.2.3 From ad4f363a582651657a6c27e989ce9e48dc48ea9a Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 26 Feb 2020 00:26:05 -0500 Subject: Document One Island scripts --- data/maps/OneIsland/map.json | 8 +- data/maps/OneIsland/scripts.inc | 76 ++-- data/maps/OneIsland/text.inc | 17 +- data/maps/OneIsland_Harbor/map.json | 2 +- data/maps/OneIsland_Harbor/scripts.inc | 14 +- data/maps/OneIsland_House1/map.json | 4 +- data/maps/OneIsland_House1/scripts.inc | 8 +- data/maps/OneIsland_House1/text.inc | 4 +- data/maps/OneIsland_House2/map.json | 2 +- data/maps/OneIsland_House2/scripts.inc | 4 +- data/maps/OneIsland_House2/text.inc | 2 +- data/maps/OneIsland_KindleRoad/map.json | 30 +- data/maps/OneIsland_KindleRoad/scripts.inc | 8 +- data/maps/OneIsland_KindleRoad/text.inc | 86 ++--- data/maps/OneIsland_KindleRoad_EmberSpa/map.json | 14 +- .../maps/OneIsland_KindleRoad_EmberSpa/scripts.inc | 36 +- data/maps/OneIsland_KindleRoad_EmberSpa/text.inc | 16 +- data/maps/OneIsland_PokemonCenter_1F/map.json | 38 +- data/maps/OneIsland_PokemonCenter_1F/scripts.inc | 407 +++++++++++---------- data/maps/OneIsland_PokemonCenter_1F/text.inc | 118 +++--- data/maps/OneIsland_TreasureBeach/map.json | 4 +- data/maps/OneIsland_TreasureBeach/scripts.inc | 4 +- data/maps/OneIsland_TreasureBeach/text.inc | 8 +- data/scripts/pc.inc | 3 +- data/scripts/trainers.inc | 196 +++++----- data/text/trainers.inc | 28 +- 26 files changed, 571 insertions(+), 566 deletions(-) (limited to 'data') diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json index 0fa530aa2..cc27f84cb 100644 --- a/data/maps/OneIsland/map.json +++ b/data/maps/OneIsland/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_EventScript_167517", + "script": "OneIsland_EventScript_OldMan", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_EventScript_167549", + "script": "OneIsland_EventScript_BaldingMan", "flag": "0" } ], @@ -103,14 +103,14 @@ "x": 14, "y": 13, "elevation": 0, - "script": "OneIsland_EventScript_167552" + "script": "OneIsland_EventScript_IslandSign" }, { "type": "bg_event_type_0", "x": 15, "y": 6, "elevation": 0, - "script": "OneIsland_EventScript_16755B" + "script": "OneIsland_EventScript_PokemonNetCenterSign" } ] } diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index 545a3d333..a474b19a8 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -1,3 +1,5 @@ +.equ LOCALID_BILL, 1 + OneIsland_MapScripts:: @ 8167484 map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_OnFrame @@ -8,35 +10,34 @@ OneIsland_OnTransition:: @ 816748F end OneIsland_OnFrame:: @ 8167493 - map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 2, EventScript_16749D + map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 2, OneIsland_EventScript_EnterOneIslandFirstTime .2byte 0 -EventScript_16749D:: @ 816749D +OneIsland_EventScript_EnterOneIslandFirstTime:: @ 816749D lockall textcolor 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_167505 + applymovement OBJ_EVENT_ID_PLAYER, OneIsland_Movement_PlayerExitHarbor waitmovement 0 - msgbox gUnknown_818161B + msgbox OneIsland_Text_BillLetsGoSeeCelio closemessage - applymovement 1, Movement_167507 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1674F4 + applymovement LOCALID_BILL, OneIsland_Movement_BillWalkToPokeCenter + applymovement OBJ_EVENT_ID_PLAYER, OneIsland_Movement_PlayerWalkToPokeCenter waitmovement 0 opendoor 14, 5 waitdooranim - applymovement 1, Movement_167514 - applymovement OBJ_EVENT_ID_PLAYER, Movement_167501 + applymovement LOCALID_BILL, OneIsland_Movement_BillEnterPokeCenter + applymovement OBJ_EVENT_ID_PLAYER, OneIsland_Movement_PlayerEnterPokeCenter waitmovement 0 closedoor 14, 5 waitdooranim - removeobject 1 + removeobject LOCALID_BILL setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 3 warp MAP_ONE_ISLAND_POKEMON_CENTER_1F, 255, 9, 9 waitstate releaseall end -Movement_1674F4:: @ 81674F4 - walk_up + .macro walk_to_pokecenter walk_up walk_up walk_up @@ -48,65 +49,60 @@ Movement_1674F4:: @ 81674F4 walk_up walk_up walk_up + .endm + +OneIsland_Movement_PlayerWalkToPokeCenter:: @ 81674F4 + walk_up + walk_to_pokecenter step_end -Movement_167501:: @ 8167501 +OneIsland_Movement_PlayerEnterPokeCenter:: @ 8167501 walk_up walk_up set_invisible step_end -Movement_167505:: @ 8167505 +OneIsland_Movement_PlayerExitHarbor:: @ 8167505 walk_up step_end -Movement_167507:: @ 8167507 - walk_up - walk_up - walk_up - walk_up - walk_right - walk_right - walk_up - walk_up - walk_up - walk_up - walk_up +OneIsland_Movement_BillWalkToPokeCenter:: @ 8167507 + walk_to_pokecenter walk_up step_end -Movement_167514:: @ 8167514 +OneIsland_Movement_BillEnterPokeCenter:: @ 8167514 walk_up set_invisible step_end -OneIsland_EventScript_167517:: @ 8167517 +OneIsland_EventScript_OldMan:: @ 8167517 lock faceplayer - goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16753F - goto_if_set FLAG_SEVII_DETOUR_FINISHED, EventScript_167535 - msgbox gUnknown_818174E + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, OneIsland_EventScript_OldManLinkHoenn + goto_if_set FLAG_SEVII_DETOUR_FINISHED, OneIsland_EventScript_OldManLinkKanto + msgbox OneIsland_Text_LuckyToHaveCelioHere release end -EventScript_167535:: @ 8167535 - msgbox gUnknown_8181858 +OneIsland_EventScript_OldManLinkKanto:: @ 8167535 + msgbox OneIsland_Text_HavePCLinkageWithKanto release end -EventScript_16753F:: @ 816753F - msgbox gUnknown_8181901 +OneIsland_EventScript_OldManLinkHoenn:: @ 816753F + msgbox OneIsland_Text_HavePCLinkageWithHoenn release end -OneIsland_EventScript_167549:: @ 8167549 - msgbox gUnknown_8181A4A, MSGBOX_NPC +OneIsland_EventScript_BaldingMan:: @ 8167549 + msgbox OneIsland_Text_IsntWarmClimateHereGreat, MSGBOX_NPC end -OneIsland_EventScript_167552:: @ 8167552 - msgbox gUnknown_81819E1, MSGBOX_SIGN +OneIsland_EventScript_IslandSign:: @ 8167552 + msgbox OneIsland_Text_IslandSign, MSGBOX_SIGN end -OneIsland_EventScript_16755B:: @ 816755B - msgbox gUnknown_8181A0A, MSGBOX_SIGN +OneIsland_EventScript_PokemonNetCenterSign:: @ 816755B + msgbox OneIsland_Text_PokemonNetCenterSign, MSGBOX_SIGN end diff --git a/data/maps/OneIsland/text.inc b/data/maps/OneIsland/text.inc index d9a6e376a..5f49a4a5c 100644 --- a/data/maps/OneIsland/text.inc +++ b/data/maps/OneIsland/text.inc @@ -1,4 +1,4 @@ -gUnknown_818161B:: @ 818161B +OneIsland_Text_BillLetsGoSeeCelio:: @ 818161B .string "BILL: Here we are!\n" .string "This is ONE ISLAND.\p" .string "There are several islands around\n" @@ -14,7 +14,7 @@ Text_WhereDoYouWantToSail:: @ 8181726 .string "Ahoy, there!\n" .string "Where do you want to sail?$" -gUnknown_818174E:: @ 818174E +OneIsland_Text_LuckyToHaveCelioHere:: @ 818174E .string "Here we are on an island smack in\n" .string "the middle of nowhere.\p" .string "We're lucky to have an upstanding\n" @@ -26,7 +26,7 @@ gUnknown_818174E:: @ 818174E .string "I'm not sure what that means, but\n" .string "CELIO is quite the man!$" -gUnknown_8181858:: @ 8181858 +OneIsland_Text_HavePCLinkageWithKanto:: @ 8181858 .string "My granddaughter was in a tizzy\n" .string "over a new breakthrough.\p" .string "She said we now have PC linkage\n" @@ -34,7 +34,7 @@ gUnknown_8181858:: @ 8181858 .string "I'm not sure what that means, but\n" .string "CELIO is quite the man!$" -gUnknown_8181901:: @ 8181901 +OneIsland_Text_HavePCLinkageWithHoenn:: @ 8181901 .string "My granddaughter was in a tizzy\n" .string "over a new breakthrough.\p" .string "She said we finally have PC linkage\n" @@ -44,18 +44,19 @@ gUnknown_8181901:: @ 8181901 .string "He would make a fine husband for\n" .string "my granddaughter!$" -gUnknown_81819E1:: @ 81819E1 +OneIsland_Text_IslandSign:: @ 81819E1 .string "ONE ISLAND\n" .string "Friends Gather at Knot Island$" -gUnknown_8181A0A:: @ 8181A0A +OneIsland_Text_PokemonNetCenterSign:: @ 8181A0A .string "Expanding the POKéMON World!\n" .string "POKéMON NET CENTER$" -Text_181A3A:: @ 8181A3A +@ Unused +OneIsland_Text_ReturnToCinnabar:: @ 8181A3A .string "グレンタウンに　もどりますか？$" -gUnknown_8181A4A:: @ 8181A4A +OneIsland_Text_IsntWarmClimateHereGreat:: @ 8181A4A .string "Hi, sight-seeing, are you?\n" .string "Isn't the warm climate here great?$" diff --git a/data/maps/OneIsland_Harbor/map.json b/data/maps/OneIsland_Harbor/map.json index fd3210c7e..a6ae42fa8 100644 --- a/data/maps/OneIsland_Harbor/map.json +++ b/data/maps/OneIsland_Harbor/map.json @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_Harbor_EventScript_1713BD", + "script": "OneIsland_Harbor_EventScript_Sailor", "flag": "0" } ], diff --git a/data/maps/OneIsland_Harbor/scripts.inc b/data/maps/OneIsland_Harbor/scripts.inc index bbbe36fb9..af6fe7ca5 100644 --- a/data/maps/OneIsland_Harbor/scripts.inc +++ b/data/maps/OneIsland_Harbor/scripts.inc @@ -4,21 +4,21 @@ OneIsland_Harbor_MapScripts:: @ 8171378 .byte 0 OneIsland_Harbor_OnWarp:: @ 8171383 - map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1, EventScript_17138D + map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1, OneIsland_Harbor_EventScript_TurnPlayerNorth .2byte 0 -EventScript_17138D:: @ 817138D +OneIsland_Harbor_EventScript_TurnPlayerNorth:: @ 817138D turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end OneIsland_Harbor_OnFrame:: @ 8171392 - map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1, EventScript_17139C + map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1, OneIsland_Harbor_EventScript_PlayerEnterHarborFirstTime .2byte 0 -EventScript_17139C:: @ 817139C +OneIsland_Harbor_EventScript_PlayerEnterHarborFirstTime:: @ 817139C lockall textcolor 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1713B9 + applymovement OBJ_EVENT_ID_PLAYER, OneIsland_Harbor_Movement_PlayerExitHarbor waitmovement 0 setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 2 warp MAP_ONE_ISLAND, 255, 12, 18 @@ -26,13 +26,13 @@ EventScript_17139C:: @ 817139C releaseall end -Movement_1713B9:: @ 81713B9 +OneIsland_Harbor_Movement_PlayerExitHarbor:: @ 81713B9 walk_up walk_up walk_up step_end -OneIsland_Harbor_EventScript_1713BD:: @ 81713BD +OneIsland_Harbor_EventScript_Sailor:: @ 81713BD lock faceplayer message Text_WhereDoYouWantToSail diff --git a/data/maps/OneIsland_House1/map.json b/data/maps/OneIsland_House1/map.json index 6a8f21cfc..ced35430e 100644 --- a/data/maps/OneIsland_House1/map.json +++ b/data/maps/OneIsland_House1/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_House1_EventScript_17135C", + "script": "OneIsland_House1_EventScript_OldMan", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_House1_EventScript_171365", + "script": "OneIsland_House1_EventScript_OldWoman", "flag": "0" } ], diff --git a/data/maps/OneIsland_House1/scripts.inc b/data/maps/OneIsland_House1/scripts.inc index 172f5f4a9..7a11eaa72 100644 --- a/data/maps/OneIsland_House1/scripts.inc +++ b/data/maps/OneIsland_House1/scripts.inc @@ -1,10 +1,10 @@ OneIsland_House1_MapScripts:: @ 817135B .byte 0 -OneIsland_House1_EventScript_17135C:: @ 817135C - msgbox gUnknown_81A2332, MSGBOX_NPC +OneIsland_House1_EventScript_OldMan:: @ 817135C + msgbox OneIsland_House1_Text_GazeUponVolcanoOnSunnyDays, MSGBOX_NPC end -OneIsland_House1_EventScript_171365:: @ 8171365 - msgbox gUnknown_81A2380, MSGBOX_NPC +OneIsland_House1_EventScript_OldWoman:: @ 8171365 + msgbox OneIsland_House1_Text_LastTimeMtEmberErupted, MSGBOX_NPC end diff --git a/data/maps/OneIsland_House1/text.inc b/data/maps/OneIsland_House1/text.inc index a050b31b0..09734127c 100644 --- a/data/maps/OneIsland_House1/text.inc +++ b/data/maps/OneIsland_House1/text.inc @@ -1,9 +1,9 @@ -gUnknown_81A2332:: @ 81A2332 +OneIsland_House1_Text_GazeUponVolcanoOnSunnyDays:: @ 81A2332 .string "On sunny days, I step out and gaze\n" .string "upon the volcano.\p" .string "That's my daily routine.$" -gUnknown_81A2380:: @ 81A2380 +OneIsland_House1_Text_LastTimeMtEmberErupted:: @ 81A2380 .string "Let me think… When was the last\n" .string "time MT. EMBER erupted?$" diff --git a/data/maps/OneIsland_House2/map.json b/data/maps/OneIsland_House2/map.json index c9ce2a7b0..a715328ef 100644 --- a/data/maps/OneIsland_House2/map.json +++ b/data/maps/OneIsland_House2/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_House2_EventScript_17136F", + "script": "OneIsland_House2_EventScript_Lass", "flag": "0" } ], diff --git a/data/maps/OneIsland_House2/scripts.inc b/data/maps/OneIsland_House2/scripts.inc index 0b1761475..e69c5b41e 100644 --- a/data/maps/OneIsland_House2/scripts.inc +++ b/data/maps/OneIsland_House2/scripts.inc @@ -1,6 +1,6 @@ OneIsland_House2_MapScripts:: @ 817136E .byte 0 -OneIsland_House2_EventScript_17136F:: @ 817136F - msgbox gUnknown_81A23B8, MSGBOX_NPC +OneIsland_House2_EventScript_Lass:: @ 817136F + msgbox OneIsland_House2_Text_IWantToStayHereForever, MSGBOX_NPC end diff --git a/data/maps/OneIsland_House2/text.inc b/data/maps/OneIsland_House2/text.inc index c147325c1..fe1a6ba91 100644 --- a/data/maps/OneIsland_House2/text.inc +++ b/data/maps/OneIsland_House2/text.inc @@ -1,4 +1,4 @@ -gUnknown_81A23B8:: @ 81A23B8 +OneIsland_House2_Text_IWantToStayHereForever:: @ 81A23B8 .string "Young people all want to go off to\n" .string "big cities.\p" .string "But I want to stay here forever!$" diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index 83aa1eadc..99dc16ac3 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -31,7 +31,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "OneIsland_KindleRoad_EventScript_1ABBF1", + "script": "OneIsland_KindleRoad_EventScript_Maria", "flag": "0" }, { @@ -44,7 +44,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "OneIsland_KindleRoad_EventScript_1ABC2F", + "script": "OneIsland_KindleRoad_EventScript_Abigail", "flag": "0" }, { @@ -57,7 +57,7 @@ "movement_range_y": 3, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "OneIsland_KindleRoad_EventScript_1ABC6D", + "script": "OneIsland_KindleRoad_EventScript_Finn", "flag": "0" }, { @@ -70,7 +70,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "OneIsland_KindleRoad_EventScript_1ABCAB", + "script": "OneIsland_KindleRoad_EventScript_Garrett", "flag": "0" }, { @@ -83,7 +83,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1ABCE9", + "script": "OneIsland_KindleRoad_EventScript_Tommy", "flag": "0" }, { @@ -96,7 +96,7 @@ "movement_range_y": 7, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "OneIsland_KindleRoad_EventScript_1ABD27", + "script": "OneIsland_KindleRoad_EventScript_Sharon", "flag": "0" }, { @@ -109,7 +109,7 @@ "movement_range_y": 4, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "OneIsland_KindleRoad_EventScript_1ABD65", + "script": "OneIsland_KindleRoad_EventScript_Tanya", "flag": "0" }, { @@ -122,7 +122,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "OneIsland_KindleRoad_EventScript_1ABDA3", + "script": "OneIsland_KindleRoad_EventScript_Shea", "flag": "0" }, { @@ -135,7 +135,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "OneIsland_KindleRoad_EventScript_1ABDE1", + "script": "OneIsland_KindleRoad_EventScript_Hugh", "flag": "0" }, { @@ -148,7 +148,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "OneIsland_KindleRoad_EventScript_1ABE1F", + "script": "OneIsland_KindleRoad_EventScript_Bryce", "flag": "0" }, { @@ -161,7 +161,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "OneIsland_KindleRoad_EventScript_1ABE5D", + "script": "OneIsland_KindleRoad_EventScript_Claire", "flag": "0" }, { @@ -174,7 +174,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "OneIsland_KindleRoad_EventScript_1ABEE1", + "script": "OneIsland_KindleRoad_EventScript_Mik", "flag": "0" }, { @@ -187,7 +187,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "OneIsland_KindleRoad_EventScript_1ABE9B", + "script": "OneIsland_KindleRoad_EventScript_Kia", "flag": "0" }, { @@ -429,14 +429,14 @@ "x": 13, "y": 59, "elevation": 0, - "script": "OneIsland_KindleRoad_EventScript_168762" + "script": "OneIsland_KindleRoad_EventScript_EmberSpaSign" }, { "type": "bg_event_type_0", "x": 8, "y": 115, "elevation": 0, - "script": "OneIsland_KindleRoad_EventScript_168759" + "script": "OneIsland_KindleRoad_EventScript_RouteSign" } ] } diff --git a/data/maps/OneIsland_KindleRoad/scripts.inc b/data/maps/OneIsland_KindleRoad/scripts.inc index 00c5106a7..bcc33708a 100644 --- a/data/maps/OneIsland_KindleRoad/scripts.inc +++ b/data/maps/OneIsland_KindleRoad/scripts.inc @@ -1,10 +1,10 @@ OneIsland_KindleRoad_MapScripts:: @ 8168758 .byte 0 -OneIsland_KindleRoad_EventScript_168759:: @ 8168759 - msgbox gUnknown_8189D02, MSGBOX_SIGN +OneIsland_KindleRoad_EventScript_RouteSign:: @ 8168759 + msgbox OneIsland_KindleRoad_Text_RouteSign, MSGBOX_SIGN end -OneIsland_KindleRoad_EventScript_168762:: @ 8168762 - msgbox gUnknown_8189D32, MSGBOX_SIGN +OneIsland_KindleRoad_EventScript_EmberSpaSign:: @ 8168762 + msgbox OneIsland_KindleRoad_Text_EmberSpaSign, MSGBOX_SIGN end diff --git a/data/maps/OneIsland_KindleRoad/text.inc b/data/maps/OneIsland_KindleRoad/text.inc index 93537a5f3..8a65dd3ac 100644 --- a/data/maps/OneIsland_KindleRoad/text.inc +++ b/data/maps/OneIsland_KindleRoad/text.inc @@ -1,164 +1,164 @@ -Text_18961F:: @ 818961F +OneIsland_KindleRoad_Text_MariaIntro:: @ 818961F .string "The weather's gorgeous!\n" .string "Perfect for a battle!$" -Text_18964D:: @ 818964D +OneIsland_KindleRoad_Text_MariaDefeat:: @ 818964D .string "Aiyeeeeh!$" -Text_189657:: @ 8189657 +OneIsland_KindleRoad_Text_MariaPostBattle:: @ 8189657 .string "Please don't splash my face!\n" .string "You'll ruin the makeup.$" -Text_18968C:: @ 818968C +OneIsland_KindleRoad_Text_AbigailIntro:: @ 818968C .string "I'm beginning to get a sunburn…$" -Text_1896AC:: @ 81896AC +OneIsland_KindleRoad_Text_AbigailDefeat:: @ 81896AC .string "Oh, you're so awful.$" -Text_1896C1:: @ 81896C1 +OneIsland_KindleRoad_Text_AbigailPostBattle:: @ 81896C1 .string "I like that cap you have.\n" .string "Maybe I should wear one, too…$" -Text_1896F9:: @ 81896F9 +OneIsland_KindleRoad_Text_FinnIntro:: @ 81896F9 .string "Seen from here, MT. EMBER towers\n" .string "into the sky.$" -Text_189728:: @ 8189728 +OneIsland_KindleRoad_Text_FinnDefeat:: @ 8189728 .string "Well, aren't you tough?$" -Text_189740:: @ 8189740 +OneIsland_KindleRoad_Text_FinnPostBattle:: @ 8189740 .string "The sky is immense around these\n" .string "parts.$" -Text_189767:: @ 8189767 +OneIsland_KindleRoad_Text_GarrettIntro:: @ 8189767 .string "I took a break from swimming,\n" .string "only to have you challenge me?$" -Text_1897A4:: @ 81897A4 +OneIsland_KindleRoad_Text_GarrettDefeat:: @ 81897A4 .string "Hey, what the…\n" .string "You're good, you!$" -Text_1897C5:: @ 81897C5 +OneIsland_KindleRoad_Text_GarrettPostBattle:: @ 81897C5 .string "Instead of using SURF all the time,\n" .string "you should swim some.$" -Text_1897FF:: @ 81897FF +OneIsland_KindleRoad_Text_TommyIntro:: @ 81897FF .string "Wait! Wait a second!\n" .string "I think I've hooked a big one!$" -Text_189833:: @ 8189833 +OneIsland_KindleRoad_Text_TommyDefeat:: @ 8189833 .string "I've lost it all again…$" -Text_18984B:: @ 818984B +OneIsland_KindleRoad_Text_TommyPostBattle:: @ 818984B .string "Not only did I lose, the big one\n" .string "got away from me, too!$" -Text_189883:: @ 8189883 +OneIsland_KindleRoad_Text_SharonIntro:: @ 8189883 .string "Could you help me out with my\n" .string "training?$" -Text_1898AB:: @ 81898AB +OneIsland_KindleRoad_Text_SharonDefeat:: @ 81898AB .string "You were a cut above me.$" -Text_1898C4:: @ 81898C4 +OneIsland_KindleRoad_Text_SharonPostBattle:: @ 81898C4 .string "It's clear that you're skilled.\n" .string "I like you!$" -Text_1898F0:: @ 81898F0 +OneIsland_KindleRoad_Text_TanyaIntro:: @ 81898F0 .string "There isn't a day in which we don't\n" .string "train!$" -Text_18991B:: @ 818991B +OneIsland_KindleRoad_Text_TanyaDefeat:: @ 818991B .string "I'm such a fool!$" -Text_18992C:: @ 818992C +OneIsland_KindleRoad_Text_TanyaPostBattle:: @ 818992C .string "I'll train even harder from now on!$" -Text_189950:: @ 8189950 +OneIsland_KindleRoad_Text_SheaIntro:: @ 8189950 .string "Every morning, before breakfast,\n" .string "I swim around this island.$" -Text_18998C:: @ 818998C +OneIsland_KindleRoad_Text_SheaDefeat:: @ 818998C .string "Gasp…\n" .string "Gasp…$" -Text_189998:: @ 8189998 +OneIsland_KindleRoad_Text_SheaPostBattle:: @ 8189998 .string "I lost because I'm pooped from all\n" .string "the running I did…$" -Text_1899CE:: @ 81899CE +OneIsland_KindleRoad_Text_HughIntro:: @ 81899CE .string "Dress appropriately for battle!\n" .string "Lose that frivolous outfit!$" -Text_189A0A:: @ 8189A0A +OneIsland_KindleRoad_Text_HughDefeat:: @ 8189A0A .string "Why me?!$" -Text_189A13:: @ 8189A13 +OneIsland_KindleRoad_Text_HughPostBattle:: @ 8189A13 .string "Even martial artists are becoming\n" .string "fashion conscious these days…$" -Text_189A53:: @ 8189A53 +OneIsland_KindleRoad_Text_BryceIntro:: @ 8189A53 .string "You know, everything tastes great\n" .string "when you're out in the wild.$" -Text_189A92:: @ 8189A92 +OneIsland_KindleRoad_Text_BryceDefeat:: @ 8189A92 .string "Awww, blown!$" -Text_189A9F:: @ 8189A9F +OneIsland_KindleRoad_Text_BrycePostBattle:: @ 8189A9F .string "The water in volcanic regions is\n" .string "delicious.$" -Text_189ACB:: @ 8189ACB +OneIsland_KindleRoad_Text_ClaireIntro:: @ 8189ACB .string "My lunch filled us up, so will you\n" .string "battle us for some exercise?$" -Text_189B0B:: @ 8189B0B +OneIsland_KindleRoad_Text_ClaireDefeat:: @ 8189B0B .string "That made me all sweaty.$" -Text_189B24:: @ 8189B24 +OneIsland_KindleRoad_Text_ClairePostBattle:: @ 8189B24 .string "What should I do?\n" .string "I feel famished again.$" -Text_189B4D:: @ 8189B4D +OneIsland_KindleRoad_Text_KiaIntro:: @ 8189B4D .string "KIA: My big brother and I make\n" .string "an awesome combination!$" -Text_189B84:: @ 8189B84 +OneIsland_KindleRoad_Text_KiaDefeat:: @ 8189B84 .string "KIA: Huh?!\n" .string "I can't believe it!$" -Text_189BA3:: @ 8189BA3 +OneIsland_KindleRoad_Text_KiaPostBattle:: @ 8189BA3 .string "KIA: How could there be anyone\n" .string "better than my big brother?$" -Text_189BDE:: @ 8189BDE +OneIsland_KindleRoad_Text_KiaNotEnoughMons:: @ 8189BDE .string "KIA: If you want to battle with\n" .string "us, you have to bring at least two\l" .string "POKéMON with you.$" -Text_189C33:: @ 8189C33 +OneIsland_KindleRoad_Text_MikIntro:: @ 8189C33 .string "MIK: Together with KIA, I'm afraid\n" .string "of nothing!$" -Text_189C62:: @ 8189C62 +OneIsland_KindleRoad_Text_MikDefeat:: @ 8189C62 .string "MIK: Whoa!\n" .string "That's too much!$" -Text_189C7E:: @ 8189C7E +OneIsland_KindleRoad_Text_MikPostBattle:: @ 8189C7E .string "MIK: How could my combination\n" .string "with KIA fail?$" -Text_189CAB:: @ 8189CAB +OneIsland_KindleRoad_Text_MikNotEnoughMons:: @ 8189CAB .string "MIK: Hey, do you want to battle\n" .string "with us two?\p" .string "Bring two or more POKéMON with\n" .string "you, then.$" -gUnknown_8189D02:: @ 8189D02 +OneIsland_KindleRoad_Text_RouteSign:: @ 8189D02 .string "This is KINDLE ROAD.\p" .string "Go straight for MT. EMBER.$" -gUnknown_8189D32:: @ 8189D32 +OneIsland_KindleRoad_Text_EmberSpaSign:: @ 8189D32 .string "Light the Fire in Your Heart!\n" .string "EMBER SPA$" diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json index 3472ab348..112a729cd 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EmberSpa_EventScript_16535C", + "script": "OneIsland_KindleRoad_EmberSpa_EventScript_OldMan", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EmberSpa_EventScript_165365", + "script": "OneIsland_KindleRoad_EmberSpa_EventScript_BaldingMan1", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EmberSpa_EventScript_165380", + "script": "OneIsland_KindleRoad_EmberSpa_EventScript_BlackBelt", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EmberSpa_EventScript_165377", + "script": "OneIsland_KindleRoad_EmberSpa_EventScript_OldWoman", "flag": "0" }, { @@ -77,7 +77,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EmberSpa_EventScript_165399", + "script": "OneIsland_KindleRoad_EmberSpa_EventScript_RockSmashMan", "flag": "0" }, { @@ -90,7 +90,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EmberSpa_EventScript_16536E", + "script": "OneIsland_KindleRoad_EmberSpa_EventScript_BaldingMan2", "flag": "0" } ], @@ -111,7 +111,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": 0, - "script": "OneIsland_KindleRoad_EmberSpa_EventScript_1653CF" + "script": "OneIsland_KindleRoad_EmberSpa_EventScript_SpaHeal" } ], "bg_events": [] diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc index d32ab0d4a..becd846c8 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc @@ -1,52 +1,52 @@ OneIsland_KindleRoad_EmberSpa_MapScripts:: @ 816535B .byte 0 -OneIsland_KindleRoad_EmberSpa_EventScript_16535C:: @ 816535C - msgbox gUnknown_817D34A, MSGBOX_NPC +OneIsland_KindleRoad_EmberSpa_EventScript_OldMan:: @ 816535C + msgbox OneIsland_KindleRoad_EmberSpa_Text_WaterWarmsMeToCore, MSGBOX_NPC end -OneIsland_KindleRoad_EmberSpa_EventScript_165365:: @ 8165365 - msgbox gUnknown_817D3DE, MSGBOX_NPC +OneIsland_KindleRoad_EmberSpa_EventScript_BaldingMan1:: @ 8165365 + msgbox OneIsland_KindleRoad_EmberSpa_Text_EnjoyBowlOfChowder, MSGBOX_NPC end -OneIsland_KindleRoad_EmberSpa_EventScript_16536E:: @ 816536E - msgbox gUnknown_817D4AA, MSGBOX_NPC +OneIsland_KindleRoad_EmberSpa_EventScript_BaldingMan2:: @ 816536E + msgbox OneIsland_KindleRoad_EmberSpa_Text_HotSpringIsTherapeutic, MSGBOX_NPC end -OneIsland_KindleRoad_EmberSpa_EventScript_165377:: @ 8165377 - msgbox gUnknown_817D4E3, MSGBOX_NPC +OneIsland_KindleRoad_EmberSpa_EventScript_OldWoman:: @ 8165377 + msgbox OneIsland_KindleRoad_EmberSpa_Text_SeeHowSmoothMySkinIs, MSGBOX_NPC end -OneIsland_KindleRoad_EmberSpa_EventScript_165380:: @ 8165380 +OneIsland_KindleRoad_EmberSpa_EventScript_BlackBelt:: @ 8165380 lock faceplayer famechecker FAMECHECKER_BRUNO, 3 - msgbox gUnknown_817D550 + msgbox OneIsland_KindleRoad_EmberSpa_Text_BrunoVisitsSpaOnOccasion release end -OneIsland_KindleRoad_EmberSpa_EventScript_165399:: @ 8165399 +OneIsland_KindleRoad_EmberSpa_EventScript_RockSmashMan:: @ 8165399 lock faceplayer - goto_if_set FLAG_GOT_HM06, EventScript_1653C5 - msgbox gUnknown_817D622 + goto_if_set FLAG_GOT_HM06, OneIsland_KindleRoad_EmberSpa_EventScript_AlreadyGotHM06 + msgbox OneIsland_KindleRoad_EmberSpa_Text_UsedThisToMakeEmberSpa giveitem ITEM_HM06 setflag FLAG_GOT_HM06 - msgbox gUnknown_817D6F3 + msgbox OneIsland_KindleRoad_EmberSpa_Text_ExplainHM06 release end -EventScript_1653C5:: @ 81653C5 - msgbox gUnknown_817D6F3 +OneIsland_KindleRoad_EmberSpa_EventScript_AlreadyGotHM06:: @ 81653C5 + msgbox OneIsland_KindleRoad_EmberSpa_Text_ExplainHM06 release end -OneIsland_KindleRoad_EmberSpa_EventScript_1653CF:: @ 81653CF +OneIsland_KindleRoad_EmberSpa_EventScript_SpaHeal:: @ 81653CF lockall fadescreen FADE_TO_WHITE special HealPlayerParty fadescreen FADE_FROM_WHITE - msgbox gUnknown_817D450 + msgbox OneIsland_KindleRoad_EmberSpa_Text_WaterExquisiteFullyRefreshed setvar VAR_TEMP_1, 1 releaseall end diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/text.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/text.inc index ffc4fea83..64c2ee64c 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/text.inc +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/text.inc @@ -1,4 +1,4 @@ -gUnknown_817D34A:: @ 817D34A +OneIsland_KindleRoad_EmberSpa_Text_WaterWarmsMeToCore:: @ 817D34A .string "Hm!\n" .string "Haaaaaaaaaaah!\p" .string "Aaaah! This is heavenly!\n" @@ -7,29 +7,29 @@ gUnknown_817D34A:: @ 817D34A .string "Go to the middle, relax, and get\n" .string "good and warm!$" -gUnknown_817D3DE:: @ 817D3DE +OneIsland_KindleRoad_EmberSpa_Text_EnjoyBowlOfChowder:: @ 817D3DE .string "My favorite part of bathing comes\n" .string "up right after this.\p" .string "I enjoy a bowl of chowder to\n" .string "warm me from the inside, too!$" -gUnknown_817D450:: @ 817D450 +OneIsland_KindleRoad_EmberSpa_Text_WaterExquisiteFullyRefreshed:: @ 817D450 .string "The water is perfectly warm.\n" .string "It feels exquisite…\p" .string "{PLAYER} and the POKéMON were\n" .string "fully refreshed!$" -gUnknown_817D4AA:: @ 817D4AA +OneIsland_KindleRoad_EmberSpa_Text_HotSpringIsTherapeutic:: @ 817D4AA .string "Soaking in a hot spring pool is\n" .string "therapeutic, people say.$" -gUnknown_817D4E3:: @ 817D4E3 +OneIsland_KindleRoad_EmberSpa_Text_SeeHowSmoothMySkinIs:: @ 817D4E3 .string "Have a look at my face.\n" .string "See how smooth my skin is?\p" .string "The hot spring's water keeps my\n" .string "skin younger than my age.$" -gUnknown_817D550:: @ 817D550 +OneIsland_KindleRoad_EmberSpa_Text_BrunoVisitsSpaOnOccasion:: @ 817D550 .string "After an honest day of training,\n" .string "nothing beats a relaxing soak in\l" .string "the hot spring pool.\p" @@ -38,7 +38,7 @@ gUnknown_817D550:: @ 817D550 .string "He comes to rehab injuries, both\n" .string "his own and his POKéMON's.$" -gUnknown_817D622:: @ 817D622 +OneIsland_KindleRoad_EmberSpa_Text_UsedThisToMakeEmberSpa:: @ 817D622 .string "Hot springs go hand-in-hand with\n" .string "volcanoes.\p" .string "The EMBER SPA here, well,\n" @@ -48,7 +48,7 @@ gUnknown_817D622:: @ 817D622 .string "I was using this at the time.\n" .string "I suppose I can part with it.$" -gUnknown_817D6F3:: @ 817D6F3 +OneIsland_KindleRoad_EmberSpa_Text_ExplainHM06:: @ 817D6F3 .string "That shatters boulders as if they\n" .string "were made of crackers.$" diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index 08df3284c..8ffa34c57 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_170E94", + "script": "OneIsland_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_170E9D", + "script": "OneIsland_PokemonCenter_1F_EventScript_Bill", "flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_170EC5", + "script": "OneIsland_PokemonCenter_1F_EventScript_Celio", "flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_CELIO" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_171148", + "script": "OneIsland_PokemonCenter_1F_EventScript_LittleBoy", "flag": "0" }, { @@ -77,7 +77,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_171151", + "script": "OneIsland_PokemonCenter_1F_EventScript_Hiker", "flag": "0" }, { @@ -90,7 +90,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_17115A", + "script": "OneIsland_PokemonCenter_1F_EventScript_BattleGirl", "flag": "0" } ], @@ -118,7 +118,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F", "var_value": 2, - "script": "OneIsland_PokemonCenter_1F_EventScript_1711AA" + "script": "OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerTop" }, { "type": "trigger", @@ -127,7 +127,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F", "var_value": 2, - "script": "OneIsland_PokemonCenter_1F_EventScript_1711B6" + "script": "OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerMidTop" }, { "type": "trigger", @@ -136,7 +136,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F", "var_value": 2, - "script": "OneIsland_PokemonCenter_1F_EventScript_1711C2" + "script": "OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerMidBottom" }, { "type": "trigger", @@ -145,7 +145,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F", "var_value": 2, - "script": "OneIsland_PokemonCenter_1F_EventScript_1711CE" + "script": "OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerBottom" } ], "bg_events": [ @@ -154,63 +154,63 @@ "x": 12, "y": 2, "elevation": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { "type": "bg_event_type_0", "x": 12, "y": 3, "elevation": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { "type": "bg_event_type_0", "x": 12, "y": 4, "elevation": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { "type": "bg_event_type_0", "x": 12, "y": 5, "elevation": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { "type": "bg_event_type_0", "x": 13, "y": 5, "elevation": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { "type": "bg_event_type_0", "x": 15, "y": 5, "elevation": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { "type": "bg_event_type_0", "x": 14, "y": 5, "elevation": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { "type": "bg_event_type_0", "x": 16, "y": 5, "elevation": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { "type": "bg_event_type_0", "x": 17, "y": 5, "elevation": 0, - "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" } ] } diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 05f00c76b..53d0aebcd 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -1,3 +1,6 @@ +.equ LOCALID_BILL, 2 +.equ LOCALID_CELIO, 3 + OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8 map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume @@ -7,147 +10,147 @@ OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8 OneIsland_PokemonCenter_1F_OnLoad:: @ 8170C0D compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - call_if_ge EventScript_170C22 - call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_170C36 + call_if_ge OneIsland_PokemonCenter_1F_EventScript_SetRubyMetatile + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, OneIsland_PokemonCenter_1F_EventScript_SetNetworkMachineOn end -EventScript_170C22:: @ 8170C22 - setmetatile 13, 4, 861, 1 +OneIsland_PokemonCenter_1F_EventScript_SetRubyMetatile:: @ 8170C22 + setmetatile 13, 4, METATILE_PokemonCenter_NetworkMachine_Ruby, 1 return -EventScript_170C2C:: @ 8170C2C - setmetatile 16, 4, 863, 1 +OneIsland_PokemonCenter_1F_EventScript_SetSapphireMetatile:: @ 8170C2C + setmetatile 16, 4, METATILE_PokemonCenter_NetworkMachine_Sapphire, 1 return -EventScript_170C36:: @ 8170C36 - call EventScript_170C2C - setmetatile 14, 4, 858, 1 - setmetatile 15, 4, 859, 1 +OneIsland_PokemonCenter_1F_EventScript_SetNetworkMachineOn:: @ 8170C36 + call OneIsland_PokemonCenter_1F_EventScript_SetSapphireMetatile + setmetatile 14, 4, METATILE_PokemonCenter_NetworkMachine_ScreenLeft_On, 1 + setmetatile 15, 4, METATILE_PokemonCenter_NetworkMachine_ScreenRight_On, 1 return OneIsland_PokemonCenter_1F_OnTransition:: @ 8170C4E setrespawn SPAWN_ONE_ISLAND compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 - call_if_eq EventScript_170C73 + call_if_eq OneIsland_PokemonCenter_1F_EventScript_SetCelioQuestDone compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0 - call_if_eq EventScript_170C79 + call_if_eq OneIsland_PokemonCenter_1F_EventScript_SetBillCelioFirstMeetingPos compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 - call_if_eq EventScript_170C90 + call_if_eq OneIsland_PokemonCenter_1F_EventScript_SetBillCelioReadyToLeavePos end -EventScript_170C73:: @ 8170C73 +OneIsland_PokemonCenter_1F_EventScript_SetCelioQuestDone:: @ 8170C73 setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7 return -EventScript_170C79:: @ 8170C79 - setobjectxyperm 2, 9, 8 - setobjectmovementtype 2, 7 - setobjectxyperm 3, 15, 6 - setobjectmovementtype 3, 7 +OneIsland_PokemonCenter_1F_EventScript_SetBillCelioFirstMeetingPos:: @ 8170C79 + setobjectxyperm LOCALID_BILL, 9, 8 + setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_CELIO, 15, 6 + setobjectmovementtype LOCALID_CELIO, MOVEMENT_TYPE_FACE_UP return -EventScript_170C90:: @ 8170C90 - setobjectxyperm 2, 14, 7 - setobjectmovementtype 2, 9 - setobjectxyperm 3, 14, 8 - setobjectmovementtype 3, 9 +OneIsland_PokemonCenter_1F_EventScript_SetBillCelioReadyToLeavePos:: @ 8170C90 + setobjectxyperm LOCALID_BILL, 14, 7 + setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_CELIO, 14, 8 + setobjectmovementtype LOCALID_CELIO, MOVEMENT_TYPE_FACE_LEFT return OneIsland_PokemonCenter_1F_OnFrame:: @ 8170CA7 - map_script_2 VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0, EventScript_170CB1 + map_script_2 VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0, OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene .2byte 0 -EventScript_170CB1:: @ 8170CB1 +OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene:: @ 8170CB1 lockall textcolor 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_170E7D - applymovement 2, Movement_170E86 + applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToCelio + applymovement LOCALID_BILL, OneIsland_PokemonCenter_1F_Movement_BillWalkToCelio waitmovement 0 - msgbox gUnknown_81A0CDE + msgbox OneIsland_PokemonCenter_1F_Text_BillHeyThereCelio applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 playse SE_PIN - applymovement 3, Movement_ExclamationMark + applymovement LOCALID_CELIO, Movement_ExclamationMark waitmovement 0 - applymovement 3, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement 3, Movement_Delay48 + applymovement LOCALID_CELIO, Movement_Delay48 waitmovement 0 - msgbox gUnknown_81A0CF7 - msgbox gUnknown_81A0D27 - applymovement 2, Movement_WalkInPlaceFastestDown + msgbox OneIsland_PokemonCenter_1F_Text_CelioCantBelieveYouCameOut + msgbox OneIsland_PokemonCenter_1F_Text_BillHowsYourResearchComing + applymovement LOCALID_BILL, Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox gUnknown_81A0D72 - applymovement 2, Movement_WalkInPlaceFastestRight + msgbox OneIsland_PokemonCenter_1F_Text_ThisIsMyBuddyCelio + applymovement LOCALID_BILL, Movement_WalkInPlaceFastestRight waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 - call_if_set FLAG_SYS_GAME_CLEAR, EventScript_170E34 - call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_170E3D - applymovement 3, Movement_WalkInPlaceFastestDown + call_if_set FLAG_SYS_GAME_CLEAR, OneIsland_PokemonCenter_1F_EventScript_IntroducePlayerChamp + call_if_unset FLAG_SYS_GAME_CLEAR, OneIsland_PokemonCenter_1F_EventScript_IntroducePlayerNotChamp + applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox gUnknown_81A0E17 - msgbox gUnknown_81A0E90 - applymovement 3, Movement_WalkInPlaceFastestLeft + msgbox OneIsland_PokemonCenter_1F_Text_CelioThatsReallyImpressive + msgbox OneIsland_PokemonCenter_1F_Text_BillBringMeUpToSpeed + applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox gUnknown_81A0ECC + msgbox OneIsland_PokemonCenter_1F_Text_CelioPCsCantLinkWithYours closemessage - applymovement 2, Movement_WalkInPlaceFastestUp + applymovement LOCALID_BILL, Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox gUnknown_81A0F40 - applymovement 2, Movement_WalkInPlaceFastestDown + msgbox OneIsland_PokemonCenter_1F_Text_BillLetMeHelpYou + applymovement LOCALID_BILL, Movement_WalkInPlaceFastestDown waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox gUnknown_81A0FB1 - msgreceiveditem gUnknown_81A10EE, ITEM_METEORITE, 1, MUS_FAN5 + msgbox OneIsland_PokemonCenter_1F_Text_CanYouDeliverThisMeteoritePlayer + msgreceiveditem OneIsland_PokemonCenter_1F_Text_AcceptedMeteoriteFromBill, ITEM_METEORITE, 1, MUS_FAN5 additem ITEM_METEORITE - applymovement 3, Movement_WalkInPlaceFastestDown + applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox gUnknown_81A1113 - giveitem_msg gUnknown_81A231B, ITEM_TRI_PASS, 1, MUS_FAN5 - msgbox gUnknown_81A1150 + msgbox OneIsland_PokemonCenter_1F_Text_CelioPleaseTakeThis + giveitem_msg OneIsland_PokemonCenter_1F_Text_ObtainedTriPass, ITEM_TRI_PASS, 1, MUS_FAN5 + msgbox OneIsland_PokemonCenter_1F_Text_PassLetsYouTravelBetweenIslands compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if_ge EventScript_170E46 + call_if_ge OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMapPage compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if_lt EventScript_170E58 + call_if_lt OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMap setflag FLAG_SYS_SEVII_MAP_123 - msgbox gUnknown_81A1230 + msgbox OneIsland_PokemonCenter_1F_Text_BillCatchYouLater closemessage - applymovement 2, Movement_WalkInPlaceFastestUp + applymovement LOCALID_BILL, Movement_WalkInPlaceFastestUp waitmovement 0 - applymovement 3, Movement_WalkInPlaceFastestUp + applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestUp waitmovement 0 setflag FLAG_SYS_PC_STORAGE_DISABLED setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 releaseall end -EventScript_170E34:: @ 8170E34 - msgbox gUnknown_81A0DE8 +OneIsland_PokemonCenter_1F_EventScript_IntroducePlayerChamp:: @ 8170E34 + msgbox OneIsland_PokemonCenter_1F_Text_PlayerIsReigningPokemonChamp return -EventScript_170E3D:: @ 8170E3D - msgbox gUnknown_81A0DAC +OneIsland_PokemonCenter_1F_EventScript_IntroducePlayerNotChamp:: @ 8170E3D + msgbox OneIsland_PokemonCenter_1F_Text_PlayerIsRisingPokemonChamp return -EventScript_170E46:: @ 8170E46 +OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMapPage:: @ 8170E46 textcolor 3 playfanfare MUS_FAN5 - message Text_1A11EC + message OneIsland_PokemonCenter_1F_Text_ReceivedExtraPageForTownMap waitmessage waitfanfare call EventScript_1A6675 return -EventScript_170E58:: @ 8170E58 +OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMap:: @ 8170E58 setflag FLAG_HIDE_TOWN_MAP setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - giveitem_msg gUnknown_81A1218, ITEM_TOWN_MAP, 1, MUS_FAN5 + giveitem_msg OneIsland_PokemonCenter_1F_Text_ReceivedTownMap, ITEM_TOWN_MAP, 1, MUS_FAN5 return -Movement_170E7D:: @ 8170E7D +OneIsland_PokemonCenter_1F_Movement_PlayerWalkToCelio:: @ 8170E7D walk_up walk_up walk_right @@ -158,7 +161,7 @@ Movement_170E7D:: @ 8170E7D walk_in_place_fastest_up step_end -Movement_170E86:: @ 8170E86 +OneIsland_PokemonCenter_1F_Movement_BillWalkToCelio:: @ 8170E86 walk_up walk_right walk_right @@ -169,121 +172,123 @@ Movement_170E86:: @ 8170E86 walk_in_place_fastest_right step_end +@ Unused Movement_170E8F:: @ 8170E8F walk_up step_end +@ Unused Movement_170E91:: @ 8170E91 walk_left walk_in_place_fastest_right step_end -OneIsland_PokemonCenter_1F_EventScript_170E94:: @ 8170E94 +OneIsland_PokemonCenter_1F_EventScript_Nurse:: @ 8170E94 lock faceplayer call EventScript_PkmnCenterNurse release end -OneIsland_PokemonCenter_1F_EventScript_170E9D:: @ 8170E9D +OneIsland_PokemonCenter_1F_EventScript_Bill:: @ 8170E9D lock - goto_if_set FLAG_SEVII_DETOUR_FINISHED, EventScript_170EB1 - msgbox gUnknown_81A1266 + goto_if_set FLAG_SEVII_DETOUR_FINISHED, OneIsland_PokemonCenter_1F_EventScript_BillGoTakeStroll + msgbox OneIsland_PokemonCenter_1F_Text_HmmHowAboutLikeThis release end -EventScript_170EB1:: @ 8170EB1 - applymovement 2, Movement_FacePlayer +OneIsland_PokemonCenter_1F_EventScript_BillGoTakeStroll:: @ 8170EB1 + applymovement LOCALID_BILL, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_81A128C + msgbox OneIsland_PokemonCenter_1F_Text_GotPCWorkingStrollAWhileMore release end -OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5 +OneIsland_PokemonCenter_1F_EventScript_Celio:: @ 8170EC5 lock faceplayer compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7 - goto_if_eq EventScript_170F35 + goto_if_eq OneIsland_PokemonCenter_1F_EventScript_CelioGiveBillFact compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 - goto_if_eq EventScript_170F9B - goto_if_set FLAG_RECOVERED_SAPPHIRE, EventScript_170FA5 + goto_if_eq OneIsland_PokemonCenter_1F_EventScript_CelioJustGivenSapphire + goto_if_set FLAG_RECOVERED_SAPPHIRE, OneIsland_PokemonCenter_1F_EventScript_GiveCelioSapphire compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if_eq EventScript_17103A - goto_if_set FLAG_GOT_RUBY, EventScript_171044 + goto_if_eq OneIsland_PokemonCenter_1F_EventScript_ExplainRainbowPass + goto_if_set FLAG_GOT_RUBY, OneIsland_PokemonCenter_1F_EventScript_GiveCelioRuby compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - goto_if_eq EventScript_1710F2 + goto_if_eq OneIsland_PokemonCenter_1F_EventScript_CelioWaitingForRuby specialvar VAR_RESULT, IsNationalPokedexEnabled compare VAR_RESULT, TRUE - goto_if_eq EventScript_1710FC + goto_if_eq OneIsland_PokemonCenter_1F_EventScript_CelioRequestRuby compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 - goto_if_eq EventScript_171134 - msgbox gUnknown_81A1321 + goto_if_eq OneIsland_PokemonCenter_1F_EventScript_CelioPlayerMissingNationalDex + msgbox OneIsland_PokemonCenter_1F_Text_SorryForBeingPoorHost closemessage - applymovement 3, Movement_FaceOriginalDirection + applymovement LOCALID_CELIO, Movement_FaceOriginalDirection waitmovement 0 release end -EventScript_170F35:: @ 8170F35 - msgbox gUnknown_81A1EBD +OneIsland_PokemonCenter_1F_EventScript_CelioGiveBillFact:: @ 8170F35 + msgbox OneIsland_PokemonCenter_1F_Text_CelioHearingRumorsAboutYou random 3 compare VAR_RESULT, 0 - goto_if_eq EventScript_170F6D + goto_if_eq OneIsland_PokemonCenter_1F_EventScript_BillFact1 compare VAR_RESULT, 1 - goto_if_eq EventScript_170F84 + goto_if_eq OneIsland_PokemonCenter_1F_EventScript_BillFact2 famechecker FAMECHECKER_BILL, 5 - msgbox gUnknown_81A2076 + msgbox OneIsland_PokemonCenter_1F_Text_BillCantStomachMilk release end -EventScript_170F6D:: @ 8170F6D +OneIsland_PokemonCenter_1F_EventScript_BillFact1:: @ 8170F6D famechecker FAMECHECKER_BILL, 3 - msgbox gUnknown_81A1EF3 + msgbox OneIsland_PokemonCenter_1F_Text_BillsFirstMonWasAbra release end -EventScript_170F84:: @ 8170F84 +OneIsland_PokemonCenter_1F_EventScript_BillFact2:: @ 8170F84 famechecker FAMECHECKER_BILL, 4 - msgbox gUnknown_81A1F7C + msgbox OneIsland_PokemonCenter_1F_Text_BillsHometownInGoldenrod release end -EventScript_170F9B:: @ 8170F9B - msgbox gUnknown_81A1E39 +OneIsland_PokemonCenter_1F_EventScript_CelioJustGivenSapphire:: @ 8170F9B + msgbox OneIsland_PokemonCenter_1F_Text_WishYouBestOfLuck release end -EventScript_170FA5:: @ 8170FA5 +OneIsland_PokemonCenter_1F_EventScript_GiveCelioSapphire:: @ 8170FA5 textcolor 3 playfanfare MUS_ME_WAZA - message Text_1A1C2D + message OneIsland_PokemonCenter_1F_Text_HandedSapphireToCelio waitmessage waitfanfare call EventScript_1A6675 removeitem ITEM_SAPPHIRE, 1 - msgbox gUnknown_81A1C4E + msgbox OneIsland_PokemonCenter_1F_Text_ThankYouGiveMeTime closemessage - applymovement 3, Movement_171142 + applymovement LOCALID_CELIO, OneIsland_PokemonCenter_1F_Movement_CelioPutGemInMachine waitmovement 0 playse SE_TK_KASYA - call EventScript_170C2C + call OneIsland_PokemonCenter_1F_EventScript_SetSapphireMetatile special DrawWholeMapView - msgbox gUnknown_81A1D45 + msgbox OneIsland_PokemonCenter_1F_Text_OkayThisIsGood closemessage delay 60 - applymovement 3, Movement_17113E + applymovement LOCALID_CELIO, OneIsland_PokemonCenter_1F_Movement_CelioCheckMachine waitmovement 0 delay 30 - applymovement 3, Movement_17113E + applymovement LOCALID_CELIO, OneIsland_PokemonCenter_1F_Movement_CelioCheckMachine waitmovement 0 delay 40 playse SE_PC_ON - call EventScript_170C36 + call OneIsland_PokemonCenter_1F_EventScript_SetNetworkMachineOn special DrawWholeMapView - msgbox gUnknown_81A1D59 - applymovement 3, Movement_FacePlayer + msgbox OneIsland_PokemonCenter_1F_Text_LinkedUpWithLanette + applymovement LOCALID_CELIO, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_81A1D7D + msgbox OneIsland_PokemonCenter_1F_Text_ManagedToLinkWithHoennThankYou special sub_810B82C setflag FLAG_SYS_CAN_LINK_WITH_RS setflag FLAG_HIDE_CERULEAN_CAVE_GUARD @@ -293,43 +298,43 @@ EventScript_170FA5:: @ 8170FA5 release end -EventScript_17103A:: @ 817103A - msgbox gUnknown_81A1BB7 +OneIsland_PokemonCenter_1F_EventScript_ExplainRainbowPass:: @ 817103A + msgbox OneIsland_PokemonCenter_1F_Text_PassLetYouGetToAllIslands release end -EventScript_171044:: @ 8171044 - msgbox gUnknown_81A197E +OneIsland_PokemonCenter_1F_EventScript_GiveCelioRuby:: @ 8171044 + msgbox OneIsland_PokemonCenter_1F_Text_OhThats textcolor 3 playfanfare MUS_ME_WAZA - message Text_1A198D + message OneIsland_PokemonCenter_1F_Text_HandedRubyToCelio waitmessage waitfanfare call EventScript_1A6675 closemessage - applymovement 3, Movement_171142 + applymovement LOCALID_CELIO, OneIsland_PokemonCenter_1F_Movement_CelioPutGemInMachine waitmovement 0 playse SE_TK_KASYA - call EventScript_170C22 + call OneIsland_PokemonCenter_1F_EventScript_SetRubyMetatile special DrawWholeMapView delay 30 - applymovement 3, Movement_FacePlayer + applymovement LOCALID_CELIO, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_81A19AA, MSGBOX_YESNO + msgbox OneIsland_PokemonCenter_1F_Text_MayIAskOneMoreFavor, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_171099 - goto EventScript_1710B2 + goto_if_eq OneIsland_PokemonCenter_1F_EventScript_DeclineHelpCelio + goto OneIsland_PokemonCenter_1F_EventScript_GiveRainbowPass end -EventScript_171099:: @ 8171099 - msgbox gUnknown_81A1A08, MSGBOX_YESNO +OneIsland_PokemonCenter_1F_EventScript_DeclineHelpCelio:: @ 8171099 + msgbox OneIsland_PokemonCenter_1F_Text_PleaseINeedYourHelp, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_171099 - goto EventScript_1710B2 + goto_if_eq OneIsland_PokemonCenter_1F_EventScript_DeclineHelpCelio + goto OneIsland_PokemonCenter_1F_EventScript_GiveRainbowPass end -EventScript_1710B2:: @ 81710B2 - msgbox gUnknown_81A1A3F +OneIsland_PokemonCenter_1F_EventScript_GiveRainbowPass:: @ 81710B2 + msgbox OneIsland_PokemonCenter_1F_Text_AnotherGemstoneInSeviiIslands removeitem ITEM_RUBY, 1 removeitem ITEM_TRI_PASS, 1 setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 @@ -337,47 +342,47 @@ EventScript_1710B2:: @ 81710B2 setflag FLAG_SYS_SEVII_MAP_4567 textcolor 3 playfanfare MUS_FAN5 - message Text_1A1B56 + message OneIsland_PokemonCenter_1F_Text_ReturnedTriPassForRainbowPass waitmessage waitfanfare playfanfare MUS_FAN5 - message Text_1A1B8E + message OneIsland_PokemonCenter_1F_Text_ObtainedExtraMapPage waitmessage waitfanfare call EventScript_1A6675 - goto EventScript_17103A + goto OneIsland_PokemonCenter_1F_EventScript_ExplainRainbowPass end -EventScript_1710F2:: @ 81710F2 - msgbox gUnknown_81A1896 +OneIsland_PokemonCenter_1F_EventScript_CelioWaitingForRuby:: @ 81710F2 + msgbox OneIsland_PokemonCenter_1F_Text_TryingToFindGem release end -EventScript_1710FC:: @ 81710FC - msgbox gUnknown_81A169B - applymovement 3, Movement_WalkInPlaceFastestUp +OneIsland_PokemonCenter_1F_EventScript_CelioRequestRuby:: @ 81710FC + msgbox OneIsland_PokemonCenter_1F_Text_CelioCaughtMoreMonMaybeICanBeUseful + applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox gUnknown_81A1723 - applymovement 3, Movement_FacePlayer + msgbox OneIsland_PokemonCenter_1F_Text_YoullBeTradingFromTrainersFarAway + applymovement LOCALID_CELIO, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_81A17DF + msgbox OneIsland_PokemonCenter_1F_Text_NeedsSpecialGemstone setvar VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 1 setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 release end -EventScript_171134:: @ 8171134 - msgbox gUnknown_81A15EC +OneIsland_PokemonCenter_1F_EventScript_CelioPlayerMissingNationalDex:: @ 8171134 + msgbox OneIsland_PokemonCenter_1F_Text_CelioImModifyingMyNetworkMachine release end -Movement_17113E:: @ 817113E +OneIsland_PokemonCenter_1F_Movement_CelioCheckMachine:: @ 817113E walk_in_place_up delay_8 walk_in_place_up step_end -Movement_171142:: @ 8171142 +OneIsland_PokemonCenter_1F_Movement_CelioPutGemInMachine:: @ 8171142 walk_in_place_fastest_up walk_in_place_up delay_16 @@ -385,116 +390,116 @@ Movement_171142:: @ 8171142 walk_in_place_up step_end -OneIsland_PokemonCenter_1F_EventScript_171148:: @ 8171148 - msgbox gUnknown_81A20D5, MSGBOX_NPC +OneIsland_PokemonCenter_1F_EventScript_LittleBoy:: @ 8171148 + msgbox OneIsland_PokemonCenter_1F_Text_CameFromPalletDontKnowIt, MSGBOX_NPC end -OneIsland_PokemonCenter_1F_EventScript_171151:: @ 8171151 - msgbox gUnknown_81A212D, MSGBOX_NPC +OneIsland_PokemonCenter_1F_EventScript_Hiker:: @ 8171151 + msgbox OneIsland_PokemonCenter_1F_Text_EnormousVolcanoOnIsland, MSGBOX_NPC end -OneIsland_PokemonCenter_1F_EventScript_17115A:: @ 817115A +OneIsland_PokemonCenter_1F_EventScript_BattleGirl:: @ 817115A lock faceplayer - goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_17116F - msgbox gUnknown_81A218D + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, OneIsland_PokemonCenter_1F_EventScript_BattleGirlHoennLinked + msgbox OneIsland_PokemonCenter_1F_Text_WishICouldTradeWithBoyfriend release end -EventScript_17116F:: @ 817116F - msgbox gUnknown_81A21D0 +OneIsland_PokemonCenter_1F_EventScript_BattleGirlHoennLinked:: @ 817116F + msgbox OneIsland_PokemonCenter_1F_Text_TradedWithFarAwayBoyfriend release end -OneIsland_PokemonCenter_1F_EventScript_171179:: @ 8171179 +OneIsland_PokemonCenter_1F_EventScript_NetworkMachine:: @ 8171179 lockall - goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_1711A0 - goto_if_set FLAG_SEVII_DETOUR_FINISHED, EventScript_171196 - msgbox gUnknown_81A223F + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, OneIsland_PokemonCenter_1F_EventScript_NetworkMachineLinkedWithHoenn + goto_if_set FLAG_SEVII_DETOUR_FINISHED, OneIsland_PokemonCenter_1F_EventScript_NetworkMachineLinkedWithKanto + msgbox OneIsland_PokemonCenter_1F_Text_MachineUnderAdjustment releaseall end -EventScript_171196:: @ 8171196 - msgbox gUnknown_81A2286 +OneIsland_PokemonCenter_1F_EventScript_NetworkMachineLinkedWithKanto:: @ 8171196 + msgbox OneIsland_PokemonCenter_1F_Text_MachineLinkedWithKanto releaseall end -EventScript_1711A0:: @ 81711A0 - msgbox gUnknown_81A22CB +OneIsland_PokemonCenter_1F_EventScript_NetworkMachineLinkedWithHoenn:: @ 81711A0 + msgbox OneIsland_PokemonCenter_1F_Text_MachineLinkedWithKantoAndHoenn releaseall end -OneIsland_PokemonCenter_1F_EventScript_1711AA:: @ 81711AA +OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerTop:: @ 81711AA lockall setvar VAR_TEMP_1, 1 - goto EventScript_1711DA + goto OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene end -OneIsland_PokemonCenter_1F_EventScript_1711B6:: @ 81711B6 +OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerMidTop:: @ 81711B6 lockall setvar VAR_TEMP_1, 2 - goto EventScript_1711DA + goto OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene end -OneIsland_PokemonCenter_1F_EventScript_1711C2:: @ 81711C2 +OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerMidBottom:: @ 81711C2 lockall setvar VAR_TEMP_1, 3 - goto EventScript_1711DA + goto OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene end -OneIsland_PokemonCenter_1F_EventScript_1711CE:: @ 81711CE +OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerBottom:: @ 81711CE lockall setvar VAR_TEMP_1, 4 - goto EventScript_1711DA + goto OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene end -EventScript_1711DA:: @ 81711DA +OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene:: @ 81711DA textcolor 0 playse SE_PIN - applymovement 2, Movement_ExclamationMark + applymovement LOCALID_BILL, Movement_ExclamationMark waitmovement 0 - msgbox gUnknown_81A13B8 + msgbox OneIsland_PokemonCenter_1F_Text_BillOhHeyPlayer closemessage compare VAR_TEMP_1, 1 - call_if_eq EventScript_1712E4 + call_if_eq OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillTop compare VAR_TEMP_1, 2 - call_if_eq EventScript_1712EF + call_if_eq OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillMidTop compare VAR_TEMP_1, 3 - call_if_eq EventScript_1712FA + call_if_eq OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillMidBottom compare VAR_TEMP_1, 4 - call_if_eq EventScript_171305 + call_if_eq OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillBottom delay 10 - msgbox gUnknown_81A13CB + msgbox OneIsland_PokemonCenter_1F_Text_BillWeGotItDone applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox gUnknown_81A1431 - applymovement 2, Movement_WalkInPlaceFastestDown + msgbox OneIsland_PokemonCenter_1F_Text_CelioJobWentQuick + applymovement LOCALID_BILL, Movement_WalkInPlaceFastestDown waitmovement 0 - applymovement 3, Movement_WalkInPlaceFastestUp + applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox gUnknown_81A1470 - msgbox gUnknown_81A14E1 + msgbox OneIsland_PokemonCenter_1F_Text_BillYouveLearnedALot + msgbox OneIsland_PokemonCenter_1F_Text_CelioOhReallyEhehe closemessage - applymovement 2, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_BILL, Movement_WalkInPlaceFastestLeft waitmovement 0 delay 10 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 delay 15 - msgbox gUnknown_81A14FB + msgbox OneIsland_PokemonCenter_1F_Text_BillWeShouldHeadBackToKanto closemessage - applymovement 2, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BILL, Movement_WalkInPlaceFastestDown waitmovement 0 delay 15 - applymovement 3, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox gUnknown_81A1574 + msgbox OneIsland_PokemonCenter_1F_Text_CelioPromiseIllShowYouAroundSometime closemessage delay 25 - applymovement OBJ_EVENT_ID_PLAYER, Movement_171326 - applymovement 2, Movement_17132D + applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerExit + applymovement LOCALID_BILL, OneIsland_PokemonCenter_1F_Movement_BillExit waitmovement 0 playse SE_KAIDAN setflag FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL @@ -506,49 +511,50 @@ EventScript_1711DA:: @ 81711DA goto EventScript_SetSail end -EventScript_1712E4:: @ 81712E4 - applymovement OBJ_EVENT_ID_PLAYER, Movement_171310 +OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillTop:: @ 81712E4 + applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillTop waitmovement 0 return -EventScript_1712EF:: @ 81712EF - applymovement OBJ_EVENT_ID_PLAYER, Movement_171314 +OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillMidTop:: @ 81712EF + applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidTop waitmovement 0 return -EventScript_1712FA:: @ 81712FA - applymovement OBJ_EVENT_ID_PLAYER, Movement_171316 +OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillMidBottom:: @ 81712FA + applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidBottom waitmovement 0 return -EventScript_171305:: @ 8171305 - applymovement OBJ_EVENT_ID_PLAYER, Movement_17131A +OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillBottom:: @ 8171305 + applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillBottom waitmovement 0 return -Movement_171310:: @ 8171310 +OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillTop:: @ 8171310 walk_right walk_down walk_in_place_fastest_right step_end -Movement_171314:: @ 8171314 +OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidTop:: @ 8171314 walk_right step_end -Movement_171316:: @ 8171316 +OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidBottom:: @ 8171316 walk_right walk_up walk_in_place_fastest_right step_end -Movement_17131A:: @ 817131A +OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillBottom:: @ 817131A walk_right walk_up walk_up walk_in_place_fastest_right step_end +@ Unused Movement_17131F:: @ 817131F delay_16 delay_16 @@ -556,11 +562,12 @@ Movement_17131F:: @ 817131F walk_in_place_fastest_left step_end +@ Unused Movement_171324:: @ 8171324 walk_in_place_fast_down step_end -Movement_171326:: @ 8171326 +OneIsland_PokemonCenter_1F_Movement_PlayerExit:: @ 8171326 walk_left walk_left walk_left @@ -569,7 +576,7 @@ Movement_171326:: @ 8171326 walk_down step_end -Movement_17132D:: @ 817132D +OneIsland_PokemonCenter_1F_Movement_BillExit:: @ 817132D walk_left walk_left walk_left diff --git a/data/maps/OneIsland_PokemonCenter_1F/text.inc b/data/maps/OneIsland_PokemonCenter_1F/text.inc index e2d6c7fed..278a1cc44 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/text.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/text.inc @@ -1,52 +1,52 @@ -gUnknown_81A0CDE:: @ 81A0CDE +OneIsland_PokemonCenter_1F_Text_BillHeyThereCelio:: @ 81A0CDE .string "BILL: Hey, there!\n" .string "CELIO!$" -gUnknown_81A0CF7:: @ 81A0CF7 +OneIsland_PokemonCenter_1F_Text_CelioCantBelieveYouCameOut:: @ 81A0CF7 .string "CELIO: BILL!\n" .string "I can't believe you came out here.$" -gUnknown_81A0D27:: @ 81A0D27 +OneIsland_PokemonCenter_1F_Text_BillHowsYourResearchComing:: @ 81A0D27 .string "BILL: Well, absolutely!\n" .string "How's your research coming along?\p" .string "…Oh, wait a sec.$" -gUnknown_81A0D72:: @ 81A0D72 +OneIsland_PokemonCenter_1F_Text_ThisIsMyBuddyCelio:: @ 81A0D72 .string "{PLAYER}, this is my buddy CELIO.\n" .string "He's one dedicated PC MANIAC!$" -gUnknown_81A0DAC:: @ 81A0DAC +OneIsland_PokemonCenter_1F_Text_PlayerIsRisingPokemonChamp:: @ 81A0DAC .string "CELIO, this is {PLAYER}, a rising\n" .string "contender as the POKéMON CHAMP!$" -gUnknown_81A0DE8:: @ 81A0DE8 +OneIsland_PokemonCenter_1F_Text_PlayerIsReigningPokemonChamp:: @ 81A0DE8 .string "CELIO, this is {PLAYER}, the\n" .string "reigning POKéMON CHAMP!$" -gUnknown_81A0E17:: @ 81A0E17 +OneIsland_PokemonCenter_1F_Text_CelioThatsReallyImpressive:: @ 81A0E17 .string "CELIO: That's really impressive.\p" .string "I hate to say it, but I have zero\n" .string "aptitude for battling.\p" .string "Anyways, I'm glad to meet you.$" -gUnknown_81A0E90:: @ 81A0E90 +OneIsland_PokemonCenter_1F_Text_BillBringMeUpToSpeed:: @ 81A0E90 .string "BILL: So, bring me up to speed.\n" .string "How's your machine running?$" -gUnknown_81A0ECC:: @ 81A0ECC +OneIsland_PokemonCenter_1F_Text_CelioPCsCantLinkWithYours:: @ 81A0ECC .string "CELIO: It's running fine, but we're\n" .string "too remote out here.\p" .string "The PCs on this island just can't\n" .string "link with your PC, BILL.$" -gUnknown_81A0F40:: @ 81A0F40 +OneIsland_PokemonCenter_1F_Text_BillLetMeHelpYou:: @ 81A0F40 .string "BILL: Oh, yeah?\n" .string "Okay, let me take a look-see.\p" .string "…Hang on here…\n" .string "I think we can make it work.\l" .string "Let me help you, okay?$" -gUnknown_81A0FB1:: @ 81A0FB1 +OneIsland_PokemonCenter_1F_Text_CanYouDeliverThisMeteoritePlayer:: @ 81A0FB1 .string "{PLAYER}, can I get you to wait for\n" .string "me just a bit?\p" .string "…Actually, can I get you to do\n" @@ -62,38 +62,38 @@ gUnknown_81A0FB1:: @ 81A0FB1 .string "So, can I get you to deliver this\n" .string "METEORITE to him?$" -gUnknown_81A10EE:: @ 81A10EE +OneIsland_PokemonCenter_1F_Text_AcceptedMeteoriteFromBill:: @ 81A10EE .string "{PLAYER} accepted the METEORITE\n" .string "from BILL.$" -gUnknown_81A1113:: @ 81A1113 +OneIsland_PokemonCenter_1F_Text_CelioPleaseTakeThis:: @ 81A1113 .string "CELIO: {PLAYER}, if you are going\n" .string "to TWO ISLAND, please take this.$" -gUnknown_81A1150:: @ 81A1150 +OneIsland_PokemonCenter_1F_Text_PassLetsYouTravelBetweenIslands:: @ 81A1150 .string "It's a PASS for the ferry service\n" .string "serving the local islands.\p" .string "It will let you travel between the\n" .string "ISLANDS ONE, TWO, and THREE.\p" .string "Oh, you should have this, too.$" -Text_1A11EC:: @ 81A11EC +OneIsland_PokemonCenter_1F_Text_ReceivedExtraPageForTownMap:: @ 81A11EC .string "{PLAYER} received an extra page\n" .string "for the TOWN MAP!$" -gUnknown_81A1218:: @ 81A1218 +OneIsland_PokemonCenter_1F_Text_ReceivedTownMap:: @ 81A1218 .string "{PLAYER} received\n" .string "a TOWN MAP!$" -gUnknown_81A1230:: @ 81A1230 +OneIsland_PokemonCenter_1F_Text_BillCatchYouLater:: @ 81A1230 .string "BILL: I'll catch you later!\n" .string "Say hi to the guy for me!$" -gUnknown_81A1266:: @ 81A1266 +OneIsland_PokemonCenter_1F_Text_HmmHowAboutLikeThis:: @ 81A1266 .string "Hmm…\p" .string "How about we try this like this…$" -gUnknown_81A128C:: @ 81A128C +OneIsland_PokemonCenter_1F_Text_GotPCWorkingStrollAWhileMore:: @ 81A128C .string "Oh, hey, {PLAYER}!\p" .string "Did you see?\n" .string "We got the PC working!\p" @@ -102,54 +102,54 @@ gUnknown_81A128C:: @ 81A128C .string "Can you go out on a stroll or\n" .string "something for a while more?$" -gUnknown_81A1321:: @ 81A1321 +OneIsland_PokemonCenter_1F_Text_SorryForBeingPoorHost:: @ 81A1321 .string "I'm sorry for taking up so much of\n" .string "BILL's time.\p" .string "I'm also sorry for being such a \n" .string "poor host on your visit here.$" -Text_UsualPCServicesUnavailable:: @ 81A1390 +OneIsland_PokemonCenter_1F_Text_UsualPCServicesUnavailable:: @ 81A1390 .string "The usual PC services aren't\n" .string "available…$" -gUnknown_81A13B8:: @ 81A13B8 +OneIsland_PokemonCenter_1F_Text_BillOhHeyPlayer:: @ 81A13B8 .string "BILL: Oh, hey!\n" .string "{PLAYER}!$" -gUnknown_81A13CB:: @ 81A13CB +OneIsland_PokemonCenter_1F_Text_BillWeGotItDone:: @ 81A13CB .string "BILL: What kept you so long?\n" .string "Been out having a good time?\p" .string "We got it done.\n" .string "The PCs are up and running!$" -gUnknown_81A1431:: @ 81A1431 +OneIsland_PokemonCenter_1F_Text_CelioJobWentQuick:: @ 81A1431 .string "CELIO: The job went incredibly\n" .string "quick.\p" .string "BILL is one amazing guy…$" -gUnknown_81A1470:: @ 81A1470 +OneIsland_PokemonCenter_1F_Text_BillYouveLearnedALot:: @ 81A1470 .string "BILL: No, no! There was almost\n" .string "nothing left for me to do.\p" .string "CELIO, I have to hand it to you.\n" .string "You've learned a lot.$" -gUnknown_81A14E1:: @ 81A14E1 +OneIsland_PokemonCenter_1F_Text_CelioOhReallyEhehe:: @ 81A14E1 .string "CELIO: Oh, really?\n" .string "Ehehe…$" -gUnknown_81A14FB:: @ 81A14FB +OneIsland_PokemonCenter_1F_Text_BillWeShouldHeadBackToKanto:: @ 81A14FB .string "BILL: Well, there you have it.\n" .string "I'm finished with the job.\l" .string "We should head back to KANTO.\p" .string "CELIO, I'll be seeing you again.$" -gUnknown_81A1574:: @ 81A1574 +OneIsland_PokemonCenter_1F_Text_CelioPromiseIllShowYouAroundSometime:: @ 81A1574 .string "CELIO: {PLAYER}, I'm really sorry\n" .string "that we sent you off alone today.\p" .string "I promise, I will show you around\n" .string "these islands sometime.$" -gUnknown_81A15EC:: @ 81A15EC +OneIsland_PokemonCenter_1F_Text_CelioImModifyingMyNetworkMachine:: @ 81A15EC .string "CELIO: Hello!\n" .string "You look awfully busy as always.\p" .string "How am I doing?\p" @@ -159,7 +159,7 @@ gUnknown_81A15EC:: @ 81A15EC .string "I hope you'll be first to use it,\l" .string "{PLAYER}.$" -gUnknown_81A169B:: @ 81A169B +OneIsland_PokemonCenter_1F_Text_CelioCaughtMoreMonMaybeICanBeUseful:: @ 81A169B .string "CELIO: {PLAYER}, how have things\n" .string "been for you?\p" .string "Oh, is that right?\n" @@ -167,7 +167,7 @@ gUnknown_81A169B:: @ 81A169B .string "Do you know what?\n" .string "Maybe I can be useful to you.$" -gUnknown_81A1723:: @ 81A1723 +OneIsland_PokemonCenter_1F_Text_YoullBeTradingFromTrainersFarAway:: @ 81A1723 .string "I'm modifying the Network Machine\n" .string "right now.\p" .string "I'm changing it so it can handle\n" @@ -176,7 +176,7 @@ gUnknown_81A1723:: @ 81A1723 .string "trading for exotic POKéMON from\l" .string "TRAINERS far away.$" -gUnknown_81A17DF:: @ 81A17DF +OneIsland_PokemonCenter_1F_Text_NeedsSpecialGemstone:: @ 81A17DF .string "But, there is a slight catch.\p" .string "For the link to work, the Machine\n" .string "needs a special gemstone.\p" @@ -184,7 +184,7 @@ gUnknown_81A17DF:: @ 81A17DF .string "but I haven't found one yet.\p" .string "Who knows where it could be.$" -gUnknown_81A1896:: @ 81A1896 +OneIsland_PokemonCenter_1F_Text_TryingToFindGem:: @ 81A1896 .string "I was trying to find the gem\n" .string "even while I was studying.\p" .string "As a result, I've made no headway\n" @@ -194,26 +194,26 @@ gUnknown_81A1896:: @ 81A1896 .string "But this time, I want to try to do\n" .string "things by myself.$" -gUnknown_81A197E:: @ 81A197E +OneIsland_PokemonCenter_1F_Text_OhThats:: @ 81A197E .string "Oh!\n" .string "Th-that's…$" -Text_1A198D:: @ 81A198D +OneIsland_PokemonCenter_1F_Text_HandedRubyToCelio:: @ 81A198D .string "{PLAYER} handed the RUBY\n" .string "to CELIO.$" -gUnknown_81A19AA:: @ 81A19AA +OneIsland_PokemonCenter_1F_Text_MayIAskOneMoreFavor:: @ 81A19AA .string "Thank you!\n" .string "{PLAYER}, you're simply amazing.\p" .string "… … … … … …\p" .string "Um… May I ask one more giant favor\n" .string "of you?$" -gUnknown_81A1A08:: @ 81A1A08 +OneIsland_PokemonCenter_1F_Text_PleaseINeedYourHelp:: @ 81A1A08 .string "It… It's not anything weird.\n" .string "Please, I need your help.$" -gUnknown_81A1A3F:: @ 81A1A3F +OneIsland_PokemonCenter_1F_Text_AnotherGemstoneInSeviiIslands:: @ 81A1A3F .string "While I was studying gemstones,\n" .string "I discovered something important.\p" .string "There is another gem that forms\n" @@ -225,26 +225,26 @@ gUnknown_81A1A3F:: @ 81A1A3F .string "{PLAYER}, may I have your ferry\n" .string "PASS and the TOWN MAP?$" -Text_1A1B56:: @ 81A1B56 +OneIsland_PokemonCenter_1F_Text_ReturnedTriPassForRainbowPass:: @ 81A1B56 .string "{PLAYER} returned the TRI-PASS and\n" .string "received the RAINBOW PASS.$" -Text_1A1B8E:: @ 81A1B8E +OneIsland_PokemonCenter_1F_Text_ObtainedExtraMapPage:: @ 81A1B8E .string "Obtained an extra page for the\n" .string "TOWN MAP!$" -gUnknown_81A1BB7:: @ 81A1BB7 +OneIsland_PokemonCenter_1F_Text_PassLetYouGetToAllIslands:: @ 81A1BB7 .string "This is my own ferry PASS.\p" .string "It will let you get to all the\n" .string "SEVII ISLANDS.\p" .string "{PLAYER}, please, I can't do\n" .string "it without your help.$" -Text_1A1C2D:: @ 81A1C2D +OneIsland_PokemonCenter_1F_Text_HandedSapphireToCelio:: @ 81A1C2D .string "{PLAYER} handed the SAPPHIRE\n" .string "to CELIO.$" -gUnknown_81A1C4E:: @ 81A1C4E +OneIsland_PokemonCenter_1F_Text_ThankYouGiveMeTime:: @ 81A1C4E .string "CELIO: So this is the gem that\n" .string "forms a pair with the RUBY…\p" .string "{PLAYER}, you've gone through a lot\n" @@ -255,14 +255,14 @@ gUnknown_81A1C4E:: @ 81A1C4E .string "Now it's my turn to work for you!\n" .string "Please give me a little time.$" -gUnknown_81A1D45:: @ 81A1D45 +OneIsland_PokemonCenter_1F_Text_OkayThisIsGood:: @ 81A1D45 .string "Okay, this is good…$" -gUnknown_81A1D59:: @ 81A1D59 +OneIsland_PokemonCenter_1F_Text_LinkedUpWithLanette:: @ 81A1D59 .string "I did it!\n" .string "I linked up with LANETTE!$" -gUnknown_81A1D7D:: @ 81A1D7D +OneIsland_PokemonCenter_1F_Text_ManagedToLinkWithHoennThankYou:: @ 81A1D7D .string "{PLAYER}…\n" .string "{PLAYER}, I did it!\p" .string "I've managed to link up with\n" @@ -273,7 +273,7 @@ gUnknown_81A1D7D:: @ 81A1D7D .string "Thanks to you, my dream came\n" .string "true…$" -gUnknown_81A1E39:: @ 81A1E39 +OneIsland_PokemonCenter_1F_Text_WishYouBestOfLuck:: @ 81A1E39 .string "I…\n" .string "I'm not crying.\p" .string "That's enough about me!\p" @@ -281,12 +281,12 @@ gUnknown_81A1E39:: @ 81A1E39 .string "looking for exotic POKéMON, right?\p" .string "I wish you the best of luck!$" -gUnknown_81A1EBD:: @ 81A1EBD +OneIsland_PokemonCenter_1F_Text_CelioHearingRumorsAboutYou:: @ 81A1EBD .string "CELIO: Hello!\p" .string "{PLAYER}, I've been hearing rumors\n" .string "about you.$" -gUnknown_81A1EF3:: @ 81A1EF3 +OneIsland_PokemonCenter_1F_Text_BillsFirstMonWasAbra:: @ 81A1EF3 .string "{PLAYER}, what's your favorite kind\n" .string "of POKéMON?\p" .string "BILL is a POKéMANIAC, so he loves\n" @@ -294,7 +294,7 @@ gUnknown_81A1EF3:: @ 81A1EF3 .string "Apparently, the first one he caught\n" .string "was an ABRA.$" -gUnknown_81A1F7C:: @ 81A1F7C +OneIsland_PokemonCenter_1F_Text_BillsHometownInGoldenrod:: @ 81A1F7C .string "By the way, {PLAYER}, you're from\n" .string "PALLET TOWN, aren't you?\p" .string "I've heard that it's a quiet and\n" @@ -305,53 +305,53 @@ gUnknown_81A1F7C:: @ 81A1F7C .string "festive, bustling city.\p" .string "I'd like to go there one day.$" -gUnknown_81A2076:: @ 81A2076 +OneIsland_PokemonCenter_1F_Text_BillCantStomachMilk:: @ 81A2076 .string "{PLAYER}, is there anything that\n" .string "you can't stand?\p" .string "Apparently, BILL simply can't\n" .string "stomach milk at all.$" -gUnknown_81A20D5:: @ 81A20D5 +OneIsland_PokemonCenter_1F_Text_CameFromPalletDontKnowIt:: @ 81A20D5 .string "Oh, you're a stranger here!\n" .string "Hi! Where did you come from?\p" .string "…PALLET TOWN?\n" .string "I don't know it!$" -gUnknown_81A212D:: @ 81A212D +OneIsland_PokemonCenter_1F_Text_EnormousVolcanoOnIsland:: @ 81A212D .string "On this island, there's an enormous\n" .string "volcano.\p" .string "It hasn't erupted lately, so why\n" .string "not enjoy a hike?$" -gUnknown_81A218D:: @ 81A218D +OneIsland_PokemonCenter_1F_Text_WishICouldTradeWithBoyfriend:: @ 81A218D .string "I wish I could trade POKéMON with\n" .string "my boyfriend who lives far away…$" -gUnknown_81A21D0:: @ 81A21D0 +OneIsland_PokemonCenter_1F_Text_TradedWithFarAwayBoyfriend:: @ 81A21D0 .string "I traded POKéMON with my boyfriend\n" .string "far away!\p" .string "Everyone's saying that we can\n" .string "thank you and CELIO.\p" .string "So, thank you!$" -gUnknown_81A223F:: @ 81A223F +OneIsland_PokemonCenter_1F_Text_MachineUnderAdjustment:: @ 81A223F .string "Network Machine\n" .string "Link Level 0\p" .string "…POKéMON Storage System under\n" .string "adjustment…$" -gUnknown_81A2286:: @ 81A2286 +OneIsland_PokemonCenter_1F_Text_MachineLinkedWithKanto:: @ 81A2286 .string "Network Machine\n" .string "Link Level 1\p" .string "Link established with the KANTO\n" .string "region.$" -gUnknown_81A22CB:: @ 81A22CB +OneIsland_PokemonCenter_1F_Text_MachineLinkedWithKantoAndHoenn:: @ 81A22CB .string "Network Machine\n" .string "Link Level 2\p" .string "Link established with the KANTO\n" .string "and HOENN regions.$" -gUnknown_81A231B:: @ 81A231B +OneIsland_PokemonCenter_1F_Text_ObtainedTriPass:: @ 81A231B .string "Obtained the TRI-PASS!$" diff --git a/data/maps/OneIsland_TreasureBeach/map.json b/data/maps/OneIsland_TreasureBeach/map.json index 33eaf4781..b95513e7a 100644 --- a/data/maps/OneIsland_TreasureBeach/map.json +++ b/data/maps/OneIsland_TreasureBeach/map.json @@ -31,7 +31,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "OneIsland_TreasureBeach_EventScript_1ABF27", + "script": "OneIsland_TreasureBeach_EventScript_Amara", "flag": "0" }, { @@ -44,7 +44,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_TreasureBeach_EventScript_16876C", + "script": "OneIsland_TreasureBeach_EventScript_Boy", "flag": "0" } ], diff --git a/data/maps/OneIsland_TreasureBeach/scripts.inc b/data/maps/OneIsland_TreasureBeach/scripts.inc index a49a763a1..137c8103e 100644 --- a/data/maps/OneIsland_TreasureBeach/scripts.inc +++ b/data/maps/OneIsland_TreasureBeach/scripts.inc @@ -1,6 +1,6 @@ OneIsland_TreasureBeach_MapScripts:: @ 816876B .byte 0 -OneIsland_TreasureBeach_EventScript_16876C:: @ 816876C - msgbox gUnknown_8189DCE, MSGBOX_NPC +OneIsland_TreasureBeach_EventScript_Boy:: @ 816876C + msgbox OneIsland_TreasureBeach_Text_GoodThingsWashUpOnBeach, MSGBOX_NPC end diff --git a/data/maps/OneIsland_TreasureBeach/text.inc b/data/maps/OneIsland_TreasureBeach/text.inc index 344ed5203..30ed2b0bb 100644 --- a/data/maps/OneIsland_TreasureBeach/text.inc +++ b/data/maps/OneIsland_TreasureBeach/text.inc @@ -1,16 +1,16 @@ -Text_189D5A:: @ 8189D5A +OneIsland_TreasureBeach_Text_AmaraIntro:: @ 8189D5A .string "Lying back, rocked by the waves…\n" .string "It's exquisite.$" -Text_189D8B:: @ 8189D8B +OneIsland_TreasureBeach_Text_AmaraDefeat:: @ 8189D8B .string "I lost…\n" .string "It feels awful.$" -Text_189DA3:: @ 8189DA3 +OneIsland_TreasureBeach_Text_AmaraPostBattle:: @ 8189DA3 .string "The sea is pleasantly warm in these\n" .string "parts.$" -gUnknown_8189DCE:: @ 8189DCE +OneIsland_TreasureBeach_Text_GoodThingsWashUpOnBeach:: @ 8189DCE .string "Good things get washed up by the\n" .string "ocean current onto this beach.\p" .string "That's why I often come here for\n" diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc index 6e266bdfc..8faee89a1 100644 --- a/data/scripts/pc.inc +++ b/data/scripts/pc.inc @@ -11,8 +11,9 @@ EventScript_PC:: @ 81A6955 goto EventScript_PCMainMenu end +@ For when the player first arrives on One Island EventScript_PCDisabled:: @ 81A698E - msgbox Text_UsualPCServicesUnavailable + msgbox OneIsland_PokemonCenter_1F_Text_UsualPCServicesUnavailable releaseall end diff --git a/data/scripts/trainers.inc b/data/scripts/trainers.inc index 3d5f60008..05d17b454 100644 --- a/data/scripts/trainers.inc +++ b/data/scripts/trainers.inc @@ -2130,186 +2130,186 @@ EventScript_1ABBD6:: @ 81ABBD6 msgbox Text_188812, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_1ABBF1:: @ 81ABBF1 - trainerbattle_single TRAINER_SWIMMER_FEMALE_MARIA, Text_18961F, Text_18964D +OneIsland_KindleRoad_EventScript_Maria:: @ 81ABBF1 + trainerbattle_single TRAINER_SWIMMER_FEMALE_MARIA, OneIsland_KindleRoad_Text_MariaIntro, OneIsland_KindleRoad_Text_MariaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABC18 - msgbox Text_189657, MSGBOX_AUTOCLOSE + goto_if_eq OneIsland_KindleRoad_EventScript_MariaRematch + msgbox OneIsland_KindleRoad_Text_MariaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABC18:: @ 81ABC18 - trainerbattle_rematch TRAINER_SWIMMER_FEMALE_MARIA, Text_1C37B5, Text_18964D - msgbox Text_189657, MSGBOX_AUTOCLOSE +OneIsland_KindleRoad_EventScript_MariaRematch:: @ 81ABC18 + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_MARIA, OneIsland_KindleRoad_Text_MariaRematchIntro, OneIsland_KindleRoad_Text_MariaDefeat + msgbox OneIsland_KindleRoad_Text_MariaPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_1ABC2F:: @ 81ABC2F - trainerbattle_single TRAINER_SWIMMER_FEMALE_ABIGAIL, Text_18968C, Text_1896AC +OneIsland_KindleRoad_EventScript_Abigail:: @ 81ABC2F + trainerbattle_single TRAINER_SWIMMER_FEMALE_ABIGAIL, OneIsland_KindleRoad_Text_AbigailIntro, OneIsland_KindleRoad_Text_AbigailDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABC56 - msgbox Text_1896C1, MSGBOX_AUTOCLOSE + goto_if_eq OneIsland_KindleRoad_EventScript_AbigailRematch + msgbox OneIsland_KindleRoad_Text_AbigailPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABC56:: @ 81ABC56 - trainerbattle_rematch TRAINER_SWIMMER_FEMALE_ABIGAIL, Text_1C37E7, Text_1896AC - msgbox Text_1896C1, MSGBOX_AUTOCLOSE +OneIsland_KindleRoad_EventScript_AbigailRematch:: @ 81ABC56 + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_ABIGAIL, OneIsland_KindleRoad_Text_AbigailRematchIntro, OneIsland_KindleRoad_Text_AbigailDefeat + msgbox OneIsland_KindleRoad_Text_AbigailPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_1ABC6D:: @ 81ABC6D - trainerbattle_single TRAINER_SWIMMER_MALE_FINN, Text_1896F9, Text_189728 +OneIsland_KindleRoad_EventScript_Finn:: @ 81ABC6D + trainerbattle_single TRAINER_SWIMMER_MALE_FINN, OneIsland_KindleRoad_Text_FinnIntro, OneIsland_KindleRoad_Text_FinnDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABC94 - msgbox Text_189740, MSGBOX_AUTOCLOSE + goto_if_eq OneIsland_KindleRoad_EventScript_FinnRematch + msgbox OneIsland_KindleRoad_Text_FinnPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABC94:: @ 81ABC94 - trainerbattle_rematch TRAINER_SWIMMER_MALE_FINN, Text_1C3807, Text_189728 - msgbox Text_189740, MSGBOX_AUTOCLOSE +OneIsland_KindleRoad_EventScript_FinnRematch:: @ 81ABC94 + trainerbattle_rematch TRAINER_SWIMMER_MALE_FINN, OneIsland_KindleRoad_Text_FinnRematchIntro, OneIsland_KindleRoad_Text_FinnDefeat + msgbox OneIsland_KindleRoad_Text_FinnPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_1ABCAB:: @ 81ABCAB - trainerbattle_single TRAINER_SWIMMER_MALE_GARRETT, Text_189767, Text_1897A4 +OneIsland_KindleRoad_EventScript_Garrett:: @ 81ABCAB + trainerbattle_single TRAINER_SWIMMER_MALE_GARRETT, OneIsland_KindleRoad_Text_GarrettIntro, OneIsland_KindleRoad_Text_GarrettDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABCD2 - msgbox Text_1897C5, MSGBOX_AUTOCLOSE + goto_if_eq OneIsland_KindleRoad_EventScript_GarrettRematch + msgbox OneIsland_KindleRoad_Text_GarrettPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABCD2:: @ 81ABCD2 - trainerbattle_rematch TRAINER_SWIMMER_MALE_GARRETT, Text_1C3835, Text_1897A4 - msgbox Text_1897C5, MSGBOX_AUTOCLOSE +OneIsland_KindleRoad_EventScript_GarrettRematch:: @ 81ABCD2 + trainerbattle_rematch TRAINER_SWIMMER_MALE_GARRETT, OneIsland_KindleRoad_Text_GarrettRematchIntro, OneIsland_KindleRoad_Text_GarrettDefeat + msgbox OneIsland_KindleRoad_Text_GarrettPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_1ABCE9:: @ 81ABCE9 - trainerbattle_single TRAINER_FISHERMAN_TOMMY, Text_1897FF, Text_189833 +OneIsland_KindleRoad_EventScript_Tommy:: @ 81ABCE9 + trainerbattle_single TRAINER_FISHERMAN_TOMMY, OneIsland_KindleRoad_Text_TommyIntro, OneIsland_KindleRoad_Text_TommyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABD10 - msgbox Text_18984B, MSGBOX_AUTOCLOSE + goto_if_eq OneIsland_KindleRoad_EventScript_TommyRematch + msgbox OneIsland_KindleRoad_Text_TommyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABD10:: @ 81ABD10 - trainerbattle_rematch TRAINER_FISHERMAN_TOMMY, Text_1C386A, Text_189833 - msgbox Text_18984B, MSGBOX_AUTOCLOSE +OneIsland_KindleRoad_EventScript_TommyRematch:: @ 81ABD10 + trainerbattle_rematch TRAINER_FISHERMAN_TOMMY, OneIsland_KindleRoad_Text_TommyRematchIntro, OneIsland_KindleRoad_Text_TommyDefeat + msgbox OneIsland_KindleRoad_Text_TommyPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_1ABD27:: @ 81ABD27 - trainerbattle_single TRAINER_CRUSH_GIRL_SHARON, Text_189883, Text_1898AB +OneIsland_KindleRoad_EventScript_Sharon:: @ 81ABD27 + trainerbattle_single TRAINER_CRUSH_GIRL_SHARON, OneIsland_KindleRoad_Text_SharonIntro, OneIsland_KindleRoad_Text_SharonDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABD4E - msgbox Text_1898C4, MSGBOX_AUTOCLOSE + goto_if_eq OneIsland_KindleRoad_EventScript_SharonRematch + msgbox OneIsland_KindleRoad_Text_SharonPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABD4E:: @ 81ABD4E - trainerbattle_rematch TRAINER_CRUSH_GIRL_SHARON, Text_1C389F, Text_1898AB - msgbox Text_1898C4, MSGBOX_AUTOCLOSE +OneIsland_KindleRoad_EventScript_SharonRematch:: @ 81ABD4E + trainerbattle_rematch TRAINER_CRUSH_GIRL_SHARON, OneIsland_KindleRoad_Text_SharonRematchIntro, OneIsland_KindleRoad_Text_SharonDefeat + msgbox OneIsland_KindleRoad_Text_SharonPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_1ABD65:: @ 81ABD65 - trainerbattle_single TRAINER_CRUSH_GIRL_TANYA, Text_1898F0, Text_18991B +OneIsland_KindleRoad_EventScript_Tanya:: @ 81ABD65 + trainerbattle_single TRAINER_CRUSH_GIRL_TANYA, OneIsland_KindleRoad_Text_TanyaIntro, OneIsland_KindleRoad_Text_TanyaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABD8C - msgbox Text_18992C, MSGBOX_AUTOCLOSE + goto_if_eq OneIsland_KindleRoad_EventScript_TanyaRematch + msgbox OneIsland_KindleRoad_Text_TanyaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABD8C:: @ 81ABD8C - trainerbattle_rematch TRAINER_CRUSH_GIRL_TANYA, Text_1C38CA, Text_18991B - msgbox Text_18992C, MSGBOX_AUTOCLOSE +OneIsland_KindleRoad_EventScript_TanyaRematch:: @ 81ABD8C + trainerbattle_rematch TRAINER_CRUSH_GIRL_TANYA, OneIsland_KindleRoad_Text_TanyaRematchIntro, OneIsland_KindleRoad_Text_TanyaDefeat + msgbox OneIsland_KindleRoad_Text_TanyaPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_1ABDA3:: @ 81ABDA3 - trainerbattle_single TRAINER_BLACK_BELT_SHEA, Text_189950, Text_18998C +OneIsland_KindleRoad_EventScript_Shea:: @ 81ABDA3 + trainerbattle_single TRAINER_BLACK_BELT_SHEA, OneIsland_KindleRoad_Text_SheaIntro, OneIsland_KindleRoad_Text_SheaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABDCA - msgbox Text_189998, MSGBOX_AUTOCLOSE + goto_if_eq OneIsland_KindleRoad_EventScript_SheaRematch + msgbox OneIsland_KindleRoad_Text_SheaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABDCA:: @ 81ABDCA - trainerbattle_rematch TRAINER_BLACK_BELT_SHEA, Text_1C38FA, Text_18998C - msgbox Text_189998, MSGBOX_AUTOCLOSE +OneIsland_KindleRoad_EventScript_SheaRematch:: @ 81ABDCA + trainerbattle_rematch TRAINER_BLACK_BELT_SHEA, OneIsland_KindleRoad_Text_SheaRematchIntro, OneIsland_KindleRoad_Text_SheaDefeat + msgbox OneIsland_KindleRoad_Text_SheaPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_1ABDE1:: @ 81ABDE1 - trainerbattle_single TRAINER_BLACK_BELT_HUGH, Text_1899CE, Text_189A0A +OneIsland_KindleRoad_EventScript_Hugh:: @ 81ABDE1 + trainerbattle_single TRAINER_BLACK_BELT_HUGH, OneIsland_KindleRoad_Text_HughIntro, OneIsland_KindleRoad_Text_HughDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABE08 - msgbox Text_189A13, MSGBOX_AUTOCLOSE + goto_if_eq OneIsland_KindleRoad_EventScript_HughRematch + msgbox OneIsland_KindleRoad_Text_HughPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABE08:: @ 81ABE08 - trainerbattle_rematch TRAINER_BLACK_BELT_HUGH, Text_1C3943, Text_189A0A - msgbox Text_189A13, MSGBOX_AUTOCLOSE +OneIsland_KindleRoad_EventScript_HughRematch:: @ 81ABE08 + trainerbattle_rematch TRAINER_BLACK_BELT_HUGH, OneIsland_KindleRoad_Text_HughRematchIntro, OneIsland_KindleRoad_Text_HughDefeat + msgbox OneIsland_KindleRoad_Text_HughPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_1ABE1F:: @ 81ABE1F - trainerbattle_single TRAINER_CAMPER_BRYCE, Text_189A53, Text_189A92 +OneIsland_KindleRoad_EventScript_Bryce:: @ 81ABE1F + trainerbattle_single TRAINER_CAMPER_BRYCE, OneIsland_KindleRoad_Text_BryceIntro, OneIsland_KindleRoad_Text_BryceDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABE46 - msgbox Text_189A9F, MSGBOX_AUTOCLOSE + goto_if_eq OneIsland_KindleRoad_EventScript_BryceRematch + msgbox OneIsland_KindleRoad_Text_BrycePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABE46:: @ 81ABE46 - trainerbattle_rematch TRAINER_CAMPER_BRYCE, Text_1C3987, Text_189A92 - msgbox Text_189A9F, MSGBOX_AUTOCLOSE +OneIsland_KindleRoad_EventScript_BryceRematch:: @ 81ABE46 + trainerbattle_rematch TRAINER_CAMPER_BRYCE, OneIsland_KindleRoad_Text_BryceRematchIntro, OneIsland_KindleRoad_Text_BryceDefeat + msgbox OneIsland_KindleRoad_Text_BrycePostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_1ABE5D:: @ 81ABE5D - trainerbattle_single TRAINER_PICNICKER_CLAIRE, Text_189ACB, Text_189B0B +OneIsland_KindleRoad_EventScript_Claire:: @ 81ABE5D + trainerbattle_single TRAINER_PICNICKER_CLAIRE, OneIsland_KindleRoad_Text_ClaireIntro, OneIsland_KindleRoad_Text_ClaireDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABE84 - msgbox Text_189B24, MSGBOX_AUTOCLOSE + goto_if_eq OneIsland_KindleRoad_EventScript_ClaireRematch + msgbox OneIsland_KindleRoad_Text_ClairePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABE84:: @ 81ABE84 - trainerbattle_rematch TRAINER_PICNICKER_CLAIRE, Text_1C39C6, Text_189B0B - msgbox Text_189B24, MSGBOX_AUTOCLOSE +OneIsland_KindleRoad_EventScript_ClaireRematch:: @ 81ABE84 + trainerbattle_rematch TRAINER_PICNICKER_CLAIRE, OneIsland_KindleRoad_Text_ClaireRematchIntro, OneIsland_KindleRoad_Text_ClaireDefeat + msgbox OneIsland_KindleRoad_Text_ClairePostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_1ABE9B:: @ 81ABE9B - trainerbattle_double TRAINER_CRUSH_KIN_MIK_KIA, Text_189B4D, Text_189B84, Text_189BDE +OneIsland_KindleRoad_EventScript_Kia:: @ 81ABE9B + trainerbattle_double TRAINER_CRUSH_KIN_MIK_KIA, OneIsland_KindleRoad_Text_KiaIntro, OneIsland_KindleRoad_Text_KiaDefeat, OneIsland_KindleRoad_Text_KiaNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABEC6 - msgbox Text_189BA3, MSGBOX_AUTOCLOSE + goto_if_eq OneIsland_KindleRoad_EventScript_KiaRematch + msgbox OneIsland_KindleRoad_Text_KiaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABEC6:: @ 81ABEC6 - trainerbattle_rematch_double TRAINER_CRUSH_KIN_MIK_KIA, Text_1C3A05, Text_189B84, Text_189BDE - msgbox Text_189BA3, MSGBOX_AUTOCLOSE +OneIsland_KindleRoad_EventScript_KiaRematch:: @ 81ABEC6 + trainerbattle_rematch_double TRAINER_CRUSH_KIN_MIK_KIA, OneIsland_KindleRoad_Text_KiaRematchIntro, OneIsland_KindleRoad_Text_KiaDefeat, OneIsland_KindleRoad_Text_KiaNotEnoughMons + msgbox OneIsland_KindleRoad_Text_KiaPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_1ABEE1:: @ 81ABEE1 - trainerbattle_double TRAINER_CRUSH_KIN_MIK_KIA, Text_189C33, Text_189C62, Text_189CAB +OneIsland_KindleRoad_EventScript_Mik:: @ 81ABEE1 + trainerbattle_double TRAINER_CRUSH_KIN_MIK_KIA, OneIsland_KindleRoad_Text_MikIntro, OneIsland_KindleRoad_Text_MikDefeat, OneIsland_KindleRoad_Text_MikNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABF0C - msgbox Text_189C7E, MSGBOX_AUTOCLOSE + goto_if_eq OneIsland_KindleRoad_EventScript_MikRematch + msgbox OneIsland_KindleRoad_Text_MikPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABF0C:: @ 81ABF0C - trainerbattle_rematch_double TRAINER_CRUSH_KIN_MIK_KIA, Text_1C3A55, Text_189C62, Text_189CAB - msgbox Text_189C7E, MSGBOX_AUTOCLOSE +OneIsland_KindleRoad_EventScript_MikRematch:: @ 81ABF0C + trainerbattle_rematch_double TRAINER_CRUSH_KIN_MIK_KIA, OneIsland_KindleRoad_Text_MikRematchIntro, OneIsland_KindleRoad_Text_MikDefeat, OneIsland_KindleRoad_Text_MikNotEnoughMons + msgbox OneIsland_KindleRoad_Text_MikPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_TreasureBeach_EventScript_1ABF27:: @ 81ABF27 - trainerbattle_single TRAINER_SWIMMER_FEMALE_AMARA, Text_189D5A, Text_189D8B +OneIsland_TreasureBeach_EventScript_Amara:: @ 81ABF27 + trainerbattle_single TRAINER_SWIMMER_FEMALE_AMARA, OneIsland_TreasureBeach_Text_AmaraIntro, OneIsland_TreasureBeach_Text_AmaraDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABF4E - msgbox Text_189DA3, MSGBOX_AUTOCLOSE + goto_if_eq OneIsland_TreasureBeach_EventScript_AmaraRematch + msgbox OneIsland_TreasureBeach_Text_AmaraPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABF4E:: @ 81ABF4E - trainerbattle_rematch TRAINER_SWIMMER_FEMALE_AMARA, Text_1C3773, Text_189D8B - msgbox Text_189DA3, MSGBOX_AUTOCLOSE +OneIsland_TreasureBeach_EventScript_AmaraRematch:: @ 81ABF4E + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_AMARA, OneIsland_TreasureBeach_Text_AmaraRematchIntro, OneIsland_TreasureBeach_Text_AmaraDefeat + msgbox OneIsland_TreasureBeach_Text_AmaraPostBattle, MSGBOX_AUTOCLOSE end ThreeIsland_BondBridge_EventScript_1ABF65:: @ 81ABF65 diff --git a/data/text/trainers.inc b/data/text/trainers.inc index 1d3d373af..7d434b383 100644 --- a/data/text/trainers.inc +++ b/data/text/trainers.inc @@ -707,60 +707,60 @@ Text_1C36DA:: @ 81C36DA .string "…But, you're welcome to battle with\n" .string "us again.$" -Text_1C3773:: @ 81C3773 +OneIsland_TreasureBeach_Text_AmaraRematchIntro:: @ 81C3773 .string "Lying back, rocked by the waves…\n" .string "I don't notice time slipping by…$" -Text_1C37B5:: @ 81C37B5 +OneIsland_KindleRoad_Text_MariaRematchIntro:: @ 81C37B5 .string "The weather's gorgeous!\n" .string "I'll try not to spoil it.$" -Text_1C37E7:: @ 81C37E7 +OneIsland_KindleRoad_Text_AbigailRematchIntro:: @ 81C37E7 .string "My sunburn is starting to hurt…$" -Text_1C3807:: @ 81C3807 +OneIsland_KindleRoad_Text_FinnRematchIntro:: @ 81C3807 .string "The fire bird's mountain casts\n" .string "a huge shadow…$" -Text_1C3835:: @ 81C3835 +OneIsland_KindleRoad_Text_GarrettRematchIntro:: @ 81C3835 .string "I have this strong feeling that\n" .string "I can win this time!$" -Text_1C386A:: @ 81C386A +OneIsland_KindleRoad_Text_TommyRematchIntro:: @ 81C386A .string "Wait! Wait a second!\n" .string "I'm sure I've hooked a big one!$" -Text_1C389F:: @ 81C389F +OneIsland_KindleRoad_Text_SharonRematchIntro:: @ 81C389F .string "You'll help me out with my\n" .string "training again?$" -Text_1C38CA:: @ 81C38CA +OneIsland_KindleRoad_Text_TanyaRematchIntro:: @ 81C38CA .string "We haven't missed a single day of\n" .string "training yet!$" -Text_1C38FA:: @ 81C38FA +OneIsland_KindleRoad_Text_SheaRematchIntro:: @ 81C38FA .string "Every morning, before breakfast,\n" .string "I swim around this island…\l" .string "Three times!$" -Text_1C3943:: @ 81C3943 +OneIsland_KindleRoad_Text_HughRematchIntro:: @ 81C3943 .string "Dress appropriately for battle!\n" .string "Lose that frivolous outfit, I said!$" -Text_1C3987:: @ 81C3987 +OneIsland_KindleRoad_Text_BryceRematchIntro:: @ 81C3987 .string "You know, everything tastes great\n" .string "when you're out in the wild.$" -Text_1C39C6:: @ 81C39C6 +OneIsland_KindleRoad_Text_ClaireRematchIntro:: @ 81C39C6 .string "I ate too much again, so will you\n" .string "battle us for some exercise?$" -Text_1C3A05:: @ 81C3A05 +OneIsland_KindleRoad_Text_KiaRematchIntro:: @ 81C3A05 .string "KIA: My big brother and I make\n" .string "an awesome combination!\p" .string "We won't lose this time!$" -Text_1C3A55:: @ 81C3A55 +OneIsland_KindleRoad_Text_MikRematchIntro:: @ 81C3A55 .string "MIK: Together with KIA, we're\n" .string "afraid of nothing!\p" .string "We'll prove it to you this time!$" -- cgit v1.2.3 From e80ddc46758bfef075b749af2802ce5d646bd9cd Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 26 Feb 2020 01:46:21 -0500 Subject: Document Two Island scripts --- data/maps/TwoIsland/map.json | 20 +-- data/maps/TwoIsland/scripts.inc | 162 +++++++++++------------ data/maps/TwoIsland/text.inc | 26 ++-- data/maps/TwoIsland_CapeBrink_House/scripts.inc | 2 + data/maps/TwoIsland_Harbor/map.json | 2 +- data/maps/TwoIsland_Harbor/scripts.inc | 2 +- data/maps/TwoIsland_House/map.json | 2 +- data/maps/TwoIsland_House/scripts.inc | 129 +++++++++--------- data/maps/TwoIsland_House/text.inc | 20 +-- data/maps/TwoIsland_JoyfulGameCorner/map.json | 6 +- data/maps/TwoIsland_JoyfulGameCorner/scripts.inc | 115 ++++++++-------- data/maps/TwoIsland_JoyfulGameCorner/text.inc | 36 ++--- data/maps/TwoIsland_PokemonCenter_1F/map.json | 6 +- data/maps/TwoIsland_PokemonCenter_1F/scripts.inc | 10 +- data/maps/TwoIsland_PokemonCenter_1F/text.inc | 4 +- 15 files changed, 277 insertions(+), 265 deletions(-) (limited to 'data') diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 668886176..8a258b635 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -31,7 +31,7 @@ "movement_range_y": 2, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_EventScript_16760F", + "script": "TwoIsland_EventScript_Clerk", "flag": "0" }, { @@ -44,7 +44,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_EventScript_167755", + "script": "TwoIsland_EventScript_Woman", "flag": "FLAG_HIDE_TWO_ISLAND_WOMAN" }, { @@ -57,7 +57,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_EventScript_16775E", + "script": "TwoIsland_EventScript_Beauty", "flag": "FLAG_HIDE_TWO_ISLAND_BEAUTY" }, { @@ -70,7 +70,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_EventScript_16774C", + "script": "TwoIsland_EventScript_Sailor", "flag": "0" }, { @@ -83,7 +83,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_EventScript_167777", + "script": "TwoIsland_EventScript_SuperNerd", "flag": "FLAG_HIDE_TWO_ISLAND_SUPER_NERD" }, { @@ -122,7 +122,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_EventScript_167789", + "script": "TwoIsland_EventScript_LittleBoy", "flag": "0" }, { @@ -135,7 +135,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_EventScript_167780", + "script": "TwoIsland_EventScript_Boy", "flag": "0" } ], @@ -176,21 +176,21 @@ "x": 29, "y": 8, "elevation": 0, - "script": "TwoIsland_EventScript_167792" + "script": "TwoIsland_EventScript_IslandSign" }, { "type": "bg_event_type_0", "x": 40, "y": 10, "elevation": 0, - "script": "TwoIsland_EventScript_16779B" + "script": "TwoIsland_EventScript_JoyfulGameCornerSign" }, { "type": "bg_event_type_0", "x": 8, "y": 3, "elevation": 0, - "script": "TwoIsland_EventScript_1677A4" + "script": "TwoIsland_EventScript_FastCurrentSign" } ] } diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index acfb2c38b..530fd3928 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -5,137 +5,137 @@ TwoIsland_MapScripts:: @ 8167564 TwoIsland_OnTransition:: @ 816756A setworldmapflag FLAG_WORLD_MAP_TWO_ISLAND setflag FLAG_VISITED_TWO_ISLAND - call EventScript_167576 + call TwoIsland_EventScript_SetShopState end -EventScript_167576:: @ 8167576 - goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_167597 - goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_1675B8 - goto_if_set FLAG_RESCUED_LOSTELLE, EventScript_1675D9 - goto EventScript_1675E8 +TwoIsland_EventScript_SetShopState:: @ 8167576 + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, TwoIsland_EventScript_SetShopStateAfterHoennLink + goto_if_set FLAG_SYS_GAME_CLEAR, TwoIsland_EventScript_SetShopStateAfterChampion + goto_if_set FLAG_RESCUED_LOSTELLE, TwoIsland_EventScript_SetShopStateAfterLostelleRescue + goto TwoIsland_EventScript_SetShopStateDefault end -EventScript_167597:: @ 8167597 - goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1675EE - goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_1, EventScript_1675F4 - goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_2, EventScript_1675FD - goto EventScript_167606 +TwoIsland_EventScript_SetShopStateAfterHoennLink:: @ 8167597 + goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, TwoIsland_EventScript_SetShopInitial + goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_1, TwoIsland_EventScript_SetShopExpanded1 + goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_2, TwoIsland_EventScript_SetShopExpanded2 + goto TwoIsland_EventScript_SetShopExpanded3 end -EventScript_1675B8:: @ 81675B8 - goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1675EE - goto_if_unset FLAG_RESCUED_LOSTELLE, EventScript_1675EE - goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_1, EventScript_1675F4 - goto EventScript_1675FD +TwoIsland_EventScript_SetShopStateAfterChampion:: @ 81675B8 + goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, TwoIsland_EventScript_SetShopInitial + goto_if_unset FLAG_RESCUED_LOSTELLE, TwoIsland_EventScript_SetShopInitial + goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_1, TwoIsland_EventScript_SetShopExpanded1 + goto TwoIsland_EventScript_SetShopExpanded2 end -EventScript_1675D9:: @ 81675D9 - goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1675EE - goto EventScript_1675F4 +TwoIsland_EventScript_SetShopStateAfterLostelleRescue:: @ 81675D9 + goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, TwoIsland_EventScript_SetShopInitial + goto TwoIsland_EventScript_SetShopExpanded1 end -EventScript_1675E8:: @ 81675E8 - goto EventScript_1675EE +TwoIsland_EventScript_SetShopStateDefault:: @ 81675E8 + goto TwoIsland_EventScript_SetShopInitial end -EventScript_1675EE:: @ 81675EE +TwoIsland_EventScript_SetShopInitial:: @ 81675EE setvar VAR_MAP_SCENE_TWO_ISLAND, 1 return -EventScript_1675F4:: @ 81675F4 +TwoIsland_EventScript_SetShopExpanded1:: @ 81675F4 setvar VAR_MAP_SCENE_TWO_ISLAND, 2 clearflag FLAG_HIDE_TWO_ISLAND_WOMAN return -EventScript_1675FD:: @ 81675FD +TwoIsland_EventScript_SetShopExpanded2:: @ 81675FD setvar VAR_MAP_SCENE_TWO_ISLAND, 3 clearflag FLAG_HIDE_TWO_ISLAND_BEAUTY return -EventScript_167606:: @ 8167606 +TwoIsland_EventScript_SetShopExpanded3:: @ 8167606 setvar VAR_MAP_SCENE_TWO_ISLAND, 4 clearflag FLAG_HIDE_TWO_ISLAND_SUPER_NERD return -TwoIsland_EventScript_16760F:: @ 816760F +TwoIsland_EventScript_Clerk:: @ 816760F goto_if_questlog EventScript_ReleaseEnd lock faceplayer compare VAR_MAP_SCENE_TWO_ISLAND, 4 - goto_if_eq EventScript_167646 + goto_if_eq TwoIsland_EventScript_ClerkShopExpanded3 compare VAR_MAP_SCENE_TWO_ISLAND, 3 - goto_if_eq EventScript_16765E + goto_if_eq TwoIsland_EventScript_ClerkShopExpanded2 compare VAR_MAP_SCENE_TWO_ISLAND, 2 - goto_if_eq EventScript_167676 - goto EventScript_16768E + goto_if_eq TwoIsland_EventScript_ClerkShopExpanded1 + goto TwoIsland_EventScript_ClerkShopInitial end -EventScript_167646:: @ 8167646 - goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_3, EventScript_1676A6 +TwoIsland_EventScript_ClerkShopExpanded3:: @ 8167646 + goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_3, TwoIsland_EventScript_ClerkShopSkipIntro setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_3 - message Text_181CAE + message TwoIsland_Text_BringingItemsFromDistantLands waitmessage - goto EventScript_167728 + goto TwoIsland_EventScript_ShopExpanded3 end -EventScript_16765E:: @ 816765E - goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_2, EventScript_1676A6 +TwoIsland_EventScript_ClerkShopExpanded2:: @ 816765E + goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_2, TwoIsland_EventScript_ClerkShopSkipIntro setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_2 - message Text_181C77 + message TwoIsland_Text_HopeYouGiveItYourBest waitmessage - goto EventScript_167708 + goto TwoIsland_EventScript_ShopExpanded2 end -EventScript_167676:: @ 8167676 - goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_1, EventScript_1676A6 +TwoIsland_EventScript_ClerkShopExpanded1:: @ 8167676 + goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_1, TwoIsland_EventScript_ClerkShopSkipIntro setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1 - message Text_181B7C + message TwoIsland_Text_AddedMerchandiseForLostelle waitmessage - goto EventScript_1676EC + goto TwoIsland_EventScript_ShopExpanded1 end -EventScript_16768E:: @ 816768E - goto_if_set FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1676A6 +TwoIsland_EventScript_ClerkShopInitial:: @ 816768E + goto_if_set FLAG_TWO_ISLAND_SHOP_INTRODUCED, TwoIsland_EventScript_ClerkShopSkipIntro setflag FLAG_TWO_ISLAND_SHOP_INTRODUCED - message Text_181AFE + message TwoIsland_Text_WelcomeToShopMerchandiseLimited waitmessage - goto EventScript_1676D3 + goto TwoIsland_EventScript_ShopInitial end -EventScript_1676A6:: @ 81676A6 +TwoIsland_EventScript_ClerkShopSkipIntro:: @ 81676A6 message Text_MayIHelpYou waitmessage compare VAR_MAP_SCENE_TWO_ISLAND, 4 - goto_if_eq EventScript_167728 + goto_if_eq TwoIsland_EventScript_ShopExpanded3 compare VAR_MAP_SCENE_TWO_ISLAND, 3 - goto_if_eq EventScript_167708 + goto_if_eq TwoIsland_EventScript_ShopExpanded2 compare VAR_MAP_SCENE_TWO_ISLAND, 2 - goto_if_eq EventScript_1676EC - goto EventScript_1676D3 + goto_if_eq TwoIsland_EventScript_ShopExpanded1 + goto TwoIsland_EventScript_ShopInitial end -EventScript_1676D3:: @ 81676D3 - pokemart Items_1676E4 +TwoIsland_EventScript_ShopInitial:: @ 81676D3 + pokemart TwoIsland_Items_ShopInitial msgbox Text_PleaseComeAgain release end .align 2 -Items_1676E4:: @ 81676E4 +TwoIsland_Items_ShopInitial:: @ 81676E4 .2byte ITEM_GREAT_BALL .2byte ITEM_FRESH_WATER .2byte ITEM_NONE release end -EventScript_1676EC:: @ 81676EC - pokemart Items_1676FC +TwoIsland_EventScript_ShopExpanded1:: @ 81676EC + pokemart TwoIsland_Items_ShopExpanded1 msgbox Text_PleaseComeAgain release end .align 2 -Items_1676FC:: @ 81676FC +TwoIsland_Items_ShopExpanded1:: @ 81676FC .2byte ITEM_ULTRA_BALL .2byte ITEM_GREAT_BALL .2byte ITEM_SODA_POP @@ -144,14 +144,14 @@ Items_1676FC:: @ 81676FC release end -EventScript_167708:: @ 8167708 - pokemart Items_167718 +TwoIsland_EventScript_ShopExpanded2:: @ 8167708 + pokemart TwoIsland_Items_ShopExpanded2 msgbox Text_PleaseComeAgain release end .align 2 -Items_167718:: @ 8167718 +TwoIsland_Items_ShopExpanded2:: @ 8167718 .2byte ITEM_ULTRA_BALL .2byte ITEM_GREAT_BALL .2byte ITEM_LEMONADE @@ -162,14 +162,14 @@ Items_167718:: @ 8167718 release end -EventScript_167728:: @ 8167728 - pokemart Items_167738 +TwoIsland_EventScript_ShopExpanded3:: @ 8167728 + pokemart TwoIsland_Items_ShopExpanded3 msgbox Text_PleaseComeAgain release end .align 2 -Items_167738:: @ 8167738 +TwoIsland_Items_ShopExpanded3:: @ 8167738 .2byte ITEM_ULTRA_BALL .2byte ITEM_REPEAT_BALL .2byte ITEM_TIMER_BALL @@ -182,42 +182,42 @@ Items_167738:: @ 8167738 release end -TwoIsland_EventScript_16774C:: @ 816774C - msgbox gUnknown_8181D2F, MSGBOX_NPC +TwoIsland_EventScript_Sailor:: @ 816774C + msgbox TwoIsland_Text_FellowMovedFromCeladonCity, MSGBOX_NPC end -TwoIsland_EventScript_167755:: @ 8167755 - msgbox gUnknown_8181DCA, MSGBOX_NPC +TwoIsland_EventScript_Woman:: @ 8167755 + msgbox TwoIsland_Text_ShopkeepersBrotherWorksGameCorner, MSGBOX_NPC end -TwoIsland_EventScript_16775E:: @ 816775E +TwoIsland_EventScript_Beauty:: @ 816775E lock faceplayer famechecker FAMECHECKER_BRUNO, 4 - msgbox gUnknown_8181E47 + msgbox TwoIsland_Text_BrunoCameToIslandWhileBack release end -TwoIsland_EventScript_167777:: @ 8167777 - msgbox gUnknown_8181F28, MSGBOX_NPC +TwoIsland_EventScript_SuperNerd:: @ 8167777 + msgbox TwoIsland_Text_BuyRareItemsHere, MSGBOX_NPC end -TwoIsland_EventScript_167780:: @ 8167780 - msgbox gUnknown_8181F5D, MSGBOX_NPC +TwoIsland_EventScript_Boy:: @ 8167780 + msgbox TwoIsland_Text_OldWomanLivesOutOnCape, MSGBOX_NPC end -TwoIsland_EventScript_167789:: @ 8167789 - msgbox gUnknown_8181FCE, MSGBOX_NPC +TwoIsland_EventScript_LittleBoy:: @ 8167789 + msgbox TwoIsland_Text_HaveYouTriedJumpingGame, MSGBOX_NPC end -TwoIsland_EventScript_167792:: @ 8167792 - msgbox gUnknown_8181A88, MSGBOX_SIGN +TwoIsland_EventScript_IslandSign:: @ 8167792 + msgbox TwoIsland_Text_IslandSign, MSGBOX_SIGN end -TwoIsland_EventScript_16779B:: @ 816779B - msgbox gUnknown_8181AA7, MSGBOX_SIGN +TwoIsland_EventScript_JoyfulGameCornerSign:: @ 816779B + msgbox TwoIsland_Text_JoyfulGameCornerSign, MSGBOX_SIGN end -TwoIsland_EventScript_1677A4:: @ 81677A4 - msgbox gUnknown_8181AC8, MSGBOX_SIGN +TwoIsland_EventScript_FastCurrentSign:: @ 81677A4 + msgbox TwoIsland_Text_DangerFastCurrent, MSGBOX_SIGN end diff --git a/data/maps/TwoIsland/text.inc b/data/maps/TwoIsland/text.inc index fca7d80ee..c0834abb8 100644 --- a/data/maps/TwoIsland/text.inc +++ b/data/maps/TwoIsland/text.inc @@ -1,23 +1,23 @@ -gUnknown_8181A88:: @ 8181A88 +TwoIsland_Text_IslandSign:: @ 8181A88 .string "TWO ISLAND\n" .string "Boon Island for Two$" -gUnknown_8181AA7:: @ 8181AA7 +TwoIsland_Text_JoyfulGameCornerSign:: @ 8181AA7 .string "Skip & Chomp!\n" .string "Joyful GAME CORNER$" -gUnknown_8181AC8:: @ 8181AC8 +TwoIsland_Text_DangerFastCurrent:: @ 8181AC8 .string "DANGER! FAST CURRENT!\n" .string "Fishing and surfing prohibited!$" -Text_181AFE:: @ 8181AFE +TwoIsland_Text_WelcomeToShopMerchandiseLimited:: @ 8181AFE .string "Oh!\n" .string "Hello, welcome to my shop!\p" .string "We've only opened up recently.\p" .string "Our merchandise is limited, but I\n" .string "hope we can serve your needs.$" -Text_181B7C:: @ 8181B7C +TwoIsland_Text_AddedMerchandiseForLostelle:: @ 8181B7C .string "I can't tell you how grateful I am\n" .string "for your rescue of LOSTELLE.\p" .string "Thanks to your feat, the people of\n" @@ -27,11 +27,11 @@ Text_181B7C:: @ 8181B7C .string "The people of THREE ISLAND\n" .string "helped me add to my merchandise.$" -Text_181C77:: @ 8181C77 +TwoIsland_Text_HopeYouGiveItYourBest:: @ 8181C77 .string "Hi! I'm giving it my best here.\n" .string "I hope you do too, {PLAYER}.$" -Text_181CAE:: @ 8181CAE +TwoIsland_Text_BringingItemsFromDistantLands:: @ 8181CAE .string "Oh, hello, {PLAYER}!\n" .string "Welcome!\p" .string "I've started bringing in items from\n" @@ -39,7 +39,7 @@ Text_181CAE:: @ 8181CAE .string "I've got some rare items in, too.\n" .string "Please have a look!$" -gUnknown_8181D2F:: @ 8181D2F +TwoIsland_Text_FellowMovedFromCeladonCity:: @ 8181D2F .string "That fellow there, he moved here\n" .string "from CELADON CITY.\p" .string "He started up a shop with his\n" @@ -47,13 +47,13 @@ gUnknown_8181D2F:: @ 8181D2F .string "You have to wonder if he knew what\n" .string "he was getting into.$" -gUnknown_8181DCA:: @ 8181DCA +TwoIsland_Text_ShopkeepersBrotherWorksGameCorner:: @ 8181DCA .string "The shopkeeper's brother took\n" .string "a job at the GAME CORNER.\p" .string "He's trying to pull together money\n" .string "so they can buy more merchandise.$" -gUnknown_8181E47:: @ 8181E47 +TwoIsland_Text_BrunoCameToIslandWhileBack:: @ 8181E47 .string "Listen, listen.\n" .string "Did you know?\p" .string "A famous TRAINER came to the\n" @@ -64,17 +64,17 @@ gUnknown_8181E47:: @ 8181E47 .string "found out that they were all sold\l" .string "out of Rage Candybars.$" -gUnknown_8181F28:: @ 8181F28 +TwoIsland_Text_BuyRareItemsHere:: @ 8181F28 .string "The discerning TRAINER knows to\n" .string "buy rare items here!$" -gUnknown_8181F5D:: @ 8181F5D +TwoIsland_Text_OldWomanLivesOutOnCape:: @ 8181F5D .string "There's an old woman who lives in\n" .string "a cottage out on the cape.\p" .string "She gives the eye to POKéMON.\n" .string "It's a bit unnerving.$" -gUnknown_8181FCE:: @ 8181FCE +TwoIsland_Text_HaveYouTriedJumpingGame:: @ 8181FCE .string "Boing! Boing!\n" .string "Have you tried the jumping game?\p" .string "The POKéMON you can enter…\n" diff --git a/data/maps/TwoIsland_CapeBrink_House/scripts.inc b/data/maps/TwoIsland_CapeBrink_House/scripts.inc index efba30945..d472e9e6c 100644 --- a/data/maps/TwoIsland_CapeBrink_House/scripts.inc +++ b/data/maps/TwoIsland_CapeBrink_House/scripts.inc @@ -1,2 +1,4 @@ TwoIsland_CapeBrink_House_MapScripts:: @ 817206B .byte 0 + +@ See move_tutors.inc diff --git a/data/maps/TwoIsland_Harbor/map.json b/data/maps/TwoIsland_Harbor/map.json index 076ea39f7..5b7d86ab5 100644 --- a/data/maps/TwoIsland_Harbor/map.json +++ b/data/maps/TwoIsland_Harbor/map.json @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_Harbor_EventScript_171806", + "script": "TwoIsland_Harbor_EventScript_Sailor", "flag": "0" } ], diff --git a/data/maps/TwoIsland_Harbor/scripts.inc b/data/maps/TwoIsland_Harbor/scripts.inc index 8c2eab36d..c59f8cf53 100644 --- a/data/maps/TwoIsland_Harbor/scripts.inc +++ b/data/maps/TwoIsland_Harbor/scripts.inc @@ -1,7 +1,7 @@ TwoIsland_Harbor_MapScripts:: @ 8171805 .byte 0 -TwoIsland_Harbor_EventScript_171806:: @ 8171806 +TwoIsland_Harbor_EventScript_Sailor:: @ 8171806 lock faceplayer message Text_WhereDoYouWantToSail diff --git a/data/maps/TwoIsland_House/map.json b/data/maps/TwoIsland_House/map.json index 2f45c143f..208519ec4 100644 --- a/data/maps/TwoIsland_House/map.json +++ b/data/maps/TwoIsland_House/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_House_EventScript_171619", + "script": "TwoIsland_House_EventScript_MoveManiac", "flag": "0" } ], diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index 9177de9cb..692f374fd 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -1,122 +1,127 @@ +.equ CHECKED_MUSHROOMS, FLAG_TEMP_1 +.equ HAS_BIG_MUSHROOM, FLAG_TEMP_2 +.equ HAS_TINY_MUSHROOMS, FLAG_TEMP_3 +.equ HAS_BOTH_MUSHROOMS, FLAG_TEMP_4 + TwoIsland_House_MapScripts:: @ 8171618 .byte 0 -TwoIsland_House_EventScript_171619:: @ 8171619 +TwoIsland_House_EventScript_MoveManiac:: @ 8171619 goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lock faceplayer - clearflag FLAG_TEMP_2 - clearflag FLAG_TEMP_3 - clearflag FLAG_TEMP_4 - goto_if_set FLAG_TEMP_1, EventScript_17164F - msgbox gUnknown_81A2B88 - setflag FLAG_TEMP_1 - goto EventScript_17164F + clearflag HAS_BIG_MUSHROOM + clearflag HAS_TINY_MUSHROOMS + clearflag HAS_BOTH_MUSHROOMS + goto_if_set CHECKED_MUSHROOMS, TwoIsland_House_EventScript_CheckPlayerHasMushrooms + msgbox TwoIsland_House_Text_TeachMonMoveForMushroom + setflag CHECKED_MUSHROOMS + goto TwoIsland_House_EventScript_CheckPlayerHasMushrooms end -EventScript_17164F:: @ 817164F +TwoIsland_House_EventScript_CheckPlayerHasMushrooms:: @ 817164F checkitem ITEM_BIG_MUSHROOM, 1 compare VAR_RESULT, TRUE - call_if_eq EventScript_1717A8 + call_if_eq TwoIsland_House_EventScript_SetHasBigMushroom checkitem ITEM_TINY_MUSHROOM, 2 compare VAR_RESULT, TRUE - call_if_eq EventScript_1717AC - goto_if_set FLAG_TEMP_2, EventScript_171687 - goto_if_set FLAG_TEMP_3, EventScript_171696 - goto EventScript_17179E + call_if_eq TwoIsland_House_EventScript_SetHasTinyMushrooms + goto_if_set HAS_BIG_MUSHROOM, TwoIsland_House_EventScript_CheckAlsoHasTinyMushrooms + goto_if_set HAS_TINY_MUSHROOMS, TwoIsland_House_EventScript_CheckAlsoHasBigMushroom + goto TwoIsland_House_EventScript_EndTutorMove end -EventScript_171687:: @ 8171687 - call_if_set FLAG_TEMP_3, EventScript_1717B0 - goto EventScript_1716A5 +TwoIsland_House_EventScript_CheckAlsoHasTinyMushrooms:: @ 8171687 + call_if_set HAS_TINY_MUSHROOMS, TwoIsland_House_EventScript_SetHasBothMushrooms + goto TwoIsland_House_EventScript_AskTutorMon end -EventScript_171696:: @ 8171696 - call_if_set FLAG_TEMP_2, EventScript_1717B0 - goto EventScript_1716A5 +TwoIsland_House_EventScript_CheckAlsoHasBigMushroom:: @ 8171696 + call_if_set HAS_BIG_MUSHROOM, TwoIsland_House_EventScript_SetHasBothMushrooms + goto TwoIsland_House_EventScript_AskTutorMon end -EventScript_1716A5:: @ 81716A5 - msgbox gUnknown_81A2C63, MSGBOX_YESNO +TwoIsland_House_EventScript_AskTutorMon:: @ 81716A5 + msgbox TwoIsland_House_Text_WantMeToTeachMove, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_17179E - goto EventScript_1716BE + goto_if_eq TwoIsland_House_EventScript_EndTutorMove + goto TwoIsland_House_EventScript_ChooseMonToTutor end -EventScript_1716BE:: @ 81716BE - msgbox gUnknown_81A2CC3 +TwoIsland_House_EventScript_ChooseMonToTutor:: @ 81716BE + msgbox TwoIsland_House_Text_TutorWhichMon special Special_SelectMoveTutorMon waitstate - compare VAR_0x8004, 6 - goto_if_ge EventScript_17179E + compare VAR_0x8004, PARTY_SIZE + goto_if_ge TwoIsland_House_EventScript_EndTutorMove special Special_IsSelectedMonEgg - compare VAR_RESULT, 1 - goto_if_eq EventScript_171790 + compare VAR_RESULT, TRUE + goto_if_eq TwoIsland_House_EventScript_CantTutorEgg compare VAR_0x8005, 0 - goto_if_eq EventScript_171782 - goto EventScript_1716F4 + goto_if_eq TwoIsland_House_EventScript_NoMoveToTutorMon + goto TwoIsland_House_EventScript_ChooseMoveToTeach end -EventScript_1716F4:: @ 81716F4 - msgbox gUnknown_81A2CE1 +TwoIsland_House_EventScript_ChooseMoveToTeach:: @ 81716F4 + msgbox TwoIsland_House_Text_TeachWhichMove special DisplayMoveTutorMenu waitstate compare VAR_0x8004, 0 - goto_if_eq EventScript_1716BE - goto_if_set FLAG_TEMP_4, EventScript_17175B - goto_if_set FLAG_TEMP_2, EventScript_171727 - goto_if_set FLAG_TEMP_3, EventScript_171741 + goto_if_eq TwoIsland_House_EventScript_ChooseMonToTutor + goto_if_set HAS_BOTH_MUSHROOMS, TwoIsland_House_EventScript_ChooseMushroom + goto_if_set HAS_BIG_MUSHROOM, TwoIsland_House_EventScript_GiveBigMushroom + goto_if_set HAS_TINY_MUSHROOMS, TwoIsland_House_EventScript_GiveTinyMushrooms end -EventScript_171727:: @ 8171727 +TwoIsland_House_EventScript_GiveBigMushroom:: @ 8171727 removeitem ITEM_BIG_MUSHROOM, 1 textcolor 3 - msgbox gUnknown_81A2DB3 + msgbox TwoIsland_House_Text_HandedOverOneBigMushroom call EventScript_1A6675 - goto EventScript_17179E + goto TwoIsland_House_EventScript_EndTutorMove end -EventScript_171741:: @ 8171741 +TwoIsland_House_EventScript_GiveTinyMushrooms:: @ 8171741 removeitem ITEM_TINY_MUSHROOM, 2 textcolor 3 - msgbox gUnknown_81A2D85 + msgbox TwoIsland_House_Text_HandedOverTwoTinyMushrooms call EventScript_1A6675 - goto EventScript_17179E + goto TwoIsland_House_EventScript_EndTutorMove end -EventScript_17175B:: @ 817175B - message Text_1A2D43 +TwoIsland_House_EventScript_ChooseMushroom:: @ 817175B + message TwoIsland_House_Text_IllNeedMushroomOrTwo waitmessage multichoice 0, 0, MULTICHOICE_MUSHROOMS, TRUE switch VAR_RESULT - case 0, EventScript_171741 - case 1, EventScript_171727 + case 0, TwoIsland_House_EventScript_GiveTinyMushrooms + case 1, TwoIsland_House_EventScript_GiveBigMushroom end -EventScript_171782:: @ 8171782 - msgbox gUnknown_81A2CFC - goto EventScript_1716BE +TwoIsland_House_EventScript_NoMoveToTutorMon:: @ 8171782 + msgbox TwoIsland_House_Text_NoMoveICanTeachThatMon + goto TwoIsland_House_EventScript_ChooseMonToTutor end -EventScript_171790:: @ 8171790 - msgbox gUnknown_81A2E20 - goto EventScript_1716BE +TwoIsland_House_EventScript_CantTutorEgg:: @ 8171790 + msgbox TwoIsland_House_Text_CantTeachAnEgg + goto TwoIsland_House_EventScript_ChooseMonToTutor end -EventScript_17179E:: @ 817179E - msgbox gUnknown_81A2DE0 +TwoIsland_House_EventScript_EndTutorMove:: @ 817179E + msgbox TwoIsland_House_Text_NeedMushroomOrTwoToLearnMove release end -EventScript_1717A8:: @ 81717A8 - setflag FLAG_TEMP_2 +TwoIsland_House_EventScript_SetHasBigMushroom:: @ 81717A8 + setflag HAS_BIG_MUSHROOM return -EventScript_1717AC:: @ 81717AC - setflag FLAG_TEMP_3 +TwoIsland_House_EventScript_SetHasTinyMushrooms:: @ 81717AC + setflag HAS_TINY_MUSHROOMS return -EventScript_1717B0:: @ 81717B0 - setflag FLAG_TEMP_4 +TwoIsland_House_EventScript_SetHasBothMushrooms:: @ 81717B0 + setflag HAS_BOTH_MUSHROOMS return diff --git a/data/maps/TwoIsland_House/text.inc b/data/maps/TwoIsland_House/text.inc index 0f0aeda5e..6f8a37f97 100644 --- a/data/maps/TwoIsland_House/text.inc +++ b/data/maps/TwoIsland_House/text.inc @@ -1,4 +1,4 @@ -gUnknown_81A2B88:: @ 81A2B88 +TwoIsland_House_Text_TeachMonMoveForMushroom:: @ 81A2B88 .string "I'm the POKéMON MOVE MANIAC.\p" .string "I know every single move that\n" .string "POKéMON learn growing up.\p" @@ -8,40 +8,40 @@ gUnknown_81A2B88:: @ 81A2B88 .string "If you do that for me, I'll teach\n" .string "a move to one POKéMON.$" -gUnknown_81A2C63:: @ 81A2C63 +TwoIsland_House_Text_WantMeToTeachMove:: @ 81A2C63 .string "Sniff, sniff…\n" .string "Hm! You smell of MUSHROOMS!\p" .string "Do you want me to teach a move\n" .string "to a POKéMON of yours?$" -gUnknown_81A2CC3:: @ 81A2CC3 +TwoIsland_House_Text_TutorWhichMon:: @ 81A2CC3 .string "Which POKéMON needs tutoring?$" -gUnknown_81A2CE1:: @ 81A2CE1 +TwoIsland_House_Text_TeachWhichMove:: @ 81A2CE1 .string "Which move should I teach?$" -gUnknown_81A2CFC:: @ 81A2CFC +TwoIsland_House_Text_NoMoveICanTeachThatMon:: @ 81A2CFC .string "Sorry…\p" .string "It doesn't appear as if I have a\n" .string "move I can teach that POKéMON.$" -Text_1A2D43:: @ 81A2D43 +TwoIsland_House_Text_IllNeedMushroomOrTwo:: @ 81A2D43 .string "Then, I'll need a MUSHROOM or two.\n" .string "What are you going to give me?$" -gUnknown_81A2D85:: @ 81A2D85 +TwoIsland_House_Text_HandedOverTwoTinyMushrooms:: @ 81A2D85 .string "{PLAYER} handed over two\n" .string "TINYMUSHROOMS in exchange.$" -gUnknown_81A2DB3:: @ 81A2DB3 +TwoIsland_House_Text_HandedOverOneBigMushroom:: @ 81A2DB3 .string "{PLAYER} handed over one\n" .string "BIG MUSHROOM in exchange.$" -gUnknown_81A2DE0:: @ 81A2DE0 +TwoIsland_House_Text_NeedMushroomOrTwoToLearnMove:: @ 81A2DE0 .string "If your POKéMON need to learn a\n" .string "move, I need a MUSHROOM or two.$" -gUnknown_81A2E20:: @ 81A2E20 +TwoIsland_House_Text_CantTeachAnEgg:: @ 81A2E20 .string "Hunh? There isn't a single move\n" .string "that I can teach an EGG.$" diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index d15bc7d3b..baf6a8db0 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_JoyfulGameCorner_EventScript_17155F", + "script": "TwoIsland_JoyfulGameCorner_EventScript_LostellesDaddy", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_JoyfulGameCorner_EventScript_17160C", + "script": "TwoIsland_JoyfulGameCorner_EventScript_Lostelle", "flag": "FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_JoyfulGameCorner_EventScript_171535", + "script": "TwoIsland_JoyfulGameCorner_EventScript_InfoMan", "flag": "0" } ], diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index 0bbb24423..fcba4720c 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -1,3 +1,7 @@ +.equ LOCALID_DADDY, 1 +.equ LOCALID_BIKER, 2 +.equ LOCALID_LOSTELLE, 3 + TwoIsland_JoyfulGameCorner_MapScripts:: @ 81713D0 map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_JoyfulGameCorner_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TwoIsland_JoyfulGameCorner_OnWarp @@ -6,86 +10,86 @@ TwoIsland_JoyfulGameCorner_MapScripts:: @ 81713D0 .byte 0 TwoIsland_JoyfulGameCorner_OnTransition:: @ 81713E5 - call_if_set FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER, EventScript_1713EF + call_if_set FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER, TwoIsland_JoyfulGameCorner_EventScript_SetLostelleReturnedPos end -EventScript_1713EF:: @ 81713EF - setobjectxyperm 1, 6, 2 - setobjectmovementtype 1, 8 - setobjectmovementtype 3, 1 +TwoIsland_JoyfulGameCorner_EventScript_SetLostelleReturnedPos:: @ 81713EF + setobjectxyperm LOCALID_DADDY, 6, 2 + setobjectmovementtype LOCALID_DADDY, MOVEMENT_TYPE_FACE_DOWN + setobjectmovementtype LOCALID_LOSTELLE, MOVEMENT_TYPE_LOOK_AROUND setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 return TwoIsland_JoyfulGameCorner_OnWarp:: @ 8171404 - map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, EventScript_171416 + map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, TwoIsland_JoyfulGameCorner_EventScript_TurnPlayerNorth map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, EventScript_CheckTurnAttendant .2byte 0 -EventScript_171416:: @ 8171416 +TwoIsland_JoyfulGameCorner_EventScript_TurnPlayerNorth:: @ 8171416 turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end TwoIsland_JoyfulGameCorner_OnFrame:: @ 817141B - map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 0, EventScript_17145F - map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, EventScript_171435 + map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 0, TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene + map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_ExitMinigameRoom .2byte 0 -EventScript_171435:: @ 8171435 +TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene:: @ 8171435 lockall textcolor 0 - msgbox gUnknown_81A28B2 + msgbox TwoIsland_JoyfulGameCorner_Text_YouRescuedLostelle textcolor 1 special Special_BufferBigGuyOrBigGirlString - msgbox gUnknown_81A2931 + msgbox TwoIsland_JoyfulGameCorner_Text_LostelleItsOkayDaddy closemessage - applymovement 3, Movement_WalkInPlaceFastestDown + applymovement LOCALID_LOSTELLE, Movement_WalkInPlaceFastestDown waitmovement 0 setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3 releaseall end -EventScript_17145F:: @ 817145F +TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene:: @ 817145F lockall textcolor 0 - applymovement 1, Movement_171520 + applymovement LOCALID_DADDY, Movement_171520 waitmovement 0 - msgbox gUnknown_81A2408 + msgbox TwoIsland_JoyfulGameCorner_Text_WhereHasLostelleGottenTo closemessage - applymovement 1, Movement_WalkInPlaceFastestDown + applymovement LOCALID_DADDY, Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN - applymovement 1, Movement_ExclamationMark + applymovement LOCALID_DADDY, Movement_ExclamationMark waitmovement 0 - applymovement 1, Movement_Delay48 + applymovement LOCALID_DADDY, Movement_Delay48 waitmovement 0 - applymovement 1, Movement_171527 + applymovement LOCALID_DADDY, Movement_171527 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox gUnknown_81A2465 + msgbox TwoIsland_JoyfulGameCorner_Text_PleaseHelpFindLostelle closemessage playse SE_DOOR waitse applymovement OBJ_EVENT_ID_PLAYER, Movement_17152C waitmovement 0 playbgm MUS_SHOUNEN, 0 - addobject 2 - applymovement 2, Movement_17152F + addobject LOCALID_BIKER + applymovement LOCALID_BIKER, TwoIsland_JoyfulGameCorner_Movement_BikerLookAround waitmovement 0 - msgbox gUnknown_81A259A - applymovement 2, Movement_WalkInPlaceFastestRight + msgbox TwoIsland_JoyfulGameCorner_Text_IsThisOnlyThreeIsland + applymovement LOCALID_BIKER, Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox gUnknown_81A2658 - msgbox gUnknown_81A26D5 + msgbox TwoIsland_JoyfulGameCorner_Text_ThisIsTwoIslandMoveIt + msgbox TwoIsland_JoyfulGameCorner_Text_TheseIslandsAreConfusing closemessage - applymovement 2, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BIKER, Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_KAIDAN - removeobject 2 + removeobject LOCALID_BIKER fadedefaultbgm delay 60 - msgbox gUnknown_81A270C + msgbox TwoIsland_JoyfulGameCorner_Text_PunkScuffedUpMyFloor clearflag FLAG_HIDE_THREE_ISLAND_LONE_BIKER setvar VAR_MAP_SCENE_THREE_ISLAND, 2 setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 1 @@ -113,7 +117,7 @@ Movement_17152C:: @ 817152C walk_in_place_fastest_right step_end -Movement_17152F:: @ 817152F +TwoIsland_JoyfulGameCorner_Movement_BikerLookAround:: @ 817152F walk_in_place_fastest_left delay_8 walk_in_place_fastest_right @@ -121,72 +125,73 @@ Movement_17152F:: @ 817152F walk_in_place_fastest_up step_end -TwoIsland_JoyfulGameCorner_EventScript_171535:: @ 8171535 +TwoIsland_JoyfulGameCorner_EventScript_InfoMan:: @ 8171535 lock faceplayer compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 goto_if_eq JoyfulGameCorner_EventScript_InfoMan2 - goto_if_set FLAG_RESCUED_LOSTELLE, EventScript_171555 - msgbox gUnknown_81A285C + goto_if_set FLAG_RESCUED_LOSTELLE, TwoIsland_JoyfulGameCorner_EventScript_GetGamesGoingSoon + msgbox TwoIsland_JoyfulGameCorner_Text_NotRunningAnyGamesToday release end -EventScript_171555:: @ 8171555 - msgbox gUnknown_81A288A +TwoIsland_JoyfulGameCorner_EventScript_GetGamesGoingSoon:: @ 8171555 + msgbox TwoIsland_JoyfulGameCorner_Text_GetGamesGoingSoon release end -TwoIsland_JoyfulGameCorner_EventScript_17155F:: @ 817155F +@ Only referred to as Lostelles Daddy in text +TwoIsland_JoyfulGameCorner_EventScript_LostellesDaddy:: @ 817155F lock faceplayer compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 goto_if_eq JoyfulGameCorner_EventScript_MinigameAttendant - goto_if_set FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER, EventScript_1715F5 + goto_if_set FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER, TwoIsland_JoyfulGameCorner_EventScript_GetGameCornerRunning compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3 - goto_if_eq EventScript_17158A - msgbox gUnknown_81A2743 + goto_if_eq TwoIsland_JoyfulGameCorner_EventScript_GiveDaddyMeteorite + msgbox TwoIsland_JoyfulGameCorner_Text_PleaseGoToThreeIsland release end -EventScript_17158A:: @ 817158A - goto_if_set FLAG_NO_ROOM_FOR_JOYFUL_GAME_CORNER_MOON_STONE, EventScript_1715C4 - msgbox gUnknown_81A296A +TwoIsland_JoyfulGameCorner_EventScript_GiveDaddyMeteorite:: @ 817158A + goto_if_set FLAG_NO_ROOM_FOR_JOYFUL_GAME_CORNER_MOON_STONE, TwoIsland_JoyfulGameCorner_EventScript_ReceiveMoonStone + msgbox TwoIsland_JoyfulGameCorner_Text_ThisIsForMe setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 textcolor 3 playfanfare MUS_ME_WAZA - message Text_1A29F7 + message TwoIsland_JoyfulGameCorner_Text_HandedMeteoriteToLostellesDaddy waitmessage waitfanfare call EventScript_1A6675 removeitem ITEM_METEORITE, 1 - msgbox gUnknown_81A2A24 - goto EventScript_1715C4 + msgbox TwoIsland_JoyfulGameCorner_Text_OhThisIsFromBill + goto TwoIsland_JoyfulGameCorner_EventScript_ReceiveMoonStone end -EventScript_1715C4:: @ 81715C4 +TwoIsland_JoyfulGameCorner_EventScript_ReceiveMoonStone:: @ 81715C4 checkitemspace ITEM_MOON_STONE, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_1715FF + goto_if_eq TwoIsland_JoyfulGameCorner_EventScript_NoRoomForMoonStone additem ITEM_MOON_STONE setflag FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER - msgreceiveditem gUnknown_81A2A9A, ITEM_MOON_STONE + msgreceiveditem TwoIsland_JoyfulGameCorner_Text_ReceivedMoonStoneFromLostellesDaddy, ITEM_MOON_STONE release end -EventScript_1715F5:: @ 81715F5 - msgbox gUnknown_81A2AF5 +TwoIsland_JoyfulGameCorner_EventScript_GetGameCornerRunning:: @ 81715F5 + msgbox TwoIsland_JoyfulGameCorner_Text_IllGetGameCornerRunning release end -EventScript_1715FF:: @ 81715FF +TwoIsland_JoyfulGameCorner_EventScript_NoRoomForMoonStone:: @ 81715FF setflag FLAG_NO_ROOM_FOR_JOYFUL_GAME_CORNER_MOON_STONE - msgbox gUnknown_81A2ACA + msgbox TwoIsland_JoyfulGameCorner_Text_NotGoingToFitInBag release end -TwoIsland_JoyfulGameCorner_EventScript_17160C:: @ 817160C +TwoIsland_JoyfulGameCorner_EventScript_Lostelle:: @ 817160C lock faceplayer - msgbox gUnknown_81A2B53 + msgbox TwoIsland_JoyfulGameCorner_Text_PleaseShowMeYouBeingCool release end diff --git a/data/maps/TwoIsland_JoyfulGameCorner/text.inc b/data/maps/TwoIsland_JoyfulGameCorner/text.inc index 21f6dd8ec..3884e8a32 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/text.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/text.inc @@ -1,10 +1,10 @@ -gUnknown_81A2408:: @ 81A2408 +TwoIsland_JoyfulGameCorner_Text_WhereHasLostelleGottenTo:: @ 81A2408 .string "Now, where's LOSTELLE gotten to\n" .string "today?\p" .string "She always brings me lunch every\n" .string "day right about now…$" -gUnknown_81A2465:: @ 81A2465 +TwoIsland_JoyfulGameCorner_Text_PleaseHelpFindLostelle:: @ 81A2465 .string "Hm? You, there!\n" .string "Are you a friend of LOSTELLE's?\p" .string "Have you seen LOSTELLE around?\n" @@ -17,7 +17,7 @@ gUnknown_81A2465:: @ 81A2465 .string "Please, help me find her!\n" .string "Please go search THREE ISLAND!$" -gUnknown_81A259A:: @ 81A259A +TwoIsland_JoyfulGameCorner_Text_IsThisOnlyThreeIsland:: @ 81A259A .string "Hah? What is this GAME CORNER?\n" .string "How much sadder can this get?\p" .string "Those clowns…\p" @@ -26,24 +26,24 @@ gUnknown_81A259A:: @ 81A259A .string "Hey, you! Is this the only THREE\n" .string "ISLAND around here?$" -gUnknown_81A2658:: @ 81A2658 +TwoIsland_JoyfulGameCorner_Text_ThisIsTwoIslandMoveIt:: @ 81A2658 .string "Try waking up before you crawl out\n" .string "of bed, you punk.\p" .string "This is TWO ISLAND!\p" .string "Move it! Get your filthy motorbike\n" .string "out of my place!$" -gUnknown_81A26D5:: @ 81A26D5 +TwoIsland_JoyfulGameCorner_Text_TheseIslandsAreConfusing:: @ 81A26D5 .string "Huh…\n" .string "Oh, oh, gotcha.\p" .string "Tch…\n" .string "These islands are confusing…$" -gUnknown_81A270C:: @ 81A270C +TwoIsland_JoyfulGameCorner_Text_PunkScuffedUpMyFloor:: @ 81A270C .string "Would you look at that?\n" .string "That punk scuffed up my floor.$" -gUnknown_81A2743:: @ 81A2743 +TwoIsland_JoyfulGameCorner_Text_PleaseGoToThreeIsland:: @ 81A2743 .string "Hey, but listen! I'm begging you,\n" .string "you have to go to THREE ISLAND.\p" .string "If anything were to happen to my\n" @@ -55,26 +55,26 @@ gUnknown_81A2743:: @ 81A2743 .string "That's why I have to get you to do\n" .string "me this big favor.$" -gUnknown_81A285C:: @ 81A285C +TwoIsland_JoyfulGameCorner_Text_NotRunningAnyGamesToday:: @ 81A285C .string "I'm sorry.\n" .string "We're not running any games today.$" -gUnknown_81A288A:: @ 81A288A +TwoIsland_JoyfulGameCorner_Text_GetGamesGoingSoon:: @ 81A288A .string "We'll get the games going soon\n" .string "for you!$" -gUnknown_81A28B2:: @ 81A28B2 +TwoIsland_JoyfulGameCorner_Text_YouRescuedLostelle:: @ 81A28B2 .string "So you rescued LOSTELLE?\n" .string "How can I thank you?\p" .string "LOSTELLE, darling, forgive me!\p" .string "Daddy didn't know you were scared\n" .string "and in trouble!$" -gUnknown_81A2931:: @ 81A2931 +TwoIsland_JoyfulGameCorner_Text_LostelleItsOkayDaddy:: @ 81A2931 .string "LOSTELLE: It's okay, Daddy.\n" .string "I got to be friends with {PLAYER}!$" -gUnknown_81A296A:: @ 81A296A +TwoIsland_JoyfulGameCorner_Text_ThisIsForMe:: @ 81A296A .string "Oh, what's that?\n" .string "You're saying that this is for me?\p" .string "How did you know that I love rare\n" @@ -82,31 +82,31 @@ gUnknown_81A296A:: @ 81A296A .string "You sure know how to make a guy\n" .string "happy.$" -Text_1A29F7:: @ 81A29F7 +TwoIsland_JoyfulGameCorner_Text_HandedMeteoriteToLostellesDaddy:: @ 81A29F7 .string "{PLAYER} handed the METEORITE\n" .string "to LOSTELLE's daddy.$" -gUnknown_81A2A24:: @ 81A2A24 +TwoIsland_JoyfulGameCorner_Text_OhThisIsFromBill:: @ 81A2A24 .string "Oh, I see, this is from BILL!\n" .string "You have to thank him for me!\p" .string "You know, you've been fantastic.\n" .string "I want you to have this.$" -gUnknown_81A2A9A:: @ 81A2A9A +TwoIsland_JoyfulGameCorner_Text_ReceivedMoonStoneFromLostellesDaddy:: @ 81A2A9A .string "{PLAYER} received a MOON STONE\n" .string "from LOSTELLE's daddy.$" -gUnknown_81A2ACA:: @ 81A2ACA +TwoIsland_JoyfulGameCorner_Text_NotGoingToFitInBag:: @ 81A2ACA .string "Your BAG's not going to fit another\n" .string "thing…$" -gUnknown_81A2AF5:: @ 81A2AF5 +TwoIsland_JoyfulGameCorner_Text_IllGetGameCornerRunning:: @ 81A2AF5 .string "All right, I'll get the GAME CORNER\n" .string "running right away.\p" .string "You have to come visit with a\n" .string "friend.$" -gUnknown_81A2B53:: @ 81A2B53 +TwoIsland_JoyfulGameCorner_Text_PleaseShowMeYouBeingCool:: @ 81A2B53 .string "Listen, listen!\p" .string "Please show me you being cool\n" .string "again!$" diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json index 7001ab1cc..18b930dfa 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_PokemonCenter_1F_EventScript_1717C3", + "script": "TwoIsland_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_PokemonCenter_1F_EventScript_1717CC", + "script": "TwoIsland_PokemonCenter_1F_EventScript_GBAKid", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_PokemonCenter_1F_EventScript_1717D5", + "script": "TwoIsland_PokemonCenter_1F_EventScript_BugCatcher", "flag": "0" } ], diff --git a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc index 6661a61eb..4fbc3bce9 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc @@ -7,17 +7,17 @@ TwoIsland_PokemonCenter_1F_OnTransition:: @ 81717BF setrespawn SPAWN_TWO_ISLAND end -TwoIsland_PokemonCenter_1F_EventScript_1717C3:: @ 81717C3 +TwoIsland_PokemonCenter_1F_EventScript_Nurse:: @ 81717C3 lock faceplayer call EventScript_PkmnCenterNurse release end -TwoIsland_PokemonCenter_1F_EventScript_1717CC:: @ 81717CC - msgbox gUnknown_81A2E59, MSGBOX_NPC +TwoIsland_PokemonCenter_1F_EventScript_GBAKid:: @ 81717CC + msgbox TwoIsland_PokemonCenter_1F_Text_HaveYouVisitedGameCorner, MSGBOX_NPC end -TwoIsland_PokemonCenter_1F_EventScript_1717D5:: @ 81717D5 - msgbox gUnknown_81A2EBE, MSGBOX_NPC +TwoIsland_PokemonCenter_1F_EventScript_BugCatcher:: @ 81717D5 + msgbox TwoIsland_PokemonCenter_1F_Text_OldLadyLivesOutOnCape, MSGBOX_NPC end diff --git a/data/maps/TwoIsland_PokemonCenter_1F/text.inc b/data/maps/TwoIsland_PokemonCenter_1F/text.inc index 514825cdf..c7c5561c0 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/text.inc +++ b/data/maps/TwoIsland_PokemonCenter_1F/text.inc @@ -1,10 +1,10 @@ -gUnknown_81A2E59:: @ 81A2E59 +TwoIsland_PokemonCenter_1F_Text_HaveYouVisitedGameCorner:: @ 81A2E59 .string "Have you visited the GAME CORNER\n" .string "already?\p" .string "It's no good to go alone.\n" .string "You have to take a friend along.$" -gUnknown_81A2EBE:: @ 81A2EBE +TwoIsland_PokemonCenter_1F_Text_OldLadyLivesOutOnCape:: @ 81A2EBE .string "Not many people live on\n" .string "TWO ISLAND.\p" .string "There is this old lady who lives\n" -- cgit v1.2.3 From 51e2b99b9d748755b77fa3bdbc86d261d58fc74c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 26 Feb 2020 09:11:24 -0500 Subject: Finish fldeff_cut --- data/fldeff_cut.s | 40 ---------------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 data/fldeff_cut.s (limited to 'data') diff --git a/data/fldeff_cut.s b/data/fldeff_cut.s deleted file mode 100644 index ca25b396a..000000000 --- a/data/fldeff_cut.s +++ /dev/null @@ -1,40 +0,0 @@ -#include "constants/maps.h" -#include "constants/species.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnknown_83D4100:: @ 83D4100 - .2byte 0x000d, 0x0001 - .2byte 0x000a, 0x0013 - .2byte 0x000b, 0x000e - .2byte 0x000c, 0x000f - .2byte 0x0352, 0x033e - .2byte 0x0300, 0x0310 - .2byte 0x0301, 0x0311 - .2byte 0x0302, 0x0312 - .2byte 0x0284, 0x0281 - .2byte 0xffff, 0xffff - - .align 2 -gOamData_83D4128:: - .4byte 0x00000000, 0x00001401 - -gAnimCmd_83D4130:: - obj_image_anim_frame 0, 30 - obj_image_anim_jump 0 - -gSpriteAnimTable_83D4138:: - .4byte gAnimCmd_83D4130 - -gUnknown_83D413C:: - obj_frame_tiles gUnknown_8398648, 0x20 - -gUnknown_83D4144:: - obj_pal gUnknown_8398688, 4096 - -gUnknown_83D414C:: @ 83D414C - spr_template 0xFFFF, 4096, gOamData_83D4128, gSpriteAnimTable_83D4138, gUnknown_83D413C, gDummySpriteAffineAnimTable, objc_8097BA8 - -- cgit v1.2.3 From 4747fcb6296709bf3f9eb287ca6adb977dae0bce Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 26 Feb 2020 09:21:49 -0500 Subject: Name methods in fldeff_cut --- data/field_effect_scripts.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index de50ed39d..cac76bea9 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -78,11 +78,11 @@ gFldEffScript_ExclamationMarkIcon:: @ 81D97C4 end gFldEffScript_UseCutOnGrass:: @ 81D97CA - callnative sub_80979A0 + callnative FldEff_UseCutOnGrass end gFldEffScript_UseCutOnTree:: @ 81D97D0 - callnative sub_80979F0 + callnative FldEff_UseCutOnTree end gFldEffScript_Shadow:: @ 81D97D6 @@ -299,7 +299,7 @@ gFldEffScript_SecretPowerShrub:: @ 81D9964 end gFldEffScript_CutGrass:: @ 81D9965 - loadfadedpal_callnative gUnknown_83D4144, sub_8097A48 + loadfadedpal_callnative gFldEffPalette_CutGrass, FldEff_CutGrass end gFldEffScript_FieldMoveShowMonInit:: @ 81D996F -- cgit v1.2.3 From 456c817338e3ce899e524eff603f47c583de24aa Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 27 Feb 2020 09:18:54 -0500 Subject: Decompile fldeff hooks --- data/field_effect.s | 4 ++-- data/field_effect_scripts.s | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/field_effect.s b/data/field_effect.s index 7e797c560..0c76e9d0d 100644 --- a/data/field_effect.s +++ b/data/field_effect.s @@ -49,12 +49,12 @@ gUnknown_83CBDB0:: .incbin "graphics/field_effects/unk_83CBDB0.4bpp" .align 2 -gUnknown_83CBE30:: @ 83CBE30 dataptr +sFldEffScrcmdTable:: @ 83CBE30 dataptr .4byte FieldEffectCmd_loadtiles .4byte FieldEffectCmd_loadfadedpal .4byte FieldEffectCmd_loadpal .4byte FieldEffectCmd_callnative - .4byte sub_80834DC + .4byte FieldEffectCmd_end .4byte FieldEffectCmd_loadgfx_callnative .4byte FieldEffectCmd_loadtiles_callnative .4byte FieldEffectCmd_loadfadedpal_callnative diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index cac76bea9..fd8681fbf 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -1,7 +1,7 @@ .include "asm/macros/field_effect_script.inc" .section script_data, "aw", %progbits .align 2 -gUnknown_81D96AC:: @ 81D96AC +gFieldEffectScriptPointers:: @ 81D96AC .4byte gFldEffScript_ExclamationMarkIcon .4byte gFldEffScript_UseCutOnGrass .4byte gFldEffScript_UseCutOnTree -- cgit v1.2.3 From c93915120f23a9545ff0743f506af3d58a1fabff Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 27 Feb 2020 11:45:08 -0500 Subject: Port many field_effect.c names from Emerald --- data/event_object_movement.s | 4 +- data/field_effect.s | 173 ++++++++++++++++++++++--------------------- data/field_effect_scripts.s | 6 +- 3 files changed, 94 insertions(+), 89 deletions(-) (limited to 'data') diff --git a/data/event_object_movement.s b/data/event_object_movement.s index 17adf3ef4..5920835c4 100644 --- a/data/event_object_movement.s +++ b/data/event_object_movement.s @@ -7028,7 +7028,7 @@ gUnknown_83A5EBC:: @ 83A5EBC .4byte gUnknown_83A5EA4 gUnknown_83A5EC0:: @ 83A5EC0 - spr_template 0xFFFF, 0x100D, gObjectEventBaseOam_16x16, gUnknown_83A5EBC, gUnknown_83A5E7C, gDummySpriteAffineAnimTable, sub_8085604 + spr_template 0xFFFF, 0x100D, gObjectEventBaseOam_16x16, gUnknown_83A5EBC, gUnknown_83A5E7C, gDummySpriteAffineAnimTable, SpriteCB_PopOutOfAsh gUnknown_83A5ED8:: @ 83A5ED8 obj_pal gUnknown_839C588, 0x100D @@ -7052,7 +7052,7 @@ gUnknown_83A5F20:: @ 83A5F20 .4byte gUnknown_83A5F08 gUnknown_83A5F24:: @ 83A5F24 - spr_template 0xFFFF, 0x100D, gObjectEventBaseOam_16x16, gUnknown_83A5F20, gUnknown_83A5EE0, gDummySpriteAffineAnimTable, sub_80853B0 + spr_template 0xFFFF, 0x100D, gObjectEventBaseOam_16x16, gUnknown_83A5F20, gUnknown_83A5EE0, gDummySpriteAffineAnimTable, SpriteCB_LavaridgeGymWarp gUnknown_83A5F3C:: @ 83A5F3C overworld_frame gUnknown_839CAA8, 2, 4, 0 diff --git a/data/field_effect.s b/data/field_effect.s index 0c76e9d0d..607ae6142 100644 --- a/data/field_effect.s +++ b/data/field_effect.s @@ -59,7 +59,7 @@ sFldEffScrcmdTable:: @ 83CBE30 dataptr .4byte FieldEffectCmd_loadtiles_callnative .4byte FieldEffectCmd_loadfadedpal_callnative -gUnknown_83CBE50:: @ 83CBE50 oamdata +gNewGameBirchOamAttributes:: @ 83CBE50 oamdata .4byte 0xc0000000, 0x00000000 gOamData_83CBE58:: @ 83CBE58 oamdata @@ -71,7 +71,7 @@ gOamData_83CBE60:: @ 83CBE60 oamdata gUnknown_83CBE68:: @ 83CBE68 sprite_frames obj_frame_tiles gUnknown_83CA770, 0x0800 -gUnknown_83CBE70:: @ 83CBE70 sprite_palette +gNewGameBirchObjectPaletteInfo:: @ 83CBE70 sprite_palette obj_pal gUnknown_83CAF70, 4102 gUnknown_83CBE78:: @ 83CBE78 @@ -82,8 +82,8 @@ gUnknown_83CBE78:: @ 83CBE78 gUnknown_83CBE80:: @ 83CBE80 dataptr .4byte gUnknown_83CBE78 -gUnknown_83CBE84:: @ 83CBE84 spr_template - spr_template 65535, 4102, gUnknown_83CBE50, gUnknown_83CBE80, gUnknown_83CBE68, gDummySpriteAffineAnimTable, SpriteCallbackDummy +gNewGameBirchObjectTemplate:: @ 83CBE84 spr_template + spr_template 65535, 4102, gNewGameBirchOamAttributes, gUnknown_83CBE80, gUnknown_83CBE68, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_83CBE9C:: @ 83CBE9C sprite_palette obj_pal gUnknown_83CAFB0, 4103 @@ -168,27 +168,27 @@ gUnknown_83CBF88:: @ 83CBF88 spr_template spr_template 65535, 4103, gOamData_83CBE58, gUnknown_83CBF54, gUnknown_83CBEB4, gDummySpriteAffineAnimTable, SpriteCB_PokeballGlow gUnknown_83CBFA0:: @ 83CBFA0 spr_template - spr_template 65535, 4103, gOamData_83CBEAC, gUnknown_83CBF54, gUnknown_83CBEBC, gDummySpriteAffineAnimTable, sub_808424C + spr_template 65535, 4103, gOamData_83CBEAC, gUnknown_83CBF54, gUnknown_83CBEBC, gDummySpriteAffineAnimTable, SpriteCB_PokecenterMonitor gUnknown_83CBFB8:: @ 83CBFB8 spr_template - spr_template 65535, 4112, gOamData_83CBE60, gUnknown_83CBF84, gUnknown_83CBEDC, gDummySpriteAffineAnimTable, sub_80842AC + spr_template 65535, 4112, gOamData_83CBE60, gUnknown_83CBF84, gUnknown_83CBEDC, gDummySpriteAffineAnimTable, SpriteCB_HallOfFameMonitor .align 2 -gUnknown_83CBFD0:: @ 83CBFD0 dataptr +sPokecenterHealTaskCBTable:: @ 83CBFD0 dataptr .4byte PokecenterHealEffect_0 .4byte PokecenterHealEffect_1 - .4byte sub_8083C78 + .4byte PokecenterHealEffect_2 .4byte PokecenterHealEffect_3 .align 2 -gUnknown_83CBFE0:: @ 83CBFE0 dataptr +sHallOfFameRecordTaskCBTable:: @ 83CBFE0 dataptr .4byte HallOfFameRecordEffect_0 - .4byte sub_8083D74 - .4byte sub_8083DAC - .4byte sub_8083DD4 + .4byte HallOfFameRecordEffect_1 + .4byte HallOfFameRecordEffect_2 + .4byte HallOfFameRecordEffect_3 .align 2 -gUnknown_83CBFF0:: @ 83CBFF0 dataptr +sPokeballGlowSpriteCBTable:: @ 83CBFF0 dataptr .4byte PokeballGlowEffect_0 .4byte PokeballGlowEffect_1 .4byte PokeballGlowEffect_2 @@ -196,10 +196,15 @@ gUnknown_83CBFF0:: @ 83CBFF0 dataptr .4byte PokeballGlowEffect_4 .4byte PokeballGlowEffect_5 .4byte PokeballGlowEffect_6 - .4byte nullsub_50 + .4byte PokeballGlowEffect_7 gUnknown_83CC010:: @ 83CC010 data16 - .2byte 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0004, 0x0006, 0x0004, 0x0000, 0x0008, 0x0006, 0x0008 + .2byte 0, 0 + .2byte 6, 0 + .2byte 0, 4 + .2byte 6, 4 + .2byte 0, 8 + .2byte 6, 8 gUnknown_83CC028:: @ 83CC028 data8 .byte 0x10, 0x0c, 0x08, 0x00 @@ -211,23 +216,23 @@ gUnknown_83CC030:: @ 83CC030 data8 .byte 0x00, 0x00, 0x00, 0x00 .align 2 -gUnknown_83CC034:: @ 83CC034 dataptr - .4byte sub_80844BC - .4byte sub_8084564 - .4byte sub_8084580 - .4byte sub_80845F4 - .4byte sub_80846AC - .4byte sub_80846C8 - .4byte sub_8084708 +sFallWarpEffectCBPtrs:: @ 83CC034 dataptr + .4byte FallWarpEffect_1 + .4byte FallWarpEffect_2 + .4byte FallWarpEffect_3 + .4byte FallWarpEffect_4 + .4byte FallWarpEffect_5 + .4byte FallWarpEffect_6 + .4byte FallWarpEffect_7 .align 2 -gUnknown_83CC050:: @ 83CC050 dataptr - .4byte sub_80847F8 - .4byte sub_8084820 - .4byte sub_8084890 - .4byte sub_80848B4 - .4byte sub_80848C4 - .4byte sub_80848E8 +sEscalatorWarpFieldEffectFuncs:: @ 83CC050 dataptr + .4byte EscalatorWarpEffect_1 + .4byte EscalatorWarpEffect_2 + .4byte EscalatorWarpEffect_3 + .4byte EscalatorWarpEffect_4 + .4byte EscalatorWarpEffect_5 + .4byte EscalatorWarpEffect_6 .align 2 gUnknown_83CC068:: @ 83CC068 dataptr @@ -240,91 +245,91 @@ gUnknown_83CC068:: @ 83CC068 dataptr .4byte sub_8084C3C .align 2 -gUnknown_83CC084:: @ 83CC084 dataptr - .4byte sub_8084D24 +sUseWaterfallFieldEffectFuncs:: @ 83CC084 dataptr + .4byte waterfall_0_setup .4byte waterfall_1_do_anim_probably .4byte waterfall_2_wait_anim_finish_probably - .4byte sub_8084DA4 - .4byte sub_8084DCC + .4byte waterfall_3_move_player_probably + .4byte waterfall_4_wait_player_move_probably .align 2 -gUnknown_83CC098:: @ 83CC098 dataptr +sDiveFieldEffectFuncPtrs:: @ 83CC098 dataptr .4byte dive_1_lock .4byte dive_2_unknown .4byte dive_3_unknown .align 2 -gUnknown_83CC0A4:: @ 83CC0A4 dataptr - .4byte sub_8084FA0 - .4byte sub_8084FD8 - .4byte sub_808500C - .4byte sub_8085058 - .4byte sub_808514C - .4byte sub_8085168 +sLavaridgeGymB1FWarpEffectFuncs:: @ 83CC0A4 dataptr + .4byte LavaridgeGymB1FWarpEffect_1 + .4byte LavaridgeGymB1FWarpEffect_2 + .4byte LavaridgeGymB1FWarpEffect_3 + .4byte LavaridgeGymB1FWarpEffect_4 + .4byte LavaridgeGymB1FWarpEffect_5 + .4byte LavaridgeGymB1FWarpEffect_6 .align 2 -gUnknown_83CC0BC:: @ 83CC0BC dataptr - .4byte sub_8085244 - .4byte sub_8085274 - .4byte sub_80852C0 - .4byte sub_8085314 +sLavaridgeGymB1FWarpExitEffectFuncs:: @ 83CC0BC dataptr + .4byte LavaridgeGymB1FWarpExitEffect_1 + .4byte LavaridgeGymB1FWarpExitEffect_2 + .4byte LavaridgeGymB1FWarpExitEffect_3 + .4byte LavaridgeGymB1FWarpExitEffect_4 .align 2 -gUnknown_83CC0CC:: @ 83CC0CC dataptr - .4byte sub_8085440 - .4byte sub_8085470 - .4byte sub_80854EC - .4byte sub_8085524 - .4byte sub_808554C +sLavaridgeGym1FWarpEffectFuncs:: @ 83CC0CC dataptr + .4byte LavaridgeGym1FWarpEffect_1 + .4byte LavaridgeGym1FWarpEffect_2 + .4byte LavaridgeGym1FWarpEffect_3 + .4byte LavaridgeGym1FWarpEffect_4 + .4byte LavaridgeGym1FWarpEffect_5 .align 2 -gUnknown_83CC0E0:: @ 83CC0E0 dataptr - .4byte sub_808566C - .4byte sub_8085690 +gEscapeRopeFieldEffectFuncs:: @ 83CC0E0 dataptr + .4byte EscapeRopeFieldEffect_Step0 + .4byte EscapeRopeFieldEffect_Step1 gUnknown_83CC0E8:: @ 83CC0E8 data8 .byte 0x01, 0x03, 0x04, 0x02, 0x01 .align 2 -gUnknown_83CC0F0:: @ 83CC0F0 dataptr - .4byte sub_8085A54 - .4byte sub_8085A80 +sEscapeRopeExitEffectFuncs:: @ 83CC0F0 dataptr + .4byte EscapeRopeExitFieldEffect_Step0 + .4byte EscapeRopeExitFieldEffect_Step1 .align 2 -gUnknown_83CC0F8:: @ 83CC0F8 dataptr - .4byte sub_8085BA8 - .4byte sub_8085BD0 - .4byte sub_8085C60 - .4byte sub_8085D34 +sTeleportEffectFuncs:: @ 83CC0F8 dataptr + .4byte TeleportFieldEffectTask1 + .4byte TeleportFieldEffectTask2 + .4byte TeleportFieldEffectTask3 + .4byte TeleportFieldEffectTask4 gUnknown_83CC108:: @ 83CC108 data8 .byte 0x01, 0x03, 0x04, 0x02, 0x01 .align 2 -gUnknown_83CC110:: @ 83CC110 dataptr - .4byte sub_8085E0C - .4byte sub_8085E98 - .4byte sub_8085F9C +sTeleportInEffectFuncs:: @ 83CC110 dataptr + .4byte TeleportInFieldEffectTask1 + .4byte TeleportInFieldEffectTask2 + .4byte TeleportInFieldEffectTask3 .align 2 -gUnknown_83CC11C:: @ 83CC11C dataptr - .4byte sub_8086110 - .4byte sub_8086180 - .4byte sub_80861FC - .4byte sub_8086288 - .4byte sub_80862B8 - .4byte sub_808630C - .4byte sub_8086358 +sShowMonOutdoorsEffectFuncs:: @ 83CC11C dataptr + .4byte ShowMonEffect_Outdoors_1 + .4byte ShowMonEffect_Outdoors_2 + .4byte ShowMonEffect_Outdoors_3 + .4byte ShowMonEffect_Outdoors_4 + .4byte ShowMonEffect_Outdoors_5 + .4byte ShowMonEffect_Outdoors_6 + .4byte ShowMonEffect_Outdoors_7 .align 2 -gUnknown_83CC138:: @ 83CC138 dataptr - .4byte sub_8086498 - .4byte sub_80864D4 - .4byte sub_8086554 - .4byte sub_80865C0 - .4byte sub_80865F0 - .4byte sub_8086630 - .4byte sub_8086650 +sShowMonIndoorsEffectFuncs:: @ 83CC138 dataptr + .4byte ShowMonEffect_Indoors_1 + .4byte ShowMonEffect_Indoors_2 + .4byte ShowMonEffect_Indoors_3 + .4byte ShowMonEffect_Indoors_4 + .4byte ShowMonEffect_Indoors_5 + .4byte ShowMonEffect_Indoors_6 + .4byte ShowMonEffect_Indoors_7 .align 2 gUnknown_83CC154:: @ 83CC154 dataptr diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index fd8681fbf..49f14d251 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -174,7 +174,7 @@ gFldEffScript_DeepSandFootprints:: @ 81D988B gFldEffScript_PokecenterHeal:: @ 81D9895 loadfadedpal gUnknown_83CBE9C - loadfadedpal_callnative gUnknown_83A5340, sub_8083B8C + loadfadedpal_callnative gUnknown_83A5340, FldEff_PokecenterHeal end gFldEffScript_UseSecretPowerTree:: @ 81D98A4 @@ -244,7 +244,7 @@ gFldEffScript_HotSpringsWater:: @ 81D990A end gFldEffScript_UseWaterfall:: @ 81D9914 - callnative oei_waterfall + callnative FldEff_UseWaterfall end gFldEffScript_UseDive:: @ 81D991A @@ -314,7 +314,7 @@ gFldEffScript_PcturnOn:: @ 81D9976 gFldEffScript_HallOfFameRecord:: @ 81D9977 loadfadedpal gUnknown_83CBE9C - loadfadedpal_callnative gUnknown_83CBEA4, sub_8083CE0 + loadfadedpal_callnative gUnknown_83CBEA4, FldEff_HallOfFameRecord end gFldEffScript_UseTeleport:: @ 81D9986 -- cgit v1.2.3 From d3adca3f9d13ebcc58f4d7e77e57dd0b5a94769d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 26 Feb 2020 16:02:29 -0500 Subject: Document Three Island scripts --- data/maps/ThreeIsland/map.json | 46 +-- data/maps/ThreeIsland/scripts.inc | 343 +++++++++++---------- data/maps/ThreeIsland/text.inc | 66 ++-- data/maps/ThreeIsland_BerryForest/map.json | 6 +- data/maps/ThreeIsland_BerryForest/scripts.inc | 30 +- data/maps/ThreeIsland_BerryForest/text.inc | 14 +- data/maps/ThreeIsland_BondBridge/map.json | 18 +- data/maps/ThreeIsland_BondBridge/scripts.inc | 8 +- data/maps/ThreeIsland_BondBridge/text.inc | 50 +-- data/maps/ThreeIsland_Harbor/map.json | 2 +- data/maps/ThreeIsland_Harbor/scripts.inc | 2 +- data/maps/ThreeIsland_House1/map.json | 4 +- data/maps/ThreeIsland_House1/scripts.inc | 8 +- data/maps/ThreeIsland_House1/text.inc | 4 +- data/maps/ThreeIsland_House2/map.json | 4 +- data/maps/ThreeIsland_House2/scripts.inc | 8 +- data/maps/ThreeIsland_House2/text.inc | 4 +- data/maps/ThreeIsland_House3/map.json | 2 +- data/maps/ThreeIsland_House3/scripts.inc | 4 +- data/maps/ThreeIsland_House3/text.inc | 2 +- data/maps/ThreeIsland_House4/map.json | 4 +- data/maps/ThreeIsland_House4/scripts.inc | 8 +- data/maps/ThreeIsland_House4/text.inc | 4 +- data/maps/ThreeIsland_House5/map.json | 2 +- data/maps/ThreeIsland_House5/scripts.inc | 10 +- data/maps/ThreeIsland_House5/text.inc | 4 +- data/maps/ThreeIsland_Mart/map.json | 8 +- data/maps/ThreeIsland_Mart/scripts.inc | 18 +- data/maps/ThreeIsland_Mart/text.inc | 6 +- data/maps/ThreeIsland_PokemonCenter_1F/map.json | 8 +- data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc | 14 +- data/maps/ThreeIsland_PokemonCenter_1F/text.inc | 6 +- data/maps/ThreeIsland_Port/map.json | 6 +- data/maps/ThreeIsland_Port/scripts.inc | 24 +- data/maps/ThreeIsland_Port/text.inc | 10 +- data/scripts/trainers.inc | 98 +++--- data/text/trainers.inc | 14 +- 37 files changed, 440 insertions(+), 429 deletions(-) (limited to 'data') diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index 9ccf2b29d..94e4ec4bf 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_1677E5", + "script": "ThreeIsland_EventScript_AntiBiker1", "flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_167989", + "script": "ThreeIsland_EventScript_AntiBiker2", "flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_1677D8", + "script": "ThreeIsland_EventScript_Biker", "flag": "FLAG_HIDE_THREE_ISLAND_LONE_BIKER" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_1677D8", + "script": "ThreeIsland_EventScript_Biker", "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_1677D8", + "script": "ThreeIsland_EventScript_Biker", "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_1677D8", + "script": "ThreeIsland_EventScript_Biker", "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_1677D8", + "script": "ThreeIsland_EventScript_Biker", "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_1677D8", + "script": "ThreeIsland_EventScript_Biker", "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { @@ -166,7 +166,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_167C77", + "script": "ThreeIsland_EventScript_Woman", "flag": "0" }, { @@ -179,7 +179,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_167C80", + "script": "ThreeIsland_EventScript_LittleBoy", "flag": "0" }, { @@ -192,7 +192,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_167C89", + "script": "ThreeIsland_EventScript_Doduo", "flag": "0" }, { @@ -205,7 +205,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_167CA5", + "script": "ThreeIsland_EventScript_Biker6", "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" } ], @@ -268,7 +268,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 2, - "script": "ThreeIsland_EventScript_1679B5" + "script": "ThreeIsland_EventScript_BikerBossIntroTrigger" }, { "type": "trigger", @@ -277,7 +277,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 2, - "script": "ThreeIsland_EventScript_1679B5" + "script": "ThreeIsland_EventScript_BikerBossIntroTrigger" }, { "type": "trigger", @@ -286,7 +286,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 2, - "script": "ThreeIsland_EventScript_1679B5" + "script": "ThreeIsland_EventScript_BikerBossIntroTrigger" }, { "type": "trigger", @@ -295,7 +295,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 2, - "script": "ThreeIsland_EventScript_1679B5" + "script": "ThreeIsland_EventScript_BikerBossIntroTrigger" }, { "type": "trigger", @@ -304,7 +304,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 3, - "script": "ThreeIsland_EventScript_167A1D" + "script": "ThreeIsland_EventScript_BattleBikersTriggerLeft" }, { "type": "trigger", @@ -313,7 +313,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 3, - "script": "ThreeIsland_EventScript_167A29" + "script": "ThreeIsland_EventScript_BattleBikersTriggerMidLeft" }, { "type": "trigger", @@ -322,7 +322,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 3, - "script": "ThreeIsland_EventScript_167A35" + "script": "ThreeIsland_EventScript_BattleBikersTriggerMid" }, { "type": "trigger", @@ -331,7 +331,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 2, - "script": "ThreeIsland_EventScript_1679B5" + "script": "ThreeIsland_EventScript_BikerBossIntroTrigger" }, { "type": "trigger", @@ -340,7 +340,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 3, - "script": "ThreeIsland_EventScript_167A41" + "script": "ThreeIsland_EventScript_BattleBikersTriggerMidRight" }, { "type": "trigger", @@ -349,7 +349,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 3, - "script": "ThreeIsland_EventScript_167A4D" + "script": "ThreeIsland_EventScript_BattleBikersTriggerRight" } ], "bg_events": [ @@ -358,7 +358,7 @@ "x": 12, "y": 31, "elevation": 0, - "script": "ThreeIsland_EventScript_167C9C" + "script": "ThreeIsland_EventScript_IslandSign" }, { "type": "hidden_item", diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index a92ad452a..484d8dba0 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -1,379 +1,390 @@ +.equ LOCALID_ANTIBIKER1, 1 +.equ LOCALID_ANTIBIKER2, 2 +.equ LOCALID_PAXTON, 3 +.equ LOCALID_BIKER1, 5 +.equ LOCALID_BIKER2, 7 +.equ LOCALID_BIKER3, 4 +.equ LOCALID_BIKER4, 6 +.equ LOCALID_BIKER5, 8 +.equ LOCALID_BIKER6, 14 + ThreeIsland_MapScripts:: @ 81677AD map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_OnTransition .byte 0 ThreeIsland_OnTransition:: @ 81677B3 setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND - call_if_set FLAG_RESCUED_LOSTELLE, EventScript_1677CB + call_if_set FLAG_RESCUED_LOSTELLE, ThreeIsland_EventScript_HideAntiBikers compare VAR_MAP_SCENE_THREE_ISLAND, 4 - call_if_eq EventScript_1677CF + call_if_eq ThreeIsland_EventScript_SetAntiBikersMovementAfterBikers end -EventScript_1677CB:: @ 81677CB +ThreeIsland_EventScript_HideAntiBikers:: @ 81677CB setflag FLAG_HIDE_THREE_ISLAND_ANTIBIKERS return -EventScript_1677CF:: @ 81677CF - setobjectmovementtype 1, 1 - setobjectmovementtype 2, 1 +ThreeIsland_EventScript_SetAntiBikersMovementAfterBikers:: @ 81677CF + setobjectmovementtype LOCALID_ANTIBIKER1, MOVEMENT_TYPE_LOOK_AROUND + setobjectmovementtype LOCALID_ANTIBIKER2, MOVEMENT_TYPE_LOOK_AROUND return -ThreeIsland_EventScript_1677D8:: @ 81677D8 +ThreeIsland_EventScript_Biker:: @ 81677D8 lock setvar VAR_TEMP_1, 2 - call EventScript_16786F + call ThreeIsland_EventScript_BikerArgumentScene release end -ThreeIsland_EventScript_1677E5:: @ 81677E5 +ThreeIsland_EventScript_AntiBiker1:: @ 81677E5 lock - goto_if_set FLAG_GOT_FULL_RESTORE_FROM_THREE_ISLAND_DEFENDER, EventScript_167806 + goto_if_set FLAG_GOT_FULL_RESTORE_FROM_THREE_ISLAND_DEFENDER, ThreeIsland_EventScript_AntiBiker1GotFullRestore compare VAR_MAP_SCENE_THREE_ISLAND, 4 - goto_if_eq EventScript_16781A + goto_if_eq ThreeIsland_EventScript_GiveFullRestore setvar VAR_TEMP_1, 0 - call EventScript_16786F + call ThreeIsland_EventScript_BikerArgumentScene release end -EventScript_167806:: @ 8167806 - applymovement 1, Movement_FacePlayer +ThreeIsland_EventScript_AntiBiker1GotFullRestore:: @ 8167806 + applymovement LOCALID_ANTIBIKER1, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_81827F1 + msgbox ThreeIsland_Text_YouveGotImpressiveMons release end -EventScript_16781A:: @ 816781A - applymovement 1, Movement_FacePlayer +ThreeIsland_EventScript_GiveFullRestore:: @ 816781A + applymovement LOCALID_ANTIBIKER1, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_818275A + msgbox ThreeIsland_Text_ThankYouOhYourMonGotHurt checkitemspace ITEM_FULL_RESTORE, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_167865 - msgreceiveditem gUnknown_81827BE, ITEM_FULL_RESTORE + goto_if_eq ThreeIsland_EventScript_NoRoomForFullRestore + msgreceiveditem ThreeIsland_Text_GivenFullRestore, ITEM_FULL_RESTORE additem ITEM_FULL_RESTORE setflag FLAG_GOT_FULL_RESTORE_FROM_THREE_ISLAND_DEFENDER - msgbox gUnknown_81827F1 + msgbox ThreeIsland_Text_YouveGotImpressiveMons release end -EventScript_167865:: @ 8167865 - msgbox gUnknown_81827DB +ThreeIsland_EventScript_NoRoomForFullRestore:: @ 8167865 + msgbox ThreeIsland_Text_OhYourBagIsFull release end -EventScript_16786F:: @ 816786F +ThreeIsland_EventScript_BikerArgumentScene:: @ 816786F compare VAR_TEMP_1, 1 - call_if_eq EventScript_167947 + call_if_eq ThreeIsland_EventScript_PlayerFaceLeft compare VAR_TEMP_1, 2 - call_if_eq EventScript_167947 - applymovement 1, Movement_167A1B + call_if_eq ThreeIsland_EventScript_PlayerFaceLeft + applymovement LOCALID_ANTIBIKER1, ThreeIsland_Movement_SpeakRight waitmovement 0 - msgbox gUnknown_81820C0 + msgbox ThreeIsland_Text_GoBackToKanto compare VAR_TEMP_1, 0 - call_if_eq EventScript_167952 + call_if_eq ThreeIsland_EventScript_PlayerFaceRight compare VAR_TEMP_1, 1 - call_if_eq EventScript_167952 + call_if_eq ThreeIsland_EventScript_PlayerFaceRight compare VAR_TEMP_1, 2 - call_if_eq EventScript_16795D - applymovement 5, Movement_167A19 + call_if_eq ThreeIsland_EventScript_PlayerFaceBiker + applymovement LOCALID_BIKER1, ThreeIsland_Movement_SpeakLeft waitmovement 0 - msgbox gUnknown_8182125 + msgbox ThreeIsland_Text_BossIsOnHisWay compare VAR_TEMP_1, 0 - call_if_eq EventScript_167931 + call_if_eq ThreeIsland_EventScript_PlayerFaceUp compare VAR_TEMP_1, 1 - call_if_eq EventScript_167931 + call_if_eq ThreeIsland_EventScript_PlayerFaceUp compare VAR_TEMP_1, 2 - call_if_eq EventScript_167973 - applymovement 2, Movement_167A1B + call_if_eq ThreeIsland_EventScript_PlayerFaceAntiBiker + applymovement LOCALID_ANTIBIKER2, ThreeIsland_Movement_SpeakRight waitmovement 0 - msgbox gUnknown_81821A9 + msgbox ThreeIsland_Text_GetOffIslandNow compare VAR_TEMP_1, 0 - call_if_eq EventScript_167952 + call_if_eq ThreeIsland_EventScript_PlayerFaceRight compare VAR_TEMP_1, 1 - call_if_eq EventScript_167952 + call_if_eq ThreeIsland_EventScript_PlayerFaceRight compare VAR_TEMP_1, 2 - call_if_eq EventScript_16795D - applymovement 4, Movement_167A19 + call_if_eq ThreeIsland_EventScript_PlayerFaceBiker + applymovement LOCALID_BIKER3, ThreeIsland_Movement_SpeakLeft waitmovement 0 - msgbox gUnknown_81821DC + msgbox ThreeIsland_Text_WhosGonnaMakeMe return -EventScript_167931:: @ 8167931 +ThreeIsland_EventScript_PlayerFaceUp:: @ 8167931 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return -EventScript_16793C:: @ 816793C +@ Unused +ThreeIsland_EventScript_PlayerFaceDown:: @ 816793C applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return -EventScript_167947:: @ 8167947 +ThreeIsland_EventScript_PlayerFaceLeft:: @ 8167947 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return -EventScript_167952:: @ 8167952 +ThreeIsland_EventScript_PlayerFaceRight:: @ 8167952 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 return -EventScript_16795D:: @ 816795D +ThreeIsland_EventScript_PlayerFaceBiker:: @ 816795D getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 9 - goto_if_ge EventScript_167931 - goto EventScript_167952 + goto_if_ge ThreeIsland_EventScript_PlayerFaceUp + goto ThreeIsland_EventScript_PlayerFaceRight end -EventScript_167973:: @ 8167973 +ThreeIsland_EventScript_PlayerFaceAntiBiker:: @ 8167973 getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 9 - goto_if_ge EventScript_167947 - goto EventScript_167931 + goto_if_ge ThreeIsland_EventScript_PlayerFaceLeft + goto ThreeIsland_EventScript_PlayerFaceUp end -ThreeIsland_EventScript_167989:: @ 8167989 +ThreeIsland_EventScript_AntiBiker2:: @ 8167989 lock compare VAR_MAP_SCENE_THREE_ISLAND, 4 - goto_if_eq EventScript_1679A1 + goto_if_eq ThreeIsland_EventScript_AntiBiker2BikersGone setvar VAR_TEMP_1, 1 - call EventScript_16786F + call ThreeIsland_EventScript_BikerArgumentScene release end -EventScript_1679A1:: @ 81679A1 - applymovement 2, Movement_FacePlayer +ThreeIsland_EventScript_AntiBiker2BikersGone:: @ 81679A1 + applymovement LOCALID_ANTIBIKER2, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_8182823 + msgbox ThreeIsland_Text_LostelleWentOffTowardsBondBridge release end -ThreeIsland_EventScript_1679B5:: @ 81679B5 +ThreeIsland_EventScript_BikerBossIntroTrigger:: @ 81679B5 lockall textcolor 0 - applymovement 1, Movement_167A1B + applymovement LOCALID_ANTIBIKER1, ThreeIsland_Movement_SpeakRight waitmovement 0 - msgbox gUnknown_81821F1 - applymovement 3, Movement_167A19 + msgbox ThreeIsland_Text_AreYouBossGoBackToKanto + applymovement LOCALID_PAXTON, ThreeIsland_Movement_SpeakLeft waitmovement 0 - msgbox gUnknown_818221F - applymovement 1, Movement_167A1B + msgbox ThreeIsland_Text_JustGotHerePal + applymovement LOCALID_ANTIBIKER1, ThreeIsland_Movement_SpeakRight waitmovement 0 - msgbox gUnknown_8182275 - applymovement 3, Movement_167A19 + msgbox ThreeIsland_Text_FollowersRaisingHavoc + applymovement LOCALID_PAXTON, ThreeIsland_Movement_SpeakLeft waitmovement 0 - msgbox gUnknown_81822FB - applymovement 1, Movement_167A1B + msgbox ThreeIsland_Text_OughtToBeThankingUs + applymovement LOCALID_ANTIBIKER1, ThreeIsland_Movement_SpeakRight waitmovement 0 - msgbox gUnknown_81823C7 + msgbox ThreeIsland_Text_YouCowardsToughInPack setvar VAR_MAP_SCENE_THREE_ISLAND, 3 releaseall end -Movement_167A19:: @ 8167A19 +ThreeIsland_Movement_SpeakLeft:: @ 8167A19 walk_in_place_left step_end -Movement_167A1B:: @ 8167A1B +ThreeIsland_Movement_SpeakRight:: @ 8167A1B walk_in_place_right step_end -ThreeIsland_EventScript_167A1D:: @ 8167A1D +ThreeIsland_EventScript_BattleBikersTriggerLeft:: @ 8167A1D lockall setvar VAR_TEMP_1, 0 - goto EventScript_167A59 + goto ThreeIsland_EventScript_BattleBikersScene end -ThreeIsland_EventScript_167A29:: @ 8167A29 +ThreeIsland_EventScript_BattleBikersTriggerMidLeft:: @ 8167A29 lockall setvar VAR_TEMP_1, 1 - goto EventScript_167A59 + goto ThreeIsland_EventScript_BattleBikersScene end -ThreeIsland_EventScript_167A35:: @ 8167A35 +ThreeIsland_EventScript_BattleBikersTriggerMid:: @ 8167A35 lockall setvar VAR_TEMP_1, 2 - goto EventScript_167A59 + goto ThreeIsland_EventScript_BattleBikersScene end -ThreeIsland_EventScript_167A41:: @ 8167A41 +ThreeIsland_EventScript_BattleBikersTriggerMidRight:: @ 8167A41 lockall setvar VAR_TEMP_1, 3 - goto EventScript_167A59 + goto ThreeIsland_EventScript_BattleBikersScene end -ThreeIsland_EventScript_167A4D:: @ 8167A4D +ThreeIsland_EventScript_BattleBikersTriggerRight:: @ 8167A4D lockall setvar VAR_TEMP_1, 4 - goto EventScript_167A59 + goto ThreeIsland_EventScript_BattleBikersScene end -EventScript_167A59:: @ 8167A59 +ThreeIsland_EventScript_BattleBikersScene:: @ 8167A59 textcolor 0 - applymovement 5, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BIKER1, Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN - applymovement 5, Movement_ExclamationMark + applymovement LOCALID_BIKER1, Movement_ExclamationMark waitmovement 0 - applymovement 5, Movement_Delay48 + applymovement LOCALID_BIKER1, Movement_Delay48 waitmovement 0 - applymovement 5, Movement_167C57 + applymovement LOCALID_BIKER1, ThreeIsland_Movement_BikerApproach waitmovement 0 playbgm MUS_SHOUNEN, 0 - msgbox gUnknown_81823ED, MSGBOX_YESNO + msgbox ThreeIsland_Text_WannaMakeSomethingOfYourStaring, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_167C35 - msgbox gUnknown_818247D - setvar VAR_LAST_TALKED, 5 - trainerbattle_no_intro TRAINER_BIKER_GOON, Text_1824B7 - applymovement 5, Movement_167C5C + goto_if_eq ThreeIsland_EventScript_LeaveBikersAlone + msgbox ThreeIsland_Text_Biker1Intro + setvar VAR_LAST_TALKED, LOCALID_BIKER1 + trainerbattle_no_intro TRAINER_BIKER_GOON, ThreeIsland_Text_Biker1Defeat + applymovement LOCALID_BIKER1, ThreeIsland_Movement_BikerSpeak waitmovement 0 - msgbox gUnknown_81824CF + msgbox ThreeIsland_Text_Biker1PostBattle closemessage - applymovement 7, Movement_167C57 + applymovement LOCALID_BIKER2, ThreeIsland_Movement_BikerApproach waitmovement 0 playbgm MUS_SHOUNEN, 0 - msgbox gUnknown_81824EF - setvar VAR_LAST_TALKED, 7 - trainerbattle_no_intro TRAINER_BIKER_GOON_2, Text_182521 - applymovement 7, Movement_167C5C + msgbox ThreeIsland_Text_Biker2Intro + setvar VAR_LAST_TALKED, LOCALID_BIKER2 + trainerbattle_no_intro TRAINER_BIKER_GOON_2, ThreeIsland_Text_Biker2Defeat + applymovement LOCALID_BIKER2, ThreeIsland_Movement_BikerSpeak waitmovement 0 - msgbox gUnknown_8182536 + msgbox ThreeIsland_Text_Biker2PostBattle closemessage - applymovement 4, Movement_167C57 + applymovement LOCALID_BIKER3, ThreeIsland_Movement_BikerApproach waitmovement 0 playbgm MUS_SHOUNEN, 0 - msgbox gUnknown_8182582 - setvar VAR_LAST_TALKED, 4 - trainerbattle_no_intro TRAINER_BIKER_GOON_3, Text_1825D4 - applymovement 4, Movement_WalkInPlaceFastestLeft + msgbox ThreeIsland_Text_Biker3Intro + setvar VAR_LAST_TALKED, LOCALID_BIKER3 + trainerbattle_no_intro TRAINER_BIKER_GOON_3, ThreeIsland_Text_Biker3Defeat + applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement 6, Movement_WalkInPlaceFastestDown - applymovement 8, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BIKER4, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BIKER5, Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox gUnknown_81825E2 + msgbox ThreeIsland_Text_Biker3PostBattle closemessage delay 45 compare VAR_TEMP_1, 0 - call_if_eq EventScript_167BC6 + call_if_eq ThreeIsland_EventScript_PaxtonApproachLeft compare VAR_TEMP_1, 1 - call_if_eq EventScript_167BD8 + call_if_eq ThreeIsland_EventScript_PaxtonApproachMidLeft compare VAR_TEMP_1, 2 - call_if_eq EventScript_167BEA + call_if_eq ThreeIsland_EventScript_PaxtonApproachMid compare VAR_TEMP_1, 3 - call_if_eq EventScript_167C03 + call_if_eq ThreeIsland_EventScript_PaxtonApproachMidRight compare VAR_TEMP_1, 4 - call_if_eq EventScript_167C1C + call_if_eq ThreeIsland_EventScript_PaxtonApproachRight playbgm MUS_SHOUNEN, 0 - msgbox gUnknown_8182623 - setvar VAR_LAST_TALKED, 3 - trainerbattle_no_intro TRAINER_CUE_BALL_PAXTON, Text_1826B7 - msgbox gUnknown_818271D + msgbox ThreeIsland_Text_PaxtonIntro + setvar VAR_LAST_TALKED, LOCALID_PAXTON + trainerbattle_no_intro TRAINER_CUE_BALL_PAXTON, ThreeIsland_Text_PaxtonDefeat + msgbox ThreeIsland_Text_PaxtonPostBattle closemessage fadescreen FADE_TO_BLACK - removeobject 3 - removeobject 5 - removeobject 7 - removeobject 4 - removeobject 6 - removeobject 8 - removeobject 14 + removeobject LOCALID_PAXTON + removeobject LOCALID_BIKER1 + removeobject LOCALID_BIKER2 + removeobject LOCALID_BIKER3 + removeobject LOCALID_BIKER4 + removeobject LOCALID_BIKER5 + removeobject LOCALID_BIKER6 fadescreen FADE_FROM_BLACK setvar VAR_MAP_SCENE_THREE_ISLAND, 4 releaseall end -EventScript_167BC6:: @ 8167BC6 - applymovement 4, Movement_WalkInPlaceFastestDown - applymovement 3, Movement_167C5E +ThreeIsland_EventScript_PaxtonApproachLeft:: @ 8167BC6 + applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown + applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachLeft waitmovement 0 return -EventScript_167BD8:: @ 8167BD8 - applymovement 4, Movement_WalkInPlaceFastestDown - applymovement 3, Movement_167C62 +ThreeIsland_EventScript_PaxtonApproachMidLeft:: @ 8167BD8 + applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown + applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMidLeft waitmovement 0 return -EventScript_167BEA:: @ 8167BEA - applymovement 4, Movement_WalkInPlaceFastestDown - applymovement 3, Movement_167C64 - applymovement OBJ_EVENT_ID_PLAYER, Movement_167C68 +ThreeIsland_EventScript_PaxtonApproachMid:: @ 8167BEA + applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown + applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMid + applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton waitmovement 0 return -EventScript_167C03:: @ 8167C03 - applymovement 4, Movement_WalkInPlaceFastestDown - applymovement OBJ_EVENT_ID_PLAYER, Movement_167C68 - applymovement 3, Movement_167C6C +ThreeIsland_EventScript_PaxtonApproachMidRight:: @ 8167C03 + applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton + applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMidRight waitmovement 0 return -EventScript_167C1C:: @ 8167C1C - applymovement 4, Movement_WalkInPlaceFastestDown - applymovement OBJ_EVENT_ID_PLAYER, Movement_167C68 - applymovement 3, Movement_167C71 +ThreeIsland_EventScript_PaxtonApproachRight:: @ 8167C1C + applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton + applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachRight waitmovement 0 return -EventScript_167C35:: @ 8167C35 - msgbox gUnknown_8182453 +ThreeIsland_EventScript_LeaveBikersAlone:: @ 8167C35 + msgbox ThreeIsland_Text_ThatsSmart closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_167C55 + applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerLeaveBikers waitmovement 0 - applymovement 5, Movement_167C59 + applymovement LOCALID_BIKER1, ThreeIsland_Movement_Biker1ReturnToPack waitmovement 0 fadedefaultbgm releaseall end -Movement_167C55:: @ 8167C55 +ThreeIsland_Movement_PlayerLeaveBikers:: @ 8167C55 walk_down step_end -Movement_167C57:: @ 8167C57 +ThreeIsland_Movement_BikerApproach:: @ 8167C57 walk_down step_end -Movement_167C59:: @ 8167C59 +ThreeIsland_Movement_Biker1ReturnToPack:: @ 8167C59 walk_up walk_in_place_fastest_left step_end -Movement_167C5C:: @ 8167C5C +ThreeIsland_Movement_BikerSpeak:: @ 8167C5C walk_in_place_down step_end -Movement_167C5E:: @ 8167C5E +ThreeIsland_Movement_PaxtonApproachLeft:: @ 8167C5E walk_down walk_left walk_in_place_fastest_down step_end -Movement_167C62:: @ 8167C62 +ThreeIsland_Movement_PaxtonApproachMidLeft:: @ 8167C62 walk_down step_end -Movement_167C64:: @ 8167C64 +ThreeIsland_Movement_PaxtonApproachMid:: @ 8167C64 walk_down walk_down walk_in_place_fastest_right step_end -Movement_167C68:: @ 8167C68 +ThreeIsland_Movement_PlayerFacePaxton:: @ 8167C68 delay_16 delay_16 walk_in_place_fastest_left step_end -Movement_167C6C:: @ 8167C6C +ThreeIsland_Movement_PaxtonApproachMidRight:: @ 8167C6C walk_down walk_down walk_right walk_in_place_fastest_right step_end -Movement_167C71:: @ 8167C71 +ThreeIsland_Movement_PaxtonApproachRight:: @ 8167C71 walk_down walk_down walk_right @@ -381,28 +392,28 @@ Movement_167C71:: @ 8167C71 walk_in_place_fastest_right step_end -ThreeIsland_EventScript_167C77:: @ 8167C77 - msgbox gUnknown_81828EB, MSGBOX_NPC +ThreeIsland_EventScript_Woman:: @ 8167C77 + msgbox ThreeIsland_Text_WouldntWantToSeeBikersHereAgain, MSGBOX_NPC end -ThreeIsland_EventScript_167C80:: @ 8167C80 - msgbox gUnknown_818298A, MSGBOX_NPC +ThreeIsland_EventScript_LittleBoy:: @ 8167C80 + msgbox ThreeIsland_Text_WhenDodouEvolvesGoingToPlayGame, MSGBOX_NPC end -ThreeIsland_EventScript_167C89:: @ 8167C89 +ThreeIsland_EventScript_Doduo:: @ 8167C89 lock faceplayer waitse playmoncry SPECIES_DODUO, 0 - msgbox gUnknown_81829F4 + msgbox ThreeIsland_Text_Doduo waitmoncry release end -ThreeIsland_EventScript_167C9C:: @ 8167C9C - msgbox gUnknown_8182061, MSGBOX_SIGN +ThreeIsland_EventScript_IslandSign:: @ 8167C9C + msgbox ThreeIsland_Text_IslandSign, MSGBOX_SIGN end -ThreeIsland_EventScript_167CA5:: @ 8167CA5 - msgbox gUnknown_818208B, MSGBOX_NPC +ThreeIsland_EventScript_Biker6:: @ 8167CA5 + msgbox ThreeIsland_Text_IslandBelongsToUs, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland/text.inc b/data/maps/ThreeIsland/text.inc index 31e058a67..6f18aab9d 100644 --- a/data/maps/ThreeIsland/text.inc +++ b/data/maps/ThreeIsland/text.inc @@ -1,50 +1,50 @@ -gUnknown_8182061:: @ 8182061 +ThreeIsland_Text_IslandSign:: @ 8182061 .string "THREE ISLAND\n" .string "Kin Island of Family Bonding$" -gUnknown_818208B:: @ 818208B +ThreeIsland_Text_IslandBelongsToUs:: @ 818208B .string "Hyahoo!\p" .string "From this day on, this island\n" .string "belongs to us!$" -gUnknown_81820C0:: @ 81820C0 +ThreeIsland_Text_GoBackToKanto:: @ 81820C0 .string "We don't need you people bringing\n" .string "your noise and trouble here!\p" .string "We're asking you to go back to\n" .string "KANTO!$" -gUnknown_8182125:: @ 8182125 +ThreeIsland_Text_BossIsOnHisWay:: @ 8182125 .string "Hey, go cry somewhere else.\n" .string "Our boss is on his way.\p" .string "When he gets here, we'll give you\n" .string "a k-rad motorbike show you won't\l" .string "soon forget!$" -gUnknown_81821A9:: @ 81821A9 +ThreeIsland_Text_GetOffIslandNow:: @ 81821A9 .string "W-what!? Not on your life!\n" .string "Get off the island now!$" -gUnknown_81821DC:: @ 81821DC +ThreeIsland_Text_WhosGonnaMakeMe:: @ 81821DC .string "Who's gonna make me?$" -gUnknown_81821F1:: @ 81821F1 +ThreeIsland_Text_AreYouBossGoBackToKanto:: @ 81821F1 .string "Are you the boss?\n" .string "Go back to KANTO right now!$" -gUnknown_818221F:: @ 818221F +ThreeIsland_Text_JustGotHerePal:: @ 818221F .string "Hah?\p" .string "I just got here, pal.\p" .string "What's with the hostile attitude?\n" .string "It's mighty cold of you!$" -gUnknown_8182275:: @ 8182275 +ThreeIsland_Text_FollowersRaisingHavoc:: @ 8182275 .string "Your gang of followers have been\n" .string "raising havoc on their bikes.\p" .string "Do you have any idea how much\n" .string "trouble they've caused us on the\l" .string "island?$" -gUnknown_81822FB:: @ 81822FB +ThreeIsland_Text_OughtToBeThankingUs:: @ 81822FB .string "No, man, I don't get it at all.\p" .string "Look at this place.\n" .string "What do you do for entertainment?\p" @@ -53,57 +53,57 @@ gUnknown_81822FB:: @ 81822FB .string "But hey, if you insist, you can try\n" .string "making us leave.$" -gUnknown_81823C7:: @ 81823C7 +ThreeIsland_Text_YouCowardsToughInPack:: @ 81823C7 .string "Grr… You cowards…\n" .string "So tough in a pack…$" -gUnknown_81823ED:: @ 81823ED +ThreeIsland_Text_WannaMakeSomethingOfYourStaring:: @ 81823ED .string "You, what are you staring at?\n" .string "Don't you know it's not polite?\p" .string "You wanna make something of it\n" .string "or what?$" -gUnknown_8182453:: @ 8182453 +ThreeIsland_Text_ThatsSmart:: @ 8182453 .string "That's smart.\n" .string "Keep your nose out of this.$" -gUnknown_818247D:: @ 818247D +ThreeIsland_Text_Biker1Intro:: @ 818247D .string "Heh, I like your guts.\n" .string "You'll be losing money to me, but…$" -Text_1824B7:: @ 81824B7 +ThreeIsland_Text_Biker1Defeat:: @ 81824B7 .string "Wha…\n" .string "What is this kid?!$" -gUnknown_81824CF:: @ 81824CF +ThreeIsland_Text_Biker1PostBattle:: @ 81824CF .string "Aww, man…\n" .string "Don't you dare laugh!$" -gUnknown_81824EF:: @ 81824EF +ThreeIsland_Text_Biker2Intro:: @ 81824EF .string "Aren't you from KANTO?\n" .string "You should be on our side!$" -Text_182521:: @ 8182521 +ThreeIsland_Text_Biker2Defeat:: @ 8182521 .string "Stop fooling around!$" -gUnknown_8182536:: @ 8182536 +ThreeIsland_Text_Biker2PostBattle:: @ 8182536 .string "What's the matter with you,\n" .string "getting all hot like that?\p" .string "Totally uncool, man!$" -gUnknown_8182582:: @ 8182582 +ThreeIsland_Text_Biker3Intro:: @ 8182582 .string "We invited the boss out here,\n" .string "but you had to mess it up!\p" .string "You embarrassed us, man!$" -Text_1825D4:: @ 81825D4 +ThreeIsland_Text_Biker3Defeat:: @ 81825D4 .string "… … … … … …$" -gUnknown_81825E2:: @ 81825E2 +ThreeIsland_Text_Biker3PostBattle:: @ 81825E2 .string "Boss, I'm telling you, you've gotta\n" .string "do something about this kid!$" -gUnknown_8182623:: @ 8182623 +ThreeIsland_Text_PaxtonIntro:: @ 8182623 .string "I've been watching you, and I'd say\n" .string "you've done enough.\p" .string "What are you, their friend or\n" @@ -111,35 +111,35 @@ gUnknown_8182623:: @ 8182623 .string "Then I guess you'll be battling me\n" .string "in their place.$" -Text_1826B7:: @ 81826B7 +ThreeIsland_Text_PaxtonDefeat:: @ 81826B7 .string "All right, enough!\n" .string "We'll leave like you wanted!\p" .string "We'll be happy to see the last of\n" .string "this boring island!$" -gUnknown_818271D:: @ 818271D +ThreeIsland_Text_PaxtonPostBattle:: @ 818271D .string "Humph! Yeah, go right on hanging\n" .string "around with these hayseeds!$" -gUnknown_818275A:: @ 818275A +ThreeIsland_Text_ThankYouOhYourMonGotHurt:: @ 818275A .string "Thank you! Those goons were\n" .string "nothing but bad trouble.\p" .string "Oh, look, your POKéMON got hurt\n" .string "on my account.$" -gUnknown_81827BE:: @ 81827BE +ThreeIsland_Text_GivenFullRestore:: @ 81827BE .string "{PLAYER} was given\n" .string "a FULL RESTORE.$" -gUnknown_81827DB:: @ 81827DB +ThreeIsland_Text_OhYourBagIsFull:: @ 81827DB .string "Oh?\n" .string "Your BAG is full.$" -gUnknown_81827F1:: @ 81827F1 +ThreeIsland_Text_YouveGotImpressiveMons:: @ 81827F1 .string "You've got seriously impressive\n" .string "POKéMON with you.$" -gUnknown_8182823:: @ 8182823 +ThreeIsland_Text_LostelleWentOffTowardsBondBridge:: @ 8182823 .string "It'd be fantastic if someone as\n" .string "strong as you lived here.\p" .string "I hope you'll at least stay here\n" @@ -149,19 +149,19 @@ gUnknown_8182823:: @ 8182823 .string "LOSTELLE went off towards BOND\n" .string "BRIDGE a while ago.$" -gUnknown_81828EB:: @ 81828EB +ThreeIsland_Text_WouldntWantToSeeBikersHereAgain:: @ 81828EB .string "THREE ISLAND is actually the most\n" .string "populous of the islands here.\p" .string "Still, it could be less sleepy.\p" .string "But I wouldn't want to see goons\n" .string "like those BIKERS here again.$" -gUnknown_818298A:: @ 818298A +ThreeIsland_Text_WhenDodouEvolvesGoingToPlayGame:: @ 818298A .string "I'm going to train my DODUO in the\n" .string "BERRY FOREST.\p" .string "When it evolves, I'm going to play\n" .string "a game on TWO ISLAND.$" -gUnknown_81829F4:: @ 81829F4 +ThreeIsland_Text_Doduo:: @ 81829F4 .string "DODUO: Gigiih!$" diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index 446dc2074..db32d0122 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_163C83", + "script": "ThreeIsland_BerryForest_EventScript_Lostelle", "flag": "FLAG_HIDE_LOSTELLE_IN_BERRY_FOREST" }, { @@ -228,14 +228,14 @@ "x": 7, "y": 27, "elevation": 0, - "script": "ThreeIsland_BerryForest_EventScript_163D31" + "script": "ThreeIsland_BerryForest_EventScript_BewareSign" }, { "type": "bg_event_type_0", "x": 39, "y": 35, "elevation": 0, - "script": "ThreeIsland_BerryForest_EventScript_163D28" + "script": "ThreeIsland_BerryForest_EventScript_WelcomeSign" }, { "type": "hidden_item", diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index cf1693258..cc750f1f4 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -7,16 +7,16 @@ ThreeIsland_BerryForest_OnTransition:: @ 8163C77 setescapewarp MAP_THREE_ISLAND_BOND_BRIDGE, 255, 12, 6 end -ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 +ThreeIsland_BerryForest_EventScript_Lostelle:: @ 8163C83 lock faceplayer - msgbox gUnknown_817ADD6 + msgbox ThreeIsland_BerryForest_Text_HelpScaryPokemon playse SE_PIN applymovement 1, Movement_ExclamationMark waitmovement 0 - applymovement 1, Movement_163D22 + applymovement 1, ThreeIsland_BerryForest_Movement_LostelleLookAround waitmovement 0 - msgbox gUnknown_817AE8E + msgbox ThreeIsland_BerryForest_Text_HereItComesAgain goto_if_questlog EventScript_ReleaseEnd waitse playmoncry SPECIES_HYPNO, 2 @@ -26,12 +26,12 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 special sub_8112364 applymovement 1, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_817AEE1 + msgbox ThreeIsland_BerryForest_Text_ThankYouHaveThis giveitem ITEM_IAPAPA_BERRY - compare VAR_RESULT, 0 - call_if_eq EventScript_163D19 + compare VAR_RESULT, FALSE + call_if_eq ThreeIsland_BerryForest_EventScript_NoRoomForBerry special Special_BufferBigGuyOrBigGirlString - msgbox gUnknown_817AF3B + msgbox ThreeIsland_BerryForest_Text_LetsGoHome closemessage setflag FLAG_RESCUED_LOSTELLE setflag FLAG_HIDE_LOSTELLE_IN_BERRY_FOREST @@ -42,11 +42,11 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 release end -EventScript_163D19:: @ 8163D19 - msgbox gUnknown_817AF9F +ThreeIsland_BerryForest_EventScript_NoRoomForBerry:: @ 8163D19 + msgbox ThreeIsland_BerryForest_Text_BerryPouchIsFull return -Movement_163D22:: @ 8163D22 +ThreeIsland_BerryForest_Movement_LostelleLookAround:: @ 8163D22 walk_in_place_fastest_left delay_16 walk_in_place_fastest_right @@ -54,10 +54,10 @@ Movement_163D22:: @ 8163D22 walk_in_place_fastest_left step_end -ThreeIsland_BerryForest_EventScript_163D28:: @ 8163D28 - msgbox gUnknown_817AFD6, MSGBOX_SIGN +ThreeIsland_BerryForest_EventScript_WelcomeSign:: @ 8163D28 + msgbox ThreeIsland_BerryForest_Text_WelcomeToBerryForest, MSGBOX_SIGN end -ThreeIsland_BerryForest_EventScript_163D31:: @ 8163D31 - msgbox gUnknown_817B029, MSGBOX_SIGN +ThreeIsland_BerryForest_EventScript_BewareSign:: @ 8163D31 + msgbox ThreeIsland_BerryForest_Text_BewareWildBerryLovingMons, MSGBOX_SIGN end diff --git a/data/maps/ThreeIsland_BerryForest/text.inc b/data/maps/ThreeIsland_BerryForest/text.inc index 807df9c30..fdb08e3c6 100644 --- a/data/maps/ThreeIsland_BerryForest/text.inc +++ b/data/maps/ThreeIsland_BerryForest/text.inc @@ -1,4 +1,4 @@ -gUnknown_817ADD6:: @ 817ADD6 +ThreeIsland_BerryForest_Text_HelpScaryPokemon:: @ 817ADD6 .string "LOSTELLE: Whimper… Sniff…\n" .string "Oh! Please, help!\p" .string "A scary POKéMON appeared there\n" @@ -8,36 +8,36 @@ gUnknown_817ADD6:: @ 817ADD6 .string "I'm too scared to move!\n" .string "But I want to go home…$" -gUnknown_817AE8E:: @ 817AE8E +ThreeIsland_BerryForest_Text_HereItComesAgain:: @ 817AE8E .string "Oh! Here it comes again!\n" .string "No! Go away! It's scaring me!\p" .string "Waaaaaaah!\n" .string "I want my daddy!$" -gUnknown_817AEE1:: @ 817AEE1 +ThreeIsland_BerryForest_Text_ThankYouHaveThis:: @ 817AEE1 .string "Ohh! That was so scary!\n" .string "Thank you!\p" .string "LOSTELLE came to pick some\n" .string "BERRIES.\p" .string "You can have this!$" -gUnknown_817AF3B:: @ 817AF3B +ThreeIsland_BerryForest_Text_LetsGoHome:: @ 817AF3B .string "What's your name?\p" .string "LOSTELLE's scared, so can I go\n" .string "with you to my daddy's house?\p" .string "Okay!\n" .string "Let's go home!$" -gUnknown_817AF9F:: @ 817AF9F +ThreeIsland_BerryForest_Text_BerryPouchIsFull:: @ 817AF9F .string "Your BERRY POUCH is full.\n" .string "I guess you don't want this.$" -gUnknown_817AFD6:: @ 817AFD6 +ThreeIsland_BerryForest_Text_WelcomeToBerryForest:: @ 817AFD6 .string "Welcome to the BERRY FOREST\p" .string "Be friendly and share BERRIES with\n" .string "others and POKéMON.$" -gUnknown_817B029:: @ 817B029 +ThreeIsland_BerryForest_Text_BewareWildBerryLovingMons:: @ 817B029 .string "Beware of wild, BERRY-loving\n" .string "POKéMON!$" diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json index e4e05fb76..d9041df2d 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -31,7 +31,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "ThreeIsland_BondBridge_EventScript_1ABF65", + "script": "ThreeIsland_BondBridge_EventScript_Nikki", "flag": "0" }, { @@ -44,7 +44,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "ThreeIsland_BondBridge_EventScript_1ABFA3", + "script": "ThreeIsland_BondBridge_EventScript_Violet", "flag": "0" }, { @@ -57,7 +57,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "ThreeIsland_BondBridge_EventScript_1ABFE1", + "script": "ThreeIsland_BondBridge_EventScript_Amira", "flag": "0" }, { @@ -70,7 +70,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "ThreeIsland_BondBridge_EventScript_1AC01F", + "script": "ThreeIsland_BondBridge_EventScript_Alexis", "flag": "0" }, { @@ -83,7 +83,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "ThreeIsland_BondBridge_EventScript_1AC05D", + "script": "ThreeIsland_BondBridge_EventScript_Tisha", "flag": "0" }, { @@ -96,7 +96,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "ThreeIsland_BondBridge_EventScript_1AC09B", + "script": "ThreeIsland_BondBridge_EventScript_Joy", "flag": "0" }, { @@ -109,7 +109,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "ThreeIsland_BondBridge_EventScript_1AC0E1", + "script": "ThreeIsland_BondBridge_EventScript_Meg", "flag": "0" }, { @@ -162,7 +162,7 @@ "x": 14, "y": 7, "elevation": 0, - "script": "ThreeIsland_BondBridge_EventScript_168777" + "script": "ThreeIsland_BondBridge_EventScript_BerryForestSign" }, { "type": "hidden_item", @@ -199,7 +199,7 @@ "x": 91, "y": 9, "elevation": 0, - "script": "ThreeIsland_BondBridge_EventScript_168780" + "script": "ThreeIsland_BondBridge_EventScript_BondBridgeSign" } ] } diff --git a/data/maps/ThreeIsland_BondBridge/scripts.inc b/data/maps/ThreeIsland_BondBridge/scripts.inc index f36889d04..7c3210ba8 100644 --- a/data/maps/ThreeIsland_BondBridge/scripts.inc +++ b/data/maps/ThreeIsland_BondBridge/scripts.inc @@ -1,10 +1,10 @@ ThreeIsland_BondBridge_MapScripts:: @ 8168776 .byte 0 -ThreeIsland_BondBridge_EventScript_168777:: @ 8168777 - msgbox gUnknown_818A210, MSGBOX_SIGN +ThreeIsland_BondBridge_EventScript_BerryForestSign:: @ 8168777 + msgbox ThreeIsland_BondBridge_Text_BerryForestAhead, MSGBOX_SIGN end -ThreeIsland_BondBridge_EventScript_168780:: @ 8168780 - msgbox gUnknown_818A223, MSGBOX_SIGN +ThreeIsland_BondBridge_EventScript_BondBridgeSign:: @ 8168780 + msgbox ThreeIsland_BondBridge_Text_BondBridgeSign, MSGBOX_SIGN end diff --git a/data/maps/ThreeIsland_BondBridge/text.inc b/data/maps/ThreeIsland_BondBridge/text.inc index dbf984c85..57f96b6d8 100644 --- a/data/maps/ThreeIsland_BondBridge/text.inc +++ b/data/maps/ThreeIsland_BondBridge/text.inc @@ -1,100 +1,100 @@ -Text_189E42:: @ 8189E42 +ThreeIsland_BondBridge_Text_NikkiIntro:: @ 8189E42 .string "The salty tang of the sea…\n" .string "It tickles my heart.$" -Text_189E72:: @ 8189E72 +ThreeIsland_BondBridge_Text_NikkiDefeat:: @ 8189E72 .string "…Sniff, sniff…\n" .string "Something smells unpleasant…$" -Text_189E9E:: @ 8189E9E +ThreeIsland_BondBridge_Text_NikkiPostBattle:: @ 8189E9E .string "Perhaps that reek is your sweaty\n" .string "POKéMON's body odor…$" -Text_189ED4:: @ 8189ED4 +ThreeIsland_BondBridge_Text_VioletIntro:: @ 8189ED4 .string "Where are you off to in such\n" .string "a hurry?$" -Text_189EFA:: @ 8189EFA +ThreeIsland_BondBridge_Text_VioletDefeat:: @ 8189EFA .string "You're raising some wonderful\n" .string "POKéMON.$" -Text_189F21:: @ 8189F21 +ThreeIsland_BondBridge_Text_VioletPostBattle:: @ 8189F21 .string "If you keep going this way, you'll\n" .string "eventually reach BERRY FOREST.$" -Text_189F63:: @ 8189F63 +ThreeIsland_BondBridge_Text_AmiraIntro:: @ 8189F63 .string "My mommy said that I can't swim\n" .string "without my float ring.$" -Text_189F9A:: @ 8189F9A +ThreeIsland_BondBridge_Text_AmiraDefeat:: @ 8189F9A .string "Waaah!\n" .string "Waaah!$" -Text_189FA8:: @ 8189FA8 +ThreeIsland_BondBridge_Text_AmiraPostBattle:: @ 8189FA8 .string "This year, I'm going to finally\n" .string "learn how to swim!$" -Text_189FDB:: @ 8189FDB +ThreeIsland_BondBridge_Text_AlexisIntro:: @ 8189FDB .string "Yay, yay!\n" .string "POKéMON!$" -Text_189FEE:: @ 8189FEE +ThreeIsland_BondBridge_Text_AlexisDefeat:: @ 8189FEE .string "What happens now?$" -Text_18A000:: @ 818A000 +ThreeIsland_BondBridge_Text_AlexisPostBattle:: @ 818A000 .string "Did I just win?\n" .string "Or did I lose?$" -Text_18A01F:: @ 818A01F +ThreeIsland_BondBridge_Text_TishaIntro:: @ 818A01F .string "Oh, no, don't come here!\n" .string "Please, stay away from me!$" -Text_18A053:: @ 818A053 +ThreeIsland_BondBridge_Text_TishaDefeat:: @ 818A053 .string "Okay, you've won!\n" .string "Now will you please go away?$" -Text_18A082:: @ 818A082 +ThreeIsland_BondBridge_Text_TishaPostBattle:: @ 818A082 .string "A POKéMON bit through my \n" .string "swimsuit.\p" .string "I can't get out of the water!$" -Text_18A0C4:: @ 818A0C4 +ThreeIsland_BondBridge_Text_JoyIntro:: @ 818A0C4 .string "JOY: We'll teach you what our\n" .string "favorite POKéMON is!$" -Text_18A0F7:: @ 818A0F7 +ThreeIsland_BondBridge_Text_JoyDefeat:: @ 818A0F7 .string "JOY: Ohh…\n" .string "MEG!$" -Text_18A106:: @ 818A106 +ThreeIsland_BondBridge_Text_JoyPostBattle:: @ 818A106 .string "JOY: Wasn't that fun?\n" .string "I hope we can battle again!$" -Text_18A138:: @ 818A138 +ThreeIsland_BondBridge_Text_JoyNotEnoughMons:: @ 818A138 .string "JOY: I really want to battle with\n" .string "MEG.\p" .string "One POKéMON isn't enough.$" -Text_18A179:: @ 818A179 +ThreeIsland_BondBridge_Text_MegIntro:: @ 818A179 .string "MEG: We'll show you our favorite\n" .string "POKéMON.$" -Text_18A1A3:: @ 818A1A3 +ThreeIsland_BondBridge_Text_MegDefeat:: @ 818A1A3 .string "MEG: Ohh…\n" .string "JOY!$" -Text_18A1B2:: @ 818A1B2 +ThreeIsland_BondBridge_Text_MegPostBattle:: @ 818A1B2 .string "MEG: JOY, wasn't that fun?$" -Text_18A1CD:: @ 818A1CD +ThreeIsland_BondBridge_Text_MegNotEnoughMons:: @ 818A1CD .string "MEG: I want to battle together\n" .string "with JOY.\p" .string "One POKéMON isn't enough.$" -gUnknown_818A210:: @ 818A210 +ThreeIsland_BondBridge_Text_BerryForestAhead:: @ 818A210 .string "BERRY FOREST AHEAD$" -gUnknown_818A223:: @ 818A223 +ThreeIsland_BondBridge_Text_BondBridgeSign:: @ 818A223 .string "BOND BRIDGE\n" .string "Please be quiet when crossing.\p" .string "BERRY FOREST AHEAD$" diff --git a/data/maps/ThreeIsland_Harbor/map.json b/data/maps/ThreeIsland_Harbor/map.json index 5864be00c..412177921 100644 --- a/data/maps/ThreeIsland_Harbor/map.json +++ b/data/maps/ThreeIsland_Harbor/map.json @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_Harbor_EventScript_171EAA", + "script": "ThreeIsland_Harbor_EventScript_Sailor", "flag": "0" } ], diff --git a/data/maps/ThreeIsland_Harbor/scripts.inc b/data/maps/ThreeIsland_Harbor/scripts.inc index 6705741cb..473b8b368 100644 --- a/data/maps/ThreeIsland_Harbor/scripts.inc +++ b/data/maps/ThreeIsland_Harbor/scripts.inc @@ -1,7 +1,7 @@ ThreeIsland_Harbor_MapScripts:: @ 8171EA9 .byte 0 -ThreeIsland_Harbor_EventScript_171EAA:: @ 8171EAA +ThreeIsland_Harbor_EventScript_Sailor:: @ 8171EAA lock faceplayer message Text_WhereDoYouWantToSail diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json index 2174a571d..c06ba0e44 100644 --- a/data/maps/ThreeIsland_House1/map.json +++ b/data/maps/ThreeIsland_House1/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_House1_EventScript_17181A", + "script": "ThreeIsland_House1_EventScript_Lostelle", "flag": "FLAG_HIDE_LOSTELLE_IN_HER_HOME" } ], @@ -45,7 +45,7 @@ "x": 2, "y": 1, "elevation": 0, - "script": "ThreeIsland_House1_EventScript_171829" + "script": "ThreeIsland_House1_EventScript_DisplayCase" } ] } diff --git a/data/maps/ThreeIsland_House1/scripts.inc b/data/maps/ThreeIsland_House1/scripts.inc index 007f7d4be..d05416f9d 100644 --- a/data/maps/ThreeIsland_House1/scripts.inc +++ b/data/maps/ThreeIsland_House1/scripts.inc @@ -1,14 +1,14 @@ ThreeIsland_House1_MapScripts:: @ 8171819 .byte 0 -ThreeIsland_House1_EventScript_17181A:: @ 817181A +ThreeIsland_House1_EventScript_Lostelle:: @ 817181A lock faceplayer special Special_BufferBigGuyOrBigGirlString - msgbox gUnknown_81A2F3E + msgbox ThreeIsland_House1_Text_YoureAlwaysSoCool release end -ThreeIsland_House1_EventScript_171829:: @ 8171829 - msgbox gUnknown_81A2F92, MSGBOX_SIGN +ThreeIsland_House1_EventScript_DisplayCase:: @ 8171829 + msgbox ThreeIsland_House1_Text_RareRocksGemsDisplayed, MSGBOX_SIGN end diff --git a/data/maps/ThreeIsland_House1/text.inc b/data/maps/ThreeIsland_House1/text.inc index 250671619..2e6a51b36 100644 --- a/data/maps/ThreeIsland_House1/text.inc +++ b/data/maps/ThreeIsland_House1/text.inc @@ -1,9 +1,9 @@ -gUnknown_81A2F3E:: @ 81A2F3E +ThreeIsland_House1_Text_YoureAlwaysSoCool:: @ 81A2F3E .string "LOSTELLE: Hi, {PLAYER}!\n" .string "You're always so cool!\p" .string "I'll make lunch for you, too, one\n" .string "day, {PLAYER}.$" -gUnknown_81A2F92:: @ 81A2F92 +ThreeIsland_House1_Text_RareRocksGemsDisplayed:: @ 81A2F92 .string "Rare rocks and gems are displayed.$" diff --git a/data/maps/ThreeIsland_House2/map.json b/data/maps/ThreeIsland_House2/map.json index a2fc4f7e3..c8dfc26ff 100644 --- a/data/maps/ThreeIsland_House2/map.json +++ b/data/maps/ThreeIsland_House2/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_House2_EventScript_1718F9", + "script": "ThreeIsland_House2_EventScript_Rocker", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_House2_EventScript_1718E0", + "script": "ThreeIsland_House2_EventScript_Man", "flag": "0" } ], diff --git a/data/maps/ThreeIsland_House2/scripts.inc b/data/maps/ThreeIsland_House2/scripts.inc index a9fd52298..d66a13530 100644 --- a/data/maps/ThreeIsland_House2/scripts.inc +++ b/data/maps/ThreeIsland_House2/scripts.inc @@ -1,14 +1,14 @@ ThreeIsland_House2_MapScripts:: @ 81718DF .byte 0 -ThreeIsland_House2_EventScript_1718E0:: @ 81718E0 +ThreeIsland_House2_EventScript_Man:: @ 81718E0 lock faceplayer famechecker FAMECHECKER_SABRINA, 1 - msgbox gUnknown_81A32CA + msgbox ThreeIsland_House2_Text_IAdmireSabrina release end -ThreeIsland_House2_EventScript_1718F9:: @ 81718F9 - msgbox gUnknown_81A3245, MSGBOX_NPC +ThreeIsland_House2_EventScript_Rocker:: @ 81718F9 + msgbox ThreeIsland_House2_Text_CantMakeThisSpoonBend, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_House2/text.inc b/data/maps/ThreeIsland_House2/text.inc index cae2b9055..c265b2805 100644 --- a/data/maps/ThreeIsland_House2/text.inc +++ b/data/maps/ThreeIsland_House2/text.inc @@ -1,4 +1,4 @@ -gUnknown_81A3245:: @ 81A3245 +ThreeIsland_House2_Text_CantMakeThisSpoonBend:: @ 81A3245 .string "Urrrrrrrrgggghhhh…\n" .string "Kwaaaaah!\p" .string "…It's useless! I can't make this\n" @@ -6,7 +6,7 @@ gUnknown_81A3245:: @ 81A3245 .string "Maybe I really don't have any\n" .string "psychic powers.$" -gUnknown_81A32CA:: @ 81A32CA +ThreeIsland_House2_Text_IAdmireSabrina:: @ 81A32CA .string "You know about a girl GYM LEADER\n" .string "in SAFFRON CITY?\p" .string "She uses PSYCHIC-type POKéMON,\n" diff --git a/data/maps/ThreeIsland_House3/map.json b/data/maps/ThreeIsland_House3/map.json index 684e06a68..7234a9af6 100644 --- a/data/maps/ThreeIsland_House3/map.json +++ b/data/maps/ThreeIsland_House3/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_House3_EventScript_171903", + "script": "ThreeIsland_House3_EventScript_Beauty", "flag": "0" } ], diff --git a/data/maps/ThreeIsland_House3/scripts.inc b/data/maps/ThreeIsland_House3/scripts.inc index b1c336d79..414761426 100644 --- a/data/maps/ThreeIsland_House3/scripts.inc +++ b/data/maps/ThreeIsland_House3/scripts.inc @@ -1,6 +1,6 @@ ThreeIsland_House3_MapScripts:: @ 8171902 .byte 0 -ThreeIsland_House3_EventScript_171903:: @ 8171903 - msgbox gUnknown_81A3379, MSGBOX_NPC +ThreeIsland_House3_EventScript_Beauty:: @ 8171903 + msgbox ThreeIsland_House3_Text_WantedToLiveSomewhereQuiet, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_House3/text.inc b/data/maps/ThreeIsland_House3/text.inc index 24b2c86c9..2a36d1ab1 100644 --- a/data/maps/ThreeIsland_House3/text.inc +++ b/data/maps/ThreeIsland_House3/text.inc @@ -1,4 +1,4 @@ -gUnknown_81A3379:: @ 81A3379 +ThreeIsland_House3_Text_WantedToLiveSomewhereQuiet:: @ 81A3379 .string "I bought this house because I\n" .string "wanted to live somewhere quiet.\p" .string "Today, I think I'll go out fishing.$" diff --git a/data/maps/ThreeIsland_House4/map.json b/data/maps/ThreeIsland_House4/map.json index c8aae0640..79aa8eedc 100644 --- a/data/maps/ThreeIsland_House4/map.json +++ b/data/maps/ThreeIsland_House4/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_House4_EventScript_17190D", + "script": "ThreeIsland_House4_EventScript_BaldingMan", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_House4_EventScript_171916", + "script": "ThreeIsland_House4_EventScript_LittleBoy", "flag": "0" } ], diff --git a/data/maps/ThreeIsland_House4/scripts.inc b/data/maps/ThreeIsland_House4/scripts.inc index d0facf443..d33f7a6ad 100644 --- a/data/maps/ThreeIsland_House4/scripts.inc +++ b/data/maps/ThreeIsland_House4/scripts.inc @@ -1,10 +1,10 @@ ThreeIsland_House4_MapScripts:: @ 817190C .byte 0 -ThreeIsland_House4_EventScript_17190D:: @ 817190D - msgbox gUnknown_81A33DB, MSGBOX_NPC +ThreeIsland_House4_EventScript_BaldingMan:: @ 817190D + msgbox ThreeIsland_House4_Text_GhostsInBerryForest, MSGBOX_NPC end -ThreeIsland_House4_EventScript_171916:: @ 8171916 - msgbox gUnknown_81A342F, MSGBOX_NPC +ThreeIsland_House4_EventScript_LittleBoy:: @ 8171916 + msgbox ThreeIsland_House4_Text_PapaKeepsLyingToMe, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_House4/text.inc b/data/maps/ThreeIsland_House4/text.inc index a32fb6a5f..f636555e5 100644 --- a/data/maps/ThreeIsland_House4/text.inc +++ b/data/maps/ThreeIsland_House4/text.inc @@ -1,10 +1,10 @@ -gUnknown_81A33DB:: @ 81A33DB +ThreeIsland_House4_Text_GhostsInBerryForest:: @ 81A33DB .string "You must never, ever go out to\n" .string "the BERRY FOREST alone.\p" .string "Why?\n" .string "There are ghosts there.$" -gUnknown_81A342F:: @ 81A342F +ThreeIsland_House4_Text_PapaKeepsLyingToMe:: @ 81A342F .string "Papa keeps lying to me, and won't\n" .string "let me go out and play!$" diff --git a/data/maps/ThreeIsland_House5/map.json b/data/maps/ThreeIsland_House5/map.json index 209fca3f8..f5c10efdf 100644 --- a/data/maps/ThreeIsland_House5/map.json +++ b/data/maps/ThreeIsland_House5/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_House5_EventScript_171920", + "script": "ThreeIsland_House5_EventScript_LittleGirl", "flag": "0" } ], diff --git a/data/maps/ThreeIsland_House5/scripts.inc b/data/maps/ThreeIsland_House5/scripts.inc index 4a2b4f370..f8d72e35b 100644 --- a/data/maps/ThreeIsland_House5/scripts.inc +++ b/data/maps/ThreeIsland_House5/scripts.inc @@ -1,15 +1,15 @@ ThreeIsland_House5_MapScripts:: @ 817191F .byte 0 -ThreeIsland_House5_EventScript_171920:: @ 8171920 +ThreeIsland_House5_EventScript_LittleGirl:: @ 8171920 lock faceplayer - goto_if_set FLAG_RESCUED_LOSTELLE, EventScript_171935 - msgbox gUnknown_81A3469 + goto_if_set FLAG_RESCUED_LOSTELLE, ThreeIsland_House5_EventScript_LittleGirlLostelleFound + msgbox ThreeIsland_House5_Text_ImNotLostelle release end -EventScript_171935:: @ 8171935 - msgbox gUnknown_81A34DB +ThreeIsland_House5_EventScript_LittleGirlLostelleFound:: @ 8171935 + msgbox ThreeIsland_House5_Text_IllGoPlayWithLostelle release end diff --git a/data/maps/ThreeIsland_House5/text.inc b/data/maps/ThreeIsland_House5/text.inc index 16a034922..85ba66658 100644 --- a/data/maps/ThreeIsland_House5/text.inc +++ b/data/maps/ThreeIsland_House5/text.inc @@ -1,4 +1,4 @@ -gUnknown_81A3469:: @ 81A3469 +ThreeIsland_House5_Text_ImNotLostelle:: @ 81A3469 .string "Me?\n" .string "I'm not LOSTELLE.\p" .string "She's probably gone to the\n" @@ -6,7 +6,7 @@ gUnknown_81A3469:: @ 81A3469 .string "She picks BERRIES there for making\n" .string "lunch.$" -gUnknown_81A34DB:: @ 81A34DB +ThreeIsland_House5_Text_IllGoPlayWithLostelle:: @ 81A34DB .string "I think I'll go play with LOSTELLE\n" .string "today.$" diff --git a/data/maps/ThreeIsland_Mart/map.json b/data/maps/ThreeIsland_Mart/map.json index 84c4d70c5..d46aaa0f0 100644 --- a/data/maps/ThreeIsland_Mart/map.json +++ b/data/maps/ThreeIsland_Mart/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_Mart_EventScript_17188D", + "script": "ThreeIsland_Mart_EventScript_Clerk", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_Mart_EventScript_1718C4", + "script": "ThreeIsland_Mart_EventScript_Picnicker", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_Mart_EventScript_1718CD", + "script": "ThreeIsland_Mart_EventScript_BugCatcher", "flag": "0" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_Mart_EventScript_1718D6", + "script": "ThreeIsland_Mart_EventScript_Youngster", "flag": "0" } ], diff --git a/data/maps/ThreeIsland_Mart/scripts.inc b/data/maps/ThreeIsland_Mart/scripts.inc index 02afb8eb4..337bb2709 100644 --- a/data/maps/ThreeIsland_Mart/scripts.inc +++ b/data/maps/ThreeIsland_Mart/scripts.inc @@ -1,19 +1,19 @@ ThreeIsland_Mart_MapScripts:: @ 817188C .byte 0 -ThreeIsland_Mart_EventScript_17188D:: @ 817188D +ThreeIsland_Mart_EventScript_Clerk:: @ 817188D goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_1718B4 + pokemart ThreeIsland_Mart_Items msgbox Text_PleaseComeAgain release end .align 2 -Items_1718B4:: @ 81718B4 +ThreeIsland_Mart_Items:: @ 81718B4 .2byte ITEM_ULTRA_BALL .2byte ITEM_HYPER_POTION .2byte ITEM_REVIVE @@ -24,14 +24,14 @@ Items_1718B4:: @ 81718B4 release end -ThreeIsland_Mart_EventScript_1718C4:: @ 81718C4 - msgbox gUnknown_81A3114, MSGBOX_NPC +ThreeIsland_Mart_EventScript_Picnicker:: @ 81718C4 + msgbox ThreeIsland_Mart_Text_TrueThatCeldadonDeptStoreBigger, MSGBOX_NPC end -ThreeIsland_Mart_EventScript_1718CD:: @ 81718CD - msgbox gUnknown_81A315C, MSGBOX_NPC +ThreeIsland_Mart_EventScript_BugCatcher:: @ 81718CD + msgbox ThreeIsland_Mart_Text_PeopleHealWithBerriesFromForest, MSGBOX_NPC end -ThreeIsland_Mart_EventScript_1718D6:: @ 81718D6 - msgbox gUnknown_81A31F0, MSGBOX_NPC +ThreeIsland_Mart_EventScript_Youngster:: @ 81718D6 + msgbox ThreeIsland_Mart_Text_BikersWereAboutToTrashMart, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_Mart/text.inc b/data/maps/ThreeIsland_Mart/text.inc index 2618bf28e..8123f1e9c 100644 --- a/data/maps/ThreeIsland_Mart/text.inc +++ b/data/maps/ThreeIsland_Mart/text.inc @@ -1,16 +1,16 @@ -gUnknown_81A3114:: @ 81A3114 +ThreeIsland_Mart_Text_TrueThatCeldadonDeptStoreBigger:: @ 81A3114 .string "Is it true?\p" .string "CELADON DEPT. STORE is several\n" .string "times bigger than this shop?$" -gUnknown_81A315C:: @ 81A315C +ThreeIsland_Mart_Text_PeopleHealWithBerriesFromForest:: @ 81A315C .string "I sometimes buy medicine here.\p" .string "But a lot of people heal POKéMON\n" .string "with BERRIES from BERRY FOREST.\p" .string "After all, BERRIES are free and\n" .string "they never run out.$" -gUnknown_81A31F0:: @ 81A31F0 +ThreeIsland_Mart_Text_BikersWereAboutToTrashMart:: @ 81A31F0 .string "Those BIKERS were about to trash\n" .string "this POKéMON MART.\p" .string "Am I glad they decided to leave!$" diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json index 65c74d9d8..596ea41cb 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_PokemonCenter_1F_EventScript_171841", + "script": "ThreeIsland_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_PokemonCenter_1F_EventScript_17185C", + "script": "ThreeIsland_PokemonCenter_1F_EventScript_Rocker", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_PokemonCenter_1F_EventScript_171853", + "script": "ThreeIsland_PokemonCenter_1F_EventScript_Lass", "flag": "0" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_PokemonCenter_1F_EventScript_17184A", + "script": "ThreeIsland_PokemonCenter_1F_EventScript_Sailor", "flag": "0" } ], diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc index 15d568a6f..1f66b557d 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc @@ -7,21 +7,21 @@ ThreeIsland_PokemonCenter_1F_OnTransition:: @ 817183D setrespawn SPAWN_THREE_ISLAND end -ThreeIsland_PokemonCenter_1F_EventScript_171841:: @ 8171841 +ThreeIsland_PokemonCenter_1F_EventScript_Nurse:: @ 8171841 lock faceplayer call EventScript_PkmnCenterNurse release end -ThreeIsland_PokemonCenter_1F_EventScript_17184A:: @ 817184A - msgbox gUnknown_81A303B, MSGBOX_NPC +ThreeIsland_PokemonCenter_1F_EventScript_Sailor:: @ 817184A + msgbox ThreeIsland_PokemonCenter_1F_Text_ImpossibleToSurfBetweenIslands, MSGBOX_NPC end -ThreeIsland_PokemonCenter_1F_EventScript_171853:: @ 8171853 - msgbox gUnknown_81A30A3, MSGBOX_NPC +ThreeIsland_PokemonCenter_1F_EventScript_Lass:: @ 8171853 + msgbox ThreeIsland_PokemonCenter_1F_Text_AlwaysBerriesInBerryForest, MSGBOX_NPC end -ThreeIsland_PokemonCenter_1F_EventScript_17185C:: @ 817185C - msgbox gUnknown_81A2FB5, MSGBOX_NPC +ThreeIsland_PokemonCenter_1F_EventScript_Rocker:: @ 817185C + msgbox ThreeIsland_PokemonCenter_1F_Text_PCNetworkCanLinkWithKanto, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/text.inc b/data/maps/ThreeIsland_PokemonCenter_1F/text.inc index 449f80d70..a9d553efd 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/text.inc +++ b/data/maps/ThreeIsland_PokemonCenter_1F/text.inc @@ -1,17 +1,17 @@ -gUnknown_81A2FB5:: @ 81A2FB5 +ThreeIsland_PokemonCenter_1F_Text_PCNetworkCanLinkWithKanto:: @ 81A2FB5 .string "Hey, did you hear the news?\p" .string "The PC network here can now link\n" .string "with PCs in KANTO.\p" .string "I don't know how that came about,\n" .string "but it's fantastic!$" -gUnknown_81A303B:: @ 81A303B +ThreeIsland_PokemonCenter_1F_Text_ImpossibleToSurfBetweenIslands:: @ 81A303B .string "It's impossible to SURF between the\n" .string "islands around these parts.\p" .string "The tides are too fast and\n" .string "treacherous.$" -gUnknown_81A30A3:: @ 81A30A3 +ThreeIsland_PokemonCenter_1F_Text_AlwaysBerriesInBerryForest:: @ 81A30A3 .string "Let's crush BERRIES!\n" .string "…That'd be wasting BERRIES?\p" .string "You can always find some BERRIES\n" diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json index 40b6fab36..c469fee53 100644 --- a/data/maps/ThreeIsland_Port/map.json +++ b/data/maps/ThreeIsland_Port/map.json @@ -31,7 +31,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_Port_EventScript_168796", + "script": "ThreeIsland_Port_EventScript_Woman", "flag": "0" }, { @@ -44,7 +44,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_Port_EventScript_1687CC", + "script": "ThreeIsland_Port_EventScript_Biker1", "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { @@ -57,7 +57,7 @@ "movement_range_y": 2, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_Port_EventScript_1687D5", + "script": "ThreeIsland_Port_EventScript_Biker2", "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" } ], diff --git a/data/maps/ThreeIsland_Port/scripts.inc b/data/maps/ThreeIsland_Port/scripts.inc index f7aa40e76..0a664b07d 100644 --- a/data/maps/ThreeIsland_Port/scripts.inc +++ b/data/maps/ThreeIsland_Port/scripts.inc @@ -7,33 +7,33 @@ ThreeIsland_Port_OnTransition:: @ 816878F setflag FLAG_SEVII_DETOUR_FINISHED end -ThreeIsland_Port_EventScript_168796:: @ 8168796 +ThreeIsland_Port_EventScript_Woman:: @ 8168796 lock faceplayer compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2 - goto_if_ge EventScript_1687B8 + goto_if_ge ThreeIsland_Port_EventScript_WomanLostelleFound compare VAR_MAP_SCENE_THREE_ISLAND, 4 - goto_if_ge EventScript_1687C2 - msgbox gUnknown_818A307 + goto_if_ge ThreeIsland_Port_EventScript_WomanBikersGone + msgbox ThreeIsland_Port_Text_IllCallThePolice release end -EventScript_1687B8:: @ 81687B8 - msgbox gUnknown_818A38B +ThreeIsland_Port_EventScript_WomanLostelleFound:: @ 81687B8 + msgbox ThreeIsland_Port_Text_EverythingTurnedOutForBest release end -EventScript_1687C2:: @ 81687C2 - msgbox gUnknown_818A339 +ThreeIsland_Port_EventScript_WomanBikersGone:: @ 81687C2 + msgbox ThreeIsland_Port_Text_ThankGoodnessBikersGone release end -ThreeIsland_Port_EventScript_1687CC:: @ 81687CC - msgbox gUnknown_818A261, MSGBOX_NPC +ThreeIsland_Port_EventScript_Biker1:: @ 81687CC + msgbox ThreeIsland_Port_Text_WereKantoRiderFederation, MSGBOX_NPC end -ThreeIsland_Port_EventScript_1687D5:: @ 81687D5 +ThreeIsland_Port_EventScript_Biker2:: @ 81687D5 lock - msgbox gUnknown_818A2D8 + msgbox ThreeIsland_Port_Text_ForkOverMoney release end diff --git a/data/maps/ThreeIsland_Port/text.inc b/data/maps/ThreeIsland_Port/text.inc index e98d5f53c..72026b353 100644 --- a/data/maps/ThreeIsland_Port/text.inc +++ b/data/maps/ThreeIsland_Port/text.inc @@ -1,25 +1,25 @@ -gUnknown_818A261:: @ 818A261 +ThreeIsland_Port_Text_WereKantoRiderFederation:: @ 818A261 .string "We're the KANTO RIDER FEDERATION!\n" .string "Vroom! Vavavavooom! Vroom!\p" .string "My bike's wimpy, so I have to\n" .string "make exhaust noises myself!$" -gUnknown_818A2D8:: @ 818A2D8 +ThreeIsland_Port_Text_ForkOverMoney:: @ 818A2D8 .string "Hey, hey, lady!\n" .string "Fork over some spending money!$" -gUnknown_818A307:: @ 818A307 +ThreeIsland_Port_Text_IllCallThePolice:: @ 818A307 .string "Aiyeeh!\p" .string "Wh-who are you?!\n" .string "I… I'll call the police!$" -gUnknown_818A339:: @ 818A339 +ThreeIsland_Port_Text_ThankGoodnessBikersGone:: @ 818A339 .string "Those BIKERS…\n" .string "Are they gone?\p" .string "Oh, thank goodness!\n" .string "They certainly had me terrified!$" -gUnknown_818A38B:: @ 818A38B +ThreeIsland_Port_Text_EverythingTurnedOutForBest:: @ 818A38B .string "Those BIKERS ran off, and\n" .string "LOSTELLE was found safe.\p" .string "Everything turned out for the best!$" diff --git a/data/scripts/trainers.inc b/data/scripts/trainers.inc index eaa76b1fa..74c761e6d 100644 --- a/data/scripts/trainers.inc +++ b/data/scripts/trainers.inc @@ -2312,95 +2312,95 @@ OneIsland_TreasureBeach_EventScript_AmaraRematch:: @ 81ABF4E msgbox OneIsland_TreasureBeach_Text_AmaraPostBattle, MSGBOX_AUTOCLOSE end -ThreeIsland_BondBridge_EventScript_1ABF65:: @ 81ABF65 - trainerbattle_single TRAINER_AROMA_LADY_NIKKI, Text_189E42, Text_189E72 +ThreeIsland_BondBridge_EventScript_Nikki:: @ 81ABF65 + trainerbattle_single TRAINER_AROMA_LADY_NIKKI, ThreeIsland_BondBridge_Text_NikkiIntro, ThreeIsland_BondBridge_Text_NikkiDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABF8C - msgbox Text_189E9E, MSGBOX_AUTOCLOSE + goto_if_eq ThreeIsland_BondBridge_EventScript_NikkiRematch + msgbox ThreeIsland_BondBridge_Text_NikkiPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABF8C:: @ 81ABF8C - trainerbattle_rematch TRAINER_AROMA_LADY_NIKKI, Text_1C3AA7, Text_189E72 - msgbox Text_189E9E, MSGBOX_AUTOCLOSE +ThreeIsland_BondBridge_EventScript_NikkiRematch:: @ 81ABF8C + trainerbattle_rematch TRAINER_AROMA_LADY_NIKKI, ThreeIsland_BondBridge_Text_NikkiRematchIntro, ThreeIsland_BondBridge_Text_NikkiDefeat + msgbox ThreeIsland_BondBridge_Text_NikkiPostBattle, MSGBOX_AUTOCLOSE end -ThreeIsland_BondBridge_EventScript_1ABFA3:: @ 81ABFA3 - trainerbattle_single TRAINER_AROMA_LADY_VIOLET, Text_189ED4, Text_189EFA +ThreeIsland_BondBridge_EventScript_Violet:: @ 81ABFA3 + trainerbattle_single TRAINER_AROMA_LADY_VIOLET, ThreeIsland_BondBridge_Text_VioletIntro, ThreeIsland_BondBridge_Text_VioletDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABFCA - msgbox Text_189F21, MSGBOX_AUTOCLOSE + goto_if_eq ThreeIsland_BondBridge_EventScript_VioletRematch + msgbox ThreeIsland_BondBridge_Text_VioletPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABFCA:: @ 81ABFCA - trainerbattle_rematch TRAINER_AROMA_LADY_VIOLET, Text_1C3ABF, Text_189EFA - msgbox Text_189F21, MSGBOX_AUTOCLOSE +ThreeIsland_BondBridge_EventScript_VioletRematch:: @ 81ABFCA + trainerbattle_rematch TRAINER_AROMA_LADY_VIOLET, ThreeIsland_BondBridge_Text_VioletRematchIntro, ThreeIsland_BondBridge_Text_VioletDefeat + msgbox ThreeIsland_BondBridge_Text_VioletPostBattle, MSGBOX_AUTOCLOSE end -ThreeIsland_BondBridge_EventScript_1ABFE1:: @ 81ABFE1 - trainerbattle_single TRAINER_TUBER_AMIRA, Text_189F63, Text_189F9A +ThreeIsland_BondBridge_EventScript_Amira:: @ 81ABFE1 + trainerbattle_single TRAINER_TUBER_AMIRA, ThreeIsland_BondBridge_Text_AmiraIntro, ThreeIsland_BondBridge_Text_AmiraDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC008 - msgbox Text_189FA8, MSGBOX_AUTOCLOSE + goto_if_eq ThreeIsland_BondBridge_EventScript_AmiraRematch + msgbox ThreeIsland_BondBridge_Text_AmiraPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC008:: @ 81AC008 - trainerbattle_rematch TRAINER_TUBER_AMIRA, Text_1C3AF2, Text_189F9A - msgbox Text_189FA8, MSGBOX_AUTOCLOSE +ThreeIsland_BondBridge_EventScript_AmiraRematch:: @ 81AC008 + trainerbattle_rematch TRAINER_TUBER_AMIRA, ThreeIsland_BondBridge_Text_AmiraRematchIntro, ThreeIsland_BondBridge_Text_AmiraDefeat + msgbox ThreeIsland_BondBridge_Text_AmiraPostBattle, MSGBOX_AUTOCLOSE end -ThreeIsland_BondBridge_EventScript_1AC01F:: @ 81AC01F - trainerbattle_single TRAINER_TUBER_ALEXIS, Text_189FDB, Text_189FEE +ThreeIsland_BondBridge_EventScript_Alexis:: @ 81AC01F + trainerbattle_single TRAINER_TUBER_ALEXIS, ThreeIsland_BondBridge_Text_AlexisIntro, ThreeIsland_BondBridge_Text_AlexisDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC046 - msgbox Text_18A000, MSGBOX_AUTOCLOSE + goto_if_eq ThreeIsland_BondBridge_EventScript_AlexisRematch + msgbox ThreeIsland_BondBridge_Text_AlexisPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC046:: @ 81AC046 - trainerbattle_rematch TRAINER_TUBER_ALEXIS, Text_1C3B1D, Text_189FEE - msgbox Text_18A000, MSGBOX_AUTOCLOSE +ThreeIsland_BondBridge_EventScript_AlexisRematch:: @ 81AC046 + trainerbattle_rematch TRAINER_TUBER_ALEXIS, ThreeIsland_BondBridge_Text_AlexisRematchIntro, ThreeIsland_BondBridge_Text_AlexisDefeat + msgbox ThreeIsland_BondBridge_Text_AlexisPostBattle, MSGBOX_AUTOCLOSE end -ThreeIsland_BondBridge_EventScript_1AC05D:: @ 81AC05D - trainerbattle_single TRAINER_SWIMMER_FEMALE_TISHA, Text_18A01F, Text_18A053 +ThreeIsland_BondBridge_EventScript_Tisha:: @ 81AC05D + trainerbattle_single TRAINER_SWIMMER_FEMALE_TISHA, ThreeIsland_BondBridge_Text_TishaIntro, ThreeIsland_BondBridge_Text_TishaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC084 - msgbox Text_18A082, MSGBOX_AUTOCLOSE + goto_if_eq ThreeIsland_BondBridge_EventScript_TishaRematch + msgbox ThreeIsland_BondBridge_Text_TishaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC084:: @ 81AC084 - trainerbattle_rematch TRAINER_SWIMMER_FEMALE_TISHA, Text_1C3B30, Text_18A053 - msgbox Text_18A082, MSGBOX_AUTOCLOSE +ThreeIsland_BondBridge_EventScript_TishaRematch:: @ 81AC084 + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_TISHA, ThreeIsland_BondBridge_Text_TishaRematchIntro, ThreeIsland_BondBridge_Text_TishaDefeat + msgbox ThreeIsland_BondBridge_Text_TishaPostBattle, MSGBOX_AUTOCLOSE end -ThreeIsland_BondBridge_EventScript_1AC09B:: @ 81AC09B - trainerbattle_double TRAINER_TWINS_JOY_MEG, Text_18A0C4, Text_18A0F7, Text_18A138 +ThreeIsland_BondBridge_EventScript_Joy:: @ 81AC09B + trainerbattle_double TRAINER_TWINS_JOY_MEG, ThreeIsland_BondBridge_Text_JoyIntro, ThreeIsland_BondBridge_Text_JoyDefeat, ThreeIsland_BondBridge_Text_JoyNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC0C6 - msgbox Text_18A106, MSGBOX_AUTOCLOSE + goto_if_eq ThreeIsland_BondBridge_EventScript_JoyRematch + msgbox ThreeIsland_BondBridge_Text_JoyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC0C6:: @ 81AC0C6 - trainerbattle_rematch_double TRAINER_TWINS_JOY_MEG, Text_1C3B6E, Text_18A0F7, Text_18A138 - msgbox Text_18A106, MSGBOX_AUTOCLOSE +ThreeIsland_BondBridge_EventScript_JoyRematch:: @ 81AC0C6 + trainerbattle_rematch_double TRAINER_TWINS_JOY_MEG, ThreeIsland_BondBridge_Text_JoyRematchIntro, ThreeIsland_BondBridge_Text_JoyDefeat, ThreeIsland_BondBridge_Text_JoyNotEnoughMons + msgbox ThreeIsland_BondBridge_Text_JoyPostBattle, MSGBOX_AUTOCLOSE end -ThreeIsland_BondBridge_EventScript_1AC0E1:: @ 81AC0E1 - trainerbattle_double TRAINER_TWINS_JOY_MEG, Text_18A179, Text_18A1A3, Text_18A1CD +ThreeIsland_BondBridge_EventScript_Meg:: @ 81AC0E1 + trainerbattle_double TRAINER_TWINS_JOY_MEG, ThreeIsland_BondBridge_Text_MegIntro, ThreeIsland_BondBridge_Text_MegDefeat, ThreeIsland_BondBridge_Text_MegNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC10C - msgbox Text_18A1B2, MSGBOX_AUTOCLOSE + goto_if_eq ThreeIsland_BondBridge_EventScript_MegRematch + msgbox ThreeIsland_BondBridge_Text_MegPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC10C:: @ 81AC10C - trainerbattle_rematch_double TRAINER_TWINS_JOY_MEG, Text_1C3B99, Text_18A1A3, Text_18A1CD - msgbox Text_18A1B2, MSGBOX_AUTOCLOSE +ThreeIsland_BondBridge_EventScript_MegRematch:: @ 81AC10C + trainerbattle_rematch_double TRAINER_TWINS_JOY_MEG, ThreeIsland_BondBridge_Text_MegRematchIntro, ThreeIsland_BondBridge_Text_MegDefeat, ThreeIsland_BondBridge_Text_MegNotEnoughMons + msgbox ThreeIsland_BondBridge_Text_MegPostBattle, MSGBOX_AUTOCLOSE end FiveIsland_ResortGorgeous_EventScript_1AC127:: @ 81AC127 diff --git a/data/text/trainers.inc b/data/text/trainers.inc index 7a51a0585..05f102cea 100644 --- a/data/text/trainers.inc +++ b/data/text/trainers.inc @@ -765,30 +765,30 @@ OneIsland_KindleRoad_Text_MikRematchIntro:: @ 81C3A55 .string "afraid of nothing!\p" .string "We'll prove it to you this time!$" -Text_1C3AA7:: @ 81C3AA7 +ThreeIsland_BondBridge_Text_NikkiRematchIntro:: @ 81C3AA7 .string "Are we to battle again?$" -Text_1C3ABF:: @ 81C3ABF +ThreeIsland_BondBridge_Text_VioletRematchIntro:: @ 81C3ABF .string "From where have you come, and\n" .string "where are you bound?$" -Text_1C3AF2:: @ 81C3AF2 +ThreeIsland_BondBridge_Text_AmiraRematchIntro:: @ 81C3AF2 .string "I want to swim without my float\n" .string "ring soon.$" -Text_1C3B1D:: @ 81C3B1D +ThreeIsland_BondBridge_Text_AlexisRematchIntro:: @ 81C3B1D .string "Yay, yay!\n" .string "POKéMON!$" -Text_1C3B30:: @ 81C3B30 +ThreeIsland_BondBridge_Text_TishaRematchIntro:: @ 81C3B30 .string "Oh, no, didn't I tell you already?\n" .string "Please, stay away from me!$" -Text_1C3B6E:: @ 81C3B6E +ThreeIsland_BondBridge_Text_JoyRematchIntro:: @ 81C3B6E .string "JOY: We've gotten stronger!\n" .string "Lots and lots!$" -Text_1C3B99:: @ 81C3B99 +ThreeIsland_BondBridge_Text_MegRematchIntro:: @ 81C3B99 .string "MEG: You can't beat us today!$" Text_1C3BB7:: @ 81C3BB7 -- cgit v1.2.3 From 0d88e2d1de7135d7cc3d724398fa8d9022831511 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 27 Feb 2020 14:08:26 -0500 Subject: through MultiplyPaletteRGBComponents --- data/field_effect.s | 79 ----------------------------------------------------- 1 file changed, 79 deletions(-) (limited to 'data') diff --git a/data/field_effect.s b/data/field_effect.s index 607ae6142..d79644860 100644 --- a/data/field_effect.s +++ b/data/field_effect.s @@ -6,85 +6,6 @@ .section .rodata .align 2 -gUnknown_83CA770:: @ 3CA770 4bpp - .incbin "graphics/field_effects/unk_83CA770.4bpp" - -gUnknown_83CAF70:: @ 83CAF70 gbapal - .incbin "graphics/field_effects/unk_83CAF70.gbapal" - -gUnknown_83CAF90:: @ 83CAF90 4bpp - .incbin "graphics/field_effects/unk_83CAF90.4bpp" - -gUnknown_83CAFB0:: @ 83CAFB0 gbapal - .incbin "graphics/field_effects/unk_83CAFB0.gbapal" - -gUnknown_83CAFD0:: @ 83CAFD0 4bpp - .incbin "graphics/field_effects/unk_83CAFD0.4bpp" - -gUnknown_83CB3D0:: @ 83CB3D0 gbapal - .incbin "graphics/field_effects/unk_83CB3D0.gbapal" - -gUnknown_83CB3F0:: @ 83CB3F0 4bpp - .incbin "graphics/field_effects/unk_83CB3F0.4bpp" - -gUnknown_83CB5F0:: @ 83CB5F0 4bpp - .incbin "graphics/field_effects/unk_83CB5F0.4bpp" - -gUnknown_83CB7F0:: @ 83CB7F0 gbapal gUnknown_83CB5F0 - .incbin "graphics/field_effects/unk_83CB7F0.gbapal" - -gUnknown_83CB810:: @ 83CB810 4bpp - .incbin "graphics/field_effects/unk_83CB810.bin" - -gUnknown_83CBA90:: @ 83CBA90 4bpp - .incbin "graphics/field_effects/unk_83CBA90.4bpp" - -gUnknown_83CBB10:: @ 83CBB10 gbapal gUnknown_83CBA90 - .incbin "graphics/field_effects/unk_83CBB10.gbapal" - -gUnknown_83CBB30:: @ 83CBB30 4bpp - .incbin "graphics/field_effects/unk_83CBB30.bin" - -gUnknown_83CBDB0:: - .incbin "graphics/field_effects/unk_83CBDB0.4bpp" - - .align 2 -sFldEffScrcmdTable:: @ 83CBE30 dataptr - .4byte FieldEffectCmd_loadtiles - .4byte FieldEffectCmd_loadfadedpal - .4byte FieldEffectCmd_loadpal - .4byte FieldEffectCmd_callnative - .4byte FieldEffectCmd_end - .4byte FieldEffectCmd_loadgfx_callnative - .4byte FieldEffectCmd_loadtiles_callnative - .4byte FieldEffectCmd_loadfadedpal_callnative - -gNewGameBirchOamAttributes:: @ 83CBE50 oamdata - .4byte 0xc0000000, 0x00000000 - -gOamData_83CBE58:: @ 83CBE58 oamdata - .4byte 0x00000000, 0x00000000 - -gOamData_83CBE60:: @ 83CBE60 oamdata - .4byte 0x40000000, 0x00000000 - -gUnknown_83CBE68:: @ 83CBE68 sprite_frames - obj_frame_tiles gUnknown_83CA770, 0x0800 - -gNewGameBirchObjectPaletteInfo:: @ 83CBE70 sprite_palette - obj_pal gUnknown_83CAF70, 4102 - -gUnknown_83CBE78:: @ 83CBE78 - obj_image_anim_frame 0x0000, 1 - obj_image_anim_end - - .align 2 -gUnknown_83CBE80:: @ 83CBE80 dataptr - .4byte gUnknown_83CBE78 - -gNewGameBirchObjectTemplate:: @ 83CBE84 spr_template - spr_template 65535, 4102, gNewGameBirchOamAttributes, gUnknown_83CBE80, gUnknown_83CBE68, gDummySpriteAffineAnimTable, SpriteCallbackDummy - gUnknown_83CBE9C:: @ 83CBE9C sprite_palette obj_pal gUnknown_83CAFB0, 4103 -- cgit v1.2.3 From 2d9327a1ff21ac142c17e270755c658491eee5aa Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 27 Feb 2020 14:21:13 -0500 Subject: Document Four Island scripts, trainer_card.inc --- data/event_scripts.s | 1 + data/maps/FourIsland/map.json | 10 +- data/maps/FourIsland/scripts.inc | 70 ++--- data/maps/FourIsland/text.inc | 14 +- data/maps/FourIsland_Harbor/map.json | 2 +- data/maps/FourIsland_Harbor/scripts.inc | 2 +- data/maps/FourIsland_House1/map.json | 2 +- data/maps/FourIsland_House1/scripts.inc | 4 +- data/maps/FourIsland_House1/text.inc | 13 +- data/maps/FourIsland_House2/map.json | 2 +- data/maps/FourIsland_LoreleisHouse/map.json | 30 +- data/maps/FourIsland_LoreleisHouse/scripts.inc | 20 +- data/maps/FourIsland_LoreleisHouse/text.inc | 8 +- data/maps/FourIsland_Mart/map.json | 6 +- data/maps/FourIsland_Mart/scripts.inc | 10 +- data/maps/FourIsland_Mart/text.inc | 4 +- data/maps/FourIsland_PokemonCenter_1F/map.json | 12 +- data/maps/FourIsland_PokemonCenter_1F/scripts.inc | 14 +- data/maps/FourIsland_PokemonCenter_1F/text.inc | 9 +- data/scripts/fame_checker.inc | 8 +- data/scripts/trainer_card.inc | 336 +++++++++++----------- data/specials.inc | 2 +- data/text/fame_checker.inc | 2 +- data/text/trainer_card.inc | 60 ++-- 24 files changed, 320 insertions(+), 321 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index c088f893d..1e9e38b98 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -34,6 +34,7 @@ #include "constants/quest_log.h" #include "constants/daycare.h" #include "constants/easy_chat.h" +#include "constants/trainer_card.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .set FALSE, 0 diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index ed72da60f..35dd24e8c 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -90,7 +90,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_EventScript_167E2E", + "script": "FourIsland_EventScript_OldWoman", "flag": "0" }, { @@ -155,7 +155,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_EventScript_167E73", + "script": "FourIsland_EventScript_FatMan", "flag": "0" }, { @@ -168,7 +168,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_EventScript_167E5A", + "script": "FourIsland_EventScript_LittleGirl", "flag": "0" } ], @@ -237,7 +237,7 @@ "x": 13, "y": 19, "elevation": 0, - "script": "FourIsland_EventScript_167E7C" + "script": "FourIsland_EventScript_IslandSign" }, { "type": "hidden_item", @@ -264,7 +264,7 @@ "x": 31, "y": 23, "elevation": 0, - "script": "FourIsland_EventScript_167E85" + "script": "FourIsland_EventScript_LoreleisHouseSign" } ] } diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 85e1db283..8a7dfafbf 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -1,3 +1,6 @@ +.equ LOCALID_DAYCARE_MAN, 1 +.equ LOCALID_RIVAL, 10 + FourIsland_MapScripts:: @ 8167CAE map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, FourIsland_OnFrame @@ -6,65 +9,64 @@ FourIsland_MapScripts:: @ 8167CAE FourIsland_OnTransition:: @ 8167CB9 setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND compare VAR_MAP_SCENE_FOUR_ISLAND, 0 - call_if_eq EventScript_167CCD - call EventScript_167CD1 + call_if_eq FourIsland_EventScript_ShowRival + call FourIsland_EventScript_TrySetDayCareManPos end -EventScript_167CCD:: @ 8167CCD +FourIsland_EventScript_ShowRival:: @ 8167CCD clearflag FLAG_HIDE_FOUR_ISLAND_RIVAL return -EventScript_167CD1:: @ 8167CD1 - goto_if_unset FLAG_PENDING_DAYCARE_EGG, EventScript_167CE1 - setobjectxyperm 1, 16, 14 - -EventScript_167CE1:: @ 8167CE1 +FourIsland_EventScript_TrySetDayCareManPos:: @ 8167CD1 + goto_if_unset FLAG_PENDING_DAYCARE_EGG, FourIsland_EventScript_EndSetDayCareManPos + setobjectxyperm LOCALID_DAYCARE_MAN, 16, 14 +FourIsland_EventScript_EndSetDayCareManPos:: @ 8167CE1 return FourIsland_OnFrame:: @ 8167CE2 - map_script_2 VAR_MAP_SCENE_FOUR_ISLAND, 0, EventScript_167CEC + map_script_2 VAR_MAP_SCENE_FOUR_ISLAND, 0, FourIsland_EventScript_RivalScene .2byte 0 -EventScript_167CEC:: @ 8167CEC +FourIsland_EventScript_RivalScene:: @ 8167CEC lockall textcolor 0 - applymovement 10, Movement_WalkInPlaceFastestDown + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown waitmovement 0 playbgm MUS_RIVAL1, 0 - applymovement 10, Movement_ExclamationMark + applymovement LOCALID_RIVAL, Movement_ExclamationMark waitmovement 0 - applymovement 10, Movement_Delay48 + applymovement LOCALID_RIVAL, Movement_Delay48 waitmovement 0 delay 25 - applymovement 10, Movement_167D49 + applymovement LOCALID_RIVAL, FourIsland_Movement_RivalApproach waitmovement 0 - msgbox gUnknown_8182B37 + msgbox FourIsland_Text_RivalAlreadyGotEggBeSmellingYa closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_167D52 - applymovement 10, Movement_167D4E + applymovement OBJ_EVENT_ID_PLAYER, FourIsland_Movement_PlayerWatchRivalExit + applymovement LOCALID_RIVAL, FourIsland_Movement_RivalExit waitmovement 0 fadedefaultbgm playse SE_KAIDAN delay 35 - removeobject 10 + removeobject LOCALID_RIVAL setvar VAR_MAP_SCENE_FOUR_ISLAND, 1 releaseall end -Movement_167D49:: @ 8167D49 +FourIsland_Movement_RivalApproach:: @ 8167D49 walk_right walk_right walk_down walk_down step_end -Movement_167D4E:: @ 8167D4E +FourIsland_Movement_RivalExit:: @ 8167D4E delay_16 delay_4 walk_down step_end -Movement_167D52:: @ 8167D52 +FourIsland_Movement_PlayerWatchRivalExit:: @ 8167D52 walk_left walk_in_place_fastest_right step_end @@ -136,36 +138,36 @@ FourIsland_EventScript_CheckOnTwoMons:: @ 8167E19 release end -FourIsland_EventScript_167E2E:: @ 8167E2E +FourIsland_EventScript_OldWoman:: @ 8167E2E lock faceplayer - goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_167E43 - msgbox gUnknown_8182A2B + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, FourIsland_EventScript_OldWomanLoreleiLeft + msgbox FourIsland_Text_LoreleiHasReturned release end -EventScript_167E43:: @ 8167E43 +FourIsland_EventScript_OldWomanLoreleiLeft:: @ 8167E43 famechecker FAMECHECKER_LORELEI, 5 - msgbox gUnknown_8182A75 + msgbox FourIsland_Text_LoreleiMetLaprasAsChild release end -FourIsland_EventScript_167E5A:: @ 8167E5A +FourIsland_EventScript_LittleGirl:: @ 8167E5A lock faceplayer famechecker FAMECHECKER_LORELEI, 4 - msgbox gUnknown_8182CE3 + msgbox FourIsland_Text_LoreleiHasLotsOfStuffedDolls release end -FourIsland_EventScript_167E73:: @ 8167E73 - msgbox gUnknown_8182D8E, MSGBOX_NPC +FourIsland_EventScript_FatMan:: @ 8167E73 + msgbox FourIsland_Text_MadeSlushieUsingIcefallCaveIce, MSGBOX_NPC end -FourIsland_EventScript_167E7C:: @ 8167E7C - msgbox gUnknown_8182A03, MSGBOX_SIGN +FourIsland_EventScript_IslandSign:: @ 8167E7C + msgbox FourIsland_Text_IslandSign, MSGBOX_SIGN end -FourIsland_EventScript_167E85:: @ 8167E85 - msgbox gUnknown_8182DEB, MSGBOX_SIGN +FourIsland_EventScript_LoreleisHouseSign:: @ 8167E85 + msgbox FourIsland_Text_LoreleisHouse, MSGBOX_SIGN end diff --git a/data/maps/FourIsland/text.inc b/data/maps/FourIsland/text.inc index 04845b223..e54650761 100644 --- a/data/maps/FourIsland/text.inc +++ b/data/maps/FourIsland/text.inc @@ -1,13 +1,13 @@ -gUnknown_8182A03:: @ 8182A03 +FourIsland_Text_IslandSign:: @ 8182A03 .string "FOUR ISLAND\n" .string "The Warm, Blue, Floe Island$" -gUnknown_8182A2B:: @ 8182A2B +FourIsland_Text_LoreleiHasReturned:: @ 8182A2B .string "LORELEI has returned.\p" .string "Did she find the city life too\n" .string "stressful, I wonder?$" -gUnknown_8182A75:: @ 8182A75 +FourIsland_Text_LoreleiMetLaprasAsChild:: @ 8182A75 .string "LORELEI has gone back.\p" .string "The LAPRAS she has, I imagine it\n" .string "to be the one she met as a child.\p" @@ -16,7 +16,7 @@ gUnknown_8182A75:: @ 8182A75 .string "Perhaps that POKéMON has been with\n" .string "her ever since.$" -gUnknown_8182B37:: @ 8182B37 +FourIsland_Text_RivalAlreadyGotEggBeSmellingYa:: @ 8182B37 .string "{RIVAL}: Hey!\n" .string "{PLAYER}!\p" .string "What are you doing here in the\n" @@ -37,7 +37,7 @@ gUnknown_8182B37:: @ 8182B37 .string "waste.\p" .string "Be smelling ya!$" -gUnknown_8182CE3:: @ 8182CE3 +FourIsland_Text_LoreleiHasLotsOfStuffedDolls:: @ 8182CE3 .string "Oh, you found me!\n" .string "Please don't tell LORELEI.\p" .string "Did you know that LORELEI has lots\n" @@ -45,12 +45,12 @@ gUnknown_8182CE3:: @ 8182CE3 .string "Every time she comes back to\n" .string "FOUR ISLAND, her collection grows!$" -gUnknown_8182D8E:: @ 8182D8E +FourIsland_Text_MadeSlushieUsingIcefallCaveIce:: @ 8182D8E .string "Ooh, chilly!\p" .string "I made a slushie using ice I\n" .string "shaved inside ICEFALL CAVE.\p" .string "It's chilly and tasty!$" -gUnknown_8182DEB:: @ 8182DEB +FourIsland_Text_LoreleisHouse:: @ 8182DEB .string "LORELEI'S HOUSE$" diff --git a/data/maps/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json index 6cd0223da..fa23fe2cd 100644 --- a/data/maps/FourIsland_Harbor/map.json +++ b/data/maps/FourIsland_Harbor/map.json @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_Harbor_EventScript_171C99", + "script": "FourIsland_Harbor_EventScript_Sailor", "flag": "0" } ], diff --git a/data/maps/FourIsland_Harbor/scripts.inc b/data/maps/FourIsland_Harbor/scripts.inc index d8933d783..3a16cd3e3 100644 --- a/data/maps/FourIsland_Harbor/scripts.inc +++ b/data/maps/FourIsland_Harbor/scripts.inc @@ -1,7 +1,7 @@ FourIsland_Harbor_MapScripts:: @ 8171C98 .byte 0 -FourIsland_Harbor_EventScript_171C99:: @ 8171C99 +FourIsland_Harbor_EventScript_Sailor:: @ 8171C99 lock faceplayer message Text_WhereDoYouWantToSail diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json index 3d4984879..f581ffa5a 100644 --- a/data/maps/FourIsland_House1/map.json +++ b/data/maps/FourIsland_House1/map.json @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_House1_EventScript_171C45", + "script": "FourIsland_House1_EventScript_FatMan", "flag": "0" } ], diff --git a/data/maps/FourIsland_House1/scripts.inc b/data/maps/FourIsland_House1/scripts.inc index 46ec500fe..e8e6322f5 100644 --- a/data/maps/FourIsland_House1/scripts.inc +++ b/data/maps/FourIsland_House1/scripts.inc @@ -1,6 +1,6 @@ FourIsland_House1_MapScripts:: @ 8171C44 .byte 0 -FourIsland_House1_EventScript_171C45:: @ 8171C45 - msgbox gUnknown_81A3802, MSGBOX_NPC +FourIsland_House1_EventScript_FatMan:: @ 8171C45 + msgbox FourIsland_House1_Text_YoureAwfullyHeavy, MSGBOX_NPC end diff --git a/data/maps/FourIsland_House1/text.inc b/data/maps/FourIsland_House1/text.inc index 2d4f8c4bd..255b3c028 100644 --- a/data/maps/FourIsland_House1/text.inc +++ b/data/maps/FourIsland_House1/text.inc @@ -1,4 +1,7 @@ -Text_1A3778:: @ 81A3778 +@ Text for this file was split weirdly, and is instead in FourIsland_PokemonCenter_1F/text.inc +@ Theres also an unused JP version of that text in this file instead + +JPText_BodySlamTeach:: @ 81A3778 .string "そーれ　ぼよーん！\n" .string "どっちが　さきに　へたばるか？\l" .string "のしかかり　しょうぶ　してるんだ\p" @@ -7,17 +10,17 @@ Text_1A3778:: @ 81A3778 .string "かわりに　きみの　ポケモンに\l" .string "のしかかり　おしえて　やろっか？$" -Text_1A37DB:: @ 81A37DB +JPText_BodySlamDeclined:: @ 81A37DB .string "また　おいで　ぼよーん！$" -Text_1A37E8:: @ 81A37E8 +JPText_BodySlamWhichMon:: @ 81A37E8 .string "どの　ポケモンに\n" .string "おしえたい　かい？$" -Text_1A37FB:: @ 81A37FB +JPText_BodySlamTaught:: @ 81A37FB .string "ぼよよーん！$" -gUnknown_81A3802:: @ 81A3802 +FourIsland_House1_Text_YoureAwfullyHeavy:: @ 81A3802 .string "There! Boing!\n" .string "You're awfully heavy!$" diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json index b83419325..a4b926233 100644 --- a/data/maps/FourIsland_House2/map.json +++ b/data/maps/FourIsland_House2/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_House2_EventScript_1B2938", + "script": "FourIsland_House2_EventScript_StickerMan", "flag": "0" } ], diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json index 7dbe72a88..1c09bc412 100644 --- a/data/maps/FourIsland_LoreleisHouse/map.json +++ b/data/maps/FourIsland_LoreleisHouse/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C58", + "script": "FourIsland_LoreleisHouse_EventScript_Lorelei", "flag": "FLAG_HIDE_LORELEI_IN_HER_HOUSE" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "0" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "0" }, { @@ -77,7 +77,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "0" }, { @@ -90,7 +90,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "0" }, { @@ -103,7 +103,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "0" }, { @@ -116,7 +116,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "FLAG_HIDE_LORELEI_HOUSE_MEOWTH_DOLL" }, { @@ -129,7 +129,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "FLAG_HIDE_LORELEI_HOUSE_CHANSEY_DOLL" }, { @@ -142,7 +142,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "FLAG_HIDE_LORELEI_HOUSE_JIGGLYPUFF_DOLL" }, { @@ -155,7 +155,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_F_DOLL" }, { @@ -168,7 +168,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_M_DOLL" }, { @@ -181,7 +181,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "FLAG_HIDE_LORELEIS_HOUSE_PIDGEOT_DOLL" }, { @@ -194,7 +194,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "FLAG_HIDE_LORELEIS_HOUSE_FEAROW_DOLL" }, { @@ -207,7 +207,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "FLAG_HIDE_LORELEIS_HOUSE_LAPRAS_DOLL" } ], diff --git a/data/maps/FourIsland_LoreleisHouse/scripts.inc b/data/maps/FourIsland_LoreleisHouse/scripts.inc index c39cc1da9..6259870e6 100644 --- a/data/maps/FourIsland_LoreleisHouse/scripts.inc +++ b/data/maps/FourIsland_LoreleisHouse/scripts.inc @@ -6,28 +6,28 @@ FourIsland_LoreleisHouse_OnTransition:: @ 8171C54 special Special_ComputeLoreleiDollCollection end -FourIsland_LoreleisHouse_EventScript_171C58:: @ 8171C58 +FourIsland_LoreleisHouse_EventScript_Lorelei:: @ 8171C58 lock faceplayer - goto_if_set FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE, EventScript_171C83 - goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, EventScript_171C76 - msgbox gUnknown_81A3826 + goto_if_set FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE, FourIsland_LoreleisHouse_EventScript_Lorelei3 + goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, FourIsland_LoreleisHouse_EventScript_Lorelei2 + msgbox FourIsland_LoreleisHouse_Text_IfAnythingWereToHappenToIsland release end -EventScript_171C76:: @ 8171C76 +FourIsland_LoreleisHouse_EventScript_Lorelei2:: @ 8171C76 setflag FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE - msgbox gUnknown_81A390C + msgbox FourIsland_LoreleisHouse_Text_IllReturnToLeagueInShortWhile release end -EventScript_171C83:: @ 8171C83 - msgbox gUnknown_81A39D8 +FourIsland_LoreleisHouse_EventScript_Lorelei3:: @ 8171C83 + msgbox FourIsland_LoreleisHouse_Text_WillDoWhatICanHereAndNow release end -FourIsland_LoreleisHouse_EventScript_171C8D:: @ 8171C8D +FourIsland_LoreleisHouse_EventScript_Doll:: @ 8171C8D lock - msgbox gUnknown_81A3A42 + msgbox FourIsland_LoreleisHouse_Text_StuffedMonDollsGalore release end diff --git a/data/maps/FourIsland_LoreleisHouse/text.inc b/data/maps/FourIsland_LoreleisHouse/text.inc index 5c7d0cd81..b332cd50e 100644 --- a/data/maps/FourIsland_LoreleisHouse/text.inc +++ b/data/maps/FourIsland_LoreleisHouse/text.inc @@ -1,4 +1,4 @@ -gUnknown_81A3826:: @ 81A3826 +FourIsland_LoreleisHouse_Text_IfAnythingWereToHappenToIsland:: @ 81A3826 .string "LORELEI: There's something weighing\n" .string "heavily on my mind.\p" .string "If anything were to happen on\n" @@ -8,7 +8,7 @@ gUnknown_81A3826:: @ 81A3826 .string "I wonder if that would make me\n" .string "irresponsible to my home…$" -gUnknown_81A390C:: @ 81A390C +FourIsland_LoreleisHouse_Text_IllReturnToLeagueInShortWhile:: @ 81A390C .string "LORELEI: So, you managed to solve\n" .string "all the problems here?\p" .string "That's wonderful.\p" @@ -18,12 +18,12 @@ gUnknown_81A390C:: @ 81A390C .string "I'll return to the POKéMON LEAGUE\n" .string "in a short while.$" -gUnknown_81A39D8:: @ 81A39D8 +FourIsland_LoreleisHouse_Text_WillDoWhatICanHereAndNow:: @ 81A39D8 .string "I don't know what will happen in\n" .string "the future, but…\p" .string "I will do what I can here and now.\n" .string "That's all I can do.$" -gUnknown_81A3A42:: @ 81A3A42 +FourIsland_LoreleisHouse_Text_StuffedMonDollsGalore:: @ 81A3A42 .string "Stuffed POKéMON dolls galore!$" diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json index f5820fef9..5543c8c50 100644 --- a/data/maps/FourIsland_Mart/map.json +++ b/data/maps/FourIsland_Mart/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_Mart_EventScript_171CAE", + "script": "FourIsland_Mart_EventScript_Clerk", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_Mart_EventScript_1ACF46", + "script": "FourIsland_Mart_EventScript_OldMan", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_Mart_EventScript_171CE8", + "script": "FourIsland_Mart_EventScript_Camper", "flag": "0" } ], diff --git a/data/maps/FourIsland_Mart/scripts.inc b/data/maps/FourIsland_Mart/scripts.inc index 5f85eaae4..36b3a0914 100644 --- a/data/maps/FourIsland_Mart/scripts.inc +++ b/data/maps/FourIsland_Mart/scripts.inc @@ -1,19 +1,19 @@ FourIsland_Mart_MapScripts:: @ 8171CAD .byte 0 -FourIsland_Mart_EventScript_171CAE:: @ 8171CAE +FourIsland_Mart_EventScript_Clerk:: @ 8171CAE goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_171CD4 + pokemart FourIsland_Mart_Items msgbox Text_PleaseComeAgain release end .align 2 -Items_171CD4:: @ 8171CD4 +FourIsland_Mart_Items:: @ 8171CD4 .2byte ITEM_ULTRA_BALL .2byte ITEM_FULL_RESTORE .2byte ITEM_MAX_POTION @@ -26,6 +26,6 @@ Items_171CD4:: @ 8171CD4 release end -FourIsland_Mart_EventScript_171CE8:: @ 8171CE8 - msgbox gUnknown_81A3B14, MSGBOX_NPC +FourIsland_Mart_EventScript_Camper:: @ 8171CE8 + msgbox FourIsland_Mart_Text_IcefallCaveIsFrigid, MSGBOX_NPC end diff --git a/data/maps/FourIsland_Mart/text.inc b/data/maps/FourIsland_Mart/text.inc index eba66dd37..afde0e79c 100644 --- a/data/maps/FourIsland_Mart/text.inc +++ b/data/maps/FourIsland_Mart/text.inc @@ -1,4 +1,4 @@ -Text_1A3A60:: @ 81A3A60 +FourIsland_Mart_Text_LoreleiGrewUpOnThisIsland:: @ 81A3A60 .string "We've had a great and powerful\n" .string "TRAINER grow up on this island.\p" .string "I bet even you'd know her.\n" @@ -6,7 +6,7 @@ Text_1A3A60:: @ 81A3A60 .string "When LORELEI was just a tyke,\n" .string "I taught her about POKéMON.$" -gUnknown_81A3B14:: @ 81A3B14 +FourIsland_Mart_Text_IcefallCaveIsFrigid:: @ 81A3B14 .string "The SEVII ISLANDS are in a warm\n" .string "region overall.\p" .string "But there is one exception you\n" diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json index a8bf5fa97..7757c904e 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/map.json +++ b/data/maps/FourIsland_PokemonCenter_1F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_PokemonCenter_1F_EventScript_171BF9", + "script": "FourIsland_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_PokemonCenter_1F_EventScript_171C02", + "script": "FourIsland_PokemonCenter_1F_EventScript_Man", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_PokemonCenter_1F_EventScript_171C0B", + "script": "FourIsland_PokemonCenter_1F_EventScript_Woman", "flag": "0" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_PokemonCenter_1F_EventScript_171C14", + "script": "FourIsland_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" } ], @@ -91,14 +91,14 @@ "x": 3, "y": 1, "elevation": 0, - "script": "FourIsland_PokemonCenter_1F_EventScript_1ACDD0" + "script": "FourIsland_PokemonCenter_1F_EventScript_PokemonJournal" }, { "type": "bg_event_type_1", "x": 2, "y": 1, "elevation": 0, - "script": "FourIsland_PokemonCenter_1F_EventScript_1ACDD0" + "script": "FourIsland_PokemonCenter_1F_EventScript_PokemonJournal" } ] } diff --git a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc index 4ee8e33c1..afb0c7582 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc @@ -7,21 +7,21 @@ FourIsland_PokemonCenter_1F_OnTransition:: @ 8171BF5 setrespawn SPAWN_FOUR_ISLAND end -FourIsland_PokemonCenter_1F_EventScript_171BF9:: @ 8171BF9 +FourIsland_PokemonCenter_1F_EventScript_Nurse:: @ 8171BF9 lock faceplayer call EventScript_PkmnCenterNurse release end -FourIsland_PokemonCenter_1F_EventScript_171C02:: @ 8171C02 - msgbox gUnknown_81A3627, MSGBOX_NPC +FourIsland_PokemonCenter_1F_EventScript_Man:: @ 8171C02 + msgbox FourIsland_PokemonCenter_1F_Text_RareIceMonsInCave, MSGBOX_NPC end -FourIsland_PokemonCenter_1F_EventScript_171C0B:: @ 8171C0B - msgbox gUnknown_81A3697, MSGBOX_NPC +FourIsland_PokemonCenter_1F_EventScript_Woman:: @ 8171C0B + msgbox FourIsland_PokemonCenter_1F_Text_DayCarePeopleFoundEggBefore, MSGBOX_NPC end -FourIsland_PokemonCenter_1F_EventScript_171C14:: @ 8171C14 - msgbox gUnknown_81A3734, MSGBOX_NPC +FourIsland_PokemonCenter_1F_EventScript_Gentleman:: @ 8171C14 + msgbox FourIsland_PokemonCenter_1F_Text_NewPokemonJournalHasntArrived, MSGBOX_NPC end diff --git a/data/maps/FourIsland_PokemonCenter_1F/text.inc b/data/maps/FourIsland_PokemonCenter_1F/text.inc index 954aabd96..43e6cacf6 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/text.inc +++ b/data/maps/FourIsland_PokemonCenter_1F/text.inc @@ -1,3 +1,4 @@ +@ The 5 texts below are supposed to be in FourIsland_House1 Text_BodySlamTeach:: @ 81A3505 .string "Ready?\n" .string "Boing!\p" @@ -19,17 +20,17 @@ Text_BodySlamWhichMon:: @ 81A35DA Text_BodySlamTaught:: @ 81A3609 .string "Boioing!$" -Text_1A3612:: @ 81A3612 +FourIsland_House1_Text_FatMan:: @ 81A3612 .string "それ　ぼよーん！\n" .string "おまえ　おもいなあー！$" -gUnknown_81A3627:: @ 81A3627 +FourIsland_PokemonCenter_1F_Text_RareIceMonsInCave:: @ 81A3627 .string "There's a rare kind of ICE POKéMON\n" .string "that lives in the cave.\p" .string "We get a lot of visitors hoping to\n" .string "see that POKéMON.$" -gUnknown_81A3697:: @ 81A3697 +FourIsland_PokemonCenter_1F_Text_DayCarePeopleFoundEggBefore:: @ 81A3697 .string "Oh? A POKéMON EGG?\n" .string "…I have no idea.\p" .string "…Oh, wait. The DAY-CARE people\n" @@ -37,7 +38,7 @@ gUnknown_81A3697:: @ 81A3697 .string "They said that they'd found EGGS\n" .string "before on their property.$" -gUnknown_81A3734:: @ 81A3734 +FourIsland_PokemonCenter_1F_Text_NewPokemonJournalHasntArrived:: @ 81A3734 .string "What's this?\p" .string "The new POKéMON JOURNAL hasn't\n" .string "arrived on this island?$" diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index c844cc115..81c05ab40 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -27,11 +27,11 @@ EventScript_1ACDB5:: @ 81ACDB5 release end -FourIsland_PokemonCenter_1F_EventScript_1ACDD0:: @ 81ACDD0 +FourIsland_PokemonCenter_1F_EventScript_PokemonJournal:: @ 81ACDD0 lockall famechecker FAMECHECKER_DAISY, 5 textcolor 3 - msgbox gUnknown_81B1B3D + msgbox PokemonJournal_Text_SpecialFeatureDaisyOak releaseall end @@ -143,11 +143,11 @@ FiveIsland_ResortGorgeous_House_EventScript_1ACF2C:: @ 81ACF2C releaseall end -FourIsland_Mart_EventScript_1ACF46:: @ 81ACF46 +FourIsland_Mart_EventScript_OldMan:: @ 81ACF46 lock faceplayer famechecker FAMECHECKER_LORELEI, 2 - msgbox Text_1A3A60 + msgbox FourIsland_Mart_Text_LoreleiGrewUpOnThisIsland release end diff --git a/data/scripts/trainer_card.inc b/data/scripts/trainer_card.inc index 906744fa8..39589cffa 100644 --- a/data/scripts/trainer_card.inc +++ b/data/scripts/trainer_card.inc @@ -1,79 +1,79 @@ CeladonCity_GameCorner_EventScript_PhotoPrinter:: @ 81B2867 lockall showmoneybox 0, 0, 0 - msgbox gUnknown_81B1D7D, MSGBOX_YESNO + msgbox CeladonCity_GameCorner_Text_TryPokemonPrinter, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1B2926 + goto_if_eq CeladonCity_GameCorner_EventScript_DeclinePhoto checkmoney 50, 0 compare VAR_RESULT, FALSE - goto_if_eq EventScript_1B292B + goto_if_eq CeladonCity_GameCorner_EventScript_NotEnoughMoneyForPhoto playse SE_SHOP removemoney 50, 0 updatemoneybox 0, 0, 0 waitse - message gUnknown_81B1E24 + message CeladonCity_GameCorner_Text_ChoosePrintType waitmessage multichoice 21, 0, MULTICHOICE_TRAINER_CARD_ICON_TINT, TRUE switch VAR_RESULT - case 0, EventScript_1B28DB - case 1, EventScript_1B28E6 - case 2, EventScript_1B28F1 - case 3, EventScript_1B28FC + case 0, CeladonCity_GameCorner_EventScript_PrintTypeNormal + case 1, CeladonCity_GameCorner_EventScript_PrintTypeBlack + case 2, CeladonCity_GameCorner_EventScript_PrintTypePink + case 3, CeladonCity_GameCorner_EventScript_PrintTypeSepia end -EventScript_1B28DB:: @ 81B28DB - setvar VAR_0x8004, 0 - goto EventScript_1B2907 +CeladonCity_GameCorner_EventScript_PrintTypeNormal:: @ 81B28DB + setvar VAR_0x8004, MON_ICON_TINT_NORMAL + goto CeladonCity_GameCorner_EventScript_PrintPhoto end -EventScript_1B28E6:: @ 81B28E6 - setvar VAR_0x8004, 1 - goto EventScript_1B2907 +CeladonCity_GameCorner_EventScript_PrintTypeBlack:: @ 81B28E6 + setvar VAR_0x8004, MON_ICON_TINT_BLACK + goto CeladonCity_GameCorner_EventScript_PrintPhoto end -EventScript_1B28F1:: @ 81B28F1 - setvar VAR_0x8004, 2 - goto EventScript_1B2907 +CeladonCity_GameCorner_EventScript_PrintTypePink:: @ 81B28F1 + setvar VAR_0x8004, MON_ICON_TINT_PINK + goto CeladonCity_GameCorner_EventScript_PrintPhoto end -EventScript_1B28FC:: @ 81B28FC - setvar VAR_0x8004, 3 - goto EventScript_1B2907 +CeladonCity_GameCorner_EventScript_PrintTypeSepia:: @ 81B28FC + setvar VAR_0x8004, MON_ICON_TINT_SEPIA + goto CeladonCity_GameCorner_EventScript_PrintPhoto end -EventScript_1B2907:: @ 81B2907 - message gUnknown_81B1E42 +CeladonCity_GameCorner_EventScript_PrintPhoto:: @ 81B2907 + message CeladonCity_GameCorner_Text_BigSmileForPhoto waitmessage playse MUS_ME_PHOTO dofieldeffect FLDEFF_UNK_45 delay 60 special Special_UpdateTrainerCardPhotoIcons - msgbox gUnknown_81B1E7D + msgbox CeladonCity_GameCorner_Text_PrintIsReadyCheckTrainerCard hidemoneybox 0, 0 releaseall end -EventScript_1B2926:: @ 81B2926 +CeladonCity_GameCorner_EventScript_DeclinePhoto:: @ 81B2926 hidemoneybox 0, 0 releaseall end -EventScript_1B292B:: @ 81B292B - msgbox gUnknown_81B1E07 +CeladonCity_GameCorner_EventScript_NotEnoughMoneyForPhoto:: @ 81B292B + msgbox CeladonCity_GameCorner_Text_DontHaveEnoughMoney hidemoneybox 0, 0 releaseall end -FourIsland_House2_EventScript_1B2938:: @ 81B2938 +FourIsland_House2_EventScript_StickerMan:: @ 81B2938 lock - specialvar VAR_0x8008, Special_StickerLadyGetBragFlags - goto_if_unset FLAG_MET_STICKER_LADY, EventScript_1B2951 - goto_if_set FLAG_MET_STICKER_LADY, EventScript_1B2994 + specialvar VAR_0x8008, StickerManGetBragFlags + goto_if_unset FLAG_MET_STICKER_MAN, FourIsland_House2_EventScript_MeetStickerMan + goto_if_set FLAG_MET_STICKER_MAN, EventScript_1B2994 end -EventScript_1B2951:: @ 81B2951 - setflag FLAG_MET_STICKER_LADY - msgbox gUnknown_81B1EB3 +FourIsland_House2_EventScript_MeetStickerMan:: @ 81B2951 + setflag FLAG_MET_STICKER_MAN + msgbox FourIsland_House2_Text_WishICouldShowOffStickers applymovement 1, Movement_FacePlayer waitmovement 0 playse SE_PIN @@ -82,10 +82,10 @@ EventScript_1B2951:: @ 81B2951 applymovement 1, Movement_Delay48 waitmovement 0 compare VAR_0x8008, 0 - goto_if_eq EventScript_1B2B8E - message gUnknown_81B1EF8 + goto_if_eq FourIsland_House2_EventScript_StickerManNothingToBrag + message FourIsland_House2_Text_GiveYouStickerIfYouBrag waitmessage - goto EventScript_1B29D0 + goto FourIsland_House2_EventScript_ChooseBrag end EventScript_1B2994:: @ 81B2994 @@ -95,290 +95,282 @@ EventScript_1B2994:: @ 81B2994 special sub_8112364 compare VAR_0x8008, 0 goto_if_eq EventScript_1B29C6 - message gUnknown_81B2025 + message FourIsland_House2_Text_BragAboutWhatToday waitmessage - goto EventScript_1B29D0 + goto FourIsland_House2_EventScript_ChooseBrag end EventScript_1B29C6:: @ 81B29C6 - msgbox gUnknown_81B1FEF + msgbox FourIsland_House2_Text_BragAboutSomethingForMe release end -EventScript_1B29D0:: @ 81B29D0 +FourIsland_House2_EventScript_ChooseBrag:: @ 81B29D0 switch VAR_0x8008 - case 1, EventScript_1B2A23 - case 2, EventScript_1B2A4F - case 4, EventScript_1B2A7B - case 3, EventScript_1B2AA7 - case 5, EventScript_1B2ADE - case 6, EventScript_1B2B15 - case 7, EventScript_1B2B4C + case 1, FourIsland_House2_EventScript_ChooseBragHoF + case 2, FourIsland_House2_EventScript_ChooseBragEggs + case 4, FourIsland_House2_EventScript_ChooseBragLinkWins + case 3, FourIsland_House2_EventScript_ChooseBragHoFEggs + case 5, FourIsland_House2_EventScript_ChooseBragHoFLinkWins + case 6, FourIsland_House2_EventScript_ChooseBragEggsLinkWins + case 7, FourIsland_House2_EventScript_ChooseBragHofEggsLinkWins end -EventScript_1B2A23:: @ 81B2A23 +FourIsland_House2_EventScript_ChooseBragHoF:: @ 81B2A23 multichoice 15, 8, MULTICHOICE_HOF_QUIT, FALSE switch VAR_RESULT - case 0, EventScript_1B2B98 - case 1, EventScript_1B2DF6 - case SCR_MENU_CANCEL, EventScript_1B2DF6 + case 0, FourIsland_House2_EventScript_BragHoF + case 1, FourIsland_House2_EventScript_QuitBrag + case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag end -EventScript_1B2A4F:: @ 81B2A4F +FourIsland_House2_EventScript_ChooseBragEggs:: @ 81B2A4F multichoice 16, 8, MULTICHOICE_EGGS_QUIT, FALSE switch VAR_RESULT - case 0, EventScript_1B2C62 - case 1, EventScript_1B2DF6 - case SCR_MENU_CANCEL, EventScript_1B2DF6 + case 0, FourIsland_House2_EventScript_BragEggs + case 1, FourIsland_House2_EventScript_QuitBrag + case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag end -EventScript_1B2A7B:: @ 81B2A7B +FourIsland_House2_EventScript_ChooseBragLinkWins:: @ 81B2A7B multichoice 15, 8, MULTICHOICE_VICTORIES_QUIT, FALSE switch VAR_RESULT - case 0, EventScript_1B2D2C - case 1, EventScript_1B2DF6 - case SCR_MENU_CANCEL, EventScript_1B2DF6 + case 0, FourIsland_House2_EventScript_BragLinkWins + case 1, FourIsland_House2_EventScript_QuitBrag + case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag end -EventScript_1B2AA7:: @ 81B2AA7 +FourIsland_House2_EventScript_ChooseBragHoFEggs:: @ 81B2AA7 multichoice 15, 6, MULTICHOICE_HOF_EGGS_QUIT, FALSE switch VAR_RESULT - case 0, EventScript_1B2B98 - case 1, EventScript_1B2C62 - case 2, EventScript_1B2DF6 - case SCR_MENU_CANCEL, EventScript_1B2DF6 + case 0, FourIsland_House2_EventScript_BragHoF + case 1, FourIsland_House2_EventScript_BragEggs + case 2, FourIsland_House2_EventScript_QuitBrag + case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag end -EventScript_1B2ADE:: @ 81B2ADE +FourIsland_House2_EventScript_ChooseBragHoFLinkWins:: @ 81B2ADE multichoice 15, 6, MULTICHOICE_HOF_VICTORIES_QUIT, FALSE switch VAR_RESULT - case 0, EventScript_1B2B98 - case 1, EventScript_1B2D2C - case 2, EventScript_1B2DF6 - case SCR_MENU_CANCEL, EventScript_1B2DF6 + case 0, FourIsland_House2_EventScript_BragHoF + case 1, FourIsland_House2_EventScript_BragLinkWins + case 2, FourIsland_House2_EventScript_QuitBrag + case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag end -EventScript_1B2B15:: @ 81B2B15 +FourIsland_House2_EventScript_ChooseBragEggsLinkWins:: @ 81B2B15 multichoice 15, 6, MULTICHOICE_EGGS_VICTORIES_QUIT, FALSE switch VAR_RESULT - case 0, EventScript_1B2C62 - case 1, EventScript_1B2D2C - case 2, EventScript_1B2DF6 - case SCR_MENU_CANCEL, EventScript_1B2DF6 + case 0, FourIsland_House2_EventScript_BragEggs + case 1, FourIsland_House2_EventScript_BragLinkWins + case 2, FourIsland_House2_EventScript_QuitBrag + case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag end -EventScript_1B2B4C:: @ 81B2B4C +FourIsland_House2_EventScript_ChooseBragHofEggsLinkWins:: @ 81B2B4C multichoice 15, 5, MULTICHOICE_HOF_EGGS_VICTORIES_QUIT, FALSE switch VAR_RESULT - case 0, EventScript_1B2B98 - case 1, EventScript_1B2C62 - case 2, EventScript_1B2D2C - case 3, EventScript_1B2DF6 - case SCR_MENU_CANCEL, EventScript_1B2DF6 + case 0, FourIsland_House2_EventScript_BragHoF + case 1, FourIsland_House2_EventScript_BragEggs + case 2, FourIsland_House2_EventScript_BragLinkWins + case 3, FourIsland_House2_EventScript_QuitBrag + case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag end -EventScript_1B2B8E:: @ 81B2B8E - msgbox gUnknown_81B1EF8 +FourIsland_House2_EventScript_StickerManNothingToBrag:: @ 81B2B8E + msgbox FourIsland_House2_Text_GiveYouStickerIfYouBrag release end -EventScript_1B2B98:: @ 81B2B98 +FourIsland_House2_EventScript_BragHoF:: @ 81B2B98 compare VAR_0x8004, 39 - goto_if_le EventScript_1B2BC5 + goto_if_le FourIsland_House2_EventScript_BragHoFLowest compare VAR_0x8004, 99 - goto_if_le EventScript_1B2BE3 + goto_if_le FourIsland_House2_EventScript_BragHoFLow compare VAR_0x8004, 199 - goto_if_le EventScript_1B2C01 + goto_if_le FourIsland_House2_EventScript_BragHoFHigh compare VAR_0x8004, 200 - goto_if_ge EventScript_1B2C1F + goto_if_ge FourIsland_House2_EventScript_BragHoFHighest end -EventScript_1B2BC5:: @ 81B2BC5 +FourIsland_House2_EventScript_BragHoFLowest:: @ 81B2BC5 compare VAR_HOF_BRAG_STATE, 1 - goto_if_eq EventScript_1B2C3D + goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedHoF setvar VAR_HOF_BRAG_STATE, 1 - msgbox gUnknown_81B206E - goto EventScript_1B2C51 - -EventScript_1B2BE2:: @ 81B2BE2 + msgbox FourIsland_House2_Text_WowHoFLowest + goto FourIsland_House2_EventScript_BraggedHoF end -EventScript_1B2BE3:: @ 81B2BE3 +FourIsland_House2_EventScript_BragHoFLow:: @ 81B2BE3 compare VAR_HOF_BRAG_STATE, 2 - goto_if_eq EventScript_1B2C3D + goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedHoF setvar VAR_HOF_BRAG_STATE, 2 - msgbox gUnknown_81B20CF - goto EventScript_1B2C51 - -EventScript_1B2C00:: @ 81B2C00 + msgbox FourIsland_House2_Text_WowHoFLow + goto FourIsland_House2_EventScript_BraggedHoF end -EventScript_1B2C01:: @ 81B2C01 +FourIsland_House2_EventScript_BragHoFHigh:: @ 81B2C01 compare VAR_HOF_BRAG_STATE, 3 - goto_if_eq EventScript_1B2C3D + goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedHoF setvar VAR_HOF_BRAG_STATE, 3 - msgbox gUnknown_81B2133 - goto EventScript_1B2C51 - -EventScript_1B2C1E:: @ 81B2C1E + msgbox FourIsland_House2_Text_WowHoFHigh + goto FourIsland_House2_EventScript_BraggedHoF end -EventScript_1B2C1F:: @ 81B2C1F +FourIsland_House2_EventScript_BragHoFHighest:: @ 81B2C1F compare VAR_HOF_BRAG_STATE, 4 - goto_if_eq EventScript_1B2C47 + goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedHoFMax setvar VAR_HOF_BRAG_STATE, 4 - msgbox gUnknown_81B21C4 - goto EventScript_1B2C51 - -EventScript_1B2C3C:: @ 81B2C3C + msgbox FourIsland_House2_Text_WowHoFHighest + goto FourIsland_House2_EventScript_BraggedHoF end -EventScript_1B2C3D:: @ 81B2C3D - msgbox gUnknown_81B227C +FourIsland_House2_EventScript_AlreadyBraggedHoF:: @ 81B2C3D + msgbox FourIsland_House2_Text_ComeBackWithBetterStoryHoF release end -EventScript_1B2C47:: @ 81B2C47 - msgbox gUnknown_81B22B0 +FourIsland_House2_EventScript_AlreadyBraggedHoFMax:: @ 81B2C47 + msgbox FourIsland_House2_Text_LivingLegendHoF release end -EventScript_1B2C51:: @ 81B2C51 +FourIsland_House2_EventScript_BraggedHoF:: @ 81B2C51 textcolor 3 playfanfare MUS_FANFA1 - message gUnknown_81B2242 + message FourIsland_House2_Text_HoFStickerApplied waitmessage waitfanfare delay 90 release end -EventScript_1B2C62:: @ 81B2C62 +FourIsland_House2_EventScript_BragEggs:: @ 81B2C62 compare VAR_0x8005, 99 - goto_if_le EventScript_1B2C8F + goto_if_le FourIsland_House2_EventScript_BragEggsLowest compare VAR_0x8005, 199 - goto_if_le EventScript_1B2CAD + goto_if_le FourIsland_House2_EventScript_BragEggsLow compare VAR_0x8005, 299 - goto_if_le EventScript_1B2CCB + goto_if_le FourIsland_House2_EventScript_BragEggsHigh compare VAR_0x8005, 300 - goto_if_ge EventScript_1B2CE9 + goto_if_ge FourIsland_House2_EventScript_BragEggsHighest end -EventScript_1B2C8F:: @ 81B2C8F +FourIsland_House2_EventScript_BragEggsLowest:: @ 81B2C8F compare VAR_EGG_BRAG_STATE, 1 - goto_if_eq EventScript_1B2D07 + goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedEggs setvar VAR_EGG_BRAG_STATE, 1 - msgbox gUnknown_81B2308 - goto EventScript_1B2D1B + msgbox FourIsland_House2_Text_WowEggsLowest + goto FourIsland_House2_EventScript_BraggedEggs end -EventScript_1B2CAD:: @ 81B2CAD +FourIsland_House2_EventScript_BragEggsLow:: @ 81B2CAD compare VAR_EGG_BRAG_STATE, 2 - goto_if_eq EventScript_1B2D07 + goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedEggs setvar VAR_EGG_BRAG_STATE, 2 - msgbox gUnknown_81B2372 - goto EventScript_1B2D1B + msgbox FourIsland_House2_Text_WowEggsLow + goto FourIsland_House2_EventScript_BraggedEggs end -EventScript_1B2CCB:: @ 81B2CCB +FourIsland_House2_EventScript_BragEggsHigh:: @ 81B2CCB compare VAR_EGG_BRAG_STATE, 3 - goto_if_eq EventScript_1B2D07 + goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedEggs setvar VAR_EGG_BRAG_STATE, 3 - msgbox gUnknown_81B23E0 - goto EventScript_1B2D1B + msgbox FourIsland_House2_Text_WowEggsHigh + goto FourIsland_House2_EventScript_BraggedEggs end -EventScript_1B2CE9:: @ 81B2CE9 +FourIsland_House2_EventScript_BragEggsHighest:: @ 81B2CE9 compare VAR_EGG_BRAG_STATE, 4 - goto_if_eq EventScript_1B2D11 + goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedEggsMax setvar VAR_EGG_BRAG_STATE, 4 - msgbox gUnknown_81B2448 - goto EventScript_1B2D1B + msgbox FourIsland_House2_Text_WowEggsHighest + goto FourIsland_House2_EventScript_BraggedEggs end -EventScript_1B2D07:: @ 81B2D07 - msgbox gUnknown_81B251B +FourIsland_House2_EventScript_AlreadyBraggedEggs:: @ 81B2D07 + msgbox FourIsland_House2_Text_ComeBackWithBetterStoryEggs release end -EventScript_1B2D11:: @ 81B2D11 - msgbox gUnknown_81B254F +FourIsland_House2_EventScript_AlreadyBraggedEggsMax:: @ 81B2D11 + msgbox FourIsland_House2_Text_LivingLegendEggs release end -EventScript_1B2D1B:: @ 81B2D1B +FourIsland_House2_EventScript_BraggedEggs:: @ 81B2D1B textcolor 3 playfanfare MUS_FANFA1 - message gUnknown_81B24EA + message FourIsland_House2_Text_EggStickerApplied waitmessage waitfanfare delay 90 release end -EventScript_1B2D2C:: @ 81B2D2C +FourIsland_House2_EventScript_BragLinkWins:: @ 81B2D2C compare VAR_0x8006, 19 - goto_if_le EventScript_1B2D59 + goto_if_le FourIsland_House2_EventScript_BragLinkWinsLowest compare VAR_0x8006, 49 - goto_if_le EventScript_1B2D77 + goto_if_le FourIsland_House2_EventScript_BragLinkWinsLow compare VAR_0x8006, 99 - goto_if_le EventScript_1B2D95 + goto_if_le FourIsland_House2_EventScript_BragLinkWinsHigh compare VAR_0x8006, 100 - goto_if_ge EventScript_1B2DB3 + goto_if_ge FourIsland_House2_EventScript_BragLinkWinsHighest end -EventScript_1B2D59:: @ 81B2D59 +FourIsland_House2_EventScript_BragLinkWinsLowest:: @ 81B2D59 compare VAR_LINK_WIN_BRAG_STATE, 1 - goto_if_eq EventScript_1B2DD1 + goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedLinkWins setvar VAR_LINK_WIN_BRAG_STATE, 1 - msgbox gUnknown_81B25A7 - goto EventScript_1B2DE5 + msgbox FourIsland_House2_Text_WowLinkWinsLowest + goto FourIsland_House2_EventScript_BraggedLinkWins end -EventScript_1B2D77:: @ 81B2D77 +FourIsland_House2_EventScript_BragLinkWinsLow:: @ 81B2D77 compare VAR_LINK_WIN_BRAG_STATE, 2 - goto_if_eq EventScript_1B2DD1 + goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedLinkWins setvar VAR_LINK_WIN_BRAG_STATE, 2 - msgbox gUnknown_81B2609 - goto EventScript_1B2DE5 + msgbox FourIsland_House2_Text_WowLinkWinsLow + goto FourIsland_House2_EventScript_BraggedLinkWins end -EventScript_1B2D95:: @ 81B2D95 +FourIsland_House2_EventScript_BragLinkWinsHigh:: @ 81B2D95 compare VAR_LINK_WIN_BRAG_STATE, 3 - goto_if_eq EventScript_1B2DD1 + goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedLinkWins setvar VAR_LINK_WIN_BRAG_STATE, 3 - msgbox gUnknown_81B267B - goto EventScript_1B2DE5 + msgbox FourIsland_House2_Text_WowLinkWinsHigh + goto FourIsland_House2_EventScript_BraggedLinkWins end -EventScript_1B2DB3:: @ 81B2DB3 +FourIsland_House2_EventScript_BragLinkWinsHighest:: @ 81B2DB3 compare VAR_LINK_WIN_BRAG_STATE, 4 - goto_if_eq EventScript_1B2DDB + goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedLinkWinsMax setvar VAR_LINK_WIN_BRAG_STATE, 4 - msgbox gUnknown_81B26F6 - goto EventScript_1B2DE5 + msgbox FourIsland_House2_Text_WowLinkWinsHighest + goto FourIsland_House2_EventScript_BraggedLinkWins end -EventScript_1B2DD1:: @ 81B2DD1 - msgbox gUnknown_81B27DB +FourIsland_House2_EventScript_AlreadyBraggedLinkWins:: @ 81B2DD1 + msgbox FourIsland_House2_Text_ComeBackWithBetterStoryLinkWins release end -EventScript_1B2DDB:: @ 81B2DDB - msgbox gUnknown_81B280F +FourIsland_House2_EventScript_AlreadyBraggedLinkWinsMax:: @ 81B2DDB + msgbox FourIsland_House2_Text_LivingLegendLinkWins release end -EventScript_1B2DE5:: @ 81B2DE5 +FourIsland_House2_EventScript_BraggedLinkWins:: @ 81B2DE5 textcolor 3 playfanfare MUS_FANFA1 - message gUnknown_81B27A6 + message FourIsland_House2_Text_VictoryStickerApplied waitmessage waitfanfare delay 90 release end -EventScript_1B2DF6:: @ 81B2DF6 +FourIsland_House2_EventScript_QuitBrag:: @ 81B2DF6 release end diff --git a/data/specials.inc b/data/specials.inc index 19ea756a7..3689ebd5f 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -368,7 +368,7 @@ gSpecials:: @ 815FD60 def_special ShouldShowBoxWasFullMessage def_special ChangeBoxPokemonNickname def_special Special_UpdateTrainerCardPhotoIcons - def_special Special_StickerLadyGetBragFlags + def_special StickerManGetBragFlags def_special SetUsedPkmnCenterQuestLogEvent def_special IsWirelessAdapterConnected def_special TryBecomeLinkLeader diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc index a8226df05..10a19b83d 100644 --- a/data/text/fame_checker.inc +++ b/data/text/fame_checker.inc @@ -1468,7 +1468,7 @@ PokemonJournal_Text_SpecialFeatureProfOak:: @ 81B1AB9 .string "PROF. OAK reportedly lives with his\n" .string "grandchildren DAISY and {RIVAL}.$" -gUnknown_81B1B3D:: @ 81B1B3D +PokemonJournal_Text_SpecialFeatureDaisyOak:: @ 81B1B3D .string "This is a POKéMON JOURNAL from\n" .string "years ago…\p" .string "POKéMON JOURNAL\n" diff --git a/data/text/trainer_card.inc b/data/text/trainer_card.inc index 3a6557cca..4a54e5b5b 100644 --- a/data/text/trainer_card.inc +++ b/data/text/trainer_card.inc @@ -1,31 +1,31 @@ -gUnknown_81B1D7D:: @ 81B1D7D +CeladonCity_GameCorner_Text_TryPokemonPrinter:: @ 81B1D7D .string "It's a POKéMON PRINTER!\p" .string "It can put a print of your POKéMON\n" .string "on the back of your TRAINER CARD.\p" .string "It costs only ¥50.\n" .string "Would you like to try it?$" -gUnknown_81B1E07:: @ 81B1E07 +CeladonCity_GameCorner_Text_DontHaveEnoughMoney:: @ 81B1E07 .string "You don't have enough money.$" -gUnknown_81B1E24:: @ 81B1E24 +CeladonCity_GameCorner_Text_ChoosePrintType:: @ 81B1E24 .string "Please choose the print type.$" -gUnknown_81B1E42:: @ 81B1E42 +CeladonCity_GameCorner_Text_BigSmileForPhoto:: @ 81B1E42 .string "A big smile for the photo, please!\n" .string "Three… Two… One…\p" .string "Flash!$" -gUnknown_81B1E7D:: @ 81B1E7D +CeladonCity_GameCorner_Text_PrintIsReadyCheckTrainerCard:: @ 81B1E7D .string "Your POKéMON print is ready!\n" .string "Check your TRAINER CARD.$" -gUnknown_81B1EB3:: @ 81B1EB3 +FourIsland_House2_Text_WishICouldShowOffStickers:: @ 81B1EB3 .string "Giggle…\n" .string "I collected a ton of STICKERS.\l" .string "I wish I could show them off…$" -gUnknown_81B1EF8:: @ 81B1EF8 +FourIsland_House2_Text_GiveYouStickerIfYouBrag:: @ 81B1EF8 .string "Oh, excellent!\n" .string "You've come to the right place!\p" .string "Look, look! See? See?\n" @@ -38,113 +38,113 @@ gUnknown_81B1EF8:: @ 81B1EF8 .string "yourself.\p" .string "What will you brag about?$" -gUnknown_81B1FEF:: @ 81B1FEF +FourIsland_House2_Text_BragAboutSomethingForMe:: @ 81B1FEF .string "Brag about something for me.\n" .string "I'll give you a STICKER.$" -gUnknown_81B2025:: @ 81B2025 +FourIsland_House2_Text_BragAboutWhatToday:: @ 81B2025 .string "Oh, hi!\n" .string "Here comes the braggart.\p" .string "What are you going to brag about\n" .string "today?$" -gUnknown_81B206E:: @ 81B206E +FourIsland_House2_Text_WowHoFLowest:: @ 81B206E .string "Oh, wow, you made it into the\n" .string "HALL OF FAME.\p" .string "That's pretty good, yup!\n" .string "I'll give you one of these.$" -gUnknown_81B20CF:: @ 81B20CF +FourIsland_House2_Text_WowHoFLow:: @ 81B20CF .string "Oh, wow, you've entered the\n" .string "HALL OF FAME often!\p" .string "That's impressive, yup!\n" .string "I'll give you one of these.$" -gUnknown_81B2133:: @ 81B2133 +FourIsland_House2_Text_WowHoFHigh:: @ 81B2133 .string "Whoa! You've made it into the\n" .string "HALL OF FAME that often?\l" .string "That's seriously incredible, yup!\p" .string "You own the POKéMON LEAGUE!\n" .string "I'll give you one of these.$" -gUnknown_81B21C4:: @ 81B21C4 +FourIsland_House2_Text_WowHoFHighest:: @ 81B21C4 .string "No way! You've gone into the\n" .string "HALL OF FAME that many times?\p" .string "You're beyond incredible, yup!\n" .string "That's it, I have to give you this.$" -gUnknown_81B2242:: @ 81B2242 +FourIsland_House2_Text_HoFStickerApplied:: @ 81B2242 .string "The HALL OF FAME STICKER was\n" .string "applied to the TRAINER CARD.$" -gUnknown_81B227C:: @ 81B227C +FourIsland_House2_Text_ComeBackWithBetterStoryHoF:: @ 81B227C .string "Hmm…\p" .string "Come back with a better story next\n" .string "time, okay?$" -gUnknown_81B22B0:: @ 81B22B0 +FourIsland_House2_Text_LivingLegendHoF:: @ 81B22B0 .string "Oh, no, no can do.\p" .string "You're practically a living legend.\n" .string "I have no SITCKERS left to give.$" -gUnknown_81B2308:: @ 81B2308 +FourIsland_House2_Text_WowEggsLowest:: @ 81B2308 .string "Oh, wow, there are POKéMON EGGS?\n" .string "I didn't know that!\p" .string "That's pretty good, yup!\n" .string "I'll give you one of these.$" -gUnknown_81B2372:: @ 81B2372 +FourIsland_House2_Text_WowEggsLow:: @ 81B2372 .string "You've hatched that many EGGS?\n" .string "You really must like them!\p" .string "That's impressive, yup!\n" .string "I'll give you one of these.$" -gUnknown_81B23E0:: @ 81B23E0 +FourIsland_House2_Text_WowEggsHigh:: @ 81B23E0 .string "Whoa! You've hatched a whole\n" .string "bunch of EGGS!\p" .string "You're an EGG-hatching machine!\n" .string "I'll give you one of these.$" -gUnknown_81B2448:: @ 81B2448 +FourIsland_House2_Text_WowEggsHighest:: @ 81B2448 .string "Wh… You hatched that many EGGS?\p" .string "What's behind your love of EGGS?\n" .string "It's beyond incredible, yup!\p" .string "You're too awesome, I tell you.\n" .string "That's it, I have to give you this.$" -gUnknown_81B24EA:: @ 81B24EA +FourIsland_House2_Text_EggStickerApplied:: @ 81B24EA .string "The EGG STICKER was applied\n" .string "to the TRAINER CARD.$" -gUnknown_81B251B:: @ 81B251B +FourIsland_House2_Text_ComeBackWithBetterStoryEggs:: @ 81B251B .string "Hmm…\p" .string "Come back with a better story next\n" .string "time, okay?$" -gUnknown_81B254F:: @ 81B254F +FourIsland_House2_Text_LivingLegendEggs:: @ 81B254F .string "Oh, no, no can do.\p" .string "You're practically a living legend.\n" .string "I have no SITCKERS left to give.$" -gUnknown_81B25A7:: @ 81B25A7 +FourIsland_House2_Text_WowLinkWinsLowest:: @ 81B25A7 .string "Oh, wow, you've had success\n" .string "link battling?\p" .string "You're pretty strong, yup!\n" .string "I'll give you one of these.$" -gUnknown_81B2609:: @ 81B2609 +FourIsland_House2_Text_WowLinkWinsLow:: @ 81B2609 .string "You've beaten your friends a lot\n" .string "link battling, huh?\p" .string "You're impressively strong, yup!\n" .string "I'll give you one of these.$" -gUnknown_81B267B:: @ 81B267B +FourIsland_House2_Text_WowLinkWinsHigh:: @ 81B267B .string "Whoa! You've beaten your friends\n" .string "a frightful number of times.\p" .string "Have you lost friends over this?\n" .string "I'll give you one of these.$" -gUnknown_81B26F6:: @ 81B26F6 +FourIsland_House2_Text_WowLinkWinsHighest:: @ 81B26F6 .string "Wh… Wickedly whoa!\n" .string "You've won mind-blowingly often!\p" .string "It just knocks me out thinking\n" @@ -152,16 +152,16 @@ gUnknown_81B26F6:: @ 81B26F6 .string "You're the stuff of nightmares!\n" .string "That's it, I have to give you this.$" -gUnknown_81B27A6:: @ 81B27A6 +FourIsland_House2_Text_VictoryStickerApplied:: @ 81B27A6 .string "The VICTORY STICKER was applied\n" .string "to the TRAINER CARD.$" -gUnknown_81B27DB:: @ 81B27DB +FourIsland_House2_Text_ComeBackWithBetterStoryLinkWins:: @ 81B27DB .string "Hmm…\p" .string "Come back with a better story next\n" .string "time, okay?$" -gUnknown_81B280F:: @ 81B280F +FourIsland_House2_Text_LivingLegendLinkWins:: @ 81B280F .string "Oh, no, no can do.\p" .string "You're practically a living legend.\n" .string "I have no SITCKERS left to give.$" -- cgit v1.2.3 From 701d4635b4880fd9055e0b0f3e5032b5d0353ab1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 27 Feb 2020 16:19:33 -0500 Subject: Pokecenter heal and HOF field effects --- data/field_effect.s | 130 ---------------------------------------------------- 1 file changed, 130 deletions(-) (limited to 'data') diff --git a/data/field_effect.s b/data/field_effect.s index d79644860..288529090 100644 --- a/data/field_effect.s +++ b/data/field_effect.s @@ -6,136 +6,6 @@ .section .rodata .align 2 -gUnknown_83CBE9C:: @ 83CBE9C sprite_palette - obj_pal gUnknown_83CAFB0, 4103 - -gUnknown_83CBEA4:: @ 83CBEA4 sprite_palette - obj_pal gUnknown_83CB3D0, 4112 - -gOamData_83CBEAC:: @ 83CBEAC oam_data - .4byte 0x80004000, 0x00000000 - -gUnknown_83CBEB4:: @ 83CBEB4 sprite_frames - obj_frame_tiles gUnknown_83CAF90, 0x0020 - -gUnknown_83CBEBC:: @ 83CBEBC sprite_frames - obj_frame_tiles gUnknown_83CAFD0 + 0x000, 0x0100 - obj_frame_tiles gUnknown_83CAFD0 + 0x100, 0x0100 - obj_frame_tiles gUnknown_83CAFD0 + 0x200, 0x0100 - obj_frame_tiles gUnknown_83CAFD0 + 0x300, 0x0100 - -gUnknown_83CBEDC:: @ 83CBEDC sprite_frames - obj_frame_tiles gUnknown_83CB3F0 + 0x000, 0x0080 - obj_frame_tiles gUnknown_83CB3F0 + 0x080, 0x0080 - obj_frame_tiles gUnknown_83CB3F0 + 0x100, 0x0080 - obj_frame_tiles gUnknown_83CB3F0 + 0x180, 0x0080 - -gUnknown_83CBEFC:: @ 83CBEFC unknown - .byte 0xf4, 0xf8, 0x01, 0x80 - .byte 0x04, 0xf8, 0x20, 0x80 - .byte 0xf4, 0x00, 0x31, 0x80 - .byte 0x04, 0x00, 0x50, 0x80 - .byte 0x04, 0x00, 0x00, 0x00 - -gUnknown_83CBF10:: @ 83CBF10 dataptr - .4byte gUnknown_83CBEFC - -gUnknown_83CBF14:: @ 83CBF14 unknown - .byte 0xe0, 0xf8, 0x05, 0x80 - .byte 0x00, 0xf8, 0x45, 0x80 - .byte 0xe0, 0x00, 0x85, 0x80 - .byte 0x00, 0x00, 0xc5, 0x80 - .byte 0x04, 0x00, 0x00, 0x00 - -gUnknown_83CBF28:: @ 83CBE28 dataptr - .4byte gUnknown_83CBF14 - -gUnknown_83CBF2C:: @ 83CBF2C animcmd - obj_image_anim_frame 0x0000, 1 - obj_image_anim_jump 0 - -gUnknown_83CBF34:: @ 83CBF34 animcmd - obj_image_anim_frame 0x0001, 5 - obj_image_anim_frame 0x0002, 5 - obj_image_anim_frame 0x0003, 7 - obj_image_anim_frame 0x0002, 5 - obj_image_anim_frame 0x0001, 5 - obj_image_anim_frame 0x0000, 5 - obj_image_anim_loop 3 - obj_image_anim_end - - .align 2 -gUnknown_83CBF54:: @ 83CBF54 dataptr - .4byte gUnknown_83CBF2C - .4byte gUnknown_83CBF34 - -gUnknown_83CBF5C:: @ 83CBF5C animcmd - obj_image_anim_frame 0x0003, 8 - obj_image_anim_frame 0x0002, 8 - obj_image_anim_frame 0x0001, 8 - obj_image_anim_frame 0x0000, 8 - obj_image_anim_frame 0x0001, 8 - obj_image_anim_frame 0x0002, 8 - obj_image_anim_loop 2 - obj_image_anim_frame 0x0001, 8 - obj_image_anim_frame 0x0000, 8 - obj_image_anim_end - - .align 2 -gUnknown_83CBF84:: @ 83CBF84 dataptr - .4byte gUnknown_83CBF5C - -gUnknown_83CBF88:: @ 83CBF88 spr_template - spr_template 65535, 4103, gOamData_83CBE58, gUnknown_83CBF54, gUnknown_83CBEB4, gDummySpriteAffineAnimTable, SpriteCB_PokeballGlow - -gUnknown_83CBFA0:: @ 83CBFA0 spr_template - spr_template 65535, 4103, gOamData_83CBEAC, gUnknown_83CBF54, gUnknown_83CBEBC, gDummySpriteAffineAnimTable, SpriteCB_PokecenterMonitor - -gUnknown_83CBFB8:: @ 83CBFB8 spr_template - spr_template 65535, 4112, gOamData_83CBE60, gUnknown_83CBF84, gUnknown_83CBEDC, gDummySpriteAffineAnimTable, SpriteCB_HallOfFameMonitor - - .align 2 -sPokecenterHealTaskCBTable:: @ 83CBFD0 dataptr - .4byte PokecenterHealEffect_0 - .4byte PokecenterHealEffect_1 - .4byte PokecenterHealEffect_2 - .4byte PokecenterHealEffect_3 - - .align 2 -sHallOfFameRecordTaskCBTable:: @ 83CBFE0 dataptr - .4byte HallOfFameRecordEffect_0 - .4byte HallOfFameRecordEffect_1 - .4byte HallOfFameRecordEffect_2 - .4byte HallOfFameRecordEffect_3 - - .align 2 -sPokeballGlowSpriteCBTable:: @ 83CBFF0 dataptr - .4byte PokeballGlowEffect_0 - .4byte PokeballGlowEffect_1 - .4byte PokeballGlowEffect_2 - .4byte PokeballGlowEffect_3 - .4byte PokeballGlowEffect_4 - .4byte PokeballGlowEffect_5 - .4byte PokeballGlowEffect_6 - .4byte PokeballGlowEffect_7 - -gUnknown_83CC010:: @ 83CC010 data16 - .2byte 0, 0 - .2byte 6, 0 - .2byte 0, 4 - .2byte 6, 4 - .2byte 0, 8 - .2byte 6, 8 - -gUnknown_83CC028:: @ 83CC028 data8 - .byte 0x10, 0x0c, 0x08, 0x00 - -gUnknown_83CC02C:: @ 83CC02C data8 - .byte 0x10, 0x0c, 0x08, 0x00 - -gUnknown_83CC030:: @ 83CC030 data8 - .byte 0x00, 0x00, 0x00, 0x00 - .align 2 sFallWarpEffectCBPtrs:: @ 83CC034 dataptr .4byte FallWarpEffect_1 -- cgit v1.2.3 From e07c771f1840fe614ac1040d55ce842602f44c4c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 27 Feb 2020 16:59:05 -0500 Subject: through Task_FallWarpFieldEffect --- data/field_effect.s | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'data') diff --git a/data/field_effect.s b/data/field_effect.s index 288529090..3e5eba818 100644 --- a/data/field_effect.s +++ b/data/field_effect.s @@ -6,16 +6,6 @@ .section .rodata .align 2 - .align 2 -sFallWarpEffectCBPtrs:: @ 83CC034 dataptr - .4byte FallWarpEffect_1 - .4byte FallWarpEffect_2 - .4byte FallWarpEffect_3 - .4byte FallWarpEffect_4 - .4byte FallWarpEffect_5 - .4byte FallWarpEffect_6 - .4byte FallWarpEffect_7 - .align 2 sEscalatorWarpFieldEffectFuncs:: @ 83CC050 dataptr .4byte EscalatorWarpEffect_1 -- cgit v1.2.3 From 7d7c51973ca025f03de1391b87b37876d3d9e90d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 28 Feb 2020 00:22:34 -0500 Subject: Document Five Island scripts --- data/maps/FiveIsland/map.json | 6 +- data/maps/FiveIsland/scripts.inc | 12 +- data/maps/FiveIsland/text.inc | 6 +- data/maps/FiveIsland_Harbor/map.json | 2 +- data/maps/FiveIsland_Harbor/scripts.inc | 2 +- data/maps/FiveIsland_House1/map.json | 2 +- data/maps/FiveIsland_House1/scripts.inc | 4 +- data/maps/FiveIsland_House1/text.inc | 4 +- data/maps/FiveIsland_House2/map.json | 2 +- data/maps/FiveIsland_House2/scripts.inc | 4 +- data/maps/FiveIsland_House2/text.inc | 2 +- data/maps/FiveIsland_LostCave_Room1/map.json | 2 +- data/maps/FiveIsland_LostCave_Room1/scripts.inc | 6 +- data/maps/FiveIsland_LostCave_Room1/text.inc | 6 +- data/maps/FiveIsland_LostCave_Room10/scripts.inc | 32 ++--- data/maps/FiveIsland_LostCave_Room10/text.inc | 6 +- data/maps/FiveIsland_LostCave_Room4/map.json | 2 +- data/maps/FiveIsland_LostCave_Room4/scripts.inc | 6 +- data/maps/FiveIsland_LostCave_Room4/text.inc | 6 +- data/maps/FiveIsland_Meadow/map.json | 8 +- data/maps/FiveIsland_Meadow/scripts.inc | 42 +++--- data/maps/FiveIsland_Meadow/text.inc | 39 ++---- data/maps/FiveIsland_MemorialPillar/map.json | 10 +- data/maps/FiveIsland_MemorialPillar/scripts.inc | 66 ++++----- data/maps/FiveIsland_MemorialPillar/text.inc | 42 +++--- data/maps/FiveIsland_PokemonCenter_1F/map.json | 10 +- data/maps/FiveIsland_PokemonCenter_1F/scripts.inc | 10 +- data/maps/FiveIsland_PokemonCenter_1F/text.inc | 4 +- data/maps/FiveIsland_ResortGorgeous/map.json | 16 +-- data/maps/FiveIsland_ResortGorgeous/scripts.inc | 24 ++-- data/maps/FiveIsland_ResortGorgeous/text.inc | 46 +++--- data/maps/FiveIsland_ResortGorgeous_House/map.json | 4 +- .../FiveIsland_ResortGorgeous_House/scripts.inc | 126 +++++++++-------- data/maps/FiveIsland_ResortGorgeous_House/text.inc | 24 ++-- data/maps/FiveIsland_WaterLabyrinth/map.json | 4 +- data/maps/FiveIsland_WaterLabyrinth/scripts.inc | 60 ++++---- data/maps/FiveIsland_WaterLabyrinth/text.inc | 28 ++-- data/maps/PalletTown_GarysHouse/scripts.inc | 2 +- data/scripts/fame_checker.inc | 4 +- data/scripts/trainers.inc | 154 ++++++++++----------- data/specials.inc | 6 +- data/text/fame_checker.inc | 2 +- data/text/trainers.inc | 22 +-- 43 files changed, 439 insertions(+), 426 deletions(-) (limited to 'data') diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index cf40eae9e..f91680715 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_EventScript_167EAA", + "script": "FiveIsland_EventScript_Fisher", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_EventScript_167EA1", + "script": "FiveIsland_EventScript_BugCatcher", "flag": "0" }, { @@ -104,7 +104,7 @@ "x": 20, "y": 8, "elevation": 0, - "script": "FiveIsland_EventScript_167E98" + "script": "FiveIsland_EventScript_IslandSign" } ] } diff --git a/data/maps/FiveIsland/scripts.inc b/data/maps/FiveIsland/scripts.inc index 6b925d8f9..ca47c7db4 100644 --- a/data/maps/FiveIsland/scripts.inc +++ b/data/maps/FiveIsland/scripts.inc @@ -6,14 +6,14 @@ FiveIsland_OnTransition:: @ 8167E94 setworldmapflag FLAG_WORLD_MAP_FIVE_ISLAND end -FiveIsland_EventScript_167E98:: @ 8167E98 - msgbox gUnknown_8182DFB, MSGBOX_SIGN +FiveIsland_EventScript_IslandSign:: @ 8167E98 + msgbox FiveIsland_Text_IslandSign, MSGBOX_SIGN end -FiveIsland_EventScript_167EA1:: @ 8167EA1 - msgbox gUnknown_8182E26, MSGBOX_NPC +FiveIsland_EventScript_BugCatcher:: @ 8167EA1 + msgbox FiveIsland_Text_WeirdBuildingInMeadow, MSGBOX_NPC end -FiveIsland_EventScript_167EAA:: @ 8167EAA - msgbox gUnknown_8182E96, MSGBOX_NPC +FiveIsland_EventScript_Fisher:: @ 8167EAA + msgbox FiveIsland_Text_BeenGettingBusierAroundHere, MSGBOX_NPC end diff --git a/data/maps/FiveIsland/text.inc b/data/maps/FiveIsland/text.inc index 40c0d7b4e..045f8c09f 100644 --- a/data/maps/FiveIsland/text.inc +++ b/data/maps/FiveIsland/text.inc @@ -1,14 +1,14 @@ -gUnknown_8182DFB:: @ 8182DFB +FiveIsland_Text_IslandSign:: @ 8182DFB .string "FIVE ISLAND\n" .string "Chrono Island: Where Time Goes$" -gUnknown_8182E26:: @ 8182E26 +FiveIsland_Text_WeirdBuildingInMeadow:: @ 8182E26 .string "Oh, this stinks. I wanted to play in\n" .string "the MEADOW.\p" .string "But they put up a weird building\n" .string "on it, so I can't play there.$" -gUnknown_8182E96:: @ 8182E96 +FiveIsland_Text_BeenGettingBusierAroundHere:: @ 8182E96 .string "It's been getting busier around\n" .string "these parts lately.\p" .string "I haven't been catching many good\n" diff --git a/data/maps/FiveIsland_Harbor/map.json b/data/maps/FiveIsland_Harbor/map.json index 4cbf533e1..3dbe4effc 100644 --- a/data/maps/FiveIsland_Harbor/map.json +++ b/data/maps/FiveIsland_Harbor/map.json @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_Harbor_EventScript_171D43", + "script": "FiveIsland_Harbor_EventScript_Sailor", "flag": "0" } ], diff --git a/data/maps/FiveIsland_Harbor/scripts.inc b/data/maps/FiveIsland_Harbor/scripts.inc index 47ee3487f..6cb97fd8e 100644 --- a/data/maps/FiveIsland_Harbor/scripts.inc +++ b/data/maps/FiveIsland_Harbor/scripts.inc @@ -1,7 +1,7 @@ FiveIsland_Harbor_MapScripts:: @ 8171D42 .byte 0 -FiveIsland_Harbor_EventScript_171D43:: @ 8171D43 +FiveIsland_Harbor_EventScript_Sailor:: @ 8171D43 lock faceplayer message Text_WhereDoYouWantToSail diff --git a/data/maps/FiveIsland_House1/map.json b/data/maps/FiveIsland_House1/map.json index d75fa598d..e6f0c29c5 100644 --- a/data/maps/FiveIsland_House1/map.json +++ b/data/maps/FiveIsland_House1/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_House1_EventScript_171D57", + "script": "FiveIsland_House1_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/FiveIsland_House1/scripts.inc b/data/maps/FiveIsland_House1/scripts.inc index 86f6cbcb4..b3ea78ecb 100644 --- a/data/maps/FiveIsland_House1/scripts.inc +++ b/data/maps/FiveIsland_House1/scripts.inc @@ -1,6 +1,6 @@ FiveIsland_House1_MapScripts:: @ 8171D56 .byte 0 -FiveIsland_House1_EventScript_171D57:: @ 8171D57 - msgbox gUnknown_81A3CAC, MSGBOX_NPC +FiveIsland_House1_EventScript_Woman:: @ 8171D57 + msgbox FiveIsland_House1_Text_HusbandWentOffFishing, MSGBOX_NPC end diff --git a/data/maps/FiveIsland_House1/text.inc b/data/maps/FiveIsland_House1/text.inc index 7fa7e5ac1..1724cf678 100644 --- a/data/maps/FiveIsland_House1/text.inc +++ b/data/maps/FiveIsland_House1/text.inc @@ -1,11 +1,11 @@ -Text_1A3C71:: @ 81A3C71 +FiveIsland_House1_JPText_HusbandWentOffFishing:: @ 81A3C71 .string "こんばんの　おかずは\n" .string "ようい　しなくて　いいぞ！\p" .string "って　だんなが\n" .string "つりに　いったん　だけど‥\l" .string "しんじて　いいのかねえ$" -gUnknown_81A3CAC:: @ 81A3CAC +FiveIsland_House1_Text_HusbandWentOffFishing:: @ 81A3CAC .string "Don't worry about buying anything\n" .string "for dinner tonight!\p" .string "…That's what my husband said when\n" diff --git a/data/maps/FiveIsland_House2/map.json b/data/maps/FiveIsland_House2/map.json index 2a3c96e0c..b1e15c7e9 100644 --- a/data/maps/FiveIsland_House2/map.json +++ b/data/maps/FiveIsland_House2/map.json @@ -25,7 +25,7 @@ "movement_range_y": 2, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_House2_EventScript_171D61", + "script": "FiveIsland_House2_EventScript_OldMan", "flag": "0" } ], diff --git a/data/maps/FiveIsland_House2/scripts.inc b/data/maps/FiveIsland_House2/scripts.inc index 79cfa755f..938571eb0 100644 --- a/data/maps/FiveIsland_House2/scripts.inc +++ b/data/maps/FiveIsland_House2/scripts.inc @@ -1,6 +1,6 @@ FiveIsland_House2_MapScripts:: @ 8171D60 .byte 0 -FiveIsland_House2_EventScript_171D61:: @ 8171D61 - msgbox gUnknown_81A3D5E, MSGBOX_NPC +FiveIsland_House2_EventScript_OldMan:: @ 8171D61 + msgbox FiveIsland_House2_Text_MeadowBelongedToFamily, MSGBOX_NPC end diff --git a/data/maps/FiveIsland_House2/text.inc b/data/maps/FiveIsland_House2/text.inc index bad18b3a3..dd794b4e3 100644 --- a/data/maps/FiveIsland_House2/text.inc +++ b/data/maps/FiveIsland_House2/text.inc @@ -1,4 +1,4 @@ -gUnknown_81A3D5E:: @ 81A3D5E +FiveIsland_House2_Text_MeadowBelongedToFamily:: @ 81A3D5E .string "That MEADOW has belonged to our\n" .string "family for generations.\p" .string "I should have had a giant mansion\n" diff --git a/data/maps/FiveIsland_LostCave_Room1/map.json b/data/maps/FiveIsland_LostCave_Room1/map.json index 43b8fe08c..ab4b2a727 100644 --- a/data/maps/FiveIsland_LostCave_Room1/map.json +++ b/data/maps/FiveIsland_LostCave_Room1/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "FiveIsland_LostCave_Room1_EventScript_164BF7", + "script": "FiveIsland_LostCave_Room1_EventScript_Lawson", "flag": "0" } ], diff --git a/data/maps/FiveIsland_LostCave_Room1/scripts.inc b/data/maps/FiveIsland_LostCave_Room1/scripts.inc index b6f4e0257..07e1df046 100644 --- a/data/maps/FiveIsland_LostCave_Room1/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room1/scripts.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room1_MapScripts:: @ 8164BF6 .byte 0 -FiveIsland_LostCave_Room1_EventScript_164BF7:: @ 8164BF7 - trainerbattle_single TRAINER_RUIN_MANIAC_LAWSON, Text_17CEF5, Text_17CF42 - msgbox gUnknown_817CF54, MSGBOX_AUTOCLOSE +FiveIsland_LostCave_Room1_EventScript_Lawson:: @ 8164BF7 + trainerbattle_single TRAINER_RUIN_MANIAC_LAWSON, FiveIsland_LostCave_Room1_Text_LawsonIntro, FiveIsland_LostCave_Room1_Text_LawsonDefeat + msgbox FiveIsland_LostCave_Room1_Text_LawsonPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/FiveIsland_LostCave_Room1/text.inc b/data/maps/FiveIsland_LostCave_Room1/text.inc index 820a9a10f..d57eb39cf 100644 --- a/data/maps/FiveIsland_LostCave_Room1/text.inc +++ b/data/maps/FiveIsland_LostCave_Room1/text.inc @@ -1,13 +1,13 @@ -Text_17CEF5:: @ 817CEF5 +FiveIsland_LostCave_Room1_Text_LawsonIntro:: @ 817CEF5 .string "Aiyeeeeeh!\p" .string "I thought this was an ancient ruin.\n" .string "But it's teeming with ghosts!$" -Text_17CF42:: @ 817CF42 +FiveIsland_LostCave_Room1_Text_LawsonDefeat:: @ 817CF42 .string "Aiyeeeeeh!\n" .string "Mercy!$" -gUnknown_817CF54:: @ 817CF54 +FiveIsland_LostCave_Room1_Text_LawsonPostBattle:: @ 817CF54 .string "I'm trying to get out of here, but\n" .string "I always end up at the same spot.\p" .string "Maybe the number of boulders is\n" diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index 8610c7c2d..747823b0d 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -4,50 +4,50 @@ FiveIsland_LostCave_Room10_MapScripts:: @ 8164C2D .byte 0 FiveIsland_LostCave_Room10_OnResume:: @ 8164C38 - call_if_defeated TRAINER_LADY_SELPHY, EventScript_164C42 + call_if_defeated TRAINER_LADY_SELPHY, FiveIsland_LostCave_Room10_EventScript_StopSelphySceneTrigger end -EventScript_164C42:: @ 8164C42 +FiveIsland_LostCave_Room10_EventScript_StopSelphySceneTrigger:: @ 8164C42 setvar VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 1 return FiveIsland_LostCave_Room10_OnFrame:: @ 8164C48 - map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 0, EventScript_164C52 + map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 0, FiveIsland_LostCave_Room10_EventScript_FindSelphyScene .2byte 0 -EventScript_164C52:: @ 8164C52 +FiveIsland_LostCave_Room10_EventScript_FindSelphyScene:: @ 8164C52 lockall textcolor 1 - applymovement 1, Movement_164CC0 + applymovement 1, FiveIsland_LostCave_Room10_Movement_SelphyWander waitmovement 0 delay 100 - applymovement 1, Movement_164CC8 + applymovement 1, FiveIsland_LostCave_Room10_Movement_SelphyApproach waitmovement 0 - msgbox gUnknown_817D062 - goto_if_questlog EventScript_164CB6 - trainerbattle_no_intro TRAINER_LADY_SELPHY, Text_17D086 - msgbox gUnknown_817D0B2 + msgbox FiveIsland_LostCave_Room10_Text_SelphyIntro + goto_if_questlog FiveIsland_LostCave_Room10_EventScript_SelphyQuestLog + trainerbattle_no_intro TRAINER_LADY_SELPHY, FiveIsland_LostCave_Room10_Text_SelphyDefeat + msgbox FiveIsland_LostCave_Room10_Text_MayIAskYouToTakeMeHome closemessage - call EventScript_164CA5 + call FiveIsland_LostCave_Room10_EventScript_SetSelphyFound warp MAP_FIVE_ISLAND_RESORT_GORGEOUS, 255, 39, 10 waitstate releaseall end -EventScript_164CA5:: @ 8164CA5 +FiveIsland_LostCave_Room10_EventScript_SetSelphyFound:: @ 8164CA5 setflag FLAG_HIDE_LOST_CAVE_SELPHY clearflag FLAG_HIDE_RESORT_GORGEOUS_SELPHY setvar VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 1 setvar VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1 return -EventScript_164CB6:: @ 8164CB6 +FiveIsland_LostCave_Room10_EventScript_SelphyQuestLog:: @ 8164CB6 settrainerflag TRAINER_LADY_SELPHY - call EventScript_164CA5 + call FiveIsland_LostCave_Room10_EventScript_SetSelphyFound releaseall end -Movement_164CC0:: @ 8164CC0 +FiveIsland_LostCave_Room10_Movement_SelphyWander:: @ 8164CC0 walk_left delay_16 walk_right @@ -57,7 +57,7 @@ Movement_164CC0:: @ 8164CC0 walk_in_place_fastest_down step_end -Movement_164CC8:: @ 8164CC8 +FiveIsland_LostCave_Room10_Movement_SelphyApproach:: @ 8164CC8 walk_down walk_down step_end diff --git a/data/maps/FiveIsland_LostCave_Room10/text.inc b/data/maps/FiveIsland_LostCave_Room10/text.inc index da92ae5e7..57542fe1f 100644 --- a/data/maps/FiveIsland_LostCave_Room10/text.inc +++ b/data/maps/FiveIsland_LostCave_Room10/text.inc @@ -1,12 +1,12 @@ -gUnknown_817D062:: @ 817D062 +FiveIsland_LostCave_Room10_Text_SelphyIntro:: @ 817D062 .string "W-what do you intend to do with\n" .string "me?$" -Text_17D086:: @ 817D086 +FiveIsland_LostCave_Room10_Text_SelphyDefeat:: @ 817D086 .string "Oh… I was afraid that you meant to\n" .string "harm me.$" -gUnknown_817D0B2:: @ 817D0B2 +FiveIsland_LostCave_Room10_Text_MayIAskYouToTakeMeHome:: @ 817D0B2 .string "I am so glad that you happened\n" .string "here.\p" .string "I grew rather bored of walking,\n" diff --git a/data/maps/FiveIsland_LostCave_Room4/map.json b/data/maps/FiveIsland_LostCave_Room4/map.json index 844d47ac4..059093f62 100644 --- a/data/maps/FiveIsland_LostCave_Room4/map.json +++ b/data/maps/FiveIsland_LostCave_Room4/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "FiveIsland_LostCave_Room4_EventScript_164C11", + "script": "FiveIsland_LostCave_Room4_EventScript_Laura", "flag": "0" } ], diff --git a/data/maps/FiveIsland_LostCave_Room4/scripts.inc b/data/maps/FiveIsland_LostCave_Room4/scripts.inc index 38241ab71..936e488e8 100644 --- a/data/maps/FiveIsland_LostCave_Room4/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room4/scripts.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room4_MapScripts:: @ 8164C10 .byte 0 -FiveIsland_LostCave_Room4_EventScript_164C11:: @ 8164C11 - trainerbattle_single TRAINER_PSYCHIC_LAURA, Text_17CFC1, Text_17CFFB - msgbox gUnknown_817D037, MSGBOX_AUTOCLOSE +FiveIsland_LostCave_Room4_EventScript_Laura:: @ 8164C11 + trainerbattle_single TRAINER_PSYCHIC_LAURA, FiveIsland_LostCave_Room4_Text_LauraIntro, FiveIsland_LostCave_Room4_Text_LauraDefeat + msgbox FiveIsland_LostCave_Room4_Text_LauraPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/FiveIsland_LostCave_Room4/text.inc b/data/maps/FiveIsland_LostCave_Room4/text.inc index a9a8c0daf..7244fcccb 100644 --- a/data/maps/FiveIsland_LostCave_Room4/text.inc +++ b/data/maps/FiveIsland_LostCave_Room4/text.inc @@ -1,12 +1,12 @@ -Text_17CFC1:: @ 817CFC1 +FiveIsland_LostCave_Room4_Text_LauraIntro:: @ 817CFC1 .string "I think there is a mysterious power\n" .string "at work in this cave.$" -Text_17CFFB:: @ 817CFFB +FiveIsland_LostCave_Room4_Text_LauraDefeat:: @ 817CFFB .string "If you don't go into the right\n" .string "tunnel, you won't get ahead.$" -gUnknown_817D037:: @ 817D037 +FiveIsland_LostCave_Room4_Text_LauraPostBattle:: @ 817D037 .string "Earlier, a lady went into the caves\n" .string "ahead.$" diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index 6546c6e5a..6c1caf054 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "FiveIsland_Meadow_EventScript_1689BB", + "script": "FiveIsland_Meadow_EventScript_Rocket3", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "FiveIsland_Meadow_EventScript_16898D", + "script": "FiveIsland_Meadow_EventScript_Rocket1", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "FiveIsland_Meadow_EventScript_1689A4", + "script": "FiveIsland_Meadow_EventScript_Rocket2", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { @@ -134,7 +134,7 @@ "x": 12, "y": 21, "elevation": 0, - "script": "FiveIsland_Meadow_EventScript_168942" + "script": "FiveIsland_Meadow_EventScript_WarehouseDoor" } ] } diff --git a/data/maps/FiveIsland_Meadow/scripts.inc b/data/maps/FiveIsland_Meadow/scripts.inc index 21fd9be76..e0e94022f 100644 --- a/data/maps/FiveIsland_Meadow/scripts.inc +++ b/data/maps/FiveIsland_Meadow/scripts.inc @@ -3,49 +3,49 @@ FiveIsland_Meadow_MapScripts:: @ 8168932 .byte 0 FiveIsland_Meadow_OnLoad:: @ 8168938 - call_if_set FLAG_UNLOCKED_ROCKET_WAREHOUSE, EventScript_168983 + call_if_set FLAG_UNLOCKED_ROCKET_WAREHOUSE, FiveIsland_Meadow_EventScript_SetWarehouseDoorUnlocked end -FiveIsland_Meadow_EventScript_168942:: @ 8168942 +FiveIsland_Meadow_EventScript_WarehouseDoor:: @ 8168942 lockall - goto_if_set FLAG_UNLOCKED_ROCKET_WAREHOUSE, EventScript_168979 - goto_if_set FLAG_LEARNED_YES_NAH_CHANSEY, EventScript_16895F - msgbox gUnknown_818AB8E + goto_if_set FLAG_UNLOCKED_ROCKET_WAREHOUSE, FiveIsland_Meadow_EventScript_WarehouseDoorAlreadyOpen + goto_if_set FLAG_LEARNED_YES_NAH_CHANSEY, FiveIsland_Meadow_EventScript_OpenWarehouseDoor + msgbox FiveIsland_Meadow_Text_EnteredPasswordAnotherNeeded releaseall end -EventScript_16895F:: @ 816895F +FiveIsland_Meadow_EventScript_OpenWarehouseDoor:: @ 816895F setflag FLAG_UNLOCKED_ROCKET_WAREHOUSE - message Text_18ABF4 + message FiveIsland_Meadow_Text_EnteredPasswordDoorOpened waitmessage delay 60 - call EventScript_168983 + call FiveIsland_Meadow_EventScript_SetWarehouseDoorUnlocked special DrawWholeMapView playse SE_PIN waitse releaseall end -EventScript_168979:: @ 8168979 - msgbox gUnknown_818AC62 +FiveIsland_Meadow_EventScript_WarehouseDoorAlreadyOpen:: @ 8168979 + msgbox FiveIsland_Meadow_Text_WarehouseDoorAlreadyOpen releaseall end -EventScript_168983:: @ 8168983 - setmetatile 12, 21, 687, 1 +FiveIsland_Meadow_EventScript_SetWarehouseDoorUnlocked:: @ 8168983 + setmetatile 12, 21, METATILE_SeviiIslands45_RocketWarehouseDoor_Unlocked, 1 return -FiveIsland_Meadow_EventScript_16898D:: @ 816898D - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_49, Text_18AC88, Text_18ACB3 - msgbox gUnknown_818ACC5, MSGBOX_AUTOCLOSE +FiveIsland_Meadow_EventScript_Rocket1:: @ 816898D + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_49, FiveIsland_Meadow_Text_Rocket1Intro, FiveIsland_Meadow_Text_Rocket1Defeat + msgbox FiveIsland_Meadow_Text_Rocket1PostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_Meadow_EventScript_1689A4:: @ 81689A4 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_50, Text_18ACF0, Text_18AD39 - msgbox gUnknown_818AD59, MSGBOX_AUTOCLOSE +FiveIsland_Meadow_EventScript_Rocket2:: @ 81689A4 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_50, FiveIsland_Meadow_Text_Rocket2Intro, FiveIsland_Meadow_Text_Rocket2Defeat + msgbox FiveIsland_Meadow_Text_Rocket2PostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_Meadow_EventScript_1689BB:: @ 81689BB - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_51, Text_18ADC6, Text_18ADFB - msgbox gUnknown_818AE16, MSGBOX_AUTOCLOSE +FiveIsland_Meadow_EventScript_Rocket3:: @ 81689BB + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_51, FiveIsland_Meadow_Text_Rocket3Intro, FiveIsland_Meadow_Text_Rocket3Defeat + msgbox FiveIsland_Meadow_Text_Rocket3PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/FiveIsland_Meadow/text.inc b/data/maps/FiveIsland_Meadow/text.inc index 7ffd69619..7d1ef844c 100644 --- a/data/maps/FiveIsland_Meadow/text.inc +++ b/data/maps/FiveIsland_Meadow/text.inc @@ -1,70 +1,59 @@ -Text_18AAD5:: @ 818AAD5 - .string "This is an excellent environment\n" - .string "for raising POKéMON.$" - -Text_18AB0B:: @ 818AB0B - .string "Your POKéMON are growing up\n" - .string "admirably well!$" - -Text_18AB37:: @ 818AB37 - .string "You know, I think you have the\n" - .string "talent to be a good BREEDER.$" - -Text_18AB73:: @ 818AB73 +@ Unused +FiveIsland_Meadow_Text_DoorNeedsTwoPasswords:: @ 818AB73 .string "とびらを　あけるには\n" .string "パスワードが　2つ　いるようだ$" -gUnknown_818AB8E:: @ 818AB8E +FiveIsland_Meadow_Text_EnteredPasswordAnotherNeeded:: @ 818AB8E .string "{PLAYER} entered a password.\p" .string "“GOLDEEN need log.”\p" .string "… … … … … …\p" .string "Another password is needed to\n" .string "open the door…$" -Text_18ABF4:: @ 818ABF4 +FiveIsland_Meadow_Text_EnteredPasswordDoorOpened:: @ 818ABF4 .string "{PLAYER} entered two passwords.\p" .string "“GOLDEEN need log.”\n" .string "“Yes, nah, CHANSEY.”\p" .string "… … … … … …\p" .string "The WAREHOUSE's door opened!$" -gUnknown_818AC62:: @ 818AC62 +FiveIsland_Meadow_Text_WarehouseDoorAlreadyOpen:: @ 818AC62 .string "The WAREHOUSE's door is already\n" .string "open.$" -Text_18AC88:: @ 818AC88 +FiveIsland_Meadow_Text_Rocket1Intro:: @ 818AC88 .string "This area's strictly off-limits!\n" .string "Out, out!$" -Text_18ACB3:: @ 818ACB3 +FiveIsland_Meadow_Text_Rocket1Defeat:: @ 818ACB3 .string "Is this for real?$" -gUnknown_818ACC5:: @ 818ACC5 +FiveIsland_Meadow_Text_Rocket1PostBattle:: @ 818ACC5 .string "You don't have any business here!\n" .string "Go home!$" -Text_18ACF0:: @ 818ACF0 +FiveIsland_Meadow_Text_Rocket2Intro:: @ 818ACF0 .string "There's nothing past here except\n" .string "our WAREHOUSE.\p" .string "So what brings you here?$" -Text_18AD39:: @ 818AD39 +FiveIsland_Meadow_Text_Rocket2Defeat:: @ 818AD39 .string "That wasn't supposed to happen…$" -gUnknown_818AD59:: @ 818AD59 +FiveIsland_Meadow_Text_Rocket2PostBattle:: @ 818AD59 .string "You're wanting to know what's inside\n" .string "this WAREHOUSE?\p" .string "It's better you didn't know.\n" .string "For your own sake, I mean.$" -Text_18ADC6:: @ 818ADC6 +FiveIsland_Meadow_Text_Rocket3Intro:: @ 818ADC6 .string "You'd be wasting time even if you\n" .string "were to get by me.$" -Text_18ADFB:: @ 818ADFB +FiveIsland_Meadow_Text_Rocket3Defeat:: @ 818ADFB .string "Oh, that makes me furious!$" -gUnknown_818AE16:: @ 818AE16 +FiveIsland_Meadow_Text_Rocket3PostBattle:: @ 818AE16 .string "You won't be able to get in without\n" .string "the passwords anyway.$" diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json index 34edad014..11719d89b 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -31,7 +31,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_MemorialPillar_EventScript_1689D3", + "script": "FiveIsland_MemorialPillar_EventScript_MemorialMan", "flag": "0" }, { @@ -44,7 +44,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "FiveIsland_MemorialPillar_EventScript_1AC317", + "script": "FiveIsland_MemorialPillar_EventScript_Milo", "flag": "0" }, { @@ -57,7 +57,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "FiveIsland_MemorialPillar_EventScript_1AC355", + "script": "FiveIsland_MemorialPillar_EventScript_Chaz", "flag": "0" }, { @@ -70,7 +70,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "FiveIsland_MemorialPillar_EventScript_1AC393", + "script": "FiveIsland_MemorialPillar_EventScript_Harold", "flag": "0" }, { @@ -95,7 +95,7 @@ "x": 9, "y": 43, "elevation": 0, - "script": "FiveIsland_MemorialPillar_EventScript_168A48" + "script": "FiveIsland_MemorialPillar_EventScript_Memorial" }, { "type": "hidden_item", diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index 98de6167e..7fd2a810d 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -1,59 +1,59 @@ FiveIsland_MemorialPillar_MapScripts:: @ 81689D2 .byte 0 -FiveIsland_MemorialPillar_EventScript_1689D3:: @ 81689D3 +FiveIsland_MemorialPillar_EventScript_MemorialMan:: @ 81689D3 lock - goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, EventScript_168A18 - goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, EventScript_168A22 - msgbox gUnknown_818B02E + goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_AlreadyGotTM42 + goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_ReturnedForTM42 + msgbox FiveIsland_MemorialPillar_Text_ScrubScrub closemessage applymovement 1, Movement_FacePlayer waitmovement 0 delay 45 - msgbox gUnknown_818B03C + msgbox FiveIsland_MemorialPillar_Text_YourMonsLookHealthy applymovement 1, Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox gUnknown_818B05E + msgbox FiveIsland_MemorialPillar_Text_ThisIsWhereIBuriedMyOnix release end -EventScript_168A18:: @ 8168A18 - msgbox gUnknown_818B2DA +FiveIsland_MemorialPillar_EventScript_AlreadyGotTM42:: @ 8168A18 + msgbox FiveIsland_MemorialPillar_Text_ScrubScrubTectonix release end -EventScript_168A22:: @ 8168A22 - msgbox gUnknown_818B282 +FiveIsland_MemorialPillar_EventScript_ReturnedForTM42:: @ 8168A22 + msgbox FiveIsland_MemorialPillar_Text_StillHaveThingAsMyThanks giveitem ITEM_TM42 - compare VAR_RESULT, 0 - goto_if_eq EventScript_168AFE - call EventScript_168AE8 + compare VAR_RESULT, FALSE + goto_if_eq FiveIsland_MemorialPillar_EventScript_NoRoomForTM42 + call FiveIsland_MemorialPillar_EventScript_ReceivedTM42 release end -FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48 +FiveIsland_MemorialPillar_EventScript_Memorial:: @ 8168A48 goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lockall - goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, EventScript_168B0B - goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, EventScript_168B0B - msgbox gUnknown_818B095 + goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_MemorialLemonadeAlreadyPlaced + goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_MemorialLemonadeAlreadyPlaced + msgbox FiveIsland_MemorialPillar_Text_HereLiesTectonixLemonadeOffering checkitem ITEM_LEMONADE, 1 compare VAR_RESULT, TRUE - goto_if_eq EventScript_168A86 + goto_if_eq FiveIsland_MemorialPillar_EventScript_AskPlaceLemonade releaseall end -EventScript_168A86:: @ 8168A86 - msgbox gUnknown_818B105, MSGBOX_YESNO +FiveIsland_MemorialPillar_EventScript_AskPlaceLemonade:: @ 8168A86 + msgbox FiveIsland_MemorialPillar_Text_LeaveAnotherLemonadeOffering, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_168A9B + goto_if_eq FiveIsland_MemorialPillar_EventScript_PlaceLemonade releaseall end -EventScript_168A9B:: @ 8168A9B +FiveIsland_MemorialPillar_EventScript_PlaceLemonade:: @ 8168A9B removeitem ITEM_LEMONADE, 1 - msgbox gUnknown_818B13E + msgbox FiveIsland_MemorialPillar_Text_PlacedCanOfLemonade closemessage applymovement 1, Movement_WalkInPlaceFastestRight waitmovement 0 @@ -61,28 +61,28 @@ EventScript_168A9B:: @ 8168A9B applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 textcolor 0 - msgbox gUnknown_818B171 + msgbox FiveIsland_MemorialPillar_Text_ThankYouPleaseTakeThis giveitem ITEM_TM42 - compare VAR_RESULT, 0 - goto_if_eq EventScript_168AFE - call EventScript_168AE8 + compare VAR_RESULT, FALSE + goto_if_eq FiveIsland_MemorialPillar_EventScript_NoRoomForTM42 + call FiveIsland_MemorialPillar_EventScript_ReceivedTM42 releaseall end -EventScript_168AE8:: @ 8168AE8 - msgbox gUnknown_818B219 +FiveIsland_MemorialPillar_EventScript_ReceivedTM42:: @ 8168AE8 + msgbox FiveIsland_MemorialPillar_Text_BeGoodToYourMonsToo applymovement 1, Movement_WalkInPlaceFastestUp waitmovement 0 setflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR return -EventScript_168AFE:: @ 8168AFE +FiveIsland_MemorialPillar_EventScript_NoRoomForTM42:: @ 8168AFE setflag FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR - msgbox gUnknown_818B23E + msgbox FiveIsland_MemorialPillar_Text_DontHaveRoomForIt releaseall end -EventScript_168B0B:: @ 8168B0B - msgbox gUnknown_818B2F8 +FiveIsland_MemorialPillar_EventScript_MemorialLemonadeAlreadyPlaced:: @ 8168B0B + msgbox FiveIsland_MemorialPillar_Text_HereLiesTectonix releaseall end diff --git a/data/maps/FiveIsland_MemorialPillar/text.inc b/data/maps/FiveIsland_MemorialPillar/text.inc index 051f3fdc1..9ba8625e5 100644 --- a/data/maps/FiveIsland_MemorialPillar/text.inc +++ b/data/maps/FiveIsland_MemorialPillar/text.inc @@ -1,69 +1,69 @@ -Text_18AE50:: @ 818AE50 +FiveIsland_MemorialPillar_Text_MiloIntro:: @ 818AE50 .string "I'm the eldest of the BIRD\n" .string "BROTHERS.\p" .string "The best thing about birds…\n" .string "It has to be the beak.$" -Text_18AEA8:: @ 818AEA8 +FiveIsland_MemorialPillar_Text_MiloDefeat:: @ 818AEA8 .string "Oh, so sharp!$" -Text_18AEB6:: @ 818AEB6 +FiveIsland_MemorialPillar_Text_MiloPostBattle:: @ 818AEB6 .string "You can fly to FOUR ISLAND from\n" .string "here.$" -Text_18AEDC:: @ 818AEDC +FiveIsland_MemorialPillar_Text_ChazIntro:: @ 818AEDC .string "I'm the middle kid of the BIRD\n" .string "BROTHERS.\p" .string "The best thing about birds…\n" .string "It has to be the wings.$" -Text_18AF39:: @ 818AF39 +FiveIsland_MemorialPillar_Text_ChazDefeat:: @ 818AF39 .string "Flap, flap!$" -Text_18AF45:: @ 818AF45 +FiveIsland_MemorialPillar_Text_ChazPostBattle:: @ 818AF45 .string "There was a really somber guy\n" .string "over that way.$" -Text_18AF72:: @ 818AF72 +FiveIsland_MemorialPillar_Text_HaroldIntro:: @ 818AF72 .string "I'm the youngest of the BIRD\n" .string "BROTHERS.\p" .string "The best thing about birds…\n" .string "It has to be the down.$" -Text_18AFCC:: @ 818AFCC +FiveIsland_MemorialPillar_Text_HaroldDefeat:: @ 818AFCC .string "Down is so comfy…\n" .string "It makes me drowsy…$" -Text_18AFF2:: @ 818AFF2 +FiveIsland_MemorialPillar_Text_HaroldPostBattle:: @ 818AFF2 .string "It fills me with happiness when\n" .string "bird POKéMON beg playfully…$" -gUnknown_818B02E:: @ 818B02E +FiveIsland_MemorialPillar_Text_ScrubScrub:: @ 818B02E .string "Scrub, scrub…$" -gUnknown_818B03C:: @ 818B03C +FiveIsland_MemorialPillar_Text_YourMonsLookHealthy:: @ 818B03C .string "Hello…\n" .string "Your POKéMON look healthy…$" -gUnknown_818B05E:: @ 818B05E +FiveIsland_MemorialPillar_Text_ThisIsWhereIBuriedMyOnix:: @ 818B05E .string "This is where I buried my ONIX…\n" .string "It was named TECTONIX…$" -gUnknown_818B095:: @ 818B095 +FiveIsland_MemorialPillar_Text_HereLiesTectonixLemonadeOffering:: @ 818B095 .string "“Here lies TECTONIX” is engraved\n" .string "on a boulder.\p" .string "There is a LEMONADE placed as an\n" .string "offering in front of the grave.$" -gUnknown_818B105:: @ 818B105 +FiveIsland_MemorialPillar_Text_LeaveAnotherLemonadeOffering:: @ 818B105 .string "Would you like to leave another\n" .string "LEMONADE as an offering?$" -gUnknown_818B13E:: @ 818B13E +FiveIsland_MemorialPillar_Text_PlacedCanOfLemonade:: @ 818B13E .string "{PLAYER} placed a can of LEMONADE\n" .string "in front of the grave.$" -gUnknown_818B171:: @ 818B171 +FiveIsland_MemorialPillar_Text_ThankYouPleaseTakeThis:: @ 818B171 .string "Th-thank you…\p" .string "That was my TECTONIX's favorite\n" .string "drink…\p" @@ -73,25 +73,25 @@ gUnknown_818B171:: @ 818B171 .string "Can you please take this as my\n" .string "thanks?$" -gUnknown_818B219:: @ 818B219 +FiveIsland_MemorialPillar_Text_BeGoodToYourMonsToo:: @ 818B219 .string "Please be good to your POKéMON,\n" .string "too.$" -gUnknown_818B23E:: @ 818B23E +FiveIsland_MemorialPillar_Text_DontHaveRoomForIt:: @ 818B23E .string "If you don't have room for it,\n" .string "I'll hold it for you till next time.$" -gUnknown_818B282:: @ 818B282 +FiveIsland_MemorialPillar_Text_StillHaveThingAsMyThanks:: @ 818B282 .string "Oh, it's you from that time…\p" .string "I still have that thing I wanted\n" .string "you to have as my thanks.$" -gUnknown_818B2DA:: @ 818B2DA +FiveIsland_MemorialPillar_Text_ScrubScrubTectonix:: @ 818B2DA .string "Scrub, scrub…\p" .string "… … …\n" .string "TECTONIX…$" -gUnknown_818B2F8:: @ 818B2F8 +FiveIsland_MemorialPillar_Text_HereLiesTectonix:: @ 818B2F8 .string "Boulders and rocks are neatly piled\n" .string "up as a cairn.\p" .string "“Here lies TECTONIX” is engraved\n" diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json index 5bb403d1c..25b7159c0 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_PokemonCenter_1F_EventScript_171D00", + "script": "FiveIsland_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_PokemonCenter_1F_EventScript_171D12", + "script": "FiveIsland_PokemonCenter_1F_EventScript_CooltrainerF", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_PokemonCenter_1F_EventScript_171D09", + "script": "FiveIsland_PokemonCenter_1F_EventScript_Chef", "flag": "0" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_PokemonCenter_1F_EventScript_1ACF5F", + "script": "FiveIsland_PokemonCenter_1F_EventScript_PokemonJournal", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { @@ -77,7 +77,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_PokemonCenter_1F_EventScript_1ACF5F", + "script": "FiveIsland_PokemonCenter_1F_EventScript_PokemonJournal", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], diff --git a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc index 21148cede..c66871fea 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc @@ -7,17 +7,17 @@ FiveIsland_PokemonCenter_1F_OnTransition:: @ 8171CFC setrespawn SPAWN_FIVE_ISLAND end -FiveIsland_PokemonCenter_1F_EventScript_171D00:: @ 8171D00 +FiveIsland_PokemonCenter_1F_EventScript_Nurse:: @ 8171D00 lock faceplayer call EventScript_PkmnCenterNurse release end -FiveIsland_PokemonCenter_1F_EventScript_171D09:: @ 8171D09 - msgbox gUnknown_81A3BBA, MSGBOX_NPC +FiveIsland_PokemonCenter_1F_EventScript_Chef:: @ 8171D09 + msgbox FiveIsland_PokemonCenter_1F_Text_OnMyWayToPrepareMeal, MSGBOX_NPC end -FiveIsland_PokemonCenter_1F_EventScript_171D12:: @ 8171D12 - msgbox gUnknown_81A3BFD, MSGBOX_NPC +FiveIsland_PokemonCenter_1F_EventScript_CooltrainerF:: @ 8171D12 + msgbox FiveIsland_PokemonCenter_1F_Text_YoureOnQuestToCatchEveryMon, MSGBOX_NPC end diff --git a/data/maps/FiveIsland_PokemonCenter_1F/text.inc b/data/maps/FiveIsland_PokemonCenter_1F/text.inc index e1b0e1ea4..3d1be0df1 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/text.inc +++ b/data/maps/FiveIsland_PokemonCenter_1F/text.inc @@ -1,8 +1,8 @@ -gUnknown_81A3BBA:: @ 81A3BBA +FiveIsland_PokemonCenter_1F_Text_OnMyWayToPrepareMeal:: @ 81A3BBA .string "I'm on my way to prepare a meal\n" .string "for a certain high-society person.$" -gUnknown_81A3BFD:: @ 81A3BFD +FiveIsland_PokemonCenter_1F_Text_YoureOnQuestToCatchEveryMon:: @ 81A3BFD .string "You're on a quest to catch every\n" .string "single kind of POKéMON?\p" .string "…How incredible. Please tell me if\n" diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json index ecb514ff8..8b5b3afd4 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -31,7 +31,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "FiveIsland_ResortGorgeous_EventScript_1AC127", + "script": "FiveIsland_ResortGorgeous_EventScript_Daisy", "flag": "0" }, { @@ -44,7 +44,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "FiveIsland_ResortGorgeous_EventScript_1AC165", + "script": "FiveIsland_ResortGorgeous_EventScript_Celina", "flag": "0" }, { @@ -57,7 +57,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "FiveIsland_ResortGorgeous_EventScript_1AC1A3", + "script": "FiveIsland_ResortGorgeous_EventScript_Rayna", "flag": "0" }, { @@ -70,7 +70,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "FiveIsland_ResortGorgeous_EventScript_1AC1E1", + "script": "FiveIsland_ResortGorgeous_EventScript_Jacki", "flag": "0" }, { @@ -83,7 +83,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "FiveIsland_ResortGorgeous_EventScript_1AC21F", + "script": "FiveIsland_ResortGorgeous_EventScript_Gillian", "flag": "0" }, { @@ -96,7 +96,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "FiveIsland_ResortGorgeous_EventScript_1AC25D", + "script": "FiveIsland_ResortGorgeous_EventScript_Destin", "flag": "0" }, { @@ -109,7 +109,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "FiveIsland_ResortGorgeous_EventScript_1AC29B", + "script": "FiveIsland_ResortGorgeous_EventScript_Toby", "flag": "0" }, { @@ -189,7 +189,7 @@ "x": 42, "y": 9, "elevation": 0, - "script": "FiveIsland_ResortGorgeous_EventScript_168844" + "script": "FiveIsland_ResortGorgeous_EventScript_SelphysHouseSign" } ] } diff --git a/data/maps/FiveIsland_ResortGorgeous/scripts.inc b/data/maps/FiveIsland_ResortGorgeous/scripts.inc index 4a5502062..c4ef75ed7 100644 --- a/data/maps/FiveIsland_ResortGorgeous/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous/scripts.inc @@ -1,44 +1,46 @@ +.equ LOCALID_SELPHY, 8 + FiveIsland_ResortGorgeous_MapScripts:: @ 81687E4 map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FiveIsland_ResortGorgeous_OnWarp map_script MAP_SCRIPT_ON_FRAME_TABLE, FiveIsland_ResortGorgeous_OnFrame .byte 0 FiveIsland_ResortGorgeous_OnWarp:: @ 81687EF - map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1, EventScript_1687F9 + map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1, FiveIsland_ResortGorgeous_EventScript_TurnPlayerNorth .2byte 0 -EventScript_1687F9:: @ 81687F9 +FiveIsland_ResortGorgeous_EventScript_TurnPlayerNorth:: @ 81687F9 turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end FiveIsland_ResortGorgeous_OnFrame:: @ 81687FE - map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1, EventScript_168808 + map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1, FiveIsland_ResortGorgeous_EventScript_SelphyReturnHomeScene .2byte 0 -EventScript_168808:: @ 8168808 +FiveIsland_ResortGorgeous_EventScript_SelphyReturnHomeScene:: @ 8168808 lockall textcolor 1 - msgbox gUnknown_818A7DB + msgbox FiveIsland_ResortGorgeous_Text_SelphyThanksYouMayGoNow closemessage - applymovement 8, Movement_WalkInPlaceFastestUp + applymovement LOCALID_SELPHY, Movement_WalkInPlaceFastestUp waitmovement 0 opendoor 39, 8 waitdooranim - applymovement 8, Movement_168841 + applymovement LOCALID_SELPHY, FiveIsland_ResortGorgeous_Movement_SelphyEnterHome waitmovement 0 closedoor 39, 8 waitdooranim - removeobject 8 + removeobject LOCALID_SELPHY clearflag FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY setvar VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 2 releaseall end -Movement_168841:: @ 8168841 +FiveIsland_ResortGorgeous_Movement_SelphyEnterHome:: @ 8168841 walk_up set_invisible step_end -FiveIsland_ResortGorgeous_EventScript_168844:: @ 8168844 - msgbox gUnknown_818A7FE, MSGBOX_SIGN +FiveIsland_ResortGorgeous_EventScript_SelphysHouseSign:: @ 8168844 + msgbox FiveIsland_ResortGorgeous_Text_SelphysHouse, MSGBOX_SIGN end diff --git a/data/maps/FiveIsland_ResortGorgeous/text.inc b/data/maps/FiveIsland_ResortGorgeous/text.inc index d984ab092..7e5ee195f 100644 --- a/data/maps/FiveIsland_ResortGorgeous/text.inc +++ b/data/maps/FiveIsland_ResortGorgeous/text.inc @@ -1,93 +1,93 @@ -Text_18A3E2:: @ 818A3E2 +FiveIsland_ResortGorgeous_Text_DaisyIntro:: @ 818A3E2 .string "With these hands, I will create\n" .string "my victory!$" -Text_18A40E:: @ 818A40E +FiveIsland_ResortGorgeous_Text_DaisyDefeat:: @ 818A40E .string "The shame of this…\n" .string "I'm red-faced…$" -Text_18A430:: @ 818A430 +FiveIsland_ResortGorgeous_Text_DaisyPostBattle:: @ 818A430 .string "Uh-oh, my paint tubes have\n" .string "scattered everywhere!$" -Text_18A461:: @ 818A461 +FiveIsland_ResortGorgeous_Text_CelinaIntro:: @ 818A461 .string "Excuse me!\n" .string "I'm trying to paint.\l" .string "Please keep out of my sight!$" -Text_18A49E:: @ 818A49E +FiveIsland_ResortGorgeous_Text_CelinaDefeat:: @ 818A49E .string "This loss…\n" .string "I feel like I'm whiting out…$" -Text_18A4C6:: @ 818A4C6 +FiveIsland_ResortGorgeous_Text_CelinaPostBattle:: @ 818A4C6 .string "GILLIAN?\n" .string "Please tilt your head slightly…\l" .string "There! That's the look I want!$" -Text_18A50E:: @ 818A50E +FiveIsland_ResortGorgeous_Text_RaynaIntro:: @ 818A50E .string "Hmm…\n" .string "The angle, it is not quite there…$" -Text_18A535:: @ 818A535 +FiveIsland_ResortGorgeous_Text_RaynaDefeat:: @ 818A535 .string "Oh…\n" .string "My feelings, they are blue…$" -Text_18A555:: @ 818A555 +FiveIsland_ResortGorgeous_Text_RaynaPostBattle:: @ 818A555 .string "The sky and the sea…\n" .string "They are so fickle.\p" .string "Their changing expressions make\n" .string "them difficult to capture.$" -Text_18A5B9:: @ 818A5B9 +FiveIsland_ResortGorgeous_Text_JackiIntro:: @ 818A5B9 .string "I am visiting my friend's retreat,\n" .string "if you must know.$" -Text_18A5EE:: @ 818A5EE +FiveIsland_ResortGorgeous_Text_JackiDefeat:: @ 818A5EE .string "Oh, my, so strong.$" -Text_18A601:: @ 818A601 +FiveIsland_ResortGorgeous_Text_JackiPostBattle:: @ 818A601 .string "I find it pleasurable to leisurely\n" .string "battle in the gentle sea breeze.$" -Text_18A645:: @ 818A645 +FiveIsland_ResortGorgeous_Text_GillianIntro:: @ 818A645 .string "I'm thinking of having a pool\n" .string "made specially for POKéMON.$" -Text_18A67F:: @ 818A67F +FiveIsland_ResortGorgeous_Text_GillianDefeat:: @ 818A67F .string "Oh, my goodness gracious!$" -Text_18A699:: @ 818A699 +FiveIsland_ResortGorgeous_Text_GillianPostBattle:: @ 818A699 .string "A pool would be nice, but I must\n" .string "say, a sun-room may be sublime.$" -Text_18A6DA:: @ 818A6DA +FiveIsland_ResortGorgeous_Text_DestinIntro:: @ 818A6DA .string "I'm a good runner.\n" .string "I'm really fast!$" -Text_18A6FE:: @ 818A6FE +FiveIsland_ResortGorgeous_Text_DestinDefeat:: @ 818A6FE .string "Oops!\n" .string "I rushed things!$" -Text_18A715:: @ 818A715 +FiveIsland_ResortGorgeous_Text_DestinPostBattle:: @ 818A715 .string "When I run with the wind, it feels\n" .string "like I could fly!$" -Text_18A74A:: @ 818A74A +FiveIsland_ResortGorgeous_Text_TobyIntro:: @ 818A74A .string "I say, this marine life here at\n" .string "this resort agrees with me.$" -Text_18A786:: @ 818A786 +FiveIsland_ResortGorgeous_Text_TobyDefeat:: @ 818A786 .string "That's a shocker!\n" .string "You must be joking.$" -Text_18A7AC:: @ 818A7AC +FiveIsland_ResortGorgeous_Text_TobyPostBattle:: @ 818A7AC .string "Getting so serious over this…\n" .string "How nonsensical.$" -gUnknown_818A7DB:: @ 818A7DB +FiveIsland_ResortGorgeous_Text_SelphyThanksYouMayGoNow:: @ 818A7DB .string "SELPHY: Thank you.\p" .string "You may go now.$" -gUnknown_818A7FE:: @ 818A7FE +FiveIsland_ResortGorgeous_Text_SelphysHouse:: @ 818A7FE .string "SELPHY'S HOUSE$" diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json index 2c2563031..82cf27051 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_ResortGorgeous_House_EventScript_171EBE", + "script": "FiveIsland_ResortGorgeous_House_EventScript_Selphy", "flag": "FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_ResortGorgeous_House_EventScript_172062", + "script": "FiveIsland_ResortGorgeous_House_EventScript_Butler", "flag": "FLAG_HIDE_SELPHYS_BUTLER" } ], diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index 50fe74879..367458ffa 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -1,116 +1,121 @@ +.equ LOCALID_SELPHY, 1 +.equ LOCALID_BUTLER, 2 + +.equ SHOWN_REQUESTED_MON, FLAG_TEMP_2 + FiveIsland_ResortGorgeous_House_MapScripts:: @ 8171EBD .byte 0 -FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE +FiveIsland_ResortGorgeous_House_EventScript_Selphy:: @ 8171EBE goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lock faceplayer - goto_if_set FLAG_TEMP_2, EventScript_172043 + goto_if_set SHOWN_REQUESTED_MON, FiveIsland_ResortGorgeous_House_EventScript_JustFulfilledRequest compare VAR_RESORT_GORGEOUS_REQUESTED_MON, 0xFFFF - goto_if_eq EventScript_171F0B + goto_if_eq FiveIsland_ResortGorgeous_House_EventScript_RequestTookTooLong compare VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE - goto_if_ne EventScript_171F19 - msgbox gUnknown_81A42A0 - goto EventScript_171EFE + goto_if_ne FiveIsland_ResortGorgeous_House_EventScript_CheckForRequestedMon + msgbox FiveIsland_ResortGorgeous_House_Text_PleaseHearMyWish + goto FiveIsland_ResortGorgeous_House_EventScript_RequestMon end -EventScript_171EFE:: @ 8171EFE - special Special_SampleResortGorgeousMonAndReward - msgbox gUnknown_81A4315 +FiveIsland_ResortGorgeous_House_EventScript_RequestMon:: @ 8171EFE + special SampleResortGorgeousMonAndReward + msgbox FiveIsland_ResortGorgeous_House_Text_WishToSeeMonPlease release end -EventScript_171F0B:: @ 8171F0B - msgbox gUnknown_81A437A - goto EventScript_171EFE +FiveIsland_ResortGorgeous_House_EventScript_RequestTookTooLong:: @ 8171F0B + msgbox FiveIsland_ResortGorgeous_House_Text_OhImTiredOfWaiting + goto FiveIsland_ResortGorgeous_House_EventScript_RequestMon end -EventScript_171F19:: @ 8171F19 +FiveIsland_ResortGorgeous_House_EventScript_CheckForRequestedMon:: @ 8171F19 copyvar VAR_0x8004, VAR_RESORT_GORGEOUS_REQUESTED_MON specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies - compare VAR_RESULT, 1 - goto_if_eq EventScript_171F34 - goto EventScript_171EFE + compare VAR_RESULT, TRUE + goto_if_eq FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon + goto FiveIsland_ResortGorgeous_House_EventScript_RequestMon end -EventScript_171F34:: @ 8171F34 - special Special_SampleResortGorgeousMonAndReward - msgbox gUnknown_81A43F7 - addobject 2 - applymovement 2, Movement_172060 +FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon:: @ 8171F34 + special SampleResortGorgeousMonAndReward + msgbox FiveIsland_ResortGorgeous_House_Text_MonYouCaughtForMeThankYou + addobject LOCALID_BUTLER + applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerEnter waitmovement 0 textcolor 0 - msgbox gUnknown_81A450B - applymovement 1, Movement_WalkInPlaceFastestUp + msgbox FiveIsland_ResortGorgeous_House_Text_ButlerYesMyLady + applymovement LOCALID_SELPHY, Movement_WalkInPlaceFastestUp waitmovement 0 textcolor 1 - msgbox gUnknown_81A4521 + msgbox FiveIsland_ResortGorgeous_House_Text_SelphyGiveTokenOfAppreciation textcolor 0 - msgbox gUnknown_81A4566 + msgbox FiveIsland_ResortGorgeous_House_Text_ButlerIShallDoAsYouBid closemessage compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_171FCD + call_if_eq FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_171FE9 + call_if_eq FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_171FFE + call_if_eq FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast compare VAR_FACING, DIR_WEST - call_if_eq EventScript_17201A - moveobjectoffscreen 2 - msgbox gUnknown_81A458E + call_if_eq FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerWest + moveobjectoffscreen LOCALID_BUTLER + msgbox FiveIsland_ResortGorgeous_House_Text_ButlerPleaseAcceptThisAsHerThanks giveitem VAR_RESORT_GORGEOUS_REWARD - compare VAR_RESULT, 0 - goto_if_eq EventScript_172025 - setflag FLAG_TEMP_2 - setvar VAR_RESORT_GORGEOUS_REQUESTED_MON, 0 + compare VAR_RESULT, FALSE + goto_if_eq FiveIsland_ResortGorgeous_House_EventScript_NoRoomForReward + setflag SHOWN_REQUESTED_MON + setvar VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE release end -EventScript_171FCD:: @ 8171FCD - applymovement 1, Movement_WalkInPlaceFastestDown - applymovement 2, Movement_17204D +FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerNorth:: @ 8171FCD + applymovement LOCALID_SELPHY, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return -EventScript_171FE9:: @ 8171FE9 - applymovement 2, Movement_172055 +FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerSouth:: @ 8171FE9 + applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerSouth waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return -EventScript_171FFE:: @ 8171FFE - applymovement 1, Movement_WalkInPlaceFastestLeft - applymovement 2, Movement_172059 +FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast:: @ 8171FFE + applymovement LOCALID_SELPHY, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return -EventScript_17201A:: @ 817201A - applymovement 2, Movement_17205E +FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerWest:: @ 817201A + applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerWest waitmovement 0 return -EventScript_172025:: @ 8172025 +FiveIsland_ResortGorgeous_House_EventScript_NoRoomForReward:: @ 8172025 textcolor 0 - msgbox gUnknown_81A45E8 + msgbox FiveIsland_ResortGorgeous_House_Text_ButlerBagAppearsToBeFull textcolor 1 - msgbox gUnknown_81A461B - setflag FLAG_TEMP_2 - setvar VAR_RESORT_GORGEOUS_REQUESTED_MON, 0 + msgbox FiveIsland_ResortGorgeous_House_Text_OhHowDisappointing + setflag SHOWN_REQUESTED_MON + setvar VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE release end -EventScript_172043:: @ 8172043 - msgbox gUnknown_81A4632 +FiveIsland_ResortGorgeous_House_EventScript_JustFulfilledRequest:: @ 8172043 + msgbox FiveIsland_ResortGorgeous_House_Text_SelphyWishYouBestOfLuck release end -Movement_17204D:: @ 817204D +FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth:: @ 817204D walk_left walk_left walk_left @@ -120,27 +125,30 @@ Movement_17204D:: @ 817204D walk_in_place_fastest_right step_end -Movement_172055:: @ 8172055 +FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerSouth:: @ 8172055 walk_left walk_left walk_in_place_fastest_down step_end -Movement_172059:: @ 8172059 +FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast:: @ 8172059 walk_left walk_left walk_left walk_down step_end -Movement_17205E:: @ 817205E +@ Very odd. If the player is talking to Selphy facing West, then the player has clipped through the table +@ In this case rather than approach the player the Butler walks up, which clips the Butler into a wall +FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerWest:: @ 817205E walk_up step_end -Movement_172060:: @ 8172060 +FiveIsland_ResortGorgeous_House_Movement_ButlerEnter:: @ 8172060 walk_in_place_down step_end -FiveIsland_ResortGorgeous_House_EventScript_172062:: @ 8172062 - msgbox gUnknown_81A4657, MSGBOX_NPC +@ Addressed as "Sebastian" but speaks only as "Butler" +FiveIsland_ResortGorgeous_House_EventScript_Butler:: @ 8172062 + msgbox FiveIsland_ResortGorgeous_House_Text_LadySelphySmileHasBrillianceOfSun, MSGBOX_NPC end diff --git a/data/maps/FiveIsland_ResortGorgeous_House/text.inc b/data/maps/FiveIsland_ResortGorgeous_House/text.inc index 1d872274b..cd01000ba 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/text.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/text.inc @@ -1,23 +1,23 @@ -gUnknown_81A42A0:: @ 81A42A0 +FiveIsland_ResortGorgeous_House_Text_PleaseHearMyWish:: @ 81A42A0 .string "SELPHY: Oh?\n" .string "Do I know you from somewhere?\p" .string "Oh, but that doesn't matter.\p" .string "I am exquisitely bored.\n" .string "Please, hear my wish.$" -gUnknown_81A4315:: @ 81A4315 +FiveIsland_ResortGorgeous_House_Text_WishToSeeMonPlease:: @ 81A4315 .string "I wish to see a POKéMON.\n" .string "A darling {STR_VAR_1}.\p" .string "I want to see one right away.\n" .string "Please, make my wish come true.$" -gUnknown_81A437A:: @ 81A437A +FiveIsland_ResortGorgeous_House_Text_OhImTiredOfWaiting:: @ 81A437A .string "SELPHY: Oh, I'm tired of this.\n" .string "I'm tired of waiting for you.\p" .string "I'll forgive you this time, but\n" .string "please don't fail me next time.$" -gUnknown_81A43F7:: @ 81A43F7 +FiveIsland_ResortGorgeous_House_Text_MonYouCaughtForMeThankYou:: @ 81A43F7 .string "SELPHY: Oh, hello, there.\p" .string "Oh, my gracious. That must be the\n" .string "{STR_VAR_1} you caught for me.\p" @@ -32,35 +32,35 @@ gUnknown_81A43F7:: @ 81A43F7 .string "SEBASTIAN!\n" .string "I need you here this instant!$" -gUnknown_81A450B:: @ 81A450B +FiveIsland_ResortGorgeous_House_Text_ButlerYesMyLady:: @ 81A450B .string "Butler: Yes, my lady.$" -gUnknown_81A4521:: @ 81A4521 +FiveIsland_ResortGorgeous_House_Text_SelphyGiveTokenOfAppreciation:: @ 81A4521 .string "SELPHY: See to it that this person\n" .string "is given a token of appreciation.$" -gUnknown_81A4566:: @ 81A4566 +FiveIsland_ResortGorgeous_House_Text_ButlerIShallDoAsYouBid:: @ 81A4566 .string "Butler: I shall do as you bid,\n" .string "my lady.$" -gUnknown_81A458E:: @ 81A458E +FiveIsland_ResortGorgeous_House_Text_ButlerPleaseAcceptThisAsHerThanks:: @ 81A458E .string "Butler: I sincerely thank you for\n" .string "pleasing Lady SELPHY.\p" .string "Please accept this as her thanks…$" -gUnknown_81A45E8:: @ 81A45E8 +FiveIsland_ResortGorgeous_House_Text_ButlerBagAppearsToBeFull:: @ 81A45E8 .string "Butler: Your BAG appears to be\n" .string "unfortunately full.$" -gUnknown_81A461B:: @ 81A461B +FiveIsland_ResortGorgeous_House_Text_OhHowDisappointing:: @ 81A461B .string "Oh…\n" .string "How disappointing.$" -gUnknown_81A4632:: @ 81A4632 +FiveIsland_ResortGorgeous_House_Text_SelphyWishYouBestOfLuck:: @ 81A4632 .string "SELPHY: I wish you the best of\n" .string "luck.$" -gUnknown_81A4657:: @ 81A4657 +FiveIsland_ResortGorgeous_House_Text_LadySelphySmileHasBrillianceOfSun:: @ 81A4657 .string "Butler: The smile of Lady SELPHY\n" .string "has the brilliance of the sun.\p" .string "Please, I beg you to bring joy\n" diff --git a/data/maps/FiveIsland_WaterLabyrinth/map.json b/data/maps/FiveIsland_WaterLabyrinth/map.json index 627ee6b87..2950419f3 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/map.json +++ b/data/maps/FiveIsland_WaterLabyrinth/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_WaterLabyrinth_EventScript_16884E", + "script": "FiveIsland_WaterLabyrinth_EventScript_EggGentleman", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "FiveIsland_WaterLabyrinth_EventScript_1AC2D9", + "script": "FiveIsland_WaterLabyrinth_EventScript_Alize", "flag": "0" } ], diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc index ed82fc5eb..f1080d094 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc @@ -1,68 +1,70 @@ FiveIsland_WaterLabyrinth_MapScripts:: @ 816884D .byte 0 -FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E +FiveIsland_WaterLabyrinth_EventScript_EggGentleman:: @ 816884E goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lock faceplayer - goto_if_set FLAG_GOT_TOGEPI_EGG, EventScript_1688E3 - goto_if_set FLAG_NO_ROOM_FOR_TOGEPI_EGG, EventScript_16892C - msgbox gUnknown_818A80D - specialvar VAR_RESULT, Special_GetLeadMonFriendship - compare VAR_RESULT, 6 - goto_if_eq EventScript_1688AC - msgbox gUnknown_818A88F + goto_if_set FLAG_GOT_TOGEPI_EGG, FiveIsland_WaterLabyrinth_EventScript_PostEggComment + goto_if_set FLAG_NO_ROOM_FOR_TOGEPI_EGG, FiveIsland_WaterLabyrinth_EventScript_ReturnForEgg + msgbox FiveIsland_WaterLabyrinth_Text_LetMeTakeLookAtMons + specialvar VAR_RESULT, GetLeadMonFriendship + compare VAR_RESULT, 6 @ Max friendship + goto_if_eq FiveIsland_WaterLabyrinth_EventScript_LeadMonMaxFriendship + msgbox FiveIsland_WaterLabyrinth_Text_HmmISeeIsee release end -EventScript_168895:: @ 8168895 +FiveIsland_WaterLabyrinth_EventScript_MonDaisyComment:: @ 8168895 famechecker FAMECHECKER_DAISY, 2 - msgbox gUnknown_818AA0C + msgbox FiveIsland_WaterLabyrinth_Text_CuteMonRemindsMeOfDaisy release end -EventScript_1688AC:: @ 81688AC - msgbox gUnknown_818A8A6 - goto EventScript_1688BA +FiveIsland_WaterLabyrinth_EventScript_LeadMonMaxFriendship:: @ 81688AC + msgbox FiveIsland_WaterLabyrinth_Text_TreatMonRightHaveThis + goto FiveIsland_WaterLabyrinth_EventScript_TryGiveEgg end -EventScript_1688BA:: @ 81688BA +FiveIsland_WaterLabyrinth_EventScript_TryGiveEgg:: @ 81688BA getpartysize compare VAR_RESULT, PARTY_SIZE - goto_if_eq EventScript_16891F + goto_if_eq FiveIsland_WaterLabyrinth_EventScript_NoRoomForEgg setflag FLAG_GOT_TOGEPI_EGG giveegg SPECIES_TOGEPI textcolor 3 playfanfare MUS_FANFA1 - message Text_18A91F + message FiveIsland_WaterLabyrinth_Text_ReceivedEggFromMan waitfanfare waitmessage call EventScript_1A6675 - goto EventScript_1688E3 + goto FiveIsland_WaterLabyrinth_EventScript_PostEggComment end -EventScript_1688E3:: @ 81688E3 +@ If the player has a Togepi/Togetic from this game (assumed to be the one the man gave you) then comment on it +@ Otherwise make normal comment +FiveIsland_WaterLabyrinth_EventScript_PostEggComment:: @ 81688E3 getspeciesname 1, SPECIES_TOGEPI setvar VAR_0x8004, SPECIES_TOGEPI - specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID - compare VAR_RESULT, 1 - goto_if_eq EventScript_168895 + specialvar VAR_RESULT, PlayerPartyContainsSpeciesWithPlayerID + compare VAR_RESULT, TRUE + goto_if_eq FiveIsland_WaterLabyrinth_EventScript_MonDaisyComment getspeciesname 1, SPECIES_TOGETIC setvar VAR_0x8004, SPECIES_TOGETIC - specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID - compare VAR_RESULT, 1 - goto_if_eq EventScript_168895 - msgbox gUnknown_818A9C0 + specialvar VAR_RESULT, PlayerPartyContainsSpeciesWithPlayerID + compare VAR_RESULT, TRUE + goto_if_eq FiveIsland_WaterLabyrinth_EventScript_MonDaisyComment + msgbox FiveIsland_WaterLabyrinth_Text_GladIMetSomeoneLikeYou release end -EventScript_16891F:: @ 816891F +FiveIsland_WaterLabyrinth_EventScript_NoRoomForEgg:: @ 816891F setflag FLAG_NO_ROOM_FOR_TOGEPI_EGG - msgbox gUnknown_818A940 + msgbox FiveIsland_WaterLabyrinth_Text_DontHaveSpaceInYourParty release end -EventScript_16892C:: @ 816892C - goto EventScript_1688BA +FiveIsland_WaterLabyrinth_EventScript_ReturnForEgg:: @ 816892C + goto FiveIsland_WaterLabyrinth_EventScript_TryGiveEgg end diff --git a/data/maps/FiveIsland_WaterLabyrinth/text.inc b/data/maps/FiveIsland_WaterLabyrinth/text.inc index 111671eb9..c4a5542d3 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/text.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/text.inc @@ -1,4 +1,4 @@ -gUnknown_818A80D:: @ 818A80D +FiveIsland_WaterLabyrinth_Text_LetMeTakeLookAtMons:: @ 818A80D .string "You travel all over the place,\n" .string "don't you?\p" .string "You're not driving your POKéMON\n" @@ -6,38 +6,39 @@ gUnknown_818A80D:: @ 818A80D .string "Let me take a look.\n" .string "… … … … … …$" -gUnknown_818A88F:: @ 818A88F +FiveIsland_WaterLabyrinth_Text_HmmISeeIsee:: @ 818A88F .string "Ah, hmm…\n" .string "I see, I see…$" -gUnknown_818A8A6:: @ 818A8A6 +FiveIsland_WaterLabyrinth_Text_TreatMonRightHaveThis:: @ 818A8A6 .string "Oh, impressive.\n" .string "You treat your POKéMON right.\p" .string "I think you can be entrusted with\n" .string "this.\p" .string "Please, I'd like you to have this.$" -Text_18A91F:: @ 818A91F +FiveIsland_WaterLabyrinth_Text_ReceivedEggFromMan:: @ 818A91F .string "{PLAYER} received an EGG\n" .string "from the man!$" -gUnknown_818A940:: @ 818A940 +FiveIsland_WaterLabyrinth_Text_DontHaveSpaceInYourParty:: @ 818A940 .string "…Unfortunately, you don't have\n" .string "space for this in your party.\p" .string "You'd better come back for it\n" .string "another time.$" -Text_18A9A9:: @ 818A9A9 +@ Unused +FiveIsland_WaterLabyrinth_Text_YouveComeBackForTheEgg:: @ 818A9A9 .string "やあ\n" .string "タマゴを　もらいに\l" .string "きて　くれたんだね$" -gUnknown_818A9C0:: @ 818A9C0 +FiveIsland_WaterLabyrinth_Text_GladIMetSomeoneLikeYou:: @ 818A9C0 .string "I received that EGG while I was\n" .string "traveling.\p" .string "I'm glad I met someone like you.$" -gUnknown_818AA0C:: @ 818AA0C +FiveIsland_WaterLabyrinth_Text_CuteMonRemindsMeOfDaisy:: @ 818AA0C .string "Oh, hello.\n" .string "That's a cute {STR_VAR_2}.\p" .string "Seeing it reminds me of a sweet \n" @@ -47,3 +48,14 @@ gUnknown_818AA0C:: @ 818AA0C .string "That little girl's name…\n" .string "I think it was DAISY.$" +FiveIsland_WaterLabyrinth_Text_AlizeIntro:: @ 818AAD5 + .string "This is an excellent environment\n" + .string "for raising POKéMON.$" + +FiveIsland_WaterLabyrinth_Text_AlizeDefeat:: @ 818AB0B + .string "Your POKéMON are growing up\n" + .string "admirably well!$" + +FiveIsland_WaterLabyrinth_Text_AlizePostBattle:: @ 818AB37 + .string "You know, I think you have the\n" + .string "talent to be a good BREEDER.$" diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index a64dff1a9..16413d758 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -90,7 +90,7 @@ PalletTown_GarysHouse_EventScript_DeclineGrooming:: @ 8168E3C PalletTown_GarysHouse_EventScript_RateMonFriendship:: @ 8168E46 msgbox PalletTown_GarysHouse_Text_MayISeeFirstMon - specialvar VAR_RESULT, Special_GetLeadMonFriendship + specialvar VAR_RESULT, GetLeadMonFriendship switch VAR_RESULT case 0, PalletTown_GarysHouse_EventScript_MonFriendshipLowest case 1, PalletTown_GarysHouse_EventScript_MonFriendshipLower diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index c844cc115..78a4137fb 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -151,12 +151,12 @@ FourIsland_Mart_EventScript_1ACF46:: @ 81ACF46 release end -FiveIsland_PokemonCenter_1F_EventScript_1ACF5F:: @ 81ACF5F +FiveIsland_PokemonCenter_1F_EventScript_PokemonJournal:: @ 81ACF5F lock faceplayer famechecker FAMECHECKER_LORELEI, 3 textcolor 3 - msgbox gUnknown_81B187F + msgbox PokemonJournal_Text_SpecialFeatureLorelei release end diff --git a/data/scripts/trainers.inc b/data/scripts/trainers.inc index eaa76b1fa..379235143 100644 --- a/data/scripts/trainers.inc +++ b/data/scripts/trainers.inc @@ -2403,147 +2403,147 @@ EventScript_1AC10C:: @ 81AC10C msgbox Text_18A1B2, MSGBOX_AUTOCLOSE end -FiveIsland_ResortGorgeous_EventScript_1AC127:: @ 81AC127 - trainerbattle_single TRAINER_PAINTER_DAISY, Text_18A3E2, Text_18A40E +FiveIsland_ResortGorgeous_EventScript_Daisy:: @ 81AC127 + trainerbattle_single TRAINER_PAINTER_DAISY, FiveIsland_ResortGorgeous_Text_DaisyIntro, FiveIsland_ResortGorgeous_Text_DaisyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC14E - msgbox Text_18A430, MSGBOX_AUTOCLOSE + goto_if_eq FiveIsland_ResortGorgeous_EventScript_DaisyRematch + msgbox FiveIsland_ResortGorgeous_Text_DaisyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC14E:: @ 81AC14E - trainerbattle_rematch TRAINER_PAINTER_DAISY, Text_1C3BF6, Text_18A40E - msgbox Text_18A430, MSGBOX_AUTOCLOSE +FiveIsland_ResortGorgeous_EventScript_DaisyRematch:: @ 81AC14E + trainerbattle_rematch TRAINER_PAINTER_DAISY, FiveIsland_ResortGorgeous_Text_DaisyRematchIntro, FiveIsland_ResortGorgeous_Text_DaisyDefeat + msgbox FiveIsland_ResortGorgeous_Text_DaisyPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_ResortGorgeous_EventScript_1AC165:: @ 81AC165 - trainerbattle_single TRAINER_PAINTER_CELINA, Text_18A461, Text_18A49E +FiveIsland_ResortGorgeous_EventScript_Celina:: @ 81AC165 + trainerbattle_single TRAINER_PAINTER_CELINA, FiveIsland_ResortGorgeous_Text_CelinaIntro, FiveIsland_ResortGorgeous_Text_CelinaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC18C - msgbox Text_18A4C6, MSGBOX_AUTOCLOSE + goto_if_eq FiveIsland_ResortGorgeous_EventScript_CelinaRematch + msgbox FiveIsland_ResortGorgeous_Text_CelinaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC18C:: @ 81AC18C - trainerbattle_rematch TRAINER_PAINTER_CELINA, Text_1C3C28, Text_18A49E - msgbox Text_18A4C6, MSGBOX_AUTOCLOSE +FiveIsland_ResortGorgeous_EventScript_CelinaRematch:: @ 81AC18C + trainerbattle_rematch TRAINER_PAINTER_CELINA, FiveIsland_ResortGorgeous_Text_CelinaRematchIntro, FiveIsland_ResortGorgeous_Text_CelinaDefeat + msgbox FiveIsland_ResortGorgeous_Text_CelinaPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_ResortGorgeous_EventScript_1AC1A3:: @ 81AC1A3 - trainerbattle_single TRAINER_PAINTER_RAYNA, Text_18A50E, Text_18A535 +FiveIsland_ResortGorgeous_EventScript_Rayna:: @ 81AC1A3 + trainerbattle_single TRAINER_PAINTER_RAYNA, FiveIsland_ResortGorgeous_Text_RaynaIntro, FiveIsland_ResortGorgeous_Text_RaynaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC1CA - msgbox Text_18A555, MSGBOX_AUTOCLOSE + goto_if_eq FiveIsland_ResortGorgeous_EventScript_RaynaRematch + msgbox FiveIsland_ResortGorgeous_Text_RaynaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC1CA:: @ 81AC1CA - trainerbattle_rematch TRAINER_PAINTER_RAYNA, Text_1C3C70, Text_18A535 - msgbox Text_18A555, MSGBOX_AUTOCLOSE +FiveIsland_ResortGorgeous_EventScript_RaynaRematch:: @ 81AC1CA + trainerbattle_rematch TRAINER_PAINTER_RAYNA, FiveIsland_ResortGorgeous_Text_RaynaRematchIntro, FiveIsland_ResortGorgeous_Text_RaynaDefeat + msgbox FiveIsland_ResortGorgeous_Text_RaynaPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_ResortGorgeous_EventScript_1AC1E1:: @ 81AC1E1 - trainerbattle_single TRAINER_LADY_JACKI, Text_18A5B9, Text_18A5EE +FiveIsland_ResortGorgeous_EventScript_Jacki:: @ 81AC1E1 + trainerbattle_single TRAINER_LADY_JACKI, FiveIsland_ResortGorgeous_Text_JackiIntro, FiveIsland_ResortGorgeous_Text_JackiDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC208 - msgbox Text_18A601, MSGBOX_AUTOCLOSE + goto_if_eq FiveIsland_ResortGorgeous_EventScript_JackiRematch + msgbox FiveIsland_ResortGorgeous_Text_JackiPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC208:: @ 81AC208 - trainerbattle_rematch TRAINER_LADY_JACKI, Text_1C3CB0, Text_18A5EE - msgbox Text_18A601, MSGBOX_AUTOCLOSE +FiveIsland_ResortGorgeous_EventScript_JackiRematch:: @ 81AC208 + trainerbattle_rematch TRAINER_LADY_JACKI, FiveIsland_ResortGorgeous_Text_JackiRematchIntro, FiveIsland_ResortGorgeous_Text_JackiDefeat + msgbox FiveIsland_ResortGorgeous_Text_JackiPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_ResortGorgeous_EventScript_1AC21F:: @ 81AC21F - trainerbattle_single TRAINER_LADY_GILLIAN, Text_18A645, Text_18A67F +FiveIsland_ResortGorgeous_EventScript_Gillian:: @ 81AC21F + trainerbattle_single TRAINER_LADY_GILLIAN, FiveIsland_ResortGorgeous_Text_GillianIntro, FiveIsland_ResortGorgeous_Text_GillianDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC246 - msgbox Text_18A699, MSGBOX_AUTOCLOSE + goto_if_eq FiveIsland_ResortGorgeous_EventScript_GillianRematch + msgbox FiveIsland_ResortGorgeous_Text_GillianPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC246:: @ 81AC246 - trainerbattle_rematch TRAINER_LADY_GILLIAN, Text_1C3CF1, Text_18A67F - msgbox Text_18A699, MSGBOX_AUTOCLOSE +FiveIsland_ResortGorgeous_EventScript_GillianRematch:: @ 81AC246 + trainerbattle_rematch TRAINER_LADY_GILLIAN, FiveIsland_ResortGorgeous_Text_GillianRematchIntro, FiveIsland_ResortGorgeous_Text_GillianDefeat + msgbox FiveIsland_ResortGorgeous_Text_GillianPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_ResortGorgeous_EventScript_1AC25D:: @ 81AC25D - trainerbattle_single TRAINER_YOUNGSTER_DESTIN, Text_18A6DA, Text_18A6FE +FiveIsland_ResortGorgeous_EventScript_Destin:: @ 81AC25D + trainerbattle_single TRAINER_YOUNGSTER_DESTIN, FiveIsland_ResortGorgeous_Text_DestinIntro, FiveIsland_ResortGorgeous_Text_DestinDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC284 - msgbox Text_18A715, MSGBOX_AUTOCLOSE + goto_if_eq FiveIsland_ResortGorgeous_EventScript_DestinRematch + msgbox FiveIsland_ResortGorgeous_Text_DestinPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC284:: @ 81AC284 - trainerbattle_rematch TRAINER_YOUNGSTER_DESTIN, Text_1C3D47, Text_18A6FE - msgbox Text_18A715, MSGBOX_AUTOCLOSE +FiveIsland_ResortGorgeous_EventScript_DestinRematch:: @ 81AC284 + trainerbattle_rematch TRAINER_YOUNGSTER_DESTIN, FiveIsland_ResortGorgeous_Text_DestinRematchIntro, FiveIsland_ResortGorgeous_Text_DestinDefeat + msgbox FiveIsland_ResortGorgeous_Text_DestinPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_ResortGorgeous_EventScript_1AC29B:: @ 81AC29B - trainerbattle_single TRAINER_SWIMMER_MALE_TOBY, Text_18A74A, Text_18A786 +FiveIsland_ResortGorgeous_EventScript_Toby:: @ 81AC29B + trainerbattle_single TRAINER_SWIMMER_MALE_TOBY, FiveIsland_ResortGorgeous_Text_TobyIntro, FiveIsland_ResortGorgeous_Text_TobyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC2C2 - msgbox Text_18A7AC, MSGBOX_AUTOCLOSE + goto_if_eq FiveIsland_ResortGorgeous_EventScript_TobyRematch + msgbox FiveIsland_ResortGorgeous_Text_TobyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC2C2:: @ 81AC2C2 - trainerbattle_rematch TRAINER_SWIMMER_MALE_TOBY, Text_1C3D73, Text_18A786 - msgbox Text_18A7AC, MSGBOX_AUTOCLOSE +FiveIsland_ResortGorgeous_EventScript_TobyRematch:: @ 81AC2C2 + trainerbattle_rematch TRAINER_SWIMMER_MALE_TOBY, FiveIsland_ResortGorgeous_Text_TobyRematchIntro, FiveIsland_ResortGorgeous_Text_TobyDefeat + msgbox FiveIsland_ResortGorgeous_Text_TobyPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_WaterLabyrinth_EventScript_1AC2D9:: @ 81AC2D9 - trainerbattle_single TRAINER_PKMN_BREEDER_ALIZE, Text_18AAD5, Text_18AB0B +FiveIsland_WaterLabyrinth_EventScript_Alize:: @ 81AC2D9 + trainerbattle_single TRAINER_PKMN_BREEDER_ALIZE, FiveIsland_WaterLabyrinth_Text_AlizeIntro, FiveIsland_WaterLabyrinth_Text_AlizeDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC300 - msgbox Text_18AB37, MSGBOX_AUTOCLOSE + goto_if_eq FiveIsland_WaterLabyrinth_EventScript_AlizeRematch + msgbox FiveIsland_WaterLabyrinth_Text_AlizePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC300:: @ 81AC300 - trainerbattle_rematch TRAINER_PKMN_BREEDER_ALIZE, Text_1C3BB7, Text_18AB0B - msgbox Text_18AB37, MSGBOX_AUTOCLOSE +FiveIsland_WaterLabyrinth_EventScript_AlizeRematch:: @ 81AC300 + trainerbattle_rematch TRAINER_PKMN_BREEDER_ALIZE, FiveIsland_WaterLabyrinth_Text_AlizeRematchIntro, FiveIsland_WaterLabyrinth_Text_AlizeDefeat + msgbox FiveIsland_WaterLabyrinth_Text_AlizePostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_MemorialPillar_EventScript_1AC317:: @ 81AC317 - trainerbattle_single TRAINER_BIRD_KEEPER_MILO, Text_18AE50, Text_18AEA8 +FiveIsland_MemorialPillar_EventScript_Milo:: @ 81AC317 + trainerbattle_single TRAINER_BIRD_KEEPER_MILO, FiveIsland_MemorialPillar_Text_MiloIntro, FiveIsland_MemorialPillar_Text_MiloDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC33E - msgbox Text_18AEB6, MSGBOX_AUTOCLOSE + goto_if_eq FiveIsland_MemorialPillar_EventScript_MiloRematch + msgbox FiveIsland_MemorialPillar_Text_MiloPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC33E:: @ 81AC33E - trainerbattle_rematch TRAINER_BIRD_KEEPER_MILO, Text_1C3DA2, Text_18AEA8 - msgbox Text_18AEB6, MSGBOX_AUTOCLOSE +FiveIsland_MemorialPillar_EventScript_MiloRematch:: @ 81AC33E + trainerbattle_rematch TRAINER_BIRD_KEEPER_MILO, FiveIsland_MemorialPillar_Text_MiloRematchIntro, FiveIsland_MemorialPillar_Text_MiloDefeat + msgbox FiveIsland_MemorialPillar_Text_MiloPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_MemorialPillar_EventScript_1AC355:: @ 81AC355 - trainerbattle_single TRAINER_BIRD_KEEPER_CHAZ, Text_18AEDC, Text_18AF39 +FiveIsland_MemorialPillar_EventScript_Chaz:: @ 81AC355 + trainerbattle_single TRAINER_BIRD_KEEPER_CHAZ, FiveIsland_MemorialPillar_Text_ChazIntro, FiveIsland_MemorialPillar_Text_ChazDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC37C - msgbox Text_18AF45, MSGBOX_AUTOCLOSE + goto_if_eq FiveIsland_MemorialPillar_EventScript_ChazRematch + msgbox FiveIsland_MemorialPillar_Text_ChazPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC37C:: @ 81AC37C - trainerbattle_rematch TRAINER_BIRD_KEEPER_CHAZ, Text_1C3E0F, Text_18AF39 - msgbox Text_18AF45, MSGBOX_AUTOCLOSE +FiveIsland_MemorialPillar_EventScript_ChazRematch:: @ 81AC37C + trainerbattle_rematch TRAINER_BIRD_KEEPER_CHAZ, FiveIsland_MemorialPillar_Text_ChazRematchIntro, FiveIsland_MemorialPillar_Text_ChazDefeat + msgbox FiveIsland_MemorialPillar_Text_ChazPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_MemorialPillar_EventScript_1AC393:: @ 81AC393 - trainerbattle_single TRAINER_BIRD_KEEPER_HAROLD, Text_18AF72, Text_18AFCC +FiveIsland_MemorialPillar_EventScript_Harold:: @ 81AC393 + trainerbattle_single TRAINER_BIRD_KEEPER_HAROLD, FiveIsland_MemorialPillar_Text_HaroldIntro, FiveIsland_MemorialPillar_Text_HaroldDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC3BA - msgbox Text_18AFF2, MSGBOX_AUTOCLOSE + goto_if_eq FiveIsland_MemorialPillar_EventScript_HaroldRematch + msgbox FiveIsland_MemorialPillar_Text_HaroldPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC3BA:: @ 81AC3BA - trainerbattle_rematch TRAINER_BIRD_KEEPER_HAROLD, Text_1C3E6A, Text_18AFCC - msgbox Text_18AFF2, MSGBOX_AUTOCLOSE +FiveIsland_MemorialPillar_EventScript_HaroldRematch:: @ 81AC3BA + trainerbattle_rematch TRAINER_BIRD_KEEPER_HAROLD, FiveIsland_MemorialPillar_Text_HaroldRematchIntro, FiveIsland_MemorialPillar_Text_HaroldDefeat + msgbox FiveIsland_MemorialPillar_Text_HaroldPostBattle, MSGBOX_AUTOCLOSE end SixIsland_OutcastIsland_EventScript_1AC3D1:: @ 81AC3D1 diff --git a/data/specials.inc b/data/specials.inc index 19ea756a7..d995179c8 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -238,7 +238,7 @@ gSpecials:: @ 815FD60 def_special Special_GetPlayerAvatarBike def_special nullsub_75 def_special nullsub_75 - def_special Special_GetLeadMonFriendship + def_special GetLeadMonFriendship def_special ScrSpecial_BattleTowerMapScript2 def_special ChooseNextBattleTowerTrainer def_special CheckPartyBattleTowerBanlist @@ -357,7 +357,7 @@ gSpecials:: @ 815FD60 def_special sub_80CADC4 def_special Special_SetVermilionTrashCans def_special sub_805D1A8 - def_special Special_SampleResortGorgeousMonAndReward + def_special SampleResortGorgeousMonAndReward def_special Special_CheckAddCoins def_special GetDaycarePokemonCount def_special Special_CloseElevatorCurrentFloorWindow @@ -444,7 +444,7 @@ gSpecials:: @ 815FD60 def_special Special_PlayerIsNotInTrainerTowerLobby def_special Special_BrailleCursorToggle def_special Script_ResetUnionRoomTrade - def_special Special_PlayerPartyContainsSpeciesWithPlayerID + def_special PlayerPartyContainsSpeciesWithPlayerID def_special AnimateTeleporterHousing def_special IsDodrioInParty def_special AnimateTeleporterCable diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc index a8226df05..e6acb6877 100644 --- a/data/text/fame_checker.inc +++ b/data/text/fame_checker.inc @@ -1429,7 +1429,7 @@ gUnknown_81B17E9:: @ 81B17E9 .string "shades only when he is thinking up\l" .string "new quiz questions.$" -gUnknown_81B187F:: @ 81B187F +PokemonJournal_Text_SpecialFeatureLorelei:: @ 81B187F .string "POKéMON JOURNAL\p" .string "Special Feature:\n" .string "ELITE FOUR's LORELEI!\p" diff --git a/data/text/trainers.inc b/data/text/trainers.inc index 7a51a0585..23fcbc2dc 100644 --- a/data/text/trainers.inc +++ b/data/text/trainers.inc @@ -791,54 +791,54 @@ Text_1C3B6E:: @ 81C3B6E Text_1C3B99:: @ 81C3B99 .string "MEG: You can't beat us today!$" -Text_1C3BB7:: @ 81C3BB7 +FiveIsland_WaterLabyrinth_Text_AlizeRematchIntro:: @ 81C3BB7 .string "Oh, hello!\p" .string "Are you raising your POKéMON in a\n" .string "good environment?$" -Text_1C3BF6:: @ 81C3BF6 +FiveIsland_ResortGorgeous_Text_DaisyRematchIntro:: @ 81C3BF6 .string "With these hands, I will create\n" .string "my victory today.$" -Text_1C3C28:: @ 81C3C28 +FiveIsland_ResortGorgeous_Text_CelinaRematchIntro:: @ 81C3C28 .string "Must I repeat myself?\n" .string "I'm trying to paint.\l" .string "Please keep out of my sight!$" -Text_1C3C70:: @ 81C3C70 +FiveIsland_ResortGorgeous_Text_RaynaRematchIntro:: @ 81C3C70 .string "I haven't made any progress…\n" .string "I still can't get the right angle…$" -Text_1C3CB0:: @ 81C3CB0 +FiveIsland_ResortGorgeous_Text_JackiRematchIntro:: @ 81C3CB0 .string "Oh, you will give me another\n" .string "opportunity to match wits with you?$" -Text_1C3CF1:: @ 81C3CF1 +FiveIsland_ResortGorgeous_Text_GillianRematchIntro:: @ 81C3CF1 .string "They're almost finished making the\n" .string "pool for my POKéMON.\p" .string "You must drop in for a visit.$" -Text_1C3D47:: @ 81C3D47 +FiveIsland_ResortGorgeous_Text_DestinRematchIntro:: @ 81C3D47 .string "I'm a good runner.\n" .string "I've gotten even faster!$" -Text_1C3D73:: @ 81C3D73 +FiveIsland_ResortGorgeous_Text_TobyRematchIntro:: @ 81C3D73 .string "I say, friend!\n" .string "Let us enjoy our time together!$" -Text_1C3DA2:: @ 81C3DA2 +FiveIsland_MemorialPillar_Text_MiloRematchIntro:: @ 81C3DA2 .string "I'm the eldest of the BIRD\n" .string "BROTHERS. Remember me?\p" .string "That's right, I'm the one who loves\n" .string "birds for their beaks!$" -Text_1C3E0F:: @ 81C3E0F +FiveIsland_MemorialPillar_Text_ChazRematchIntro:: @ 81C3E0F .string "I'm the middle kid of the BIRD\n" .string "BROTHERS.\p" .string "I'm the one that loves wings.\n" .string "Let's battle again!$" -Text_1C3E6A:: @ 81C3E6A +FiveIsland_MemorialPillar_Text_HaroldRematchIntro:: @ 81C3E6A .string "I'm the youngest of the BIRD\n" .string "BROTHERS.\p" .string "I love birds for their down.\n" -- cgit v1.2.3 From 948b695ad436ade56858d76c3cd0d836910936ff Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 28 Feb 2020 08:16:21 -0500 Subject: Document Six Island scripts --- data/event_scripts.s | 1 + data/maps/SevenIsland_TrainerTower/text.inc | 65 ------ data/maps/SixIsland/map.json | 6 +- data/maps/SixIsland/scripts.inc | 12 +- data/maps/SixIsland/text.inc | 6 +- data/maps/SixIsland_GreenPath/map.json | 6 +- data/maps/SixIsland_GreenPath/scripts.inc | 8 +- data/maps/SixIsland_GreenPath/text.inc | 83 +------- data/maps/SixIsland_Harbor/map.json | 2 +- data/maps/SixIsland_Harbor/scripts.inc | 2 +- data/maps/SixIsland_House/map.json | 2 +- data/maps/SixIsland_House/scripts.inc | 4 +- data/maps/SixIsland_House/text.inc | 2 +- data/maps/SixIsland_Mart/map.json | 6 +- data/maps/SixIsland_Mart/scripts.inc | 10 +- data/maps/SixIsland_Mart/text.inc | 4 +- data/maps/SixIsland_OutcastIsland/map.json | 12 +- data/maps/SixIsland_OutcastIsland/scripts.inc | 6 +- data/maps/SixIsland_OutcastIsland/text.inc | 78 ++++++- data/maps/SixIsland_PatternBush/map.json | 24 +-- data/maps/SixIsland_PatternBush/scripts.inc | 80 +++---- data/maps/SixIsland_PatternBush/text.inc | 72 +++---- data/maps/SixIsland_PokemonCenter_1F/map.json | 6 +- data/maps/SixIsland_PokemonCenter_1F/scripts.inc | 42 ++-- data/maps/SixIsland_PokemonCenter_1F/text.inc | 6 +- data/maps/SixIsland_RuinValley/map.json | 14 +- data/maps/SixIsland_RuinValley/scripts.inc | 30 +-- data/maps/SixIsland_RuinValley/text.inc | 76 ++++++- data/maps/SixIsland_WaterPath/map.json | 18 +- data/maps/SixIsland_WaterPath/scripts.inc | 8 +- data/maps/SixIsland_WaterPath/text.inc | 50 ++--- data/maps/SixIsland_WaterPath_House1/map.json | 4 +- data/maps/SixIsland_WaterPath_House1/scripts.inc | 66 +++--- data/maps/SixIsland_WaterPath_House1/text.inc | 74 +------ data/maps/SixIsland_WaterPath_House2/map.json | 2 +- data/maps/SixIsland_WaterPath_House2/scripts.inc | 4 +- data/maps/SixIsland_WaterPath_House2/text.inc | 2 +- data/maps/TwoIsland_CapeBrink_House/text.inc | 53 +++++ data/scripts/fame_checker.inc | 4 +- data/scripts/trainers.inc | 252 +++++++++++------------ data/text/trainers.inc | 36 ++-- 41 files changed, 619 insertions(+), 619 deletions(-) create mode 100644 data/maps/TwoIsland_CapeBrink_House/text.inc (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index c088f893d..1fea39feb 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -795,6 +795,7 @@ gStdScriptsEnd:: .include "data/maps/SixIsland_House/text.inc" .include "data/maps/SixIsland_Mart/text.inc" .include "data/maps/FiveIsland_ResortGorgeous_House/text.inc" + .include "data/maps/TwoIsland_CapeBrink_House/text.inc" .include "data/maps/SixIsland_WaterPath_House1/text.inc" .include "data/maps/SixIsland_WaterPath_House2/text.inc" .include "data/maps/SevenIsland_SevaultCanyon_House/text.inc" diff --git a/data/maps/SevenIsland_TrainerTower/text.inc b/data/maps/SevenIsland_TrainerTower/text.inc index 027b3de54..d0d8554b1 100644 --- a/data/maps/SevenIsland_TrainerTower/text.inc +++ b/data/maps/SevenIsland_TrainerTower/text.inc @@ -1,68 +1,3 @@ -Text_18BE5D:: @ 818BE5D - .string "There appear to be many secrets\n" - .string "still unsolved in this world.$" - -Text_18BE9B:: @ 818BE9B - .string "Hmm…$" - -Text_18BEA0:: @ 818BEA0 - .string "I suggest to you that you, too,\n" - .string "give a thought to the secrets and\l" - .string "mysteries of our world once a day.$" - -Text_18BF05:: @ 818BF05 - .string "I'm curious, what compelled you to\n" - .string "come here?$" - -Text_18BF33:: @ 818BF33 - .string "It's been so long since I battled,\n" - .string "my instincts are off.$" - -Text_18BF6C:: @ 818BF6C - .string "There are several ruins on the\n" - .string "SEVII ISLANDS.\p" - .string "The majority of them date back\n" - .string "a long way.$" - -Text_18BFC5:: @ 818BFC5 - .string "It's been said that there are\n" - .string "mysterious stones on this island.\p" - .string "I suspect it has something to do\n" - .string "with the ruins here.$" - -Text_18C03B:: @ 818C03B - .string "Oh, interesting.$" - -Text_18C04C:: @ 818C04C - .string "Those ruins over there…\p" - .string "I haven't had any luck in finding\n" - .string "how I can get inside.$" - -Text_18C09C:: @ 818C09C - .string "A battle with you, so high up!$" - -Text_18C0BB:: @ 818C0BB - .string "Oh, the heartbreak of losing so\n" - .string "easily to you!$" - -Text_18C0EA:: @ 818C0EA - .string "Experience the joy of climbing!$" - -Text_18C10A:: @ 818C10A - .string "I'm pretty familiar with the land\n" - .string "around these parts.$" - -Text_18C140:: @ 818C140 - .string "You don't need to be so pushy.\n" - .string "I'll be happy to tell you.$" - -Text_18C17A:: @ 818C17A - .string "The door to the ruins…\n" - .string "It has these strange patterns\l" - .string "engraved on the outside.\p" - .string "I don't know what they mean,\n" - .string "though.$" - Text_18C1ED:: @ 818C1ED .string "I sensed your approach.$" diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json index ec8c1ffe3..bc04c47d8 100644 --- a/data/maps/SixIsland/map.json +++ b/data/maps/SixIsland/map.json @@ -31,7 +31,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_EventScript_167EEB", + "script": "SixIsland_EventScript_Boy", "flag": "0" }, { @@ -44,7 +44,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_EventScript_167EE2", + "script": "SixIsland_EventScript_Hiker", "flag": "0" } ], @@ -85,7 +85,7 @@ "x": 9, "y": 17, "elevation": 0, - "script": "SixIsland_EventScript_167EF4" + "script": "SixIsland_EventScript_IslandSign" }, { "type": "hidden_item", diff --git a/data/maps/SixIsland/scripts.inc b/data/maps/SixIsland/scripts.inc index 01d373654..863390ba8 100644 --- a/data/maps/SixIsland/scripts.inc +++ b/data/maps/SixIsland/scripts.inc @@ -6,14 +6,14 @@ SixIsland_OnTransition:: @ 8167EDE setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND end -SixIsland_EventScript_167EE2:: @ 8167EE2 - msgbox gUnknown_81831EF, MSGBOX_NPC +SixIsland_EventScript_Hiker:: @ 8167EE2 + msgbox SixIsland_Text_ThatWayToWaterPathRuinValley, MSGBOX_NPC end -SixIsland_EventScript_167EEB:: @ 8167EEB - msgbox gUnknown_8183255, MSGBOX_NPC +SixIsland_EventScript_Boy:: @ 8167EEB + msgbox SixIsland_Text_SkyAtNightIsFantastic, MSGBOX_NPC end -SixIsland_EventScript_167EF4:: @ 8167EF4 - msgbox gUnknown_81831C6, MSGBOX_SIGN +SixIsland_EventScript_IslandSign:: @ 8167EF4 + msgbox SixIsland_Text_IslandSign, MSGBOX_SIGN end diff --git a/data/maps/SixIsland/text.inc b/data/maps/SixIsland/text.inc index bade2abd1..0d2fc43ce 100644 --- a/data/maps/SixIsland/text.inc +++ b/data/maps/SixIsland/text.inc @@ -1,14 +1,14 @@ -gUnknown_81831C6:: @ 81831C6 +SixIsland_Text_IslandSign:: @ 81831C6 .string "SIX ISLAND\n" .string "Fortune Island of Aged Wisdom$" -gUnknown_81831EF:: @ 81831EF +SixIsland_Text_ThatWayToWaterPathRuinValley:: @ 81831EF .string "Keep going this way and you'll get\n" .string "to the WATER PATH.\p" .string "Stay on that and you'll get to\n" .string "the RUIN VALLEY.$" -gUnknown_8183255:: @ 8183255 +SixIsland_Text_SkyAtNightIsFantastic:: @ 8183255 .string "When you're this far away from the\n" .string "city, the sky at night is fantastic.$" diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json index ff6ad2c51..f9955cfd2 100644 --- a/data/maps/SixIsland_GreenPath/map.json +++ b/data/maps/SixIsland_GreenPath/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SixIsland_GreenPath_EventScript_1AC517", + "script": "SixIsland_GreenPath_EventScript_Jaclyn", "flag": "0" } ], @@ -77,14 +77,14 @@ "x": 40, "y": 10, "elevation": 0, - "script": "SixIsland_GreenPath_EventScript_168B37" + "script": "SixIsland_GreenPath_EventScript_LeftRouteSign" }, { "type": "bg_event_type_0", "x": 69, "y": 10, "elevation": 0, - "script": "SixIsland_GreenPath_EventScript_168B2E" + "script": "SixIsland_GreenPath_EventScript_RightRouteSign" }, { "type": "hidden_item", diff --git a/data/maps/SixIsland_GreenPath/scripts.inc b/data/maps/SixIsland_GreenPath/scripts.inc index acc4336d2..559158455 100644 --- a/data/maps/SixIsland_GreenPath/scripts.inc +++ b/data/maps/SixIsland_GreenPath/scripts.inc @@ -1,10 +1,10 @@ SixIsland_GreenPath_MapScripts:: @ 8168B2D .byte 0 -SixIsland_GreenPath_EventScript_168B2E:: @ 8168B2E - msgbox gUnknown_818B84D, MSGBOX_SIGN +SixIsland_GreenPath_EventScript_RightRouteSign:: @ 8168B2E + msgbox SixIsland_GreenPath_Text_LeftRouteSign, MSGBOX_SIGN end -SixIsland_GreenPath_EventScript_168B37:: @ 8168B37 - msgbox gUnknown_818B86B, MSGBOX_SIGN +SixIsland_GreenPath_EventScript_LeftRouteSign:: @ 8168B37 + msgbox SixIsland_GreenPath_Text_RightRouteSign, MSGBOX_SIGN end diff --git a/data/maps/SixIsland_GreenPath/text.inc b/data/maps/SixIsland_GreenPath/text.inc index 97d8bc2c8..e8113cac3 100644 --- a/data/maps/SixIsland_GreenPath/text.inc +++ b/data/maps/SixIsland_GreenPath/text.inc @@ -1,94 +1,21 @@ -Text_18B400:: @ 818B400 - .string "I'm having no luck at all.\n" - .string "A battle'd be a change of pace!$" - -Text_18B43B:: @ 818B43B - .string "Nope, no luck at all…$" - -Text_18B451:: @ 818B451 - .string "I can't very well go home without\n" - .string "catching something, though.$" - -Text_18B48F:: @ 818B48F - .string "Gasp… Gasp…\p" - .string "I swam here from SIX ISLE PORT\n" - .string "in one go.$" - -Text_18B4C5:: @ 818B4C5 - .string "Gasp…\n" - .string "Gasp…$" - -Text_18B4D1:: @ 818B4D1 - .string "I'm only at the halfway point…\n" - .string "I'm beat…$" - -Text_18B4FA:: @ 818B4FA - .string "It's not so easy sending POKéMON\n" - .string "out while swimming, you know?$" - -Text_18B539:: @ 818B539 - .string "I didn't lose to you at swimming.\n" - .string "This doesn't bother me.$" - -Text_18B573:: @ 818B573 - .string "Are you headed for the island up\n" - .string "past here?\p" - .string "I didn't see anything interesting\n" - .string "there.$" - -Text_18B5C8:: @ 818B5C8 - .string "AVA: Let's have a two-on-two\n" - .string "marine battle!$" - -Text_18B5F4:: @ 818B5F4 - .string "AVA: Oh, you're amazing!\n" - .string "Even better, you're on your own!$" - -Text_18B62E:: @ 818B62E - .string "AVA: You know, I do prefer the\n" - .string "sea over any pool.$" - -Text_18B660:: @ 818B660 - .string "AVA: You're challenging us to\n" - .string "a battle?\p" - .string "You'll need at least two POKéMON\n" - .string "if you want to do that.$" - -Text_18B6C1:: @ 818B6C1 - .string "GEB: Big Sister, help!\n" - .string "Please battle with me!$" - -Text_18B6EF:: @ 818B6EF - .string "GEB: Wow, Big Sister, this person's\n" - .string "really good!$" - -Text_18B720:: @ 818B720 - .string "GEB: I'm hanging onto my sister\n" - .string "because I can't touch the bottom.$" - -Text_18B762:: @ 818B762 - .string "GEB: Please battle against me and\n" - .string "my sister!\p" - .string "…Oh, you don't have two POKéMON?$" - -Text_18B7B0:: @ 818B7B0 +SixIsland_GreenPath_Text_JaclynIntro:: @ 818B7B0 .string "…Huh?\p" .string "I was envisioning my house, but\n" .string "this is where I TELEPORT?$" -Text_18B7F0:: @ 818B7F0 +SixIsland_GreenPath_Text_JaclynDefeat:: @ 818B7F0 .string "Big boo-boo!$" -Text_18B7FD:: @ 818B7FD +SixIsland_GreenPath_Text_JaclynPostBattle:: @ 818B7FD .string "I am so scatterbrained!\p" .string "I need to focus so I can TELEPORT\n" .string "properly to my house!$" -gUnknown_818B84D:: @ 818B84D +SixIsland_GreenPath_Text_LeftRouteSign:: @ 818B84D .string "GREEN PATH\n" .string "PATTERN BUSH AHEAD$" -gUnknown_818B86B:: @ 818B86B +SixIsland_GreenPath_Text_RightRouteSign:: @ 818B86B .string "GREEN PATH\n" .string "Think Green, Keep Nature Clean!$" diff --git a/data/maps/SixIsland_Harbor/map.json b/data/maps/SixIsland_Harbor/map.json index e303ff025..58c47c48a 100644 --- a/data/maps/SixIsland_Harbor/map.json +++ b/data/maps/SixIsland_Harbor/map.json @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_Harbor_EventScript_171E48", + "script": "SixIsland_Harbor_EventScript_Sailor", "flag": "0" } ], diff --git a/data/maps/SixIsland_Harbor/scripts.inc b/data/maps/SixIsland_Harbor/scripts.inc index 11ed9c7b8..fabf9d841 100644 --- a/data/maps/SixIsland_Harbor/scripts.inc +++ b/data/maps/SixIsland_Harbor/scripts.inc @@ -1,7 +1,7 @@ SixIsland_Harbor_MapScripts:: @ 8171E47 .byte 0 -SixIsland_Harbor_EventScript_171E48:: @ 8171E48 +SixIsland_Harbor_EventScript_Sailor:: @ 8171E48 lock faceplayer message Text_WhereDoYouWantToSail diff --git a/data/maps/SixIsland_House/map.json b/data/maps/SixIsland_House/map.json index 2747a0cf0..b27112474 100644 --- a/data/maps/SixIsland_House/map.json +++ b/data/maps/SixIsland_House/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_House_EventScript_171E5C", + "script": "SixIsland_House_EventScript_OldMan", "flag": "0" } ], diff --git a/data/maps/SixIsland_House/scripts.inc b/data/maps/SixIsland_House/scripts.inc index 1ad94906f..bf61629b2 100644 --- a/data/maps/SixIsland_House/scripts.inc +++ b/data/maps/SixIsland_House/scripts.inc @@ -1,6 +1,6 @@ SixIsland_House_MapScripts:: @ 8171E5B .byte 0 -SixIsland_House_EventScript_171E5C:: @ 8171E5C - msgbox gUnknown_81A412E, MSGBOX_NPC +SixIsland_House_EventScript_OldMan:: @ 8171E5C + msgbox SixIsland_House_Text_GoodPlaceForNatureAndHistory, MSGBOX_NPC end diff --git a/data/maps/SixIsland_House/text.inc b/data/maps/SixIsland_House/text.inc index 06fd9c274..839cdf2f3 100644 --- a/data/maps/SixIsland_House/text.inc +++ b/data/maps/SixIsland_House/text.inc @@ -1,4 +1,4 @@ -gUnknown_81A412E:: @ 81A412E +SixIsland_House_Text_GoodPlaceForNatureAndHistory:: @ 81A412E .string "There's nothing that young people'd\n" .string "find exciting here on this island.\p" .string "But, this is a good place in terms\n" diff --git a/data/maps/SixIsland_Mart/map.json b/data/maps/SixIsland_Mart/map.json index e208da76c..7607a118d 100644 --- a/data/maps/SixIsland_Mart/map.json +++ b/data/maps/SixIsland_Mart/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_Mart_EventScript_171E66", + "script": "SixIsland_Mart_EventScript_Clerk", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_Mart_EventScript_1ACFEF", + "script": "SixIsland_Mart_EventScript_OldWoman", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_Mart_EventScript_171EA0", + "script": "SixIsland_Mart_EventScript_Picnicker", "flag": "0" } ], diff --git a/data/maps/SixIsland_Mart/scripts.inc b/data/maps/SixIsland_Mart/scripts.inc index 777948764..da7515c52 100644 --- a/data/maps/SixIsland_Mart/scripts.inc +++ b/data/maps/SixIsland_Mart/scripts.inc @@ -1,19 +1,19 @@ SixIsland_Mart_MapScripts:: @ 8171E65 .byte 0 -SixIsland_Mart_EventScript_171E66:: @ 8171E66 +SixIsland_Mart_EventScript_Clerk:: @ 8171E66 goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_171E8C + pokemart SixIsland_Mart_Items msgbox Text_PleaseComeAgain release end .align 2 -Items_171E8C:: @ 8171E8C +SixIsland_Mart_Items:: @ 8171E8C .2byte ITEM_ULTRA_BALL .2byte ITEM_FULL_RESTORE .2byte ITEM_MAX_POTION @@ -26,6 +26,6 @@ Items_171E8C:: @ 8171E8C release end -SixIsland_Mart_EventScript_171EA0:: @ 8171EA0 - msgbox gUnknown_81A4271, MSGBOX_NPC +SixIsland_Mart_EventScript_Picnicker:: @ 8171EA0 + msgbox SixIsland_Mart_Text_ShouldBuyMailAndWriteLetter, MSGBOX_NPC end diff --git a/data/maps/SixIsland_Mart/text.inc b/data/maps/SixIsland_Mart/text.inc index 34e6275a2..178f635ea 100644 --- a/data/maps/SixIsland_Mart/text.inc +++ b/data/maps/SixIsland_Mart/text.inc @@ -1,4 +1,4 @@ -Text_1A41CA:: @ 81A41CA +SixIsland_Mart_Text_AgathaOldestEverEliteFourMember:: @ 81A41CA .string "Play with POKéMON lots and live\n" .string "a long life!\p" .string "Take AGATHA, for example.\p" @@ -6,7 +6,7 @@ Text_1A41CA:: @ 81A41CA .string "oldest-ever ELITE FOUR member.\p" .string "She spurs me to do bigger things.$" -gUnknown_81A4271:: @ 81A4271 +SixIsland_Mart_Text_ShouldBuyMailAndWriteLetter:: @ 81A4271 .string "I should buy some MAIL and write\n" .string "him a letter…$" diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json index 14828c8eb..d39a4d70d 100644 --- a/data/maps/SixIsland_OutcastIsland/map.json +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -31,7 +31,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SixIsland_OutcastIsland_EventScript_168B16", + "script": "SixIsland_OutcastIsland_EventScript_Rocket", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { @@ -44,7 +44,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SixIsland_OutcastIsland_EventScript_1AC3D1", + "script": "SixIsland_OutcastIsland_EventScript_Tylor", "flag": "0" }, { @@ -57,7 +57,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SixIsland_OutcastIsland_EventScript_1AC40F", + "script": "SixIsland_OutcastIsland_EventScript_Mymo", "flag": "0" }, { @@ -70,7 +70,7 @@ "movement_range_y": 4, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SixIsland_OutcastIsland_EventScript_1AC44D", + "script": "SixIsland_OutcastIsland_EventScript_Nicole", "flag": "0" }, { @@ -83,7 +83,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SixIsland_OutcastIsland_EventScript_1AC48B", + "script": "SixIsland_OutcastIsland_EventScript_Ava", "flag": "0" }, { @@ -96,7 +96,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SixIsland_OutcastIsland_EventScript_1AC4D1", + "script": "SixIsland_OutcastIsland_EventScript_Geb", "flag": "0" }, { diff --git a/data/maps/SixIsland_OutcastIsland/scripts.inc b/data/maps/SixIsland_OutcastIsland/scripts.inc index fb4ec0217..b43a93095 100644 --- a/data/maps/SixIsland_OutcastIsland/scripts.inc +++ b/data/maps/SixIsland_OutcastIsland/scripts.inc @@ -1,7 +1,7 @@ SixIsland_OutcastIsland_MapScripts:: @ 8168B15 .byte 0 -SixIsland_OutcastIsland_EventScript_168B16:: @ 8168B16 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_46, Text_18B35A, Text_18B3C2 - msgbox gUnknown_818B3C8, MSGBOX_AUTOCLOSE +SixIsland_OutcastIsland_EventScript_Rocket:: @ 8168B16 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_46, SixIsland_OutcastIsland_Text_RocketIntro, SixIsland_OutcastIsland_Text_RocketDefeat + msgbox SixIsland_OutcastIsland_Text_RocketPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SixIsland_OutcastIsland/text.inc b/data/maps/SixIsland_OutcastIsland/text.inc index 47b138e41..67218e416 100644 --- a/data/maps/SixIsland_OutcastIsland/text.inc +++ b/data/maps/SixIsland_OutcastIsland/text.inc @@ -1,13 +1,85 @@ -Text_18B35A:: @ 818B35A +SixIsland_OutcastIsland_Text_RocketIntro:: @ 818B35A .string "There're no rare POKéMON around\n" .string "these parts! Not a one!\p" .string "That burns me up, man.\n" .string "I'll take it out on you!$" -Text_18B3C2:: @ 818B3C2 +SixIsland_OutcastIsland_Text_RocketDefeat:: @ 818B3C2 .string "…Huh?$" -gUnknown_818B3C8:: @ 818B3C8 +SixIsland_OutcastIsland_Text_RocketPostBattle:: @ 818B3C8 .string "So listen, you haven't seen any\n" .string "rare POKéMON, have you?$" +SixIsland_OutcastIsland_Text_TylorIntro:: @ 818B400 + .string "I'm having no luck at all.\n" + .string "A battle'd be a change of pace!$" + +SixIsland_OutcastIsland_Text_TylorDefeat:: @ 818B43B + .string "Nope, no luck at all…$" + +SixIsland_OutcastIsland_Text_TylorPostBattle:: @ 818B451 + .string "I can't very well go home without\n" + .string "catching something, though.$" + +SixIsland_OutcastIsland_Text_MymoIntro:: @ 818B48F + .string "Gasp… Gasp…\p" + .string "I swam here from SIX ISLE PORT\n" + .string "in one go.$" + +SixIsland_OutcastIsland_Text_MymoDefeat:: @ 818B4C5 + .string "Gasp…\n" + .string "Gasp…$" + +SixIsland_OutcastIsland_Text_MymoPostBattle:: @ 818B4D1 + .string "I'm only at the halfway point…\n" + .string "I'm beat…$" + +SixIsland_OutcastIsland_Text_NicoleIntro:: @ 818B4FA + .string "It's not so easy sending POKéMON\n" + .string "out while swimming, you know?$" + +SixIsland_OutcastIsland_Text_NicoleDefeat:: @ 818B539 + .string "I didn't lose to you at swimming.\n" + .string "This doesn't bother me.$" + +SixIsland_OutcastIsland_Text_NicolePostBattle:: @ 818B573 + .string "Are you headed for the island up\n" + .string "past here?\p" + .string "I didn't see anything interesting\n" + .string "there.$" + +SixIsland_OutcastIsland_Text_AvaIntro:: @ 818B5C8 + .string "AVA: Let's have a two-on-two\n" + .string "marine battle!$" + +SixIsland_OutcastIsland_Text_AvaDefeat:: @ 818B5F4 + .string "AVA: Oh, you're amazing!\n" + .string "Even better, you're on your own!$" + +SixIsland_OutcastIsland_Text_AvaPostBattle:: @ 818B62E + .string "AVA: You know, I do prefer the\n" + .string "sea over any pool.$" + +SixIsland_OutcastIsland_Text_AvaNotEnoughMons:: @ 818B660 + .string "AVA: You're challenging us to\n" + .string "a battle?\p" + .string "You'll need at least two POKéMON\n" + .string "if you want to do that.$" + +SixIsland_OutcastIsland_Text_GebIntro:: @ 818B6C1 + .string "GEB: Big Sister, help!\n" + .string "Please battle with me!$" + +SixIsland_OutcastIsland_Text_GebDefeat:: @ 818B6EF + .string "GEB: Wow, Big Sister, this person's\n" + .string "really good!$" + +SixIsland_OutcastIsland_Text_GebPostBattle:: @ 818B720 + .string "GEB: I'm hanging onto my sister\n" + .string "because I can't touch the bottom.$" + +SixIsland_OutcastIsland_Text_GebNotEnoughMons:: @ 818B762 + .string "GEB: Please battle against me and\n" + .string "my sister!\p" + .string "…Oh, you don't have two POKéMON?$" diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json index e0d100f6c..893790bd4 100644 --- a/data/maps/SixIsland_PatternBush/map.json +++ b/data/maps/SixIsland_PatternBush/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SixIsland_PatternBush_EventScript_164590", + "script": "SixIsland_PatternBush_EventScript_Bethany", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SixIsland_PatternBush_EventScript_1645A7", + "script": "SixIsland_PatternBush_EventScript_Allison", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SixIsland_PatternBush_EventScript_1645BE", + "script": "SixIsland_PatternBush_EventScript_Garret", "flag": "0" }, { @@ -64,7 +64,7 @@ "movement_range_y": 2, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SixIsland_PatternBush_EventScript_1645D5", + "script": "SixIsland_PatternBush_EventScript_Jonah", "flag": "0" }, { @@ -77,7 +77,7 @@ "movement_range_y": 5, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SixIsland_PatternBush_EventScript_1645EC", + "script": "SixIsland_PatternBush_EventScript_Vance", "flag": "0" }, { @@ -90,7 +90,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SixIsland_PatternBush_EventScript_164603", + "script": "SixIsland_PatternBush_EventScript_Nash", "flag": "0" }, { @@ -103,7 +103,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "SixIsland_PatternBush_EventScript_16461A", + "script": "SixIsland_PatternBush_EventScript_Cordell", "flag": "0" }, { @@ -116,7 +116,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "SixIsland_PatternBush_EventScript_164631", + "script": "SixIsland_PatternBush_EventScript_Dalia", "flag": "0" }, { @@ -129,7 +129,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SixIsland_PatternBush_EventScript_164648", + "script": "SixIsland_PatternBush_EventScript_Joana", "flag": "0" }, { @@ -142,7 +142,7 @@ "movement_range_y": 2, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SixIsland_PatternBush_EventScript_16465F", + "script": "SixIsland_PatternBush_EventScript_Riley", "flag": "0" }, { @@ -155,7 +155,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SixIsland_PatternBush_EventScript_164676", + "script": "SixIsland_PatternBush_EventScript_Marcy", "flag": "0" }, { @@ -168,7 +168,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SixIsland_PatternBush_EventScript_16468D", + "script": "SixIsland_PatternBush_EventScript_Layton", "flag": "0" } ], diff --git a/data/maps/SixIsland_PatternBush/scripts.inc b/data/maps/SixIsland_PatternBush/scripts.inc index 97a8a0a30..a9d9be019 100644 --- a/data/maps/SixIsland_PatternBush/scripts.inc +++ b/data/maps/SixIsland_PatternBush/scripts.inc @@ -6,75 +6,75 @@ SixIsland_PatternBush_OnTransition:: @ 816455F setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH getplayerxy VAR_TEMP_1, VAR_TEMP_2 compare VAR_TEMP_1, 50 - call_if_ge EventScript_16457E + call_if_ge SixIsland_PatternBush_EventScript_SetEscapeRightExit compare VAR_TEMP_1, 49 - call_if_le EventScript_164587 + call_if_le SixIsland_PatternBush_EventScript_SetEscapeLeftExit end -EventScript_16457E:: @ 816457E +SixIsland_PatternBush_EventScript_SetEscapeRightExit:: @ 816457E setescapewarp MAP_SIX_ISLAND_GREEN_PATH, 255, 64, 10 return -EventScript_164587:: @ 8164587 +SixIsland_PatternBush_EventScript_SetEscapeLeftExit:: @ 8164587 setescapewarp MAP_SIX_ISLAND_GREEN_PATH, 255, 45, 10 return -SixIsland_PatternBush_EventScript_164590:: @ 8164590 - trainerbattle_single TRAINER_PKMN_BREEDER_BETHANY, Text_17BF3A, Text_17BF66 - msgbox gUnknown_817BF97, MSGBOX_AUTOCLOSE +SixIsland_PatternBush_EventScript_Bethany:: @ 8164590 + trainerbattle_single TRAINER_PKMN_BREEDER_BETHANY, SixIsland_PatternBush_Text_BethanyIntro, SixIsland_PatternBush_Text_BethanyDefeat + msgbox SixIsland_PatternBush_Text_BethanyPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_PatternBush_EventScript_1645A7:: @ 81645A7 - trainerbattle_single TRAINER_PKMN_BREEDER_ALLISON, Text_17BFEB, Text_17C028 - msgbox gUnknown_817C056, MSGBOX_AUTOCLOSE +SixIsland_PatternBush_EventScript_Allison:: @ 81645A7 + trainerbattle_single TRAINER_PKMN_BREEDER_ALLISON, SixIsland_PatternBush_Text_AllisonIntro, SixIsland_PatternBush_Text_AllisonDefeat + msgbox SixIsland_PatternBush_Text_AllisonPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_PatternBush_EventScript_1645BE:: @ 81645BE - trainerbattle_single TRAINER_BUG_CATCHER_GARRET, Text_17C0BE, Text_17C0F2 - msgbox gUnknown_817C113, MSGBOX_AUTOCLOSE +SixIsland_PatternBush_EventScript_Garret:: @ 81645BE + trainerbattle_single TRAINER_BUG_CATCHER_GARRET, SixIsland_PatternBush_Text_GarretIntro, SixIsland_PatternBush_Text_GarretDefeat + msgbox SixIsland_PatternBush_Text_GarretPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_PatternBush_EventScript_1645D5:: @ 81645D5 - trainerbattle_single TRAINER_BUG_CATCHER_JONAH, Text_17C155, Text_17C196 - msgbox gUnknown_817C1D0, MSGBOX_AUTOCLOSE +SixIsland_PatternBush_EventScript_Jonah:: @ 81645D5 + trainerbattle_single TRAINER_BUG_CATCHER_JONAH, SixIsland_PatternBush_Text_JonahIntro, SixIsland_PatternBush_Text_JonahDefeat + msgbox SixIsland_PatternBush_Text_JonahPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_PatternBush_EventScript_1645EC:: @ 81645EC - trainerbattle_single TRAINER_BUG_CATCHER_VANCE, Text_17C246, Text_17C275 - msgbox gUnknown_817C2A4, MSGBOX_AUTOCLOSE +SixIsland_PatternBush_EventScript_Vance:: @ 81645EC + trainerbattle_single TRAINER_BUG_CATCHER_VANCE, SixIsland_PatternBush_Text_VanceIntro, SixIsland_PatternBush_Text_VanceDefeat + msgbox SixIsland_PatternBush_Text_VancePostBattle, MSGBOX_AUTOCLOSE end -SixIsland_PatternBush_EventScript_164603:: @ 8164603 - trainerbattle_single TRAINER_YOUNGSTER_NASH, Text_17C2D9, Text_17C30D - msgbox gUnknown_817C31C, MSGBOX_AUTOCLOSE +SixIsland_PatternBush_EventScript_Nash:: @ 8164603 + trainerbattle_single TRAINER_YOUNGSTER_NASH, SixIsland_PatternBush_Text_NashIntro, SixIsland_PatternBush_Text_NashDefeat + msgbox SixIsland_PatternBush_Text_NashPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_PatternBush_EventScript_16461A:: @ 816461A - trainerbattle_single TRAINER_YOUNGSTER_CORDELL, Text_17C373, Text_17C3A5 - msgbox gUnknown_817C3CE, MSGBOX_AUTOCLOSE +SixIsland_PatternBush_EventScript_Cordell:: @ 816461A + trainerbattle_single TRAINER_YOUNGSTER_CORDELL, SixIsland_PatternBush_Text_CordellIntro, SixIsland_PatternBush_Text_CordellDefeat + msgbox SixIsland_PatternBush_Text_CordellPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_PatternBush_EventScript_164631:: @ 8164631 - trainerbattle_single TRAINER_LASS_DALIA, Text_17C42B, Text_17C458 - msgbox gUnknown_817C490, MSGBOX_AUTOCLOSE +SixIsland_PatternBush_EventScript_Dalia:: @ 8164631 + trainerbattle_single TRAINER_LASS_DALIA, SixIsland_PatternBush_Text_DaliaIntro, SixIsland_PatternBush_Text_DaliaDefeat + msgbox SixIsland_PatternBush_Text_DaliaPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_PatternBush_EventScript_164648:: @ 8164648 - trainerbattle_single TRAINER_LASS_JOANA, Text_17C4FE, Text_17C552 - msgbox gUnknown_817C590, MSGBOX_AUTOCLOSE +SixIsland_PatternBush_EventScript_Joana:: @ 8164648 + trainerbattle_single TRAINER_LASS_JOANA, SixIsland_PatternBush_Text_JoanaIntro, SixIsland_PatternBush_Text_JoanaDefeat + msgbox SixIsland_PatternBush_Text_JoanaPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_PatternBush_EventScript_16465F:: @ 816465F - trainerbattle_single TRAINER_CAMPER_RILEY, Text_17C5DB, Text_17C609 - msgbox gUnknown_817C615, MSGBOX_AUTOCLOSE +SixIsland_PatternBush_EventScript_Riley:: @ 816465F + trainerbattle_single TRAINER_CAMPER_RILEY, SixIsland_PatternBush_Text_RileyIntro, SixIsland_PatternBush_Text_RileyDefeat + msgbox SixIsland_PatternBush_Text_RileyPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_PatternBush_EventScript_164676:: @ 8164676 - trainerbattle_single TRAINER_PICNICKER_MARCY, Text_17C63E, Text_17C660 - msgbox gUnknown_817C68E, MSGBOX_AUTOCLOSE +SixIsland_PatternBush_EventScript_Marcy:: @ 8164676 + trainerbattle_single TRAINER_PICNICKER_MARCY, SixIsland_PatternBush_Text_MarcyIntro, SixIsland_PatternBush_Text_MarcyDefeat + msgbox SixIsland_PatternBush_Text_MarcyPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_PatternBush_EventScript_16468D:: @ 816468D - trainerbattle_single TRAINER_RUIN_MANIAC_LAYTON, Text_17C6C9, Text_17C6FB - msgbox gUnknown_817C728, MSGBOX_AUTOCLOSE +SixIsland_PatternBush_EventScript_Layton:: @ 816468D + trainerbattle_single TRAINER_RUIN_MANIAC_LAYTON, SixIsland_PatternBush_Text_LaytonIntro, SixIsland_PatternBush_Text_LaytonDefeat + msgbox SixIsland_PatternBush_Text_LaytonPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SixIsland_PatternBush/text.inc b/data/maps/SixIsland_PatternBush/text.inc index eddaf1ed9..4c4161fe9 100644 --- a/data/maps/SixIsland_PatternBush/text.inc +++ b/data/maps/SixIsland_PatternBush/text.inc @@ -1,154 +1,154 @@ -Text_17BF3A:: @ 817BF3A +SixIsland_PatternBush_Text_BethanyIntro:: @ 817BF3A .string "I'm curious, how do you raise your\n" .string "POKéMON?$" -Text_17BF66:: @ 817BF66 +SixIsland_PatternBush_Text_BethanyDefeat:: @ 817BF66 .string "You raise your POKéMON with a\n" .string "whole lot of love!$" -gUnknown_817BF97:: @ 817BF97 +SixIsland_PatternBush_Text_BethanyPostBattle:: @ 817BF97 .string "In the same way your mother raised\n" .string "you full of love, you should raise\l" .string "your POKéMON.$" -Text_17BFEB:: @ 817BFEB +SixIsland_PatternBush_Text_AllisonIntro:: @ 817BFEB .string "I'm working to preserve the natural\n" .string "ecology of POKéMON here.$" -Text_17C028:: @ 817C028 +SixIsland_PatternBush_Text_AllisonDefeat:: @ 817C028 .string "Oh, for someone so young, you are\n" .string "tremendous!$" -gUnknown_817C056:: @ 817C056 +SixIsland_PatternBush_Text_AllisonPostBattle:: @ 817C056 .string "I'm not saying that you shouldn't\n" .string "catch POKéMON.\p" .string "I just want people to raise their\n" .string "POKéMON responsibly.$" -Text_17C0BE:: @ 817C0BE +SixIsland_PatternBush_Text_GarretIntro:: @ 817C0BE .string "I caught a BUG POKéMON that lives\n" .string "only around here!$" -Text_17C0F2:: @ 817C0F2 +SixIsland_PatternBush_Text_GarretDefeat:: @ 817C0F2 .string "Heheh…\n" .string "Isn't my POKéMON awesome?$" -gUnknown_817C113:: @ 817C113 +SixIsland_PatternBush_Text_GarretPostBattle:: @ 817C113 .string "There's a girl near the BUSH who\n" .string "measures HERACROSS for TRAINERS.$" -Text_17C155:: @ 817C155 +SixIsland_PatternBush_Text_JonahIntro:: @ 817C155 .string "You know, it just doesn't feel right\n" .string "if I don't use BUG POKéMON.$" -Text_17C196:: @ 817C196 +SixIsland_PatternBush_Text_JonahDefeat:: @ 817C196 .string "It's okay, losing is a fun part of\n" .string "POKéMON's appeal, too.$" -gUnknown_817C1D0:: @ 817C1D0 +SixIsland_PatternBush_Text_JonahPostBattle:: @ 817C1D0 .string "By the way, “appeal” is a weird\n" .string "word, if you think about it.\p" .string "Like, is it like an orange peel?\n" .string "Or like a ringing bell?$" -Text_17C246:: @ 817C246 +SixIsland_PatternBush_Text_VanceIntro:: @ 817C246 .string "Yeah, yeah, yeah!\n" .string "Look at all the BUG POKéMON!$" -Text_17C275:: @ 817C275 +SixIsland_PatternBush_Text_VanceDefeat:: @ 817C275 .string "I got beat while I was still busy\n" .string "celebrating!$" -gUnknown_817C2A4:: @ 817C2A4 +SixIsland_PatternBush_Text_VancePostBattle:: @ 817C2A4 .string "I'm going to bring my little brother\n" .string "here next time.$" -Text_17C2D9:: @ 817C2D9 +SixIsland_PatternBush_Text_NashIntro:: @ 817C2D9 .string "Look, look! There are funny\n" .string "patterns on the ground.$" -Text_17C30D:: @ 817C30D +SixIsland_PatternBush_Text_NashDefeat:: @ 817C30D .string "Super awesome!$" -gUnknown_817C31C:: @ 817C31C +SixIsland_PatternBush_Text_NashPostBattle:: @ 817C31C .string "The funny patterns on the ground…\p" .string "They look like the patterns on my\n" .string "grandpa's clothes.$" -Text_17C373:: @ 817C373 +SixIsland_PatternBush_Text_CordellIntro:: @ 817C373 .string "I bet you think I'm just some guy,\n" .string "don't you, eh?$" -Text_17C3A5:: @ 817C3A5 +SixIsland_PatternBush_Text_CordellDefeat:: @ 817C3A5 .string "I bet you think I'm weak,\n" .string "don't you, eh?$" -gUnknown_817C3CE:: @ 817C3CE +SixIsland_PatternBush_Text_CordellPostBattle:: @ 817C3CE .string "Ayup, you townies come around all\n" .string "so dandy with a hat that flashy…\p" .string "How about giving me that?$" -Text_17C42B:: @ 817C42B +SixIsland_PatternBush_Text_DaliaIntro:: @ 817C42B .string "Take a deep breath.\n" .string "Isn't the air delicious?$" -Text_17C458:: @ 817C458 +SixIsland_PatternBush_Text_DaliaDefeat:: @ 817C458 .string "If you'd like, I can teach you how\n" .string "to breathe properly.$" -gUnknown_817C490:: @ 817C490 +SixIsland_PatternBush_Text_DaliaPostBattle:: @ 817C490 .string "First, exhale.\n" .string "Blow everything out.\p" .string "When you can't exhale anymore,\n" .string "inhale the clean air!\p" .string "Isn't it refreshing?$" -Text_17C4FE:: @ 817C4FE +SixIsland_PatternBush_Text_JoanaIntro:: @ 817C4FE .string "I love BUG POKéMON.\n" .string "That's why I'm here all the time.\p" .string "Am I the only girl like that?$" -Text_17C552:: @ 817C552 +SixIsland_PatternBush_Text_JoanaDefeat:: @ 817C552 .string "I lost, but I'm still laughing.\n" .string "Am I the only girl like that?$" -gUnknown_817C590:: @ 817C590 +SixIsland_PatternBush_Text_JoanaPostBattle:: @ 817C590 .string "I'm going to keep on collecting\n" .string "BUG POKéMON.\p" .string "Am I the only girl like that?$" -Text_17C5DB:: @ 817C5DB +SixIsland_PatternBush_Text_RileyIntro:: @ 817C5DB .string "This is a good spot.\n" .string "I'll pitch my tent here.$" -Text_17C609:: @ 817C609 +SixIsland_PatternBush_Text_RileyDefeat:: @ 817C609 .string "Wimped out…$" -gUnknown_817C615:: @ 817C615 +SixIsland_PatternBush_Text_RileyPostBattle:: @ 817C615 .string "I'm going to observe the night sky\n" .string "here.$" -Text_17C63E:: @ 817C63E +SixIsland_PatternBush_Text_MarcyIntro:: @ 817C63E .string "Oh, yuck!\n" .string "I think a bug stung me!$" -Text_17C660:: @ 817C660 +SixIsland_PatternBush_Text_MarcyDefeat:: @ 817C660 .string "It wasn't a bug.\n" .string "I cut my shin on some grass.$" -gUnknown_817C68E:: @ 817C68E +SixIsland_PatternBush_Text_MarcyPostBattle:: @ 817C68E .string "A little cut like that…\n" .string "A little spit's enough to cure it!$" -Text_17C6C9:: @ 817C6C9 +SixIsland_PatternBush_Text_LaytonIntro:: @ 817C6C9 .string "Have you noticed something odd\n" .string "about these parts?$" -Text_17C6FB:: @ 817C6FB +SixIsland_PatternBush_Text_LaytonDefeat:: @ 817C6FB .string "Have you taken a good look around\n" .string "your feet?$" -gUnknown_817C728:: @ 817C728 +SixIsland_PatternBush_Text_LaytonPostBattle:: @ 817C728 .string "There are places here in PATTERN\n" .string "BUSH where grass won't grow.\p" .string "What could be the cause of such\n" diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json index c866b4299..43a16ad00 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/map.json +++ b/data/maps/SixIsland_PokemonCenter_1F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_PokemonCenter_1F_EventScript_171E05", + "script": "SixIsland_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_PokemonCenter_1F_EventScript_171E0E", + "script": "SixIsland_PokemonCenter_1F_EventScript_Hiker", "flag": "0" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_PokemonCenter_1F_EventScript_171E17", + "script": "SixIsland_PokemonCenter_1F_EventScript_OldMan", "flag": "0" } ], diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index 6bde430ab..72134595e 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -1,3 +1,5 @@ +.equ LOCALID_RIVAL, 2 + SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume @@ -7,73 +9,73 @@ SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A SixIsland_PokemonCenter_1F_OnTransition:: @ 8171D7A setrespawn SPAWN_SIX_ISLAND compare VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0 - call_if_eq EventScript_171D89 + call_if_eq SixIsland_PokemonCenter_1F_EventScript_ShowRival end -EventScript_171D89:: @ 8171D89 +SixIsland_PokemonCenter_1F_EventScript_ShowRival:: @ 8171D89 clearflag FLAG_HIDE_SIX_ISLAND_POKECENTER_RIVAL return SixIsland_PokemonCenter_1F_OnFrame:: @ 8171D8D - map_script_2 VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0, EventScript_171D97 + map_script_2 VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0, SixIsland_PokemonCenter_1F_EventScript_RivalScene .2byte 0 -EventScript_171D97:: @ 8171D97 +SixIsland_PokemonCenter_1F_EventScript_RivalScene:: @ 8171D97 lockall textcolor 0 - applymovement 2, Movement_WalkInPlaceFastestDown + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown waitmovement 0 playbgm MUS_RIVAL1, 0 - applymovement 2, Movement_ExclamationMark + applymovement LOCALID_RIVAL, Movement_ExclamationMark waitmovement 0 - applymovement 2, Movement_Delay48 + applymovement LOCALID_RIVAL, Movement_Delay48 waitmovement 0 delay 25 - applymovement 2, Movement_171DF9 + applymovement LOCALID_RIVAL, SixIsland_PokemonCenter_1F_Movement_RivalApproach waitmovement 0 - msgbox gUnknown_81A3F30 + msgbox SixIsland_PokemonCenter_1F_Text_RivalImpossibleToGetAllMonsAroundHere closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_171E02 - applymovement 2, Movement_171DFE + applymovement OBJ_EVENT_ID_PLAYER, SixIsland_PokemonCenter_1F_Movement_PlayerWatchRivalExit + applymovement LOCALID_RIVAL, SixIsland_PokemonCenter_1F_Movement_RivalExit waitmovement 0 fadedefaultbgm playse SE_KAIDAN delay 35 - removeobject 2 + removeobject LOCALID_RIVAL setvar VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 1 setvar VAR_MAP_SCENE_FOUR_ISLAND, 1 releaseall end -Movement_171DF9:: @ 8171DF9 +SixIsland_PokemonCenter_1F_Movement_RivalApproach:: @ 8171DF9 walk_right walk_right walk_down walk_down step_end -Movement_171DFE:: @ 8171DFE +SixIsland_PokemonCenter_1F_Movement_RivalExit:: @ 8171DFE delay_16 delay_4 walk_down step_end -Movement_171E02:: @ 8171E02 +SixIsland_PokemonCenter_1F_Movement_PlayerWatchRivalExit:: @ 8171E02 walk_left walk_in_place_fastest_right step_end -SixIsland_PokemonCenter_1F_EventScript_171E05:: @ 8171E05 +SixIsland_PokemonCenter_1F_EventScript_Nurse:: @ 8171E05 lock faceplayer call EventScript_PkmnCenterNurse release end -SixIsland_PokemonCenter_1F_EventScript_171E0E:: @ 8171E0E - msgbox gUnknown_81A3E02, MSGBOX_NPC +SixIsland_PokemonCenter_1F_EventScript_Hiker:: @ 8171E0E + msgbox SixIsland_PokemonCenter_1F_Text_SomethingHiddenOnThisIsland, MSGBOX_NPC end -SixIsland_PokemonCenter_1F_EventScript_171E17:: @ 8171E17 - msgbox gUnknown_81A3E87, MSGBOX_NPC +SixIsland_PokemonCenter_1F_EventScript_OldMan:: @ 8171E17 + msgbox SixIsland_PokemonCenter_1F_Text_SomeMonsEvolveByTradingWithHeldItem, MSGBOX_NPC end diff --git a/data/maps/SixIsland_PokemonCenter_1F/text.inc b/data/maps/SixIsland_PokemonCenter_1F/text.inc index a7b4f3336..170a0e011 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/text.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/text.inc @@ -1,11 +1,11 @@ -gUnknown_81A3E02:: @ 81A3E02 +SixIsland_PokemonCenter_1F_Text_SomethingHiddenOnThisIsland:: @ 81A3E02 .string "For ten years, I've searched for\n" .string "RUINS.\p" .string "No, make that twenty years.\p" .string "I get this feeling that there's\n" .string "something hidden on this island.$" -gUnknown_81A3E87:: @ 81A3E87 +SixIsland_PokemonCenter_1F_Text_SomeMonsEvolveByTradingWithHeldItem:: @ 81A3E87 .string "You know of POKéMON that evolve\n" .string "only upon trading, yes?\p" .string "But did you know that there are\n" @@ -13,7 +13,7 @@ gUnknown_81A3E87:: @ 81A3E87 .string "Some POKéMON evolve only when\n" .string "traded while holding specific items.$" -gUnknown_81A3F30:: @ 81A3F30 +SixIsland_PokemonCenter_1F_Text_RivalImpossibleToGetAllMonsAroundHere:: @ 81A3F30 .string "{RIVAL}: Hey, {PLAYER}!\n" .string "How's your POKéDEX filling up?\p" .string "It looks like it's impossible to get\n" diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index f800f0d0d..bb63d3db3 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -31,7 +31,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_RuinValley_EventScript_168B6D", + "script": "SixIsland_RuinValley_EventScript_Scientist", "flag": "FLAG_HIDE_RUIN_VALLEY_SCIENTIST" }, { @@ -44,7 +44,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "SixIsland_RuinValley_EventScript_1AC717", + "script": "SixIsland_RuinValley_EventScript_Stanly", "flag": "0" }, { @@ -57,7 +57,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SixIsland_RuinValley_EventScript_1AC755", + "script": "SixIsland_RuinValley_EventScript_Foster", "flag": "0" }, { @@ -70,7 +70,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SixIsland_RuinValley_EventScript_1AC793", + "script": "SixIsland_RuinValley_EventScript_Larry", "flag": "0" }, { @@ -83,7 +83,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SixIsland_RuinValley_EventScript_1AC7D1", + "script": "SixIsland_RuinValley_EventScript_Daryl", "flag": "0" }, { @@ -96,7 +96,7 @@ "movement_range_y": 3, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SixIsland_RuinValley_EventScript_1AC80F", + "script": "SixIsland_RuinValley_EventScript_Hector", "flag": "0" }, { @@ -259,7 +259,7 @@ "x": 24, "y": 24, "elevation": 3, - "script": "SixIsland_RuinValley_EventScript_168B94" + "script": "SixIsland_RuinValley_EventScript_DottedHoleDoor" } ] } diff --git a/data/maps/SixIsland_RuinValley/scripts.inc b/data/maps/SixIsland_RuinValley/scripts.inc index 9dadf5525..48888b357 100644 --- a/data/maps/SixIsland_RuinValley/scripts.inc +++ b/data/maps/SixIsland_RuinValley/scripts.inc @@ -3,42 +3,42 @@ SixIsland_RuinValley_MapScripts:: @ 8168B53 .byte 0 SixIsland_RuinValley_OnLoad:: @ 8168B59 - call_if_set FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE, EventScript_168B63 + call_if_set FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE, SixIsland_RuinValley_EventScript_OpenDottedHoleDoor end -EventScript_168B63:: @ 8168B63 - setmetatile 24, 24, 856, 0 +SixIsland_RuinValley_EventScript_OpenDottedHoleDoor:: @ 8168B63 + setmetatile 24, 24, METATILE_SeviiIslands67_DottedHoleDoor_Open, 0 return -SixIsland_RuinValley_EventScript_168B6D:: @ 8168B6D +SixIsland_RuinValley_EventScript_Scientist:: @ 8168B6D lock - msgbox gUnknown_818BD47 + msgbox SixIsland_RuinValley_Text_CantFigureOutHowToGetInside applymovement 1, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_818BD7A + msgbox SixIsland_RuinValley_Text_IFoundThisPlace applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end -SixIsland_RuinValley_EventScript_168B94:: @ 8168B94 +SixIsland_RuinValley_EventScript_DottedHoleDoor:: @ 8168B94 lockall - goto_if_set FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE, EventScript_168BC1 - msgbox gUnknown_818BDC0, MSGBOX_YESNO + goto_if_set FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE, SixIsland_RuinValley_EventScript_DottedHoleDoorOpen + msgbox SixIsland_RuinValley_Text_CheckDoorMoreThoroughly, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_168BCB - msgbox gUnknown_818BE11 + goto_if_eq SixIsland_RuinValley_EventScript_IgnoreDottedHoleDoor + msgbox SixIsland_RuinValley_Text_SeveralDotsOnTheDoor braillemessage Braille_Text_Cut waitbuttonpress releaseall end -EventScript_168BC1:: @ 8168BC1 - msgbox gUnknown_818BE4B +SixIsland_RuinValley_EventScript_DottedHoleDoorOpen:: @ 8168BC1 + msgbox SixIsland_RuinValley_Text_DoorIsOpen releaseall end -EventScript_168BCB:: @ 8168BCB - msgbox gUnknown_818BDF9 +SixIsland_RuinValley_EventScript_IgnoreDottedHoleDoor:: @ 8168BCB + msgbox SixIsland_RuinValley_Text_LeftDoorAlone releaseall end diff --git a/data/maps/SixIsland_RuinValley/text.inc b/data/maps/SixIsland_RuinValley/text.inc index 14cee7a88..63524bb19 100644 --- a/data/maps/SixIsland_RuinValley/text.inc +++ b/data/maps/SixIsland_RuinValley/text.inc @@ -1,23 +1,87 @@ -gUnknown_818BD47:: @ 818BD47 +SixIsland_RuinValley_Text_CantFigureOutHowToGetInside:: @ 818BD47 .string "I can't figure out how I'm supposed\n" .string "to get inside.$" -gUnknown_818BD7A:: @ 818BD7A +SixIsland_RuinValley_Text_IFoundThisPlace:: @ 818BD7A .string "Let me tell you, I found this\n" .string "place.\p" .string "Don't look so envious, will you?$" -gUnknown_818BDC0:: @ 818BDC0 +SixIsland_RuinValley_Text_CheckDoorMoreThoroughly:: @ 818BDC0 .string "The door doesn't budge at all.\n" .string "Check it more thoroughly?$" -gUnknown_818BDF9:: @ 818BDF9 +SixIsland_RuinValley_Text_LeftDoorAlone:: @ 818BDF9 .string "{PLAYER} left the door alone.$" -gUnknown_818BE11:: @ 818BE11 +SixIsland_RuinValley_Text_SeveralDotsOnTheDoor:: @ 818BE11 .string "On closer inspection, there are\n" .string "several dots on the door…$" -gUnknown_818BE4B:: @ 818BE4B +SixIsland_RuinValley_Text_DoorIsOpen:: @ 818BE4B .string "The door is open.$" +SixIsland_RuinValley_Text_StanlyIntro:: @ 818BE5D + .string "There appear to be many secrets\n" + .string "still unsolved in this world.$" + +SixIsland_RuinValley_Text_StanlyDefeat:: @ 818BE9B + .string "Hmm…$" + +SixIsland_RuinValley_Text_StanlyPostBattle:: @ 818BEA0 + .string "I suggest to you that you, too,\n" + .string "give a thought to the secrets and\l" + .string "mysteries of our world once a day.$" + +SixIsland_RuinValley_Text_FosterIntro:: @ 818BF05 + .string "I'm curious, what compelled you to\n" + .string "come here?$" + +SixIsland_RuinValley_Text_FosterDefeat:: @ 818BF33 + .string "It's been so long since I battled,\n" + .string "my instincts are off.$" + +SixIsland_RuinValley_Text_FosterPostBattle:: @ 818BF6C + .string "There are several ruins on the\n" + .string "SEVII ISLANDS.\p" + .string "The majority of them date back\n" + .string "a long way.$" + +SixIsland_RuinValley_Text_LarryIntro:: @ 818BFC5 + .string "It's been said that there are\n" + .string "mysterious stones on this island.\p" + .string "I suspect it has something to do\n" + .string "with the ruins here.$" + +SixIsland_RuinValley_Text_LarryDefeat:: @ 818C03B + .string "Oh, interesting.$" + +SixIsland_RuinValley_Text_LarryPostBattle:: @ 818C04C + .string "Those ruins over there…\p" + .string "I haven't had any luck in finding\n" + .string "how I can get inside.$" + +SixIsland_RuinValley_Text_DarylIntro:: @ 818C09C + .string "A battle with you, so high up!$" + +SixIsland_RuinValley_Text_DarylDefeat:: @ 818C0BB + .string "Oh, the heartbreak of losing so\n" + .string "easily to you!$" + +SixIsland_RuinValley_Text_DarylPostBattle:: @ 818C0EA + .string "Experience the joy of climbing!$" + +SixIsland_RuinValley_Text_HectorIntro:: @ 818C10A + .string "I'm pretty familiar with the land\n" + .string "around these parts.$" + +SixIsland_RuinValley_Text_HectorDefeat:: @ 818C140 + .string "You don't need to be so pushy.\n" + .string "I'll be happy to tell you.$" + +SixIsland_RuinValley_Text_HectorPostBattle:: @ 818C17A + .string "The door to the ruins…\n" + .string "It has these strange patterns\l" + .string "engraved on the outside.\p" + .string "I don't know what they mean,\n" + .string "though.$" diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json index 97e30aa5c..0aefb4478 100644 --- a/data/maps/SixIsland_WaterPath/map.json +++ b/data/maps/SixIsland_WaterPath/map.json @@ -41,7 +41,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SixIsland_WaterPath_EventScript_1AC555", + "script": "SixIsland_WaterPath_EventScript_Rose", "flag": "0" }, { @@ -54,7 +54,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SixIsland_WaterPath_EventScript_1AC593", + "script": "SixIsland_WaterPath_EventScript_Edward", "flag": "0" }, { @@ -67,7 +67,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "SixIsland_WaterPath_EventScript_1AC5D1", + "script": "SixIsland_WaterPath_EventScript_Samir", "flag": "0" }, { @@ -80,7 +80,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SixIsland_WaterPath_EventScript_1AC60F", + "script": "SixIsland_WaterPath_EventScript_Denise", "flag": "0" }, { @@ -93,7 +93,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SixIsland_WaterPath_EventScript_1AC64D", + "script": "SixIsland_WaterPath_EventScript_Miu", "flag": "0" }, { @@ -106,7 +106,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SixIsland_WaterPath_EventScript_1AC693", + "script": "SixIsland_WaterPath_EventScript_Mia", "flag": "0" }, { @@ -119,7 +119,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "SixIsland_WaterPath_EventScript_1AC6D9", + "script": "SixIsland_WaterPath_EventScript_Earl", "flag": "0" }, { @@ -172,7 +172,7 @@ "x": 8, "y": 14, "elevation": 0, - "script": "SixIsland_WaterPath_EventScript_168B41" + "script": "SixIsland_WaterPath_EventScript_HornWantedSign" }, { "type": "hidden_item", @@ -209,7 +209,7 @@ "x": 12, "y": 54, "elevation": 0, - "script": "SixIsland_WaterPath_EventScript_168B4A" + "script": "SixIsland_WaterPath_EventScript_RouteSign" } ] } diff --git a/data/maps/SixIsland_WaterPath/scripts.inc b/data/maps/SixIsland_WaterPath/scripts.inc index 27f49d4aa..0df3fab4b 100644 --- a/data/maps/SixIsland_WaterPath/scripts.inc +++ b/data/maps/SixIsland_WaterPath/scripts.inc @@ -1,10 +1,10 @@ SixIsland_WaterPath_MapScripts:: @ 8168B40 .byte 0 -SixIsland_WaterPath_EventScript_168B41:: @ 8168B41 - msgbox gUnknown_818BD0C, MSGBOX_SIGN +SixIsland_WaterPath_EventScript_HornWantedSign:: @ 8168B41 + msgbox SixIsland_WaterPath_Text_WantedUltimateHorn, MSGBOX_SIGN end -SixIsland_WaterPath_EventScript_168B4A:: @ 8168B4A - msgbox gUnknown_818BD27, MSGBOX_SIGN +SixIsland_WaterPath_EventScript_RouteSign:: @ 8168B4A + msgbox SixIsland_WaterPath_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/SixIsland_WaterPath/text.inc b/data/maps/SixIsland_WaterPath/text.inc index 70a8ce017..7ee28923a 100644 --- a/data/maps/SixIsland_WaterPath/text.inc +++ b/data/maps/SixIsland_WaterPath/text.inc @@ -1,102 +1,102 @@ -Text_18B896:: @ 818B896 +SixIsland_WaterPath_Text_RoseIntro:: @ 818B896 .string "I let a pleasant breeze lead me\n" .string "all the way here.$" -Text_18B8C8:: @ 818B8C8 +SixIsland_WaterPath_Text_RoseDefeat:: @ 818B8C8 .string "Giggle… You're so cute when you're\n" .string "determined.$" -Text_18B8F7:: @ 818B8F7 +SixIsland_WaterPath_Text_RosePostBattle:: @ 818B8F7 .string "I want to go to the woods over\n" .string "there, but…\p" .string "There are lots of BUG POKéMON.\n" .string "They scare me a little.$" -Text_18B959:: @ 818B959 +SixIsland_WaterPath_Text_EdwardIntro:: @ 818B959 .string "I'm practicing in secret so no one\n" .string "can see me.$" -Text_18B988:: @ 818B988 +SixIsland_WaterPath_Text_EdwardDefeat:: @ 818B988 .string "Nobody saw me losing, right?$" -Text_18B9A5:: @ 818B9A5 +SixIsland_WaterPath_Text_EdwardPostBattle:: @ 818B9A5 .string "As a performer, I don't want people\n" .string "to know about the effort I put in.$" -Text_18B9EC:: @ 818B9EC +SixIsland_WaterPath_Text_SamirIntro:: @ 818B9EC .string "What, you're suggesting that you're\n" .string "sick of seeing SWIMMERS like me?\p" .string "Aww, don't be hatin'!$" -Text_18BA47:: @ 818BA47 +SixIsland_WaterPath_Text_SamirDefeat:: @ 818BA47 .string "Oh, no, no, no.$" -Text_18BA57:: @ 818BA57 +SixIsland_WaterPath_Text_SamirPostBattle:: @ 818BA57 .string "I couldn't lift the stigma of being\n" .string "a SWIMMER…$" -Text_18BA86:: @ 818BA86 +SixIsland_WaterPath_Text_DeniseIntro:: @ 818BA86 .string "My boyfriend's always busy, so I\n" .string "come swimming by myself.$" -Text_18BAC0:: @ 818BAC0 +SixIsland_WaterPath_Text_DeniseDefeat:: @ 818BAC0 .string "Awww, I knew this would happen!$" -Text_18BAE0:: @ 818BAE0 +SixIsland_WaterPath_Text_DenisePostBattle:: @ 818BAE0 .string "When I can't be with my boyfriend,\n" .string "I spend time with the POKéMON he\l" .string "gave me.$" -Text_18BB2D:: @ 818BB2D +SixIsland_WaterPath_Text_EarlIntro:: @ 818BB2D .string "Tell me, where are the mountains\n" .string "around these parts?$" -Text_18BB62:: @ 818BB62 +SixIsland_WaterPath_Text_EarlDefeat:: @ 818BB62 .string "I lost my way while I was busy\n" .string "battling!$" -Text_18BB8B:: @ 818BB8B +SixIsland_WaterPath_Text_EarlPostBattle:: @ 818BB8B .string "Aren't there any mountains around\n" .string "these parts?$" -Text_18BBBA:: @ 818BBBA +SixIsland_WaterPath_Text_MiuIntro:: @ 818BBBA .string "MIU: Hello, POKéMON!\n" .string "It's time to play!$" -Text_18BBE2:: @ 818BBE2 +SixIsland_WaterPath_Text_MiuDefeat:: @ 818BBE2 .string "MIU: Oh, no!\n" .string "Mommy!$" -Text_18BBF6:: @ 818BBF6 +SixIsland_WaterPath_Text_MiuPostBattle:: @ 818BBF6 .string "MIU: It makes me all sad inside\n" .string "when we lose…$" -Text_18BC24:: @ 818BC24 +SixIsland_WaterPath_Text_MiuNotEnoughMons:: @ 818BC24 .string "MIU: MIA and I are TWINS.\n" .string "We want to battle together.$" -Text_18BC5A:: @ 818BC5A +SixIsland_WaterPath_Text_MiaIntro:: @ 818BC5A .string "MIA: Hello, POKéMON!\n" .string "It's time to battle!$" -Text_18BC84:: @ 818BC84 +SixIsland_WaterPath_Text_MiaDefeat:: @ 818BC84 .string "MIA: You're mean!\n" .string "You're bad for winning!$" -Text_18BCAE:: @ 818BCAE +SixIsland_WaterPath_Text_MiaPostBattle:: @ 818BCAE .string "MIA: Ohh…\n" .string "I'm sorry, my POKéMON…$" -Text_18BCCF:: @ 818BCCF +SixIsland_WaterPath_Text_MiaNotEnoughMons:: @ 818BCCF .string "MIA: Oh, you only have one\n" .string "POKéMON?\p" .string "Don't you feel lonesome?$" -gUnknown_818BD0C:: @ 818BD0C +SixIsland_WaterPath_Text_WantedUltimateHorn:: @ 818BD0C .string "Wanted!\n" .string "The Ultimate Horn!$" -gUnknown_818BD27:: @ 818BD27 +SixIsland_WaterPath_Text_RouteSign:: @ 818BD27 .string "WATER PATH\n" .string "Leads to RUIN VALLEY$" diff --git a/data/maps/SixIsland_WaterPath_House1/map.json b/data/maps/SixIsland_WaterPath_House1/map.json index 84a650469..cb9a39991 100644 --- a/data/maps/SixIsland_WaterPath_House1/map.json +++ b/data/maps/SixIsland_WaterPath_House1/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_WaterPath_House1_EventScript_17206D", + "script": "SixIsland_WaterPath_House1_EventScript_Beauty", "flag": "0" } ], @@ -45,7 +45,7 @@ "x": 9, "y": 1, "elevation": 0, - "script": "SixIsland_WaterPath_House1_EventScript_172157" + "script": "SixIsland_WaterPath_House1_EventScript_SizeRecord" } ] } diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc index a8efb4608..173179ac3 100644 --- a/data/maps/SixIsland_WaterPath_House1/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc @@ -1,84 +1,84 @@ SixIsland_WaterPath_House1_MapScripts:: @ 817206C .byte 0 -SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D +SixIsland_WaterPath_House1_EventScript_Beauty:: @ 817206D lock faceplayer goto_if_questlog EventScript_ReleaseEnd special sub_8112364 setvar VAR_0x8004, SPECIES_HERACROSS specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies - compare VAR_RESULT, 0 - goto_if_eq EventScript_1720E5 + compare VAR_RESULT, FALSE + goto_if_eq SixIsland_WaterPath_House1_EventScript_NoHeracrossInParty special GetHeracrossSizeRecordInfo - msgbox gUnknown_81A4A3F + msgbox SixIsland_WaterPath_House1_Text_MayIMeasureHeracross special Special_ChooseMonFromParty waitstate copyvar VAR_RESULT, VAR_0x8004 - compare VAR_RESULT, 6 - goto_if_ge EventScript_1720EF + compare VAR_RESULT, PARTY_SIZE + goto_if_ge SixIsland_WaterPath_House1_EventScript_DontShowMon special CompareHeracrossSize compare VAR_RESULT, 1 - goto_if_eq EventScript_1720F1 + goto_if_eq SixIsland_WaterPath_House1_EventScript_ShownNonHeracross compare VAR_RESULT, 2 - goto_if_eq EventScript_1720FB + goto_if_eq SixIsland_WaterPath_House1_EventScript_ShownSmallHeracross compare VAR_RESULT, 3 - goto_if_eq EventScript_172121 + goto_if_eq SixIsland_WaterPath_House1_EventScript_ShownBigHeracross compare VAR_RESULT, 4 - goto_if_eq EventScript_17210E + goto_if_eq SixIsland_WaterPath_House1_EventScript_ShownTiedHeracross release end -EventScript_1720E5:: @ 81720E5 - msgbox gUnknown_81A49E9 +SixIsland_WaterPath_House1_EventScript_NoHeracrossInParty:: @ 81720E5 + msgbox SixIsland_WaterPath_House1_Text_LoveItNeedItHeracross release end -EventScript_1720EF:: @ 81720EF +SixIsland_WaterPath_House1_EventScript_DontShowMon:: @ 81720EF release end -EventScript_1720F1:: @ 81720F1 - msgbox gUnknown_81A4BEF +SixIsland_WaterPath_House1_EventScript_ShownNonHeracross:: @ 81720F1 + msgbox SixIsland_WaterPath_House1_Text_ThisWontDo release end -EventScript_1720FB:: @ 81720FB - goto_if_unset FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, EventScript_172121 - msgbox gUnknown_81A4B7A +SixIsland_WaterPath_House1_EventScript_ShownSmallHeracross:: @ 81720FB + goto_if_unset FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, SixIsland_WaterPath_House1_EventScript_ShownBigHeracross + msgbox SixIsland_WaterPath_House1_Text_ItsXInchesYInchesWasBiggest release end -EventScript_17210E:: @ 817210E - goto_if_unset FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, EventScript_172121 - msgbox gUnknown_81A4B39 +SixIsland_WaterPath_House1_EventScript_ShownTiedHeracross:: @ 817210E + goto_if_unset FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, SixIsland_WaterPath_House1_EventScript_ShownBigHeracross + msgbox SixIsland_WaterPath_House1_Text_ItsXInchesSameAsBefore release end -EventScript_172121:: @ 8172121 +SixIsland_WaterPath_House1_EventScript_ShownBigHeracross:: @ 8172121 setflag FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1 - msgbox gUnknown_81A4A88 + msgbox SixIsland_WaterPath_House1_Text_ItsXInchesDeserveReward giveitem ITEM_NEST_BALL - compare VAR_RESULT, 0 - goto_if_eq EventScript_17214D - msgbox gUnknown_81A4AD9 + compare VAR_RESULT, FALSE + goto_if_eq SixIsland_WaterPath_House1_EventScript_NoRoomForNestBall + msgbox SixIsland_WaterPath_House1_Text_WantToSeeBiggerOne release end -EventScript_17214D:: @ 817214D - msgbox gUnknown_81A4C47 +SixIsland_WaterPath_House1_EventScript_NoRoomForNestBall:: @ 817214D + msgbox SixIsland_WaterPath_House1_Text_YourBagIsFull release end -SixIsland_WaterPath_House1_EventScript_172157:: @ 8172157 +SixIsland_WaterPath_House1_EventScript_SizeRecord:: @ 8172157 lockall - goto_if_set FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, EventScript_17216B - msgbox gUnknown_81A4CB9 + goto_if_set FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, SixIsland_WaterPath_House1_EventScript_SizeRecordNonEmpty + msgbox SixIsland_WaterPath_House1_Text_BlankChartOfSomeSort releaseall end -EventScript_17216B:: @ 817216B +SixIsland_WaterPath_House1_EventScript_SizeRecordNonEmpty:: @ 817216B special GetHeracrossSizeRecordInfo - msgbox gUnknown_81A4C6E + msgbox SixIsland_WaterPath_House1_Text_BiggestHeracrossIsXInches releaseall end diff --git a/data/maps/SixIsland_WaterPath_House1/text.inc b/data/maps/SixIsland_WaterPath_House1/text.inc index 4c32a80ff..a7e61b961 100644 --- a/data/maps/SixIsland_WaterPath_House1/text.inc +++ b/data/maps/SixIsland_WaterPath_House1/text.inc @@ -1,104 +1,50 @@ -Text_UltimateMoveThatMon:: @ 81A46C6 - .string "I perfected the ultimate move of\n" - .string "its type…\p" - .string "But will no one take it for\n" - .string "future use?\p" - .string "…Hm? Hmmm!\p" - .string "Y-you…\n" - .string "Th-that {STR_VAR_1}…$" - -Text_JustMistaken:: @ 81A4737 - .string "…No…\n" - .string "I was just mistaken.$" - -Text_AllowMeToTeachMonUltimateMove:: @ 81A4751 - .string "Oh! This is the one!\n" - .string "This is the POKéMON!\p" - .string "This {STR_VAR_1} is worthy of\n" - .string "learning my ultimate move!\p" - .string "Will you allow it?\p" - .string "Will you allow your {STR_VAR_1} to\n" - .string "learn my {STR_VAR_2}?$" - -Text_YouRejectIt:: @ 81A47E5 - .string "Gaah! You reject it?\n" - .string "No, I won't be dissuaded!$" - -Text_LetMeConferUltimateMove:: @ 81A4814 - .string "You will allow it?\p" - .string "Then, let me confer my ultimate\n" - .string "{STR_VAR_2} on your {STR_VAR_1}.\p" - .string "Ggggrah-awooo!$" - -Text_TaughtMove:: @ 81A4865 - .string "Gasp, gasp, gasp…\p" - .string "I didn't think I could teach that\n" - .string "move while I still lived…$" - -Text_MakeBestUseOfMove:: @ 81A48B3 - .string "I implore you to make the best\n" - .string "use of that move and gain power!$" - -Text_PassedOnEverythingIKnow:: @ 81A48F3 - .string "Gasp, gasp, gasp…\p" - .string "I have no regrets now.\n" - .string "I've passed on everything I know.\p" - .string "Now I can live out my life knowing\n" - .string "my work is done.$" - -Text_FeelRejuvenated:: @ 81A4972 - .string "After I passed on my knowledge to\n" - .string "you, I felt so much relief.\p" - .string "In fact, I feel rejuvenated,\n" - .string "as if I were younger again!$" - -gUnknown_81A49E9:: @ 81A49E9 +SixIsland_WaterPath_House1_Text_LoveItNeedItHeracross:: @ 81A49E9 .string "Hera, hera, HERACROSS!\n" .string "Big and shiny, it's the bug boss!\l" .string "Love it, need it, HERACROSS!$" -gUnknown_81A4A3F:: @ 81A4A3F +SixIsland_WaterPath_House1_Text_MayIMeasureHeracross:: @ 81A4A3F .string "Eeeeek!\n" .string "That's a HERACROSS!\p" .string "Please, please, may I measure how\n" .string "big it is?$" -gUnknown_81A4A88:: @ 81A4A88 +SixIsland_WaterPath_House1_Text_ItsXInchesDeserveReward:: @ 81A4A88 .string "Eeeek, it's {STR_VAR_2} inches!\n" .string "I've never seen anything like this!\l" .string "You deserve a reward!$" -gUnknown_81A4AD9:: @ 81A4AD9 +SixIsland_WaterPath_House1_Text_WantToSeeBiggerOne:: @ 81A4AD9 .string "I want to see a much, much bigger\n" .string "HERACROSS than that one.\p" .string "Oh, how I adore them, big\n" .string "HERACROSS!$" -gUnknown_81A4B39:: @ 81A4B39 +SixIsland_WaterPath_House1_Text_ItsXInchesSameAsBefore:: @ 81A4B39 .string "Huh? This {STR_VAR_2}-inch measurement…\n" .string "Oh, boo! It's the same as before.$" -gUnknown_81A4B7A:: @ 81A4B7A +SixIsland_WaterPath_House1_Text_ItsXInchesYInchesWasBiggest:: @ 81A4B7A .string "Oh, it's just {STR_VAR_2} inches.\n" .string "The HERACROSS before was bigger.\p" .string "It was {STR_VAR_3} inches, the biggest\n" .string "HERACROSS you've brought me.$" -gUnknown_81A4BEF:: @ 81A4BEF +SixIsland_WaterPath_House1_Text_ThisWontDo:: @ 81A4BEF .string "Oh, no! This won't do!\p" .string "HERACROSS looks much more macho\n" .string "and cool, and has a lovely horn!$" -gUnknown_81A4C47:: @ 81A4C47 +SixIsland_WaterPath_House1_Text_YourBagIsFull:: @ 81A4C47 .string "Your BAG is full.\n" .string "My reward won't fit.$" -gUnknown_81A4C6E:: @ 81A4C6E +SixIsland_WaterPath_House1_Text_BiggestHeracrossIsXInches:: @ 81A4C6E .string "The biggest HERACROSS that I have\n" .string "ever seen measured so far is:\p" .string "{STR_VAR_3} inches!$" -gUnknown_81A4CB9:: @ 81A4CB9 +SixIsland_WaterPath_House1_Text_BlankChartOfSomeSort:: @ 81A4CB9 .string "It's a blank chart of some sort.\p" .string "It has spaces for writing in\n" .string "records of some kind.$" diff --git a/data/maps/SixIsland_WaterPath_House2/map.json b/data/maps/SixIsland_WaterPath_House2/map.json index 9dcdbd976..200475e2d 100644 --- a/data/maps/SixIsland_WaterPath_House2/map.json +++ b/data/maps/SixIsland_WaterPath_House2/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_WaterPath_House2_EventScript_172179", + "script": "SixIsland_WaterPath_House2_EventScript_Man", "flag": "0" } ], diff --git a/data/maps/SixIsland_WaterPath_House2/scripts.inc b/data/maps/SixIsland_WaterPath_House2/scripts.inc index 4cb8e9827..937fdd178 100644 --- a/data/maps/SixIsland_WaterPath_House2/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House2/scripts.inc @@ -1,6 +1,6 @@ SixIsland_WaterPath_House2_MapScripts:: @ 8172178 .byte 0 -SixIsland_WaterPath_House2_EventScript_172179:: @ 8172179 - msgbox gUnknown_81A4D0D, MSGBOX_NPC +SixIsland_WaterPath_House2_EventScript_Man:: @ 8172179 + msgbox SixIsland_WaterPath_House2_Text_MyNeighborMeasuredMe, MSGBOX_NPC end diff --git a/data/maps/SixIsland_WaterPath_House2/text.inc b/data/maps/SixIsland_WaterPath_House2/text.inc index 03c8e187b..19dd60965 100644 --- a/data/maps/SixIsland_WaterPath_House2/text.inc +++ b/data/maps/SixIsland_WaterPath_House2/text.inc @@ -1,4 +1,4 @@ -gUnknown_81A4D0D:: @ 81A4D0D +SixIsland_WaterPath_House2_Text_MyNeighborMeasuredMe:: @ 81A4D0D .string "My height is 67.0 inches on the\n" .string "button.\p" .string "I know it is this precisely because\n" diff --git a/data/maps/TwoIsland_CapeBrink_House/text.inc b/data/maps/TwoIsland_CapeBrink_House/text.inc new file mode 100644 index 000000000..4b691163c --- /dev/null +++ b/data/maps/TwoIsland_CapeBrink_House/text.inc @@ -0,0 +1,53 @@ +Text_UltimateMoveThatMon:: @ 81A46C6 + .string "I perfected the ultimate move of\n" + .string "its type…\p" + .string "But will no one take it for\n" + .string "future use?\p" + .string "…Hm? Hmmm!\p" + .string "Y-you…\n" + .string "Th-that {STR_VAR_1}…$" + +Text_JustMistaken:: @ 81A4737 + .string "…No…\n" + .string "I was just mistaken.$" + +Text_AllowMeToTeachMonUltimateMove:: @ 81A4751 + .string "Oh! This is the one!\n" + .string "This is the POKéMON!\p" + .string "This {STR_VAR_1} is worthy of\n" + .string "learning my ultimate move!\p" + .string "Will you allow it?\p" + .string "Will you allow your {STR_VAR_1} to\n" + .string "learn my {STR_VAR_2}?$" + +Text_YouRejectIt:: @ 81A47E5 + .string "Gaah! You reject it?\n" + .string "No, I won't be dissuaded!$" + +Text_LetMeConferUltimateMove:: @ 81A4814 + .string "You will allow it?\p" + .string "Then, let me confer my ultimate\n" + .string "{STR_VAR_2} on your {STR_VAR_1}.\p" + .string "Ggggrah-awooo!$" + +Text_TaughtMove:: @ 81A4865 + .string "Gasp, gasp, gasp…\p" + .string "I didn't think I could teach that\n" + .string "move while I still lived…$" + +Text_MakeBestUseOfMove:: @ 81A48B3 + .string "I implore you to make the best\n" + .string "use of that move and gain power!$" + +Text_PassedOnEverythingIKnow:: @ 81A48F3 + .string "Gasp, gasp, gasp…\p" + .string "I have no regrets now.\n" + .string "I've passed on everything I know.\p" + .string "Now I can live out my life knowing\n" + .string "my work is done.$" + +Text_FeelRejuvenated:: @ 81A4972 + .string "After I passed on my knowledge to\n" + .string "you, I felt so much relief.\p" + .string "In fact, I feel rejuvenated,\n" + .string "as if I were younger again!$" diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index c844cc115..b53630361 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -195,11 +195,11 @@ SevenIsland_PokemonCenter_1F_EventScript_1ACFD4:: @ 81ACFD4 release end -SixIsland_Mart_EventScript_1ACFEF:: @ 81ACFEF +SixIsland_Mart_EventScript_OldWoman:: @ 81ACFEF lock faceplayer famechecker FAMECHECKER_AGATHA, 5 - msgbox Text_1A41CA + msgbox SixIsland_Mart_Text_AgathaOldestEverEliteFourMember release end diff --git a/data/scripts/trainers.inc b/data/scripts/trainers.inc index eaa76b1fa..1508f52b2 100644 --- a/data/scripts/trainers.inc +++ b/data/scripts/trainers.inc @@ -2546,238 +2546,238 @@ EventScript_1AC3BA:: @ 81AC3BA msgbox Text_18AFF2, MSGBOX_AUTOCLOSE end -SixIsland_OutcastIsland_EventScript_1AC3D1:: @ 81AC3D1 - trainerbattle_single TRAINER_FISHERMAN_TYLOR, Text_18B400, Text_18B43B +SixIsland_OutcastIsland_EventScript_Tylor:: @ 81AC3D1 + trainerbattle_single TRAINER_FISHERMAN_TYLOR, SixIsland_OutcastIsland_Text_TylorIntro, SixIsland_OutcastIsland_Text_TylorDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC3F8 - msgbox Text_18B451, MSGBOX_AUTOCLOSE + goto_if_eq SixIsland_OutcastIsland_EventScript_TylorRematch + msgbox SixIsland_OutcastIsland_Text_TylorPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC3F8:: @ 81AC3F8 - trainerbattle_rematch TRAINER_FISHERMAN_TYLOR, Text_1C3ED0, Text_18B43B - msgbox Text_18B451, MSGBOX_AUTOCLOSE +SixIsland_OutcastIsland_EventScript_TylorRematch:: @ 81AC3F8 + trainerbattle_rematch TRAINER_FISHERMAN_TYLOR, SixIsland_OutcastIsland_Text_TylorRematchIntro, SixIsland_OutcastIsland_Text_TylorDefeat + msgbox SixIsland_OutcastIsland_Text_TylorPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_OutcastIsland_EventScript_1AC40F:: @ 81AC40F - trainerbattle_single TRAINER_SWIMMER_MALE_MYMO, Text_18B48F, Text_18B4C5 +SixIsland_OutcastIsland_EventScript_Mymo:: @ 81AC40F + trainerbattle_single TRAINER_SWIMMER_MALE_MYMO, SixIsland_OutcastIsland_Text_MymoIntro, SixIsland_OutcastIsland_Text_MymoDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC436 - msgbox Text_18B4D1, MSGBOX_AUTOCLOSE + goto_if_eq SixIsland_OutcastIsland_EventScript_MymoRematch + msgbox SixIsland_OutcastIsland_Text_MymoPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC436:: @ 81AC436 - trainerbattle_rematch TRAINER_SWIMMER_MALE_MYMO, Text_1C3F11, Text_18B4C5 - msgbox Text_18B4D1, MSGBOX_AUTOCLOSE +SixIsland_OutcastIsland_EventScript_MymoRematch:: @ 81AC436 + trainerbattle_rematch TRAINER_SWIMMER_MALE_MYMO, SixIsland_OutcastIsland_Text_MymoRematchIntro, SixIsland_OutcastIsland_Text_MymoDefeat + msgbox SixIsland_OutcastIsland_Text_MymoPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_OutcastIsland_EventScript_1AC44D:: @ 81AC44D - trainerbattle_single TRAINER_SWIMMER_FEMALE_NICOLE, Text_18B4FA, Text_18B539 +SixIsland_OutcastIsland_EventScript_Nicole:: @ 81AC44D + trainerbattle_single TRAINER_SWIMMER_FEMALE_NICOLE, SixIsland_OutcastIsland_Text_NicoleIntro, SixIsland_OutcastIsland_Text_NicoleDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC474 - msgbox Text_18B573, MSGBOX_AUTOCLOSE + goto_if_eq SixIsland_OutcastIsland_EventScript_NicoleRematch + msgbox SixIsland_OutcastIsland_Text_NicolePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC474:: @ 81AC474 - trainerbattle_rematch TRAINER_SWIMMER_FEMALE_NICOLE, Text_1C3F51, Text_18B539 - msgbox Text_18B573, MSGBOX_AUTOCLOSE +SixIsland_OutcastIsland_EventScript_NicoleRematch:: @ 81AC474 + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_NICOLE, SixIsland_OutcastIsland_Text_NicoleRematchIntro, SixIsland_OutcastIsland_Text_NicoleDefeat + msgbox SixIsland_OutcastIsland_Text_NicolePostBattle, MSGBOX_AUTOCLOSE end -SixIsland_OutcastIsland_EventScript_1AC48B:: @ 81AC48B - trainerbattle_double TRAINER_SIS_AND_BRO_AVA_GEB, Text_18B5C8, Text_18B5F4, Text_18B660 +SixIsland_OutcastIsland_EventScript_Ava:: @ 81AC48B + trainerbattle_double TRAINER_SIS_AND_BRO_AVA_GEB, SixIsland_OutcastIsland_Text_AvaIntro, SixIsland_OutcastIsland_Text_AvaDefeat, SixIsland_OutcastIsland_Text_AvaNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC4B6 - msgbox Text_18B62E, MSGBOX_AUTOCLOSE + goto_if_eq SixIsland_OutcastIsland_EventScript_AvaRematch + msgbox SixIsland_OutcastIsland_Text_AvaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC4B6:: @ 81AC4B6 - trainerbattle_rematch_double TRAINER_SIS_AND_BRO_AVA_GEB, Text_1C3F7B, Text_18B5F4, Text_18B660 - msgbox Text_18B62E, MSGBOX_AUTOCLOSE +SixIsland_OutcastIsland_EventScript_AvaRematch:: @ 81AC4B6 + trainerbattle_rematch_double TRAINER_SIS_AND_BRO_AVA_GEB, SixIsland_OutcastIsland_Text_AvaRematchIntro, SixIsland_OutcastIsland_Text_AvaDefeat, SixIsland_OutcastIsland_Text_AvaNotEnoughMons + msgbox SixIsland_OutcastIsland_Text_AvaPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_OutcastIsland_EventScript_1AC4D1:: @ 81AC4D1 - trainerbattle_double TRAINER_SIS_AND_BRO_AVA_GEB, Text_18B6C1, Text_18B6EF, Text_18B762 +SixIsland_OutcastIsland_EventScript_Geb:: @ 81AC4D1 + trainerbattle_double TRAINER_SIS_AND_BRO_AVA_GEB, SixIsland_OutcastIsland_Text_GebIntro, SixIsland_OutcastIsland_Text_GebDefeat, SixIsland_OutcastIsland_Text_GebNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC4FC - msgbox Text_18B720, MSGBOX_AUTOCLOSE + goto_if_eq SixIsland_OutcastIsland_EventScript_GebRematch + msgbox SixIsland_OutcastIsland_Text_GebPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC4FC:: @ 81AC4FC - trainerbattle_rematch_double TRAINER_SIS_AND_BRO_AVA_GEB, Text_1C3FB3, Text_18B6EF, Text_18B762 - msgbox Text_18B720, MSGBOX_AUTOCLOSE +SixIsland_OutcastIsland_EventScript_GebRematch:: @ 81AC4FC + trainerbattle_rematch_double TRAINER_SIS_AND_BRO_AVA_GEB, SixIsland_OutcastIsland_Text_GebRematchIntro, SixIsland_OutcastIsland_Text_GebDefeat, SixIsland_OutcastIsland_Text_GebNotEnoughMons + msgbox SixIsland_OutcastIsland_Text_GebPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_GreenPath_EventScript_1AC517:: @ 81AC517 - trainerbattle_single TRAINER_PSYCHIC_JACLYN, Text_18B7B0, Text_18B7F0 +SixIsland_GreenPath_EventScript_Jaclyn:: @ 81AC517 + trainerbattle_single TRAINER_PSYCHIC_JACLYN, SixIsland_GreenPath_Text_JaclynIntro, SixIsland_GreenPath_Text_JaclynDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC53E - msgbox Text_18B7FD, MSGBOX_AUTOCLOSE + goto_if_eq SixIsland_GreenPath_EventScript_JaclynRematch + msgbox SixIsland_GreenPath_Text_JaclynPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC53E:: @ 81AC53E - trainerbattle_rematch TRAINER_PSYCHIC_JACLYN, Text_1C3FE9, Text_18B7F0 - msgbox Text_18B7FD, MSGBOX_AUTOCLOSE +SixIsland_GreenPath_EventScript_JaclynRematch:: @ 81AC53E + trainerbattle_rematch TRAINER_PSYCHIC_JACLYN, SixIsland_GreenPath_Text_JaclynRematchIntro, SixIsland_GreenPath_Text_JaclynDefeat + msgbox SixIsland_GreenPath_Text_JaclynPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_WaterPath_EventScript_1AC555:: @ 81AC555 - trainerbattle_single TRAINER_AROMA_LADY_ROSE, Text_18B896, Text_18B8C8 +SixIsland_WaterPath_EventScript_Rose:: @ 81AC555 + trainerbattle_single TRAINER_AROMA_LADY_ROSE, SixIsland_WaterPath_Text_RoseIntro, SixIsland_WaterPath_Text_RoseDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC57C - msgbox Text_18B8F7, MSGBOX_AUTOCLOSE + goto_if_eq SixIsland_WaterPath_EventScript_RoseRematch + msgbox SixIsland_WaterPath_Text_RosePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC57C:: @ 81AC57C - trainerbattle_rematch TRAINER_AROMA_LADY_ROSE, Text_1C4028, Text_18B8C8 - msgbox Text_18B8F7, MSGBOX_AUTOCLOSE +SixIsland_WaterPath_EventScript_RoseRematch:: @ 81AC57C + trainerbattle_rematch TRAINER_AROMA_LADY_ROSE, SixIsland_WaterPath_Text_RoseRematchIntro, SixIsland_WaterPath_Text_RoseDefeat + msgbox SixIsland_WaterPath_Text_RosePostBattle, MSGBOX_AUTOCLOSE end -SixIsland_WaterPath_EventScript_1AC593:: @ 81AC593 - trainerbattle_single TRAINER_JUGGLER_EDWARD, Text_18B959, Text_18B988 +SixIsland_WaterPath_EventScript_Edward:: @ 81AC593 + trainerbattle_single TRAINER_JUGGLER_EDWARD, SixIsland_WaterPath_Text_EdwardIntro, SixIsland_WaterPath_Text_EdwardDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC5BA - msgbox Text_18B9A5, MSGBOX_AUTOCLOSE + goto_if_eq SixIsland_WaterPath_EventScript_EdwardRematch + msgbox SixIsland_WaterPath_Text_EdwardPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC5BA:: @ 81AC5BA - trainerbattle_rematch TRAINER_JUGGLER_EDWARD, Text_1C4057, Text_18B988 - msgbox Text_18B9A5, MSGBOX_AUTOCLOSE +SixIsland_WaterPath_EventScript_EdwardRematch:: @ 81AC5BA + trainerbattle_rematch TRAINER_JUGGLER_EDWARD, SixIsland_WaterPath_Text_EdwardRematchIntro, SixIsland_WaterPath_Text_EdwardDefeat + msgbox SixIsland_WaterPath_Text_EdwardPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_WaterPath_EventScript_1AC5D1:: @ 81AC5D1 - trainerbattle_single TRAINER_SWIMMER_MALE_SAMIR, Text_18B9EC, Text_18BA47 +SixIsland_WaterPath_EventScript_Samir:: @ 81AC5D1 + trainerbattle_single TRAINER_SWIMMER_MALE_SAMIR, SixIsland_WaterPath_Text_SamirIntro, SixIsland_WaterPath_Text_SamirDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC5F8 - msgbox Text_18BA57, MSGBOX_AUTOCLOSE + goto_if_eq SixIsland_WaterPath_EventScript_SamirRematch + msgbox SixIsland_WaterPath_Text_SamirPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC5F8:: @ 81AC5F8 - trainerbattle_rematch TRAINER_SWIMMER_MALE_SAMIR, Text_1C407F, Text_18BA47 - msgbox Text_18BA57, MSGBOX_AUTOCLOSE +SixIsland_WaterPath_EventScript_SamirRematch:: @ 81AC5F8 + trainerbattle_rematch TRAINER_SWIMMER_MALE_SAMIR, SixIsland_WaterPath_Text_SamirRematchIntro, SixIsland_WaterPath_Text_SamirDefeat + msgbox SixIsland_WaterPath_Text_SamirPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_WaterPath_EventScript_1AC60F:: @ 81AC60F - trainerbattle_single TRAINER_SWIMMER_FEMALE_DENISE, Text_18BA86, Text_18BAC0 +SixIsland_WaterPath_EventScript_Denise:: @ 81AC60F + trainerbattle_single TRAINER_SWIMMER_FEMALE_DENISE, SixIsland_WaterPath_Text_DeniseIntro, SixIsland_WaterPath_Text_DeniseDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC636 - msgbox Text_18BAE0, MSGBOX_AUTOCLOSE + goto_if_eq SixIsland_WaterPath_EventScript_DeniseRematch + msgbox SixIsland_WaterPath_Text_DenisePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC636:: @ 81AC636 - trainerbattle_rematch TRAINER_SWIMMER_FEMALE_DENISE, Text_1C40D9, Text_18BAC0 - msgbox Text_18BAE0, MSGBOX_AUTOCLOSE +SixIsland_WaterPath_EventScript_DeniseRematch:: @ 81AC636 + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_DENISE, SixIsland_WaterPath_Text_DeniseRematchIntro, SixIsland_WaterPath_Text_DeniseDefeat + msgbox SixIsland_WaterPath_Text_DenisePostBattle, MSGBOX_AUTOCLOSE end -SixIsland_WaterPath_EventScript_1AC64D:: @ 81AC64D - trainerbattle_double TRAINER_TWINS_MIU_MIA, Text_18BBBA, Text_18BBE2, Text_18BC24 +SixIsland_WaterPath_EventScript_Miu:: @ 81AC64D + trainerbattle_double TRAINER_TWINS_MIU_MIA, SixIsland_WaterPath_Text_MiuIntro, SixIsland_WaterPath_Text_MiuDefeat, SixIsland_WaterPath_Text_MiuNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC678 - msgbox Text_18BBF6, MSGBOX_AUTOCLOSE + goto_if_eq SixIsland_WaterPath_EventScript_MiuRematch + msgbox SixIsland_WaterPath_Text_MiuPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC678:: @ 81AC678 - trainerbattle_rematch_double TRAINER_TWINS_MIU_MIA, Text_1C4138, Text_18BBE2, Text_18BC24 - msgbox Text_18BBF6, MSGBOX_AUTOCLOSE +SixIsland_WaterPath_EventScript_MiuRematch:: @ 81AC678 + trainerbattle_rematch_double TRAINER_TWINS_MIU_MIA, SixIsland_WaterPath_Text_MiuRematchIntro, SixIsland_WaterPath_Text_MiuDefeat, SixIsland_WaterPath_Text_MiuNotEnoughMons + msgbox SixIsland_WaterPath_Text_MiuPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_WaterPath_EventScript_1AC693:: @ 81AC693 - trainerbattle_double TRAINER_TWINS_MIU_MIA, Text_18BC5A, Text_18BC84, Text_18BCCF +SixIsland_WaterPath_EventScript_Mia:: @ 81AC693 + trainerbattle_double TRAINER_TWINS_MIU_MIA, SixIsland_WaterPath_Text_MiaIntro, SixIsland_WaterPath_Text_MiaDefeat, SixIsland_WaterPath_Text_MiaNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC6BE - msgbox Text_18BCAE, MSGBOX_AUTOCLOSE + goto_if_eq SixIsland_WaterPath_EventScript_MiaRematch + msgbox SixIsland_WaterPath_Text_MiaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC6BE:: @ 81AC6BE - trainerbattle_rematch_double TRAINER_TWINS_MIU_MIA, Text_1C4166, Text_18BC84, Text_18BCCF - msgbox Text_18BCAE, MSGBOX_AUTOCLOSE +SixIsland_WaterPath_EventScript_MiaRematch:: @ 81AC6BE + trainerbattle_rematch_double TRAINER_TWINS_MIU_MIA, SixIsland_WaterPath_Text_MiaRematchIntro, SixIsland_WaterPath_Text_MiaDefeat, SixIsland_WaterPath_Text_MiaNotEnoughMons + msgbox SixIsland_WaterPath_Text_MiaPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_WaterPath_EventScript_1AC6D9:: @ 81AC6D9 - trainerbattle_single TRAINER_HIKER_EARL, Text_18BB2D, Text_18BB62 +SixIsland_WaterPath_EventScript_Earl:: @ 81AC6D9 + trainerbattle_single TRAINER_HIKER_EARL, SixIsland_WaterPath_Text_EarlIntro, SixIsland_WaterPath_Text_EarlDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC700 - msgbox Text_18BB8B, MSGBOX_AUTOCLOSE + goto_if_eq SixIsland_WaterPath_EventScript_EarlRematch + msgbox SixIsland_WaterPath_Text_EarlPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC700:: @ 81AC700 - trainerbattle_rematch TRAINER_HIKER_EARL, Text_1C40FA, Text_18BB62 - msgbox Text_18BB8B, MSGBOX_AUTOCLOSE +SixIsland_WaterPath_EventScript_EarlRematch:: @ 81AC700 + trainerbattle_rematch TRAINER_HIKER_EARL, SixIsland_WaterPath_Text_EarlRematchIntro, SixIsland_WaterPath_Text_EarlDefeat + msgbox SixIsland_WaterPath_Text_EarlPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_RuinValley_EventScript_1AC717:: @ 81AC717 - trainerbattle_single TRAINER_RUIN_MANIAC_STANLY, Text_18BE5D, Text_18BE9B +SixIsland_RuinValley_EventScript_Stanly:: @ 81AC717 + trainerbattle_single TRAINER_RUIN_MANIAC_STANLY, SixIsland_RuinValley_Text_StanlyIntro, SixIsland_RuinValley_Text_StanlyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC73E - msgbox Text_18BEA0, MSGBOX_AUTOCLOSE + goto_if_eq SixIsland_RuinValley_EventScript_StanlyRematch + msgbox SixIsland_RuinValley_Text_StanlyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC73E:: @ 81AC73E - trainerbattle_rematch TRAINER_RUIN_MANIAC_STANLY, Text_1C4196, Text_18BE9B - msgbox Text_18BEA0, MSGBOX_AUTOCLOSE +SixIsland_RuinValley_EventScript_StanlyRematch:: @ 81AC73E + trainerbattle_rematch TRAINER_RUIN_MANIAC_STANLY, SixIsland_RuinValley_Text_StanlyRematchIntro, SixIsland_RuinValley_Text_StanlyDefeat + msgbox SixIsland_RuinValley_Text_StanlyPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_RuinValley_EventScript_1AC755:: @ 81AC755 - trainerbattle_single TRAINER_RUIN_MANIAC_FOSTER, Text_18BF05, Text_18BF33 +SixIsland_RuinValley_EventScript_Foster:: @ 81AC755 + trainerbattle_single TRAINER_RUIN_MANIAC_FOSTER, SixIsland_RuinValley_Text_FosterIntro, SixIsland_RuinValley_Text_FosterDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC77C - msgbox Text_18BF6C, MSGBOX_AUTOCLOSE + goto_if_eq SixIsland_RuinValley_EventScript_FosterRematch + msgbox SixIsland_RuinValley_Text_FosterPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC77C:: @ 81AC77C - trainerbattle_rematch TRAINER_RUIN_MANIAC_FOSTER, Text_1C41D4, Text_18BF33 - msgbox Text_18BF6C, MSGBOX_AUTOCLOSE +SixIsland_RuinValley_EventScript_FosterRematch:: @ 81AC77C + trainerbattle_rematch TRAINER_RUIN_MANIAC_FOSTER, SixIsland_RuinValley_Text_FosterRematchIntro, SixIsland_RuinValley_Text_FosterDefeat + msgbox SixIsland_RuinValley_Text_FosterPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_RuinValley_EventScript_1AC793:: @ 81AC793 - trainerbattle_single TRAINER_RUIN_MANIAC_LARRY, Text_18BFC5, Text_18C03B +SixIsland_RuinValley_EventScript_Larry:: @ 81AC793 + trainerbattle_single TRAINER_RUIN_MANIAC_LARRY, SixIsland_RuinValley_Text_LarryIntro, SixIsland_RuinValley_Text_LarryDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC7BA - msgbox Text_18C04C, MSGBOX_AUTOCLOSE + goto_if_eq SixIsland_RuinValley_EventScript_LarryRematch + msgbox SixIsland_RuinValley_Text_LarryPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC7BA:: @ 81AC7BA - trainerbattle_rematch TRAINER_RUIN_MANIAC_LARRY, Text_1C4210, Text_18C03B - msgbox Text_18C04C, MSGBOX_AUTOCLOSE +SixIsland_RuinValley_EventScript_LarryRematch:: @ 81AC7BA + trainerbattle_rematch TRAINER_RUIN_MANIAC_LARRY, SixIsland_RuinValley_Text_LarryRematchIntro, SixIsland_RuinValley_Text_LarryDefeat + msgbox SixIsland_RuinValley_Text_LarryPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_RuinValley_EventScript_1AC7D1:: @ 81AC7D1 - trainerbattle_single TRAINER_HIKER_DARYL, Text_18C09C, Text_18C0BB +SixIsland_RuinValley_EventScript_Daryl:: @ 81AC7D1 + trainerbattle_single TRAINER_HIKER_DARYL, SixIsland_RuinValley_Text_DarylIntro, SixIsland_RuinValley_Text_DarylDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC7F8 - msgbox Text_18C0EA, MSGBOX_AUTOCLOSE + goto_if_eq SixIsland_RuinValley_EventScript_DarylRematch + msgbox SixIsland_RuinValley_Text_DarylPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC7F8:: @ 81AC7F8 - trainerbattle_rematch TRAINER_HIKER_DARYL, Text_1C4280, Text_18C0BB - msgbox Text_18C0EA, MSGBOX_AUTOCLOSE +SixIsland_RuinValley_EventScript_DarylRematch:: @ 81AC7F8 + trainerbattle_rematch TRAINER_HIKER_DARYL, SixIsland_RuinValley_Text_DarylRematchIntro, SixIsland_RuinValley_Text_DarylDefeat + msgbox SixIsland_RuinValley_Text_DarylPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_RuinValley_EventScript_1AC80F:: @ 81AC80F - trainerbattle_single TRAINER_POKEMANIAC_HECTOR, Text_18C10A, Text_18C140 +SixIsland_RuinValley_EventScript_Hector:: @ 81AC80F + trainerbattle_single TRAINER_POKEMANIAC_HECTOR, SixIsland_RuinValley_Text_HectorIntro, SixIsland_RuinValley_Text_HectorDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC836 - msgbox Text_18C17A, MSGBOX_AUTOCLOSE + goto_if_eq SixIsland_RuinValley_EventScript_HectorRematch + msgbox SixIsland_RuinValley_Text_HectorPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC836:: @ 81AC836 - trainerbattle_rematch TRAINER_POKEMANIAC_HECTOR, Text_1C42A0, Text_18C140 - msgbox Text_18C17A, MSGBOX_AUTOCLOSE +SixIsland_RuinValley_EventScript_HectorRematch:: @ 81AC836 + trainerbattle_rematch TRAINER_POKEMANIAC_HECTOR, SixIsland_RuinValley_Text_HectorRematchIntro, SixIsland_RuinValley_Text_HectorDefeat + msgbox SixIsland_RuinValley_Text_HectorPostBattle, MSGBOX_AUTOCLOSE end SevenIsland_TrainerTower_EventScript_1AC84D:: @ 81AC84D diff --git a/data/text/trainers.inc b/data/text/trainers.inc index 7a51a0585..eb6fbf22f 100644 --- a/data/text/trainers.inc +++ b/data/text/trainers.inc @@ -844,80 +844,80 @@ Text_1C3E6A:: @ 81C3E6A .string "I love birds for their down.\n" .string "I didn't think I'd see you again!$" -Text_1C3ED0:: @ 81C3ED0 +SixIsland_OutcastIsland_Text_TylorRematchIntro:: @ 81C3ED0 .string "I'm still having no luck at all.\n" .string "A battle'd be a change of pace!$" -Text_1C3F11:: @ 81C3F11 +SixIsland_OutcastIsland_Text_MymoRematchIntro:: @ 81C3F11 .string "Gasp… Gasp…\p" .string "I swam here from SIX ISLAND's port\n" .string "in one go again.$" -Text_1C3F51:: @ 81C3F51 +SixIsland_OutcastIsland_Text_NicoleRematchIntro:: @ 81C3F51 .string "You always come along while I'm\n" .string "swimming.$" -Text_1C3F7B:: @ 81C3F7B +SixIsland_OutcastIsland_Text_AvaRematchIntro:: @ 81C3F7B .string "AVA: Let's have another\n" .string "two-on-two marine battle today!$" -Text_1C3FB3:: @ 81C3FB3 +SixIsland_OutcastIsland_Text_GebRematchIntro:: @ 81C3FB3 .string "GEB: My big sister and I are way\n" .string "tougher than before!$" -Text_1C3FE9:: @ 81C3FE9 +SixIsland_GreenPath_Text_JaclynRematchIntro:: @ 81C3FE9 .string "…Huh?\p" .string "I envision my house, but TELEPORT\n" .string "always brings me here!$" -Text_1C4028:: @ 81C4028 +SixIsland_WaterPath_Text_RoseRematchIntro:: @ 81C4028 .string "Oh, hello.\n" .string "A pleasant breeze is blowing again.$" -Text_1C4057:: @ 81C4057 +SixIsland_WaterPath_Text_EdwardRematchIntro:: @ 81C4057 .string "Hehehe, I'm practicing in secret\n" .string "again.$" -Text_1C407F:: @ 81C407F +SixIsland_WaterPath_Text_SamirRematchIntro:: @ 81C407F .string "What, you're sick of seeing\n" .string "SWIMMERS like me?\p" .string "Aww, don't be hatin'!\n" .string "Battle with me again.$" -Text_1C40D9:: @ 81C40D9 +SixIsland_WaterPath_Text_DeniseRematchIntro:: @ 81C40D9 .string "Sigh…\n" .string "My boyfriend's busy again…$" -Text_1C40FA:: @ 81C40FA +SixIsland_WaterPath_Text_EarlRematchIntro:: @ 81C40FA .string "Come on, tell me, where are the\n" .string "mountains around these parts?$" -Text_1C4138:: @ 81C4138 +SixIsland_WaterPath_Text_MiuRematchIntro:: @ 81C4138 .string "MIU: Hello, POKéMON!\n" .string "It's time to play again!$" -Text_1C4166:: @ 81C4166 +SixIsland_WaterPath_Text_MiaRematchIntro:: @ 81C4166 .string "MIA: Hello, POKéMON!\n" .string "It's time to battle again!$" -Text_1C4196:: @ 81C4196 +SixIsland_RuinValley_Text_StanlyRematchIntro:: @ 81C4196 .string "There appear to be many secrets\n" .string "still unsolved in this world.$" -Text_1C41D4:: @ 81C41D4 +SixIsland_RuinValley_Text_FosterRematchIntro:: @ 81C41D4 .string "Hi, didn't we meet before?\n" .string "What compelled you to come back?$" -Text_1C4210:: @ 81C4210 +SixIsland_RuinValley_Text_LarryRematchIntro:: @ 81C4210 .string "It's been said that there are\n" .string "mysterious stones on this island.\p" .string "Have you discovered anything since\n" .string "we last met?$" -Text_1C4280:: @ 81C4280 +SixIsland_RuinValley_Text_DarylRematchIntro:: @ 81C4280 .string "A rematch with you, so high up!$" -Text_1C42A0:: @ 81C42A0 +SixIsland_RuinValley_Text_HectorRematchIntro:: @ 81C42A0 .string "I'm pretty familiar with the land\n" .string "around these parts.$" -- cgit v1.2.3 From 1779aedbf0e321188ff239095a3e20f38cf22575 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 28 Feb 2020 10:02:40 -0500 Subject: Escalator field effect --- data/field_effect.s | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'data') diff --git a/data/field_effect.s b/data/field_effect.s index 3e5eba818..d6ae15de2 100644 --- a/data/field_effect.s +++ b/data/field_effect.s @@ -6,25 +6,6 @@ .section .rodata .align 2 - .align 2 -sEscalatorWarpFieldEffectFuncs:: @ 83CC050 dataptr - .4byte EscalatorWarpEffect_1 - .4byte EscalatorWarpEffect_2 - .4byte EscalatorWarpEffect_3 - .4byte EscalatorWarpEffect_4 - .4byte EscalatorWarpEffect_5 - .4byte EscalatorWarpEffect_6 - - .align 2 -gUnknown_83CC068:: @ 83CC068 dataptr - .4byte sub_8084A5C - .4byte sub_8084AD8 - .4byte sub_8084B18 - .4byte sub_8084B78 - .4byte sub_8084BB8 - .4byte sub_8084C18 - .4byte sub_8084C3C - .align 2 sUseWaterfallFieldEffectFuncs:: @ 83CC084 dataptr .4byte waterfall_0_setup -- cgit v1.2.3 From c117bc6864b951c1f6ea124aa8176e64ad25f5c8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 28 Feb 2020 10:19:34 -0500 Subject: Waterfall field effect --- data/field_effect.s | 8 -------- 1 file changed, 8 deletions(-) (limited to 'data') diff --git a/data/field_effect.s b/data/field_effect.s index d6ae15de2..d2b02436f 100644 --- a/data/field_effect.s +++ b/data/field_effect.s @@ -6,14 +6,6 @@ .section .rodata .align 2 - .align 2 -sUseWaterfallFieldEffectFuncs:: @ 83CC084 dataptr - .4byte waterfall_0_setup - .4byte waterfall_1_do_anim_probably - .4byte waterfall_2_wait_anim_finish_probably - .4byte waterfall_3_move_player_probably - .4byte waterfall_4_wait_player_move_probably - .align 2 sDiveFieldEffectFuncPtrs:: @ 83CC098 dataptr .4byte dive_1_lock -- cgit v1.2.3 From 8a092738468de1f4bbe11b7ef4d338735312e9dd Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 28 Feb 2020 11:16:03 -0500 Subject: Unused dive field effect --- data/field_effect.s | 6 ------ 1 file changed, 6 deletions(-) (limited to 'data') diff --git a/data/field_effect.s b/data/field_effect.s index d2b02436f..596084514 100644 --- a/data/field_effect.s +++ b/data/field_effect.s @@ -6,12 +6,6 @@ .section .rodata .align 2 - .align 2 -sDiveFieldEffectFuncPtrs:: @ 83CC098 dataptr - .4byte dive_1_lock - .4byte dive_2_unknown - .4byte dive_3_unknown - .align 2 sLavaridgeGymB1FWarpEffectFuncs:: @ 83CC0A4 dataptr .4byte LavaridgeGymB1FWarpEffect_1 -- cgit v1.2.3 From 9cf19244fa1fe925d4273eb32c8b7c68c5271152 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 28 Feb 2020 13:18:21 -0500 Subject: Port Lavaridge Gym B1F Warp from Emerald --- data/field_effect.s | 38 +++++++++++--------------------------- data/field_effect_scripts.s | 8 ++++---- 2 files changed, 15 insertions(+), 31 deletions(-) (limited to 'data') diff --git a/data/field_effect.s b/data/field_effect.s index 596084514..7d9a50f3f 100644 --- a/data/field_effect.s +++ b/data/field_effect.s @@ -6,22 +6,6 @@ .section .rodata .align 2 - .align 2 -sLavaridgeGymB1FWarpEffectFuncs:: @ 83CC0A4 dataptr - .4byte LavaridgeGymB1FWarpEffect_1 - .4byte LavaridgeGymB1FWarpEffect_2 - .4byte LavaridgeGymB1FWarpEffect_3 - .4byte LavaridgeGymB1FWarpEffect_4 - .4byte LavaridgeGymB1FWarpEffect_5 - .4byte LavaridgeGymB1FWarpEffect_6 - - .align 2 -sLavaridgeGymB1FWarpExitEffectFuncs:: @ 83CC0BC dataptr - .4byte LavaridgeGymB1FWarpExitEffect_1 - .4byte LavaridgeGymB1FWarpExitEffect_2 - .4byte LavaridgeGymB1FWarpExitEffect_3 - .4byte LavaridgeGymB1FWarpExitEffect_4 - .align 2 sLavaridgeGym1FWarpEffectFuncs:: @ 83CC0CC dataptr .4byte LavaridgeGym1FWarpEffect_1 @@ -80,19 +64,19 @@ sShowMonIndoorsEffectFuncs:: @ 83CC138 dataptr .4byte ShowMonEffect_Indoors_7 .align 2 -gUnknown_83CC154:: @ 83CC154 dataptr - .4byte sub_80869C0 - .4byte sub_8086A20 - .4byte sub_8086A6C - .4byte sub_8086AB4 - .4byte sub_8086B30 +sUseSurfEffectFuncs:: @ 83CC154 dataptr + .4byte UseSurfEffect_1 + .4byte UseSurfEffect_2 + .4byte UseSurfEffect_3 + .4byte UseSurfEffect_4 + .4byte UseSurfEffect_5 .align 2 -gUnknown_83CC168:: @ 83CC168 dataptr - .4byte sub_8086C00 - .4byte sub_8086C24 - .4byte sub_8086C70 - .4byte sub_8086CF4 +sUnk41EffectFuncs:: @ 83CC168 dataptr + .4byte Unk41Effect_1 + .4byte Unk41Effect_2 + .4byte Unk41Effect_3 + .4byte Unk41Effect_4 gUnknown_83CC178:: @ 83CC178 dataptr (incomplete) .4byte sub_8086E70 diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 49f14d251..0f8295871 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -102,15 +102,15 @@ gFldEffScript_FieldMoveShowMon:: @ 81D97F0 end gFldEffScript_Ash:: @ 81D97F6 - loadfadedpal_callnative gUnknown_83A5348, oei_ash + loadfadedpal_callnative gUnknown_83A5348, FldEff_Ash end gFldEffScript_SurfBlob:: @ 81D9800 - callnative sub_80DC3D0 + callnative FldEff_SurfBlob end gFldEffScript_UseSurf:: @ 81D9806 - callnative sub_8086944 + callnative FldEff_UseSurf end gFldEffScript_Dust:: @ 81D980C @@ -326,7 +326,7 @@ gFldEffScript_SmileyFaceIcon:: @ 81D998C end gFldEffScript_Unk41:: @ 81D9992 - callnative sub_8086BA8 + callnative FldEff_Unk41 end gFldEffScript_DoubleExclMarkIcon:: @ 81D9998 -- cgit v1.2.3 From 8f42b7b56d887b6bca517499a841c259652af372 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 28 Feb 2020 13:23:51 -0500 Subject: Lavaridge Gym 1F Warp field effect --- data/field_effect.s | 8 -------- 1 file changed, 8 deletions(-) (limited to 'data') diff --git a/data/field_effect.s b/data/field_effect.s index 7d9a50f3f..c3fd0f35f 100644 --- a/data/field_effect.s +++ b/data/field_effect.s @@ -6,14 +6,6 @@ .section .rodata .align 2 - .align 2 -sLavaridgeGym1FWarpEffectFuncs:: @ 83CC0CC dataptr - .4byte LavaridgeGym1FWarpEffect_1 - .4byte LavaridgeGym1FWarpEffect_2 - .4byte LavaridgeGym1FWarpEffect_3 - .4byte LavaridgeGym1FWarpEffect_4 - .4byte LavaridgeGym1FWarpEffect_5 - .align 2 gEscapeRopeFieldEffectFuncs:: @ 83CC0E0 dataptr .4byte EscapeRopeFieldEffect_Step0 -- cgit v1.2.3 From fb56341fe4fedeeca53b17fc693b4b3dd7824ff2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 28 Feb 2020 14:14:34 -0500 Subject: Escape Rope field effect --- data/field_effect.s | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'data') diff --git a/data/field_effect.s b/data/field_effect.s index c3fd0f35f..baa7625a7 100644 --- a/data/field_effect.s +++ b/data/field_effect.s @@ -6,19 +6,6 @@ .section .rodata .align 2 - .align 2 -gEscapeRopeFieldEffectFuncs:: @ 83CC0E0 dataptr - .4byte EscapeRopeFieldEffect_Step0 - .4byte EscapeRopeFieldEffect_Step1 - -gUnknown_83CC0E8:: @ 83CC0E8 data8 - .byte 0x01, 0x03, 0x04, 0x02, 0x01 - - .align 2 -sEscapeRopeExitEffectFuncs:: @ 83CC0F0 dataptr - .4byte EscapeRopeExitFieldEffect_Step0 - .4byte EscapeRopeExitFieldEffect_Step1 - .align 2 sTeleportEffectFuncs:: @ 83CC0F8 dataptr .4byte TeleportFieldEffectTask1 -- cgit v1.2.3 From 410aaa00ff6bb8d0e9dae755b60e216be24b9660 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 28 Feb 2020 14:26:54 -0500 Subject: Teleport field effect --- data/field_effect.s | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'data') diff --git a/data/field_effect.s b/data/field_effect.s index baa7625a7..3629040b3 100644 --- a/data/field_effect.s +++ b/data/field_effect.s @@ -6,22 +6,6 @@ .section .rodata .align 2 - .align 2 -sTeleportEffectFuncs:: @ 83CC0F8 dataptr - .4byte TeleportFieldEffectTask1 - .4byte TeleportFieldEffectTask2 - .4byte TeleportFieldEffectTask3 - .4byte TeleportFieldEffectTask4 - -gUnknown_83CC108:: @ 83CC108 data8 - .byte 0x01, 0x03, 0x04, 0x02, 0x01 - - .align 2 -sTeleportInEffectFuncs:: @ 83CC110 dataptr - .4byte TeleportInFieldEffectTask1 - .4byte TeleportInFieldEffectTask2 - .4byte TeleportInFieldEffectTask3 - .align 2 sShowMonOutdoorsEffectFuncs:: @ 83CC11C dataptr .4byte ShowMonEffect_Outdoors_1 -- cgit v1.2.3 From 0c492c087eca215e7dd29a90b8a3e9232ffe3bf6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 28 Feb 2020 15:19:50 -0500 Subject: Show Mon field effect --- data/field_effect.s | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'data') diff --git a/data/field_effect.s b/data/field_effect.s index 3629040b3..004dd555a 100644 --- a/data/field_effect.s +++ b/data/field_effect.s @@ -6,26 +6,6 @@ .section .rodata .align 2 - .align 2 -sShowMonOutdoorsEffectFuncs:: @ 83CC11C dataptr - .4byte ShowMonEffect_Outdoors_1 - .4byte ShowMonEffect_Outdoors_2 - .4byte ShowMonEffect_Outdoors_3 - .4byte ShowMonEffect_Outdoors_4 - .4byte ShowMonEffect_Outdoors_5 - .4byte ShowMonEffect_Outdoors_6 - .4byte ShowMonEffect_Outdoors_7 - - .align 2 -sShowMonIndoorsEffectFuncs:: @ 83CC138 dataptr - .4byte ShowMonEffect_Indoors_1 - .4byte ShowMonEffect_Indoors_2 - .4byte ShowMonEffect_Indoors_3 - .4byte ShowMonEffect_Indoors_4 - .4byte ShowMonEffect_Indoors_5 - .4byte ShowMonEffect_Indoors_6 - .4byte ShowMonEffect_Indoors_7 - .align 2 sUseSurfEffectFuncs:: @ 83CC154 dataptr .4byte UseSurfEffect_1 -- cgit v1.2.3 From 80e5031619f388ba3274ca573e58451cb443d54b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 28 Feb 2020 15:29:16 -0500 Subject: Use Surf field effect --- data/field_effect.s | 8 -------- 1 file changed, 8 deletions(-) (limited to 'data') diff --git a/data/field_effect.s b/data/field_effect.s index 004dd555a..c24b7d3f6 100644 --- a/data/field_effect.s +++ b/data/field_effect.s @@ -6,14 +6,6 @@ .section .rodata .align 2 - .align 2 -sUseSurfEffectFuncs:: @ 83CC154 dataptr - .4byte UseSurfEffect_1 - .4byte UseSurfEffect_2 - .4byte UseSurfEffect_3 - .4byte UseSurfEffect_4 - .4byte UseSurfEffect_5 - .align 2 sUnk41EffectFuncs:: @ 83CC168 dataptr .4byte Unk41Effect_1 -- cgit v1.2.3 From f8251866551143e2febe55fe47e92f7c826696b3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 28 Feb 2020 15:55:12 -0500 Subject: Use VS Seeker field effect --- data/field_effect.s | 27 ++++++++++----------------- data/field_effect_scripts.s | 8 ++++---- 2 files changed, 14 insertions(+), 21 deletions(-) (limited to 'data') diff --git a/data/field_effect.s b/data/field_effect.s index c24b7d3f6..63142e981 100644 --- a/data/field_effect.s +++ b/data/field_effect.s @@ -6,23 +6,16 @@ .section .rodata .align 2 - .align 2 -sUnk41EffectFuncs:: @ 83CC168 dataptr - .4byte Unk41Effect_1 - .4byte Unk41Effect_2 - .4byte Unk41Effect_3 - .4byte Unk41Effect_4 - -gUnknown_83CC178:: @ 83CC178 dataptr (incomplete) - .4byte sub_8086E70 - .4byte sub_8086EC8 - .4byte sub_8086F0C - .4byte sub_8086F64 - .4byte sub_8086FA8 - .4byte sub_8086FFC - .4byte sub_808706C - .4byte sub_8087118 - .4byte sub_8087138 +sUseFlyEffectFuncs:: @ 83CC178 dataptr (incomplete) + .4byte UseFlyEffect_1 + .4byte UseFlyEffect_2 + .4byte UseFlyEffect_3 + .4byte UseFlyEffect_4 + .4byte UseFlyEffect_5 + .4byte UseFlyEffect_6 + .4byte UseFlyEffect_7 + .4byte UseFlyEffect_8 + .4byte UseFlyEffect_9 gUnknown_83CC19C:: @ 83CC19C affineanimcmd obj_rot_scal_anim_frame 8, 8, 226, 0 diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 0f8295871..3b30c8878 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -67,7 +67,7 @@ gFieldEffectScriptPointers:: @ 81D96AC .4byte gFldEffScript_HallOfFameRecord .4byte gFldEffScript_UseTeleport .4byte gFldEffScript_SmileyFaceIcon - .4byte gFldEffScript_Unk41 + .4byte gFldEffScript_UseVsSeeker .4byte gFldEffScript_DoubleExclMarkIcon .4byte gFldEffScript_Unk43 .4byte gFldEffScript_Unk44 @@ -192,7 +192,7 @@ gFldEffScript_MountainDisguise:: @ 81D98AC end gFldEffScript_NpcflyOut:: @ 81D98B2 - callnative sub_8086D38 + callnative FldEff_NpcFlyOut end gFldEffScript_UseFly:: @ 81D98B8 @@ -325,8 +325,8 @@ gFldEffScript_SmileyFaceIcon:: @ 81D998C callnative FldEff_SmileyFaceIcon end -gFldEffScript_Unk41:: @ 81D9992 - callnative FldEff_Unk41 +gFldEffScript_UseVsSeeker:: @ 81D9992 + callnative FldEff_UseVsSeeker end gFldEffScript_DoubleExclMarkIcon:: @ 81D9998 -- cgit v1.2.3 From fb064f17ba63a79df09901c874b03665f4bf11e8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 28 Feb 2020 17:10:06 -0500 Subject: Fly field effect --- data/field_effect.s | 54 ----------------------------------------------------- 1 file changed, 54 deletions(-) (limited to 'data') diff --git a/data/field_effect.s b/data/field_effect.s index 63142e981..529205a57 100644 --- a/data/field_effect.s +++ b/data/field_effect.s @@ -6,60 +6,6 @@ .section .rodata .align 2 -sUseFlyEffectFuncs:: @ 83CC178 dataptr (incomplete) - .4byte UseFlyEffect_1 - .4byte UseFlyEffect_2 - .4byte UseFlyEffect_3 - .4byte UseFlyEffect_4 - .4byte UseFlyEffect_5 - .4byte UseFlyEffect_6 - .4byte UseFlyEffect_7 - .4byte UseFlyEffect_8 - .4byte UseFlyEffect_9 - -gUnknown_83CC19C:: @ 83CC19C affineanimcmd - obj_rot_scal_anim_frame 8, 8, 226, 0 - obj_rot_scal_anim_frame 28, 28, 0, 30 - obj_rot_scal_anim_end - -gUnknown_83CC1B4:: @ 83CC1B4 affineanimcmd - obj_rot_scal_anim_frame 256, 256, 64, 0 - obj_rot_scal_anim_frame -10, -10, 0, 22 - obj_rot_scal_anim_end - - .align 2 -gUnknown_83CC1CC:: @ 83CC1CC dataptr - .4byte gUnknown_83CC19C - .4byte gUnknown_83CC1B4 - - .align 2 -gUnknown_83CC1D4:: @ 83CC1D4 dataptr - .4byte sub_80874C8 - .4byte sub_80875C8 - .4byte sub_8087644 - .4byte sub_8087698 - .4byte sub_8087710 - .4byte sub_8087748 - .4byte fishE - -gUnknown_83CC1F0:: @ 83CC1F0 data16 - .2byte 0xfffe, 0xfffc, 0xfffb, 0xfffa, 0xfff9, 0xfff8, 0xfff8, 0xfff8, 0xfff9, 0xfff9, 0xfffa, 0xfffb, 0xfffd, 0xfffe, 0x0000, 0x0002 - .2byte 0x0004, 0x0008 - -gUnknown_83CC214:: @ 83CC214 affineanimcmd - obj_rot_scal_anim_frame 24, 24, 0, 1 - obj_rot_scal_anim_jump 0 - -gUnknown_83CC224:: @ 83CC224 affineanimcmd - obj_rot_scal_anim_frame 512, 512, 0, 1 - obj_rot_scal_anim_frame -16, -16, 0, 1 - obj_rot_scal_anim_jump 1 - - .align 2 -gUnknown_83CC23C:: @ 83CC23C dataptr - .4byte gUnknown_83CC214 - .4byte gUnknown_83CC224 - gUnknown_83CC244:: @ 83CC244 dataptr .4byte sub_8087C00 .4byte sub_8087C2C -- cgit v1.2.3 From 575e8da6a971d5b6a54835ac370eb57eacc76db4 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 28 Feb 2020 20:24:19 -0500 Subject: Document Seven Island scripts --- data/maps/SevenIsland/map.json | 6 +- data/maps/SevenIsland/scripts.inc | 12 +- data/maps/SevenIsland/text.inc | 6 +- data/maps/SevenIsland_Harbor/map.json | 2 +- data/maps/SevenIsland_Harbor/scripts.inc | 2 +- data/maps/SevenIsland_House_Room1/map.json | 4 +- data/maps/SevenIsland_House_Room1/scripts.inc | 138 ++++++------ data/maps/SevenIsland_House_Room1/text.inc | 31 +-- data/maps/SevenIsland_House_Room2/scripts.inc | 28 +-- data/maps/SevenIsland_Mart/map.json | 8 +- data/maps/SevenIsland_Mart/scripts.inc | 18 +- data/maps/SevenIsland_Mart/text.inc | 6 +- data/maps/SevenIsland_PokemonCenter_1F/map.json | 12 +- data/maps/SevenIsland_PokemonCenter_1F/scripts.inc | 14 +- data/maps/SevenIsland_PokemonCenter_1F/text.inc | 6 +- data/maps/SevenIsland_SevaultCanyon/map.json | 20 +- data/maps/SevenIsland_SevaultCanyon/scripts.inc | 4 +- data/maps/SevenIsland_SevaultCanyon/text.inc | 56 ++--- .../SevenIsland_SevaultCanyon_Entrance/map.json | 14 +- .../SevenIsland_SevaultCanyon_Entrance/scripts.inc | 4 +- .../SevenIsland_SevaultCanyon_Entrance/text.inc | 50 ++--- data/maps/SevenIsland_SevaultCanyon_House/map.json | 4 +- .../SevenIsland_SevaultCanyon_House/scripts.inc | 36 ++-- data/maps/SevenIsland_SevaultCanyon_House/text.inc | 12 +- data/maps/SevenIsland_TrainerTower/map.json | 8 +- data/maps/SevenIsland_TrainerTower/scripts.inc | 8 +- data/maps/SevenIsland_TrainerTower/text.inc | 25 ++- data/scripts/fame_checker.inc | 8 +- data/scripts/trainers.inc | 240 ++++++++++----------- data/specials.inc | 4 +- data/text/fame_checker.inc | 2 +- data/text/trainers.inc | 32 +-- 32 files changed, 414 insertions(+), 406 deletions(-) (limited to 'data') diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json index c71782405..e55ba193a 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_EventScript_167EC6", + "script": "SevenIsland_EventScript_OldWoman", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_EventScript_167ECF", + "script": "SevenIsland_EventScript_Scientist", "flag": "0" } ], @@ -103,7 +103,7 @@ "x": 17, "y": 9, "elevation": 0, - "script": "SevenIsland_EventScript_167EBD" + "script": "SevenIsland_EventScript_IslandSign" } ] } diff --git a/data/maps/SevenIsland/scripts.inc b/data/maps/SevenIsland/scripts.inc index f7debbf02..649c1ea73 100644 --- a/data/maps/SevenIsland/scripts.inc +++ b/data/maps/SevenIsland/scripts.inc @@ -6,14 +6,14 @@ SevenIsland_OnTransition:: @ 8167EB9 setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND end -SevenIsland_EventScript_167EBD:: @ 8167EBD - msgbox gUnknown_8183046, MSGBOX_SIGN +SevenIsland_EventScript_IslandSign:: @ 8167EBD + msgbox SevenIsland_Text_IslandSign, MSGBOX_SIGN end -SevenIsland_EventScript_167EC6:: @ 8167EC6 - msgbox gUnknown_818306C, MSGBOX_NPC +SevenIsland_EventScript_OldWoman:: @ 8167EC6 + msgbox SevenIsland_Text_IslandsMadeInSevenDays, MSGBOX_NPC end -SevenIsland_EventScript_167ECF:: @ 8167ECF - msgbox gUnknown_8183143, MSGBOX_NPC +SevenIsland_EventScript_Scientist:: @ 8167ECF + msgbox SevenIsland_Text_IslandVirtuallyUntouched, MSGBOX_NPC end diff --git a/data/maps/SevenIsland/text.inc b/data/maps/SevenIsland/text.inc index 995752422..8b0e98818 100644 --- a/data/maps/SevenIsland/text.inc +++ b/data/maps/SevenIsland/text.inc @@ -17,11 +17,11 @@ Text_SwordsDanceTaught:: @ 818300D .string "If only we could keep getting\n" .string "stronger and stronger, eh?$" -gUnknown_8183046:: @ 8183046 +SevenIsland_Text_IslandSign:: @ 8183046 .string "SEVEN ISLAND\n" .string "Quest Island of Infinity$" -gUnknown_818306C:: @ 818306C +SevenIsland_Text_IslandsMadeInSevenDays:: @ 818306C .string "These islands are called the SEVII\n" .string "ISLANDS because there are seven.\p" .string "…Or at least that's what the young\n" @@ -30,7 +30,7 @@ gUnknown_818306C:: @ 818306C .string "named because they are said to\l" .string "have been made in seven days.$" -gUnknown_8183143:: @ 8183143 +SevenIsland_Text_IslandVirtuallyUntouched:: @ 8183143 .string "This island has been left virtually\n" .string "untouched in its natural state.\p" .string "It could be a little difficult to\n" diff --git a/data/maps/SevenIsland_Harbor/map.json b/data/maps/SevenIsland_Harbor/map.json index 5c1a8726a..61f41a9f3 100644 --- a/data/maps/SevenIsland_Harbor/map.json +++ b/data/maps/SevenIsland_Harbor/map.json @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_Harbor_EventScript_170BE5", + "script": "SevenIsland_Harbor_EventScript_Sailor", "flag": "0" } ], diff --git a/data/maps/SevenIsland_Harbor/scripts.inc b/data/maps/SevenIsland_Harbor/scripts.inc index f042ca668..fb51c905c 100644 --- a/data/maps/SevenIsland_Harbor/scripts.inc +++ b/data/maps/SevenIsland_Harbor/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_Harbor_MapScripts:: @ 8170BE4 .byte 0 -SevenIsland_Harbor_EventScript_170BE5:: @ 8170BE5 +SevenIsland_Harbor_EventScript_Sailor:: @ 8170BE5 lock faceplayer message Text_WhereDoYouWantToSail diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json index 052d7fa31..b2f5611b1 100644 --- a/data/maps/SevenIsland_House_Room1/map.json +++ b/data/maps/SevenIsland_House_Room1/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_House_Room1_EventScript_170958", + "script": "SevenIsland_House_Room1_EventScript_OldWoman", "flag": "0" } ], @@ -52,7 +52,7 @@ "x": 4, "y": 1, "elevation": 0, - "script": "SevenIsland_House_Room1_EventScript_170A75" + "script": "SevenIsland_House_Room1_EventScript_Box" } ] } diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index 8875211f8..63e8a7250 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -1,3 +1,7 @@ +.equ LOCALID_OLD_WOMAN, 1 + +.equ TRAINER_VISITING, VAR_TEMP_1 + SevenIsland_House_Room1_MapScripts:: @ 817088A map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_House_Room1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_House_Room1_OnFrame @@ -6,178 +10,178 @@ SevenIsland_House_Room1_MapScripts:: @ 817088A SevenIsland_House_Room1_OnTransition:: @ 8170895 special ValidateEReaderTrainer compare VAR_RESULT, 0 - call_if_eq EventScript_1708AF + call_if_eq SevenIsland_House_Room1_EventScript_SetTrainerVisitingLayout compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0 - call_if_ne EventScript_1708C3 + call_if_ne SevenIsland_House_Room1_EventScript_MoveOldWomanToDoor end -EventScript_1708AF:: @ 81708AF - setvar VAR_TEMP_1, 1 - setobjectxyperm 1, 4, 2 - setobjectmovementtype 1, 8 +SevenIsland_House_Room1_EventScript_SetTrainerVisitingLayout:: @ 81708AF + setvar TRAINER_VISITING, TRUE + setobjectxyperm LOCALID_OLD_WOMAN, 4, 2 + setobjectmovementtype LOCALID_OLD_WOMAN, MOVEMENT_TYPE_FACE_DOWN setmaplayoutindex LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1_DOOR_OPEN return -EventScript_1708C3:: @ 81708C3 - setobjectxyperm 1, 3, 2 - setobjectmovementtype 1, 10 +SevenIsland_House_Room1_EventScript_MoveOldWomanToDoor:: @ 81708C3 + setobjectxyperm LOCALID_OLD_WOMAN, 3, 2 + setobjectmovementtype LOCALID_OLD_WOMAN, MOVEMENT_TYPE_FACE_RIGHT return SevenIsland_House_Room1_OnFrame:: @ 81708CF - map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1, EventScript_1708E9 - map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2, EventScript_1708E9 - map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3, EventScript_1708E9 + map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1, SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle + map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2, SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle + map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3, SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle .2byte 0 -EventScript_1708E9:: @ 1708E9 +SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle:: @ 1708E9 lockall textcolor 1 - applymovement OBJ_EVENT_ID_PLAYER, Movement_170953 + applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerReEnterRoom waitmovement 0 - applymovement 1, Movement_170955 + applymovement LOCALID_OLD_WOMAN, SevenIsland_House_Room1_Movement_OldWomanWalkBehindPlayer waitmovement 0 - moveobjectoffscreen 1 + moveobjectoffscreen LOCALID_OLD_WOMAN applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1 - call_if_eq EventScript_170938 + call_if_eq SevenIsland_House_Room1_EventScript_BattleWonComment compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2 - call_if_eq EventScript_170941 + call_if_eq SevenIsland_House_Room1_EventScript_BattleLostComment compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3 - call_if_eq EventScript_17094A + call_if_eq SevenIsland_House_Room1_EventScript_BattleTiedComment special LoadPlayerParty setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0 releaseall end -EventScript_170938:: @ 8170938 - msgbox gUnknown_81A088C +SevenIsland_House_Room1_EventScript_BattleWonComment:: @ 8170938 + msgbox SevenIsland_House_Room1_Text_AstoundingBattle return -EventScript_170941:: @ 8170941 - msgbox gUnknown_81A0971 +SevenIsland_House_Room1_EventScript_BattleLostComment:: @ 8170941 + msgbox SevenIsland_House_Room1_Text_FeelYourDisappointment return -EventScript_17094A:: @ 817094A - msgbox gUnknown_81A0807 +SevenIsland_House_Room1_EventScript_BattleTiedComment:: @ 817094A + msgbox SevenIsland_House_Room1_Text_DrawWasIt return -Movement_170953:: @ 8170953 +SevenIsland_House_Room1_Movement_PlayerReEnterRoom:: @ 8170953 walk_down step_end -Movement_170955:: @ 8170955 +SevenIsland_House_Room1_Movement_OldWomanWalkBehindPlayer:: @ 8170955 walk_right walk_in_place_fastest_down step_end -SevenIsland_House_Room1_EventScript_170958:: @ 8170958 +SevenIsland_House_Room1_EventScript_OldWoman:: @ 8170958 lock faceplayer special ValidateEReaderTrainer compare VAR_RESULT, 1 - call_if_eq EventScript_17097D - compare VAR_TEMP_1, 1 - goto_if_eq EventScript_170987 - msgbox gUnknown_81A049B + call_if_eq SevenIsland_House_Room1_EventScript_InvalidVisitingTrainer + compare TRAINER_VISITING, TRUE + goto_if_eq SevenIsland_House_Room1_EventScript_TrainerVisiting + msgbox SevenIsland_House_Room1_Text_OnlyEnjoymentWatchingBattles release end -EventScript_17097D:: @ 817097D - msgbox gUnknown_81A049B +SevenIsland_House_Room1_EventScript_InvalidVisitingTrainer:: @ 817097D + msgbox SevenIsland_House_Room1_Text_OnlyEnjoymentWatchingBattles release end -EventScript_170987:: @ 8170987 +SevenIsland_House_Room1_EventScript_TrainerVisiting:: @ 8170987 special SavePlayerParty - special Special_BufferEReaderTrainerName5 - msgbox gUnknown_81A0598, MSGBOX_YESNO + special BufferEReaderTrainerName + msgbox SevenIsland_House_Room1_Text_ChallengeVisitingTrainer, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_170A11 - call EventScript_170A1E + goto_if_eq SevenIsland_House_Room1_EventScript_DeclineBattle + call SevenIsland_House_Room1_EventScript_ChooseParty compare VAR_RESULT, 0 - goto_if_eq EventScript_170A11 - msgbox gUnknown_81A0788, MSGBOX_YESNO + goto_if_eq SevenIsland_House_Room1_EventScript_DeclineBattle + msgbox SevenIsland_House_Room1_Text_SaveProgressBeforeBattle, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_170A11 + goto_if_eq SevenIsland_House_Room1_EventScript_DeclineBattle special LoadPlayerParty call EventScript_AskSaveGame compare VAR_RESULT, 0 - goto_if_eq EventScript_170A11 + goto_if_eq SevenIsland_House_Room1_EventScript_DeclineBattle special SavePlayerParty special ReducePlayerPartyToThree - msgbox gUnknown_81A07C4 + msgbox SevenIsland_House_Room1_Text_DontHoldAnythingBack closemessage compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_170A2D + call_if_eq SevenIsland_House_Room1_EventScript_EnterBattleRoomNorth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_170A3F + call_if_eq SevenIsland_House_Room1_EventScript_EnterBattleRoomEast compare VAR_FACING, DIR_WEST - call_if_eq EventScript_170A51 + call_if_eq SevenIsland_House_Room1_EventScript_EnterBattleRoomWest warp MAP_SEVEN_ISLAND_HOUSE_ROOM2, 255, 3, 1 waitstate release end -EventScript_170A11:: @ 8170A11 +SevenIsland_House_Room1_EventScript_DeclineBattle:: @ 8170A11 special LoadPlayerParty - msgbox gUnknown_81A064E + msgbox SevenIsland_House_Room1_Text_OhYouWontBattle release end -EventScript_170A1E:: @ 8170A1E - msgbox gUnknown_81A06AB +SevenIsland_House_Room1_EventScript_ChooseParty:: @ 8170A1E + msgbox SevenIsland_House_Room1_Text_LimitThreeMonsPerSide fadescreen FADE_TO_BLACK special ChooseHalfPartyForBattle waitstate return -EventScript_170A2D:: @ 8170A2D - applymovement VAR_LAST_TALKED, Movement_170A6F - applymovement OBJ_EVENT_ID_PLAYER, Movement_170A63 +SevenIsland_House_Room1_EventScript_EnterBattleRoomNorth:: @ 8170A2D + applymovement VAR_LAST_TALKED, SevenIsland_House_Room1_Movement_OldWomanMoveAsideLeft + applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomNorth waitmovement 0 return -EventScript_170A3F:: @ 8170A3F - applymovement VAR_LAST_TALKED, Movement_170A72 - applymovement OBJ_EVENT_ID_PLAYER, Movement_170A67 +SevenIsland_House_Room1_EventScript_EnterBattleRoomEast:: @ 8170A3F + applymovement VAR_LAST_TALKED, SevenIsland_House_Room1_Movement_OldWomanMoveAsideRight + applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomEast waitmovement 0 return -EventScript_170A51:: @ 8170A51 - applymovement VAR_LAST_TALKED, Movement_170A6F - applymovement OBJ_EVENT_ID_PLAYER, Movement_170A6B +SevenIsland_House_Room1_EventScript_EnterBattleRoomWest:: @ 8170A51 + applymovement VAR_LAST_TALKED, SevenIsland_House_Room1_Movement_OldWomanMoveAsideLeft + applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomWest waitmovement 0 return -Movement_170A63:: @ 8170A63 +SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomNorth:: @ 8170A63 delay_16 walk_up walk_up step_end -Movement_170A67:: @ 8170A67 +SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomEast:: @ 8170A67 delay_16 walk_right walk_up step_end -Movement_170A6B:: @ 8170A6B +SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomWest:: @ 8170A6B delay_16 walk_left walk_up step_end -Movement_170A6F:: @ 8170A6F +SevenIsland_House_Room1_Movement_OldWomanMoveAsideLeft:: @ 8170A6F walk_left walk_in_place_fastest_right step_end -Movement_170A72:: @ 8170A72 +SevenIsland_House_Room1_Movement_OldWomanMoveAsideRight:: @ 8170A72 walk_right walk_in_place_fastest_left step_end -SevenIsland_House_Room1_EventScript_170A75:: @ 8170A75 - msgbox gUnknown_81A0567, MSGBOX_SIGN +SevenIsland_House_Room1_EventScript_Box:: @ 8170A75 + msgbox SevenIsland_House_Room1_Text_SlightBreezeAroundBox, MSGBOX_SIGN end diff --git a/data/maps/SevenIsland_House_Room1/text.inc b/data/maps/SevenIsland_House_Room1/text.inc index 2e6c7f2f8..d8ddad04e 100644 --- a/data/maps/SevenIsland_House_Room1/text.inc +++ b/data/maps/SevenIsland_House_Room1/text.inc @@ -1,4 +1,4 @@ -gUnknown_81A049B:: @ 81A049B +SevenIsland_House_Room1_Text_OnlyEnjoymentWatchingBattles:: @ 81A049B .string "I may not look like much now,\n" .string "but when I was younger…\p" .string "I flew everywhere, challenging\n" @@ -7,11 +7,11 @@ gUnknown_81A049B:: @ 81A049B .string "is reminiscing about the past while\l" .string "watching battles.$" -gUnknown_81A0567:: @ 81A0567 +SevenIsland_House_Room1_Text_SlightBreezeAroundBox:: @ 81A0567 .string "There is a slight breeze blowing\n" .string "around the box.$" -gUnknown_81A0598:: @ 81A0598 +SevenIsland_House_Room1_Text_ChallengeVisitingTrainer:: @ 81A0598 .string "Ah!\n" .string "Welcome, my friend!\p" .string "Let me tell you something. There's\n" @@ -21,7 +21,7 @@ gUnknown_81A0598:: @ 81A0598 .string "Tell me, you did come to challenge\n" .string "{STR_VAR_1}, am I right?$" -gUnknown_81A064E:: @ 81A064E +SevenIsland_House_Room1_Text_OhYouWontBattle:: @ 81A064E .string "Oh…\n" .string "You won't battle…\p" .string "I see, I see.\n" @@ -29,7 +29,7 @@ gUnknown_81A064E:: @ 81A064E .string "Well, perhaps if you change your\n" .string "mind, do come back.$" -gUnknown_81A06AB:: @ 81A06AB +SevenIsland_House_Room1_Text_LimitThreeMonsPerSide:: @ 81A06AB .string "Ah!\n" .string "You will battle for me?\p" .string "It was worth my time moving the\n" @@ -41,31 +41,33 @@ gUnknown_81A06AB:: @ 81A06AB .string "Can I get you to limit it to\n" .string "battles of three POKéMON per side?$" -gUnknown_81A0788:: @ 81A0788 +SevenIsland_House_Room1_Text_SaveProgressBeforeBattle:: @ 81A0788 .string "Fine! Before your battle, would\n" .string "you like to save your game?$" -gUnknown_81A07C4:: @ 81A07C4 +SevenIsland_House_Room1_Text_DontHoldAnythingBack:: @ 81A07C4 .string "All right.\n" .string "Don't hold anything back!$" -Text_1A07E9:: @ 81A07E9 +@ Unused +SevenIsland_House_Room1_Text_StrVar1_1:: @ 81A07E9 .string "{STR_VAR_1}$" -gUnknown_81A07EC:: @ 81A07EC +SevenIsland_House_Room2_Text_MatchEndedUpDraw:: @ 81A07EC .string "The match ended up a draw.$" -gUnknown_81A0807:: @ 81A0807 +SevenIsland_House_Room1_Text_DrawWasIt:: @ 81A0807 .string "A draw, was it?\p" .string "However, let me say that it was\n" .string "a worthy spectacle.\p" .string "I'd say it was a wonderful battle\n" .string "with a real sense of depth!$" -Text_1A0889:: @ 81A0889 +@ Unused +SevenIsland_House_Room1_Text_StrVar1_2:: @ 81A0889 .string "{STR_VAR_1}$" -gUnknown_81A088C:: @ 81A088C +SevenIsland_House_Room1_Text_AstoundingBattle:: @ 81A088C .string "Bravo!\p" .string "Bravo, indeed!\n" .string "What an astounding battle!\p" @@ -77,10 +79,11 @@ gUnknown_81A088C:: @ 81A088C .string "Yes!\n" .string "It was sheer magnificence!$" -Text_1A096E:: @ 81A096E +@ Unused +SevenIsland_House_Room1_Text_StrVar1_3:: @ 81A096E .string "{STR_VAR_1}$" -gUnknown_81A0971:: @ 81A0971 +SevenIsland_House_Room1_Text_FeelYourDisappointment:: @ 81A0971 .string "Too bad!\n" .string "I feel your disappointment.\p" .string "However, that disappointment is\n" diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index 8d0ef3475..311c7200f 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -8,14 +8,14 @@ SevenIsland_House_Room2_OnTransition:: @ 8170A89 end SevenIsland_House_Room2_OnFrame:: @ 8170A8D - map_script_2 VAR_TEMP_1, 0, EventScript_170A97 + map_script_2 VAR_TEMP_1, 0, SevenIsland_House_Room2_EventScript_BattleVisitingTrainer .2byte 0 -EventScript_170A97:: @ 8170A97 +SevenIsland_House_Room2_EventScript_BattleVisitingTrainer:: @ 8170A97 lockall - applymovement OBJ_EVENT_ID_PLAYER, Movement_170B22 + applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room2_Movement_PlayerEnterRoom waitmovement 0 - special PrintEReaderTrainerGreeting + special BufferEReaderTrainerGreeting msgbox gStringVar4 closemessage setvar VAR_0x8004, 2 @@ -23,14 +23,14 @@ EventScript_170A97:: @ 8170A97 special StartSpecialBattle waitstate compare VAR_RESULT, 3 - call_if_eq EventScript_170AFE + call_if_eq SevenIsland_House_Room2_EventScript_BattleTie compare VAR_RESULT, 1 - call_if_eq EventScript_170B0C + call_if_eq SevenIsland_House_Room2_EventScript_BattleWon compare VAR_RESULT, 2 - call_if_eq EventScript_170B17 + call_if_eq SevenIsland_House_Room2_EventScript_BattleLost closemessage special HealPlayerParty - applymovement OBJ_EVENT_ID_PLAYER, Movement_170B28 + applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room2_Movement_PlayerExitRoom waitmovement 0 special LoadPlayerParty setvar VAR_TEMP_1, 1 @@ -39,26 +39,26 @@ EventScript_170A97:: @ 8170A97 releaseall end -EventScript_170AFE:: @ 8170AFE +SevenIsland_House_Room2_EventScript_BattleTie:: @ 8170AFE setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3 - msgbox gUnknown_81A07EC + msgbox SevenIsland_House_Room2_Text_MatchEndedUpDraw return -EventScript_170B0C:: @ 8170B0C +SevenIsland_House_Room2_EventScript_BattleWon:: @ 8170B0C setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1 special Special_ShowStringVar4AsFieldMessage waitmessage waitbuttonpress return -EventScript_170B17:: @ 8170B17 +SevenIsland_House_Room2_EventScript_BattleLost:: @ 8170B17 setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2 special Special_ShowStringVar4AsFieldMessage waitmessage waitbuttonpress return -Movement_170B22:: @ 8170B22 +SevenIsland_House_Room2_Movement_PlayerEnterRoom:: @ 8170B22 walk_down walk_down walk_down @@ -66,7 +66,7 @@ Movement_170B22:: @ 8170B22 walk_right step_end -Movement_170B28:: @ 8170B28 +SevenIsland_House_Room2_Movement_PlayerExitRoom:: @ 8170B28 walk_left walk_left walk_up diff --git a/data/maps/SevenIsland_Mart/map.json b/data/maps/SevenIsland_Mart/map.json index 16ff19533..a3ba4eb37 100644 --- a/data/maps/SevenIsland_Mart/map.json +++ b/data/maps/SevenIsland_Mart/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_Mart_EventScript_170B31", + "script": "SevenIsland_Mart_EventScript_Clerk", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_Mart_EventScript_170B6E", + "script": "SevenIsland_Mart_EventScript_Lass", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_Mart_EventScript_170B80", + "script": "SevenIsland_Mart_EventScript_Fisher", "flag": "0" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_Mart_EventScript_170B77", + "script": "SevenIsland_Mart_EventScript_Hiker", "flag": "0" } ], diff --git a/data/maps/SevenIsland_Mart/scripts.inc b/data/maps/SevenIsland_Mart/scripts.inc index 2757fba07..a816cb8b4 100644 --- a/data/maps/SevenIsland_Mart/scripts.inc +++ b/data/maps/SevenIsland_Mart/scripts.inc @@ -1,19 +1,19 @@ SevenIsland_Mart_MapScripts:: @ 8170B30 .byte 0 -SevenIsland_Mart_EventScript_170B31:: @ 8170B31 +SevenIsland_Mart_EventScript_Clerk:: @ 8170B31 goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_170B58 + pokemart SevenIsland_Mart_Items msgbox Text_PleaseComeAgain release end .align 2 -Items_170B58:: @ 8170B58 +SevenIsland_Mart_Items:: @ 8170B58 .2byte ITEM_ULTRA_BALL .2byte ITEM_GREAT_BALL .2byte ITEM_FULL_RESTORE @@ -27,14 +27,14 @@ Items_170B58:: @ 8170B58 release end -SevenIsland_Mart_EventScript_170B6E:: @ 8170B6E - msgbox gUnknown_81A0A4F, MSGBOX_NPC +SevenIsland_Mart_EventScript_Lass:: @ 8170B6E + msgbox SevenIsland_Mart_Text_MonHavePersonalitiesOfTheirOwn, MSGBOX_NPC end -SevenIsland_Mart_EventScript_170B77:: @ 8170B77 - msgbox gUnknown_81A0ACC, MSGBOX_NPC +SevenIsland_Mart_EventScript_Hiker:: @ 8170B77 + msgbox SevenIsland_Mart_Text_PreparationsCompleteForRuins, MSGBOX_NPC end -SevenIsland_Mart_EventScript_170B80:: @ 8170B80 - msgbox gUnknown_81A0B09, MSGBOX_NPC +SevenIsland_Mart_EventScript_Fisher:: @ 8170B80 + msgbox SevenIsland_Mart_Text_NeedToFishOnSevenIsland, MSGBOX_NPC end diff --git a/data/maps/SevenIsland_Mart/text.inc b/data/maps/SevenIsland_Mart/text.inc index 9716c2427..ab364c889 100644 --- a/data/maps/SevenIsland_Mart/text.inc +++ b/data/maps/SevenIsland_Mart/text.inc @@ -1,14 +1,14 @@ -gUnknown_81A0A4F:: @ 81A0A4F +SevenIsland_Mart_Text_MonHavePersonalitiesOfTheirOwn:: @ 81A0A4F .string "POKéMON have personalities of their\n" .string "own, just like people.\p" .string "My PIKACHU has a HASTY nature,\n" .string "so it grew to be a speedy POKéMON.$" -gUnknown_81A0ACC:: @ 81A0ACC +SevenIsland_Mart_Text_PreparationsCompleteForRuins:: @ 81A0ACC .string "Okay, preparations are complete\n" .string "for me to explore the RUINS.$" -gUnknown_81A0B09:: @ 81A0B09 +SevenIsland_Mart_Text_NeedToFishOnSevenIsland:: @ 81A0B09 .string "I need to fish on SEVEN ISLAND.\p" .string "That will complete my fishing tour\n" .string "of the SEVII ISLANDS.\p" diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json index 522d68473..40f31f2b8 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_PokemonCenter_1F_EventScript_170B98", + "script": "SevenIsland_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_PokemonCenter_1F_EventScript_170BA1", + "script": "SevenIsland_PokemonCenter_1F_EventScript_OldMan", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_PokemonCenter_1F_EventScript_170BAA", + "script": "SevenIsland_PokemonCenter_1F_EventScript_Sailor", "flag": "0" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_PokemonCenter_1F_EventScript_170BB3", + "script": "SevenIsland_PokemonCenter_1F_EventScript_Beauty", "flag": "0" }, { @@ -77,7 +77,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_PokemonCenter_1F_EventScript_1ACFD4", + "script": "SevenIsland_PokemonCenter_1F_EventScript_PokemonJournal", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { @@ -90,7 +90,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_PokemonCenter_1F_EventScript_1ACFD4", + "script": "SevenIsland_PokemonCenter_1F_EventScript_PokemonJournal", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], diff --git a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc index 459806f32..447d9d1e8 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc @@ -7,21 +7,21 @@ SevenIsland_PokemonCenter_1F_OnTransition:: @ 8170B94 setrespawn SPAWN_SEVEN_ISLAND end -SevenIsland_PokemonCenter_1F_EventScript_170B98:: @ 8170B98 +SevenIsland_PokemonCenter_1F_EventScript_Nurse:: @ 8170B98 lock faceplayer call EventScript_PkmnCenterNurse release end -SevenIsland_PokemonCenter_1F_EventScript_170BA1:: @ 8170BA1 - msgbox gUnknown_81A0B98, MSGBOX_NPC +SevenIsland_PokemonCenter_1F_EventScript_OldMan:: @ 8170BA1 + msgbox SevenIsland_PokemonCenter_1F_Text_EventsDependingOnConnections, MSGBOX_NPC end -SevenIsland_PokemonCenter_1F_EventScript_170BAA:: @ 8170BAA - msgbox gUnknown_81A0C1F, MSGBOX_NPC +SevenIsland_PokemonCenter_1F_EventScript_Sailor:: @ 8170BAA + msgbox SevenIsland_PokemonCenter_1F_Text_DidYouRideSeagallopHere, MSGBOX_NPC end -SevenIsland_PokemonCenter_1F_EventScript_170BB3:: @ 8170BB3 - msgbox gUnknown_81A0CA5, MSGBOX_NPC +SevenIsland_PokemonCenter_1F_EventScript_Beauty:: @ 8170BB3 + msgbox SevenIsland_PokemonCenter_1F_Text_CheckOutTrainerTower, MSGBOX_NPC end diff --git a/data/maps/SevenIsland_PokemonCenter_1F/text.inc b/data/maps/SevenIsland_PokemonCenter_1F/text.inc index 44e325ca0..feacb5b4d 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/text.inc +++ b/data/maps/SevenIsland_PokemonCenter_1F/text.inc @@ -1,11 +1,11 @@ -gUnknown_81A0B98:: @ 81A0B98 +SevenIsland_PokemonCenter_1F_Text_EventsDependingOnConnections:: @ 81A0B98 .string "On this island, different events\n" .string "occur depending on connections.\p" .string "What are those connections?\p" .string "They are for you to discover on\n" .string "your own.$" -gUnknown_81A0C1F:: @ 81A0C1F +SevenIsland_PokemonCenter_1F_Text_DidYouRideSeagallopHere:: @ 81A0C1F .string "Did you ride a SEAGALLOP ferry\n" .string "to get here?\p" .string "There are at least ten of those\n" @@ -13,7 +13,7 @@ gUnknown_81A0C1F:: @ 81A0C1F .string "I don't know where they all go,\n" .string "though.$" -gUnknown_81A0CA5:: @ 81A0CA5 +SevenIsland_PokemonCenter_1F_Text_CheckOutTrainerTower:: @ 81A0CA5 .string "If you're confident, you should\n" .string "check out TRAINER TOWER.$" diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index b9c1bc77e..a3d196ac3 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SevenIsland_SevaultCanyon_EventScript_1ACA4D", + "script": "SevenIsland_SevaultCanyon_EventScript_Cyndy", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SevenIsland_SevaultCanyon_EventScript_1ACA8B", + "script": "SevenIsland_SevaultCanyon_EventScript_Evan", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SevenIsland_SevaultCanyon_EventScript_1ACAC9", + "script": "SevenIsland_SevaultCanyon_EventScript_Jackson", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SevenIsland_SevaultCanyon_EventScript_1ACB07", + "script": "SevenIsland_SevaultCanyon_EventScript_Katelyn", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SevenIsland_SevaultCanyon_EventScript_1ACB45", + "script": "SevenIsland_SevaultCanyon_EventScript_Leroy", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SevenIsland_SevaultCanyon_EventScript_1ACB83", + "script": "SevenIsland_SevaultCanyon_EventScript_Michelle", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SevenIsland_SevaultCanyon_EventScript_1ACBC1", + "script": "SevenIsland_SevaultCanyon_EventScript_Lex", "flag": "0" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SevenIsland_SevaultCanyon_EventScript_1ACC07", + "script": "SevenIsland_SevaultCanyon_EventScript_Nya", "flag": "0" }, { @@ -283,7 +283,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_EventScript_1ACF95", + "script": "SevenIsland_SevaultCanyon_EventScript_BlackBelt", "flag": "0" } ], @@ -320,7 +320,7 @@ "x": 16, "y": 71, "elevation": 0, - "script": "SevenIsland_SevaultCanyon_EventScript_168BFE" + "script": "SevenIsland_SevaultCanyon_EventScript_RouteSign" } ] } diff --git a/data/maps/SevenIsland_SevaultCanyon/scripts.inc b/data/maps/SevenIsland_SevaultCanyon/scripts.inc index 8c906d3f2..0d5b46b87 100644 --- a/data/maps/SevenIsland_SevaultCanyon/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon/scripts.inc @@ -1,6 +1,6 @@ SevenIsland_SevaultCanyon_MapScripts:: @ 8168BFD .byte 0 -SevenIsland_SevaultCanyon_EventScript_168BFE:: @ 8168BFE - msgbox gUnknown_818CF2B, MSGBOX_SIGN +SevenIsland_SevaultCanyon_EventScript_RouteSign:: @ 8168BFE + msgbox SevenIsland_SevaultCanyon_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/SevenIsland_SevaultCanyon/text.inc b/data/maps/SevenIsland_SevaultCanyon/text.inc index 21c87dbc0..4e3dda9d1 100644 --- a/data/maps/SevenIsland_SevaultCanyon/text.inc +++ b/data/maps/SevenIsland_SevaultCanyon/text.inc @@ -1,126 +1,126 @@ -Text_18C887:: @ 818C887 +SevenIsland_SevaultCanyon_Text_CyndyIntro:: @ 818C887 .string "My conditioning's in top form!$" -Text_18C8A6:: @ 818C8A6 +SevenIsland_SevaultCanyon_Text_CyndyDefeat:: @ 818C8A6 .string "Huh?\n" .string "Something's not right…$" -Text_18C8C2:: @ 818C8C2 +SevenIsland_SevaultCanyon_Text_CyndyPostBattle:: @ 818C8C2 .string "The way I am now, I may have to\n" .string "hold off on TRAINER TOWER…$" -Text_18C8FD:: @ 818C8FD +SevenIsland_SevaultCanyon_Text_EvanIntro:: @ 818C8FD .string "It doesn't matter if you happen to\n" .string "have the strongest POKéMON…\p" .string "It doesn't mean a thing if you don't\n" .string "know how to use them properly!$" -Text_18C980:: @ 818C980 +SevenIsland_SevaultCanyon_Text_EvanDefeat:: @ 818C980 .string "You're a master at this.$" -Text_18C999:: @ 818C999 +SevenIsland_SevaultCanyon_Text_EvanPostBattle:: @ 818C999 .string "You see them every so often,\n" .string "TRAINERS with awesome POKéMON\l" .string "who have no idea what to do.\p" .string "Before training POKéMON, TRAINERS\n" .string "themselves need to grow up.$" -Text_18CA2F:: @ 818CA2F +SevenIsland_SevaultCanyon_Text_JacksonIntro:: @ 818CA2F .string "I work to protect the environment.\n" .string "In turn, nature protects me!$" -Text_18CA6F:: @ 818CA6F +SevenIsland_SevaultCanyon_Text_JacksonDefeat:: @ 818CA6F .string "Whoa! You're tough!\n" .string "How about protecting me?$" -Text_18CA9C:: @ 818CA9C +SevenIsland_SevaultCanyon_Text_JacksonPostBattle:: @ 818CA9C .string "From far out among the stars, our\n" .string "planet is just a drop of water.\p" .string "But we want to protect that drop\n" .string "of water for everyone.$" -Text_18CB16:: @ 818CB16 +SevenIsland_SevaultCanyon_Text_KatelynIntro:: @ 818CB16 .string "Those shoes you have are pretty\n" .string "snazzy.$" -Text_18CB3E:: @ 818CB3E +SevenIsland_SevaultCanyon_Text_KatelynDefeat:: @ 818CB3E .string "You're hot stuff in spite of your\n" .string "cute looks.$" -Text_18CB6C:: @ 818CB6C +SevenIsland_SevaultCanyon_Text_KatelynPostBattle:: @ 818CB6C .string "Your mom bought those snazzy\n" .string "RUNNING SHOES for you?\p" .string "She must adore you.$" -Text_18CBB4:: @ 818CBB4 +SevenIsland_SevaultCanyon_Text_LeroyIntro:: @ 818CBB4 .string "You look strong.\n" .string "Let me battle you, please!$" -Text_18CBE0:: @ 818CBE0 +SevenIsland_SevaultCanyon_Text_LeroyDefeat:: @ 818CBE0 .string "I knew it!\n" .string "You're as tough as I thought!$" -Text_18CC09:: @ 818CC09 +SevenIsland_SevaultCanyon_Text_LeroyPostBattle:: @ 818CC09 .string "The way you battle has given me\n" .string "a lot of useful data.\p" .string "Thanks so much!$" -Text_18CC4F:: @ 818CC4F +SevenIsland_SevaultCanyon_Text_MichelleIntro:: @ 818CC4F .string "I was given the best possible\n" .string "education to become this strong.\p" .string "I don't want to lose to anyone!$" -Text_18CCAE:: @ 818CCAE +SevenIsland_SevaultCanyon_Text_MichelleDefeat:: @ 818CCAE .string "Thank you. I feel like I've been\n" .string "set free by losing to you.$" -Text_18CCEA:: @ 818CCEA +SevenIsland_SevaultCanyon_Text_MichellePostBattle:: @ 818CCEA .string "For some reason, I get furious\n" .string "over the slightest thing.\p" .string "I'll calm myself by breathing\n" .string "deeply.$" -Text_18CD49:: @ 818CD49 +SevenIsland_SevaultCanyon_Text_LexIntro:: @ 818CD49 .string "LEX: My darling NYA, together\n" .string "we could win!$" -Text_18CD75:: @ 818CD75 +SevenIsland_SevaultCanyon_Text_LexDefeat:: @ 818CD75 .string "LEX: I seem to have been too\n" .string "careless…$" -Text_18CD9C:: @ 818CD9C +SevenIsland_SevaultCanyon_Text_LexPostBattle:: @ 818CD9C .string "LEX: I think it was a good\n" .string "experience for NYA.\p" .string "You have my gratitude.$" -Text_18CDE2:: @ 818CDE2 +SevenIsland_SevaultCanyon_Text_LexNotEnoughMons:: @ 818CDE2 .string "LEX: May I ask you to battle the\n" .string "both of us at the same time?$" -Text_18CE20:: @ 818CE20 +SevenIsland_SevaultCanyon_Text_NyaIntro:: @ 818CE20 .string "NYA: I'll do my best so I won't\n" .string "drag down my mentor, LEX!$" -Text_18CE5A:: @ 818CE5A +SevenIsland_SevaultCanyon_Text_NyaDefeat:: @ 818CE5A .string "NYA: Oh, no…\n" .string "I'm so sorry, I…$" -Text_18CE78:: @ 818CE78 +SevenIsland_SevaultCanyon_Text_NyaPostBattle:: @ 818CE78 .string "NYA: I think I'm going to need\n" .string "much more seasoning and tutoring\l" .string "under LEX…\p" .string "…So, LEX, please, may I stay with\n" .string "you like this?$" -Text_18CEF4:: @ 818CEF4 +SevenIsland_SevaultCanyon_Text_NyaNotEnoughMons:: @ 818CEF4 .string "NYA: I'm sorry, but may we battle\n" .string "in two-on-two style?$" -gUnknown_818CF2B:: @ 818CF2B +SevenIsland_SevaultCanyon_Text_RouteSign:: @ 818CF2B .string "SEVAULT CANYON\n" .string "TANOBY RUINS AHEAD$" -Text_18CF4D:: @ 818CF4D +SevenIsland_SevaultCanyon_Text_BrunoTrainedWithBrawly:: @ 818CF4D .string "Training by oneself is certainly\n" .string "not a bad thing.\p" .string "But it's also not bad to aim for\n" diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json index 75c09cc6f..6939e8dfc 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9", + "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_Miah", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907", + "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_Eve", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D", + "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_Jon", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1", + "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_Nicolas", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F", + "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_Madeline", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993", + "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_Mason", "flag": "0" }, { @@ -137,7 +137,7 @@ "x": 14, "y": 26, "elevation": 0, - "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_168BF4" + "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_RouteSign" } ] } diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc index 617055d66..b032d990b 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc @@ -1,6 +1,6 @@ SevenIsland_SevaultCanyon_Entrance_MapScripts:: @ 8168BF3 .byte 0 -SevenIsland_SevaultCanyon_Entrance_EventScript_168BF4:: @ 8168BF4 - msgbox gUnknown_818C82D, MSGBOX_SIGN +SevenIsland_SevaultCanyon_Entrance_EventScript_RouteSign:: @ 8168BF4 + msgbox SevenIsland_SevaultCanyon_Entrance_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc index 86ade1dbd..3ab590e41 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc @@ -1,100 +1,92 @@ -Text_18C384:: @ 818C384 - .string "トレーナータワーには\n" - .string "いまは　はいれない　みたい‥$" - -Text_18C39E:: @ 818C39E - .string "トレーナータワーが　あいてる！\n" - .string "さっそく　はいってみよう！$" - -Text_18C3BC:: @ 818C3BC +SevenIsland_SevaultCanyon_Entrance_Text_MiahIntro:: @ 818C3BC .string "Kyahaha!\n" .string "I'll flick you away effortlessly!$" -Text_18C3E7:: @ 818C3E7 +SevenIsland_SevaultCanyon_Entrance_Text_MiahDefeat:: @ 818C3E7 .string "Tch!\n" .string "Too strong for me!$" -Text_18C3FF:: @ 818C3FF +SevenIsland_SevaultCanyon_Entrance_Text_MiahPostBattle:: @ 818C3FF .string "What's that?\n" .string "I don't act the way I look?\p" .string "Heh, that's a part of my strategy!$" -Text_18C44B:: @ 818C44B +SevenIsland_SevaultCanyon_Entrance_Text_MasonIntro:: @ 818C44B .string "Howdy!\n" .string "Are you a member of my fan club?$" -Text_18C473:: @ 818C473 +SevenIsland_SevaultCanyon_Entrance_Text_MasonDefeat:: @ 818C473 .string "Oh, so you're not a fan…\p" .string "Well, I can change that.\n" .string "Let me sing for you!$" -Text_18C4BA:: @ 818C4BA +SevenIsland_SevaultCanyon_Entrance_Text_MasonPostBattle:: @ 818C4BA .string "Lalalah…\n" .string "My POKéMON, I send them out,\l" .string "all the girls scream and shout!$" -Text_18C500:: @ 818C500 +SevenIsland_SevaultCanyon_Entrance_Text_NicolasIntro:: @ 818C500 .string "This island is too spread out…\n" .string "It's not easy patrolling the place.$" -Text_18C543:: @ 818C543 +SevenIsland_SevaultCanyon_Entrance_Text_NicolasDefeat:: @ 818C543 .string "Uh-huh…$" -Text_18C54B:: @ 818C54B +SevenIsland_SevaultCanyon_Entrance_Text_NicolasPostBattle:: @ 818C54B .string "TRAINERS like you from cities,\n" .string "they sure are tough.\p" .string "You'll be headed for the TOWER,\n" .string "won't you?$" -Text_18C5AA:: @ 818C5AA +SevenIsland_SevaultCanyon_Entrance_Text_MadelineIntro:: @ 818C5AA .string "I punish people who abuse\n" .string "POKéMON!$" -Text_18C5CD:: @ 818C5CD +SevenIsland_SevaultCanyon_Entrance_Text_MadelineDefeat:: @ 818C5CD .string "You don't seem to be a problem\n" .string "TRAINER.$" -Text_18C5F5:: @ 818C5F5 +SevenIsland_SevaultCanyon_Entrance_Text_MadelinePostBattle:: @ 818C5F5 .string "If you treat your POKéMON with\n" .string "kindness, they'll understand.$" -Text_18C632:: @ 818C632 +SevenIsland_SevaultCanyon_Entrance_Text_EveIntro:: @ 818C632 .string "EVE: I'll team up with JON and\n" .string "battle together.$" -Text_18C662:: @ 818C662 +SevenIsland_SevaultCanyon_Entrance_Text_EveDefeat:: @ 818C662 .string "EVE: Me and JON, we lost.\n" .string "Ehehe.$" -Text_18C683:: @ 818C683 +SevenIsland_SevaultCanyon_Entrance_Text_EvePostBattle:: @ 818C683 .string "EVE: I'm going to work harder with\n" .string "JON.$" -Text_18C6AB:: @ 818C6AB +SevenIsland_SevaultCanyon_Entrance_Text_EveNotEnoughMons:: @ 818C6AB .string "EVE: I want to team up with JON\n" .string "when I battle you.\p" .string "Come back with two POKéMON, okay?$" -Text_18C700:: @ 818C700 +SevenIsland_SevaultCanyon_Entrance_Text_JonIntro:: @ 818C700 .string "JON: When I'm with EVE, it feels\n" .string "like we could never lose.$" -Text_18C73B:: @ 818C73B +SevenIsland_SevaultCanyon_Entrance_Text_JonDefeat:: @ 818C73B .string "JON: When I'm with EVE,\n" .string "it doesn't feel like I've lost!$" -Text_18C773:: @ 818C773 +SevenIsland_SevaultCanyon_Entrance_Text_JonPostBattle:: @ 818C773 .string "JON: When I'm with EVE, I feel\n" .string "giddy whether I win or lose.\p" .string "It's magical!$" -Text_18C7BD:: @ 818C7BD +SevenIsland_SevaultCanyon_Entrance_Text_JonNotEnoughMons:: @ 818C7BD .string "JON: If it's with EVE, I'll be\n" .string "happy to battle with you.\p" .string "So, I'd like to make it a\n" .string "two-on-two battle, if I may.$" -gUnknown_818C82D:: @ 818C82D +SevenIsland_SevaultCanyon_Entrance_Text_RouteSign:: @ 818C82D .string "SEVAULT CANYON ENTRANCE\p" .string "TRAINERS are asked to refrain from\n" .string "damaging plants in the CANYON.$" diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json index 9dd436790..bee4a1a86 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_House_EventScript_172183", + "script": "SevenIsland_SevaultCanyon_House_EventScript_BaldingMan", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_House_EventScript_172242", + "script": "SevenIsland_SevaultCanyon_House_EventScript_Chansey", "flag": "0" }, { diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index 975444645..3d0bb73ea 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -1,57 +1,57 @@ SevenIsland_SevaultCanyon_House_MapScripts:: @ 8172182 .byte 0 -SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 +SevenIsland_SevaultCanyon_House_EventScript_BaldingMan:: @ 8172183 lock - goto_if_set FLAG_TEMP_2, EventScript_172211 + goto_if_set FLAG_TEMP_2, SevenIsland_SevaultCanyon_House_EventScript_AlreadyDanced playbgm MUS_P_SCHOOL, 0 - applymovement 1, Movement_172231 + applymovement 1, SevenIsland_SevaultCanyon_House_Movement_ChanseyDance waitmovement 0 fadedefaultbgm delay 30 applymovement 1, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_81A4D72 + msgbox SevenIsland_SevaultCanyon_House_Text_ChanseyDanceJoinIn textcolor 3 - msgbox gUnknown_81A4DAF, MSGBOX_YESNO + msgbox SevenIsland_SevaultCanyon_House_Text_WouldYouLikeToDance, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_172225 - msgbox gUnknown_81A4DD8 + goto_if_eq SevenIsland_SevaultCanyon_House_EventScript_DeclineDance + msgbox SevenIsland_SevaultCanyon_House_Text_DancedChanseyDance closemessage call EventScript_1A6675 compare VAR_FACING, DIR_SOUTH - call_if_ne EventScript_172206 + call_if_ne SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown delay 30 playbgm MUS_P_SCHOOL, 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_172231 + applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_SevaultCanyon_House_Movement_ChanseyDance waitmovement 0 fadedefaultbgm delay 30 call EventScript_OutOfCenterPartyHeal - msgbox gUnknown_81A4DF5 + msgbox SevenIsland_SevaultCanyon_House_Text_YoureAllChipperNow setflag FLAG_TEMP_2 release end -EventScript_172206:: @ 8172206 +SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown:: @ 8172206 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return -EventScript_172211:: @ 8172211 +SevenIsland_SevaultCanyon_House_EventScript_AlreadyDanced:: @ 8172211 applymovement 1, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_81A4D72 + msgbox SevenIsland_SevaultCanyon_House_Text_ChanseyDanceJoinIn release end -EventScript_172225:: @ 8172225 +SevenIsland_SevaultCanyon_House_EventScript_DeclineDance:: @ 8172225 textcolor 0 - msgbox gUnknown_81A4DC8 + msgbox SevenIsland_SevaultCanyon_House_Text_ComeOnDance release end -Movement_172231:: @ 8172231 +SevenIsland_SevaultCanyon_House_Movement_ChanseyDance:: @ 8172231 walk_in_place_down delay_16 walk_in_place_down @@ -70,12 +70,12 @@ Movement_172231:: @ 8172231 delay_4 step_end -SevenIsland_SevaultCanyon_House_EventScript_172242:: @ 8172242 +SevenIsland_SevaultCanyon_House_EventScript_Chansey:: @ 8172242 lock faceplayer waitse playmoncry SPECIES_CHANSEY, 0 - msgbox gUnknown_81A4E26 + msgbox SevenIsland_SevaultCanyon_House_Text_Chansey waitmoncry release end diff --git a/data/maps/SevenIsland_SevaultCanyon_House/text.inc b/data/maps/SevenIsland_SevaultCanyon_House/text.inc index 0602136b9..478107036 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/text.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/text.inc @@ -1,22 +1,22 @@ -gUnknown_81A4D72:: @ 81A4D72 +SevenIsland_SevaultCanyon_House_Text_ChanseyDanceJoinIn:: @ 81A4D72 .string "Dance, dance!\n" .string "CHANSEY Dance!\p" .string "You join in, too!\n" .string "Dance, dance!$" -gUnknown_81A4DAF:: @ 81A4DAF +SevenIsland_SevaultCanyon_House_Text_WouldYouLikeToDance:: @ 81A4DAF .string "Would you like to dance?$" -gUnknown_81A4DC8:: @ 81A4DC8 +SevenIsland_SevaultCanyon_House_Text_ComeOnDance:: @ 81A4DC8 .string "Come on, dance!$" -gUnknown_81A4DD8:: @ 81A4DD8 +SevenIsland_SevaultCanyon_House_Text_DancedChanseyDance:: @ 81A4DD8 .string "{PLAYER} danced the CHANSEY Dance!$" -gUnknown_81A4DF5:: @ 81A4DF5 +SevenIsland_SevaultCanyon_House_Text_YoureAllChipperNow:: @ 81A4DF5 .string "Ahahahaha!\p" .string "There, you're all chipper now!\n" .string "Lucky!$" -gUnknown_81A4E26:: @ 81A4E26 +SevenIsland_SevaultCanyon_House_Text_Chansey:: @ 81A4E26 .string "CHANSEY: Chansi! Chansi!$" diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json index 29095ad7e..f7a3a7402 100644 --- a/data/maps/SevenIsland_TrainerTower/map.json +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -31,7 +31,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SevenIsland_TrainerTower_EventScript_1AC84D", + "script": "SevenIsland_TrainerTower_EventScript_Dario", "flag": "0" }, { @@ -44,7 +44,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SevenIsland_TrainerTower_EventScript_1AC88B", + "script": "SevenIsland_TrainerTower_EventScript_Rodette", "flag": "0" } ], @@ -94,14 +94,14 @@ "x": 56, "y": 8, "elevation": 0, - "script": "SevenIsland_TrainerTower_EventScript_168BE1" + "script": "SevenIsland_TrainerTower_EventScript_TrainerTowerSign" }, { "type": "bg_event_type_0", "x": 50, "y": 30, "elevation": 0, - "script": "SevenIsland_TrainerTower_EventScript_168BEA" + "script": "SevenIsland_TrainerTower_EventScript_TrainerTowerAheadSign" } ] } diff --git a/data/maps/SevenIsland_TrainerTower/scripts.inc b/data/maps/SevenIsland_TrainerTower/scripts.inc index 56716493a..6e9daea9f 100644 --- a/data/maps/SevenIsland_TrainerTower/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower/scripts.inc @@ -6,10 +6,10 @@ SevenIsland_TrainerTower_OnTransition:: @ 8168BDB setvar VAR_MAP_SCENE_TRAINER_TOWER, 0 end -SevenIsland_TrainerTower_EventScript_168BE1:: @ 8168BE1 - msgbox gUnknown_818C338, MSGBOX_SIGN +SevenIsland_TrainerTower_EventScript_TrainerTowerSign:: @ 8168BE1 + msgbox SevenIsland_TrainerTower_Text_TrainerTowerSign, MSGBOX_SIGN end -SevenIsland_TrainerTower_EventScript_168BEA:: @ 8168BEA - msgbox gUnknown_818C370, MSGBOX_SIGN +SevenIsland_TrainerTower_EventScript_TrainerTowerAheadSign:: @ 8168BEA + msgbox SevenIsland_TrainerTower_Text_TrainerTowerAhead, MSGBOX_SIGN end diff --git a/data/maps/SevenIsland_TrainerTower/text.inc b/data/maps/SevenIsland_TrainerTower/text.inc index d0d8554b1..92fa81605 100644 --- a/data/maps/SevenIsland_TrainerTower/text.inc +++ b/data/maps/SevenIsland_TrainerTower/text.inc @@ -1,32 +1,41 @@ -Text_18C1ED:: @ 818C1ED +SevenIsland_TrainerTower_Text_DarioIntro:: @ 818C1ED .string "I sensed your approach.$" -Text_18C205:: @ 818C205 +SevenIsland_TrainerTower_Text_DarioDefeat:: @ 818C205 .string "Give up…$" -Text_18C20E:: @ 818C20E +SevenIsland_TrainerTower_Text_DarioPostBattle:: @ 818C20E .string "In your future, I sense that you\n" .string "will meet many others.\p" .string "I think you will be linked to each\n" .string "other by a strange power.$" -Text_18C283:: @ 818C283 +SevenIsland_TrainerTower_Text_RodetteIntro:: @ 818C283 .string "Somewhere on this island, peculiar\n" .string "POKéMON are sleeping.$" -Text_18C2BC:: @ 818C2BC +SevenIsland_TrainerTower_Text_RodetteDefeat:: @ 818C2BC .string "What an amazing TRAINER!$" -Text_18C2D5:: @ 818C2D5 +SevenIsland_TrainerTower_Text_RodettePostBattle:: @ 818C2D5 .string "Somewhere on this island, peculiar\n" .string "POKéMON are sleeping.\p" .string "Could it be that they're waiting\n" .string "for you?$" -gUnknown_818C338:: @ 818C338 +SevenIsland_TrainerTower_Text_TrainerTowerSign:: @ 818C338 .string "TRAINER TOWER ENTRANCE\n" .string "Rise to the Challenge, TRAINERS!$" -gUnknown_818C370:: @ 818C370 +SevenIsland_TrainerTower_Text_TrainerTowerAhead:: @ 818C370 .string "TRAINER TOWER AHEAD$" +@ Unused text perhaps indicating Trainer Tower was planned to be unlocked by something +SevenIsland_TrainerTower_Text_LooksLikeTrainerTowerIsClosed:: @ 818C384 + .string "トレーナータワーには\n" + .string "いまは　はいれない　みたい‥$" + +SevenIsland_TrainerTower_Text_TrainerTowerIsOpenLetsGoIn:: @ 818C39E + .string "トレーナータワーが　あいてる！\n" + .string "さっそく　はいってみよう！$" + diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index b53630361..1a3744904 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -169,11 +169,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_PokemonJournalBruno:: @ 81ACF7A release end -SevenIsland_SevaultCanyon_EventScript_1ACF95:: @ 81ACF95 +SevenIsland_SevaultCanyon_EventScript_BlackBelt:: @ 81ACF95 lock faceplayer famechecker FAMECHECKER_BRUNO, 5 - msgbox Text_18CF4D + msgbox SevenIsland_SevaultCanyon_Text_BrunoTrainedWithBrawly release end @@ -186,12 +186,12 @@ IndigoPlateau_PokemonCenter_1F_EventScript_BlackBelt:: @ 81ACFAE release end -SevenIsland_PokemonCenter_1F_EventScript_1ACFD4:: @ 81ACFD4 +SevenIsland_PokemonCenter_1F_EventScript_PokemonJournal:: @ 81ACFD4 lock faceplayer famechecker FAMECHECKER_AGATHA, 3 textcolor 3 - msgbox gUnknown_81B19A8 + msgbox PokemonJournal_Text_SpecialFeatureAgatha release end diff --git a/data/scripts/trainers.inc b/data/scripts/trainers.inc index 1508f52b2..57dd7df68 100644 --- a/data/scripts/trainers.inc +++ b/data/scripts/trainers.inc @@ -2780,223 +2780,223 @@ SixIsland_RuinValley_EventScript_HectorRematch:: @ 81AC836 msgbox SixIsland_RuinValley_Text_HectorPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_TrainerTower_EventScript_1AC84D:: @ 81AC84D - trainerbattle_single TRAINER_PSYCHIC_DARIO, Text_18C1ED, Text_18C205 +SevenIsland_TrainerTower_EventScript_Dario:: @ 81AC84D + trainerbattle_single TRAINER_PSYCHIC_DARIO, SevenIsland_TrainerTower_Text_DarioIntro, SevenIsland_TrainerTower_Text_DarioDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC874 - msgbox Text_18C20E, MSGBOX_AUTOCLOSE + goto_if_eq SevenIsland_TrainerTower_EventScript_DarioRematch + msgbox SevenIsland_TrainerTower_Text_DarioPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC874:: @ 81AC874 - trainerbattle_rematch TRAINER_PSYCHIC_DARIO, Text_1C42D6, Text_18C205 - msgbox Text_18C20E, MSGBOX_AUTOCLOSE +SevenIsland_TrainerTower_EventScript_DarioRematch:: @ 81AC874 + trainerbattle_rematch TRAINER_PSYCHIC_DARIO, SevenIsland_TrainerTower_Text_DarioRematchIntro, SevenIsland_TrainerTower_Text_DarioDefeat + msgbox SevenIsland_TrainerTower_Text_DarioPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_TrainerTower_EventScript_1AC88B:: @ 81AC88B - trainerbattle_single TRAINER_PSYCHIC_RODETTE, Text_18C283, Text_18C2BC +SevenIsland_TrainerTower_EventScript_Rodette:: @ 81AC88B + trainerbattle_single TRAINER_PSYCHIC_RODETTE, SevenIsland_TrainerTower_Text_RodetteIntro, SevenIsland_TrainerTower_Text_RodetteDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC8B2 - msgbox Text_18C2D5, MSGBOX_AUTOCLOSE + goto_if_eq SevenIsland_TrainerTower_EventScript_RodetteRematch + msgbox SevenIsland_TrainerTower_Text_RodettePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC8B2:: @ 81AC8B2 - trainerbattle_rematch TRAINER_PSYCHIC_RODETTE, Text_1C42EE, Text_18C2BC - msgbox Text_18C2D5, MSGBOX_AUTOCLOSE +SevenIsland_TrainerTower_EventScript_RodetteRematch:: @ 81AC8B2 + trainerbattle_rematch TRAINER_PSYCHIC_RODETTE, SevenIsland_TrainerTower_Text_RodetteRematchIntro, SevenIsland_TrainerTower_Text_RodetteDefeat + msgbox SevenIsland_TrainerTower_Text_RodettePostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9:: @ 81AC8C9 - trainerbattle_single TRAINER_AROMA_LADY_MIAH, Text_18C3BC, Text_18C3E7 +SevenIsland_SevaultCanyon_Entrance_EventScript_Miah:: @ 81AC8C9 + trainerbattle_single TRAINER_AROMA_LADY_MIAH, SevenIsland_SevaultCanyon_Entrance_Text_MiahIntro, SevenIsland_SevaultCanyon_Entrance_Text_MiahDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC8F0 - msgbox Text_18C3FF, MSGBOX_AUTOCLOSE + goto_if_eq SevenIsland_SevaultCanyon_Entrance_EventScript_MiahRematch + msgbox SevenIsland_SevaultCanyon_Entrance_Text_MiahPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC8F0:: @ 81AC8F0 - trainerbattle_rematch TRAINER_AROMA_LADY_MIAH, Text_1C4327, Text_18C3E7 - msgbox Text_18C3FF, MSGBOX_AUTOCLOSE +SevenIsland_SevaultCanyon_Entrance_EventScript_MiahRematch:: @ 81AC8F0 + trainerbattle_rematch TRAINER_AROMA_LADY_MIAH, SevenIsland_SevaultCanyon_Entrance_Text_MiahRematchIntro, SevenIsland_SevaultCanyon_Entrance_Text_MiahDefeat + msgbox SevenIsland_SevaultCanyon_Entrance_Text_MiahPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907:: @ 81AC907 - trainerbattle_double TRAINER_YOUNG_COUPLE_EVE_JON, Text_18C632, Text_18C662, Text_18C6AB +SevenIsland_SevaultCanyon_Entrance_EventScript_Eve:: @ 81AC907 + trainerbattle_double TRAINER_YOUNG_COUPLE_EVE_JON, SevenIsland_SevaultCanyon_Entrance_Text_EveIntro, SevenIsland_SevaultCanyon_Entrance_Text_EveDefeat, SevenIsland_SevaultCanyon_Entrance_Text_EveNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC932 - msgbox Text_18C683, MSGBOX_AUTOCLOSE + goto_if_eq SevenIsland_SevaultCanyon_Entrance_EventScript_EveRematch + msgbox SevenIsland_SevaultCanyon_Entrance_Text_EvePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC932:: @ 81AC932 - trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_EVE_JON, Text_1C4416, Text_18C662, Text_18C6AB - msgbox Text_18C683, MSGBOX_AUTOCLOSE +SevenIsland_SevaultCanyon_Entrance_EventScript_EveRematch:: @ 81AC932 + trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_EVE_JON, SevenIsland_SevaultCanyon_Entrance_Text_EveRematchIntro, SevenIsland_SevaultCanyon_Entrance_Text_EveDefeat, SevenIsland_SevaultCanyon_Entrance_Text_EveNotEnoughMons + msgbox SevenIsland_SevaultCanyon_Entrance_Text_EvePostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D:: @ 81AC94D - trainerbattle_double TRAINER_YOUNG_COUPLE_EVE_JON, Text_18C700, Text_18C73B, Text_18C7BD +SevenIsland_SevaultCanyon_Entrance_EventScript_Jon:: @ 81AC94D + trainerbattle_double TRAINER_YOUNG_COUPLE_EVE_JON, SevenIsland_SevaultCanyon_Entrance_Text_JonIntro, SevenIsland_SevaultCanyon_Entrance_Text_JonDefeat, SevenIsland_SevaultCanyon_Entrance_Text_JonNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC978 - msgbox Text_18C773, MSGBOX_AUTOCLOSE + goto_if_eq SevenIsland_SevaultCanyon_Entrance_EventScript_JonRematch + msgbox SevenIsland_SevaultCanyon_Entrance_Text_JonPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC978:: @ 81AC978 - trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_EVE_JON, Text_1C444C, Text_18C73B, Text_18C7BD - msgbox Text_18C773, MSGBOX_AUTOCLOSE +SevenIsland_SevaultCanyon_Entrance_EventScript_JonRematch:: @ 81AC978 + trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_EVE_JON, SevenIsland_SevaultCanyon_Entrance_Text_JonRematchIntro, SevenIsland_SevaultCanyon_Entrance_Text_JonDefeat, SevenIsland_SevaultCanyon_Entrance_Text_JonNotEnoughMons + msgbox SevenIsland_SevaultCanyon_Entrance_Text_JonPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993:: @ 81AC993 - trainerbattle_single TRAINER_JUGGLER_MASON, Text_18C44B, Text_18C473 +SevenIsland_SevaultCanyon_Entrance_EventScript_Mason:: @ 81AC993 + trainerbattle_single TRAINER_JUGGLER_MASON, SevenIsland_SevaultCanyon_Entrance_Text_MasonIntro, SevenIsland_SevaultCanyon_Entrance_Text_MasonDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC9BA - msgbox Text_18C4BA, MSGBOX_AUTOCLOSE + goto_if_eq SevenIsland_SevaultCanyon_Entrance_EventScript_MasonRematch + msgbox SevenIsland_SevaultCanyon_Entrance_Text_MasonPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC9BA:: @ 81AC9BA - trainerbattle_rematch TRAINER_JUGGLER_MASON, Text_1C4374, Text_18C473 - msgbox Text_18C4BA, MSGBOX_AUTOCLOSE +SevenIsland_SevaultCanyon_Entrance_EventScript_MasonRematch:: @ 81AC9BA + trainerbattle_rematch TRAINER_JUGGLER_MASON, SevenIsland_SevaultCanyon_Entrance_Text_MasonRematchIntro, SevenIsland_SevaultCanyon_Entrance_Text_MasonDefeat + msgbox SevenIsland_SevaultCanyon_Entrance_Text_MasonPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1:: @ 81AC9D1 - trainerbattle_single TRAINER_PKMN_RANGER_NICOLAS, Text_18C500, Text_18C543 +SevenIsland_SevaultCanyon_Entrance_EventScript_Nicolas:: @ 81AC9D1 + trainerbattle_single TRAINER_PKMN_RANGER_NICOLAS, SevenIsland_SevaultCanyon_Entrance_Text_NicolasIntro, SevenIsland_SevaultCanyon_Entrance_Text_NicolasDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC9F8 - msgbox Text_18C54B, MSGBOX_AUTOCLOSE + goto_if_eq SevenIsland_SevaultCanyon_Entrance_EventScript_NicolasRematch + msgbox SevenIsland_SevaultCanyon_Entrance_Text_NicolasPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC9F8:: @ 81AC9F8 - trainerbattle_rematch TRAINER_PKMN_RANGER_NICOLAS, Text_1C43AD, Text_18C543 - msgbox Text_18C54B, MSGBOX_AUTOCLOSE +SevenIsland_SevaultCanyon_Entrance_EventScript_NicolasRematch:: @ 81AC9F8 + trainerbattle_rematch TRAINER_PKMN_RANGER_NICOLAS, SevenIsland_SevaultCanyon_Entrance_Text_NicolasRematchIntro, SevenIsland_SevaultCanyon_Entrance_Text_NicolasDefeat + msgbox SevenIsland_SevaultCanyon_Entrance_Text_NicolasPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F:: @ 81ACA0F - trainerbattle_single TRAINER_PKMN_RANGER_MADELINE, Text_18C5AA, Text_18C5CD +SevenIsland_SevaultCanyon_Entrance_EventScript_Madeline:: @ 81ACA0F + trainerbattle_single TRAINER_PKMN_RANGER_MADELINE, SevenIsland_SevaultCanyon_Entrance_Text_MadelineIntro, SevenIsland_SevaultCanyon_Entrance_Text_MadelineDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ACA36 - msgbox Text_18C5F5, MSGBOX_AUTOCLOSE + goto_if_eq SevenIsland_SevaultCanyon_Entrance_EventScript_MadelineRematch + msgbox SevenIsland_SevaultCanyon_Entrance_Text_MadelinePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ACA36:: @ 81ACA36 - trainerbattle_rematch TRAINER_PKMN_RANGER_MADELINE, Text_1C43EC, Text_18C5CD - msgbox Text_18C5F5, MSGBOX_AUTOCLOSE +SevenIsland_SevaultCanyon_Entrance_EventScript_MadelineRematch:: @ 81ACA36 + trainerbattle_rematch TRAINER_PKMN_RANGER_MADELINE, SevenIsland_SevaultCanyon_Entrance_Text_MadelineRematchIntro, SevenIsland_SevaultCanyon_Entrance_Text_MadelineDefeat + msgbox SevenIsland_SevaultCanyon_Entrance_Text_MadelinePostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_EventScript_1ACA4D:: @ 81ACA4D - trainerbattle_single TRAINER_CRUSH_GIRL_CYNDY, Text_18C887, Text_18C8A6 +SevenIsland_SevaultCanyon_EventScript_Cyndy:: @ 81ACA4D + trainerbattle_single TRAINER_CRUSH_GIRL_CYNDY, SevenIsland_SevaultCanyon_Text_CyndyIntro, SevenIsland_SevaultCanyon_Text_CyndyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ACA74 - msgbox Text_18C8C2, MSGBOX_AUTOCLOSE + goto_if_eq SevenIsland_SevaultCanyon_EventScript_CyndyRematch + msgbox SevenIsland_SevaultCanyon_Text_CyndyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ACA74:: @ 81ACA74 - trainerbattle_rematch TRAINER_CRUSH_GIRL_CYNDY, Text_1C4491, Text_18C8A6 - msgbox Text_18C8C2, MSGBOX_AUTOCLOSE +SevenIsland_SevaultCanyon_EventScript_CyndyRematch:: @ 81ACA74 + trainerbattle_rematch TRAINER_CRUSH_GIRL_CYNDY, SevenIsland_SevaultCanyon_Text_CyndyRematchIntro, SevenIsland_SevaultCanyon_Text_CyndyDefeat + msgbox SevenIsland_SevaultCanyon_Text_CyndyPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_EventScript_1ACA8B:: @ 81ACA8B - trainerbattle_single TRAINER_TAMER_EVAN, Text_18C8FD, Text_18C980 +SevenIsland_SevaultCanyon_EventScript_Evan:: @ 81ACA8B + trainerbattle_single TRAINER_TAMER_EVAN, SevenIsland_SevaultCanyon_Text_EvanIntro, SevenIsland_SevaultCanyon_Text_EvanDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ACAB2 - msgbox Text_18C999, MSGBOX_AUTOCLOSE + goto_if_eq SevenIsland_SevaultCanyon_EventScript_EvanRematch + msgbox SevenIsland_SevaultCanyon_Text_EvanPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ACAB2:: @ 81ACAB2 - trainerbattle_rematch TRAINER_TAMER_EVAN, Text_1C44CB, Text_18C980 - msgbox Text_18C999, MSGBOX_AUTOCLOSE +SevenIsland_SevaultCanyon_EventScript_EvanRematch:: @ 81ACAB2 + trainerbattle_rematch TRAINER_TAMER_EVAN, SevenIsland_SevaultCanyon_Text_EvanRematchIntro, SevenIsland_SevaultCanyon_Text_EvanDefeat + msgbox SevenIsland_SevaultCanyon_Text_EvanPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_EventScript_1ACAC9:: @ 81ACAC9 - trainerbattle_single TRAINER_PKMN_RANGER_JACKSON, Text_18CA2F, Text_18CA6F +SevenIsland_SevaultCanyon_EventScript_Jackson:: @ 81ACAC9 + trainerbattle_single TRAINER_PKMN_RANGER_JACKSON, SevenIsland_SevaultCanyon_Text_JacksonIntro, SevenIsland_SevaultCanyon_Text_JacksonDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ACAF0 - msgbox Text_18CA9C, MSGBOX_AUTOCLOSE + goto_if_eq SevenIsland_SevaultCanyon_EventScript_JacksonRematch + msgbox SevenIsland_SevaultCanyon_Text_JacksonPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ACAF0:: @ 81ACAF0 - trainerbattle_rematch TRAINER_PKMN_RANGER_JACKSON, Text_1C454E, Text_18CA6F - msgbox Text_18CA9C, MSGBOX_AUTOCLOSE +SevenIsland_SevaultCanyon_EventScript_JacksonRematch:: @ 81ACAF0 + trainerbattle_rematch TRAINER_PKMN_RANGER_JACKSON, SevenIsland_SevaultCanyon_Text_JacksonRematchIntro, SevenIsland_SevaultCanyon_Text_JacksonDefeat + msgbox SevenIsland_SevaultCanyon_Text_JacksonPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_EventScript_1ACB07:: @ 81ACB07 - trainerbattle_single TRAINER_PKMN_RANGER_KATELYN, Text_18CB16, Text_18CB3E +SevenIsland_SevaultCanyon_EventScript_Katelyn:: @ 81ACB07 + trainerbattle_single TRAINER_PKMN_RANGER_KATELYN, SevenIsland_SevaultCanyon_Text_KatelynIntro, SevenIsland_SevaultCanyon_Text_KatelynDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ACB2E - msgbox Text_18CB6C, MSGBOX_AUTOCLOSE + goto_if_eq SevenIsland_SevaultCanyon_EventScript_KatelynRematch + msgbox SevenIsland_SevaultCanyon_Text_KatelynPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ACB2E:: @ 81ACB2E - trainerbattle_rematch TRAINER_PKMN_RANGER_KATELYN, Text_1C458E, Text_18CB3E - msgbox Text_18CB6C, MSGBOX_AUTOCLOSE +SevenIsland_SevaultCanyon_EventScript_KatelynRematch:: @ 81ACB2E + trainerbattle_rematch TRAINER_PKMN_RANGER_KATELYN, SevenIsland_SevaultCanyon_Text_KatelynRematchIntro, SevenIsland_SevaultCanyon_Text_KatelynDefeat + msgbox SevenIsland_SevaultCanyon_Text_KatelynPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_EventScript_1ACB45:: @ 81ACB45 - trainerbattle_single TRAINER_COOLTRAINER_LEROY, Text_18CBB4, Text_18CBE0 +SevenIsland_SevaultCanyon_EventScript_Leroy:: @ 81ACB45 + trainerbattle_single TRAINER_COOLTRAINER_LEROY, SevenIsland_SevaultCanyon_Text_LeroyIntro, SevenIsland_SevaultCanyon_Text_LeroyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ACB6C - msgbox Text_18CC09, MSGBOX_AUTOCLOSE + goto_if_eq SevenIsland_SevaultCanyon_EventScript_LeroyRematch + msgbox SevenIsland_SevaultCanyon_Text_LeroyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ACB6C:: @ 81ACB6C - trainerbattle_rematch TRAINER_COOLTRAINER_LEROY, Text_1C45C2, Text_18CBE0 - msgbox Text_18CC09, MSGBOX_AUTOCLOSE +SevenIsland_SevaultCanyon_EventScript_LeroyRematch:: @ 81ACB6C + trainerbattle_rematch TRAINER_COOLTRAINER_LEROY, SevenIsland_SevaultCanyon_Text_LeroyRematchIntro, SevenIsland_SevaultCanyon_Text_LeroyDefeat + msgbox SevenIsland_SevaultCanyon_Text_LeroyPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_EventScript_1ACB83:: @ 81ACB83 - trainerbattle_single TRAINER_COOLTRAINER_MICHELLE, Text_18CC4F, Text_18CCAE +SevenIsland_SevaultCanyon_EventScript_Michelle:: @ 81ACB83 + trainerbattle_single TRAINER_COOLTRAINER_MICHELLE, SevenIsland_SevaultCanyon_Text_MichelleIntro, SevenIsland_SevaultCanyon_Text_MichelleDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ACBAA - msgbox Text_18CCEA, MSGBOX_AUTOCLOSE + goto_if_eq SevenIsland_SevaultCanyon_EventScript_MichelleRematch + msgbox SevenIsland_SevaultCanyon_Text_MichellePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ACBAA:: @ 81ACBAA - trainerbattle_rematch TRAINER_COOLTRAINER_MICHELLE, Text_1C45FB, Text_18CCAE - msgbox Text_18CCEA, MSGBOX_AUTOCLOSE +SevenIsland_SevaultCanyon_EventScript_MichelleRematch:: @ 81ACBAA + trainerbattle_rematch TRAINER_COOLTRAINER_MICHELLE, SevenIsland_SevaultCanyon_Text_MichelleRematchIntro, SevenIsland_SevaultCanyon_Text_MichelleDefeat + msgbox SevenIsland_SevaultCanyon_Text_MichellePostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_EventScript_1ACBC1:: @ 81ACBC1 - trainerbattle_double TRAINER_COOL_COUPLE_LEX_NYA, Text_18CD49, Text_18CD75, Text_18CDE2 +SevenIsland_SevaultCanyon_EventScript_Lex:: @ 81ACBC1 + trainerbattle_double TRAINER_COOL_COUPLE_LEX_NYA, SevenIsland_SevaultCanyon_Text_LexIntro, SevenIsland_SevaultCanyon_Text_LexDefeat, SevenIsland_SevaultCanyon_Text_LexNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ACBEC - msgbox Text_18CD9C, MSGBOX_AUTOCLOSE + goto_if_eq SevenIsland_SevaultCanyon_EventScript_LexRematch + msgbox SevenIsland_SevaultCanyon_Text_LexPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ACBEC:: @ 81ACBEC - trainerbattle_rematch_double TRAINER_COOL_COUPLE_LEX_NYA, Text_1C4662, Text_18CD75, Text_18CDE2 - msgbox Text_18CD9C, MSGBOX_AUTOCLOSE +SevenIsland_SevaultCanyon_EventScript_LexRematch:: @ 81ACBEC + trainerbattle_rematch_double TRAINER_COOL_COUPLE_LEX_NYA, SevenIsland_SevaultCanyon_Text_LexRematchIntro, SevenIsland_SevaultCanyon_Text_LexDefeat, SevenIsland_SevaultCanyon_Text_LexNotEnoughMons + msgbox SevenIsland_SevaultCanyon_Text_LexPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_EventScript_1ACC07:: @ 81ACC07 - trainerbattle_double TRAINER_COOL_COUPLE_LEX_NYA, Text_18CE20, Text_18CE5A, Text_18CEF4 +SevenIsland_SevaultCanyon_EventScript_Nya:: @ 81ACC07 + trainerbattle_double TRAINER_COOL_COUPLE_LEX_NYA, SevenIsland_SevaultCanyon_Text_NyaIntro, SevenIsland_SevaultCanyon_Text_NyaDefeat, SevenIsland_SevaultCanyon_Text_NyaNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ACC32 - msgbox Text_18CE78, MSGBOX_AUTOCLOSE + goto_if_eq SevenIsland_SevaultCanyon_EventScript_NyaRematch + msgbox SevenIsland_SevaultCanyon_Text_NyaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ACC32:: @ 81ACC32 - trainerbattle_rematch_double TRAINER_COOL_COUPLE_LEX_NYA, Text_1C4699, Text_18CE5A, Text_18CEF4 - msgbox Text_18CE78, MSGBOX_AUTOCLOSE +SevenIsland_SevaultCanyon_EventScript_NyaRematch:: @ 81ACC32 + trainerbattle_rematch_double TRAINER_COOL_COUPLE_LEX_NYA, SevenIsland_SevaultCanyon_Text_NyaRematchIntro, SevenIsland_SevaultCanyon_Text_NyaDefeat, SevenIsland_SevaultCanyon_Text_NyaNotEnoughMons + msgbox SevenIsland_SevaultCanyon_Text_NyaPostBattle, MSGBOX_AUTOCLOSE end SevenIsland_TanobyRuins_EventScript_Brandon:: @ 81ACC4D trainerbattle_single TRAINER_RUIN_MANIAC_BRANDON, SevenIsland_TanobyRuins_Text_BrandonIntro, SevenIsland_TanobyRuins_Text_BrandonDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq SevenIsland_TanobyRuins_EventScript_RematchBrandon + goto_if_eq SevenIsland_TanobyRuins_EventScript_BrandonRematch msgbox SevenIsland_TanobyRuins_Text_BrandonPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_TanobyRuins_EventScript_RematchBrandon:: @ 81ACC74 +SevenIsland_TanobyRuins_EventScript_BrandonRematch:: @ 81ACC74 trainerbattle_rematch TRAINER_RUIN_MANIAC_BRANDON, SevenIsland_TanobyRuins_Text_BrandonRematchIntro, SevenIsland_TanobyRuins_Text_BrandonDefeat msgbox SevenIsland_TanobyRuins_Text_BrandonPostBattle, MSGBOX_AUTOCLOSE end @@ -3005,11 +3005,11 @@ SevenIsland_TanobyRuins_EventScript_Benjamin:: @ 81ACC8B trainerbattle_single TRAINER_RUIN_MANIAC_BENJAMIN, SevenIsland_TanobyRuins_Text_BenjaminIntro, SevenIsland_TanobyRuins_Text_BenjaminDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq SevenIsland_TanobyRuins_EventScript_RematchBenjamin + goto_if_eq SevenIsland_TanobyRuins_EventScript_BenjaminRematch msgbox SevenIsland_TanobyRuins_Text_BenjaminPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_TanobyRuins_EventScript_RematchBenjamin:: @ 81ACCB2 +SevenIsland_TanobyRuins_EventScript_BenjaminRematch:: @ 81ACCB2 trainerbattle_rematch TRAINER_RUIN_MANIAC_BENJAMIN, SevenIsland_TanobyRuins_Text_BenjaminRematchIntro, SevenIsland_TanobyRuins_Text_BenjaminDefeat msgbox SevenIsland_TanobyRuins_Text_BenjaminPostBattle, MSGBOX_AUTOCLOSE end @@ -3018,11 +3018,11 @@ SevenIsland_TanobyRuins_EventScript_Edna:: @ 81ACCC9 trainerbattle_single TRAINER_PAINTER_EDNA, SevenIsland_TanobyRuins_Text_EdnaIntro, SevenIsland_TanobyRuins_Text_EdnaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq SevenIsland_TanobyRuins_EventScript_RematchEdna + goto_if_eq SevenIsland_TanobyRuins_EventScript_EdnaRematch msgbox SevenIsland_TanobyRuins_Text_EdnaPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_TanobyRuins_EventScript_RematchEdna:: @ 81ACCF0 +SevenIsland_TanobyRuins_EventScript_EdnaRematch:: @ 81ACCF0 trainerbattle_rematch TRAINER_PAINTER_EDNA, SevenIsland_TanobyRuins_Text_EdnaRematchIntro, SevenIsland_TanobyRuins_Text_EdnaDefeat msgbox SevenIsland_TanobyRuins_Text_EdnaPostBattle, MSGBOX_AUTOCLOSE end @@ -3031,11 +3031,11 @@ SevenIsland_TanobyRuins_EventScript_Clifford:: @ 81ACD07 trainerbattle_single TRAINER_GENTLEMAN_CLIFFORD, SevenIsland_TanobyRuins_Text_CliffordIntro, SevenIsland_TanobyRuins_Text_CliffordDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq SevenIsland_TanobyRuins_EventScript_RematchClifford + goto_if_eq SevenIsland_TanobyRuins_EventScript_CliffordRematch msgbox SevenIsland_TanobyRuins_Text_CliffordPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_TanobyRuins_EventScript_RematchClifford:: @ 81ACD2E +SevenIsland_TanobyRuins_EventScript_CliffordRematch:: @ 81ACD2E trainerbattle_rematch TRAINER_GENTLEMAN_CLIFFORD, SevenIsland_TanobyRuins_Text_CliffordRematchIntro, SevenIsland_TanobyRuins_Text_CliffordDefeat msgbox SevenIsland_TanobyRuins_Text_CliffordPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/specials.inc b/data/specials.inc index 19ea756a7..7b798f785 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -243,7 +243,7 @@ gSpecials:: @ 815FD60 def_special ChooseNextBattleTowerTrainer def_special CheckPartyBattleTowerBanlist def_special PrintBattleTowerTrainerGreeting - def_special PrintEReaderTrainerGreeting + def_special BufferEReaderTrainerGreeting def_special StartSpecialBattle def_special SetBattleTowerProperty def_special BattleTowerUtil @@ -293,7 +293,7 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 - def_special Special_BufferEReaderTrainerName5 + def_special BufferEReaderTrainerName def_special Special_GetRandomSlotMachine def_special GetPlayerFacingDirection def_special nullsub_75 diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc index a8226df05..89d9f312a 100644 --- a/data/text/fame_checker.inc +++ b/data/text/fame_checker.inc @@ -1445,7 +1445,7 @@ PokemonJournal_Text_SpecialFeatureBruno:: @ 81B1913 .string "FOUR out of his burning ambition to\l" .string "battle the best TRAINERS.$" -gUnknown_81B19A8:: @ 81B19A8 +PokemonJournal_Text_SpecialFeatureAgatha:: @ 81B19A8 .string "POKéMON JOURNAL\p" .string "Special Feature:\n" .string "ELITE FOUR's AGATHA!\p" diff --git a/data/text/trainers.inc b/data/text/trainers.inc index eb6fbf22f..0fc4ff30c 100644 --- a/data/text/trainers.inc +++ b/data/text/trainers.inc @@ -921,71 +921,71 @@ SixIsland_RuinValley_Text_HectorRematchIntro:: @ 81C42A0 .string "I'm pretty familiar with the land\n" .string "around these parts.$" -Text_1C42D6:: @ 81C42D6 +SevenIsland_TrainerTower_Text_DarioRematchIntro:: @ 81C42D6 .string "I sensed your approach.$" -Text_1C42EE:: @ 81C42EE +SevenIsland_TrainerTower_Text_RodetteRematchIntro:: @ 81C42EE .string "Somewhere on this island, peculiar\n" .string "POKéMON are sleeping.$" -Text_1C4327:: @ 81C4327 +SevenIsland_SevaultCanyon_Entrance_Text_MiahRematchIntro:: @ 81C4327 .string "Kyahaha!\p" .string "Coming back won't change a thing.\n" .string "I'll flick you away effortlessly!$" -Text_1C4374:: @ 81C4374 +SevenIsland_SevaultCanyon_Entrance_Text_MasonRematchIntro:: @ 81C4374 .string "Howdy! You're a member of my\n" .string "fan club, isn't that right?$" -Text_1C43AD:: @ 81C43AD +SevenIsland_SevaultCanyon_Entrance_Text_NicolasRematchIntro:: @ 81C43AD .string "This island is too spread out…\n" .string "Patrolling the place is a drag…$" -Text_1C43EC:: @ 81C43EC +SevenIsland_SevaultCanyon_Entrance_Text_MadelineRematchIntro:: @ 81C43EC .string "I don't forgive people who abuse\n" .string "POKéMON!$" -Text_1C4416:: @ 81C4416 +SevenIsland_SevaultCanyon_Entrance_Text_EveRematchIntro:: @ 81C4416 .string "EVE: I'll team up with JON and\n" .string "battle together again.$" -Text_1C444C:: @ 81C444C +SevenIsland_SevaultCanyon_Entrance_Text_JonRematchIntro:: @ 81C444C .string "JON: When I'm with EVE, it feels\n" .string "like we could never lose, not ever.$" -Text_1C4491:: @ 81C4491 +SevenIsland_SevaultCanyon_Text_CyndyRematchIntro:: @ 81C4491 .string "Let's have another battle.\n" .string "My conditioning's in top form!$" -Text_1C44CB:: @ 81C44CB +SevenIsland_SevaultCanyon_Text_EvanRematchIntro:: @ 81C44CB .string "It doesn't matter if you happen to\n" .string "have the strongest POKéMON…\p" .string "It doesn't mean a thing if you don't\n" .string "know how to use them properly!$" -Text_1C454E:: @ 81C454E +SevenIsland_SevaultCanyon_Text_JacksonRematchIntro:: @ 81C454E .string "I work to protect the environment.\n" .string "In turn, nature protects me!$" -Text_1C458E:: @ 81C458E +SevenIsland_SevaultCanyon_Text_KatelynRematchIntro:: @ 81C458E .string "Every time we meet, you have those\n" .string "snazzy shoes on.$" -Text_1C45C2:: @ 81C45C2 +SevenIsland_SevaultCanyon_Text_LeroyRematchIntro:: @ 81C45C2 .string "You must have gotten tougher.\n" .string "Let me battle you, please!$" -Text_1C45FB:: @ 81C45FB +SevenIsland_SevaultCanyon_Text_MichelleRematchIntro:: @ 81C45FB .string "I was given the best possible\n" .string "education to become this strong.\p" .string "I won't lose this time.\n" .string "Absolutely not!$" -Text_1C4662:: @ 81C4662 +SevenIsland_SevaultCanyon_Text_LexRematchIntro:: @ 81C4662 .string "LEX: My darling NYA, together\n" .string "we will win for certain!$" -Text_1C4699:: @ 81C4699 +SevenIsland_SevaultCanyon_Text_NyaRematchIntro:: @ 81C4699 .string "NYA: I won't drag down my mentor\n" .string "LEX! We're going to win!$" -- cgit v1.2.3 From 47f6e9f97396d1486fe515b8a994bbc285060419 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 28 Feb 2020 23:01:37 -0500 Subject: Document missed Vermilion house script --- data/maps/VermilionCity_House3/map.json | 8 ++++---- data/maps/VermilionCity_House3/scripts.inc | 16 ++++++++-------- data/maps/VermilionCity_House3/text.inc | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'data') diff --git a/data/maps/VermilionCity_House3/map.json b/data/maps/VermilionCity_House3/map.json index c5cd83671..2c12e663c 100644 --- a/data/maps/VermilionCity_House3/map.json +++ b/data/maps/VermilionCity_House3/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_House3_EventScript_16BAAA", + "script": "VermilionCity_House3_EventScript_Boy", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_House3_EventScript_16BABC", + "script": "VermilionCity_House3_EventScript_Pidgey", "flag": "0" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_House3_EventScript_16BAB3", + "script": "VermilionCity_House3_EventScript_Lass", "flag": "0" } ], @@ -98,7 +98,7 @@ "x": 6, "y": 4, "elevation": 3, - "script": "VermilionCity_House3_EventScript_16BACF" + "script": "VermilionCity_House3_EventScript_Letter" } ] } diff --git a/data/maps/VermilionCity_House3/scripts.inc b/data/maps/VermilionCity_House3/scripts.inc index 8f9de55e0..78caf2156 100644 --- a/data/maps/VermilionCity_House3/scripts.inc +++ b/data/maps/VermilionCity_House3/scripts.inc @@ -1,24 +1,24 @@ VermilionCity_House3_MapScripts:: @ 816BAA9 .byte 0 -VermilionCity_House3_EventScript_16BAAA:: @ 816BAAA - msgbox gUnknown_81953AF, MSGBOX_NPC +VermilionCity_House3_EventScript_Boy:: @ 816BAAA + msgbox VermilionCity_House3_Text_PidgeyFlyLetterToSaffron, MSGBOX_NPC end -VermilionCity_House3_EventScript_16BAB3:: @ 816BAB3 - msgbox gUnknown_8195471, MSGBOX_NPC +VermilionCity_House3_EventScript_Lass:: @ 816BAB3 + msgbox VermilionCity_House3_Text_SendMyPidgeyToUnionRoom, MSGBOX_NPC end -VermilionCity_House3_EventScript_16BABC:: @ 816BABC +VermilionCity_House3_EventScript_Pidgey:: @ 816BABC lock faceplayer waitse playmoncry SPECIES_PIDGEY, 0 - msgbox gUnknown_81953EE + msgbox VermilionCity_House3_Text_Pidgey waitmoncry release end -VermilionCity_House3_EventScript_16BACF:: @ 816BACF - msgbox gUnknown_8195400, MSGBOX_SIGN +VermilionCity_House3_EventScript_Letter:: @ 816BACF + msgbox VermilionCity_House3_Text_DearPippiLetter, MSGBOX_SIGN end diff --git a/data/maps/VermilionCity_House3/text.inc b/data/maps/VermilionCity_House3/text.inc index 99ea3e49e..88be18c10 100644 --- a/data/maps/VermilionCity_House3/text.inc +++ b/data/maps/VermilionCity_House3/text.inc @@ -1,18 +1,18 @@ -gUnknown_81953AF:: @ 81953AF +VermilionCity_House3_Text_PidgeyFlyLetterToSaffron:: @ 81953AF .string "I'm getting my PIDGEY to fly a\n" .string "letter to SAFFRON in the north.$" -gUnknown_81953EE:: @ 81953EE +VermilionCity_House3_Text_Pidgey:: @ 81953EE .string "PIDGEY: Kurukkoo!$" -gUnknown_8195400:: @ 8195400 +VermilionCity_House3_Text_DearPippiLetter:: @ 8195400 .string "Dear PIPPI,\n" .string "I hope to see you soon.\p" .string "I heard SAFFRON has problems with\n" .string "TEAM ROCKET.\p" .string "VERMILION appears to be safe.$" -gUnknown_8195471:: @ 8195471 +VermilionCity_House3_Text_SendMyPidgeyToUnionRoom:: @ 8195471 .string "I want to exchange MAIL with all\n" .string "sorts of people.\p" .string "I send my PIDGEY to a UNION ROOM\n" -- cgit v1.2.3 From 9b9ae3d3374dd61870d47f025ffc0346a0b6839c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 29 Feb 2020 14:30:01 -0500 Subject: through sub_8080E6C --- data/cable_club.s | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 data/cable_club.s (limited to 'data') diff --git a/data/cable_club.s b/data/cable_club.s deleted file mode 100644 index 8ea8b9167..000000000 --- a/data/cable_club.s +++ /dev/null @@ -1,15 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnknown_83C6AB0:: @ 83C6AB0 - .byte 0, 16, 11, 11, 2, 15 - .2byte 0x125 - -gUnknown_83C6AB8:: @ 83C6AB8 - .4byte gUnknown_841DF8B - .4byte gUnknown_841DF92 - .4byte gUnknown_841DF99 - .4byte gUnknown_841DFA0 -- cgit v1.2.3 From 21dddd57605cf4cbc31f0a903cc50a8f588817ff Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 29 Feb 2020 16:31:57 -0500 Subject: Finish cable_club.c --- data/specials.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/specials.inc b/data/specials.inc index 19ea756a7..2e1ba68ac 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -38,7 +38,7 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special TryBattleLinkup def_special TryTradeLinkup - def_special sub_80810F4 + def_special TryRecordMixLinkup def_special CloseLink def_special EnterColosseumPlayerSpot def_special EnterTradeSeat -- cgit v1.2.3 From cbd380f2bf6738ec9222a2284e9de2297f0dc413 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 29 Feb 2020 17:01:03 -0500 Subject: Name many functions in cable_club.c --- data/specials.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/specials.inc b/data/specials.inc index 2e1ba68ac..028be3a41 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -42,8 +42,8 @@ gSpecials:: @ 815FD60 def_special CloseLink def_special EnterColosseumPlayerSpot def_special EnterTradeSeat - def_special sub_80819B8 - def_special sub_808130C + def_special Special_WiredCableClubTrade + def_special Special_CableClub_AskSaveTheGame def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 -- cgit v1.2.3 From 62100376b71f54d6ca4b6f020c860e69368c2720 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 2 Mar 2020 00:19:11 -0500 Subject: Split/label some common event scripts --- data/event_scripts.s | 353 +++---------------------- data/maps/PokemonLeague_HallOfFame/scripts.inc | 2 +- data/scripts/cave_of_origin.inc | 36 +++ data/scripts/hall_of_fame.inc | 38 +++ data/scripts/itemfinder.inc | 27 ++ data/scripts/questionnaire.inc | 48 ++++ data/scripts/white_out.inc | 69 +++++ data/specials.inc | 6 +- data/text/pc.inc | 17 ++ data/text/white_out.inc | 53 ++++ 10 files changed, 329 insertions(+), 320 deletions(-) create mode 100644 data/scripts/cave_of_origin.inc create mode 100644 data/scripts/hall_of_fame.inc create mode 100644 data/scripts/itemfinder.inc create mode 100644 data/scripts/questionnaire.inc create mode 100644 data/scripts/white_out.inc create mode 100644 data/text/pc.inc create mode 100644 data/text/white_out.inc (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index c088f893d..9a646cd67 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -811,33 +811,20 @@ Text_WouldYouLikeToMixRecords:: @ 81A5028 Text_WeHopeToSeeYouAgain2:: @ 81A505B .string "We hope to see you again!$" -Text_BootedUpPC:: @ 81A5075 - .string "{PLAYER} booted up the PC.$" - -Text_AccessWhichPC:: @ 81A508A - .string "Which PC should be accessed?$" - -Text_AccessedSomeonesPC:: @ 81A50A7 - .string "Accessed Someone's PC.$" - -Text_OpenedPkmnStorage:: @ 81A50BE - .string "POKéMON Storage System opened.$" + .include "data/text/pc.inc" -Text_AccessedPlayersPC:: @ 81A50DD - .string "Accessed {PLAYER}'s PC.$" - -Text_AccessedBillsPC:: @ 81A50EF - .string "Accessed BILL's PC.$" - -Text_1A5103:: @ 81A5103 +@ Unused +Text_WelcomeTradeCenter:: @ 81A5103 .string "Welcome to the POKéMON CABLE CLUB\n" .string "TRADE CENTER.$" -Text_1A5133:: @ 81A5133 +@ Unused +Text_WelcomeColosseum:: @ 81A5133 .string "Welcome to the POKéMON CABLE CLUB\n" .string "COLOSSEUM.$" -Text_1A5160:: @ 81A5160 +@ Unused +Text_WelcomeTimeCapsule:: @ 81A5160 .string "Welcome to the POKéMON CABLE CLUB\n" .string "TIME CAPSULE.$" @@ -866,7 +853,8 @@ Text_BagItemCanBeRegistered:: @ 81A5375 .string "An item in the BAG can be\n" .string "registered to SELECT for easy use.$" -Text_1A53B2:: @ 81A53B2 +@ Unused (email from R/S Rivals computer) +Text_TrainerSchoolEmail:: @ 81A53B2 .string "パソコンに\n" .string "ポケモン　トレーナー　こうざの\l" .string "メールが　きている！\p" @@ -879,7 +867,8 @@ Text_1A53B2:: @ 81A53B2 Text_PlayerBootedUpPC:: @ 81A5420 .string "{PLAYER} booted up the PC.$" -Text_1A5435:: @ 81A5435 +@ Unused +Text_LinkWasCanceled:: @ 81A5435 .string "つうしんは　キャンセルされました$" @ Unused @@ -929,7 +918,7 @@ Text_AppearsToBeUndergoingAdjustments:: @ 81A5667 .string "It appears to be undergoing\n" .string "adjustments…$" -Text_1A5690:: @ 81A5690 +Text_HandedOverItem:: @ 81A5690 .string "{PLAYER} handed over the\n" .string "{STR_VAR_1}.$" @@ -993,68 +982,14 @@ Text_1A5CC3:: @ 81A5CC3 Text_1A5CCE:: @ 81A5CCE .string "そっか‥$" -Text_1A5CD3:: @ 81A5CD3 +Text_TheDoorIsClosed:: @ 81A5CD3 .string "ドアは　しまっている‥$" Text_TheDoorIsOpen:: @ 81A5CDF .string "The door is open…$" .include "data/text/pc_transfer.inc" - -Text_1A5E89:: @ 81A5E89 - .string "First, you should restore your\n" - .string "POKéMON to full health.$" - -Text_1A5EC0:: @ 81A5EC0 - .string "Your POKéMON have been healed\n" - .string "to perfect health.\p" - .string "If your POKéMON's energy, HP,\n" - .string "is down, please come see us.\p" - .string "If you're planning to go far in the\n" - .string "field, you should buy some POTIONS\l" - .string "at the POKéMON MART.\p" - .string "We hope you excel!$" - -Text_1A5F9B:: @ 81A5F9B - .string "Your POKéMON have been healed\n" - .string "to perfect health.\p" - .string "We hope you excel!$" - -Text_1A5FDF:: @ 81A5FDF - .string "MOM: {PLAYER}!\n" - .string "Welcome home.\p" - .string "It sounds like you had quite\n" - .string "an experience.\p" - .string "Maybe you should take a quick\n" - .string "rest.$" - -Text_1A6046:: @ 81A6046 - .string "MOM: Oh, good! You and your\n" - .string "POKéMON are looking great.\p" - .string "I just heard from PROF. OAK.\p" - .string "He said that POKéMON's energy is\n" - .string "measured in HP.\p" - .string "If your POKéMON lose their HP,\n" - .string "you can restore them at any\l" - .string "POKéMON CENTER.\p" - .string "If you're going to travel far away,\n" - .string "the smart TRAINER stocks up on\l" - .string "POTIONS at the POKéMON MART.\p" - .string "Make me proud, honey!\p" - .string "Take care!$" - -Text_1A6197:: @ 81A6197 - .string "{PLAYER} is out of usable\n" - .string "POKéMON!\p" - .string "{PLAYER} panicked and lost ¥{STR_VAR_1}…\p" - .string "… … … …\p" - .string "{PLAYER} whited out!$" - -Text_1A61E5:: @ 81A61E5 - .string "{PLAYER} is out of usable\n" - .string "POKéMON!\p" - .string "{PLAYER} whited out!$" - + .include "data/text/white_out.inc" .include "data/text/poke_mart.inc" Text_MonFlewAway:: @ 81A63C4 @@ -1131,45 +1066,7 @@ EventScript_ResetAllMapFlags:: @ 81A6481 setvar VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500 end -EventScript_1A651A:: @ 81A651A - clearflag FLAG_HIDE_POSTGAME_GOSSIPERS - call EventScript_ResetEliteFour - special Special_UpdateTrainerFanClubGameClear - specialvar VAR_RESULT, IsNationalPokedexEnabled - compare VAR_RESULT, FALSE - call_if_eq EventScript_1A653B - call EventScript_ResetLegendaries - return - -EventScript_1A653B:: @ 81A653B - setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 2 - return - -EventScript_ResetLegendaries:: @ 81A6541 - clearflag FLAG_LUGIA_FLEW_AWAY - clearflag FLAG_HO_OH_FLEW_AWAY - clearflag FLAG_DEOXYS_FLEW_AWAY - return - -gUnknown_81A654B:: @ 81A654B - call EventScript_ResetEliteFour - end - -EventScript_ResetEliteFour:: @ 81A6551 - clearflag FLAG_DEFEATED_LORELEI - clearflag FLAG_DEFEATED_BRUNO - clearflag FLAG_DEFEATED_AGATHA - clearflag FLAG_DEFEATED_LANCE - clearflag FLAG_DEFEATED_CHAMP - cleartrainerflag TRAINER_CHAMPION_FIRST_SQUIRTLE - cleartrainerflag TRAINER_CHAMPION_FIRST_BULBASAUR - cleartrainerflag TRAINER_CHAMPION_FIRST_CHARMANDER - cleartrainerflag TRAINER_CHAMPION_REMATCH_SQUIRTLE - cleartrainerflag TRAINER_CHAMPION_REMATCH_BULBASAUR - cleartrainerflag TRAINER_CHAMPION_REMATCH_CHARMANDER - setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 0 - return - + .include "data/scripts/hall_of_fame.inc" .include "data/scripts/pkmn_center_nurse.inc" .include "data/scripts/obtain_item.inc" .include "data/scripts/pc.inc" @@ -1210,42 +1107,7 @@ EventScript_WallTownMap:: @ 81A6C32 .include "data/text/pokedex_rating.inc" .include "data/scripts/pokedex_rating.inc" - -EventScript_1A7493:: @ 81A7493 - lockall - setvar VAR_TEMP_1, 1 - goto EventScript_1A74B7 - end - -EventScript_1A749F:: @ 81A749F - lockall - setvar VAR_TEMP_2, 1 - goto EventScript_1A74B7 - end - -EventScript_1A74AB:: @ 81A74AB - lockall - setvar VAR_TEMP_3, 1 - goto EventScript_1A74B7 - end - -EventScript_1A74B7:: @ 81A74B7 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special Special_ShakeScreen - waitstate - releaseall - end - -EventScript_1A74D1:: @ 81A74D1 - setvar VAR_TEMP_1, 1 - setvar VAR_TEMP_2, 1 - setvar VAR_TEMP_3, 1 - setvar VAR_TEMP_4, 1 - setvar VAR_TEMP_5, 1 - return + .include "data/scripts/cave_of_origin.inc" EventScript_ChangePokemonNickname:: @ 81A74EB fadescreen FADE_TO_BLACK @@ -1253,10 +1115,11 @@ EventScript_ChangePokemonNickname:: @ 81A74EB waitstate return -EventScript_1A74F2:: @ 81A74F2 +@ Unused +EventScript_HandOverItem:: @ 81A74F2 getitemname 0, VAR_0x8004 playfanfare MUS_ME_WAZA - message Text_1A5690 + message Text_HandedOverItem waitmessage waitfanfare removeitem VAR_0x8004, 1 @@ -1265,55 +1128,7 @@ EventScript_1A74F2:: @ 81A74F2 .include "data/scripts/pokemon_league.inc" .include "data/scripts/movement.inc" .include "data/scripts/flavor_text.inc" - -gUnknown_81A7702:: @ 81A7702 - lockall - textcolor 3 - msgbox Text_FillOutQuestionnaire, MSGBOX_YESNO - compare VAR_RESULT, NO - goto_if_eq EventScript_1A778A - setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE - call Common_ShowEasyChatScreen - lock - faceplayer - specialvar VAR_0x8008, Special_GetMartClerkObjectId - textcolor 0 - compare VAR_0x8004, 0 - goto_if_eq EventScript_1A774D - compare VAR_RESULT, 0 - goto_if_eq EventScript_1A778A - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A778C - end - -EventScript_1A774D:: @ 81A774D - applymovement VAR_0x8008, Movement_FaceDown - waitmovement 0 - playse SE_PIN - applymovement VAR_0x8008, Movement_ExclamationMark - waitmovement 0 - applymovement VAR_0x8008, Movement_Delay48 - waitmovement 0 - msgbox Text_YouKnowThoseWords - setflag FLAG_SYS_MYSTERY_GIFT_ENABLED - textcolor 3 - special sub_80699BC - signmsg - msgbox Text_YouCanAccessMysteryGift - normalmsg - releaseall - end - -EventScript_1A778A:: @ 81A778A - releaseall - end - -EventScript_1A778C:: @ 81A778C - applymovement VAR_0x8008, Movement_FaceDown - waitmovement 0 - msgbox Text_QuestionnaireThankYou - releaseall - end + .include "data/scripts/questionnaire.inc" EventScript_BagItemCanBeRegistered:: @ 81A77A0 msgbox Text_BagItemCanBeRegistered, MSGBOX_SIGN @@ -1362,7 +1177,8 @@ EventScript_ReleaseEnd:: @ 81A7AE0 .include "data/scripts/pokemon_mansion.inc" -EventScript_1A80FE:: @ 81A80FE +@ Unused +EventScript_DelayedLookAround:: @ 81A80FE lockall applymovement VAR_0x8004, Movement_WalkInPlaceFastestLeft waitmovement 0 @@ -1449,137 +1265,42 @@ VermilionCity_PokemonCenter_1F_EventScript_ExplainVSSeeker:: @ 81A8D3F release end -EventScript_ItemfinderDigUpUnderfootItem:: @ 81A8D49 - lockall - textcolor 3 - waitse - call EventScript_TryPickUpHiddenItem - compare VAR_0x8007, TRUE - goto_if_eq EventScript_DigUpItemPutInPocket - compare VAR_0x8007, FALSE - goto_if_eq EventScript_DigUpItemBagIsFull - end - -EventScript_DigUpItemPutInPocket:: - message Text_DugUpItemFromGround - waitfanfare - waitmessage - delay 60 - msgbox Text_PutItemAway - special Special_SetHiddenItemFlag - releaseall - end - -EventScript_DigUpItemBagIsFull:: - msgbox Text_DugUpItemFromGround - msgbox Text_TooBadBagFull - setvar VAR_RESULT, 0 - releaseall - end - -EventScript_AfterWhiteOutHeal:: @ 81A8D97 - lockall - textcolor 1 - msgbox Text_1A5E89 - call EventScript_PkmnCenterNurse_TakeAndHealPkmn - call_if_unset FLAG_DEFEATED_BROCK, EventScript_1A8DC6 - call_if_set FLAG_DEFEATED_BROCK, EventScript_1A8DCF - applymovement VAR_LAST_TALKED, Movement_Bow - waitmovement 0 - fadedefaultbgm - releaseall - end - -EventScript_1A8DC6:: @ 81A8DC6 - msgbox Text_1A5EC0 - return - -EventScript_1A8DCF:: @ 81A8DCF - msgbox Text_1A5F9B - return - -EventScript_MomHeal:: @ 81A8DD8 - lockall - textcolor 1 - applymovement 1, Movement_WalkInPlaceFastestDown - waitmovement 0 - msgbox Text_1A5FDF - call EventScript_OutOfCenterPartyHeal - msgbox Text_1A6046 - fadedefaultbgm - releaseall - end - -EventScript_PoisonWhiteOut:: @ 81A8DFD - lockall - textcolor 3 - special ExecuteWhiteOut - waitstate - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A8E11 - releaseall - end - -EventScript_1A8E11:: @ 81A8E11 - checkmoney 1, 0 - compare VAR_RESULT, FALSE - goto_if_eq EventScript_1A8E2E - compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A8E3C - end - -EventScript_1A8E2E:: @ 81A8E2E - msgbox Text_1A61E5 - goto EventScript_1A8E4D - end - -EventScript_1A8E3C:: @ 81A8E3C - special Special_OverworldWhiteOutGetMoneyLoss - msgbox Text_1A6197 - goto EventScript_1A8E4D - end - -EventScript_1A8E4D:: @ 81A8E4D - special sub_807F0B0 - waitstate - fadescreen FADE_TO_BLACK - special sp0C8_whiteout_maybe - waitstate - end + .include "data/scripts/itemfinder.inc" + .include "data/scripts/white_out.inc" Std_PutItemAway:: @ 81A8E58 bufferitemnameplural 1, VAR_0x8000, VAR_0x8001 checkitemtype VAR_0x8000 - call EventScript_1A8E6F + call EventScript_BufferPutAwayPocketName msgbox Text_PutItemAway return -EventScript_1A8E6F:: @ 81A8E6F +EventScript_BufferPutAwayPocketName:: @ 81A8E6F switch VAR_RESULT - case POCKET_ITEMS, EventScript_1A8EAC - case POCKET_KEY_ITEMS, EventScript_1A8EB1 - case POCKET_POKE_BALLS, EventScript_1A8EB6 - case POCKET_TM_CASE, EventScript_1A8EBB - case POCKET_BERRY_POUCH, EventScript_1A8EC0 + case POCKET_ITEMS, EventScript_BufferPutAwayPocketItems + case POCKET_KEY_ITEMS, EventScript_BufferPutAwayPocketKeyItems + case POCKET_POKE_BALLS, EventScript_BufferPutAwayPocketPokeBalls + case POCKET_TM_CASE, EventScript_BufferPutAwayPocketTMCase + case POCKET_BERRY_POUCH, EventScript_BufferPutAwayPocketBerryPouch end -EventScript_1A8EAC:: @ 81A8EAC +EventScript_BufferPutAwayPocketItems:: @ 81A8EAC getstdstring 2, STDSTRING_ITEMS_POCKET return -EventScript_1A8EB1:: @ 81A8EB1 +EventScript_BufferPutAwayPocketKeyItems:: @ 81A8EB1 getstdstring 2, STDSTRING_KEY_ITEMS_POCKET return -EventScript_1A8EB6:: @ 81A8EB6 +EventScript_BufferPutAwayPocketPokeBalls:: @ 81A8EB6 getstdstring 2, STDSTRING_POKEBALLS_POCKET return -EventScript_1A8EBB:: @ 81A8EBB +EventScript_BufferPutAwayPocketTMCase:: @ 81A8EBB getstdstring 2, STDSTRING_TM_CASE return -EventScript_1A8EC0:: @ 81A8EC0 +EventScript_BufferPutAwayPocketBerryPouch:: @ 81A8EC0 getstdstring 2, STDSTRING_BERRY_POUCH return @@ -1611,7 +1332,7 @@ EventScript_NoMoreRoomForPokemon:: @ 81A927C @ Test message! @ Welcome to the world of Pokémon! -Text_1ACD45:: @ 81ACD45 +Text_TestMsg:: @ 81ACD45 .string "テストよう　メッセージです！\n" .string "ポケモンの　せかいへ　ようこそ！$" diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc index de838a669..658a176e5 100644 --- a/data/maps/PokemonLeague_HallOfFame/scripts.inc +++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc @@ -34,7 +34,7 @@ PokemonLeague_HallOfFame_EventScript_EnterRoom:: @ 8162D70 waitfieldeffect FLDEFF_HALL_OF_FAME_RECORD delay 40 setvar VAR_TEMP_1, 1 - call EventScript_1A651A + call EventScript_SetDefeatedEliteFourFlagsVars setrespawn SPAWN_PALLET_TOWN fadescreenspeed FADE_TO_BLACK, 24 special Special_HallOfFame diff --git a/data/scripts/cave_of_origin.inc b/data/scripts/cave_of_origin.inc new file mode 100644 index 000000000..6a1f967f2 --- /dev/null +++ b/data/scripts/cave_of_origin.inc @@ -0,0 +1,36 @@ +@ All unused / leftover scripts from RS +CaveOfOrigin_EventScript_Shake1:: @ 81A7493 + lockall + setvar VAR_TEMP_1, 1 + goto CaveOfOrigin_EventScript_Shake + end + +CaveOfOrigin_EventScript_Shake2:: @ 81A749F + lockall + setvar VAR_TEMP_2, 1 + goto CaveOfOrigin_EventScript_Shake + end + +CaveOfOrigin_EventScript_Shake3:: @ 81A74AB + lockall + setvar VAR_TEMP_3, 1 + goto CaveOfOrigin_EventScript_Shake + end + +CaveOfOrigin_EventScript_Shake:: @ 81A74B7 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 8 + setvar VAR_0x8007, 5 + special Special_ShakeScreen + waitstate + releaseall + end + +CaveOfOrigin_EventScript_DisableShakes:: @ 81A74D1 + setvar VAR_TEMP_1, 1 + setvar VAR_TEMP_2, 1 + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_4, 1 + setvar VAR_TEMP_5, 1 + return diff --git a/data/scripts/hall_of_fame.inc b/data/scripts/hall_of_fame.inc new file mode 100644 index 000000000..5ce427a6a --- /dev/null +++ b/data/scripts/hall_of_fame.inc @@ -0,0 +1,38 @@ +EventScript_SetDefeatedEliteFourFlagsVars:: @ 81A651A + clearflag FLAG_HIDE_POSTGAME_GOSSIPERS + call EventScript_ResetEliteFour + special Special_UpdateTrainerFanClubGameClear + specialvar VAR_RESULT, IsNationalPokedexEnabled + compare VAR_RESULT, FALSE + call_if_eq EventScript_SetReadyTryGiveNationalDexScene + call EventScript_ResetLegendaries + return + +EventScript_SetReadyTryGiveNationalDexScene:: @ 81A653B + setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 2 + return + +EventScript_ResetLegendaries:: @ 81A6541 + clearflag FLAG_LUGIA_FLEW_AWAY + clearflag FLAG_HO_OH_FLEW_AWAY + clearflag FLAG_DEOXYS_FLEW_AWAY + return + +EventScript_ResetEliteFourEnd:: @ 81A654B + call EventScript_ResetEliteFour + end + +EventScript_ResetEliteFour:: @ 81A6551 + clearflag FLAG_DEFEATED_LORELEI + clearflag FLAG_DEFEATED_BRUNO + clearflag FLAG_DEFEATED_AGATHA + clearflag FLAG_DEFEATED_LANCE + clearflag FLAG_DEFEATED_CHAMP + cleartrainerflag TRAINER_CHAMPION_FIRST_SQUIRTLE + cleartrainerflag TRAINER_CHAMPION_FIRST_BULBASAUR + cleartrainerflag TRAINER_CHAMPION_FIRST_CHARMANDER + cleartrainerflag TRAINER_CHAMPION_REMATCH_SQUIRTLE + cleartrainerflag TRAINER_CHAMPION_REMATCH_BULBASAUR + cleartrainerflag TRAINER_CHAMPION_REMATCH_CHARMANDER + setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 0 + return diff --git a/data/scripts/itemfinder.inc b/data/scripts/itemfinder.inc new file mode 100644 index 000000000..8b806f815 --- /dev/null +++ b/data/scripts/itemfinder.inc @@ -0,0 +1,27 @@ +EventScript_ItemfinderDigUpUnderfootItem:: @ 81A8D49 + lockall + textcolor 3 + waitse + call EventScript_TryPickUpHiddenItem + compare VAR_0x8007, TRUE + goto_if_eq EventScript_DigUpItemPutInPocket + compare VAR_0x8007, FALSE + goto_if_eq EventScript_DigUpItemBagIsFull + end + +EventScript_DigUpItemPutInPocket:: + message Text_DugUpItemFromGround + waitfanfare + waitmessage + delay 60 + msgbox Text_PutItemAway + special Special_SetHiddenItemFlag + releaseall + end + +EventScript_DigUpItemBagIsFull:: + msgbox Text_DugUpItemFromGround + msgbox Text_TooBadBagFull + setvar VAR_RESULT, 0 + releaseall + end diff --git a/data/scripts/questionnaire.inc b/data/scripts/questionnaire.inc new file mode 100644 index 000000000..8e28f80db --- /dev/null +++ b/data/scripts/questionnaire.inc @@ -0,0 +1,48 @@ +EventScript_Questionnaire:: @ 81A7702 + lockall + textcolor 3 + msgbox Text_FillOutQuestionnaire, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq EventScript_DeclineQuestionnaire + setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE + call Common_ShowEasyChatScreen + lock + faceplayer + specialvar VAR_0x8008, Special_GetMartClerkObjectId + textcolor 0 + compare VAR_0x8004, 0 + goto_if_eq EventScript_EnableMysteryGift + compare VAR_RESULT, 0 + goto_if_eq EventScript_DeclineQuestionnaire + compare VAR_RESULT, 1 + goto_if_eq EventScript_TookQuestionnaire + end + +EventScript_EnableMysteryGift:: @ 81A774D + applymovement VAR_0x8008, Movement_FaceDown + waitmovement 0 + playse SE_PIN + applymovement VAR_0x8008, Movement_ExclamationMark + waitmovement 0 + applymovement VAR_0x8008, Movement_Delay48 + waitmovement 0 + msgbox Text_YouKnowThoseWords + setflag FLAG_SYS_MYSTERY_GIFT_ENABLED + textcolor 3 + special sub_80699BC + signmsg + msgbox Text_YouCanAccessMysteryGift + normalmsg + releaseall + end + +EventScript_DeclineQuestionnaire:: @ 81A778A + releaseall + end + +EventScript_TookQuestionnaire:: @ 81A778C + applymovement VAR_0x8008, Movement_FaceDown + waitmovement 0 + msgbox Text_QuestionnaireThankYou + releaseall + end diff --git a/data/scripts/white_out.inc b/data/scripts/white_out.inc new file mode 100644 index 000000000..b961a6cf2 --- /dev/null +++ b/data/scripts/white_out.inc @@ -0,0 +1,69 @@ +EventScript_AfterWhiteOutHeal:: @ 81A8D97 + lockall + textcolor 1 + msgbox Text_FirstShouldRestoreMonsHealth + call EventScript_PkmnCenterNurse_TakeAndHealPkmn + call_if_unset FLAG_DEFEATED_BROCK, EventScript_AfterWhiteOutHealMsgPreBrock + call_if_set FLAG_DEFEATED_BROCK, EventScript_AfterWhiteOutHealMsg + applymovement VAR_LAST_TALKED, Movement_Bow + waitmovement 0 + fadedefaultbgm + releaseall + end + +EventScript_AfterWhiteOutHealMsgPreBrock:: @ 81A8DC6 + msgbox Text_MonsHealedShouldBuyPotions + return + +EventScript_AfterWhiteOutHealMsg:: @ 81A8DCF + msgbox Text_MonsHealed + return + +EventScript_AfterWhiteOutMomHeal:: @ 81A8DD8 + lockall + textcolor 1 + applymovement 1, Movement_WalkInPlaceFastestDown + waitmovement 0 + msgbox Text_HadQuiteAnExperienceTakeRest + call EventScript_OutOfCenterPartyHeal + msgbox Text_MomExplainHPGetPotions + fadedefaultbgm + releaseall + end + +EventScript_FieldPoison:: @ 81A8DFD + lockall + textcolor 3 + special TryFieldPoisonWhiteOut + waitstate + compare VAR_RESULT, TRUE + goto_if_eq EventScript_FieldWhiteOut + releaseall + end + +EventScript_FieldWhiteOut:: @ 81A8E11 + checkmoney 1, 0 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_FieldWhiteOutNoMoney + compare VAR_RESULT, TRUE + goto_if_eq EventScript_FieldWhiteOutHasMoney + end + +EventScript_FieldWhiteOutNoMoney:: @ 81A8E2E + msgbox Text_WhitedOut + goto EventScript_FieldWhiteOutFade + end + +EventScript_FieldWhiteOutHasMoney:: @ 81A8E3C + special Special_OverworldWhiteOutGetMoneyLoss + msgbox Text_WhitedOutLostMoney + goto EventScript_FieldWhiteOutFade + end + +EventScript_FieldWhiteOutFade:: @ 81A8E4D + special Script_FadeOutMapMusic + waitstate + fadescreen FADE_TO_BLACK + special SetCB2Whiteout + waitstate + end diff --git a/data/specials.inc b/data/specials.inc index 19ea756a7..5b9ca7d5a 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -207,8 +207,8 @@ gSpecials:: @ 815FD60 def_special Special_BattleRecords def_special IsEnoughForCostInVar0x8005 def_special SubtractMoneyFromVar0x8005 - def_special ExecuteWhiteOut - def_special sp0C8_whiteout_maybe + def_special TryFieldPoisonWhiteOut + def_special SetCB2Whiteout def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 @@ -340,7 +340,7 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special nullsub_75 def_special LoadPlayerBag - def_special sub_807F0B0 + def_special Script_FadeOutMapMusic def_special nullsub_75 def_special nullsub_75 def_special HasAllKantoMons diff --git a/data/text/pc.inc b/data/text/pc.inc new file mode 100644 index 000000000..c39a0c61f --- /dev/null +++ b/data/text/pc.inc @@ -0,0 +1,17 @@ +Text_BootedUpPC:: @ 81A5075 + .string "{PLAYER} booted up the PC.$" + +Text_AccessWhichPC:: @ 81A508A + .string "Which PC should be accessed?$" + +Text_AccessedSomeonesPC:: @ 81A50A7 + .string "Accessed Someone's PC.$" + +Text_OpenedPkmnStorage:: @ 81A50BE + .string "POKéMON Storage System opened.$" + +Text_AccessedPlayersPC:: @ 81A50DD + .string "Accessed {PLAYER}'s PC.$" + +Text_AccessedBillsPC:: @ 81A50EF + .string "Accessed BILL's PC.$" diff --git a/data/text/white_out.inc b/data/text/white_out.inc new file mode 100644 index 000000000..347e45c4c --- /dev/null +++ b/data/text/white_out.inc @@ -0,0 +1,53 @@ +Text_FirstShouldRestoreMonsHealth:: @ 81A5E89 + .string "First, you should restore your\n" + .string "POKéMON to full health.$" + +Text_MonsHealedShouldBuyPotions:: @ 81A5EC0 + .string "Your POKéMON have been healed\n" + .string "to perfect health.\p" + .string "If your POKéMON's energy, HP,\n" + .string "is down, please come see us.\p" + .string "If you're planning to go far in the\n" + .string "field, you should buy some POTIONS\l" + .string "at the POKéMON MART.\p" + .string "We hope you excel!$" + +Text_MonsHealed:: @ 81A5F9B + .string "Your POKéMON have been healed\n" + .string "to perfect health.\p" + .string "We hope you excel!$" + +Text_HadQuiteAnExperienceTakeRest:: @ 81A5FDF + .string "MOM: {PLAYER}!\n" + .string "Welcome home.\p" + .string "It sounds like you had quite\n" + .string "an experience.\p" + .string "Maybe you should take a quick\n" + .string "rest.$" + +Text_MomExplainHPGetPotions:: @ 81A6046 + .string "MOM: Oh, good! You and your\n" + .string "POKéMON are looking great.\p" + .string "I just heard from PROF. OAK.\p" + .string "He said that POKéMON's energy is\n" + .string "measured in HP.\p" + .string "If your POKéMON lose their HP,\n" + .string "you can restore them at any\l" + .string "POKéMON CENTER.\p" + .string "If you're going to travel far away,\n" + .string "the smart TRAINER stocks up on\l" + .string "POTIONS at the POKéMON MART.\p" + .string "Make me proud, honey!\p" + .string "Take care!$" + +Text_WhitedOutLostMoney:: @ 81A6197 + .string "{PLAYER} is out of usable\n" + .string "POKéMON!\p" + .string "{PLAYER} panicked and lost ¥{STR_VAR_1}…\p" + .string "… … … …\p" + .string "{PLAYER} whited out!$" + +Text_WhitedOut:: @ 81A61E5 + .string "{PLAYER} is out of usable\n" + .string "POKéMON!\p" + .string "{PLAYER} whited out!$" -- cgit v1.2.3 From 358f785a039474442bc0380f2e0ebe4a36b8d553 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 2 Mar 2020 00:53:22 -0500 Subject: Resolve some JP text --- data/event_scripts.s | 15 +++------------ data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc | 6 ++++++ data/maps/CeladonCity_Gym/text.inc | 6 ------ data/maps/CeruleanCity/text.inc | 3 ++- data/text/itemfinder.inc | 10 ++++++++++ 5 files changed, 21 insertions(+), 19 deletions(-) create mode 100644 data/text/itemfinder.inc (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 9a646cd67..f148e2bd2 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -843,7 +843,7 @@ Text_PlayerWhatCanIDoForYou:: @ 81A51D0 .include "data/text/obtain_item.inc" -Text_1A5351:: @ 81A5351 +Text_MakingPreparations:: @ 81A5351 .string "じゅんびちゅうです！$" Text_WantWhichFloor:: @ 81A535C @@ -926,16 +926,7 @@ Text_GiveNicknameToThisMon:: @ 81A56A7 .string "Do you want to give a nickname to\n" .string "this {STR_VAR_1}?$" -Text_1A56D2:: @ 81A56D2 - .string "おッ！　ダウジングマシンが\n" - .string "はんのう　してるぞ！\p" - .string "ましたに　どうぐが　うまってる！\n" - .string "‥‥‥$" - -Text_DugUpItemFromGround:: @ 81A5700 - .string "{PLAYER} dug up one {STR_VAR_2}\n" - .string "from deep in the ground.$" - + .include "data/text/itemfinder.inc" .include "data/text/route23.inc" .include "data/text/aide.inc" .include "data/text/ingame_trade.inc" @@ -995,7 +986,7 @@ Text_TheDoorIsOpen:: @ 81A5CDF Text_MonFlewAway:: @ 81A63C4 .string "The {STR_VAR_1} flew away!$" -Text_1A63D6:: @ 81A63D6 +Text_TheresBedLetsRest:: @ 81A63D6 .string "ベッドが　ある‥‥\n" .string "やすんでいこう$" diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc index 140c98958..f2b950607 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc @@ -29,3 +29,9 @@ CeladonCity_GameCorner_PrizeRoom_Text_NeedMoreCoins:: @ 81970D5 .string "Sorry, you'll need more COINS\n" .string "than that.$" +CeladonCity_GameCorner_PrizeRoom_Text_OopsNotEnoughRoom:: @ 81970FE + .string "おきゃくさん もう もてないよ$" + +CeladonCity_GameCorner_PrizeRoom_Text_OhFineThen:: @ 819710E + .string "あっ そう$" + diff --git a/data/maps/CeladonCity_Gym/text.inc b/data/maps/CeladonCity_Gym/text.inc index 02ded4fb0..9e372584e 100644 --- a/data/maps/CeladonCity_Gym/text.inc +++ b/data/maps/CeladonCity_Gym/text.inc @@ -1,9 +1,3 @@ -Text_SorryDontHaveAnyMore:: @ 81970FE - .string "おきゃくさん もう もてないよ$" - -Text_ISee:: @ 819710E - .string "あっ そう$" - CeladonCity_Gym_Text_ErikaIntro:: @ 8197114 .string "Hello…\n" .string "Lovely weather, isn't it?\l" diff --git a/data/maps/CeruleanCity/text.inc b/data/maps/CeruleanCity/text.inc index 06a21d302..7a940032d 100644 --- a/data/maps/CeruleanCity/text.inc +++ b/data/maps/CeruleanCity/text.inc @@ -42,7 +42,8 @@ CeruleanCity_Text_ExplainFameCheckerSmellYa:: @ 817ED5D .string "All right, this time I really am\n" .string "gone. Smell ya!$" -CeruleanCity_Text_17EDF8:: @ 817EDF8 +@ RB translation: "Heh! You're no match for my genius!" +CeruleanCity_Text_RivalVictory:: @ 817EDF8 .string "なんたって！\n" .string "おれは　てんさい　だからよ！$" diff --git a/data/text/itemfinder.inc b/data/text/itemfinder.inc new file mode 100644 index 000000000..5c59f43ee --- /dev/null +++ b/data/text/itemfinder.inc @@ -0,0 +1,10 @@ +@ Unused +Text_ItemfinderResponding:: @ 81A56D2 + .string "おッ！　ダウジングマシンが\n" + .string "はんのう　してるぞ！\p" + .string "ましたに　どうぐが　うまってる！\n" + .string "‥‥‥$" + +Text_DugUpItemFromGround:: @ 81A5700 + .string "{PLAYER} dug up one {STR_VAR_2}\n" + .string "from deep in the ground.$" -- cgit v1.2.3 From a506860558e71be26b4c37e9ac67b431ff0674a0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 2 Mar 2020 09:18:32 -0500 Subject: field effect 0x43 --- data/field_effect_scripts.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 3b30c8878..484de872b 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -334,7 +334,7 @@ gFldEffScript_DoubleExclMarkIcon:: @ 81D9998 end gFldEffScript_Unk43:: @ 81D999E - callnative sub_8087924 + callnative FldEff_Unk43 end gFldEffScript_Unk44:: @ 81D99A4 -- cgit v1.2.3 From a7966b5047cde2c32d3222847b1a048b5aaef343 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 2 Mar 2020 09:47:33 -0500 Subject: Finish field_effect.c --- data/field_effect.s | 43 ------------------------------------------- data/field_effect_scripts.s | 10 +++++----- 2 files changed, 5 insertions(+), 48 deletions(-) delete mode 100644 data/field_effect.s (limited to 'data') diff --git a/data/field_effect.s b/data/field_effect.s deleted file mode 100644 index 529205a57..000000000 --- a/data/field_effect.s +++ /dev/null @@ -1,43 +0,0 @@ -#include "constants/maps.h" -#include "constants/species.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnknown_83CC244:: @ 83CC244 dataptr - .4byte sub_8087C00 - .4byte sub_8087C2C - .4byte sub_8087CB4 - -gUnknown_83CC250:: @ 83CC250 sprite_frames - obj_frame_tiles gUnknown_83CBDB0 + 0x00, 0x0020 - obj_frame_tiles gUnknown_83CBDB0 + 0x20, 0x0020 - obj_frame_tiles gUnknown_83CBDB0 + 0x40, 0x0020 - obj_frame_tiles gUnknown_83CBDB0 + 0x60, 0x0020 - -gUnknown_83CC270:: @ 83CC270 animcmd - obj_image_anim_frame 0x0000, 0 - obj_image_anim_end - -gUnknown_83CC278:: @ 83CC278 animcmd - obj_image_anim_frame 0x0001, 0 - obj_image_anim_end - -gUnknown_83CC280:: @ 83CC280 animcmd - obj_image_anim_frame 0x0002, 0 - obj_image_anim_end - -gUnknown_83CC288:: @ 83CC288 animcmd - obj_image_anim_frame 0x0003, 0 - obj_image_anim_end - -gUnknown_83CC290:: @ 83CC290 dataptr - .4byte gUnknown_83CC270 - .4byte gUnknown_83CC278 - .4byte gUnknown_83CC280 - .4byte gUnknown_83CC288 - -gUnknown_83CC2A0:: @ 83CC2A0 spr_template - spr_template 65535, 4371, gOamData_83CBE58, gUnknown_83CC290, gUnknown_83CC250, gDummySpriteAffineAnimTable, sub_8087D90 diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 484de872b..010627fb5 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -69,7 +69,7 @@ gFieldEffectScriptPointers:: @ 81D96AC .4byte gFldEffScript_SmileyFaceIcon .4byte gFldEffScript_UseVsSeeker .4byte gFldEffScript_DoubleExclMarkIcon - .4byte gFldEffScript_Unk43 + .4byte gFldEffScript_MoveDeoxysRock .4byte gFldEffScript_Unk44 .4byte gFldEffScript_Unk45 @@ -333,14 +333,14 @@ gFldEffScript_DoubleExclMarkIcon:: @ 81D9998 callnative FldEff_DoubleExclMarkIcon end -gFldEffScript_Unk43:: @ 81D999E - callnative FldEff_Unk43 +gFldEffScript_MoveDeoxysRock:: @ 81D999E + callnative Fldeff_MoveDeoxysRock end gFldEffScript_Unk44:: @ 81D99A4 - callnative sub_8087AB4 + callnative FldEff_Unk44 end gFldEffScript_Unk45:: @ 81D99AA - callnative sub_8087E28 + callnative FldEff_Unk45 end -- cgit v1.2.3 From 875dde7a0cc2229decf41b1ecbac88addbdc8ea4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 2 Mar 2020 09:51:21 -0500 Subject: Rename remaining field effect callbacks --- data/field_effect_scripts.s | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data') diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 010627fb5..5517d1fda 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -165,7 +165,7 @@ gFldEffScript_Unknown22:: @ 81D987B end gFldEffScript_BerryTreeGrowthSparkle:: @ 81D9885 - callnative sub_80DC9DC + callnative FldEff_BerryTreeGrowthSparkle end gFldEffScript_DeepSandFootprints:: @ 81D988B @@ -224,7 +224,7 @@ gFldEffScript_UseRockSmash:: @ 81D98E4 end gFldEffScript_UseStrength:: @ 81D98EA - callnative sub_80D0860 + callnative FldEff_UseStrength end gFldEffScript_UseDig:: @ 81D98F0 @@ -236,11 +236,11 @@ gFldEffScript_SandPile:: @ 81D98F6 end gFldEffScript_ShortGrass:: @ 81D9900 - loadfadedpal_callnative gUnknown_83A5348, sub_80DB808 + loadfadedpal_callnative gUnknown_83A5348, FldEff_ShortGrass end gFldEffScript_HotSpringsWater:: @ 81D990A - loadfadedpal_callnative gUnknown_83A5348, sub_80DBF50 + loadfadedpal_callnative gUnknown_83A5348, FldEff_HotSpringsWater end gFldEffScript_UseWaterfall:: @ 81D9914 -- cgit v1.2.3 From 2f8ac698c8a03954d3bf0d05a9ef13dd447eaf53 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 2 Mar 2020 09:57:54 -0500 Subject: Static symbols in field_effect.c --- data/field_effect_scripts.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 5517d1fda..95d63568c 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -334,7 +334,7 @@ gFldEffScript_DoubleExclMarkIcon:: @ 81D9998 end gFldEffScript_MoveDeoxysRock:: @ 81D999E - callnative Fldeff_MoveDeoxysRock + callnative FldEff_MoveDeoxysRock end gFldEffScript_Unk44:: @ 81D99A4 -- cgit v1.2.3 From 6191739a4d01c4a83c4df721eb05b4f86c747381 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 2 Mar 2020 12:24:05 -0500 Subject: Label sign bg events --- data/map_events.s | 4 +- data/maps/CeladonCity/map.json | 24 ++++--- data/maps/CeladonCity_Condominiums_1F/map.json | 6 +- data/maps/CeladonCity_Condominiums_2F/map.json | 6 +- data/maps/CeladonCity_Condominiums_3F/map.json | 24 ++++--- data/maps/CeladonCity_Condominiums_Roof/map.json | 6 +- .../CeladonCity_Condominiums_RoofRoom/map.json | 9 ++- data/maps/CeladonCity_DepartmentStore_1F/map.json | 6 +- data/maps/CeladonCity_DepartmentStore_2F/map.json | 3 +- data/maps/CeladonCity_DepartmentStore_3F/map.json | 33 ++++++--- data/maps/CeladonCity_DepartmentStore_4F/map.json | 3 +- data/maps/CeladonCity_DepartmentStore_5F/map.json | 3 +- .../CeladonCity_DepartmentStore_Elevator/map.json | 6 +- .../maps/CeladonCity_DepartmentStore_Roof/map.json | 12 ++-- data/maps/CeladonCity_GameCorner/map.json | 72 +++++++++++++------- data/maps/CeladonCity_Gym/map.json | 6 +- data/maps/CeruleanCity/map.json | 21 ++++-- data/maps/CeruleanCity_BikeShop/map.json | 24 ++++--- data/maps/CeruleanCity_Gym/map.json | 6 +- data/maps/CeruleanCity_House2/map.json | 3 +- data/maps/CeruleanCity_House5/map.json | 3 +- data/maps/CinnabarIsland/map.json | 12 ++-- data/maps/CinnabarIsland_Gym/map.json | 45 ++++++++----- .../CinnabarIsland_PokemonLab_Entrance/map.json | 12 ++-- .../map.json | 6 +- data/maps/FiveIsland/map.json | 3 +- data/maps/FiveIsland_Meadow/map.json | 3 +- data/maps/FiveIsland_MemorialPillar/map.json | 3 +- data/maps/FiveIsland_ResortGorgeous/map.json | 3 +- data/maps/FiveIsland_ResortGorgeous_House/map.json | 6 +- data/maps/FiveIsland_RocketWarehouse/map.json | 69 ++++++++++++------- data/maps/FourIsland/map.json | 6 +- data/maps/FourIsland_PokemonCenter_1F/map.json | 6 +- data/maps/FuchsiaCity/map.json | 33 ++++++--- data/maps/FuchsiaCity_Gym/map.json | 6 +- data/maps/FuchsiaCity_WardensHouse/map.json | 12 ++-- data/maps/LavenderTown/map.json | 12 ++-- .../LavenderTown_VolunteerPokemonHouse/map.json | 9 ++- data/maps/MtEmber_RubyPath_B4F/map.json | 78 ++++++++++++++-------- data/maps/MtEmber_RubyPath_B5F/map.json | 3 +- data/maps/MtMoon_1F/map.json | 3 +- data/maps/OneIsland/map.json | 6 +- data/maps/OneIsland_KindleRoad/map.json | 6 +- data/maps/OneIsland_PokemonCenter_1F/map.json | 27 +++++--- data/maps/PalletTown/map.json | 15 +++-- data/maps/PalletTown_GarysHouse/map.json | 9 ++- data/maps/PalletTown_PlayersHouse_1F/map.json | 3 +- data/maps/PalletTown_PlayersHouse_2F/map.json | 9 ++- data/maps/PalletTown_ProfessorOaksLab/map.json | 12 ++-- data/maps/PewterCity/map.json | 15 +++-- data/maps/PewterCity_Gym/map.json | 6 +- data/maps/PewterCity_Museum_1F/map.json | 12 ++-- data/maps/PewterCity_Museum_2F/map.json | 24 ++++--- data/maps/PokemonMansion_1F/map.json | 3 +- data/maps/PokemonMansion_2F/map.json | 9 ++- data/maps/PokemonMansion_3F/map.json | 6 +- data/maps/PokemonMansion_B1F/map.json | 9 ++- data/maps/RockTunnel_1F/map.json | 3 +- data/maps/RocketHideout_Elevator/map.json | 3 +- data/maps/Route1/map.json | 3 +- data/maps/Route10/map.json | 9 ++- data/maps/Route11/map.json | 3 +- data/maps/Route11_EastEntrance_2F/map.json | 6 +- data/maps/Route12/map.json | 6 +- data/maps/Route12_FishingHouse/map.json | 3 +- data/maps/Route12_NorthEntrance_2F/map.json | 6 +- data/maps/Route13/map.json | 9 ++- data/maps/Route14/map.json | 3 +- data/maps/Route15/map.json | 3 +- data/maps/Route15_WestEntrance_2F/map.json | 6 +- data/maps/Route16/map.json | 6 +- data/maps/Route16_NorthEntrance_2F/map.json | 6 +- data/maps/Route17/map.json | 18 +++-- data/maps/Route18/map.json | 6 +- data/maps/Route18_EastEntrance_2F/map.json | 6 +- data/maps/Route19/map.json | 3 +- data/maps/Route2/map.json | 6 +- data/maps/Route20/map.json | 6 +- data/maps/Route22/map.json | 3 +- data/maps/Route23/map.json | 3 +- data/maps/Route25/map.json | 3 +- data/maps/Route25_SeaCottage/map.json | 3 +- data/maps/Route3/map.json | 3 +- data/maps/Route4/map.json | 6 +- data/maps/Route5/map.json | 3 +- data/maps/Route6/map.json | 3 +- data/maps/Route7/map.json | 3 +- data/maps/Route8/map.json | 3 +- data/maps/Route9/map.json | 3 +- data/maps/SSAnne_CaptainsOffice/map.json | 9 ++- data/maps/SafariZone_Center/map.json | 9 ++- data/maps/SafariZone_East/map.json | 9 ++- data/maps/SafariZone_North/map.json | 15 +++-- data/maps/SafariZone_West/map.json | 12 ++-- data/maps/SaffronCity/map.json | 27 +++++--- data/maps/SaffronCity_CopycatsHouse_2F/map.json | 6 +- data/maps/SaffronCity_Dojo/map.json | 12 ++-- data/maps/SaffronCity_Gym/map.json | 6 +- data/maps/SaffronCity_House/map.json | 3 +- data/maps/SeafoamIslands_B4F/map.json | 6 +- data/maps/SevenIsland/map.json | 3 +- data/maps/SevenIsland_House_Room1/map.json | 3 +- data/maps/SevenIsland_SevaultCanyon/map.json | 3 +- .../SevenIsland_SevaultCanyon_Entrance/map.json | 3 +- data/maps/SevenIsland_TrainerTower/map.json | 6 +- data/maps/SilphCo_10F/map.json | 15 +++-- data/maps/SilphCo_11F/map.json | 15 +++-- data/maps/SilphCo_1F/map.json | 3 +- data/maps/SilphCo_2F/map.json | 27 +++++--- data/maps/SilphCo_3F/map.json | 27 +++++--- data/maps/SilphCo_4F/map.json | 27 +++++--- data/maps/SilphCo_5F/map.json | 48 ++++++++----- data/maps/SilphCo_6F/map.json | 15 +++-- data/maps/SilphCo_7F/map.json | 39 +++++++---- data/maps/SilphCo_8F/map.json | 15 +++-- data/maps/SilphCo_9F/map.json | 51 +++++++++----- data/maps/SilphCo_Elevator/map.json | 3 +- data/maps/SixIsland/map.json | 3 +- data/maps/SixIsland_DottedHole_B1F/map.json | 3 +- data/maps/SixIsland_DottedHole_B2F/map.json | 3 +- data/maps/SixIsland_DottedHole_B3F/map.json | 3 +- data/maps/SixIsland_DottedHole_B4F/map.json | 3 +- .../SixIsland_DottedHole_SapphireRoom/map.json | 3 +- data/maps/SixIsland_GreenPath/map.json | 6 +- data/maps/SixIsland_RuinValley/map.json | 3 +- data/maps/SixIsland_WaterPath/map.json | 6 +- data/maps/SixIsland_WaterPath_House1/map.json | 3 +- data/maps/ThreeIsland/map.json | 3 +- data/maps/ThreeIsland_BerryForest/map.json | 6 +- data/maps/ThreeIsland_BondBridge/map.json | 6 +- data/maps/ThreeIsland_House1/map.json | 3 +- data/maps/TrainerTower_Elevator/map.json | 3 +- data/maps/TrainerTower_Lobby/map.json | 3 +- data/maps/TwoIsland/map.json | 9 ++- data/maps/TwoIsland_JoyfulGameCorner/map.json | 6 +- data/maps/VermilionCity/map.json | 15 +++-- data/maps/VermilionCity_Gym/map.json | 51 +++++++++----- data/maps/VermilionCity_House3/map.json | 3 +- data/maps/VermilionCity_PokemonFanClub/map.json | 6 +- data/maps/ViridianCity/map.json | 15 +++-- data/maps/ViridianCity_Gym/map.json | 6 +- data/maps/ViridianCity_House1/map.json | 3 +- data/maps/ViridianCity_House2/map.json | 15 +++-- data/maps/ViridianForest/map.json | 18 +++-- 144 files changed, 1039 insertions(+), 522 deletions(-) (limited to 'data') diff --git a/data/map_events.s b/data/map_events.s index 62bd63b2e..9255e3396 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -1,4 +1,4 @@ -@#include "constants/bg_event_constants.h" +#include "constants/event_bg.h" #include "constants/event_object_movement.h" #include "constants/event_objects.h" #include "constants/flags.h" @@ -6,10 +6,8 @@ #include "constants/map_scripts.h" #include "constants/layouts.h" #include "constants/maps.h" -@#include "constants/secret_bases.h" #include "constants/vars.h" #include "constants/weather.h" -@#include "constants/trainer_hill.h" .include "asm/macros.inc" .include "constants/constants.inc" .include "constants/item_data_constants.inc" diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index f635220e1..d4d0122ca 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -319,59 +319,67 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 45, "y": 23, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_EventScript_TrainerTips2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 38, "y": 23, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_EventScript_PrizeExchangeSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 33, "y": 23, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_EventScript_GameCornerSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 22, "y": 18, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_EventScript_CitySign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 26, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_EventScript_MansionSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 33, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_EventScript_TrainerTips1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 18, "y": 14, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_EventScript_DeptStoreSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 16, "y": 31, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_EventScript_GymSign" }, { diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json index 6887e5d59..0d4d0c599 100644 --- a/data/maps/CeladonCity_Condominiums_1F/map.json +++ b/data/maps/CeladonCity_Condominiums_1F/map.json @@ -115,17 +115,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_Condominiums_1F_EventScript_SuiteSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_Condominiums_1F_EventScript_SuiteSign" } ] diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json index f2d2e8de6..60931f16b 100644 --- a/data/maps/CeladonCity_Condominiums_2F/map.json +++ b/data/maps/CeladonCity_Condominiums_2F/map.json @@ -75,17 +75,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_Condominiums_2F_EventScript_MeetingRoomSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_Condominiums_2F_EventScript_MeetingRoomSign" } ] diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json index 90cded248..303754f6b 100644 --- a/data/maps/CeladonCity_Condominiums_3F/map.json +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -101,59 +101,67 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_Condominiums_3F_EventScript_DevelopmentRoomSign" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 1, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CeladonCity_Condominiums_3F_EventScript_Computer1" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 5, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CeladonCity_Condominiums_3F_EventScript_Computer2" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 1, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CeladonCity_Condominiums_3F_EventScript_Computer3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_Condominiums_3F_EventScript_DevelopmentRoomSign" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 0, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CeladonCity_Condominiums_3F_EventScript_Computer3" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 0, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CeladonCity_Condominiums_3F_EventScript_Computer1" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 4, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CeladonCity_Condominiums_3F_EventScript_Computer2" } ] diff --git a/data/maps/CeladonCity_Condominiums_Roof/map.json b/data/maps/CeladonCity_Condominiums_Roof/map.json index 428acdf99..c5d43e4ef 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/map.json +++ b/data/maps/CeladonCity_Condominiums_Roof/map.json @@ -41,17 +41,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_Condominiums_Roof_EventScript_Sign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_Condominiums_Roof_EventScript_Sign" } ] diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index a8aa69f77..edb1ec528 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -68,24 +68,27 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_Condominiums_RoofRoom_EventScript_Blackboard" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_Condominiums_RoofRoom_EventScript_Blackboard" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_Condominiums_RoofRoom_EventScript_TMsPamphlet" } ] diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json index fa5630be8..6cff44808 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json @@ -90,17 +90,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_1F_EventScript_LayoutSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_1F_EventScript_FloorSign" } ] diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json index 39b0f530b..589eda654 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -94,10 +94,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_2F_EventScript_FloorSign" } ] diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json index ac47d8ac5..e97292c6c 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -107,80 +107,91 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_3F_EventScript_FloorSign" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 2, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CeladonCity_DepartmentStore_3F_EventScript_TV1" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 5, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CeladonCity_DepartmentStore_3F_EventScript_TV2" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 2, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CeladonCity_DepartmentStore_3F_EventScript_TV3" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 5, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CeladonCity_DepartmentStore_3F_EventScript_TV4" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 1, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_3F_EventScript_SuperNES" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 1, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_3F_EventScript_SuperNES" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_3F_EventScript_SuperNES" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_3F_EventScript_SuperNES" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 2, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CeladonCity_DepartmentStore_3F_EventScript_Poster" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 0, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CeladonCity_DepartmentStore_3F_EventScript_Poster" } ] diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json index 5d6cdb416..f32fa8c70 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json @@ -81,10 +81,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_4F_EventScript_FloorSign" } ] diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json index 5746f8363..8d1ba57ae 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json @@ -94,10 +94,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_5F_EventScript_FloorSign" } ] diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json index 2a1af1699..d2ad4fa76 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json @@ -34,17 +34,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 0, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelect" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelect" } ] diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json index 7fed112f3..132b04af5 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json @@ -54,31 +54,35 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 14, "y": 3, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_Roof_EventScript_FloorSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 10, "y": 3, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 3, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 3, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine" } ] diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json index 063e7e74a..fa69f8dc8 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -312,171 +312,195 @@ "underfoot": false }, { - "type": "bg_event_type_4", + "type": "sign", "x": 0, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine0" }, { - "type": "bg_event_type_4", + "type": "sign", "x": 0, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine1" }, { - "type": "bg_event_type_4", + "type": "sign", "x": 0, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine2" }, { - "type": "bg_event_type_3", + "type": "sign", "x": 5, "y": 6, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine3" }, { - "type": "bg_event_type_3", + "type": "sign", "x": 5, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", "script": "CeladonCity_GameCorner_EventScript_UnusableSlotMachine1" }, { - "type": "bg_event_type_3", + "type": "sign", "x": 5, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine5" }, { - "type": "bg_event_type_3", + "type": "sign", "x": 5, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine6" }, { - "type": "bg_event_type_4", + "type": "sign", "x": 6, "y": 6, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine7" }, { - "type": "bg_event_type_4", + "type": "sign", "x": 6, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine8" }, { - "type": "bg_event_type_4", + "type": "sign", "x": 6, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine9" }, { - "type": "bg_event_type_3", + "type": "sign", "x": 11, "y": 6, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine10" }, { - "type": "bg_event_type_3", + "type": "sign", "x": 11, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine11" }, { - "type": "bg_event_type_3", + "type": "sign", "x": 11, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine12" }, { - "type": "bg_event_type_3", + "type": "sign", "x": 11, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine13" }, { - "type": "bg_event_type_4", + "type": "sign", "x": 12, "y": 6, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine14" }, { - "type": "bg_event_type_4", + "type": "sign", "x": 12, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", "script": "CeladonCity_GameCorner_EventScript_UnusableSlotMachine2" }, { - "type": "bg_event_type_4", + "type": "sign", "x": 12, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine16" }, { - "type": "bg_event_type_4", + "type": "sign", "x": 12, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine17" }, { - "type": "bg_event_type_3", + "type": "sign", "x": 17, "y": 6, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", "script": "CeladonCity_GameCorner_EventScript_UnusableSlotMachine3" }, { - "type": "bg_event_type_3", + "type": "sign", "x": 17, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine19" }, { - "type": "bg_event_type_3", + "type": "sign", "x": 17, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine20" }, { - "type": "bg_event_type_3", + "type": "sign", "x": 17, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine21" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_GameCorner_EventScript_Poster" }, { - "type": "bg_event_type_3", + "type": "sign", "x": 17, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", "script": "CeladonCity_GameCorner_EventScript_PhotoPrinter" } ] diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json index 230a033bb..d9f291300 100644 --- a/data/maps/CeladonCity_Gym/map.json +++ b/data/maps/CeladonCity_Gym/map.json @@ -185,17 +185,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_Gym_EventScript_GymStatue" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_Gym_EventScript_GymStatue" } ] diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index b9e7f6106..885c7207a 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -343,31 +343,35 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 20, "y": 25, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_EventScript_CitySign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 27, "y": 21, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_EventScript_GymSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 28, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_EventScript_BikeShopSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 19, "y": 32, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_EventScript_TrainerTips" }, { @@ -381,24 +385,27 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 25, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_BikeShop_EventScript_Bicycle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 27, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_BikeShop_EventScript_Bicycle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 26, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_BikeShop_EventScript_Bicycle" } ] diff --git a/data/maps/CeruleanCity_BikeShop/map.json b/data/maps/CeruleanCity_BikeShop/map.json index 1db90cc0f..fe379e48d 100644 --- a/data/maps/CeruleanCity_BikeShop/map.json +++ b/data/maps/CeruleanCity_BikeShop/map.json @@ -81,59 +81,67 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 3, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_BikeShop_EventScript_Bicycle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_BikeShop_EventScript_Bicycle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_BikeShop_EventScript_Bicycle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 2, "y": 3, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_BikeShop_EventScript_Bicycle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 1, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_BikeShop_EventScript_Bicycle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 2, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_BikeShop_EventScript_Bicycle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 2, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_BikeShop_EventScript_Bicycle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 2, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_BikeShop_EventScript_Bicycle" } ] diff --git a/data/maps/CeruleanCity_Gym/map.json b/data/maps/CeruleanCity_Gym/map.json index 551bc0d9a..f31474399 100644 --- a/data/maps/CeruleanCity_Gym/map.json +++ b/data/maps/CeruleanCity_Gym/map.json @@ -94,17 +94,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 17, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_Gym_EventScript_GymStatue" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 10, "y": 17, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_Gym_EventScript_GymStatue" } ] diff --git a/data/maps/CeruleanCity_House2/map.json b/data/maps/CeruleanCity_House2/map.json index 8a36a82d3..2cdf99d67 100644 --- a/data/maps/CeruleanCity_House2/map.json +++ b/data/maps/CeruleanCity_House2/map.json @@ -75,10 +75,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_House2_EventScript_WallHole" } ] diff --git a/data/maps/CeruleanCity_House5/map.json b/data/maps/CeruleanCity_House5/map.json index a1b7d870d..c9c5edc09 100644 --- a/data/maps/CeruleanCity_House5/map.json +++ b/data/maps/CeruleanCity_House5/map.json @@ -41,10 +41,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_House5_EventScript_BerryCrushRankings" } ] diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index bd9c57435..6dabd0e47 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -129,31 +129,35 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 3, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CinnabarIsland_EventScript_IslandSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CinnabarIsland_EventScript_PokemonLabSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 22, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CinnabarIsland_EventScript_GymSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 10, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CinnabarIsland_EventScript_PokemonLabSign" } ] diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json index efa247390..086a470bc 100644 --- a/data/maps/CinnabarIsland_Gym/map.json +++ b/data/maps/CinnabarIsland_Gym/map.json @@ -159,108 +159,123 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 23, "y": 20, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CinnabarIsland_Gym_EventScript_GymStatue" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 27, "y": 20, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CinnabarIsland_Gym_EventScript_GymStatue" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 22, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CinnabarIsland_Gym_EventScript_Quz1Left" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 23, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CinnabarIsland_Gym_EventScript_Quz1Right" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 15, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CinnabarIsland_Gym_EventScript_Quiz2Left" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 16, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CinnabarIsland_Gym_EventScript_Quiz2Right" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 13, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CinnabarIsland_Gym_EventScript_Quiz3Left" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 14, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CinnabarIsland_Gym_EventScript_Quiz3Right" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 13, "y": 17, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CinnabarIsland_Gym_EventScript_Quiz4Left" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 14, "y": 17, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CinnabarIsland_Gym_EventScript_Quiz4Right" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 1, "y": 18, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CinnabarIsland_Gym_EventScript_Quiz5Left" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 2, "y": 18, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CinnabarIsland_Gym_EventScript_Quiz5Right" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 1, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CinnabarIsland_Gym_EventScript_Quiz6Left" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 2, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CinnabarIsland_Gym_EventScript_Quiz6Right" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 3, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CinnabarIsland_Gym_EventScript_BlaineFujiPhoto" } ] diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json index cd8a2df15..5822a716e 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json @@ -76,31 +76,35 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_DrFujiPhoto" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_MeetingRoomSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 18, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_RAndDRoomSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 24, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_TestingRoomSign" } ] diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json index 38688647e..d9b98752d 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -54,17 +54,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_AmberPipe" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_Computer" } ] diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index f91680715..4922eb063 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -100,10 +100,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 20, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_EventScript_IslandSign" } ] diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index 6c1caf054..30195a833 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -130,10 +130,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 21, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_Meadow_EventScript_WarehouseDoor" } ] diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json index 11719d89b..ace36826f 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -91,10 +91,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_1", + "type": "sign", "x": 9, "y": 43, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "FiveIsland_MemorialPillar_EventScript_Memorial" }, { diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json index 8b5b3afd4..7e69fc3fc 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -185,10 +185,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 42, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_ResortGorgeous_EventScript_SelphysHouseSign" } ] diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json index 82cf27051..5c696d0d5 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -54,17 +54,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_1", + "type": "sign", "x": 9, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "FiveIsland_ResortGorgeous_House_EventScript_1ACF2C" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 8, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "FiveIsland_ResortGorgeous_House_EventScript_1ACF2C" } ] diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index 6d6f5b7bc..3c87c10d3 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -186,17 +186,19 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_3", + "type": "sign", "x": 26, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", "script": "FiveIsland_RocketWarehouse_EventScript_Computer" }, { @@ -220,150 +222,171 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 10, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 10, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 10, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 3, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 3, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 2, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 2, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" } ] diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index 35dd24e8c..b7b3da95a 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -233,10 +233,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 13, "y": 19, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FourIsland_EventScript_IslandSign" }, { @@ -260,10 +261,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 31, "y": 23, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FourIsland_EventScript_LoreleisHouseSign" } ] diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json index 7757c904e..8b1d8bc4b 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/map.json +++ b/data/maps/FourIsland_PokemonCenter_1F/map.json @@ -87,17 +87,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_1", + "type": "sign", "x": 3, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "FourIsland_PokemonCenter_1F_EventScript_PokemonJournal" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 2, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "FourIsland_PokemonCenter_1F_EventScript_PokemonJournal" } ] diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index da9946432..6ed4ef5a5 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -322,80 +322,91 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 31, "y": 18, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_EventScript_CitySign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 26, "y": 18, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_EventScript_SafariZoneSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 32, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_EventScript_GymSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 31, "y": 31, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_EventScript_WardensHomeSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 35, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_EventScript_VoltorbSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 38, "y": 16, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_EventScript_SlowpokeSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 41, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_EventScript_ChanseySign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 17, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_EventScript_KangaskhanSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_EventScript_FossilMonSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 17, "y": 18, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_EventScript_LaprasSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 22, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_EventScript_SafariGameSign" }, { diff --git a/data/maps/FuchsiaCity_Gym/map.json b/data/maps/FuchsiaCity_Gym/map.json index c14782953..a7a63cf15 100644 --- a/data/maps/FuchsiaCity_Gym/map.json +++ b/data/maps/FuchsiaCity_Gym/map.json @@ -146,17 +146,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 19, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_Gym_EventScript_GymStatue" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 10, "y": 19, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_Gym_EventScript_GymStatue" } ] diff --git a/data/maps/FuchsiaCity_WardensHouse/map.json b/data/maps/FuchsiaCity_WardensHouse/map.json index bf130d7e2..92a3165d1 100644 --- a/data/maps/FuchsiaCity_WardensHouse/map.json +++ b/data/maps/FuchsiaCity_WardensHouse/map.json @@ -94,31 +94,35 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_WardensHouse_EventScript_DisplaySign2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_WardensHouse_EventScript_DisplaySign1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_WardensHouse_EventScript_DisplaySign1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_WardensHouse_EventScript_DisplaySign2" } ] diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json index 5205e43e0..1edbe2867 100644 --- a/data/maps/LavenderTown/map.json +++ b/data/maps/LavenderTown/map.json @@ -118,31 +118,35 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "LavenderTown_EventScript_SilphScopeNotice" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 15, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "LavenderTown_EventScript_TownSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 21, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "LavenderTown_EventScript_PokemonTowerSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "LavenderTown_EventScript_VolunteerHouseSign" } ] diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json index 14781ded3..7be052760 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json @@ -120,24 +120,27 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "LavenderTown_VolunteerPokemonHouse_EventScript_PokemonFanMagazine" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "LavenderTown_VolunteerPokemonHouse_EventScript_Bookshelf" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "LavenderTown_VolunteerPokemonHouse_EventScript_Bookshelf" } ] diff --git a/data/maps/MtEmber_RubyPath_B4F/map.json b/data/maps/MtEmber_RubyPath_B4F/map.json index c10c21ff9..5d4da8a7a 100644 --- a/data/maps/MtEmber_RubyPath_B4F/map.json +++ b/data/maps/MtEmber_RubyPath_B4F/map.json @@ -34,185 +34,211 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_1", + "type": "sign", "x": 3, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleABC" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 4, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleABC" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 5, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleABC" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 4, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleGHI" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 3, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleGHI" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 5, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleGHI" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 3, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleMNO" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 4, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleMNO" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 5, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleMNO" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 3, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleTUV" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 4, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleTUV" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 5, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleTUV" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 7, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleDEF" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 8, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleDEF" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 9, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleDEF" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 7, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleJKL" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 8, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleJKL" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 9, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleJKL" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 7, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BraillePQRS" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 11, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BraillePeriod" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 11, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleComma" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 8, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BraillePQRS" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 9, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BraillePQRS" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 7, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleWXYZ" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 9, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleWXYZ" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 8, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleWXYZ" } ] diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json index ccd53263e..1fd9bd290 100644 --- a/data/maps/MtEmber_RubyPath_B5F/map.json +++ b/data/maps/MtEmber_RubyPath_B5F/map.json @@ -41,10 +41,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_1", + "type": "sign", "x": 7, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B5F_EventScript_BrailleMessage" } ] diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json index 4bfd935f9..a35db089c 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -231,10 +231,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 19, "y": 26, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "MtMoon_1F_EventScript_ZubatSign" } ] diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json index cc27f84cb..344798602 100644 --- a/data/maps/OneIsland/map.json +++ b/data/maps/OneIsland/map.json @@ -99,17 +99,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 14, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "OneIsland_EventScript_IslandSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 15, "y": 6, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "OneIsland_EventScript_PokemonNetCenterSign" } ] diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index 99dc16ac3..972dbc2e7 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -425,17 +425,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 13, "y": 59, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "OneIsland_KindleRoad_EventScript_EmberSpaSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 115, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "OneIsland_KindleRoad_EventScript_RouteSign" } ] diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index 8ffa34c57..849cdca08 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -150,66 +150,75 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 3, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 13, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 15, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 14, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 16, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 17, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" } ] diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 32d501c67..97b0ac74a 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -120,38 +120,43 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 16, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_EventScript_OaksLabSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_EventScript_PlayersHouseSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 13, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_EventScript_RivalsHouseSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_EventScript_TownSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_EventScript_TrainerTips" } ] diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json index 48822f5bb..b4ac2c780 100644 --- a/data/maps/PalletTown_GarysHouse/map.json +++ b/data/maps/PalletTown_GarysHouse/map.json @@ -68,24 +68,27 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_GarysHouse_EventScript_Bookshelf" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_GarysHouse_EventScript_Bookshelf" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_GarysHouse_EventScript_Picture" } ] diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json index b6d8afc36..f32d6b102 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/map.json +++ b/data/maps/PalletTown_PlayersHouse_1F/map.json @@ -62,10 +62,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_PlayersHouse_1F_EventScript_TV" } ] diff --git a/data/maps/PalletTown_PlayersHouse_2F/map.json b/data/maps/PalletTown_PlayersHouse_2F/map.json index 8d6f9fa57..bd2aec42f 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/map.json +++ b/data/maps/PalletTown_PlayersHouse_2F/map.json @@ -27,24 +27,27 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 5, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_PlayersHouse_2F_EventScript_NES" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 1, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_PlayersHouse_2F_EventScript_PC" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_PlayersHouse_2F_EventScript_Sign" } ] diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index ce27f53a8..fa7c23e9b 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -227,31 +227,35 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 2, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_ProfessorOaksLab_EventScript_Computer" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_ProfessorOaksLab_EventScript_Computer" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_ProfessorOaksLab_EventScript_LeftSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_ProfessorOaksLab_EventScript_RightSign" } ] diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index 63d974e60..070637f7f 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -236,38 +236,43 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 19, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_EventScript_MuseumSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 39, "y": 19, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_EventScript_PoliceNotice" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_EventScript_GymSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 20, "y": 30, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_EventScript_TrainerTips" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 31, "y": 25, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_EventScript_CitySign" }, { diff --git a/data/maps/PewterCity_Gym/map.json b/data/maps/PewterCity_Gym/map.json index c5009c369..0457d1dea 100644 --- a/data/maps/PewterCity_Gym/map.json +++ b/data/maps/PewterCity_Gym/map.json @@ -81,17 +81,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_Gym_EventScript_GymStatue" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_Gym_EventScript_GymStatue" } ] diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index ab2389c02..df70c9344 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -169,31 +169,35 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_Museum_1F_EventScript_AerodactylFossil" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_Museum_1F_EventScript_KabutopsFossil" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 27, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "PewterCity_Museum_1F_EventScript_PokemonJournalBrock" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 26, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "PewterCity_Museum_1F_EventScript_PokemonJournalBrock" } ] diff --git a/data/maps/PewterCity_Museum_2F/map.json b/data/maps/PewterCity_Museum_2F/map.json index cce062e6d..25076ca69 100644 --- a/data/maps/PewterCity_Museum_2F/map.json +++ b/data/maps/PewterCity_Museum_2F/map.json @@ -93,59 +93,67 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 6, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_Museum_2F_EventScript_MoonStone" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 15, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_Museum_2F_EventScript_SpaceShuttle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 14, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_Museum_2F_EventScript_SpaceShuttle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 16, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_Museum_2F_EventScript_SpaceShuttle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 14, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_Museum_2F_EventScript_SpaceShuttle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 15, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_Museum_2F_EventScript_SpaceShuttle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 16, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_Museum_2F_EventScript_SpaceShuttle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_Museum_2F_EventScript_MoonStone" } ] diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json index f3d8d7d17..37594ad42 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -156,10 +156,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_1", + "type": "sign", "x": 5, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "PokemonMansion_1F_EventScript_Statue" }, { diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json index 17f1847ed..1ae8106db 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -108,24 +108,27 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_1", + "type": "sign", "x": 2, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "PokemonMansion_2F_EventScript_Statue" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 31, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PokemonMansion_2F_EventScript_DiaryJuly10th" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 25, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PokemonMansion_2F_EventScript_DiaryJuly5th" } ] diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index 368d261db..5d6a8c3a1 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -129,17 +129,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PokemonMansion_3F_EventScript_DiaryFeb6th" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 12, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "PokemonMansion_3F_EventScript_Statue" }, { diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index 37cd7c276..8e281f772 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -106,24 +106,27 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 21, "y": 27, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PokemonMansion_B1F_EventScript_DiarySep1st" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 24, "y": 29, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "PokemonMansion_B1F_EventScript_Statue" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 27, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "PokemonMansion_B1F_EventScript_Statue" }, { diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index 52ae9407e..32938e61c 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -193,10 +193,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 14, "y": 33, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "RockTunnel_1F_EventScript_RouteSign" } ] diff --git a/data/maps/RocketHideout_Elevator/map.json b/data/maps/RocketHideout_Elevator/map.json index 8e2d35889..746d61db2 100644 --- a/data/maps/RocketHideout_Elevator/map.json +++ b/data/maps/RocketHideout_Elevator/map.json @@ -34,10 +34,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 0, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "RocketHideout_Elevator_EventScript_FloorSelect" } ] diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json index fab0ef1f1..e400dc366 100644 --- a/data/maps/Route1/map.json +++ b/data/maps/Route1/map.json @@ -57,10 +57,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 31, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route1_EventScript_RouteSign" } ] diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index 7c44db6d9..b2127adf5 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -197,24 +197,27 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 15, "y": 59, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route10_EventScript_SouthRockTunnelSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 42, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route10_EventScript_PowerPlantSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 21, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route10_EventScript_NorthRockTunnelSign" }, { diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json index f7d261a8e..f3a2798a4 100644 --- a/data/maps/Route11/map.json +++ b/data/maps/Route11/map.json @@ -222,10 +222,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 7, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route11_EventScript_DiglettsCaveSign" }, { diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json index 5ac6eb2d3..3b621be31 100644 --- a/data/maps/Route11_EastEntrance_2F/map.json +++ b/data/maps/Route11_EastEntrance_2F/map.json @@ -54,17 +54,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route11_EastEntrance_2F_EventScript_LeftBinoculars" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route11_EastEntrance_2F_EventScript_RightBinoculars" } ] diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index c46c45f2f..ee56fb220 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -247,17 +247,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 17, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route12_EventScript_RouteSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 15, "y": 69, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route12_EventScript_FishingSign" }, { diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json index 557dcb00c..ae79e4465 100644 --- a/data/maps/Route12_FishingHouse/map.json +++ b/data/maps/Route12_FishingHouse/map.json @@ -55,10 +55,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route12_FishingHouse_EventScript_MagikarpRecordSign" } ] diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json index 220589706..0bfea2720 100644 --- a/data/maps/Route12_NorthEntrance_2F/map.json +++ b/data/maps/Route12_NorthEntrance_2F/map.json @@ -41,17 +41,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route12_NorthEntrance_2F_EventScript_LeftBinoculars" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route12_NorthEntrance_2F_EventScript_RightBinoculars" } ] diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index cd56c9244..923408ff2 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -174,24 +174,27 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 41, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route13_EventScript_RouteSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 37, "y": 6, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route13_EventScript_TrainerTips2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 21, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route13_EventScript_TrainerTips1" }, { diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index 76c96e56c..69e679b74 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -226,10 +226,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 17, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route14_EventScript_RouteSign" }, { diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index ef6dee02a..38d12303a 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -229,10 +229,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 41, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route15_EventScript_RouteSign" } ] diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json index 8317b4d84..bff054b37 100644 --- a/data/maps/Route15_WestEntrance_2F/map.json +++ b/data/maps/Route15_WestEntrance_2F/map.json @@ -41,17 +41,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route15_WestEntrance_2F_EventScript_LeftBinoculars" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route15_WestEntrance_2F_EventScript_RightBinoculars" } ] diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index b88cbe12c..f6f26ac5f 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -197,17 +197,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 17, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route16_EventScript_RouteSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 33, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route16_EventScript_CyclingRoadSign" }, { diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json index 103929172..2b7e87446 100644 --- a/data/maps/Route16_NorthEntrance_2F/map.json +++ b/data/maps/Route16_NorthEntrance_2F/map.json @@ -67,17 +67,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route16_NorthEntrance_2F_EventScript_LeftBinoculars" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route16_NorthEntrance_2F_EventScript_RightBinoculars" } ] diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json index 43ec14e88..216da4c48 100644 --- a/data/maps/Route17/map.json +++ b/data/maps/Route17/map.json @@ -161,45 +161,51 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 97, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route17_EventScript_RouteSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 83, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route17_EventScript_TrainerTips2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 68, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route17_EventScript_TrainerTips1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 53, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route17_EventScript_ItemsNotice" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 125, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route17_EventScript_BallsNotice" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 157, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route17_EventScript_CyclingRoadSign" }, { diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json index 6976a7570..427e6347b 100644 --- a/data/maps/Route18/map.json +++ b/data/maps/Route18/map.json @@ -85,17 +85,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 37, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route18_EventScript_CyclingRoadSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 52, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route18_EventScript_RouteSign" } ] diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json index c5c7b0853..d42dea652 100644 --- a/data/maps/Route18_EastEntrance_2F/map.json +++ b/data/maps/Route18_EastEntrance_2F/map.json @@ -41,17 +41,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route18_EastEntrance_2F_EventScript_LeftBinoculars" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route18_EastEntrance_2F_EventScript_RightBinoculars" } ] diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json index d8f35ad21..da02ab12c 100644 --- a/data/maps/Route19/map.json +++ b/data/maps/Route19/map.json @@ -187,10 +187,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 13, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route19_EventScript_RouteSign" } ] diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index 720b484d8..e02cbd20e 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -194,17 +194,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 14, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route2_EventScript_DiglettsCaveSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 73, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route2_EventScript_RouteSign" } ] diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json index 04f110847..fb5da2a10 100644 --- a/data/maps/Route20/map.json +++ b/data/maps/Route20/map.json @@ -189,17 +189,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 68, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route20_EventScript_SeafoamIslandsSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 64, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route20_EventScript_SeafoamIslandsSign" }, { diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index b4da63654..d3f74056c 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -114,10 +114,11 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route22_EventScript_LeagueGateSign" } ] diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json index aeaa87f85..6fc781eea 100644 --- a/data/maps/Route23/map.json +++ b/data/maps/Route23/map.json @@ -610,10 +610,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 31, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route23_EventScript_VictoryRoadGateSign" } ] diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index eee743a54..c20a76f4a 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -203,10 +203,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 48, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route25_EventScript_SeaCottageSign" }, { diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json index e8ac1df8d..a24337e79 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -68,10 +68,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_1", + "type": "sign", "x": 4, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "Route25_SeaCottage_EventScript_Computer" } ] diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index 1dbccf3ac..c137d9f48 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -148,10 +148,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 72, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route3_EventScript_RouteSign" }, { diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index fc4c4b53c..af04e21a8 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -145,17 +145,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 18, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route4_EventScript_MtMoonSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 34, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route4_EventScript_RouteSign" }, { diff --git a/data/maps/Route5/map.json b/data/maps/Route5/map.json index 08ec22387..a178efdc2 100644 --- a/data/maps/Route5/map.json +++ b/data/maps/Route5/map.json @@ -59,10 +59,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 32, "y": 32, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route5_EventScript_UndergroundPathSign" } ] diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index 349f35369..fd7a985b5 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -131,10 +131,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 21, "y": 15, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route6_EventScript_UndergroundPathSign" }, { diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index 09de5c2b8..52e630274 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -60,10 +60,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route7_EventScript_UndergroundPathSign" }, { diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index 6da585949..70f83ee31 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -241,10 +241,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 16, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route8_EventScript_UndergroundPathSign" }, { diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index 7fbff394d..e8cedc59c 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -187,10 +187,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 29, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route9_EventScript_RouteSign" }, { diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json index a514df616..97fa4067c 100644 --- a/data/maps/SSAnne_CaptainsOffice/map.json +++ b/data/maps/SSAnne_CaptainsOffice/map.json @@ -41,24 +41,27 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 2, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SSAnne_CaptainsOffice_EventScript_Book" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 3, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SSAnne_CaptainsOffice_EventScript_TrashCan" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 2, "y": 3, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SSAnne_CaptainsOffice_EventScript_Book" } ] diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json index 2b14d57d6..248a277c0 100644 --- a/data/maps/SafariZone_Center/map.json +++ b/data/maps/SafariZone_Center/map.json @@ -125,17 +125,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 30, "y": 26, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_Center_EventScript_RestHouseSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 25, "y": 27, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_Center_EventScript_TrainerTips" }, { @@ -149,10 +151,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 33, "y": 20, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_Center_EventScript_AreaSign" } ] diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json index a36d24a0e..c28626f63 100644 --- a/data/maps/SafariZone_East/map.json +++ b/data/maps/SafariZone_East/map.json @@ -122,24 +122,27 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 18, "y": 27, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_East_EventScript_AreaSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 43, "y": 15, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_East_EventScript_RestHouseSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 17, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_East_EventScript_TrainerTips" } ] diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index 4c1a7049b..ef8631c8f 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -151,38 +151,43 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 13, "y": 27, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_North_EventScript_TrainerTips1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 23, "y": 31, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_North_EventScript_AreaSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 29, "y": 32, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_North_EventScript_TrainerTips2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 34, "y": 28, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_North_EventScript_TrainerTips3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 44, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_North_EventScript_RestHouseSign" } ] diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json index d7b77f4bc..e56830150 100644 --- a/data/maps/SafariZone_West/map.json +++ b/data/maps/SafariZone_West/map.json @@ -150,31 +150,35 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 27, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_West_EventScript_LostTeethNotice" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 36, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_West_EventScript_TrainerTips" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 35, "y": 26, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_West_EventScript_AreaSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 22, "y": 19, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_West_EventScript_RestHouseSign" }, { diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index 5b61ffdd0..383be8d28 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -343,66 +343,75 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 29, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_EventScript_CitySign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 42, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_EventScript_DojoSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 13, "y": 25, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_EventScript_SilphProductSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 18, "y": 30, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_EventScript_TrainerTips2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 29, "y": 31, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_EventScript_SilphCoSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 54, "y": 25, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_EventScript_TrainerTips1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 50, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_EventScript_GymSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 40, "y": 38, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_EventScript_MrPsychicsHouseSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 49, "y": 22, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_EventScript_TrainerFanClubSign" } ] diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/map.json b/data/maps/SaffronCity_CopycatsHouse_2F/map.json index 77b75f09d..f5f6daa56 100644 --- a/data/maps/SaffronCity_CopycatsHouse_2F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_2F/map.json @@ -80,17 +80,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 1, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_CopycatsHouse_2F_EventScript_Computer" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_CopycatsHouse_2F_EventScript_Game" }, { diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index 1d2e8e575..f0f8641ff 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -152,31 +152,35 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_Dojo_EventScript_Statue" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_Dojo_EventScript_Statue" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_Dojo_EventScript_LeftScroll" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_Dojo_EventScript_RightScroll" } ] diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json index d29379fc3..7d99f45c0 100644 --- a/data/maps/SaffronCity_Gym/map.json +++ b/data/maps/SaffronCity_Gym/map.json @@ -369,17 +369,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 20, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_Gym_EventScript_GymStatue" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 16, "y": 20, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_Gym_EventScript_GymStatue" } ] diff --git a/data/maps/SaffronCity_House/map.json b/data/maps/SaffronCity_House/map.json index 02cef3897..17690ea89 100644 --- a/data/maps/SaffronCity_House/map.json +++ b/data/maps/SaffronCity_House/map.json @@ -94,10 +94,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 4, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_House_EventScript_Letter" } ] diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index b1f1f6908..edd0e5d3f 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -139,17 +139,19 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 30, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SeafoamIslands_B4F_EventScript_FastCurrentSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 14, "y": 18, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SeafoamIslands_B4F_EventScript_BoulderHintSign" } ] diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json index e55ba193a..829698bf9 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -99,10 +99,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 17, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SevenIsland_EventScript_IslandSign" } ] diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json index b2f5611b1..6e4b51e2a 100644 --- a/data/maps/SevenIsland_House_Room1/map.json +++ b/data/maps/SevenIsland_House_Room1/map.json @@ -48,10 +48,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SevenIsland_House_Room1_EventScript_Box" } ] diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index a3d196ac3..6096e0c49 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -316,10 +316,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 16, "y": 71, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SevenIsland_SevaultCanyon_EventScript_RouteSign" } ] diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json index 6939e8dfc..f05f55394 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -133,10 +133,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 14, "y": 26, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_RouteSign" } ] diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json index f7a3a7402..67319b37d 100644 --- a/data/maps/SevenIsland_TrainerTower/map.json +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -90,17 +90,19 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 56, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SevenIsland_TrainerTower_EventScript_TrainerTowerSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 50, "y": 30, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SevenIsland_TrainerTower_EventScript_TrainerTowerAheadSign" } ] diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index 0e04a2f1c..8c0f5ed97 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -141,31 +141,35 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_10F_EventScript_Door" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 13, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_10F_EventScript_Door" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_10F_EventScript_Door" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 13, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_10F_EventScript_Door" }, { @@ -179,10 +183,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_10F_EventScript_FloorSign" } ] diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index 458446a43..22b72e3ee 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -139,31 +139,35 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 16, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_11F_EventScript_Door" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 17, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_11F_EventScript_Door" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 16, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_11F_EventScript_Door" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 17, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_11F_EventScript_Door" }, { @@ -177,10 +181,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_11F_EventScript_FloorSign" } ] diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json index 59c9bf374..e4cfd2927 100644 --- a/data/maps/SilphCo_1F/map.json +++ b/data/maps/SilphCo_1F/map.json @@ -69,10 +69,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 30, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_1F_EventScript_FloorSign" } ] diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index e3fb80764..61c40ac7b 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -135,59 +135,67 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_2F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_2F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_2F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_2F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 15, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_2F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 15, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_2F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_2F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_2F_EventScript_Door2" }, { @@ -201,10 +209,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 29, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_2F_EventScript_FloorSign" } ] diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index ffe70afbf..954808b4b 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -143,59 +143,67 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 10, "y": 12, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_3F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 10, "y": 13, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_3F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 21, "y": 12, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_3F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 21, "y": 13, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_3F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 12, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_3F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 13, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_3F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 20, "y": 12, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_3F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 20, "y": 13, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_3F_EventScript_Door2" }, { @@ -209,10 +217,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 29, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_3F_EventScript_FloorSign" } ] diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index 080e2649c..19b3822f2 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -174,59 +174,67 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_4F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_4F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 17, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_4F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 17, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_4F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 15, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_4F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 14, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_4F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 14, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_4F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 15, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_4F_EventScript_Door2" }, { @@ -240,10 +248,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 29, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_4F_EventScript_FloorSign" } ] diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index 0da89c2b1..d258396df 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -197,108 +197,123 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 18, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 19, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 19, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_Door3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 19, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_Door3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 19, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 18, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 18, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_Door3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 18, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_Door3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 28, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_PokemonReport3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 30, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_PokemonReport2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 25, "y": 15, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_PokemonReport1" }, { @@ -312,10 +327,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 29, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_FloorSign" } ] diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index c895f1d4b..60200d7e3 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -186,31 +186,35 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 15, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_6F_EventScript_Door" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_6F_EventScript_Door" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 15, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_6F_EventScript_Door" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_6F_EventScript_Door" }, { @@ -224,10 +228,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 25, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_6F_EventScript_FloorSign" } ] diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index 261335452..0c1a78b97 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -225,87 +225,99 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_7F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_7F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_7F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_7F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 24, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_7F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 25, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_7F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 25, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_7F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 24, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_7F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 25, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_7F_EventScript_Door3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 26, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_7F_EventScript_Door3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 25, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_7F_EventScript_Door3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 26, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_7F_EventScript_Door3" }, { @@ -319,10 +331,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 20, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_7F_EventScript_FloorSign" } ] diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index 1f5ed77ca..da5fb3f35 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -148,31 +148,35 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_8F_EventScript_Door" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_8F_EventScript_Door" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_8F_EventScript_Door" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_8F_EventScript_Door" }, { @@ -186,10 +190,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 27, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_8F_EventScript_FloorSign" } ] diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json index 7cbb1c15d..d242f5d78 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -118,115 +118,131 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 13, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 13, "y": 17, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 21, "y": 6, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 22, "y": 6, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 22, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 21, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 21, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door4" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 21, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door4" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 22, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door4" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 22, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door4" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 2, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 2, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 17, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door2" }, { @@ -240,10 +256,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 17, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_FloorSign" } ] diff --git a/data/maps/SilphCo_Elevator/map.json b/data/maps/SilphCo_Elevator/map.json index 446e891f2..491ca323c 100644 --- a/data/maps/SilphCo_Elevator/map.json +++ b/data/maps/SilphCo_Elevator/map.json @@ -27,10 +27,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 0, "y": 2, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_Elevator_EventScript_FloorSelect" } ] diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json index bc04c47d8..0ce841063 100644 --- a/data/maps/SixIsland/map.json +++ b/data/maps/SixIsland/map.json @@ -81,10 +81,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 17, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SixIsland_EventScript_IslandSign" }, { diff --git a/data/maps/SixIsland_DottedHole_B1F/map.json b/data/maps/SixIsland_DottedHole_B1F/map.json index 5f4ded240..1fcfc933d 100644 --- a/data/maps/SixIsland_DottedHole_B1F/map.json +++ b/data/maps/SixIsland_DottedHole_B1F/map.json @@ -55,10 +55,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_1", + "type": "sign", "x": 6, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "SixIsland_DottedHole_B1F_EventScript_BrailleUp" } ] diff --git a/data/maps/SixIsland_DottedHole_B2F/map.json b/data/maps/SixIsland_DottedHole_B2F/map.json index 3106f7d83..8458d04be 100644 --- a/data/maps/SixIsland_DottedHole_B2F/map.json +++ b/data/maps/SixIsland_DottedHole_B2F/map.json @@ -55,10 +55,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_1", + "type": "sign", "x": 6, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "SixIsland_DottedHole_B2F_EventScript_BrailleLeft" } ] diff --git a/data/maps/SixIsland_DottedHole_B3F/map.json b/data/maps/SixIsland_DottedHole_B3F/map.json index 300c46114..154c12c9e 100644 --- a/data/maps/SixIsland_DottedHole_B3F/map.json +++ b/data/maps/SixIsland_DottedHole_B3F/map.json @@ -55,10 +55,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_1", + "type": "sign", "x": 6, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "SixIsland_DottedHole_B3F_EventScript_BrailleRight" } ] diff --git a/data/maps/SixIsland_DottedHole_B4F/map.json b/data/maps/SixIsland_DottedHole_B4F/map.json index 95e9c10b4..92633086e 100644 --- a/data/maps/SixIsland_DottedHole_B4F/map.json +++ b/data/maps/SixIsland_DottedHole_B4F/map.json @@ -55,10 +55,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_1", + "type": "sign", "x": 6, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "SixIsland_DottedHole_B4F_EventScript_BrailleDown" } ] diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json index 5ae17361a..df977d9c0 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -61,10 +61,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_1", + "type": "sign", "x": 7, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "SixIsland_DottedHole_SapphireRoom_EventScript_BrailleMessage" } ] diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json index f9955cfd2..269a8da2d 100644 --- a/data/maps/SixIsland_GreenPath/map.json +++ b/data/maps/SixIsland_GreenPath/map.json @@ -73,17 +73,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 40, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SixIsland_GreenPath_EventScript_LeftRouteSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 69, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SixIsland_GreenPath_EventScript_RightRouteSign" }, { diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index bb63d3db3..8d2d508fb 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -255,10 +255,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 24, "y": 24, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SixIsland_RuinValley_EventScript_DottedHoleDoor" } ] diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json index 0aefb4478..acd74ce8d 100644 --- a/data/maps/SixIsland_WaterPath/map.json +++ b/data/maps/SixIsland_WaterPath/map.json @@ -168,10 +168,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SixIsland_WaterPath_EventScript_HornWantedSign" }, { @@ -205,10 +206,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 54, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SixIsland_WaterPath_EventScript_RouteSign" } ] diff --git a/data/maps/SixIsland_WaterPath_House1/map.json b/data/maps/SixIsland_WaterPath_House1/map.json index cb9a39991..8ebfb4adf 100644 --- a/data/maps/SixIsland_WaterPath_House1/map.json +++ b/data/maps/SixIsland_WaterPath_House1/map.json @@ -41,10 +41,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SixIsland_WaterPath_House1_EventScript_SizeRecord" } ] diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index 94e4ec4bf..77ca11bf1 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -354,10 +354,11 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 31, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ThreeIsland_EventScript_IslandSign" }, { diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index db32d0122..989079f14 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -224,17 +224,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 27, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ThreeIsland_BerryForest_EventScript_BewareSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 39, "y": 35, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ThreeIsland_BerryForest_EventScript_WelcomeSign" }, { diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json index d9041df2d..104b2684a 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -158,10 +158,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 14, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ThreeIsland_BondBridge_EventScript_BerryForestSign" }, { @@ -195,10 +196,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 91, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ThreeIsland_BondBridge_EventScript_BondBridgeSign" } ] diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json index c06ba0e44..558cbdd21 100644 --- a/data/maps/ThreeIsland_House1/map.json +++ b/data/maps/ThreeIsland_House1/map.json @@ -41,10 +41,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 2, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ThreeIsland_House1_EventScript_DisplayCase" } ] diff --git a/data/maps/TrainerTower_Elevator/map.json b/data/maps/TrainerTower_Elevator/map.json index ce626e2cf..869b50f82 100644 --- a/data/maps/TrainerTower_Elevator/map.json +++ b/data/maps/TrainerTower_Elevator/map.json @@ -27,10 +27,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 0, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "TrainerTower_Elevator_EventScript_FloorSelect" } ] diff --git a/data/maps/TrainerTower_Lobby/map.json b/data/maps/TrainerTower_Lobby/map.json index e0ee44722..9bf4c9397 100644 --- a/data/maps/TrainerTower_Lobby/map.json +++ b/data/maps/TrainerTower_Lobby/map.json @@ -117,10 +117,11 @@ ], "bg_events": [ { - "type": "bg_event_type_1", + "type": "sign", "x": 8, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "TrainerTower_Lobby_EventScript_ShowRecords" } ] diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 8a258b635..295cb3844 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -172,24 +172,27 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 29, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "TwoIsland_EventScript_IslandSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 40, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "TwoIsland_EventScript_JoyfulGameCornerSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 3, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "TwoIsland_EventScript_FastCurrentSign" } ] diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index baf6a8db0..f56eabea4 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -80,17 +80,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 1, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "TwoIsland_JoyfulGameCorner_EventScript_ShowPokemonJumpRecords" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 0, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "TwoIsland_JoyfulGameCorner_EventScript_ShowDodrioBerryPickingRecords" } ] diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index 52e167ea7..292d223d8 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -243,38 +243,43 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 33, "y": 6, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_EventScript_CitySign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 10, "y": 17, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_EventScript_PokemonFanClubSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 10, "y": 24, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_EventScript_GymSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 34, "y": 18, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_EventScript_HarborSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 45, "y": 17, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_EventScript_SnorlaxNotice" }, { diff --git a/data/maps/VermilionCity_Gym/map.json b/data/maps/VermilionCity_Gym/map.json index eab43a7f5..fdfd60a22 100644 --- a/data/maps/VermilionCity_Gym/map.json +++ b/data/maps/VermilionCity_Gym/map.json @@ -107,122 +107,139 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 17, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_GymStatue" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 17, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_GymStatue" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 1, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan4" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan5" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 1, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan6" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan7" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan8" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan9" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan10" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 1, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan11" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan12" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan13" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan14" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan15" } ] diff --git a/data/maps/VermilionCity_House3/map.json b/data/maps/VermilionCity_House3/map.json index 2c12e663c..0edea264f 100644 --- a/data/maps/VermilionCity_House3/map.json +++ b/data/maps/VermilionCity_House3/map.json @@ -94,10 +94,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 4, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_House3_EventScript_Letter" } ] diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json index 4bf91321f..81275379b 100644 --- a/data/maps/VermilionCity_PokemonFanClub/map.json +++ b/data/maps/VermilionCity_PokemonFanClub/map.json @@ -120,17 +120,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 2, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_PokemonFanClub_EventScript_RulesSign1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_PokemonFanClub_EventScript_RulesSign2" } ] diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index 616e511ee..93237caec 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -226,38 +226,43 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 23, "y": 1, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianCity_EventScript_TrainerTips1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 32, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianCity_EventScript_GymSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 20, "y": 31, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianCity_EventScript_TrainerTips2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 20, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianCity_EventScript_CitySign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 36, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianCity_EventScript_GymDoor" } ] diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json index 0cc83f420..18f8031af 100644 --- a/data/maps/ViridianCity_Gym/map.json +++ b/data/maps/ViridianCity_Gym/map.json @@ -172,17 +172,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 15, "y": 20, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianCity_Gym_EventScript_GymStatue" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 19, "y": 20, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianCity_Gym_EventScript_GymStatue" }, { diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House1/map.json index 0b6247f93..68d6bcd2d 100644 --- a/data/maps/ViridianCity_House1/map.json +++ b/data/maps/ViridianCity_House1/map.json @@ -81,10 +81,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianCity_House1_EventScript_NicknameSign" } ] diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_House2/map.json index c770669e5..26e28f038 100644 --- a/data/maps/ViridianCity_House2/map.json +++ b/data/maps/ViridianCity_House2/map.json @@ -68,38 +68,43 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianCity_House2_EventScript_Notebook" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianCity_House2_EventScript_Blackboard" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianCity_House2_EventScript_Blackboard" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 9, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "ViridianCity_House2_EventScript_PokemonJournal" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 8, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "ViridianCity_House2_EventScript_PokemonJournal" } ] diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index a11b85a94..ba78294fa 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -206,45 +206,51 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 39, "y": 59, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianForest_EventScript_TrainerTips1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 43, "y": 26, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianForest_EventScript_TrainerTips3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 29, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianForest_EventScript_TrainerTips4" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianForest_EventScript_ExitSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 28, "y": 44, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianForest_EventScript_TrainerTips2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 31, "y": 60, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianForest_EventScript_TrainerTips5" }, { -- cgit v1.2.3 From 4ab3d77d8043fbf2dc7d7892b8e2f0ef1e96134f Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 2 Mar 2020 12:57:54 -0500 Subject: Fix special var names --- data/event_scripts.s | 2 +- data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc | 2 +- data/maps/FiveIsland_WaterLabyrinth/scripts.inc | 2 +- data/maps/FourIsland/scripts.inc | 2 +- data/maps/FourIsland_PokemonDayCare/scripts.inc | 2 +- data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc | 2 +- data/maps/FuchsiaCity_WardensHouse/scripts.inc | 2 +- data/maps/OneIsland_PokemonCenter_1F/scripts.inc | 8 ++++---- data/maps/PalletTown_ProfessorOaksLab/scripts.inc | 10 +++++----- data/maps/PewterCity/scripts.inc | 2 +- data/maps/PewterCity_House1/scripts.inc | 2 +- data/maps/Route1/scripts.inc | 2 +- data/maps/SSAnne_CaptainsOffice/scripts.inc | 2 +- data/maps/SaffronCity_Dojo/scripts.inc | 4 ++-- data/maps/SevenIsland_SevaultCanyon_House/scripts.inc | 2 +- data/maps/TwoIsland_House/scripts.inc | 4 ++-- data/maps/TwoIsland_JoyfulGameCorner/scripts.inc | 2 +- data/scripts/cable_club.inc | 12 ++++++------ data/scripts/day_care.inc | 2 +- data/scripts/move_tutors.inc | 2 +- data/scripts/obtain_item.inc | 13 +++++++------ data/scripts/std_msgbox.inc | 2 +- data/scripts/trainer_tower.inc | 2 +- 23 files changed, 43 insertions(+), 42 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index dae7ba832..564e18fb9 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -66,7 +66,7 @@ gSpecialVars:: @ 815FD0C .4byte gSpecialVar_MonBoxPos .4byte gSpecialVar_TextColor .4byte gSpecialVar_PrevTextColor - .4byte gUnknown_20370DE + .4byte gSpecialVar_0x8014 .include "data/specials.inc" diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index bd05d824d..fb7cac74d 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -154,7 +154,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink:: @ 816BF7C waitmessage waitfanfare putitemaway VAR_0x8009 - call EventScript_1A6675 + call EventScript_RestorePrevTextColor compare VAR_0x8008, ITEM_FRESH_WATER call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM16 compare VAR_0x8008, ITEM_SODA_POP diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc index f1080d094..956652eb7 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc @@ -38,7 +38,7 @@ FiveIsland_WaterLabyrinth_EventScript_TryGiveEgg:: @ 81688BA message FiveIsland_WaterLabyrinth_Text_ReceivedEggFromMan waitfanfare waitmessage - call EventScript_1A6675 + call EventScript_RestorePrevTextColor goto FiveIsland_WaterLabyrinth_EventScript_PostEggComment end diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 8a7dfafbf..cc2347dee 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -112,7 +112,7 @@ FourIsland_EventScript_DaycareAcceptEgg:: @ 8167DD1 FourIsland_EventScript_DaycareReceivedEgg:: @ 8167DEB textcolor 3 message DayCare_Text_ReceivedEgg - call EventScript_1A6675 + call EventScript_RestorePrevTextColor playfanfare MUS_FANFA1 waitfanfare waitbuttonpress diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index c6cf95b20..dc04c477f 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -138,7 +138,7 @@ FourIsland_PokemonDayCare_RetrieveMon:: @ 8171B05 playmoncry VAR_RESULT, 0 textcolor 3 msgbox DayCare_Text_TookBackMon - call EventScript_1A6675 + call EventScript_RestorePrevTextColor waitmoncry specialvar VAR_RESULT, GetDaycareState compare VAR_RESULT, DAYCARE_ONE_MON diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index 863ddbd48..ec9a7ca6a 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -123,7 +123,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_TryEnterSafariZone:: @ 816D3CA playfanfare MUS_FANFA1 message FuchsiaCity_SafariZone_Entrance_Text_PlayerReceived30SafariBalls waitfanfare - call EventScript_1A6675 + call EventScript_RestorePrevTextColor msgbox FuchsiaCity_SafariZone_Entrance_Text_CallYouOnPAWhenYouRunOut closemessage hidemoneybox 0, 0 diff --git a/data/maps/FuchsiaCity_WardensHouse/scripts.inc b/data/maps/FuchsiaCity_WardensHouse/scripts.inc index 141101e1b..1f0c891d6 100644 --- a/data/maps/FuchsiaCity_WardensHouse/scripts.inc +++ b/data/maps/FuchsiaCity_WardensHouse/scripts.inc @@ -21,7 +21,7 @@ FuchsiaCity_WardensHouse_EventScript_GiveGoldTeeth:: @ 816D780 waitmessage waitfanfare msgbox FuchsiaCity_WardensHouse_Text_WardenPoppedInHisTeeth - call EventScript_1A6675 + call EventScript_RestorePrevTextColor checkplayergender compare VAR_RESULT, MALE call_if_eq FuchsiaCity_WardensHouse_EventScript_WardenThanksMale diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 53d0aebcd..67c48c033 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -141,7 +141,7 @@ OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMapPage:: @ 8170E46 message OneIsland_PokemonCenter_1F_Text_ReceivedExtraPageForTownMap waitmessage waitfanfare - call EventScript_1A6675 + call EventScript_RestorePrevTextColor return OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMap:: @ 8170E58 @@ -264,7 +264,7 @@ OneIsland_PokemonCenter_1F_EventScript_GiveCelioSapphire:: @ 8170FA5 message OneIsland_PokemonCenter_1F_Text_HandedSapphireToCelio waitmessage waitfanfare - call EventScript_1A6675 + call EventScript_RestorePrevTextColor removeitem ITEM_SAPPHIRE, 1 msgbox OneIsland_PokemonCenter_1F_Text_ThankYouGiveMeTime closemessage @@ -310,7 +310,7 @@ OneIsland_PokemonCenter_1F_EventScript_GiveCelioRuby:: @ 8171044 message OneIsland_PokemonCenter_1F_Text_HandedRubyToCelio waitmessage waitfanfare - call EventScript_1A6675 + call EventScript_RestorePrevTextColor closemessage applymovement LOCALID_CELIO, OneIsland_PokemonCenter_1F_Movement_CelioPutGemInMachine waitmovement 0 @@ -349,7 +349,7 @@ OneIsland_PokemonCenter_1F_EventScript_GiveRainbowPass:: @ 81710B2 message OneIsland_PokemonCenter_1F_Text_ObtainedExtraMapPage waitmessage waitfanfare - call EventScript_1A6675 + call EventScript_RestorePrevTextColor goto OneIsland_PokemonCenter_1F_EventScript_ExplainRainbowPass end diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 19518f6e7..ffa7d58f0 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -98,7 +98,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexScene:: @ 8169035 textcolor 3 msgbox PalletTown_ProfessorOaksLab_Text_OakTookBothPokedexUnits closemessage - call EventScript_1A6675 + call EventScript_RestorePrevTextColor compare VAR_FACING, DIR_NORTH call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskNorth compare VAR_FACING, DIR_SOUTH @@ -128,7 +128,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexScene:: @ 8169035 message PalletTown_ProfessorOaksLab_Text_PlayersPokedexWasUpgraded waitmessage waitfanfare - call EventScript_1A6675 + call EventScript_RestorePrevTextColor special EnableNationalPokedex msgbox PalletTown_ProfessorOaksLab_Text_OakMustReallyWorkToFillPokedex msgbox PalletTown_ProfessorOaksLab_Text_RivalIllCompleteThePokedex @@ -655,7 +655,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: @ 816961E message PalletTown_ProfessorOaksLab_Text_DeliveredOaksParcel waitmessage waitfanfare - call EventScript_1A6675 + call EventScript_RestorePrevTextColor removeitem ITEM_OAKS_PARCEL, 1 msgbox PalletTown_ProfessorOaksLab_Text_OakCustomBallIOrdered playbgm MUS_RIVAL1, 0 @@ -721,7 +721,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: @ 816961E message PalletTown_ProfessorOaksLab_Text_ReceivedPokedexFromOak waitmessage waitfanfare - call EventScript_1A6675 + call EventScript_RestorePrevTextColor setflag FLAG_SYS_POKEDEX_GET special sub_810B810 setvar VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 1 @@ -1212,7 +1212,7 @@ PalletTown_ProfessorOaksLab_EventScript_ChoseStarter:: @ 8169C74 erasemonpic removeobject VAR_LAST_TALKED msgbox PalletTown_ProfessorOaksLab_Text_OakThisMonIsEnergetic - call EventScript_1A6675 + call EventScript_RestorePrevTextColor setflag FLAG_SYS_POKEMON_GET setflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN givemon PLAYER_STARTER_SPECIES, 5, ITEM_NONE diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 83d8f4d35..be854826b 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -728,7 +728,7 @@ PewterCity_EventScript_AideGiveRunningShoes:: @ 81662DE signmsg msgbox PewterCity_Text_ExplainRunningShoes normalmsg - call EventScript_1A6675 + call EventScript_RestorePrevTextColor msgbox PewterCity_Text_MustBeGoingBackToLab closemessage compare VAR_TEMP_1, 0 diff --git a/data/maps/PewterCity_House1/scripts.inc b/data/maps/PewterCity_House1/scripts.inc index 3d173b174..f6b07a7f9 100644 --- a/data/maps/PewterCity_House1/scripts.inc +++ b/data/maps/PewterCity_House1/scripts.inc @@ -27,5 +27,5 @@ PewterCity_House1_EventScript_DoNidoranCry:: @ 816A749 playmoncry SPECIES_NIDORAN_M, 0 msgbox PewterCity_House1_Text_Nidoran waitmoncry - call EventScript_1A6675 + call EventScript_RestorePrevTextColor return diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc index 36a42f65e..aaea71eaf 100644 --- a/data/maps/Route1/scripts.inc +++ b/data/maps/Route1/scripts.inc @@ -17,7 +17,7 @@ Route1_EventScript_MartClerk:: @ 8167EFE waitfanfare additem ITEM_POTION msgbox Route1_Text_PutPotionAway - call EventScript_1A6675 + call EventScript_RestorePrevTextColor setflag FLAG_GOT_POTION_ON_ROUTE_1 release end diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc index d5d976e21..3ccd4fa51 100644 --- a/data/maps/SSAnne_CaptainsOffice/scripts.inc +++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc @@ -10,7 +10,7 @@ SSAnne_CaptainsOffice_EventScript_Captain:: @ 8160B3A waitmessage playfanfare MUS_ME_ASA waitfanfare - call EventScript_1A6675 + call EventScript_RestorePrevTextColor delay 50 applymovement 1, Movement_FacePlayer waitmovement 0 diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index 88e53d64c..1dd8b31e1 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -29,7 +29,7 @@ SaffronCity_Dojo_EventScript_HitmonleeBall:: @ 816EC00 waitmovement 0 textcolor 0 msgbox SaffronCity_Dojo_Text_YouWantHitmonlee, MSGBOX_YESNO - call EventScript_1A6675 + call EventScript_RestorePrevTextColor compare VAR_RESULT, YES goto_if_eq SaffronCity_Dojo_EventScript_GiveHitmon erasemonpic @@ -51,7 +51,7 @@ SaffronCity_Dojo_EventScript_HitmonchanBall:: @ 816EC46 waitmovement 0 textcolor 0 msgbox SaffronCity_Dojo_Text_YouWantHitmonchan, MSGBOX_YESNO - call EventScript_1A6675 + call EventScript_RestorePrevTextColor compare VAR_RESULT, YES goto_if_eq SaffronCity_Dojo_EventScript_GiveHitmon erasemonpic diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index 3d0bb73ea..0c12e9362 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -18,7 +18,7 @@ SevenIsland_SevaultCanyon_House_EventScript_BaldingMan:: @ 8172183 goto_if_eq SevenIsland_SevaultCanyon_House_EventScript_DeclineDance msgbox SevenIsland_SevaultCanyon_House_Text_DancedChanseyDance closemessage - call EventScript_1A6675 + call EventScript_RestorePrevTextColor compare VAR_FACING, DIR_SOUTH call_if_ne SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown delay 30 diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index 692f374fd..241f317a4 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -78,7 +78,7 @@ TwoIsland_House_EventScript_GiveBigMushroom:: @ 8171727 removeitem ITEM_BIG_MUSHROOM, 1 textcolor 3 msgbox TwoIsland_House_Text_HandedOverOneBigMushroom - call EventScript_1A6675 + call EventScript_RestorePrevTextColor goto TwoIsland_House_EventScript_EndTutorMove end @@ -86,7 +86,7 @@ TwoIsland_House_EventScript_GiveTinyMushrooms:: @ 8171741 removeitem ITEM_TINY_MUSHROOM, 2 textcolor 3 msgbox TwoIsland_House_Text_HandedOverTwoTinyMushrooms - call EventScript_1A6675 + call EventScript_RestorePrevTextColor goto TwoIsland_House_EventScript_EndTutorMove end diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index fcba4720c..f3b5f4dff 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -162,7 +162,7 @@ TwoIsland_JoyfulGameCorner_EventScript_GiveDaddyMeteorite:: @ 817158A message TwoIsland_JoyfulGameCorner_Text_HandedMeteoriteToLostellesDaddy waitmessage waitfanfare - call EventScript_1A6675 + call EventScript_RestorePrevTextColor removeitem ITEM_METEORITE, 1 msgbox TwoIsland_JoyfulGameCorner_Text_OhThisIsFromBill goto TwoIsland_JoyfulGameCorner_EventScript_ReceiveMoonStone diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index c174eaf41..e7eda5271 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -288,7 +288,7 @@ CableClub_EventScript_TryEnterColosseum:: @ 81BB54C textcolor 3 special TryBattleLinkup waitstate - call EventScript_1A6675 + call EventScript_RestorePrevTextColor compare VAR_RESULT, 1 goto_if_eq CableClub_EventScript_EnterColosseum compare VAR_RESULT, 2 @@ -395,7 +395,7 @@ CableClub_EventScript_TradeCenter:: @ 81BB6AB textcolor 3 special TryTradeLinkup waitstate - call EventScript_1A6675 + call EventScript_RestorePrevTextColor compare VAR_RESULT, 1 goto_if_eq CableClub_EventScript_EnterTradeCenter compare VAR_RESULT, 2 @@ -1001,7 +1001,7 @@ CableClub_EventScript_ChooseLinkLeaderFrom2:: @ 81BBDBC textcolor 3 message CableClub_Text_ChooseGroupLeaderOfTwo waitmessage - call EventScript_1A6675 + call EventScript_RestorePrevTextColor multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE switch VAR_RESULT case 0, CableClub_EventScript_TryJoinGroup2Players @@ -1036,7 +1036,7 @@ CableClub_EventScript_ChooseLinkLeaderFrom4:: @ 81BBE50 textcolor 3 message CableClub_Text_ChooseGroupLeaderOfFour waitmessage - call EventScript_1A6675 + call EventScript_RestorePrevTextColor multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE switch VAR_RESULT case 0, CableClub_EventScript_TryJoinGroup4Players @@ -1071,7 +1071,7 @@ CableClub_EventScript_ChooseLinkLeader:: @ 81BBEE4 textcolor 3 message CableClub_Text_ChooseGroupLeader waitmessage - call EventScript_1A6675 + call EventScript_RestorePrevTextColor multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE switch VAR_RESULT case 0, CableClub_EventScript_TryJoinGroupXPlayers @@ -1281,7 +1281,7 @@ CableClub_EventScript_ChooseLinkLeaderMinigame:: @ 81BC1CE textcolor 3 message CableClub_Text_ChooseGroupLeader waitmessage - call EventScript_1A6675 + call EventScript_RestorePrevTextColor multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE switch VAR_RESULT case 0, CableClub_EventScript_TryJoinMinigameLinkGroup diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 8e3318c35..59b65332b 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -102,7 +102,7 @@ Route5_PokemonDayCare_EventScript_RetrieveMon:: @ 81BF4EA waitse playmoncry VAR_RESULT, 0 msgbox Route5_PokemonDayCare_Text_PlayerGotMonBack - call EventScript_1A6675 + call EventScript_RestorePrevTextColor waitmoncry goto Route5_PokemonDayCare_EventScript_CloseMoneyBox end diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc index 40fcd43db..744e50199 100644 --- a/data/scripts/move_tutors.inc +++ b/data/scripts/move_tutors.inc @@ -560,7 +560,7 @@ EventScript_CanOnlyBeLearnedOnce:: @ 81C4F37 signmsg msgbox Text_MoveCanOnlyBeLearnedOnce, MSGBOX_YESNO normalmsg - call EventScript_1A6675 + call EventScript_RestorePrevTextColor return Movement_JumpInPlaceDown: @ 81C4F4C diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc index 3ada6109c..a50693292 100644 --- a/data/scripts/obtain_item.inc +++ b/data/scripts/obtain_item.inc @@ -1,18 +1,19 @@ -EventScript_1A666F:: @ 81A666F - copyvar VAR_MON_BOX_POS, VAR_MON_BOX_ID +@ Unused, handled by textcolor script cmd +EventScript_SaveTextColor:: @ 81A666F + copyvar VAR_PREV_TEXT_COLOR, VAR_TEXT_COLOR return -EventScript_1A6675:: @ 81A6675 - copyvar VAR_MON_BOX_ID, VAR_MON_BOX_POS +EventScript_RestorePrevTextColor:: @ 81A6675 + copyvar VAR_TEXT_COLOR, VAR_PREV_TEXT_COLOR return Std_ObtainItem:: @ 81A667B - copyvar VAR_MON_BOX_POS, VAR_MON_BOX_ID + copyvar VAR_PREV_TEXT_COLOR, VAR_TEXT_COLOR textcolor 3 additem VAR_0x8000, VAR_0x8001 copyvar VAR_0x8007, VAR_RESULT call EventScript_ObtainItemMessage - copyvar VAR_MON_BOX_ID, VAR_MON_BOX_POS + copyvar VAR_TEXT_COLOR, VAR_PREV_TEXT_COLOR return EventScript_ObtainItemMessage:: @ 81A6697 diff --git a/data/scripts/std_msgbox.inc b/data/scripts/std_msgbox.inc index d1605976e..da53a3cc1 100644 --- a/data/scripts/std_msgbox.inc +++ b/data/scripts/std_msgbox.inc @@ -39,7 +39,7 @@ Std_ReceivedItem:: @ 81A4E66 compare VAR_0x8002, MUS_FANFA1 call_if_eq EventScript_ReceivedItemWaitFanfare putitemaway VAR_0x8000, VAR_0x8001 - call EventScript_1A6675 + call EventScript_RestorePrevTextColor return EventScript_ReceivedItemFanfare1:: @ 81A4EA2 diff --git a/data/scripts/trainer_tower.inc b/data/scripts/trainer_tower.inc index 45ffc285d..3b21c0844 100644 --- a/data/scripts/trainer_tower.inc +++ b/data/scripts/trainer_tower.inc @@ -299,7 +299,7 @@ TrainerTower_Roof_EventScript_ReceivePrize: waitmessage getstdstring 2, STDSTRING_ITEMS_POCKET msgbox Text_PutItemAway - call EventScript_1A6675 + call EventScript_RestorePrevTextColor goto TrainerTower_Roof_EventScript_CheckFinalTime TrainerTower_Roof_EventScript_NoRoomForPrize:: @ 81C543A -- cgit v1.2.3 From 6363d39e99612904a0393a272bbb1748ef9dca20 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 2 Mar 2020 13:34:34 -0500 Subject: port field_effect_helpers from emerald --- data/event_object_movement.s | 52 ++++++++++++++++++++++---------------------- data/field_effect_helpers.s | 34 ----------------------------- data/field_effect_scripts.s | 8 +++---- 3 files changed, 30 insertions(+), 64 deletions(-) delete mode 100644 data/field_effect_helpers.s (limited to 'data') diff --git a/data/event_object_movement.s b/data/event_object_movement.s index 5920835c4..88aa543b9 100644 --- a/data/event_object_movement.s +++ b/data/event_object_movement.s @@ -2,7 +2,7 @@ .include "constants/constants.inc" .section .rodata .align 2 -gUnknown_835B934:: @ 835B934 +gReflectionEffectPaletteMap:: @ 835B934 .byte 0x01, 0x01, 0x06, 0x07, 0x08, 0x09, 0x06, 0x07, 0x08, 0x09, 0x0b, 0x0b, 0x00, 0x00, 0x00, 0x00 gUnknown_835B944:: @ 835B944 @@ -6325,16 +6325,16 @@ gUnknown_83A5374:: @ 83A5374 obj_frame_tiles gUnknown_8398128, 0x400 gUnknown_83A537C:: @ 83A537C - spr_template 65535, 65535, gObjectEventBaseOam_128x64, gUnknown_83A5358, gUnknown_83A535C, gDummySpriteAffineAnimTable, oamc_shadow + spr_template 65535, 65535, gObjectEventBaseOam_128x64, gUnknown_83A5358, gUnknown_83A535C, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect gUnknown_83A5394:: @ 83A5394 - spr_template 65535, 65535, gObjectEventBaseOam_Unknown1, gUnknown_83A5358, gUnknown_83A5364, gDummySpriteAffineAnimTable, oamc_shadow + spr_template 65535, 65535, gObjectEventBaseOam_Unknown1, gUnknown_83A5358, gUnknown_83A5364, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect gUnknown_83A53AC:: @ 83A53AC - spr_template 65535, 65535, gObjectEventBaseOam_Unknown2, gUnknown_83A5358, gUnknown_83A536C, gDummySpriteAffineAnimTable, oamc_shadow + spr_template 65535, 65535, gObjectEventBaseOam_Unknown2, gUnknown_83A5358, gUnknown_83A536C, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect gUnknown_83A53C4:: @ 83A53C4 - spr_template 65535, 65535, gObjectEventBaseOam_Unknown3, gUnknown_83A5358, gUnknown_83A5374, gDummySpriteAffineAnimTable, oamc_shadow + spr_template 65535, 65535, gObjectEventBaseOam_Unknown3, gUnknown_83A5358, gUnknown_83A5374, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect gUnknown_83A53DC:: @ 83A53DC overworld_frame gUnknown_839A008, 2, 2, 0 @@ -6355,7 +6355,7 @@ gUnknown_83A541C:: @ 83A541C .4byte gUnknown_83A5404 gUnknown_83A5420:: @ 83A5420 - spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A541C, gUnknown_83A53DC, gDummySpriteAffineAnimTable, unc_grass_normal + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A541C, gUnknown_83A53DC, gDummySpriteAffineAnimTable, UpdateTallGrassFieldEffect gUnknown_83A5438:: @ 83A5438 overworld_frame gUnknown_83986A8, 2, 2, 0 @@ -6379,7 +6379,7 @@ gUnknown_83A5484:: @ 83A5484 .4byte gUnknown_83A5460 gUnknown_83A5488:: @ 83A5488 - spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5484, gUnknown_83A5438, gDummySpriteAffineAnimTable, sub_80DCD1C + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5484, gUnknown_83A5438, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim gUnknown_83A54A0:: @ 83A54A0 overworld_frame gUnknown_8398928, 2, 2, 0 @@ -6400,7 +6400,7 @@ gUnknown_83A54E0:: @ 83A54E0 .4byte gUnknown_83A54C8 gUnknown_83A54E4:: @ 83A54E4 - spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A54E0, gUnknown_83A54A0, gDummySpriteAffineAnimTable, sub_80DC2FC + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A54E0, gUnknown_83A54A0, gDummySpriteAffineAnimTable, UpdateAshFieldEffect gUnknown_83A54FC:: @ 83A54FC overworld_frame gUnknown_8396B08, 2, 8, 0 @@ -6437,7 +6437,7 @@ gUnknown_83A555C:: @ 83A555C .4byte gUnknown_83A5550 gUnknown_83A556C:: @ 83A556C - spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_32x32, gUnknown_83A555C, gUnknown_83A54FC, gDummySpriteAffineAnimTable, sub_80DC4F8 + spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_32x32, gUnknown_83A555C, gUnknown_83A54FC, gDummySpriteAffineAnimTable, UpdateSurfBlobFieldEffect gUnknown_83A5584:: @ 83A5584 overworld_frame gUnknown_8398BA8, 2, 2, 0 @@ -6542,7 +6542,7 @@ gUnknown_83A56E0:: @ 83A56E0 .4byte gUnknown_83A56D8 gUnknown_83A56F4:: @ 83A56F4 - spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A56E0, gUnknown_83A56B0, gDummySpriteAffineAnimTable, sub_80DBAFC + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A56E0, gUnknown_83A56B0, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect gUnknown_83A570C:: @ 83A570C overworld_frame gUnknown_839A488, 2, 2, 0 @@ -6572,7 +6572,7 @@ gUnknown_83A573C:: @ 83A573C .4byte gUnknown_83A5734 gUnknown_83A5750:: @ 83A5750 - spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A573C, gUnknown_83A570C, gDummySpriteAffineAnimTable, sub_80DBAFC + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A573C, gUnknown_83A570C, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect gUnknown_83A5768:: @ 83A5768 overworld_frame gUnknown_839A588, 2, 2, 0 @@ -6624,7 +6624,7 @@ gUnknown_83A57C8:: @ 83A57C8 .4byte gUnknown_83A57C0 gUnknown_83A57EC:: @ 83A57EC - spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A57C8, gUnknown_83A5768, gDummySpriteAffineAnimTable, sub_80DBAFC + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A57C8, gUnknown_83A5768, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect gUnknown_83A5804:: @ 83A5804 overworld_frame gUnknown_839AA48, 2, 2, 0 @@ -6670,7 +6670,7 @@ gUnknown_83A5894:: @ 83A5894 .4byte gUnknown_83A5870 gUnknown_83A589C:: @ 83A589C - spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_Unknown1, gUnknown_83A5894, gUnknown_83A5854, gDummySpriteAffineAnimTable, sub_80DBC2C + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_Unknown1, gUnknown_83A5894, gUnknown_83A5854, gDummySpriteAffineAnimTable, UpdateSplashFieldEffect gUnknown_83A58B4:: @ 83A58B4 overworld_frame gUnknown_839ACC8, 2, 1, 0 @@ -6709,7 +6709,7 @@ gUnknown_83A5938:: @ 83A5938 .4byte gUnknown_83A5918 gUnknown_83A593C:: @ 83A593C - spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5938, gUnknown_83A58F8, gDummySpriteAffineAnimTable, unc_grass_tall + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5938, gUnknown_83A58F8, gDummySpriteAffineAnimTable, UpdateLongGrassFieldEffect gUnknown_83A5954:: @ 83A5954 overworld_frame gUnknown_8399488, 2, 2, 0 @@ -6761,7 +6761,7 @@ gUnknown_83A5A2C:: @ 83A5A2C .4byte gUnknown_83A5A04 gUnknown_83A5A30:: @ 83A5A30 - spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5A2C, gUnknown_83A59BC, gDummySpriteAffineAnimTable, sub_80DCD1C + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5A2C, gUnknown_83A59BC, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim gUnknown_83A5A48:: @ 83A5A48 overworld_frame gUnknown_8399C08, 2, 2, 0 @@ -6782,7 +6782,7 @@ gUnknown_83A5A84:: @ 83A5A84 .4byte gUnknown_83A5A68 gUnknown_83A5A88:: @ 83A5A88 - spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5A84, gUnknown_83A5A48, gDummySpriteAffineAnimTable, sub_80DCD1C + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5A84, gUnknown_83A5A48, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim gUnknown_83A5AA0:: @ 83A5AA0 overworld_frame gUnknown_839A788, 2, 2, 0 @@ -6801,7 +6801,7 @@ gUnknown_83A5AD4:: @ 83A5AD4 .4byte gUnknown_83A5AC0 gUnknown_83A5AD8:: @ 83A5AD8 - spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A5AD4, gUnknown_83A5AA0, gDummySpriteAffineAnimTable, sub_80DCD1C + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A5AD4, gUnknown_83A5AA0, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim gUnknown_83A5AF0:: @ 83A5AF0 overworld_frame gUnknown_839A988, 2, 1, 0 @@ -6818,7 +6818,7 @@ gUnknown_83A5B18:: @ 83A5B18 .4byte gUnknown_83A5B08 gUnknown_83A5B1C:: @ 83A5B1C - spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_Unknown1, gUnknown_83A5B18, gUnknown_83A5AF0, gDummySpriteAffineAnimTable, sub_80DC86C + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_Unknown1, gUnknown_83A5B18, gUnknown_83A5AF0, gDummySpriteAffineAnimTable, UpdateSandPileFieldEffect gUnknown_83A5B34:: @ 83A5B34 overworld_frame gUnknown_839AD88, 2, 2, 0 @@ -6839,7 +6839,7 @@ gUnknown_83A5B70:: @ 83A5B70 .4byte gUnknown_83A5B54 gUnknown_83A5B74:: @ 83A5B74 - spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A5B70, gUnknown_83A5B34, gDummySpriteAffineAnimTable, sub_80DCD1C + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A5B70, gUnknown_83A5B34, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim gUnknown_83A5B8C:: @ 83A5B8C obj_rot_scal_anim_frame -256, 256, 128, 0 @@ -6900,7 +6900,7 @@ gUnknown_83A5CAC:: @ 83A5CAC .4byte gUnknown_83A5C8C gUnknown_83A5CB4:: @ 83A5CB4 - spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_16x32, gUnknown_83A5CAC, gUnknown_83A5C4C, gDummySpriteAffineAnimTable, sub_80DCAC8 + spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_16x32, gUnknown_83A5CAC, gUnknown_83A5C4C, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect gUnknown_83A5CCC:: @ 83A5CCC overworld_frame gUnknown_839B708, 2, 4, 0 @@ -6930,7 +6930,7 @@ gUnknown_83A5D2C:: @ 83A5D2C .4byte gUnknown_83A5D0C gUnknown_83A5D34:: @ 83A5D34 - spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_16x32, gUnknown_83A5D2C, gUnknown_83A5CCC, gDummySpriteAffineAnimTable, sub_80DCAC8 + spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_16x32, gUnknown_83A5D2C, gUnknown_83A5CCC, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect gUnknown_83A5D4C:: @ 83A5D4C overworld_frame gUnknown_839BE08, 2, 4, 0 @@ -6942,7 +6942,7 @@ gUnknown_83A5D4C:: @ 83A5D4C overworld_frame gUnknown_839BE08, 2, 4, 6 gUnknown_83A5D84:: @ 83A5D84 - spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_16x32, gUnknown_83A5CAC, gUnknown_83A5D4C, gDummySpriteAffineAnimTable, sub_80DCAC8 + spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_16x32, gUnknown_83A5CAC, gUnknown_83A5D4C, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect gUnknown_83A5D9C:: @ 83A5D9C overworld_frame gUnknown_839D3C8, 8, 8, 0 @@ -6994,7 +6994,7 @@ gUnknown_83A5E34:: @ 83A5E34 .4byte gUnknown_83A5E28 gUnknown_83A5E38:: @ 83A5E38 - spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5E34, gUnknown_83A5E18, gDummySpriteAffineAnimTable, sub_80DB8AC + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5E34, gUnknown_83A5E18, gDummySpriteAffineAnimTable, UpdateShortGrassFieldEffect gUnknown_83A5E50:: @ 83A5E50 overworld_frame gUnknown_839C508, 2, 2, 0 @@ -7007,7 +7007,7 @@ gUnknown_83A5E60:: @ 83A5E60 .4byte gUnknown_83A5E58 gUnknown_83A5E64:: @ 83A5E64 - spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5E60, gUnknown_83A5E50, gDummySpriteAffineAnimTable, sub_80DBFF4 + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5E60, gUnknown_83A5E50, gDummySpriteAffineAnimTable, UpdateHotSpringsWaterFieldEffect gUnknown_83A5E7C:: @ 83A5E7C overworld_frame gUnknown_839C5A8, 2, 2, 0 @@ -7079,7 +7079,7 @@ gUnknown_83A5FA0:: @ 83A5FA0 .4byte gUnknown_83A5F7C gUnknown_83A5FA4:: @ 83A5FA4 - spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x32, gUnknown_83A5FA0, gUnknown_83A5F3C, gDummySpriteAffineAnimTable, sub_80DC99C + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x32, gUnknown_83A5FA0, gUnknown_83A5F3C, gDummySpriteAffineAnimTable, UpdateBubblesFieldEffect gUnknown_83A5FBC:: @ 83A5FBC overworld_frame gUnknown_839D2A8, 2, 2, 0 @@ -7095,7 +7095,7 @@ gUnknown_83A5FDC:: @ 83A5FDC .4byte gUnknown_83A5FCC gUnknown_83A5FE0:: @ 83A5FE0 - spr_template 0xFFFF, 0x100F, gObjectEventBaseOam_16x16, gUnknown_83A5FDC, gUnknown_83A5FBC, gDummySpriteAffineAnimTable, sub_80DCC90 + spr_template 0xFFFF, 0x100F, gObjectEventBaseOam_16x16, gUnknown_83A5FDC, gUnknown_83A5FBC, gDummySpriteAffineAnimTable, UpdateSparkleFieldEffect gUnknown_83A5FF8:: obj_pal gUnknown_839D3A8, 0x100F diff --git a/data/field_effect_helpers.s b/data/field_effect_helpers.s deleted file mode 100644 index 7ad7b168a..000000000 --- a/data/field_effect_helpers.s +++ /dev/null @@ -1,34 +0,0 @@ -#include "constants/region_map.h" -#include "constants/flags.h" -#include "constants/moves.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - .section .rodata - .align 2 - -gUnknown_83FECCC:: @ 83FECCC - .2byte 0x0c, 0x1c, 0x2c - -gUnknown_83FECD2:: @ 83FECD2 - .byte 0, 1, 2, 3 - -gUnknown_83FECD6:: @ 83FECD6 - .2byte 0x0004, 0x0004, 0x0004, 0x0010 - - .align 2 -gUnknown_83FECE0:: @ 83FECE0 - .4byte sub_80DBB18 - .4byte sub_80DBB3C - - .align 2 -gUnknown_83FECE8:: @ 83FECE8 - .4byte sub_80DC318 - .4byte sub_80DC348 - .4byte sub_80DC3A8 - -gUnknown_83FECF4:: @ 83FECF4 - .byte 0, 0, 1, 2, 3 - - .align 1 -gUnknown_83FECFA:: @ 83FECFA - .2byte 0x0007, 0x000f diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 95d63568c..43698653d 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -86,15 +86,15 @@ gFldEffScript_UseCutOnTree:: @ 81D97D0 end gFldEffScript_Shadow:: @ 81D97D6 - callnative oei_shadow + callnative FldEff_Shadow end gFldEffScript_TallGrass:: @ 81D97DC - loadfadedpal_callnative gUnknown_83A5348, oei_grass_normal + loadfadedpal_callnative gUnknown_83A5348, FldEff_TallGrass end gFldEffScript_Ripple:: @ 81D97E6 - loadfadedpal_callnative gUnknown_83A5348, oei_ripples + loadfadedpal_callnative gUnknown_83A5348, FldEff_Ripple end gFldEffScript_FieldMoveShowMon:: @ 81D97F0 @@ -129,7 +129,7 @@ gFldEffScript_SandFootprints:: @ 81D9821 end gFldEffScript_JumpBigSplash:: @ 81D982B - loadfadedpal_callnative gUnknown_83A5340, oei_water_drop_tall + loadfadedpal_callnative gUnknown_83A5340, FldEff_JumpBigSplash end gFldEffScript_Splash:: @ 81D9835 -- cgit v1.2.3 From dd5f3c3c3d8c0b9ee3229f408e2d30d60f5b3306 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 2 Mar 2020 13:52:16 -0500 Subject: Add missing script labels --- data/maps/FiveIsland_ResortGorgeous_House/map.json | 4 +- data/maps/PokemonLeague_HallOfFame/scripts.inc | 4 +- data/maps/Route21_North/text.inc | 1 + data/maps/Route5_PokemonDayCare/text.inc | 4 +- data/scripts/cable_club.inc | 2 +- data/scripts/fame_checker.inc | 12 +- data/scripts/trainer_card.inc | 8 +- data/specials.inc | 342 ++++++++++----------- data/text/fame_checker.inc | 2 +- data/text/trainers.inc | 9 +- 10 files changed, 195 insertions(+), 193 deletions(-) (limited to 'data') diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json index 5c696d0d5..ea47b8bc3 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -59,7 +59,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FiveIsland_ResortGorgeous_House_EventScript_1ACF2C" + "script": "FiveIsland_ResortGorgeous_House_EventScript_PokemonJournal" }, { "type": "sign", @@ -67,7 +67,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FiveIsland_ResortGorgeous_House_EventScript_1ACF2C" + "script": "FiveIsland_ResortGorgeous_House_EventScript_PokemonJournal" } ] } diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc index 658a176e5..207cbb52d 100644 --- a/data/maps/PokemonLeague_HallOfFame/scripts.inc +++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc @@ -4,10 +4,10 @@ PokemonLeague_HallOfFame_MapScripts:: @ 8162D4C .byte 0 PokemonLeague_HallOfFame_OnWarp:: @ 8162D57 - map_script_2 VAR_TEMP_1, 0, EventScript_162D61 + map_script_2 VAR_TEMP_1, 0, PokemonLeague_HallOfFame_EventScript_TurnPlayerNorth .2byte 0 -EventScript_162D61:: @ 8162D61 +PokemonLeague_HallOfFame_EventScript_TurnPlayerNorth:: @ 8162D61 turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end diff --git a/data/maps/Route21_North/text.inc b/data/maps/Route21_North/text.inc index 67b93c175..60caf4702 100644 --- a/data/maps/Route21_North/text.inc +++ b/data/maps/Route21_North/text.inc @@ -32,6 +32,7 @@ Route21_North_Text_SpencerPostBattle:: @ 8188465 @ Below is the battle text for the Cue Ball that was on Route 21 in Gen 1. @ This trainer wasnt used in Gen 3 so their text goes unused/untranslated +@ Interestingly they did add a rematch intro text for this trainer @ English translations from RB are listed @ "What's wrong with me swimming?" diff --git a/data/maps/Route5_PokemonDayCare/text.inc b/data/maps/Route5_PokemonDayCare/text.inc index b87ca2ca2..1bea7c875 100644 --- a/data/maps/Route5_PokemonDayCare/text.inc +++ b/data/maps/Route5_PokemonDayCare/text.inc @@ -59,10 +59,10 @@ Route5_PokemonDayCare_Text_YouveGotNoRoomForIt:: @ 819DFC2 Route5_PokemonDayCare_Text_DontHaveEnoughMoney:: @ 819E001 .string "You don't have enough money.$" -Text_19E01E:: @ 819E01E +Route5_PokemonDayCare_Text_19E01E:: @ 819E01E .string "きみの\n" .string "みてみるかね？$" -Text_19E02A:: @ 819E02A +Route5_PokemonDayCare_Text_CantAcceptMonWithHM:: @ 819E02A .string "わるいけど　ひでんのわざを　もった\n" .string "ポケモンは　あずかれないなぁ$" diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index e7eda5271..ad41b1afb 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -19,7 +19,7 @@ CableClub_EventScript_MysteryGiftMan:: @ 81BB1D2 execram @ Unused -EventScript_1BB1E4:: @ 81BB1E4 +EventScript_MysteryGiftThankYou:: @ 81BB1E4 msgbox Text_ThankYouForAccessingMysteryGift, MSGBOX_NPC end diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index c7dab5b52..76b5d5c81 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -8,7 +8,7 @@ ViridianCity_House2_EventScript_PokemonJournal:: @ 81ACD65 release end -EventScript_1ACD8D:: @ 81ACD8D +EventScript_PokemonJournalUnused1:: @ 81ACD8D lock faceplayer famechecker FAMECHECKER_DAISY, 1 @@ -18,7 +18,7 @@ EventScript_1ACD8D:: @ 81ACD8D release end -EventScript_1ACDB5:: @ 81ACDB5 +EventScript_PokemonJournalUnused2:: @ 81ACDB5 lock faceplayer famechecker FAMECHECKER_DAISY, 4 @@ -135,11 +135,11 @@ CinnabarIsland_Gym_EventScript_BlaineFujiPhoto:: @ 81ACF07 releaseall end -FiveIsland_ResortGorgeous_House_EventScript_1ACF2C:: @ 81ACF2C +FiveIsland_ResortGorgeous_House_EventScript_PokemonJournal:: @ 81ACF2C lockall famechecker FAMECHECKER_BLAINE, 5 textcolor 3 - msgbox gUnknown_81B17E9 + msgbox PokemonJournal_Text_SpecialFeatureBlaine releaseall end @@ -203,7 +203,7 @@ SixIsland_Mart_EventScript_OldWoman:: @ 81ACFEF release end -EventScript_1AD008:: @ 81AD008 +EventScript_LanceUnused:: @ 81AD008 lock faceplayer famechecker FAMECHECKER_LANCE, 0 @@ -211,7 +211,7 @@ EventScript_1AD008:: @ 81AD008 release end -EventScript_1AD021:: @ 81AD021 +SaffronCity_EventScript_BattleGirlUnused:: @ 81AD021 lock faceplayer famechecker FAMECHECKER_LANCE, 1 diff --git a/data/scripts/trainer_card.inc b/data/scripts/trainer_card.inc index 39589cffa..8d441606f 100644 --- a/data/scripts/trainer_card.inc +++ b/data/scripts/trainer_card.inc @@ -68,7 +68,7 @@ FourIsland_House2_EventScript_StickerMan:: @ 81B2938 lock specialvar VAR_0x8008, StickerManGetBragFlags goto_if_unset FLAG_MET_STICKER_MAN, FourIsland_House2_EventScript_MeetStickerMan - goto_if_set FLAG_MET_STICKER_MAN, EventScript_1B2994 + goto_if_set FLAG_MET_STICKER_MAN, FourIsland_House2_EventScript_StickerManAskForBrag end FourIsland_House2_EventScript_MeetStickerMan:: @ 81B2951 @@ -88,19 +88,19 @@ FourIsland_House2_EventScript_MeetStickerMan:: @ 81B2951 goto FourIsland_House2_EventScript_ChooseBrag end -EventScript_1B2994:: @ 81B2994 +FourIsland_House2_EventScript_StickerManAskForBrag:: @ 81B2994 applymovement 1, Movement_FacePlayer waitmovement 0 goto_if_questlog EventScript_ReleaseEnd special sub_8112364 compare VAR_0x8008, 0 - goto_if_eq EventScript_1B29C6 + goto_if_eq FourIsland_House2_EventScript_NothingToBragAbout message FourIsland_House2_Text_BragAboutWhatToday waitmessage goto FourIsland_House2_EventScript_ChooseBrag end -EventScript_1B29C6:: @ 81B29C6 +FourIsland_House2_EventScript_NothingToBragAbout:: @ 81B29C6 msgbox FourIsland_House2_Text_BragAboutSomethingForMe release end diff --git a/data/specials.inc b/data/specials.inc index 7802679c6..c44e1f3b4 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -14,28 +14,28 @@ gSpecials:: @ 815FD60 def_special ReturnFromLinkRoom def_special CleanupLinkRoomState def_special sub_8081770 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial def_special TryBattleLinkup def_special TryTradeLinkup def_special TryRecordMixLinkup @@ -44,20 +44,20 @@ gSpecials:: @ 815FD60 def_special EnterTradeSeat def_special Special_WiredCableClubTrade def_special Special_CableClub_AskSaveTheGame - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial def_special SavePlayerParty def_special LoadPlayerParty def_special ChooseHalfPartyForBattle def_special Script_ShowLinkTrainerCard - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial def_special IsEnigmaBerryValid def_special ScrSpecial_GetTrainerBattleMode def_special ScrSpecial_ShowTrainerIntroSpeech @@ -70,63 +70,63 @@ gSpecials:: @ 815FD60 def_special ScrSpecial_StartTrainerEyeRematch def_special ShowPokemonStorageSystem def_special HasEnoughMonsForDoubleBattle - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial def_special Special_HasLeadMonBeenRenamed - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial def_special sub_8081128 def_special Field_AskSaveTheGame def_special nullsub_56 def_special ShowEasyChatScreen def_special Special_BufferEasyChatMessage - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial def_special GetHeracrossSizeRecordInfo def_special CompareHeracrossSize def_special GetMagikarpSizeRecordInfo @@ -134,43 +134,43 @@ gSpecials:: @ 815FD60 def_special NameRaterWasNicknameChanged def_special Special_GetMonNickname def_special Special_IsMonOTIDNotPlayers - def_special nullsub_75 - def_special nullsub_75 + def_special NullFieldSpecial + def_special NullFieldSpecial def_special BufferRandomHobbyOrLifestyleString - def_special nullsub_75 + def_special NullFieldSpecial def_special RegisteredItemHandleBikeSwap def_special CalculatePlayerPartyCount def_special CountPartyNonEggMons def_special CountPartyAliveNonEggMons_IgnoreVar0x8004Slot - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial def_special Special_ShowStringVar4AsFieldMessage def_special DrawWholeMapView def_special Special_GetPlayerXY - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial def_special Special_GetPlayerTrainerIdOnesDigit def_special Special_BufferBigGuyOrBigGirlString def_special Special_BufferSonOrDaughterString def_special Special_SetHiddenItemFlag - def_special nullsub_75 - def_special nullsub_75 + def_special NullFieldSpecial + def_special NullFieldSpecial def_special Overworld_PlaySpecialMapMusic - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial def_special ScrSpecial_StartOldManTutorialBattle def_special ChangePokemonNickname def_special Special_ChooseMonFromParty - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial def_special Special_IsFanClubMemberFanOfPlayer def_special Special_GetNumFansOfPlayerInTrainerFanClub def_special Special_BufferFanClubTrainerName @@ -180,14 +180,14 @@ gSpecials:: @ 815FD60 def_special Special_UpdateTrainerFanClubGameClear def_special Special_TryGainNewFanFromCounter def_special ScrSpecial_RockSmashWildEncounter - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial def_special Special_GetBattleOutcome def_special GetDaycareMonNicknames def_special GetDaycareState @@ -209,35 +209,35 @@ gSpecials:: @ 815FD60 def_special SubtractMoneyFromVar0x8005 def_special TryFieldPoisonWhiteOut def_special SetCB2Whiteout - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial def_special EnterSafariMode def_special ExitSafariMode - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial def_special Special_GetPokedexCount def_special Special_GetProfOaksRatingMessage def_special Special_AnimatePcTurnOn def_special Special_AnimatePcTurnOff def_special Special_GetElevatorFloor - def_special nullsub_75 - def_special nullsub_75 + def_special NullFieldSpecial + def_special NullFieldSpecial def_special Special_SelectMoveTutorMon def_special Special_SelectMove def_special Special_MoveDeleterForgetMove def_special Special_BufferMoveDeleterNicknameAndMove def_special Special_GetNumMovesSelectedMonHas def_special DisplayMoveTutorMenu - def_special nullsub_75 - def_special nullsub_75 + def_special NullFieldSpecial + def_special NullFieldSpecial def_special Special_GetPlayerAvatarBike - def_special nullsub_75 - def_special nullsub_75 + def_special NullFieldSpecial + def_special NullFieldSpecial def_special GetLeadMonFriendship def_special ScrSpecial_BattleTowerMapScript2 def_special ChooseNextBattleTowerTrainer @@ -255,7 +255,7 @@ gSpecials:: @ 815FD60 def_special AwardBattleTowerRibbons def_special ChooseBattleTowerPlayerParty def_special ValidateEReaderTrainer - def_special nullsub_75 + def_special NullFieldSpecial def_special ReducePlayerPartyToThree def_special BedroomPC def_special PlayerPC @@ -264,58 +264,58 @@ gSpecials:: @ 815FD60 def_special CreateInGameTradePokemon def_special DoInGameTradeScene def_special GetTradeSpecies - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial def_special ScrSpecial_CreatePCMenu def_special HallOfFamePCBeginFade def_special Special_ShowDiploma - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial def_special nullsub_61 def_special DoSoftReset def_special Special_HallOfFame def_special Special_AnimateElevator - def_special nullsub_75 + def_special NullFieldSpecial def_special SpawnCameraObject def_special RemoveCameraObject - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial def_special BufferEReaderTrainerName def_special Special_GetRandomSlotMachine def_special GetPlayerFacingDirection - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial def_special LeadMonHasEffortRibbon def_special GiveLeadMonEffortRibbon def_special ScrSpecial_AreLeadMonEVsMaxedOut def_special Script_FacePlayer def_special Script_ClearHeldMovement def_special InitRoamer - def_special nullsub_75 + def_special NullFieldSpecial def_special Special_PlayerHasGrassPokemonInParty - def_special nullsub_75 - def_special nullsub_75 + def_special NullFieldSpecial + def_special NullFieldSpecial def_special Special_IsStarterFirstStageInParty - def_special nullsub_75 + def_special NullFieldSpecial def_special Special_IsThereRoomInAnyBoxForMorePokemon - def_special nullsub_75 + def_special NullFieldSpecial def_special Special_DrawElevatorCurrentFloorWindow - def_special nullsub_75 + def_special NullFieldSpecial def_special Special_CheckPartyPokerus def_special Special_SetIcefallCaveCrackedIceMetatiles def_special Special_ShakeScreen @@ -323,32 +323,32 @@ gSpecials:: @ 815FD60 def_special Special_StartLegendaryBattle def_special Special_StartRegiBattle def_special SetUpTrainerMovement - def_special nullsub_75 - def_special nullsub_75 + def_special NullFieldSpecial + def_special NullFieldSpecial def_special sub_807B6C0 def_special DoDiveWarp def_special DoFallWarp - def_special nullsub_75 - def_special nullsub_75 + def_special NullFieldSpecial + def_special NullFieldSpecial def_special SetEReaderTrainerGfxId def_special ScrSpecial_StartSouthernIslandBattle - def_special nullsub_75 - def_special nullsub_75 - def_special nullsub_75 + def_special NullFieldSpecial + def_special NullFieldSpecial + def_special NullFieldSpecial def_special Special_GetSpeciesOfPartySlot_x8004 def_special Special_IsSelectedMonEgg - def_special nullsub_75 - def_special nullsub_75 + def_special NullFieldSpecial + def_special NullFieldSpecial def_special LoadPlayerBag def_special Script_FadeOutMapMusic - def_special nullsub_75 - def_special nullsub_75 + def_special NullFieldSpecial + def_special NullFieldSpecial def_special HasAllKantoMons def_special Special_IsMonOTNameNotPlayers - def_special nullsub_75 + def_special NullFieldSpecial def_special Dummy_TryEnableBravoTrainerBattleTower def_special GetNameOfEnigmaBerryInPlayerParty - def_special nullsub_75 + def_special NullFieldSpecial def_special sub_810B82C def_special ScrSpecial_StartMarowakBattle def_special Special_ForcePlayerOntoBike diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc index 8341c8858..9fbe05652 100644 --- a/data/text/fame_checker.inc +++ b/data/text/fame_checker.inc @@ -1421,7 +1421,7 @@ PokemonJournal_Text_SpecialFeatureSabrina:: @ 81B1753 .string "communicate with her POKéMON\l" .string "during battle without speaking.$" -gUnknown_81B17E9:: @ 81B17E9 +PokemonJournal_Text_SpecialFeatureBlaine:: @ 81B17E9 .string "POKéMON JOURNAL\p" .string "Special Feature: CINNABAR GYM\n" .string "LEADER BLAINE!\p" diff --git a/data/text/trainers.inc b/data/text/trainers.inc index ebe5965b5..5be1149ae 100644 --- a/data/text/trainers.inc +++ b/data/text/trainers.inc @@ -1,14 +1,14 @@ -gUnknown_81C137C:: @ 81C137C +VSSeeker_Text_BatteryNotChargedNeedXSteps:: @ 81C137C .string "The battery isn't charged enough.\p" .string "No. of steps required to fully\n" .string "charge the battery: {STR_VAR_1}{PAUSE_UNTIL_PRESS}$" -gUnknown_81C13D6:: @ 81C13D6 +VSSeeker_Text_NoTrainersWithinRange:: @ 81C13D6 .string "There are no TRAINERS within range\n" .string "who can battle…\p" .string "The VS SEEKER was turned off.{PAUSE_UNTIL_PRESS}$" -gUnknown_81C1429:: @ 81C1429 +VSSeeker_Text_TrainersNotReady:: @ 81C1429 .string "The other TRAINERS don't appear\n" .string "to be ready for battle.\p" .string "Let's wait till later.{PAUSE_UNTIL_PRESS}$" @@ -610,7 +610,8 @@ Route21_North_Text_WadeRematchIntro:: @ 81C3231 Route21_North_Text_SpencerRematchIntro:: @ 81C3264 .string "The sea cleanses my body and soul!$" -Text_1C3287:: @ 81C3287 +@ Unused trainer from RB that had a rematch intro added +Route21_North_Text_CueBallRematchIntro:: @ 81C3287 .string "きょうも　およぎに\n" .string "きちまったぜ$" -- cgit v1.2.3 From 42e6e9bd9cc98d9edd214330aba2795766ec95af Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 2 Mar 2020 14:55:20 -0500 Subject: Remove interactwith from field move scripts --- data/maps/CeladonCity/map.json | 4 +-- data/maps/CeladonCity_Gym/map.json | 6 ++--- data/maps/CeruleanCave_1F/map.json | 12 ++++----- data/maps/CeruleanCave_2F/map.json | 20 +++++++-------- data/maps/CeruleanCave_B1F/map.json | 18 ++++++------- data/maps/CeruleanCity/map.json | 2 +- data/maps/FiveIsland_Meadow/map.json | 4 +-- data/maps/FourIsland/map.json | 2 +- data/maps/FuchsiaCity/map.json | 8 +++--- data/maps/FuchsiaCity_WardensHouse/map.json | 2 +- data/maps/MtEmber_Exterior/map.json | 22 ++++++++-------- data/maps/MtEmber_RubyPath_1F/map.json | 10 ++++---- data/maps/MtEmber_RubyPath_B1F/map.json | 8 +++--- data/maps/MtEmber_RubyPath_B1F_Stairs/map.json | 2 +- data/maps/MtEmber_RubyPath_B2F/map.json | 14 +++++----- data/maps/MtEmber_RubyPath_B2F_Stairs/map.json | 4 +-- data/maps/MtEmber_RubyPath_B3F/map.json | 20 +++++++-------- data/maps/MtEmber_Summit/map.json | 8 +++--- data/maps/MtEmber_SummitPath_2F/map.json | 18 ++++++------- data/maps/OneIsland_KindleRoad/map.json | 26 +++++++++---------- data/maps/PewterCity/map.json | 2 +- data/maps/RockTunnel_B1F/map.json | 30 +++++++++++----------- data/maps/Route10/map.json | 8 +++--- data/maps/Route12/map.json | 4 +-- data/maps/Route13/map.json | 2 +- data/maps/Route14/map.json | 6 ++--- data/maps/Route16/map.json | 2 +- data/maps/Route2/map.json | 8 +++--- data/maps/Route25/map.json | 2 +- data/maps/Route8/map.json | 4 +-- data/maps/Route9/map.json | 2 +- data/maps/SeafoamIslands_1F/map.json | 4 +-- data/maps/SeafoamIslands_B1F/map.json | 4 +-- data/maps/SeafoamIslands_B2F/map.json | 4 +-- data/maps/SeafoamIslands_B3F/map.json | 8 +++--- data/maps/SevenIsland_SevaultCanyon/map.json | 16 ++++++------ .../SevenIsland_SevaultCanyon_TanobyKey/map.json | 14 +++++----- data/maps/SixIsland_RuinValley/map.json | 16 ++++++------ data/maps/ThreeIsland/map.json | 2 +- data/maps/ThreeIsland_BerryForest/map.json | 20 +++++++-------- data/maps/ThreeIsland_BondBridge/map.json | 4 +-- data/maps/TwoIsland/map.json | 2 +- data/maps/VermilionCity/map.json | 2 +- data/maps/VictoryRoad_1F/map.json | 6 ++--- data/maps/VictoryRoad_2F/map.json | 6 ++--- data/maps/VictoryRoad_3F/map.json | 8 +++--- data/maps/ViridianCity/map.json | 4 +-- data/scripts/field_moves.inc | 22 ++++++++-------- 48 files changed, 211 insertions(+), 211 deletions(-) (limited to 'data') diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index d4d0122ca..34395c3f8 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_14" }, { @@ -166,7 +166,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" }, { diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json index d9f291300..67a97d71d 100644 --- a/data/maps/CeladonCity_Gym/map.json +++ b/data/maps/CeladonCity_Gym/map.json @@ -129,7 +129,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { @@ -142,7 +142,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" }, { @@ -155,7 +155,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_14" } ], diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json index ee32088bc..b1d9c02d0 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" }, { @@ -77,7 +77,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" }, { @@ -90,7 +90,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_14" }, { @@ -103,7 +103,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" }, { @@ -116,7 +116,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_16" }, { @@ -129,7 +129,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_17" } ], diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json index a19dac4e7..b3e7eeb9e 100644 --- a/data/maps/CeruleanCave_2F/map.json +++ b/data/maps/CeruleanCave_2F/map.json @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" }, { @@ -77,7 +77,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" }, { @@ -90,7 +90,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_14" }, { @@ -103,7 +103,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" }, { @@ -116,7 +116,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_16" }, { @@ -129,7 +129,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_17" }, { @@ -142,7 +142,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_18" }, { @@ -155,7 +155,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_19" }, { @@ -168,7 +168,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1A" }, { @@ -181,7 +181,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1B" } ], diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json index cb873d731..26df88f09 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" }, { @@ -77,7 +77,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" }, { @@ -90,7 +90,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_14" }, { @@ -103,7 +103,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" }, { @@ -116,7 +116,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_16" }, { @@ -129,7 +129,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_17" }, { @@ -142,7 +142,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_18" }, { @@ -155,7 +155,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_19" }, { @@ -168,7 +168,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1A" } ], diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index 885c7207a..a6d771035 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -150,7 +150,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" }, { diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index 30195a833..123b7f994 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" }, { diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index b7b3da95a..46e268c42 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -103,7 +103,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" }, { diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index 6ed4ef5a5..89f795961 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -171,7 +171,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { @@ -184,7 +184,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" }, { @@ -197,7 +197,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_14" }, { @@ -210,7 +210,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_15" }, { diff --git a/data/maps/FuchsiaCity_WardensHouse/map.json b/data/maps/FuchsiaCity_WardensHouse/map.json index 92a3165d1..da8c3259f 100644 --- a/data/maps/FuchsiaCity_WardensHouse/map.json +++ b/data/maps/FuchsiaCity_WardensHouse/map.json @@ -38,7 +38,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index 2ffa70dbb..68e70f765 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -103,7 +103,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" }, { @@ -116,7 +116,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" }, { @@ -129,7 +129,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -142,7 +142,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -155,7 +155,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -168,7 +168,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_14" }, { @@ -181,7 +181,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" }, { @@ -194,7 +194,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -207,7 +207,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -220,7 +220,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_16" }, { @@ -233,7 +233,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_17" }, { diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json index 3f6153369..820cda01a 100644 --- a/data/maps/MtEmber_RubyPath_1F/map.json +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_14" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" }, { @@ -77,7 +77,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_16" } ], diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json index 5a9ed2ccc..0bc285563 100644 --- a/data/maps/MtEmber_RubyPath_B1F/map.json +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_14" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" } ], diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json index c7d4e2f34..0c7d4ecaf 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" } ], diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json index 4c83d7a9b..aa5683183 100644 --- a/data/maps/MtEmber_RubyPath_B2F/map.json +++ b/data/maps/MtEmber_RubyPath_B2F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" }, { @@ -77,7 +77,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" }, { @@ -90,7 +90,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_14" }, { @@ -103,7 +103,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" } ], diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json index 375c6beb5..812ce3863 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" } ], diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index 29f75c76d..c39ac4267 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" }, { @@ -77,7 +77,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" }, { @@ -90,7 +90,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_14" }, { @@ -103,7 +103,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" }, { @@ -116,7 +116,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_16" }, { @@ -129,7 +129,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_17" }, { @@ -142,7 +142,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" } ], diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json index 286baa86a..7c7e60831 100644 --- a/data/maps/MtEmber_Summit/map.json +++ b/data/maps/MtEmber_Summit/map.json @@ -38,7 +38,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -64,7 +64,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -77,7 +77,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" } ], diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json index 9698a5529..5b29a3546 100644 --- a/data/maps/MtEmber_SummitPath_2F/map.json +++ b/data/maps/MtEmber_SummitPath_2F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_14" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" }, { @@ -77,7 +77,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_16" }, { @@ -90,7 +90,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_17" }, { @@ -103,7 +103,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_18" }, { @@ -116,7 +116,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_19" }, { @@ -129,7 +129,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1A" } ], diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index 972dbc2e7..d2a12ac4d 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -200,7 +200,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" }, { @@ -213,7 +213,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" }, { @@ -226,7 +226,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_16" }, { @@ -239,7 +239,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_17" }, { @@ -252,7 +252,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_18" }, { @@ -265,7 +265,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_19" }, { @@ -278,7 +278,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1A" }, { @@ -291,7 +291,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1B" }, { @@ -304,7 +304,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1C" }, { @@ -317,7 +317,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1D" }, { @@ -330,7 +330,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1E" }, { @@ -343,7 +343,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1F" }, { @@ -356,7 +356,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_11" }, { diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index 070637f7f..ed52917a3 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index 6d172a9f6..89ec864cd 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -168,7 +168,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" }, { @@ -181,7 +181,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" }, { @@ -194,7 +194,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_14" }, { @@ -207,7 +207,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" }, { @@ -220,7 +220,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_16" }, { @@ -233,7 +233,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_17" }, { @@ -246,7 +246,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_18" }, { @@ -259,7 +259,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_19" }, { @@ -272,7 +272,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1A" }, { @@ -285,7 +285,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1B" }, { @@ -298,7 +298,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1C" }, { @@ -311,7 +311,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1D" }, { @@ -324,7 +324,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1E" }, { @@ -337,7 +337,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1F" }, { @@ -350,7 +350,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_11" } ], diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index b2127adf5..59d998a4b 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_14" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_15" } ], diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index ee56fb220..d9baf947c 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -145,7 +145,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { @@ -210,7 +210,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" } ], diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index 923408ff2..d3d4c520f 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -166,7 +166,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" } ], diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index 69e679b74..ec17c5556 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -166,7 +166,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { @@ -179,7 +179,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" }, { @@ -192,7 +192,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_14" }, { diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index f6f26ac5f..e9ddd5030 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index e02cbd20e..d9dacd473 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_14" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_15" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_16" }, { diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index c20a76f4a..82c80ddf4 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -161,7 +161,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index 70f83ee31..ffc181a4d 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { @@ -166,7 +166,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" }, { diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index e8cedc59c..4bf88e47c 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json index 518817209..e542dd610 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 0, "trainer_type": 66, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_1" }, { @@ -38,7 +38,7 @@ "movement_range_y": 0, "trainer_type": 67, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_2" }, { diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json index 6091f5d8c..253b640b3 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 0, "trainer_type": 68, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_1" }, { @@ -38,7 +38,7 @@ "movement_range_y": 0, "trainer_type": 69, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_2" }, { diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json index b602137cc..05f393cf0 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 0, "trainer_type": 70, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_1" }, { @@ -38,7 +38,7 @@ "movement_range_y": 0, "trainer_type": 71, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_2" }, { diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json index fb01fff9c..d84d79b54 100644 --- a/data/maps/SeafoamIslands_B3F/map.json +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -51,7 +51,7 @@ "movement_range_y": 0, "trainer_type": 77, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_5" }, { @@ -64,7 +64,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_6" }, { @@ -77,7 +77,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_4" }, { @@ -90,7 +90,7 @@ "movement_range_y": 0, "trainer_type": 76, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_3" } ], diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index 6096e0c49..d7dd34a32 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" }, { @@ -153,7 +153,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -166,7 +166,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" }, { @@ -179,7 +179,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" }, { @@ -192,7 +192,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_16" }, { @@ -205,7 +205,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_17" }, { @@ -218,7 +218,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -231,7 +231,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1B" }, { diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index a27961b23..73ae71224 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -25,7 +25,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -64,7 +64,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -77,7 +77,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -90,7 +90,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -103,7 +103,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" } ], diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index 8d2d508fb..1d3cbdae1 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -109,7 +109,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -122,7 +122,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -135,7 +135,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -148,7 +148,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -161,7 +161,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -174,7 +174,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -187,7 +187,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -200,7 +200,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index 77ca11bf1..f68701fc0 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index 989079f14..d88a902a3 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_14" }, { @@ -77,7 +77,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_15" }, { @@ -90,7 +90,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_16" }, { @@ -103,7 +103,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_17" }, { @@ -116,7 +116,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_18" }, { @@ -129,7 +129,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_19" }, { @@ -142,7 +142,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_1A" }, { @@ -155,7 +155,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_1B" }, { diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json index 104b2684a..69654076e 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -122,7 +122,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { @@ -135,7 +135,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" } ], diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 295cb3844..8fa55df36 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -96,7 +96,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index 292d223d8..a4d26bf49 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index f6c6811d1..dc76fd235 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -77,7 +77,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -90,7 +90,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -103,7 +103,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" } ], diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index 184187cf3..d9d29a361 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -142,7 +142,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -155,7 +155,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -168,7 +168,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_HIDE_VICTORY_ROAD_2F_BOULDER" }, { diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index 76ea5245c..e3fb362d5 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -103,7 +103,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -116,7 +116,7 @@ "movement_range_y": 0, "trainer_type": 88, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_HIDE_VICTORY_ROAD_3F_BOULDER" }, { @@ -129,7 +129,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -142,7 +142,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index 93237caec..e99c93c4a 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -54,7 +54,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_11" }, { @@ -132,7 +132,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { diff --git a/data/scripts/field_moves.inc b/data/scripts/field_moves.inc index 73ee4d947..b26aa534c 100644 --- a/data/scripts/field_moves.inc +++ b/data/scripts/field_moves.inc @@ -1,4 +1,4 @@ -EventScript_InteractWithCutTreeObject:: @ 81BDF13 +EventScript_CutTree:: @ 81BDF13 goto_if_questlog EventScript_ReleaseEnd lockall goto_if_unset FLAG_BADGE02_GET, EventScript_CantCutTree @@ -15,24 +15,24 @@ EventScript_InteractWithCutTreeObject:: @ 81BDF13 closemessage dofieldeffect FLDEFF_USE_CUT_ON_TREE waitstate - goto EventScript_CutTree + goto EventScript_CutTreeDown end EventScript_FldEffCut:: @ 81BDF6B lockall dofieldeffect FLDEFF_USE_CUT_ON_TREE waitstate - goto EventScript_CutTree + goto EventScript_CutTreeDown end -EventScript_CutTree:: @ 81BDF76 - applymovement VAR_LAST_TALKED, Movement_CutTree +EventScript_CutTreeDown:: @ 81BDF76 + applymovement VAR_LAST_TALKED, Movement_CutTreeDown waitmovement 0 removeobject VAR_LAST_TALKED releaseall end -Movement_CutTree:: @ 81BDF85 +Movement_CutTreeDown:: @ 81BDF85 cut_tree step_end @@ -58,7 +58,7 @@ Text_TreeCanBeCutDown:: @ 81BDFE3 .string "This tree looks like it can be CUT\n" .string "down!$" -EventScript_InteractWithRockSmashRockObject:: @ 81BE00C +EventScript_RockSmash:: @ 81BE00C goto_if_questlog EventScript_ReleaseEnd lockall goto_if_unset FLAG_BADGE06_GET, EventScript_CantSmashRock @@ -121,7 +121,7 @@ Text_MonMaySmashRock:: @ 81BE0E2 .string "It's a rugged rock, but a POKéMON\n" .string "may be able to smash it.$" -EventScript_InteractWithStrengthBoulderObject:: @ 81BE11D +EventScript_StrengthBoulder:: @ 81BE11D goto_if_questlog EventScript_ReleaseEnd lockall goto_if_unset FLAG_BADGE04_GET, EventScript_CantMoveBoulder @@ -182,7 +182,7 @@ Text_StrengthMadeMovingBouldersPossible:: @ 81BE284 .string "STRENGTH made it possible to move\n" .string "boulders around.$" -EventScript_InteractWithWaterfall:: @ 81BE2B7 +EventScript_Waterfall:: @ 81BE2B7 goto_if_questlog EventScript_ReleaseEnd lockall checkpartymove MOVE_WATERFALL @@ -197,7 +197,7 @@ EventScript_InteractWithWaterfall:: @ 81BE2B7 dofieldeffect FLDEFF_USE_WATERFALL goto EventScript_EndWaterfall -EventScript_81BE2FF:: @ 81BE2FF +EventScript_CantUseWaterfall:: @ 81BE2FF lockall EventScript_WaterCrashingDown: msgbox Text_WallOfWaterCrashingDown @@ -217,7 +217,7 @@ Text_MonUsedWaterfall:: @ 81BE378 .string "{STR_VAR_1} used WATERFALL.$" @ Unused leftover from R/S -EventScript_InteractWithDeepWater:: @ 81BE38B +EventScript_DeepWater:: @ 81BE38B lockall checkpartymove MOVE_DIVE compare VAR_RESULT, PARTY_SIZE -- cgit v1.2.3 From 63e0b54f969b19082ce92b2c3596250e53791ec0 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 2 Mar 2020 16:35:52 -0500 Subject: Label pokedude text --- data/text/poke_dude.inc | 65 +++++++++++++++---------------------------------- 1 file changed, 20 insertions(+), 45 deletions(-) (limited to 'data') diff --git a/data/text/poke_dude.inc b/data/text/poke_dude.inc index fc1273056..79d7493e0 100644 --- a/data/text/poke_dude.inc +++ b/data/text/poke_dude.inc @@ -1,154 +1,129 @@ -gUnknown_81C5F69:: +PokeDude_Text_SpeedierBattlerGoesFirst:: .string "POKé DUDE: The speedier of the\n" .string "battlers gets to attack first.$" -gUnknown_81C5FA7:: +PokeDude_Text_MyRattataFasterThanPidgey:: .string "It looks like my RATTATA was\n" .string "faster than the PIDGEY.$" -gUnknown_81C5FDC:: +PokeDude_Text_BattlersTakeTurnsAttacking:: .string "The battlers take turns attacking\n" .string "and reducing each other's HP.$" -gUnknown_81C601C:: +PokeDude_Text_MyRattataWonGetsEXP:: .string "My RATTATA reduced the foe's HP\n" .string "to zero, so it wins!\p" - .string "The POKéMON that took part in the\n" .string "battle get EXP. Points.\p" - .string "When a POKéMON collects enough\n" .string "EXP. Points, it levels up.\p" - .string "Leveling up makes your POKéMON\n" .string "stronger than before.$" -gUnknown_81C60FA:: +PokeDude_Text_UhOhRattataPoisoned:: .string "POKé DUDE: Uh-oh…\n" .string "My RATTATA has been poisoned…\p" - .string "If a POKéMON is poisoned, it loses\n" .string "HP steadily.$" -gUnknown_81C615A:: +PokeDude_Text_HealStatusRightAway:: .string "If a POKéMON develops a status\n" .string "problem, heal it right away.$" -gUnknown_81C6196:: +PokeDude_Text_UsingItemTakesTurn:: .string "Using an item on a POKéMON uses\n" .string "up one turn, though.\p" - .string "Now, it's the opponent's turn!$" -gUnknown_81C61EA:: +PokeDude_Text_YayWeManagedToWin:: .string "Yay!\n" .string "We managed to win!$" -gUnknown_81C6202:: +PokeDude_Text_WaterNotVeryEffectiveAgainstGrass:: .string "POKé DUDE: The move BUBBLE is\n" .string "a WATER-type attack.\p" - .string "The targeted ODDISH is a\n" .string "GRASS/POISON-type POKéMON.\p" - .string "The WATER-type attack is absorbed\n" .string "by the GRASS-type POKéMON…\p" - .string "As a result, the move becomes not\n" .string "very effective, and inflicts only\l" .string "half the usual damage.$" -gUnknown_81C6301:: +PokeDude_Text_GrassEffectiveAgainstWater:: .string "Uh-oh, this is not good!\p" - .string "The ABSORB attack you just saw\n" .string "is a GRASS-type move.\p" - .string "POLIWAG is a WATER-type POKéMON.\p" - .string "So, ABSORB becomes super\n" .string "effective, doubling the damage.$" -gUnknown_81C63A9:: +PokeDude_Text_LetsTryShiftingMons:: .string "It's not going to be easy to win\n" .string "with this matchup…\p" - .string "Let's try shifting POKéMON!$" -gUnknown_81C63F9:: +PokeDude_Text_ShiftingUsesTurn:: .string "Shifting POKéMON in and out uses\n" .string "up one turn.\p" - .string "Now, it's the opponent's turn.$" -gUnknown_81C6446:: +PokeDude_Text_ButterfreeDoubleResistsGrass:: .string "BUTTERFREE is a BUG/FLYING-type\n" .string "POKéMON.\p" - .string "Against this POKéMON, a GRASS-\n" .string "type attack…\p" - .string "…inflicts only half the usual\n" .string "damage on a BUG-type POKéMON…\p" - .string "…And, it also causes only half the\n" .string "damage on a FLYING-type POKéMON.\p" - .string "Therefore, BUTTERFREE, being a\n" .string "BUG/FLYING POKéMON, only takes\l" .string "one quarter of the usual damage.$" -gUnknown_81C657A:: +PokeDude_Text_ButterfreeGoodAgainstOddish:: .string "ODDISH is a GRASS/POISON-type\n" .string "POKéMON.\p" - .string "A FLYING- or PSYCHIC-type attack\n" .string "is super effective against it.\p" - .string "One of those types of attacks will\n" .string "inflict double the usual damage.\p" - .string "Okay, here we go!$" -gUnknown_81C6637:: +PokeDude_Text_YeahWeWon:: .string "Yeah!\n" .string "We won!$" -gUnknown_81C6645:: +PokeDude_Text_WeakenMonBeforeCatching:: .string "POKé DUDE: When you're trying to\n" .string "catch a POKéMON, don't throw any\l" .string "POKé BALLS right away.\p" - .string "First, you need to weaken it by\n" .string "reducing its HP.$" -gUnknown_81C66CF:: +PokeDude_Text_BestIfTargetStatused:: .string "Okay, that should be good enough.\p" - .string "But, if it's possible, it would be\n" .string "best if the target has a status\l" .string "problem.\p" - .string "For instance, it would be easier\n" .string "to catch if it were asleep or\l" .string "paralyzed.$" -gUnknown_81C6787:: +PokeDude_Text_CantDoubleUpOnStatus:: .string "This will make the POKéMON a lot\n" .string "easier to catch!\p" - .string "Oh, yes. If you paralyze a\n" .string "POKéMON, you can't make it fall\l" .string "asleep on top of paralysis.\p" - .string "In other words, you can't double\n" .string "up status problems, okay?$" -gUnknown_81C684B:: +PokeDude_Text_LetMeThrowBall:: .string "Okay!\n" .string "Let me throw my POKé BALL!$" -gUnknown_81C686C:: +PokeDude_Text_PickBestKindOfBall:: .string "Before you throw a POKé BALL,\n" .string "consider the condition and the\l" .string "type of POKéMON, and pick the kind\l" -- cgit v1.2.3 From 8594e7f72d070ce10fcc41a8c2dfe32420e7c560 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 2 Mar 2020 21:36:30 -0500 Subject: Port berry_crush_2 from emerald --- data/berry_crush.s | 74 ------------------------------------------------------ 1 file changed, 74 deletions(-) (limited to 'data') diff --git a/data/berry_crush.s b/data/berry_crush.s index 417347801..1d2a3182d 100644 --- a/data/berry_crush.s +++ b/data/berry_crush.s @@ -3,80 +3,6 @@ .section .rodata .align 2 -gUnknown_846E2E0:: @ 846E2E0 - .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 - -gUnknown_846E2E8:: @ 846E2E8 - .byte 0x00, 0x01, 0x02, 0x03, 0x05, 0x00, 0x00, 0x00 - -gUnknown_846E2F0:: @ 846E2F0 - .byte 0x04, 0x01, 0x00, 0xff - .byte 0x00, 0x00, 0x00, 0x04 - .byte 0x02, 0x00, 0xff, 0x00 - .byte 0x00, 0x00, 0x04, 0x02 - .byte 0x00, 0xfe, 0x00, 0x00 - .byte 0x00, 0x06, 0x03, 0x01 - .byte 0xff, 0xfd, 0xff, 0x00 - .byte 0x06, 0x04, 0x01, 0xfe - .byte 0xfc, 0xfe, 0x00, 0x00 - -gUnknown_846E314:: @ 846E314 - .byte 0x03, 0x02, 0x01, 0x00 - .byte 0x03, 0x03, 0x01, 0x00 - .byte 0x03, 0x03, 0x02, 0x00 - .byte 0x03, 0x04, 0x02, 0x00 - .byte 0x03, 0x05, 0x03, 0x00 - -gUnknown_846E328:: @ 846E328 - .4byte gUnknown_841CE3C - .4byte gUnknown_841CE78 - .4byte gUnknown_841CEA8 - .4byte gUnknown_841CF14 - .4byte gUnknown_841CF50 - .4byte gUnknown_841CF70 - .4byte gUnknown_841CFA0 - .4byte gUnknown_841CFD4 - .4byte gUnknown_841D008 - -gUnknown_846E34C:: @ 846E34C - .4byte NULL - .4byte sub_814BBB8 - .4byte sub_814BC10 - .4byte sub_814BC74 - .4byte sub_814BD7C - .4byte sub_814BD9C - .4byte sub_814BDBC - .4byte sub_814BE0C - .4byte sub_814BE64 - .4byte sub_814BE7C - .4byte sub_814BFD0 - .4byte sub_814C118 - .4byte sub_814C24C - .4byte sub_814C850 - .4byte sub_814C8F8 - .4byte sub_814C990 - .4byte sub_814CB20 - .4byte sub_814CC0C - .4byte sub_814CFA8 - .4byte sub_814D094 - .4byte sub_814D188 - .4byte sub_814D240 - .4byte sub_814D31C - .4byte sub_814D3A4 - .4byte sub_814D468 - .4byte sub_814D4C8 - -gUnknown_846E3B4:: @ 846E3B4 - .byte 0x02, 0x04, 0x06, 0x07 - .byte 0x03, 0x05, 0x08, 0x0b - .byte 0x03, 0x07, 0x0b, 0x0f - .byte 0x04, 0x08, 0x0c, 0x11 - -gUnknown_846E3C4:: @ 846E3C4 - .byte 0x05, 0x07, 0x09, 0x0c - -gUnknown_846E3C8:: @ 846E3C8 - .byte 0x03, 0x07, 0x0f, 0x1f gUnknown_846E3CC:: @ 846E3CC .4byte 0x000000f8 -- cgit v1.2.3 From 2e8570499dfcc0db64dfcb446f4e20a162253543 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 3 Mar 2020 01:44:06 -0500 Subject: Sync event ticket flag names --- data/maps/VermilionCity/scripts.inc | 16 ++++++++-------- data/mystery_event_msg.s | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'data') diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 0442f3d02..0485cd89e 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -59,7 +59,7 @@ VermilionCity_EventScript_FerrySailor:: @ 8166941 end VermilionCity_EventScript_CheckHasMysticTicket:: @ 8166958 - goto_if_unset FLAG_SYS_GOT_MYSTIC_TICKET, EventScript_SetResultFalse + goto_if_unset FLAG_ENABLE_SHIP_NAVEL_ROCK, EventScript_SetResultFalse checkitem ITEM_MYSTIC_TICKET, 1 compare VAR_RESULT, FALSE goto_if_eq EventScript_SetResultFalse @@ -67,7 +67,7 @@ VermilionCity_EventScript_CheckHasMysticTicket:: @ 8166958 end VermilionCity_EventScript_CheckHasAuroraTicket:: @ 8166977 - goto_if_unset FLAG_SYS_GOT_AURORA_TICKET, EventScript_SetResultFalse + goto_if_unset FLAG_ENABLE_SHIP_BIRTH_ISLAND, EventScript_SetResultFalse checkitem ITEM_AURORA_TICKET, 1 compare VAR_RESULT, FALSE goto_if_eq EventScript_SetResultFalse @@ -103,7 +103,7 @@ VermilionCity_EventScript_HasMysticTicket:: @ 81669FD call VermilionCity_EventScript_CheckHasAuroraTicket compare VAR_RESULT, TRUE goto_if_eq VermilionCity_EventScript_HasMysticAndAuroraTickets - call_if_unset FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN, VermilionCity_EventScript_ShowMysticTicket + call_if_unset FLAG_SHOWN_MYSTIC_TICKET, VermilionCity_EventScript_ShowMysticTicket message VermilionCity_Text_BoardSeagallopFerry waitmessage multichoice 17, 6, MULTICHOICE_SEVII_NAVEL, FALSE @@ -115,12 +115,12 @@ VermilionCity_EventScript_HasMysticTicket:: @ 81669FD end VermilionCity_EventScript_ShowMysticTicket:: @ 8166A53 - setflag FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN + setflag FLAG_SHOWN_MYSTIC_TICKET msgbox VermilionCity_Text_OhMysticTicketTakeYouToNavelRock return VermilionCity_EventScript_HasAuroraTicket:: @ 8166A5F - call_if_unset FLAG_SHOWED_AURORATICKET_TO_CAPTAIN, VermilionCity_EventScript_ShowAuroraTicket + call_if_unset FLAG_SHOWN_AURORA_TICKET, VermilionCity_EventScript_ShowAuroraTicket message VermilionCity_Text_BoardSeagallopFerry waitmessage multichoice 13, 6, MULTICHOICE_SEVII_BIRTH, FALSE @@ -132,13 +132,13 @@ VermilionCity_EventScript_HasAuroraTicket:: @ 8166A5F end VermilionCity_EventScript_ShowAuroraTicket:: @ 8166AA5 - setflag FLAG_SHOWED_AURORATICKET_TO_CAPTAIN + setflag FLAG_SHOWN_AURORA_TICKET msgbox VermilionCity_Text_OhAuroraTicketTakeYouToBirthIsland return VermilionCity_EventScript_HasMysticAndAuroraTickets:: @ 8166AB1 - call_if_unset FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN, VermilionCity_EventScript_ShowMysticTicket - call_if_unset FLAG_SHOWED_AURORATICKET_TO_CAPTAIN, VermilionCity_EventScript_ShowAuroraTicket + call_if_unset FLAG_SHOWN_MYSTIC_TICKET, VermilionCity_EventScript_ShowMysticTicket + call_if_unset FLAG_SHOWN_AURORA_TICKET, VermilionCity_EventScript_ShowAuroraTicket message VermilionCity_Text_BoardSeagallopFerry waitmessage multichoice 13, 5, MULTICHOICE_SEVII_NAVEL_BIRTH, FALSE diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index 2eab73984..5b1f5cacb 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -228,7 +228,7 @@ MysteryEventScript_AuroraTicket:: @ 84894B9 compare VAR_RESULT, FALSE vgoto_if_eq AuroraTicket_NoBagSpace giveitem ITEM_AURORA_TICKET - setflag FLAG_SYS_GOT_AURORA_TICKET + setflag FLAG_ENABLE_SHIP_BIRTH_ISLAND setflag FLAG_GOT_AURORA_TICKET vmessage sText_AuroraTicket2 waitmessage @@ -289,7 +289,7 @@ MysteryEventScript_MysticTicket:: @ 8489689 compare VAR_RESULT, FALSE vgoto_if_eq MysticTicket_NoBagSpace giveitem ITEM_MYSTIC_TICKET - setflag FLAG_SYS_GOT_MYSTIC_TICKET + setflag FLAG_ENABLE_SHIP_NAVEL_ROCK setflag FLAG_GOT_MYSTIC_TICKET vmessage sText_MysticTicket1 waitmessage -- cgit v1.2.3 From 8a7c2ded11a2adf4f09ddca814eb06fdbca13fd1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 3 Mar 2020 12:24:18 -0500 Subject: Port berry_crush_3 from Emerald --- data/berry_crush.s | 292 ----------------------------------------------------- data/strings.s | 48 ++++----- 2 files changed, 24 insertions(+), 316 deletions(-) (limited to 'data') diff --git a/data/berry_crush.s b/data/berry_crush.s index 1d2a3182d..56cf980c2 100644 --- a/data/berry_crush.s +++ b/data/berry_crush.s @@ -3,295 +3,3 @@ .section .rodata .align 2 - -gUnknown_846E3CC:: @ 846E3CC - .4byte 0x000000f8 - @ { - @ .bg = 0, - @ .charBaseIndex = 2, - @ .mapBaseIndex = 15, - @ .screenSize = 0, - @ .paletteMode = 0, - @ .priority = 0, - @ .baseTile = 0x0000 - @ } - .4byte 0x000014d1 - @ { - @ .bg = 1, - @ .charBaseIndex = 0, - @ .mapBaseIndex = 13, - @ .screenSize = 2, - @ .paletteMode = 0, - @ .priority = 1, - @ .baseTile = 0x0000 - @ } - .4byte 0x000020c2 - @ { - @ .bg = 2, - @ .charBaseIndex = 0, - @ .mapBaseIndex = 12, - @ .screenSize = 0, - @ .paletteMode = 0, - @ .priority = 2, - @ .baseTile = 0x0000 - @ } - .4byte 0x000030b3 - @ { - @ .bg = 3, - @ .charBaseIndex = 0, - @ .mapBaseIndex = 11, - @ .screenSize = 0, - @ .paletteMode = 0, - @ .priority = 3, - @ .baseTile = 0x0000 - @ } - -gUnknown_846E3DC:: @ 846E3DC - .byte 0x01, 0x02, 0x03 - -gUnknown_846E3DF:: @ 846E3DF - .byte 0x00, 0x01, 0x02 - -gUnknown_846E3E2:: @ 846E3E2 - .byte 0x00, 0x03, 0x04 - -gUnknown_846E3E5:: @ 846E3E5 - .byte 0x01, 0x08, 0x09 - .byte 0x01, 0x06, 0x07 - -gUnknown_846E3EB:: @ 846E3EB - .byte 0x01, 0x04, 0x05 - - .align 2 -gUnknown_846E3F0:: @ 846E3F0 - .byte 0, 3, 4, 24, 13, 15 - .2byte 0x0001 - -gUnknown_846E3F8:: @ 846E3F8 - .byte 0, 0, 0, 9, 2, 8 - .2byte 0x03ed - .byte 0, 0, 3, 9, 2, 8 - .2byte 0x03db - .byte 0, 0, 6, 9, 2, 8 - .2byte 0x03c9 - .byte 0, 21, 3, 9, 2, 8 - .2byte 0x03b7 - .byte 0, 21, 6, 9, 2, 8 - .2byte 0x03a5 - .byte 255, 0, 0, 0, 0, 0 - .2byte 0x0000 - .byte 0, 4, 2, 22, 16, 15 - .2byte 0x0001 - .byte 0, 4, 2, 22, 16, 15 - .2byte 0x0001 - .byte 0, 3, 2, 24, 16, 15 - .2byte 0x0001 - .byte 255, 0, 0, 0, 0, 0 - .2byte 0x0000 - -gUnknown_846E448:: @ 846E448 - .byte 0x06, 0x08, 0x09, 0x0b - .byte 0x0c, 0x0e, 0x0f, 0x10 - -gUnknown_846E450:: @ 846E450 - .4byte 50000000, 25000000, 12500000, 6250000, 3125000, 1562500, 781250, 390625 - -gUnknown_846E470:: @ 846E470 gbapal - .incbin "graphics/link_games/unk_846E4D0.gbapal" - -gUnknown_846E490:: @ 846E490 gbapal - .incbin "graphics/link_games/unk_846E7FC.gbapal" - -gUnknown_846E4B0:: @ 846E4B0 gbapal - .incbin "graphics/link_games/unk_846ECC4.gbapal" - -gUnknown_846E4D0:: @ 846E4D0 4bpp.lz - .incbin "graphics/link_games/unk_846E4D0.4bpp.lz" - -gUnknown_846E7FC:: @ 846E7FC 4bpp.lz - .incbin "graphics/link_games/unk_846E7FC.4bpp.lz" - -gUnknown_846EB78:: @ 846EB78 4bpp.lz - .incbin "graphics/link_games/unk_846EB78.4bpp.lz" - -gUnknown_846ECC4:: @ 846ECC4 4bpp.lz - .incbin "graphics/link_games/unk_846ECC4.4bpp.lz" - -gUnknown_846ED90:: @ 846ED90 bin.lz - .incbin "graphics/link_games/unk_846ED90.bin.lz" - -gUnknown_846EEC0:: @ 846EEC0 bin.lz - .incbin "graphics/link_games/unk_846EEC0.bin.lz" - -gUnknown_846F058:: @ 846F058 bin.lz - .incbin "graphics/link_games/unk_846F058.bin.lz" - -gUnknown_846F280:: @ 846F280 - .byte 0x01, 0x03, 0x00, 0x00, 0x00 - .byte 0x00, 0x01, 0x03, 0x00, 0x00 - .byte 0x01, 0x03, 0x02, 0x04, 0x00 - .byte 0x00, 0x01, 0x03, 0x02, 0x04 - -gUnknown_846F294:: @ 846F294 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x03, 0x00, 0xe4, 0xff, 0xfc, 0xff, 0xe8, 0xff, 0x10, 0x00 - .byte 0x02, 0x00, 0x06, 0x00, 0xf0, 0xff, 0x14, 0x00, 0xf8, 0xff, 0x10, 0x00 - .byte 0x03, 0x14, 0x03, 0x00, 0x1c, 0x00, 0xfc, 0xff, 0x20, 0x00, 0xf8, 0xff - .byte 0x04, 0x14, 0x06, 0x00, 0x10, 0x00, 0x14, 0x00, 0x10, 0x00, 0xf8, 0xff - -gUnknown_846F2D0:: @ 846F2D0 - .byte 0x00, 0x00 - .byte 0xff, 0x00 - .byte 0x01, 0x01 - -gUnknown_846F2D6:: @ 846F2D6 - .byte 0x00, 0x00 - .byte 0xf0, 0xfc - .byte 0x10, 0xfc - .byte 0xf8, 0xfe - .byte 0x08, 0xfe - .byte 0xe8, 0xf8 - .byte 0x18, 0xf8 - .byte 0xe0, 0xf4 - .byte 0x20, 0xf4 - .byte 0xd8, 0xf0 - .byte 0x28, 0xf0 - -gUnknown_846F2EC:: @ 846F2EC - .2byte 5, 6, 7, 8, 9 - - .align 2 -gUnknown_846F2F8:: @ 846F2F8 - obj_tiles gUnknown_846E4D0, 0x0800, 1 - obj_tiles gUnknown_846E7FC, 0x0e00, 2 - obj_tiles gUnknown_846EB78, 0x0700, 3 - obj_tiles gUnknown_846ECC4, 0x02c0, 4 - obj_tiles NULL, 0x0000, 0 - -gUnknown_846F320:: @ 846F320 - obj_pal gUnknown_846E470, 1 - obj_pal gUnknown_846E490, 2 - obj_pal gUnknown_846E4B0, 4 - obj_pal NULL, 0 - -gUnknown_846F340:: - obj_image_anim_frame 0x0000, 0 - obj_image_anim_end - -gUnknown_846F348:: - obj_image_anim_frame 0x0000, 4 - obj_image_anim_frame 0x0010, 4 - obj_image_anim_frame 0x0020, 4 - obj_image_anim_end - -gUnknown_846F358:: - obj_image_anim_frame 0x0030, 2 - obj_image_anim_frame 0x0040, 2 - obj_image_anim_frame 0x0050, 2 - obj_image_anim_frame 0x0060, 2 - obj_image_anim_end - -gUnknown_846F36C:: - obj_image_anim_frame 0x0000, 2 - obj_image_anim_frame 0x0004, 2 - obj_image_anim_frame 0x0008, 2 - obj_image_anim_frame 0x000c, 2 - obj_image_anim_frame 0x0010, 2 - obj_image_anim_frame 0x0014, 2 - obj_image_anim_jump 0 - -gUnknown_846F388:: - obj_image_anim_frame 0x0018, 4 - obj_image_anim_frame 0x001c, 4 - obj_image_anim_frame 0x0020, 4 - obj_image_anim_frame 0x0024, 4 - obj_image_anim_frame 0x0028, 4 - obj_image_anim_frame 0x002c, 4 - obj_image_anim_frame 0x0030, 4 - obj_image_anim_frame 0x0034, 4 - obj_image_anim_jump 0 - -gUnknown_846F3AC:: - obj_image_anim_frame 0x0014, 0 - obj_image_anim_end - -gUnknown_846F3B4:: - obj_image_anim_frame 0x0000, 0 - obj_image_anim_end - -gUnknown_846F3BC:: - obj_rot_scal_anim_frame 256, 256, 0, 0 - obj_rot_scal_anim_frame 0, 0, 2, 1 - obj_rot_scal_anim_jump 1 - -gUnknown_846F3D4:: - obj_rot_scal_anim_frame 256, 256, 0, 0 - obj_rot_scal_anim_frame 0, 0, 254, 1 - obj_rot_scal_anim_jump 1 - -gUnknown_846F3EC:: - .4byte gUnknown_846F340 - -gUnknown_846F3F0:: - .4byte gUnknown_846F348 - .4byte gUnknown_846F358 - -gUnknown_846F3F8:: - .4byte gUnknown_846F36C - .4byte gUnknown_846F388 - -gUnknown_846F400:: - .4byte gUnknown_846F3AC - -gUnknown_846F404:: - .4byte gUnknown_846F3B4 - -gUnknown_846F408:: - .4byte gUnknown_846F3BC - .4byte gUnknown_846F3D4 - -gUnknown_846F410:: @ 846F410 - spr_template 1, 1, gOamData_AffineOff_ObjNormal_64x64, gUnknown_846F3EC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_846F428:: @ 846F428 - spr_template 2, 2, gOamData_AffineOff_ObjNormal_32x32, gUnknown_846F3F0, NULL, gDummySpriteAffineAnimTable, sub_814EFD0 - -gUnknown_846F440:: @ 846F440 - spr_template 3, 2, gOamData_AffineOff_ObjNormal_16x16, gUnknown_846F3F8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_846F458:: @ 846F458 - spr_template 4, 4, gOamData_AffineOff_ObjNormal_8x16, gUnknown_846F400, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_846F470:: @ 846F470 - spr_template 5, 5, gOamData_AffineDouble_ObjNormal_32x32, gUnknown_846F404, NULL, gUnknown_846F408, SpriteCallbackDummy - -gUnknown_846F488:: @ 846F488 DigitObjUtilTemplate - @ strConvMode, shape, size, priority - .byte 1 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 9 - .byte 2, 8 @ ndigits, width - .align 2 - .2byte 0x9c, 0x00 @ x, y - .4byte gUnknown_846F2F8 + 0x18 @ spriteSheet - .4byte gUnknown_846F320 + 0x10 @ spritePalette - @ strConvMode, shape, size, priority - .byte 0 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 8 - .byte 2, 8 @ ndigits, width - .align 2 - .2byte 0xb4, 0x00 @ x, y - .4byte gUnknown_846F2F8 + 0x18 @ spriteSheet - .4byte gUnknown_846F320 + 0x10 @ spritePalette - @ strConvMode, shape, size, priority - .byte 0 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 8 - .byte 2, 8 @ ndigits, width - .align 2 - .2byte 0xcc, 0x00 @ x, y - .4byte gUnknown_846F2F8 + 0x18 @ spriteSheet - .4byte gUnknown_846F320 + 0x10 @ spritePalette - -gUnknown_846F4B8:: @ 846F4B8 - .4byte gUnknown_841D034 - .4byte gUnknown_841D03C - .4byte gUnknown_841D044 - .4byte gUnknown_841D0D4 - .4byte gUnknown_841D0E8 - .4byte gUnknown_841D100 diff --git a/data/strings.s b/data/strings.s index 1d56d6be7..93a98960e 100644 --- a/data/strings.s +++ b/data/strings.s @@ -3448,90 +3448,90 @@ gUnknown_841D008:: @ 841D008 .string "Communication standby…$" .align 2 -gUnknown_841D020:: @ 841D020 +gText_1_ClrLtGryShdwBlk_Dynamic0:: @ 841D020 .string "1. {COLOR LIGHT_GRAY}{SHADOW BLACK}{DYNAMIC 0x00}$" -gUnknown_841D02C:: @ 841D02C +gText_1_Dynamic0:: @ 841D02C .string "1. {DYNAMIC 0x00}$" .align 2 -gUnknown_841D034:: @ 0x841D034 +gText_SpaceTimes:: @ 0x841D034 .string " times$" .align 2 -gUnknown_841D03C:: @ 0x841D03C +gText_XDotY:: @ 0x841D03C .string "{STR_VAR_1}.{STR_VAR_2}$" .align 2 -gUnknown_841D044:: @ 0x841D044 +gText_StrVar1Berry:: @ 0x841D044 .string "{STR_VAR_1} BERRY$" .align 2 -gUnknown_841D050:: @ 841D050 +gText_TimeColon:: @ 841D050 .string "Time:$" .align 2 -gUnknown_841D058:: @ 841D058 +gText_PressingSpeed:: @ 841D058 .string "Pressing Speed:$" -gUnknown_841D068:: @ 841D068 +gText_Silkiness:: @ 841D068 .string "Silkiness:$" .align 2 -gUnknown_841D074:: @ 841D074 +gText_StrVar1:: @ 841D074 .string "{STR_VAR_1}$" .align 2 -gUnknown_841D078:: @ 841D078 +gText_SpaceMin:: @ 841D078 .string "min.$" .align 2 -gUnknown_841D080:: @ 841D080 +gText_XDotY2:: @ 841D080 .string "{STR_VAR_1}.{STR_VAR_2}$" .align 2 -gUnknown_841D088:: @ 841D088 +gText_SpaceSec:: @ 841D088 .string "sec.$" .align 2 -gUnknown_841D090:: @ 841D090 +gText_XDotY3:: @ 841D090 .string "{STR_VAR_1}.{STR_VAR_2}$" .align 2 -gUnknown_841D098:: @ 841D098 +gText_TimesPerSec:: @ 841D098 .string "Times/sec.$" .align 2 -gUnknown_841D0A4:: @ 841D0A4 - .string "{STR_VAR_1}サ$" +gText_Var1Percent:: @ 841D0A4 + .string "{STR_VAR_1}%$" .align 2 -gUnknown_841D0A8:: @ 841D0A8 +gText_PressesRankings:: @ 841D0A8 .string "No. of Presses Rankings$" .align 2 -gUnknown_841D0C0:: @ 841D0C0 +gText_CrushingResults:: @ 841D0C0 .string "Crushing Results$" .align 2 -gUnknown_841D0D4:: @ 0x841D0D4 +gText_NeatnessRankings:: @ 0x841D0D4 .string "Neatness Rankings$" .align 2 -gUnknown_841D0E8:: @ 0x841D0E8 +gText_CooperativeRankings:: @ 0x841D0E8 .string "Cooperative Rankings$" .align 2 -gUnknown_841D100:: @ 0x841D100 +gText_PressingPowerRankings:: @ 0x841D100 .string "Pressing-Power Rankings$" -gUnknown_841D118:: @ 841D118 +gText_BerryCrush2:: @ 841D118 .string "BERRY CRUSH$" -gUnknown_841D124:: @ 841D124 +gText_PressingSpeedRankings:: @ 841D124 .string "Pressing-Speed Rankings$" -gUnknown_841D13C:: @ 841D13C +gText_Var1Players:: @ 841D13C .string "{STR_VAR_1} PLAYERS$" .align 2 -- cgit v1.2.3 From d047e6631066139abe81fe5924b724cc9d02af62 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 3 Mar 2020 13:59:54 -0500 Subject: Duplicate data in dodrio_berry_picking.c --- data/berry_powder.s | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 data/berry_powder.s (limited to 'data') diff --git a/data/berry_powder.s b/data/berry_powder.s deleted file mode 100644 index 0f812d79d..000000000 --- a/data/berry_powder.s +++ /dev/null @@ -1,36 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - - .align 2 -gUnknown_847565C_UnrefDupe:: @ 8471F00 struct BgTemplate(???) - .4byte 0x000001e0 - .4byte 0x000012c9 - .4byte 0x000012ea - .4byte 0x000021ff - .4byte 0x000000ff - .4byte 0x00000000 - - .align 2 -gUnknown_8475674_UnrefDupe:: @ 8471F18 - window_template 0x00, 0x01, 0x01, 0x1c, 0x03, 0x0d, 0x0013 - window_template 0x00, 0x01, 0x06, 0x1c, 0x0d, 0x0d, 0x0067 - - .align 2 -gUnknown_8475684_UnrefDupe:: @ 8471F28 - window_template 0x00, 0x01, 0x06, 0x1c, 0x07, 0x0d, 0x0067 - - .align 2 -gUnknown_847568C_UnrefDupe:: @ 8471F30 - window_template 0x00, 0x01, 0x08, 0x13, 0x03, 0x0d, 0x0013 - window_template 0x00, 0x16, 0x07, 0x06, 0x04, 0x0d, 0x004c - - .align 2 -gUnknown_847569C_UnrefDupe:: @ 8471F40 - window_template 0x00, 0x04, 0x06, 0x16, 0x05, 0x0d, 0x0013 - - .align 2 -gUnknown_84756A4_UnrefDupe:: @ 8471F48 - window_template 0x00, 0x05, 0x08, 0x13, 0x03, 0x0d, 0x0013 -- cgit v1.2.3 From 4c4b19da7e2f6f71a13f92068f395894c53798fd Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 3 Mar 2020 01:39:10 -0500 Subject: Label help system text --- data/text/help_system.inc | 741 +++++++++++++++++++++++----------------------- 1 file changed, 369 insertions(+), 372 deletions(-) (limited to 'data') diff --git a/data/text/help_system.inc b/data/text/help_system.inc index ccc57332b..b19427e2c 100644 --- a/data/text/help_system.inc +++ b/data/text/help_system.inc @@ -1,193 +1,190 @@ -gUnknown_81B2DF8:: @ 81B2DF8 +Help_Text_WhatShouldIDo:: @ 81B2DF8 .string "What should I do in this situation?$" -gUnknown_81B2E1C:: @ 81B2E1C +Help_Text_HowDoIDoThis:: @ 81B2E1C .string "How do I do this?$" -gUnknown_81B2E2E:: @ 81B2E2E +Help_Text_WhatDoesThisTermMean:: @ 81B2E2E .string "What does this term mean?$" -gUnknown_81B2E48:: @ 81B2E48 +Help_Text_AboutThisGame:: @ 81B2E48 .string "About this game$" -gUnknown_81B2E58:: @ 81B2E58 +Help_Text_TypeMatchupList:: @ 81B2E58 .string "Type Matchup List$" -gUnknown_81B2E6A:: @ 81B2E6A +Help_Text_Exit:: @ 81B2E6A .string "EXIT$" -gUnknown_81B2E6F:: @ 81B2E6F +Help_Text_Cancel:: @ 81B2E6F .string "CANCEL$" gUnknown_81B2E76:: .string "じぶんの ちからで やってみよう！$" -gUnknown_81B2E88:: @ 81B2E88 +Help_Text_DescWhatShouldIDo:: @ 81B2E88 .string "Select to obtain hints for getting\n" .string "over challenging situations.$" -gUnknown_81B2EC8:: @ 81B2EC8 +Help_Text_DescHowDoIDoThis:: @ 81B2EC8 .string "Detailed instructions are given for\n" .string "various operations.$" -gUnknown_81B2F00:: @ 81B2F00 +Help_Text_DescWhatDoesThisTermMean:: @ 81B2F00 .string "Detailed descriptions are given for\n" .string "terms that appear in the game.$" -gUnknown_81B2F43:: @ 81B2F43 +Help_Text_DescAboutThisGame:: @ 81B2F43 .string "Detailed descriptions are given\n" .string "about this game.$" -gUnknown_81B2F74:: @ 81B2F74 +Help_Text_DescTypeMatchupList:: @ 81B2F74 .string "The matchups of POKéMON types\n" .string "and moves are listed.$" -gUnknown_81B2FA9:: @ 81B2FA9 +Help_Text_DescExit:: @ 81B2FA9 .string "Select to exit the HELP System.$" -gUnknown_81B2FC9:: @ 81B2FC9 +Help_Text_Greetings:: @ 81B2FC9 .string "Greetings! This is the HELP System.\n" .string "Call me up whenever and wherever you\l" - .string "need by p" - -gUnknown_81B301B:: @ 81B301B - .string "ressing the L or R Button.\l" + .string "need by pressing the L or R Button.\l" .string "The help messages change to suit the\l" .string "situation, so check them often, please.$" -gUnknown_81B3083:: @ 81B3083 +Help_Text_PlayingForFirstTime:: @ 81B3083 .string "I'm playing for the first time. Help!$" -gUnknown_81B30A9:: @ 81B30A9 +Help_Text_WhatShouldIBeDoing:: @ 81B30A9 .string "What should I be doing?$" -gUnknown_81B30C1:: @ 81B30C1 +Help_Text_CantGetOutOfRoom:: @ 81B30C1 .string "I can't get out of a room!$" -gUnknown_81B30DC:: @ 81B30DC +Help_Text_CantFindPersonIWant:: @ 81B30DC .string "I can't find the person I want.$" -gUnknown_81B30FC:: @ 81B30FC +Help_Text_TalkedToEveryoneNowWhat:: @ 81B30FC .string "I've talked to everyone. Now what?$" -gUnknown_81B311F:: @ 81B311F +Help_Text_SomeoneBlockingMyWay:: @ 81B311F .string "There's someone blocking my way!$" -gUnknown_81B3140:: @ 81B3140 +Help_Text_ICantGoOn:: @ 81B3140 .string "I can't go on!$" -gUnknown_81B314F:: @ 81B314F +Help_Text_OutOfThingsToDo:: @ 81B314F .string "I'm out of things to do.$" -gUnknown_81B3168:: @ 81B3168 +Help_Text_WhatHappenedToItemIGot:: @ 81B3168 .string "What happened to the item I got?$" -gUnknown_81B3189:: @ 81B3189 +Help_Text_WhatAreMyAdventureBasics:: @ 81B3189 .string "What are the basics of my adventure?$" -gUnknown_81B31AE:: @ 81B31AE +Help_Text_HowAreRoadsForestsDifferent:: @ 81B31AE .string "How are roads and forests different?$" -gUnknown_81B31D3:: @ 81B31D3 +Help_Text_HowAreCavesDifferent:: @ 81B31D3 .string "How are caves different?$" -gUnknown_81B31EC:: @ 81B31EC +Help_Text_HowDoIProgress:: @ 81B31EC .string "How do I progress?$" -gUnknown_81B31FF:: @ 81B31FF +Help_Text_WhenCanIUseItem:: @ 81B31FF .string "When can I use items?$" -gUnknown_81B3215:: @ 81B3215 +Help_Text_WhatsABattle:: @ 81B3215 .string "What's a battle?$" -gUnknown_81B3226:: @ 81B3226 +Help_Text_HowDoIPrepareForBattle:: @ 81B3226 .string "How do I prepare for battle?$" -gUnknown_81B3243:: @ 81B3243 +Help_Text_WhatIsAMonsVitality:: @ 81B3243 .string "What is a POKéMON's vitality?$" -gUnknown_81B3261:: @ 81B3261 +Help_Text_MyMonsAreHurt:: @ 81B3261 .string "My POKéMON are hurt!$" -gUnknown_81B3276:: @ 81B3276 +Help_Text_WhatIsStatusProblem:: @ 81B3276 .string "What is a status problem?$" -gUnknown_81B3290:: @ 81B3290 +Help_Text_WhatHappensIfAllMyMonsFaint:: @ 81B3290 .string "What happens if all my POKéMON faint?$" -gUnknown_81B32B6:: @ 81B32B6 +Help_Text_CantCatchMons:: @ 81B32B6 .string "I can't catch POKéMON!$" -gUnknown_81B32CD:: @ 81B32CD +Help_Text_RanOutOfPotions:: @ 81B32CD .string "I ran out of POTIONS.$" -gUnknown_81B32E3:: @ 81B32E3 +Help_Text_CanIBuyPokeBalls:: @ 81B32E3 .string "Can I buy POKé BALLS?$" -gUnknown_81B32F9:: @ 81B32F9 +Help_Text_WhatsATrainer:: @ 81B32F9 .string "What's a TRAINER?$" -gUnknown_81B330B:: @ 81B330B +Help_Text_HowDoIWinAgainstTrainer:: @ 81B330B .string "How do I win against a TRAINER?$" -gUnknown_81B332B:: @ 81B332B +Help_Text_WhereDoMonsAppear:: @ 81B332B .string "Where do POKéMON appear?$" -gUnknown_81B3344:: @ 81B3344 +Help_Text_WhatAreMoves:: @ 81B3344 .string "What are POKéMON moves?$" -gUnknown_81B335C:: @ 81B335C +Help_Text_WhatAreHiddenMoves:: @ 81B335C .string "What are HIDDEN moves?$" -gUnknown_81B3373:: @ 81B3373 +Help_Text_WhatMovesShouldIUse:: @ 81B3373 .string "What moves should I use?$" -gUnknown_81B338C:: @ 81B338C +Help_Text_WantToAddMoreMoves:: @ 81B338C .string "I want to add more moves.$" -gUnknown_81B33A6:: @ 81B33A6 +Help_Text_WantToMakeMonStronger:: @ 81B33A6 .string "I want to make my POKéMON stronger.$" -gUnknown_81B33CA:: @ 81B33CA +Help_Text_FoeMonsTooStrong:: @ 81B33CA .string "The foe POKéMON are too strong!$" -gUnknown_81B33EA:: @ 81B33EA +Help_Text_WhatDoIDoInCave:: @ 81B33EA .string "What do I do in a cave?$" -gUnknown_81B3402:: @ 81B3402 +Help_Text_NothingIWantToKnow:: @ 81B3402 .string "There's nothing that I want to know!$" -gUnknown_81B3427:: @ 81B3427 +Help_Text_WhatsPokemonCenter:: @ 81B3427 .string "What's a POKéMON CENTER?$" -gUnknown_81B3440:: @ 81B3440 +Help_Text_WhatsPokemonMart:: @ 81B3440 .string "What's a POKéMON MART?$" -gUnknown_81B3457:: @ 81B3457 +Help_Text_WantToEndGame:: @ 81B3457 .string "I want to end the game.$" -gUnknown_81B346F:: @ 81B346F +Help_Text_WhatsAMon:: @ 81B346F .string "What's a POKéMON?$" -gUnknown_81B3481:: @ 81B3481 +Help_Text_WhatIsThatPersonLike:: @ 81B3481 .string "What is that person like?$" -gUnknown_81B349B:: @ 81B349B +Help_Text_WhatDoesHiddenMoveDo:: @ 81B349B .string "What does a HIDDEN move do?$" -gUnknown_81B34B7:: @ 81B34B7 +Help_Text_WhatDoIDoInSafari:: @ 81B34B7 .string "What do I do in a SAFARI GAME?$" -gUnknown_81B34D6:: @ 81B34D6 +Help_Text_WhatAreSafariRules:: @ 81B34D6 .string "What are the SAFARI GAME rules?$" -gUnknown_81B34F6:: @ 81B34F6 +Help_Text_WantToEndSafari:: @ 81B34F6 .string "I want to end this SAFARI GAME!$" -gUnknown_81B3516:: @ 81B3516 +Help_Text_WhatIsAGym:: @ 81B3516 .string "What is a GYM?$" -gUnknown_81B3525:: @ 81B3525 +Help_Text_AnswerPlayingForFirstTime:: @ 81B3525 .string "You become the main character,\n" .string "exploring the world of POKéMON.\l" .string "By talking to people and solving\l" @@ -195,7 +192,7 @@ gUnknown_81B3525:: @ 81B3525 .string "Strive for the goal together with your\l" .string "wonderful POKéMON.$" -gUnknown_81B35E6:: @ 81B35E6 +Help_Text_AnswerWhatShouldIBeDoing:: @ 81B35E6 .string "When you come across another person,\n" .string "go up to them and press the A Button.\l" .string "That will get them to talk and interact\l" @@ -204,7 +201,7 @@ gUnknown_81B35E6:: @ 81B35E6 .string "the same way. Talk to people and check\l" .string "things often to obtain information.$" -gUnknown_81B36EB:: @ 81B36EB +Help_Text_AnswerCantGetOutOfRoom:: @ 81B36EB .string "On the stairs or the exits of a\n" .string "building is a red mat. Move your\l" .string "character to stand on top of the\l" @@ -212,7 +209,7 @@ gUnknown_81B36EB:: @ 81B36EB .string "toward the stairs or the exit to\l" .string "advance.$" -gUnknown_81B379A:: @ 81B379A +Help_Text_AnswerCantFindPersonIWant:: @ 81B379A .string "This isn't something you should worry\n" .string "about too much.\l" .string "Talk to other people, check signs,\l" @@ -220,11 +217,11 @@ gUnknown_81B379A:: @ 81B379A .string "Sometimes, you may need to just move\l" .string "to a new town or place.$" -gUnknown_81B3849:: @ 81B3849 +Help_Text_AnswerTalkedToEveryoneNowWhat:: @ 81B3849 .string "Try moving on to a new road, town, or\n" .string "place.$" -gUnknown_81B3876:: @ 81B3876 +Help_Text_AnswerSomeoneBlockingMyWay:: @ 81B3876 .string "There could be something in the town\n" .string "or inside a building that is the cause.\l" .string "Try talking to the people in the area\l" @@ -233,7 +230,7 @@ gUnknown_81B3876:: @ 81B3876 .string "Afterwards, try talking to the person\l" .string "blocking your way again.$" -gUnknown_81B3972:: @ 81B3972 +Help_Text_AnswerICantGoOn:: @ 81B3972 .string "Try talking to people by going up to\n" .string "them and pressing the A Button.\l" .string "Also, try checking things like odd trees\l" @@ -241,13 +238,13 @@ gUnknown_81B3972:: @ 81B3972 .string "Press the {PLUS} Control Pad and try going\l" .string "to places that look impassable, too.$" -gUnknown_81B3A51:: @ 81B3A51 +Help_Text_AnswerOutOfThingsToDo:: @ 81B3A51 .string "Try going to places where you \n" .string "haven't visited yet.\l" .string "Also, check everything that looks\l" .string "suspicious by pressing the A Button.$" -gUnknown_81B3ACC:: @ 81B3ACC +Help_Text_AnswerWhatHappenedToItemIGot:: @ 81B3ACC .string "Any item that you are given by another\n" .string "character goes in your BAG.\l" .string "The item is automatically sorted and\l" @@ -256,7 +253,7 @@ gUnknown_81B3ACC:: @ 81B3ACC .string "please refer to the HELP System's\l" .string "“How do I do this?” heading.$" -gUnknown_81B3BB6:: @ 81B3BB6 +Help_Text_AnswerWhatAreMyAdventureBasics:: @ 81B3BB6 .string "If POKéMON are hurt in battle,\n" .string "take them to a POKéMON CENTER and\l" .string "have them healed by the staff.\l" @@ -265,13 +262,13 @@ gUnknown_81B3BB6:: @ 81B3BB6 .string "Stock up on healing items at\l" .string "POKéMON MARTS before traveling far.$" -gUnknown_81B3C99:: @ 81B3C99 +Help_Text_AnswerHowAreRoadsForestsDifferent:: @ 81B3C99 .string "Forests are basically the same as\n" .string "roads but they can be like mazes.\l" .string "All forests have a way out, so don't\l" .string "give up if you get lost.$" -gUnknown_81B3D1B:: @ 81B3D1B +Help_Text_AnswerHowAreCavesDifferent:: @ 81B3D1B .string "Caves are dark and dangerous. Wild\n" .string "POKéMON can appear anywhere in them.\l" .string "If there is an emergency, rush to a\l" @@ -279,7 +276,7 @@ gUnknown_81B3D1B:: @ 81B3D1B .string "New towns await discovery beyond some\l" .string "caves, so don't give up.$" -gUnknown_81B3DE3:: @ 81B3DE3 +Help_Text_AnswerHowDoIProgress:: @ 81B3DE3 .string "The object of the game is to train\n" .string "your POKéMON and move forward.\l" .string "You must collect info and solve\l" @@ -288,7 +285,7 @@ gUnknown_81B3DE3:: @ 81B3DE3 .string "What would get that impeding\l" .string "person out of the way?$" -gUnknown_81B3EBC:: @ 81B3EBC +Help_Text_AnswerWhenCanIUseItem:: @ 81B3EBC .string "There are several kinds of items.\n" .string "Some can be used only on the field.\l" .string "Some are only for use during battle.\l" @@ -296,7 +293,7 @@ gUnknown_81B3EBC:: @ 81B3EBC .string "Try using an item - if it can't be used,\l" .string "you will be alerted.$" -gUnknown_81B3F7F:: @ 81B3F7F +Help_Text_AnswerWhatsABattle:: @ 81B3F7F .string "In a battle, POKéMON try to reduce\n" .string "one another's vitality, expressed as\l" .string "HP. If a POKéMON's HP falls to zero,\l" @@ -305,14 +302,14 @@ gUnknown_81B3F7F:: @ 81B3F7F .string "earn EXP. Points, which help them\l" .string "level up (grow stronger).$" -gUnknown_81B406C:: @ 81B406C +Help_Text_AnswerHowDoIPrepareForBattle:: @ 81B406C .string "First, fully heal the POKéMON in your\n" .string "party (the POKéMON with you) at any\l" .string "POKéMON CENTER.\l" .string "You should also buy healing items for\l" .string "emergencies at a POKéMON MART.$" -gUnknown_81B410B:: @ 81B410B +Help_Text_AnswerWhatIsAMonsVitality:: @ 81B410B .string "A POKéMON's vitality is expressed in HP.\n" .string "If a POKéMON is hurt in battle, HP is\l" .string "subtracted. If its HP drops to zero,\l" @@ -320,7 +317,7 @@ gUnknown_81B410B:: @ 81B410B .string "Heal hurt or fainted POKéMON at a\l" .string "POKéMON CENTER or by using items.$" -gUnknown_81B41D7:: @ 81B41D7 +Help_Text_AnswerMyMonsAreHurt:: @ 81B41D7 .string "A POKéMON CENTER is like an inn for\n" .string "POKéMON. It will fully heal POKéMON of\l" .string "any status problems and fully restore\l" @@ -328,7 +325,7 @@ gUnknown_81B41D7:: @ 81B41D7 .string "This service is free, so get in the\l" .string "habit of healing your POKéMON often.$" -gUnknown_81B42B3:: @ 81B42B3 +Help_Text_AnswerWhatIsStatusProblem:: @ 81B42B3 .string "A status problem refers to an ailment\n" .string "that is inflicted on a POKéMON by its\l" .string "foe's attack. These include burns,\l" @@ -337,7 +334,7 @@ gUnknown_81B42B3:: @ 81B42B3 .string "visiting a POKéMON CENTER or using\l" .string "the appropriate item.$" -gUnknown_81B439D:: @ 81B439D +Help_Text_AnswerWhatHappensIfAllMyMonsFaint:: @ 81B439D .string "If all the POKéMON in your party\n" .string "(all the POKéMON with you) faint, you\l" .string "lose some MONEY, and you are\l" @@ -346,7 +343,7 @@ gUnknown_81B439D:: @ 81B439D .string "POKéMON CENTERS often. Also, get\l" .string "in the habit of saving often.$" -gUnknown_81B4483:: @ 81B4483 +Help_Text_AnswerCantCatchMons:: @ 81B4483 .string "If a wild POKéMON escapes from a POKé\n" .string "BALL, it's obviously still feisty.\l" .string "Try reducing its HP some more, and\l" @@ -355,7 +352,7 @@ gUnknown_81B4483:: @ 81B4483 .string "If the POKé BALL rocks for a while,\l" .string "the quarry is close to being caught!$" -gUnknown_81B457C:: @ 81B457C +Help_Text_AnswerRanOutOfPotions:: @ 81B457C .string "There are shops, known as POKéMON\n" .string "MARTS, that sell items.\l" .string "You will not find POKéMON MARTS on\l" @@ -363,7 +360,7 @@ gUnknown_81B457C:: @ 81B457C .string "Stock up on needed items while you are\l" .string "visiting a town with a POKéMON MART.$" -gUnknown_81B4645:: @ 81B4645 +Help_Text_AnswerCanIBuyPokeBalls:: @ 81B4645 .string "You may buy POKé BALLS at any\n" .string "POKéMON MART in any town.\l" .string "You will not find POKéMON MARTS on\l" @@ -371,7 +368,7 @@ gUnknown_81B4645:: @ 81B4645 .string "Stock up on POKé BALLS while you are\l" .string "visiting a town with a POKéMON MART.$" -gUnknown_81B470A:: @ 81B470A +Help_Text_AnswerWhatsATrainer:: @ 81B470A .string "A TRAINER is a person who raises\n" .string "POKéMON through battling.\l" .string "TRAINERS will challenge you \l" @@ -380,7 +377,7 @@ gUnknown_81B470A:: @ 81B470A .string "If your eyes meet, you have to accept\l" .string "their challenge. So be careful!$" -gUnknown_81B47F0:: @ 81B47F0 +Help_Text_AnswerHowDoIWinAgainstTrainer:: @ 81B47F0 .string "To beat a TRAINER in battle, use\n" .string "POKéMON that have type advantages\l" .string "over the foe's POKéMON. You may also\l" @@ -389,14 +386,14 @@ gUnknown_81B47F0:: @ 81B47F0 .string "foe's POKéMON is another obvious\l" .string "tactic.$" -gUnknown_81B48C6:: @ 81B48C6 +Help_Text_AnswerWhereDoMonsAppear:: @ 81B48C6 .string "Wild POKéMON will appear in tall grass,\n" .string "on roads, and in forests. They will\l" .string "appear anywhere in dark caves.\l" .string "There are no wild POKéMON or TRAINERS\l" .string "in towns, so they are safe places.$" -gUnknown_81B497A:: @ 81B497A +Help_Text_AnswerWhatAreMoves:: @ 81B497A .string "POKéMON may learn up to four different\n" .string "techniques, or moves. There is a great\l" .string "variety of moves including attacks and\l" @@ -405,7 +402,7 @@ gUnknown_81B497A:: @ 81B497A .string "for each POKéMON. Some moves\l" .string "can be learned from machines.$" -gUnknown_81B4A72:: @ 81B4A72 +Help_Text_AnswerWhatAreHiddenMoves:: @ 81B4A72 .string "HIDDEN moves are those that are\n" .string "especially important for your\l" .string "adventure. To use such a move outside\l" @@ -414,7 +411,7 @@ gUnknown_81B4A72:: @ 81B4A72 .string "move use it. A fainted POKéMON may use\l" .string "a HIDDEN move outside of battle.$" -gUnknown_81B4B65:: @ 81B4B65 +Help_Text_AnswerWhatMovesShouldIUse:: @ 81B4B65 .string "Select “FIGHT,” and the MENU of moves\n" .string "will appear. Consider the type\l" .string "matchups, and use the most effective\l" @@ -423,7 +420,7 @@ gUnknown_81B4B65:: @ 81B4B65 .string "picking a POKéMON, opening “SUMMARY,”\l" .string "then opening “POKéMON SKILLS.”$" -gUnknown_81B4C54:: @ 81B4C54 +Help_Text_AnswerWantToAddMoreMoves:: @ 81B4C54 .string "The most a POKéMON can learn is four\n" .string "moves. They are learned as the\l" .string "POKéMON levels up. It can also be\l" @@ -431,7 +428,7 @@ gUnknown_81B4C54:: @ 81B4C54 .string "Machine) or HM (Hidden Machine).\l" .string "There are also people who teach moves.$" -gUnknown_81B4D26:: @ 81B4D26 +Help_Text_AnswerWantToMakeMonStronger:: @ 81B4D26 .string "The key to making your POKéMON\n" .string "strong is to battle and win often.\l" .string "The EXP. (Experience) Points earned\l" @@ -440,7 +437,7 @@ gUnknown_81B4D26:: @ 81B4D26 .string "them. Battle wild POKéMON often to\l" .string "level up your party.$" -gUnknown_81B4E0B:: @ 81B4E0B +Help_Text_AnswerFoeMonsTooStrong:: @ 81B4E0B .string "If your foes are too strong, try\n" .string "leveling up your POKéMON some more.\l" .string "Go back the way you came and battle\l" @@ -448,7 +445,7 @@ gUnknown_81B4E0B:: @ 81B4E0B .string "You may also battle TRAINERS whom you\l" .string "have not battled before.$" -gUnknown_81B4ED8:: @ 81B4ED8 +Help_Text_AnswerWhatDoIDoInCave:: @ 81B4ED8 .string "Unlike roads and forests, wild POKéMON\n" .string "can appear anywhere in caves.\l" .string "If your POKéMON are hurt in a cave,\l" @@ -456,11 +453,11 @@ gUnknown_81B4ED8:: @ 81B4ED8 .string "to heal them right away. It is very\l" .string "dangerous to force your luck in caves.$" -gUnknown_81B4FB2:: @ 81B4FB2 +Help_Text_AnswerNothingIWantToKnow:: @ 81B4FB2 .string "Trust your own knowledge and power.\n" .string "Believe in yourself and find your way!$" -gUnknown_81B4FFD:: @ 81B4FFD +Help_Text_AnswerWhatsPokemonCenter:: @ 81B4FFD .string "A POKéMON CENTER is identified by its\n" .string "red roof and a “P.C” sign. Every\l" .string "POKéMON CENTER offers such services as\l" @@ -469,14 +466,14 @@ gUnknown_81B4FFD:: @ 81B4FFD .string "On the upper floor are facilities for\l" .string "linking with friends and others.$" -gUnknown_81B50FF:: @ 81B50FF +Help_Text_AnswerWhatsPokemonMart:: @ 81B50FF .string "A POKéMON MART is identified by its\n" .string "blue roof and a “MART” sign.\l" .string "Items can be bought and sold at any\l" .string "POKéMON MART. Some MARTS carry items\l" .string "that are available only in their towns.$" -gUnknown_81B51B1:: @ 81B51B1 +Help_Text_AnswerWantToEndGame:: @ 81B51B1 .string "You can safely end your game by\n" .string "selecting “SAVE” on the MENU.\l" .string "Once you have saved, the game can be\l" @@ -484,19 +481,19 @@ gUnknown_81B51B1:: @ 81B51B1 .string "turned back on, you can resume from\l" .string "where you last saved.$" -gUnknown_81B5272:: @ 81B5272 +Help_Text_AnswerWhatsAMon:: @ 81B5272 .string "POKéMON are living beings about which\n" .string "many mysteries still remain. You may\l" .string "see them in grass, the sea, and caves.\l" .string "They appear to obey the wishes of the\l" .string "TRAINERS that caught them.$" -gUnknown_81B5325:: @ 81B5325 +Help_Text_AnswerWhatIsThatPersonLike:: @ 81B5325 .string "Use the FAME CHECKER among the\n" .string "KEY ITEMS in your BAG.\l" .string "It may give you a hint, so try it out.$" -gUnknown_81B5382:: @ 81B5382 +Help_Text_AnswerWhatDoesHiddenMoveDo:: @ 81B5382 .string "A HIDDEN move is taught to a POKéMON\n" .string "using an HM (Hidden Machine).\l" .string "A HIDDEN move is important for helping\l" @@ -505,24 +502,24 @@ gUnknown_81B5382:: @ 81B5382 .string "cuts down small trees. There is one\l" .string "for traveling on water, and so on.$" -gUnknown_81B547C:: @ 81B547C +Help_Text_AnswerWhatDoIDoInSafari:: @ 81B547C .string "Try to catch wild POKéMON by throwing\n" .string "the special SAFARI BALLS.\l" .string "You may keep any item you find, too.$" -gUnknown_81B54E1:: @ 81B54E1 +Help_Text_AnswerWhatAreSafariRules:: @ 81B54E1 .string "Your SAFARI GAME ends once you have\n" .string "traveled a certain distance or thrown\l" .string "all your SAFARI BALLS.\l" .string "Open the MENU to check the remaining\l" .string "number of steps and SAFARI BALLS.$" -gUnknown_81B5589:: @ 81B5589 +Help_Text_AnswerWantToEndSafari:: @ 81B5589 .string "If you would like to cut your SAFARI\n" .string "GAME short, open the MENU and select\l" .string "“RETIRE” at the top of the list.$" -gUnknown_81B55F4:: @ 81B55F4 +Help_Text_AnswerWhatIsAGym:: @ 81B55F4 .string "POKéMON GYMS are operated by the\n" .string "POKéMON LEAGUE and are training\l" .string "facilities for TRAINERS. They are all\l" @@ -531,151 +528,151 @@ gUnknown_81B55F4:: @ 81B55F4 .string "is a very skilled TRAINER. Beat the\l" .string "LEADER to collect a BADGE.$" -gUnknown_81B56E3:: @ 81B56E3 +Help_Text_UsingPokedex:: @ 81B56E3 .string " Using “POKéDEX”$" -gUnknown_81B56F4:: @ 81B56F4 +Help_Text_UsingPokemon:: @ 81B56F4 .string " Using “POKéMON”$" -gUnknown_81B5705:: @ 81B5705 +Help_Text_UsingSummary:: @ 81B5705 .string " Using “SUMMARY”$" -gUnknown_81B5717:: @ 81B5717 +Help_Text_UsingSwitch:: @ 81B5717 .string " Using “SWITCH”$" -gUnknown_81B5728:: @ 81B5728 +Help_Text_UsingItem:: @ 81B5728 .string " Using “ITEM”$" -gUnknown_81B5737:: @ 81B5737 +Help_Text_UsingBag:: @ 81B5737 .string " Using “BAG”$" -gUnknown_81B5744:: @ 81B5744 +Help_Text_UsingAnItem:: @ 81B5744 .string " Using an item$" -gUnknown_81B5754:: @ 81B5754 +Help_Text_UsingKeyItem:: @ 81B5754 .string " Using a key item$" -gUnknown_81B5767:: @ 81B5767 +Help_Text_UsingPokeBall:: @ 81B5767 .string " Using a POKé BALL$" -gUnknown_81B577B:: @ 81B577B +Help_Text_UsingPlayer:: @ 81B577B .string " Using “{PLAYER}”$" -gUnknown_81B5787:: @ 81B5787 +Help_Text_UsingSave:: @ 81B5787 .string " Using “SAVE”$" -gUnknown_81B5795:: @ 81B5795 +Help_Text_UsingOption:: @ 81B5795 .string " Using “OPTION”$" -gUnknown_81B57A5:: @ 81B57A5 +Help_Text_UsingPotion:: @ 81B57A5 .string " Using a POTION$" -gUnknown_81B57B8:: @ 81B57B8 +Help_Text_UsingTownMap:: @ 81B57B8 .string " Using the TOWN MAP$" -gUnknown_81B57CF:: @ 81B57CF +Help_Text_UsingTM:: @ 81B57CF .string " Using a TM$" -gUnknown_81B57DE:: @ 81B57DE +Help_Text_UsingHM:: @ 81B57DE .string " Using an HM$" -gUnknown_81B57EE:: @ 81B57EE +Help_Text_UsingMoveOutsideOfBattle:: @ 81B57EE .string "Using a move outside of battle$" -gUnknown_81B580D:: @ 81B580D +Help_Text_RidingBicycle:: @ 81B580D .string " Riding the BICYCLE$" -gUnknown_81B5824:: @ 81B5824 +Help_Text_EnteringName:: @ 81B5824 .string "Entering a name$" -gUnknown_81B5834:: @ 81B5834 +Help_Text_UsingPC:: @ 81B5834 .string "Using a PC$" -gUnknown_81B583F:: @ 81B583F +Help_Text_UsingBillsPC:: @ 81B583F .string " Using “{STR_VAR_1}'S PC”$" -gUnknown_81B5850:: @ 81B5850 +Help_Text_UsingWithdraw:: @ 81B5850 .string " Using “WITHDRAW”$" -gUnknown_81B5863:: @ 81B5863 +Help_Text_UsingDeposit:: @ 81B5863 .string " Using “DEPOSIT”$" -gUnknown_81B5875:: @ 81B5875 +Help_Text_UsingMove:: @ 81B5875 .string " Using “MOVE”$" -gUnknown_81B5884:: @ 81B5884 +Help_Text_MovingItems:: @ 81B5884 .string " Moving items$" -gUnknown_81B5893:: @ 81B5893 +Help_Text_UsingPlayersPC:: @ 81B5893 .string " Using “{PLAYER}'s PC”$" -gUnknown_81B58A4:: @ 81B58A4 +Help_Text_UsingWithdrawItem:: @ 81B58A4 .string " Using “WITHDRAW ITEM”$" -gUnknown_81B58BC:: @ 81B58BC +Help_Text_UsingDepositItem:: @ 81B58BC .string " Using “DEPOSIT ITEM”$" -gUnknown_81B58D3:: @ 81B58D3 +Help_Text_UsingMailbox:: @ 81B58D3 .string " Using “MAILBOX”$" -gUnknown_81B58E5:: @ 81B58E5 +Help_Text_UsingProfOaksPC:: @ 81B58E5 .string " Using “PROF. OAK'S PC”$" -gUnknown_81B58FD:: @ 81B58FD +Help_Text_OpeningMenu:: @ 81B58FD .string "Opening the MENU$" -gUnknown_81B590E:: @ 81B590E +Help_Text_UsingFight:: @ 81B590E .string " Using “FIGHT”$" -gUnknown_81B591D:: @ 81B591D +Help_Text_UsingPokemon2:: @ 81B591D .string " Using “POKéMON”$" -gUnknown_81B592E:: @ 81B592E +Help_Text_UsingShift:: @ 81B592E .string " Using “SHIFT”$" -gUnknown_81B593E:: @ 81B593E +Help_Text_UsingSummary2:: @ 81B593E .string " Using “SUMMARY”$" -gUnknown_81B5950:: @ 81B5950 +Help_Text_UsingBag2:: @ 81B5950 .string " Using “BAG”$" -gUnknown_81B595D:: @ 81B595D +Help_Text_ReadingPokedex:: @ 81B595D .string " Reading the “POKéDEX”$" -gUnknown_81B5974:: @ 81B5974 +Help_Text_UsingHomePC:: @ 81B5974 .string "Using the PC at home$" -gUnknown_81B5989:: @ 81B5989 +Help_Text_UsingItemStorage:: @ 81B5989 .string "Using the Item Storage System$" -gUnknown_81B59A7:: @ 81B59A7 +Help_Text_UsingWithdrawItem2:: @ 81B59A7 .string " Using “WITHDRAW ITEM”$" -gUnknown_81B59BF:: @ 81B59BF +Help_Text_UsingDepositItem2:: @ 81B59BF .string " Using “DEPOSIT ITEM”$" -gUnknown_81B59D6:: @ 81B59D6 +Help_Text_UsingMailbox2:: @ 81B59D6 .string "Using the MAILBOX$" -gUnknown_81B59E8:: @ 81B59E8 +Help_Text_UsingRun:: @ 81B59E8 .string " Using “RUN”$" -gUnknown_81B59F5:: @ 81B59F5 +Help_Text_RegisterKeyItem:: @ 81B59F5 .string " “REGISTER” a key item$" -gUnknown_81B5A0D:: @ 81B5A0D +Help_Text_UsingBall:: @ 81B5A0D .string " Using “BALL”$" -gUnknown_81B5A1B:: @ 81B5A1B +Help_Text_UsingBait:: @ 81B5A1B .string " Using “BAIT”$" -gUnknown_81B5A29:: @ 81B5A29 +Help_Text_UsingRock:: @ 81B5A29 .string " Using “ROCK”$" -gUnknown_81B5A37:: @ 81B5A37 +Help_Text_UsingHallOfFame:: @ 81B5A37 .string " Using “HALL OF FAME”$" -gUnknown_81B5A4D:: @ 81B5A4D +Help_Text_HowToUsePokedex:: @ 81B5A4D .string "{CIRCLE_1} Select “POKéDEX” on the MENU.\n" .string "{CIRCLE_2} Choose POKéMON using commands such\n" .string " as “POKéMON LIST,”\n" @@ -684,13 +681,13 @@ gUnknown_81B5A4D:: @ 81B5A4D .string "{CIRCLE_3} Select a POKéMON to obtain detailed\n" .string " information.$" -gUnknown_81B5B0C:: @ 81B5B0C +Help_Text_HowToUsePokemon:: @ 81B5B0C .string "{CIRCLE_1} Select “POKéMON” on the MENU.\n" .string "{CIRCLE_2} Choose a POKéMON in your party.\n" .string "{CIRCLE_3} Select “SUMMARY,” “SWITCH,”\n" .string " or “ITEM.”$" -gUnknown_81B5B7D:: @ 81B5B7D +Help_Text_HowToUseSummary:: @ 81B5B7D .string "{CIRCLE_1} Select “SUMMARY.”\n" .string "{CIRCLE_2} Press left or right on the {PLUS} Control\n" .string " Pad to check the information:\n" @@ -698,7 +695,7 @@ gUnknown_81B5B7D:: @ 81B5B7D .string " “POKéMON SKILLS”\n" .string " “KNOWN MOVES”$" -gUnknown_81B5C13:: @ 81B5C13 +Help_Text_HowToUseSwitch:: @ 81B5C13 .string "{CIRCLE_1} Choose the POKéMON you want to\n" .string " switch around.\n" .string "{CIRCLE_2} Select “SWITCH.”\n" @@ -707,7 +704,7 @@ gUnknown_81B5C13:: @ 81B5C13 .string "The POKéMON at the left of the screen\n" .string "will be the first one out in a battle.$" -gUnknown_81B5CDF:: @ 81B5CDF +Help_Text_HowToUseItem:: @ 81B5CDF .string "{CIRCLE_1} Select “ITEM.”\n" .string "{CIRCLE_2} Select whether you want to “GIVE”\n" .string " an item to the POKéMON to hold,\n" @@ -715,7 +712,7 @@ gUnknown_81B5CDF:: @ 81B5CDF .string "A POKéMON can hold no more than one\n" .string "item!$" -gUnknown_81B5D87:: @ 81B5D87 +Help_Text_HowToUseBag:: @ 81B5D87 .string "{CIRCLE_1} Select “BAG” on the MENU.\n" .string "{CIRCLE_2} Press left or right on the {PLUS} Control\n" .string " Pad to check the data headings:\n" @@ -724,7 +721,7 @@ gUnknown_81B5D87:: @ 81B5D87 .string " “POKé BALLS”\n" .string " Press up or down to select an item.$" -gUnknown_81B5E41:: @ 81B5E41 +Help_Text_HowToUseAnItem:: @ 81B5E41 .string "{CIRCLE_1} Select the “ITEMS” POCKET.\n" .string "{CIRCLE_2} Press up or down on the {PLUS} Control\n" .string " Pad to select an item.\n" @@ -733,14 +730,14 @@ gUnknown_81B5E41:: @ 81B5E41 .string "Some items may not be used depending\n" .string "on the place and/or situation.$" -gUnknown_81B5F10:: @ 81B5F10 +Help_Text_HowToUseKeyItem:: @ 81B5F10 .string "{CIRCLE_1} Select the “KEY ITEMS” POCKET.\n" .string "{CIRCLE_2} Press up or down on the {PLUS} Control\n" .string " Pad to select a key item.\n" .string "{CIRCLE_3} Select “USE” to use the selected\n" .string " key item.$" -gUnknown_81B5FA6:: @ 81B5FA6 +Help_Text_HowToUsePokeBall:: @ 81B5FA6 .string "{CIRCLE_1} While battling a wild POKéMON,\n" .string " select the BAG's “POKé BALLS”\n" .string " POCKET.\n" @@ -749,7 +746,7 @@ gUnknown_81B5FA6:: @ 81B5FA6 .string "{CIRCLE_3} Select “USE” to throw the selected\n" .string " POKé BALL.$" -gUnknown_81B606C:: @ 81B606C +Help_Text_HowToUsePlayer:: @ 81B606C .string "{CIRCLE_1} Select “{PLAYER}” on the MENU.\n" .string "{CIRCLE_2} Your TRAINER CARD is displayed face\n" .string " up with basic information. Press the\n" @@ -757,7 +754,7 @@ gUnknown_81B606C:: @ 81B606C .string "{CIRCLE_3} A variety of data can be found on\n" .string " the reverse side of the CARD.$" -gUnknown_81B6140:: @ 81B6140 +Help_Text_HowToUseSave:: @ 81B6140 .string "{CIRCLE_1} Select “SAVE” on the MENU.\n" .string "{CIRCLE_2} Select “YES” and your progress is\n" .string " recorded in the save file.\n" @@ -765,7 +762,7 @@ gUnknown_81B6140:: @ 81B6140 .string "off the game. Your game can be resumed\n" .string "from where you saved.$" -gUnknown_81B6203:: @ 81B6203 +Help_Text_HowToUseOption:: @ 81B6203 .string "{CIRCLE_1} Select “OPTION” on the MENU.\n" .string "{CIRCLE_2} Press up or down on the {PLUS} Control\n" .string " Pad to select an optional item, then\n" @@ -774,7 +771,7 @@ gUnknown_81B6203:: @ 81B6203 .string "{CIRCLE_3} Select “CANCEL” or press the\n" .string " B Button after making changes.$" -gUnknown_81B62E4:: @ 81B62E4 +Help_Text_HowToUsePotion:: @ 81B62E4 .string "{CIRCLE_1} Open the MENU.\n" .string "{CIRCLE_2} Press up or down on the {PLUS} Control\n" .string " Pad and select “BAG.”\n" @@ -783,7 +780,7 @@ gUnknown_81B62E4:: @ 81B62E4 .string "{CIRCLE_4} Select “USE.”\n" .string "{CIRCLE_5} Select the POKéMON to be healed.$" -gUnknown_81B6397:: @ 81B6397 +Help_Text_HowToUseTownMap:: @ 81B6397 .string "{CIRCLE_1} Open the MENU.\n" .string "{CIRCLE_2} Press up or down on the {PLUS} Control\n" .string " Pad and select “BAG.”\n" @@ -792,7 +789,7 @@ gUnknown_81B6397:: @ 81B6397 .string " up or down to select “TOWN MAP.” \n" .string "{CIRCLE_4} Select “USE” to open the TOWN MAP.$" -gUnknown_81B6478:: @ 81B6478 +Help_Text_HowToUseTM:: @ 81B6478 .string "{CIRCLE_1} Open the MENU.\n" .string "{CIRCLE_2} Open the “KEY ITEMS” POCKET in the\n" .string " “BAG.”\n" @@ -801,7 +798,7 @@ gUnknown_81B6478:: @ 81B6478 .string "{CIRCLE_5} Select a POKéMON that can learn the\n" .string " move in the TM.$" -gUnknown_81B6525:: @ 81B6525 +Help_Text_HowToUseHM:: @ 81B6525 .string "{CIRCLE_1} Open the MENU.\n" .string "{CIRCLE_2} Open the “KEY ITEMS” POCKET in the\n" .string " “BAG.”\n" @@ -810,7 +807,7 @@ gUnknown_81B6525:: @ 81B6525 .string "{CIRCLE_5} Select a POKéMON that can learn it.\n" .string "HMs are hard to remove, so be careful!$" -gUnknown_81B65E7:: @ 81B65E7 +Help_Text_HowToUseMoveOutsideOfBattle:: @ 81B65E7 .string "{CIRCLE_1} Open the MENU.\n" .string "{CIRCLE_2} Select “POKéMON.”\n" .string "{CIRCLE_3} Select a POKéMON that knows an\n" @@ -819,7 +816,7 @@ gUnknown_81B65E7:: @ 81B65E7 .string " use the desired move to destroy an\n" .string " obstacle, fly, surf, etc.$" -gUnknown_81B66BA:: @ 81B66BA +Help_Text_HowToRideBicycle:: @ 81B66BA .string "{CIRCLE_1} Open the MENU. Open the\n" .string " “KEY ITEMS” POCKET in the “BAG”\n" .string " and select the “BICYCLE.”\n" @@ -828,7 +825,7 @@ gUnknown_81B66BA:: @ 81B66BA .string " “REGISTER” it for instant use by\n" .string " pressing SELECT.$" -gUnknown_81B678E:: @ 81B678E +Help_Text_HowToEnterName:: @ 81B678E .string "{CIRCLE_1} Move the cursor to the letter you\n" .string " want with the {PLUS} Control Pad, then\n" .string " press the A Button to enter it.\n" @@ -837,11 +834,11 @@ gUnknown_81B678E:: @ 81B678E .string " uppercase and lowercase letters.\n" .string "{CIRCLE_4} Press the A Button on “OK.”$" -gUnknown_81B6883:: @ 81B6883 +Help_Text_HowToUsePC:: @ 81B6883 .string "{CIRCLE_1} Go to any POKéMON CENTER, go up\n" .string " to the PC, then press the A Button.$" -gUnknown_81B68CD:: @ 81B68CD +Help_Text_HowToUseBillsPC:: @ 81B68CD .string "{CIRCLE_1} Select “{STR_VAR_1}'S PC” on the PC.\n" .string "{CIRCLE_2} Select from one of the top three\n" .string " MENU items to access the POKéMON\n" @@ -850,7 +847,7 @@ gUnknown_81B68CD:: @ 81B68CD .string "six in your party, the POKéMON is sent\n" .string "automatically to a BOX in the System!$" -gUnknown_81B69B9:: @ 81B69B9 +Help_Text_HowToUseWithdraw:: @ 81B69B9 .string "{CIRCLE_1} Select a POKéMON in the open BOX\n" .string " with the {PLUS} Control Pad.\n" .string "{CIRCLE_2} Select “WITHDRAW” to remove the\n" @@ -859,7 +856,7 @@ gUnknown_81B69B9:: @ 81B69B9 .string "You may not withdraw a POKéMON if you\n" .string "already have six POKéMON with you!$" -gUnknown_81B6A9A:: @ 81B6A9A +Help_Text_HowToUseDeposit:: @ 81B6A9A .string "{CIRCLE_1} Select a POKéMON in your party with\n" .string " the {PLUS} Control Pad.\n" .string "{CIRCLE_2} Select “DEPOSIT.”\n" @@ -868,7 +865,7 @@ gUnknown_81B6A9A:: @ 81B6A9A .string "If you have only one POKéMON with you,\n" .string "it may not be stored!$" -gUnknown_81B6B6E:: @ 81B6B6E +Help_Text_HowToUseMove:: @ 81B6B6E .string "{CIRCLE_1} Select a POKéMON in the open BOX.\n" .string "{CIRCLE_2} Pick up the POKéMON by selecting\n" .string " “MOVE” and move it anywhere with\n" @@ -877,7 +874,7 @@ gUnknown_81B6B6E:: @ 81B6B6E .string " and press left or right to move it\n" .string " to another BOX.$" -gUnknown_81B6C4F:: @ 81B6C4F +Help_Text_HowToMoveItems:: @ 81B6C4F .string "{CIRCLE_1} Faintly shown POKéMON can be made\n" .string " to hold an item by selecting it and\n" .string " pressing the A Button.\n" @@ -886,7 +883,7 @@ gUnknown_81B6C4F:: @ 81B6C4F .string " another POKéMON, or return the item\n" .string " to the BAG with the A Button.$" -gUnknown_81B6D4A:: @ 81B6D4A +Help_Text_HowToUsePlayersPC:: @ 81B6D4A .string "{CIRCLE_1} Select “{PLAYER}'s PC” on the PC.\n" .string "{CIRCLE_2} Select either “ITEM STORAGE” or\n" .string " “MAILBOX.”\n" @@ -894,7 +891,7 @@ gUnknown_81B6D4A:: @ 81B6D4A .string "if your BAG is full. You may also\n" .string "withdraw items stored in your PC.$" -gUnknown_81B6E02:: @ 81B6E02 +Help_Text_HowToUseWithdrawItem:: @ 81B6E02 .string "{CIRCLE_1} Select “WITHDRAW ITEM.”\n" .string "{CIRCLE_2} Select the item to be withdrawn.\n" .string "{CIRCLE_3} The item can be withdrawn and\n" @@ -902,7 +899,7 @@ gUnknown_81B6E02:: @ 81B6E02 .string " It may also be directly given to a\n" .string " POKéMON to hold.$" -gUnknown_81B6EC1:: @ 81B6EC1 +Help_Text_HowToUseDepositItem:: @ 81B6EC1 .string "{CIRCLE_1} Select “DEPOSIT ITEM.”\n" .string "{CIRCLE_2} Select the item in the BAG to be\n" .string " deposited using the {PLUS} Control Pad.\n" @@ -911,7 +908,7 @@ gUnknown_81B6EC1:: @ 81B6EC1 .string " quantity with the {PLUS} Control Pad,\n" .string " then press the A Button.$" -gUnknown_81B6FA8:: @ 81B6FA8 +Help_Text_HowToUseMailbox:: @ 81B6FA8 .string "When MAIL is taken from a POKéMON,\n" .string "it is moved to the MAILBOX. If it has\n" .string "no MAIL, the MAILBOX can't be used.\n" @@ -919,14 +916,14 @@ gUnknown_81B6FA8:: @ 81B6FA8 .string "{CIRCLE_2} Select “MAILBOX” to read MAIL or\n" .string " make a POKéMON hold MAIL.$" -gUnknown_81B7075:: @ 81B7075 +Help_Text_HowToUseProfOaksPC:: @ 81B7075 .string "{CIRCLE_1} Select “PROF. OAK'S PC” on the PC.\n" .string "{CIRCLE_2} PROF. OAK will evaluate your\n" .string " POKéDEX.\n" .string "His evaluations should give you hints\n" .string "for catching more POKéMON!$" -gUnknown_81B7108:: @ 81B7108 +Help_Text_HowToOpenMenu:: @ 81B7108 .string "{CIRCLE_1} Press START.\n" .string "{CIRCLE_2} The MENU will open on the right.\n" .string "{CIRCLE_3} Depending on the situation, the MENU\n" @@ -935,12 +932,12 @@ gUnknown_81B7108:: @ 81B7108 .string "situations such as when talking, doing\n" .string "something, battling, etc.$" -gUnknown_81B71EA:: @ 81B71EA +Help_Text_HowToUseFight:: @ 81B71EA .string "{CIRCLE_1} Select “FIGHT.”\n" .string "{CIRCLE_2} Select one of the moves shown,\n" .string "and that move will be used!$" -gUnknown_81B723B:: @ 81B723B +Help_Text_HowToUsePokemon2:: @ 81B723B .string "{CIRCLE_1} Select “POKéMON.”\n" .string "{CIRCLE_2} Select the POKéMON in your party\n" .string " that you want to use.\n" @@ -949,7 +946,7 @@ gUnknown_81B723B:: @ 81B723B .string " selecting “SHIFT.” Check POKéMON\n" .string " data by selecting “SUMMARY.”$" -gUnknown_81B7319:: @ 81B7319 +Help_Text_HowToUseShift:: @ 81B7319 .string "This command switches the POKéMON in\n" .string "battle with another one in your party.\n" .string "{CIRCLE_1} Select the POKéMON to be sent out.\n" @@ -957,7 +954,7 @@ gUnknown_81B7319:: @ 81B7319 .string "{CIRCLE_3} The selected POKéMON will switch\n" .string " places with the POKéMON in battle!$" -gUnknown_81B73E8:: @ 81B73E8 +Help_Text_HowToUseSummary2:: @ 81B73E8 .string "{CIRCLE_1} Select “SUMMARY.”\n" .string "{CIRCLE_2} Press left or right on the {PLUS} Control\n" .string " Pad to check the information:\n" @@ -965,7 +962,7 @@ gUnknown_81B73E8:: @ 81B73E8 .string " “POKéMON SKILLS”\n" .string " “KNOWN MOVES”$" -gUnknown_81B747E:: @ 81B747E +Help_Text_HowToUseBag2:: @ 81B747E .string "{CIRCLE_1} Select “BAG.”\n" .string "{CIRCLE_2} Press left or right on the {PLUS} Control\n" .string " Pad to check the data headings:\n" @@ -974,7 +971,7 @@ gUnknown_81B747E:: @ 81B747E .string " “POKé BALLS”\n" .string " Press up or down to select an item.$" -gUnknown_81B752C:: @ 81B752C +Help_Text_HowToReadPokedex:: @ 81B752C .string "{CIRCLE_1} POKéMON that you have caught are\n" .string " identified by a POKé BALL mark on\n" .string " the POKéDEX list.\n" @@ -988,20 +985,20 @@ gUnknown_81B752C:: @ 81B752C .string " TOWN MAP with its habitat(s).$" .endif -gUnknown_81B7611:: @ 81B7611 +Help_Text_HowToUseHomePC:: @ 81B7611 .string "{CIRCLE_1} Go up to the PC at home, then press\n" .string " the A Button.\n" .string "{CIRCLE_2} The PC will turn on.\n" .string "{CIRCLE_3} Select either “ITEM STORAGE” or\n" .string " “MAILBOX.”$" -gUnknown_81B7692:: @ 81B7692 +Help_Text_HowToUseItemStorage:: @ 81B7692 .string "{CIRCLE_1} Select “WITHDRAW ITEM” to withdraw\n" .string " an item stored on your PC.\n" .string "{CIRCLE_2} Select “DEPOSIT ITEM” to put \n" .string " an item from your BAG into your PC.$" -gUnknown_81B771E:: @ 81B771E +Help_Text_HowToUseWithdrawItem2:: @ 81B771E .string "{CIRCLE_1} Select “WITHDRAW ITEM.”\n" .string "{CIRCLE_2} Select the item to be withdrawn.\n" .string "{CIRCLE_3} The item can be withdrawn and\n" @@ -1009,41 +1006,41 @@ gUnknown_81B771E:: @ 81B771E .string " It may also be directly given to a\n" .string " POKéMON to hold.$" -gUnknown_81B77DD:: @ 81B77DD +Help_Text_HowToUseDepositItem2:: @ 81B77DD .string "{CIRCLE_1} Select “DEPOSIT ITEM.”\n" .string "{CIRCLE_2} Select the item in the BAG to be\n" .string " deposited using the {PLUS} Control Pad.\n" .string "{CIRCLE_3} If there is nothing in the BAG, this\n" .string " command can't be used!$" -gUnknown_81B7884:: @ 81B7884 +Help_Text_HowToUseMailbox2:: @ 81B7884 .string "When MAIL is taken from a POKéMON,\n" .string "it is moved to the MAILBOX. If it has\n" .string "no MAIL, the MAILBOX can't be used.\n" .string "{CIRCLE_1} Select MAIL by name to read it or\n" .string " make a POKéMON hold it.$" -gUnknown_81B7931:: @ 81B7931 +Help_Text_HowToUseRun:: @ 81B7931 .string "You may not “RUN” from a TRAINER\n" .string "battle!\n" .string "{CIRCLE_1} You may “RUN” from a wild POKéMON.\n" .string "{CIRCLE_2} Your chance of escape is improved\n" .string " if your POKéMON in battle is fast.$" -gUnknown_81B79CB:: @ 81B79CB +Help_Text_HowToRegisterKeyItem:: @ 81B79CB .string "You may “REGISTER” a key item for\n" .string "instant use by pressing SELECT!\n" .string "{CIRCLE_1} Open the “KEY ITEMS” POCKET.\n" .string "{CIRCLE_2} Select the key item, then select\n" .string " “REGISTER.”$" -gUnknown_81B7A60:: @ 81B7A60 +Help_Text_HowToUseBall:: @ 81B7A60 .string "{CIRCLE_1} Select to throw the special POKé\n" .string " BALL used only in the SAFARI ZONE.\n" .string "When wild POKéMON appear, throw lots\n" .string "of SAFARI BALLS to catch them!$" -gUnknown_81B7AEE:: @ 81B7AEE +Help_Text_HowToUseBait:: @ 81B7AEE .string "{CIRCLE_1} Select to throw the special food\n" .string " used only in the SAFARI ZONE.\n" .string "It is POKéMON food rolled up into\n" @@ -1051,148 +1048,148 @@ gUnknown_81B7AEE:: @ 81B7AEE .string "thrown, the wild POKéMON may get\n" .string "attracted by it, and may not flee!$" -gUnknown_81B7BBE:: @ 81B7BBE +Help_Text_HowToUseRock:: @ 81B7BBE .string "{CIRCLE_1} Select to throw a rock lying on\n" .string " the ground in the SAFARI ZONE.\n" .string "Throwing a rock at a POKéMON may \n" .string "make it run away, but it becomes easier\n" .string "to catch!$" -gUnknown_81B7C57:: @ 81B7C57 +Help_Text_HowToUseHallOfFame:: @ 81B7C57 .string "{CIRCLE_1} Select “HALL OF FAME” on the PC.\n" .string "{CIRCLE_2} The POKéMON that have entered the\n" .string " HALL OF FAME can be examined.$" -gUnknown_81B7CC1:: @ 81B7CC1 +Help_Text_HP:: @ 81B7CC1 .string "HP$" -gUnknown_81B7CC4:: @ 81B7CC4 +Help_Text_EXP:: @ 81B7CC4 .string "EXP. {LEFT_PAREN}EXP. Points{RIGHT_PAREN}$" -gUnknown_81B7CD9:: @ 81B7CD9 +Help_Text_Moves:: @ 81B7CD9 .string "MOVES$" -gUnknown_81B7CDF:: @ 81B7CDF +Help_Text_Attack:: @ 81B7CDF .string "ATTACK$" -gUnknown_81B7CE6:: @ 81B7CE6 +Help_Text_Defense:: @ 81B7CE6 .string "DEFENSE$" -gUnknown_81B7CEE:: @ 81B7CEE +Help_Text_SpAtk:: @ 81B7CEE .string "SP. ATK$" -gUnknown_81B7CF6:: @ 81B7CF6 +Help_Text_SpDef:: @ 81B7CF6 .string "SP. DEF$" -gUnknown_81B7CFE:: @ 81B7CFE +Help_Text_Speed:: @ 81B7CFE .string "SPEED$" -gUnknown_81B7D04:: @ 81B7D04 +Help_Text_Level:: @ 81B7D04 .string "Lv. {LEFT_PAREN}Level{RIGHT_PAREN}$" -gUnknown_81B7D12:: @ 81B7D12 +Help_Text_Type:: @ 81B7D12 .string "TYPE$" -gUnknown_81B7D17:: @ 81B7D17 +Help_Text_OT:: @ 81B7D17 .string "OT$" -gUnknown_81B7D1A:: @ 81B7D1A +Help_Text_Item:: @ 81B7D1A .string "ITEM$" -gUnknown_81B7D1F:: @ 81B7D1F +Help_Text_Ability:: @ 81B7D1F .string "ABILITY$" -gUnknown_81B7D27:: @ 81B7D27 +Help_Text_Money:: @ 81B7D27 .string "MONEY$" -gUnknown_81B7D2D:: @ 81B7D2D +Help_Text_MoveType:: @ 81B7D2D .string "MOVE TYPE$" -gUnknown_81B7D37:: @ 81B7D37 +Help_Text_Nature:: @ 81B7D37 .string "NATURE$" -gUnknown_81B7D3E:: @ 81B7D3E +Help_Text_IDNo:: @ 81B7D3E .string "ID No.$" -gUnknown_81B7D45:: @ 81B7D45 +Help_Text_PP:: @ 81B7D45 .string "PP$" -gUnknown_81B7D48:: @ 81B7D48 +Help_Text_Power:: @ 81B7D48 .string "POWER$" -gUnknown_81B7D4E:: @ 81B7D4E +Help_Text_Accuracy:: @ 81B7D4E .string "ACCURACY$" -gUnknown_81B7D57:: @ 81B7D57 +Help_Text_FNT:: @ 81B7D57 .string "FNT$" -gUnknown_81B7D5B:: @ 81B7D5B +Help_Text_Items:: @ 81B7D5B .string "ITEMS$" -gUnknown_81B7D61:: @ 81B7D61 +Help_Text_KeyItems:: @ 81B7D61 .string "KEY ITEMS$" -gUnknown_81B7D6B:: @ 81B7D6B +Help_Text_PokeBalls:: @ 81B7D6B .string "POKé BALLS$" -gUnknown_81B7D76:: @ 81B7D76 +Help_Text_Pokedex:: @ 81B7D76 .string "POKéDEX$" -gUnknown_81B7D7E:: @ 81B7D7E +Help_Text_PlayTime:: @ 81B7D7E .string "PLAY TIME$" -gUnknown_81B7D88:: @ 81B7D88 +Help_Text_Badges:: @ 81B7D88 .string "BADGES$" -gUnknown_81B7D8F:: @ 81B7D8F +Help_Text_TextSpeed:: @ 81B7D8F .string "TEXT SPEED$" -gUnknown_81B7D9A:: @ 81B7D9A +Help_Text_BattleScene:: @ 81B7D9A .string "BATTLE SCENE$" -gUnknown_81B7DA7:: @ 81B7DA7 +Help_Text_BattleStyle:: @ 81B7DA7 .string "BATTLE STYLE$" -gUnknown_81B7DB4:: @ 81B7DB4 +Help_Text_Sound:: @ 81B7DB4 .string "SOUND$" -gUnknown_81B7DBA:: @ 81B7DBA +Help_Text_ButtonMode:: @ 81B7DBA .string "BUTTON MODE$" -gUnknown_81B7DC6:: @ 81B7DC6 +Help_Text_Frame:: @ 81B7DC6 .string "FRAME$" -gUnknown_81B7DCC:: @ 81B7DCC +Help_Text_Cancel2:: @ 81B7DCC .string "CANCEL$" -gUnknown_81B7DD3:: @ 81B7DD3 +Help_Text_TM:: @ 81B7DD3 .string "TM$" -gUnknown_81B7DD6:: @ 81B7DD6 +Help_Text_HM:: @ 81B7DD6 .string "HM$" -gUnknown_81B7DD9:: @ 81B7DD9 +Help_Text_HMMove:: @ 81B7DD9 .string "HM MOVE$" -gUnknown_81B7DE1:: @ 81B7DE1 +Help_Text_Evolution:: @ 81B7DE1 .string "EVOLUTION$" -gUnknown_81B7DEB:: @ 81B7DEB +Help_Text_StatusProblem:: @ 81B7DEB .string "STATUS PROBLEM$" -gUnknown_81B7DFA:: @ 81B7DFA +Help_Text_Pokemon:: @ 81B7DFA .string "POKéMON$" -gUnknown_81B7E02:: @ 81B7E02 +Help_Text_IDNo2:: @ 81B7E02 .string "ID No.$" -gUnknown_81B7E09:: @ 81B7E09 +Help_Text_Money2:: @ 81B7E09 .string "MONEY$" -gUnknown_81B7E0F:: @ 81B7E0F +Help_Text_Badges2:: @ 81B7E0F .string "BADGES$" -gUnknown_81B7E16:: @ 81B7E16 +Help_Text_DefineHP:: @ 81B7E16 .string "HP indicates a POKéMON's vitality.\n" .string "If a POKéMON's HP drops to zero, it\l" .string "faints and is unable to battle.\l" @@ -1201,7 +1198,7 @@ gUnknown_81B7E16:: @ 81B7E16 .string "If your POKéMON are hurt, restore their\l" .string "HP at a POKéMON CENTER or use items.$" -gUnknown_81B7F0A:: @ 81B7F0A +Help_Text_DefineEXP:: @ 81B7F0A .string "EXP. Points stands for “Experience\n" .string "Points.” POKéMON gain EXP. Points by\l" .string "participating in winning battles.\l" @@ -1210,7 +1207,7 @@ gUnknown_81B7F0A:: @ 81B7F0A .string "indicates accumulated EXP. Points.\l" .string "It returns to zero upon leveling up.$" -gUnknown_81B800A:: @ 81B800A +Help_Text_DefineMoves:: @ 81B800A .string "POKéMON may learn up to four different\n" .string "moves. There are many kinds of moves\l" .string "including attacks and those with\l" @@ -1219,7 +1216,7 @@ gUnknown_81B800A:: @ 81B800A .string "POKéMON. Some moves can be learned\l" .string "from items.$" -gUnknown_81B80EC:: @ 81B80EC +Help_Text_DefineAttack:: @ 81B80EC .string "ATTACK indicates the power of an\n" .string "offensive move. The higher this stat,\l" .string "the more powerful the move.\l" @@ -1228,13 +1225,13 @@ gUnknown_81B80EC:: @ 81B80EC .string "FLYING, BUG, FIGHTING, ROCK, GHOST,\l" .string "and STEEL.$" -gUnknown_81B81C2:: @ 81B81C2 +Help_Text_DefineDefense:: @ 81B81C2 .string "DEFENSE indicates the resistance a\n" .string "POKéMON has against physical attacks.\l" .string "The higher this stat, the less damage\l" .string "sustained from a foe's physical hit.$" -gUnknown_81B8256:: @ 81B8256 +Help_Text_DefineSpAtk:: @ 81B8256 .string "SP. ATK (Special Attack) indicates the\n" .string "power of a special attack move.\l" .string "The higher this stat, the more powerful\l" @@ -1243,20 +1240,20 @@ gUnknown_81B8256:: @ 81B8256 .string "types: FIRE, WATER, ELECTRIC, GRASS,\l" .string "ICE, PSYCHIC, DRAGON, and DARK.$" -gUnknown_81B8348:: @ 81B8348 +Help_Text_DefineSpDef:: @ 81B8348 .string "SP. DEF (Special Defense) indicates\n" .string "the resistance a POKéMON has against\l" .string "special attacks.\l" .string "The higher this stat, the less damage\l" .string "sustained from a foe's special attack.$" -gUnknown_81B83EF:: @ 81B83EF +Help_Text_DefineSpeed:: @ 81B83EF .string "SPEED indicates the agility of a\n" .string "POKéMON. If this stat exceeds the foe's\l" .string "in battle, the POKéMON can make a move\l" .string "before its slower opponent.$" -gUnknown_81B847B:: @ 81B847B +Help_Text_DefineLevel:: @ 81B847B .string "Lv. (Level) indicates the growth and\n" .string "strength of a POKéMON.\l" .string "In general, when a POKéMON levels up,\l" @@ -1265,7 +1262,7 @@ gUnknown_81B847B:: @ 81B847B .string "POKéMON may learn a new move upon\l" .string "leveling up.$" -gUnknown_81B8550:: @ 81B8550 +Help_Text_DefineType:: @ 81B8550 .string "POKéMON and moves are classified by\n" .string "type. Every type has advantageous and\l" .string "disadvantageous matchups against\l" @@ -1274,14 +1271,14 @@ gUnknown_81B8550:: @ 81B8550 .string "strong against the FIRE type and weak\l" .string "against the GRASS type.$" -gUnknown_81B8647:: @ 81B8647 +Help_Text_DefineOT:: @ 81B8647 .string "OT stands for “Original TRAINER,”\n" .string "the first TRAINER to have caught the\l" .string "selected POKéMON.\l" .string "Even if the POKéMON is traded, the OT\l" .string "name will remain unchanged.$" -gUnknown_81B86E2:: @ 81B86E2 +Help_Text_DefineItem:: @ 81B86E2 .string "All POKéMON can be made to hold one\n" .string "item each. Some items will be used by\l" .string "the POKéMON automatically in certain\l" @@ -1289,7 +1286,7 @@ gUnknown_81B86E2:: @ 81B86E2 .string "item, select the item from the BAG and\l" .string "“GIVE” it to the POKéMON.$" -gUnknown_81B87B8:: @ 81B87B8 +Help_Text_DefineAbility:: @ 81B87B8 .string "All POKéMON have a special ABILITY.\n" .string "There are many different kinds of these\l" .string "abilities, some used in battle, some\l" @@ -1297,13 +1294,13 @@ gUnknown_81B87B8:: @ 81B87B8 .string "species to species. Some species may\l" .string "have more than one kind of ability.$" -gUnknown_81B8897:: @ 81B8897 +Help_Text_DefineMoney:: @ 81B8897 .string "Whenever you win a battle against a\n" .string "TRAINER, you are given prize money.\l" .string "Save up your prize money so you can\l" .string "enjoy shopping at POKéMON MARTS!$" -gUnknown_81B8924:: @ 81B8924 +Help_Text_DefineMoveType:: @ 81B8924 .string "Moves are also classified by types.\n" .string "If a POKéMON of a certain type uses\l" .string "a move of the same type, the move's\l" @@ -1312,13 +1309,13 @@ gUnknown_81B8924:: @ 81B8924 .string "target, its effectiveness is also\l" .string "boosted.$" -gUnknown_81B8A04:: @ 81B8A04 +Help_Text_DefineNature:: @ 81B8A04 .string "All POKéMON have a personality,\n" .string "or “NATURE.” The POKéMON's\l" .string "nature appears to affect how the\l" .string "POKéMON will grow upon leveling up.$" -gUnknown_81B8A84:: @ 81B8A84 +Help_Text_DefineIDNo:: @ 81B8A84 .string "The ID No. is a special number assigned\n" .string "specifically to you as a TRAINER.\l" .string "Together with the OT name, the ID No.\l" @@ -1327,7 +1324,7 @@ gUnknown_81B8A84:: @ 81B8A84 .string "The ID No. does not change even if the\l" .string "POKéMON is traded.$" -gUnknown_81B8B62:: @ 81B8B62 +Help_Text_DefinePP:: @ 81B8B62 .string "PP stands for “Power Points.”\n" .string "It indicates the number of times a\l" .string "certain move can be used in battle.\l" @@ -1335,19 +1332,19 @@ gUnknown_81B8B62:: @ 81B8B62 .string "a POKéMON CENTER or using certain\l" .string "items.$" -gUnknown_81B8C18:: @ 81B8C18 +Help_Text_DefinePower:: @ 81B8C18 .string "POWER indicates the strength of an\n" .string "attack. The higher this number, the\l" .string "greater the damage that can be\l" .string "inflicted on the foe!$" -gUnknown_81B8C94:: @ 81B8C94 +Help_Text_DefineAccuracy:: @ 81B8C94 .string "ACCURACY indicates the probability of\n" .string "the move hitting the foe.\l" .string "The higher this number, the more likely\l" .string "the move will strike the target.$" -gUnknown_81B8D1D:: @ 81B8D1D +Help_Text_DefineFNT:: @ 81B8D1D .string "FNT stands for “fainted.”\n" .string "A POKéMON faints if its HP is reduced\l" .string "to zero. It becomes incapable of taking\l" @@ -1355,13 +1352,13 @@ gUnknown_81B8D1D:: @ 81B8D1D .string "Restore a fainted POKéMON at a POKéMON\l" .string "CENTER, or use an item.$" -gUnknown_81B8DD4:: @ 81B8DD4 +Help_Text_DefineItems:: @ 81B8DD4 .string "Ordinary items bought at any POKéMON\n" .string "MART are placed in the ITEMS POCKET.\l" .string "Items may be used, given to a POKéMON\l" .string "to hold, or tossed out as garbage.$" -gUnknown_81B8E67:: @ 81B8E67 +Help_Text_DefineKeyItems:: @ 81B8E67 .string "Important items that you find or \n" .string "receive from people are placed in the\l" .string "KEY ITEMS POCKET.\l" @@ -1370,7 +1367,7 @@ gUnknown_81B8E67:: @ 81B8E67 .string "registered, the item can be used\l" .string "without opening the MENU and BAG.$" -gUnknown_81B8F4D:: @ 81B8F4D +Help_Text_DefinePokeBalls:: @ 81B8F4D .string "POKé BALLS, which are used for\n" .string "catching wild POKéMON, are placed in\l" .string "the POKé BALLS POCKET.\l" @@ -1379,33 +1376,33 @@ gUnknown_81B8F4D:: @ 81B8F4D .string "POKéMON to hold, or tossed out as\l" .string "garbage.$" -gUnknown_81B901B:: @ 81B901B +Help_Text_DefinePokedex:: @ 81B901B .string "This indicates the number of species of\n" .string "POKéMON you have caught and/or\l" .string "evolved to fill the POKéDEX.\l" .string "Try hard to catch all sorts of\l" .string "POKéMON!$" -gUnknown_81B90A7:: @ 81B90A7 +Help_Text_DefinePlayTime:: @ 81B90A7 .string "This is the total amount of time that\n" .string "you have played this game.$" -gUnknown_81B90E8:: @ 81B90E8 +Help_Text_DefineBadges:: @ 81B90E8 .string "The POKéMON LEAGUE BADGES that you\n" .string "have won are registered and shown.\l" .string "Earn BADGES by defeating GYM LEADERS\l" .string "in various cities and towns.$" -gUnknown_81B9170:: @ 81B9170 +Help_Text_DefineTextSpeed:: @ 81B9170 .string "You can adjust how quickly the text is\n" .string "displayed. Choose one: SLOW, MID,\l" .string "or FAST.$" -gUnknown_81B91C2:: @ 81B91C2 +Help_Text_DefineBattleScene:: @ 81B91C2 .string "You can choose to turn the battle\n" .string "animation ON or OFF.$" -gUnknown_81B91F9:: @ 81B91F9 +Help_Text_DefineBattleStyle:: @ 81B91F9 .string "You can choose whether or not a\n" .string "TRAINER can switch a POKéMON after\l" .string "it has made its foe faint.\l" @@ -1413,11 +1410,11 @@ gUnknown_81B91F9:: @ 81B91F9 .string "chance to switch a POKéMON after it\l" .string "has made its foe faint.$" -gUnknown_81B92B8:: @ 81B92B8 +Help_Text_DefineSound:: @ 81B92B8 .string "You can choose between MONO and\n" .string "STEREO sound output.$" -gUnknown_81B92ED:: @ 81B92ED +Help_Text_DefineButtonMode:: @ 81B92ED .string "Set to “HELP” to display help messages\n" .string "by pressing the L or R Button.\l" .string "Set to “LR” to enable the switching\l" @@ -1426,17 +1423,17 @@ gUnknown_81B92ED:: @ 81B92ED .string "Set to “L=A” to make the L Button\l" .string "work the same as the A Button.$" -gUnknown_81B93D8:: @ 81B93D8 +Help_Text_DefineFrame:: @ 81B93D8 .string "You may choose the design of the frame\n" .string "around certain menus. Try them out and\l" .string "see what you like.$" -gUnknown_81B9439:: @ 81B9439 +Help_Text_DefineCancel2:: @ 81B9439 .string "The settings will be changed to the\n" .string "selections shown in red, and you will\l" .string "return to the MENU.$" -gUnknown_81B9497:: @ 81B9497 +Help_Text_DefineTM:: @ 81B9497 .string "A TM (Technical Machine) is a device\n" .string "used to teach a move to a POKéMON.\l" .string "There are many different kinds.\l" @@ -1444,7 +1441,7 @@ gUnknown_81B9497:: @ 81B9497 .string "POKéMON capable of using them.\l" .string "A TM breaks after a single use.$" -gUnknown_81B9560:: @ 81B9560 +Help_Text_DefineHM:: @ 81B9560 .string "An HM (Hidden Machine) is a device used\n" .string "to teach a HIDDEN move to a POKéMON.\l" .string "A HIDDEN move can be taught only to\l" @@ -1453,7 +1450,7 @@ gUnknown_81B9560:: @ 81B9560 .string "and over. A HIDDEN move can be tough\l" .string "for a POKéMON to forget.$" -gUnknown_81B9656:: @ 81B9656 +Help_Text_DefineHMMove:: @ 81B9656 .string "HIDDEN moves are those that are\n" .string "especially important for your\l" .string "adventure. To use such a move outside\l" @@ -1462,7 +1459,7 @@ gUnknown_81B9656:: @ 81B9656 .string "move use it. A fainted POKéMON may use\l" .string "a HIDDEN move outside of battle.$" -gUnknown_81B9749:: @ 81B9749 +Help_Text_DefineEvolution:: @ 81B9749 .string "Among POKéMON, there are some that\n" .string "undergo major changes (evolution) upon\l" .string "growing to certain levels. Evolution\l" @@ -1471,7 +1468,7 @@ gUnknown_81B9749:: @ 81B9749 .string "it may learn. Some POKéMON evolve\l" .string "due to reasons other than leveling up.$" -gUnknown_81B984F:: @ 81B984F +Help_Text_DefineStatusProblem:: @ 81B984F .string "Status problems include:\n" .string "Sleep: Can't use moves.\l" .string "Poison: Causes steady HP loss.\l" @@ -1480,14 +1477,14 @@ gUnknown_81B984F:: @ 81B984F .string "Freeze: Can't use moves.\l" .string "These can be healed with items, etc.$" -gUnknown_81B991C:: @ 81B991C +Help_Text_DefinePokemon:: @ 81B991C .string "POKéMON is a name given to describe\n" .string "wondrous creatures that inhabit all\l" .string "corners of this world.\l" .string "People raise POKéMON to be their pets,\l" .string "use them for battling, and so on.$" -gUnknown_81B99C4:: @ 81B99C4 +Help_Text_DefineIDNo2:: @ 81B99C4 .string "The ID No. is a special number assigned\n" .string "specifically to you as a TRAINER.\l" .string "Together with the OT name, the ID No.\l" @@ -1496,40 +1493,40 @@ gUnknown_81B99C4:: @ 81B99C4 .string "The ID No. does not change even if the\l" .string "POKéMON is traded.$" -gUnknown_81B9AA2:: @ 81B9AA2 +Help_Text_DefineMoney2:: @ 81B9AA2 .string "Whenever you win a battle against a\n" .string "TRAINER, you are given prize money.\l" .string "Save up your prize money so you can\l" .string "enjoy shopping at POKéMON MARTS!$" -gUnknown_81B9B2F:: @ 81B9B2F +Help_Text_DefineBadges2:: @ 81B9B2F .string "This indicates the number of POKéMON\n" .string "LEAGUE BADGES that you have won.\l" .string "Earn BADGES by defeating GYM LEADERS\l" .string "in various cities and towns.$" -gUnknown_81B9BB7:: @ 81B9BB7 +Help_Text_TheHelpSystem:: @ 81B9BB7 .string "The HELP System$" -gUnknown_81B9BC7:: @ 81B9BC7 +Help_Text_TheGame:: @ 81B9BC7 .string "The game$" -gUnknown_81B9BD0:: @ 81B9BD0 +Help_Text_WirelessAdapter:: @ 81B9BD0 .string "Wireless Adapter$" -gUnknown_81B9BE1:: @ 81B9BE1 +Help_Text_GameFundamentals1:: @ 81B9BE1 .string "Game fundamentals 1$" -gUnknown_81B9BF5:: @ 81B9BF5 +Help_Text_GameFundamentals2:: @ 81B9BF5 .string "Game fundamentals 2$" -gUnknown_81B9C09:: @ 81B9C09 +Help_Text_GameFundamentals3:: @ 81B9C09 .string "Game fundamentals 3$" -gUnknown_81B9C1D:: @ 81B9C1D +Help_Text_WhatArePokemon:: @ 81B9C1D .string "What are POKéMON?$" -gUnknown_81B9C2F:: @ 81B9C2F +Help_Text_DescTheHelpSystem:: @ 81B9C2F .string "The help messages change depending on\n" .string "how much you have progressed in the\l" .string "game. They are designed to support you\l" @@ -1537,7 +1534,7 @@ gUnknown_81B9C2F:: @ 81B9C2F .string "anything that you don't understand,\l" .string "please look up the HELP System!$" -gUnknown_81B9D04:: @ 81B9D04 +Help_Text_DescTheGame:: @ 81B9D04 .string "You become the main character to\n" .string "explore the world of POKéMON!\l" .string "By talking to people and solving\l" @@ -1545,7 +1542,7 @@ gUnknown_81B9D04:: @ 81B9D04 .string "Strive for the goal together with your\l" .string "wonderful POKéMON!$" -gUnknown_81B9DC5:: @ 81B9DC5 +Help_Text_DescWirelessAdapter:: @ 81B9DC5 .string "This game communicates over a wireless\n" .string "link using the Wireless Adapter.\p" .string "Go wireless anywhere, anytime, and\n" @@ -1553,14 +1550,14 @@ gUnknown_81B9DC5:: @ 81B9DC5 .string "Try playing with the Wireless Adapter\n" .string "always attached!$" -gUnknown_81B9E75:: @ 81B9E75 +Help_Text_DescGameFundamentals1:: @ 81B9E75 .string "Visit every city and town, travel every\n" .string "road, explore every cave, and face\l" .string "every challenge as you strive to\l" .string "become the greatest TRAINER of\l" .string "POKéMON!$" -gUnknown_81B9F09:: @ 81B9F09 +Help_Text_DescGameFundamentals2:: @ 81B9F09 .string "On your adventure, you will be faced\n" .string "with many obstacles. Every obstacle\l" .string "can be overcome by doing something\l" @@ -1568,12 +1565,12 @@ gUnknown_81B9F09:: @ 81B9F09 .string "are affected by something that happens\l" .string "far away.$" -gUnknown_81B9FCE:: @ 81B9FCE +Help_Text_DescGameFundamentals3:: @ 81B9FCE .string "Some of the obstacles in your way can\n" .string "be removed once your POKéMON learn\l" .string "specific moves.$" -gUnknown_81BA027:: @ 81BA027 +Help_Text_DescWhatArePokemon:: @ 81BA027 .string "POKéMON are wondrous creatures that\n" .string "are shrouded in mystery. You may meet\l" .string "them all over the world…in tall\l" @@ -1581,112 +1578,112 @@ gUnknown_81BA027:: @ 81BA027 .string "They appear to grow obedient to the\l" .string "TRAINERS that caught them.$" -gUnknown_81BA0F1:: @ 81BA0F1 +Help_Text_UsingTypeMatchupList:: @ 81BA0F1 .string "Using the Type Matchup List$" -gUnknown_81BA10D:: @ 81BA10D +Help_Text_OwnMoveDark:: @ 81BA10D .string "Own move type: DARK$" -gUnknown_81BA121:: @ 81BA121 +Help_Text_OwnPokemonDark:: @ 81BA121 .string "Own POKéMON type: DARK$" -gUnknown_81BA138:: @ 81BA138 +Help_Text_OwnMoveRock:: @ 81BA138 .string "Own move type: ROCK$" -gUnknown_81BA14C:: @ 81BA14C +Help_Text_OwnPokemonRock:: @ 81BA14C .string "Own POKéMON type: ROCK$" -gUnknown_81BA163:: @ 81BA163 +Help_Text_OwnMovePsychic:: @ 81BA163 .string "Own move type: PSYCHIC$" -gUnknown_81BA17A:: @ 81BA17A +Help_Text_OwnPokemonPsychic:: @ 81BA17A .string "Own POKéMON type: PSYCHIC$" -gUnknown_81BA194:: @ 81BA194 +Help_Text_OwnMoveFighting:: @ 81BA194 .string "Own move type: FIGHTING$" -gUnknown_81BA1AC:: @ 81BA1AC +Help_Text_OwnPokemonFighting:: @ 81BA1AC .string "Own POKéMON type: FIGHTING$" -gUnknown_81BA1C7:: @ 81BA1C7 +Help_Text_OwnMoveGrass:: @ 81BA1C7 .string "Own move type: GRASS$" -gUnknown_81BA1DC:: @ 81BA1DC +Help_Text_OwnPokemonGrass:: @ 81BA1DC .string "Own POKéMON type: GRASS$" -gUnknown_81BA1F4:: @ 81BA1F4 +Help_Text_OwnMoveGhost:: @ 81BA1F4 .string "Own move type: GHOST$" -gUnknown_81BA209:: @ 81BA209 +Help_Text_OwnPokemonGhost:: @ 81BA209 .string "Own POKéMON type: GHOST$" -gUnknown_81BA221:: @ 81BA221 +Help_Text_OwnMoveIce:: @ 81BA221 .string "Own move type: ICE$" -gUnknown_81BA234:: @ 81BA234 +Help_Text_OwnPokemonIce:: @ 81BA234 .string "Own POKéMON type: ICE$" -gUnknown_81BA24A:: @ 81BA24A +Help_Text_OwnMoveGround:: @ 81BA24A .string "Own move type: GROUND$" -gUnknown_81BA260:: @ 81BA260 +Help_Text_OwnPokemonGround:: @ 81BA260 .string "Own POKéMON type: GROUND$" -gUnknown_81BA279:: @ 81BA279 +Help_Text_OwnMoveElectric:: @ 81BA279 .string "Own move type: ELECTRIC$" -gUnknown_81BA291:: @ 81BA291 +Help_Text_OwnPokemonElectric:: @ 81BA291 .string "Own POKéMON type: ELECTRIC$" -gUnknown_81BA2AC:: @ 81BA2AC +Help_Text_OwnMovePoison:: @ 81BA2AC .string "Own move type: POISON$" -gUnknown_81BA2C2:: @ 81BA2C2 +Help_Text_OwnPokemonPoison:: @ 81BA2C2 .string "Own POKéMON type: POISON$" -gUnknown_81BA2DB:: @ 81BA2DB +Help_Text_OwnMoveDragon:: @ 81BA2DB .string "Own move type: DRAGON$" -gUnknown_81BA2F1:: @ 81BA2F1 +Help_Text_OwnPokemonDragon:: @ 81BA2F1 .string "Own POKéMON type: DRAGON$" -gUnknown_81BA30A:: @ 81BA30A +Help_Text_OwnMoveNormal:: @ 81BA30A .string "Own move type: NORMAL$" -gUnknown_81BA320:: @ 81BA320 +Help_Text_OwnPokemonNormal:: @ 81BA320 .string "Own POKéMON type: NORMAL$" -gUnknown_81BA339:: @ 81BA339 +Help_Text_OwnMoveSteel:: @ 81BA339 .string "Own move type: STEEL$" -gUnknown_81BA34E:: @ 81BA34E +Help_Text_OwnPokemonSteel:: @ 81BA34E .string "Own POKéMON type: STEEL$" -gUnknown_81BA366:: @ 81BA366 +Help_Text_OwnMoveFlying:: @ 81BA366 .string "Own move type: FLYING$" -gUnknown_81BA37C:: @ 81BA37C +Help_Text_OwnPokemonFlying:: @ 81BA37C .string "Own POKéMON type: FLYING$" -gUnknown_81BA395:: @ 81BA395 +Help_Text_OwnMoveFire:: @ 81BA395 .string "Own move type: FIRE$" -gUnknown_81BA3A9:: @ 81BA3A9 +Help_Text_OwnPokemonFire:: @ 81BA3A9 .string "Own POKéMON type: FIRE$" -gUnknown_81BA3C0:: @ 81BA3C0 +Help_Text_OwnMoveWater:: @ 81BA3C0 .string "Own move type: WATER$" -gUnknown_81BA3D5:: @ 81BA3D5 +Help_Text_OwnPokemonWater:: @ 81BA3D5 .string "Own POKéMON type: WATER$" -gUnknown_81BA3ED:: @ 81BA3ED +Help_Text_OwnMoveBug:: @ 81BA3ED .string "Own move type: BUG$" -gUnknown_81BA400:: @ 81BA400 +Help_Text_OwnPokemonBug:: @ 81BA400 .string "Own POKéMON type: BUG$" -gUnknown_81BA416:: @ 81BA416 +Help_Text_HowToUseTypeMatchupList:: @ 81BA416 .string "Depending on the matchup of the\n" .string "move type and the target POKéMON's\l" .string "type, the move's effectiveness varies:\l" @@ -1695,144 +1692,144 @@ gUnknown_81BA416:: @ 81BA416 .string "{BIG_MULT_X}: Not effective at all\l" .string "(No changes for other matchups.)$" -gUnknown_81BA4E6:: @ 81BA4E6 +Help_Text_TypeMatchupOwnMoveDark:: @ 81BA4E6 .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: PSYCHIC, GHOST\p" .string " {TRIANGLE}: FIGHTING, DARK, STEEL$" -gUnknown_81BA539:: @ 81BA539 +Help_Text_TypeMatchupOwnPokemonDark:: @ 81BA539 .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: FIGHTING, BUG\p" .string " {TRIANGLE}: GHOST, DARK\p" .string " {BIG_MULT_X}: PSYCHIC$" -gUnknown_81BA595:: @ 81BA595 +Help_Text_TypeMatchupOwnMoveRock:: @ 81BA595 .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: FIRE, ICE, FLYING, BUG\p" .string " {TRIANGLE}: FIGHTING, GROUND, STEEL$" -gUnknown_81BA5F2:: @ 81BA5F2 +Help_Text_TypeMatchupOwnPokemonRock:: @ 81BA5F2 .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: WATER, GRASS, FIGHTING,\n" .string " GROUND, STEEL\p" .string " {TRIANGLE}: NORMAL, FIRE, POISON, FLYING$" -gUnknown_81BA66F:: @ 81BA66F +Help_Text_TypeMatchupOwnMovePsychic:: @ 81BA66F .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: FIGHTING, POISON\p" .string " {TRIANGLE}: PSYCHIC, STEEL\p" .string " {BIG_MULT_X}: DARK$" -gUnknown_81BA6C9:: @ 81BA6C9 +Help_Text_TypeMatchupOwnPokemonPsychic:: @ 81BA6C9 .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: BUG, GHOST, DARK\p" .string " {TRIANGLE}: FIGHTING, PSYCHIC$" -gUnknown_81BA71F:: @ 81BA71F +Help_Text_TypeMatchupOwnMoveFighting:: @ 81BA71F .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: NORMAL, ICE, ROCK, DARK, STEEL\p" .string " {TRIANGLE}: POISON, FLYING, PSYCHIC, BUG\p" .string " {BIG_MULT_X}: GHOST$" -gUnknown_81BA796:: @ 81BA796 +Help_Text_TypeMatchupOwnPokemonFighting:: @ 81BA796 .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: FLYING, PSYCHIC\p" .string " {TRIANGLE}: BUG, ROCK, DARK$" -gUnknown_81BA7E9:: @ 81BA7E9 +Help_Text_TypeMatchupOwnMoveGrass:: @ 81BA7E9 .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: WATER, GROUND, ROCK\p" .string " {TRIANGLE}: FIRE, GRASS, POISON, FLYING,\n" .string " BUG, DRAGON, STEEL$" -gUnknown_81BA862:: @ 81BA862 +Help_Text_TypeMatchupOwnPokemonGrass:: @ 81BA862 .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: FIRE, ICE, POISON, FLYING, BUG\p" .string " {TRIANGLE}: WATER, ELECTRIC, GRASS, GROUND$" -gUnknown_81BA8D3:: @ 81BA8D3 +Help_Text_TypeMatchupOwnMoveGhost:: @ 81BA8D3 .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: PSYCHIC, GHOST\p" .string " {TRIANGLE}: DARK, STEEL\p" .string " {BIG_MULT_X}: NORMAL$" -gUnknown_81BA92A:: @ 81BA92A +Help_Text_TypeMatchupOwnPokemonGhost:: @ 81BA92A .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: GHOST, DARK\p" .string " {TRIANGLE}: POISON, BUG\p" .string " {BIG_MULT_X}: NORMAL, FIGHTING$" -gUnknown_81BA98D:: @ 81BA98D +Help_Text_TypeMatchupOwnMoveIce:: @ 81BA98D .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: GRASS, GROUND, FLYING, DRAGON\p" .string " {TRIANGLE}: FIRE, WATER, ICE, STEEL$" -gUnknown_81BA9F1:: @ 81BA9F1 +Help_Text_TypeMatchupOwnPokemonIce:: @ 81BA9F1 .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: FIRE, FIGHTING, ROCK, STEEL\p" .string " {TRIANGLE}: ICE$" -gUnknown_81BAA44:: @ 81BAA44 +Help_Text_TypeMatchupOwnMoveGround:: @ 81BAA44 .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: FIRE, ELECTRIC, POISON, ROCK,\n" .string " STEEL\p" .string " {TRIANGLE}: GRASS, BUG\n" .string " {BIG_MULT_X}: FLYING$" -gUnknown_81BAAB6:: @ 81BAAB6 +Help_Text_TypeMatchupOwnPokemonGround:: @ 81BAAB6 .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: WATER, GRASS, ICE\p" .string " {TRIANGLE}: POISON, ROCK\p" .string " {BIG_MULT_X}: ELECTRIC$" -gUnknown_81BAB18:: @ 81BAB18 +Help_Text_TypeMatchupOwnMoveElectric:: @ 81BAB18 .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: WATER, FLYING\p" .string " {TRIANGLE}: ELECTRIC, GRASS, DRAGON\p" .string " {BIG_MULT_X}: GROUND$" -gUnknown_81BAB7A:: @ 81BAB7A +Help_Text_TypeMatchupOwnPokemonElectric:: @ 81BAB7A .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: GROUND\p" .string " {TRIANGLE}: ELECTRIC, FLYING, STEEL$" -gUnknown_81BABCC:: @ 81BABCC +Help_Text_TypeMatchupOwnMovePoison:: @ 81BABCC .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: GRASS\p" .string " {TRIANGLE}: POISON, GROUND, ROCK, GHOST\p" .string " {BIG_MULT_X}: STEEL$" -gUnknown_81BAC29:: @ 81BAC29 +Help_Text_TypeMatchupOwnPokemonPoison:: @ 81BAC29 .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: GROUND, PSYCHIC\p" .string " {TRIANGLE}: GRASS, FIGHTING, POISON, BUG$" -gUnknown_81BAC89:: @ 81BAC89 +Help_Text_TypeMatchupOwnMoveDragon:: @ 81BAC89 .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: DRAGON\p" .string " {TRIANGLE}: STEEL$" -gUnknown_81BACC4:: @ 81BACC4 +Help_Text_TypeMatchupOwnPokemonDragon:: @ 81BACC4 .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: ICE, DRAGON\p" .string " {TRIANGLE}: FIRE, WATER, ELECTRIC, GRASS$" -gUnknown_81BAD20:: @ 81BAD20 +Help_Text_TypeMatchupOwnMoveNormal:: @ 81BAD20 .string "Effect on the opposing POKéMON:\p" .string " {TRIANGLE}: ROCK, STEEL\p" .string " {BIG_MULT_X}: GHOST$" -gUnknown_81BAD60:: @ 81BAD60 +Help_Text_TypeMatchupOwnPokemonNormal:: @ 81BAD60 .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: FIGHTING\p" .string " {BIG_MULT_X}: GHOST$" -gUnknown_81BADA2:: @ 81BADA2 +Help_Text_TypeMatchupOwnMoveSteel:: @ 81BADA2 .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: ICE, ROCK\p" .string " {TRIANGLE}: FIRE, WATER, ELECTRIC, STEEL$" -gUnknown_81BADF7:: @ 81BADF7 +Help_Text_TypeMatchupOwnPokemonSteel:: @ 81BADF7 .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: FIRE, FIGHTING, GROUND\n" .string " {TRIANGLE}: NORMAL, GRASS, ICE, FLYING,\l" @@ -1840,44 +1837,44 @@ gUnknown_81BADF7:: @ 81BADF7 .string " DRAGON, DARK, STEEL\l" .string " {BIG_MULT_X}: POISON$" -gUnknown_81BAEA8:: @ 81BAEA8 +Help_Text_TypeMatchupOwnMoveFlying:: @ 81BAEA8 .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: GRASS, FIGHTING, BUG\p" .string " {TRIANGLE}: ELECTRIC, ROCK, STEEL$" -gUnknown_81BAF01:: @ 81BAF01 +Help_Text_TypeMatchupOwnPokemonFlying:: @ 81BAF01 .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: ELECTRIC, ICE, ROCK\p" .string " {TRIANGLE}: GRASS, FIGHTING, BUG\p" .string " {BIG_MULT_X}: GROUND$" -gUnknown_81BAF6B:: @ 81BAF6B +Help_Text_TypeMatchupOwnMoveFire:: @ 81BAF6B .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: GRASS, ICE, BUG, STEEL\p" .string " {TRIANGLE}: FIRE, WATER, ROCK, DRAGON$" -gUnknown_81BAFCA:: @ 81BAFCA +Help_Text_TypeMatchupOwnPokemonFire:: @ 81BAFCA .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: WATER, GROUND, ROCK\p" .string " {TRIANGLE}: FIRE, GRASS, ICE, BUG, STEEL$" -gUnknown_81BB02E:: @ 81BB02E +Help_Text_TypeMatchupOwnMoveWater:: @ 81BB02E .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: FIRE, GROUND, ROCK\p" .string " {TRIANGLE}: WATER, GRASS, DRAGON$" -gUnknown_81BB084:: @ 81BB084 +Help_Text_TypeMatchupOwnPokemonWater:: @ 81BB084 .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: ELECTRIC, GRASS\p" .string " {TRIANGLE}: FIRE, WATER, ICE, STEEL$" -gUnknown_81BB0DF:: @ 81BB0DF +Help_Text_TypeMatchupOwnMoveBug:: @ 81BB0DF .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: GRASS, PSYCHIC, DARK\p" .string " {TRIANGLE}: FIRE, FIGHTING, POISON,\n" .string " FLYING, GHOST, STEEL$" -gUnknown_81BB156:: @ 81BB156 +Help_Text_TypeMatchupOwnPokemonBug:: @ 81BB156 .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: FIRE, FLYING, ROCK\p" .string " {TRIANGLE}: GRASS, FIGHTING, GROUND$" -- cgit v1.2.3 From df08e8645bb4c6f6abe34383fcb863b5165956f3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 3 Mar 2020 14:05:38 -0500 Subject: Port some standalone rodata objects to C --- data/data_8479668.s | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'data') diff --git a/data/data_8479668.s b/data/data_8479668.s index 6d8a22898..0ddecfe58 100644 --- a/data/data_8479668.s +++ b/data/data_8479668.s @@ -13,18 +13,6 @@ .section .rodata - .align 2 -gUnknown_8479668:: @ 8479668 - .incbin "graphics/misc/unk_8479688.gbapal" - -gUnknown_8479688:: - .incbin "graphics/misc/unk_8479688.4bpp.lz" - -gUnknown_8479748:: - .incbin "graphics/misc/unk_8479748.4bpp.lz" - - .section .rodata.after_trainer_tower - // berry_fix_program gUnknown_847A8D8:: -- cgit v1.2.3 From 1aa1f189721ba9c21597bae047282c4a785ab400 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 3 Mar 2020 14:42:15 -0500 Subject: Sync trainer_battle.inc --- data/scripts/trainer_battle.inc | 119 ++++++++++++++++++++-------------------- data/specials.inc | 12 ++-- 2 files changed, 65 insertions(+), 66 deletions(-) (limited to 'data') diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc index ccb279300..a49700846 100644 --- a/data/scripts/trainer_battle.inc +++ b/data/scripts/trainer_battle.inc @@ -1,143 +1,142 @@ -gUnknown_81A4EB4:: @ 81A4EB4 +EventScript_DoTrainerBattleFromApproach:: @ 81A4EB4 lock special PlayTrainerEncounterMusic - special ScrSpecial_EndTrainerApproach + special EndTrainerApproach waitstate - goto EventScript_1A4FC7 + goto EventScript_DoTrainerBattle EventScript_TryDoNormalTrainerBattle:: @ 81A4EC1 lock faceplayer - applymovement VAR_LAST_TALKED, Movement_1A4FC5 + applymovement VAR_LAST_TALKED, Movement_RevealTrainer waitmovement 0 specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought - compare VAR_RESULT, 0 - goto_if_ne EventScript_1A4EE8 + compare VAR_RESULT, FALSE + goto_if_ne EventScript_NoTrainerBattle special PlayTrainerEncounterMusic special SetUpTrainerMovement - goto EventScript_1A4FC7 + goto EventScript_DoTrainerBattle -EventScript_1A4EE8:: @ 81A4EE8 +EventScript_NoTrainerBattle:: @ 81A4EE8 ontrainerbattleend EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9 lock faceplayer - call EventScript_1A4FBA + call EventScript_RevealTrainer specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought - compare VAR_RESULT, 0 - goto_if_ne EventScript_1A4F20 + compare VAR_RESULT, FALSE + goto_if_ne EventScript_NoDoubleTrainerBattle special HasEnoughMonsForDoubleBattle compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS - goto_if_ne EventScript_1A4F19 + goto_if_ne EventScript_NotEnoughMonsForDoubleBattle special PlayTrainerEncounterMusic special SetUpTrainerMovement - goto EventScript_1A4FC7 + goto EventScript_DoTrainerBattle -EventScript_1A4F19:: @ 81A4F19 - special ScrSpecial_ShowTrainerNonBattlingSpeech +EventScript_NotEnoughMonsForDoubleBattle:: @ 81A4F19 + special ShowTrainerCantBattleSpeech waitmessage waitbuttonpress release end -EventScript_1A4F20:: @ 81A4F20 +EventScript_NoDoubleTrainerBattle:: @ 81A4F20 ontrainerbattleend -EventScript_DoTrainerBattle:: @ 81A4F21 - applymovement VAR_LAST_TALKED, Movement_1A4FC5 +EventScript_DoNoIntroTrainerBattle:: @ 81A4F21 + applymovement VAR_LAST_TALKED, Movement_RevealTrainer waitmovement 0 special PlayTrainerEncounterMusic - goto_if_questlog EventScript_1A501A + goto_if_questlog EventScript_EndQuestLogBattle battlebegin ontrainerbattleend EventScript_TryDoRematchBattle:: @ 81A4F3E - call EventScript_1A4FBA - specialvar VAR_RESULT, ScrSpecial_GetTrainerEyeRematchFlag - compare VAR_RESULT, 0 - goto_if_eq EventScript_1A4F72 + call EventScript_RevealTrainer + specialvar VAR_RESULT, IsTrainerReadyForRematch + compare VAR_RESULT, FALSE + goto_if_eq EventScript_NoRematchBattle special PlayTrainerEncounterMusic special SetUpTrainerMovement - special ScrSpecial_ShowTrainerIntroSpeech + special ShowTrainerIntroSpeech waitmessage waitbuttonpress - goto_if_questlog EventScript_1A4FB8 - special ScrSpecial_StartTrainerEyeRematch + goto_if_questlog EventScript_EndQuestLogRematch + special BattleSetup_StartRematchBattle waitstate releaseall end -EventScript_1A4F72:: @ 81A4F72 +EventScript_NoRematchBattle:: @ 81A4F72 ontrainerbattleend EventScript_TryDoDoubleRematchBattle:: @ 81A4F73 - specialvar VAR_RESULT, ScrSpecial_GetTrainerEyeRematchFlag - compare VAR_RESULT, 0 - goto_if_eq EventScript_1A4FB0 + specialvar VAR_RESULT, IsTrainerReadyForRematch + compare VAR_RESULT, FALSE + goto_if_eq EventScript_NoDoubleRematchBattle special HasEnoughMonsForDoubleBattle compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS - goto_if_ne EventScript_1A4FB1 + goto_if_ne EventScript_NotEnoughMonsForDoubleRematchBattle special PlayTrainerEncounterMusic special SetUpTrainerMovement - special ScrSpecial_ShowTrainerIntroSpeech + special ShowTrainerIntroSpeech waitmessage waitbuttonpress - goto_if_questlog EventScript_1A4FB8 - special ScrSpecial_StartTrainerEyeRematch + goto_if_questlog EventScript_EndQuestLogRematch + special BattleSetup_StartRematchBattle waitstate releaseall end -EventScript_1A4FB0:: @ 81A4FB0 +EventScript_NoDoubleRematchBattle:: @ 81A4FB0 ontrainerbattleend -EventScript_1A4FB1:: @ 81A4FB1 - special ScrSpecial_ShowTrainerNonBattlingSpeech +EventScript_NotEnoughMonsForDoubleRematchBattle:: @ 81A4FB1 + special ShowTrainerCantBattleSpeech waitmessage waitbuttonpress release end -EventScript_1A4FB8:: @ 81A4FB8 +EventScript_EndQuestLogRematch:: @ 81A4FB8 releaseall end -EventScript_1A4FBA:: @ 81A4FBA - applymovement VAR_LAST_TALKED, Movement_1A4FC5 +EventScript_RevealTrainer:: @ 81A4FBA + applymovement VAR_LAST_TALKED, Movement_RevealTrainer waitmovement 0 return -Movement_1A4FC5:: @ 81A4FC5 - step_67 +Movement_RevealTrainer:: @ 81A4FC5 + reveal_trainer step_end -EventScript_1A4FC7:: @ 81A4FC7 - special ScrSpecial_ShowTrainerIntroSpeech +EventScript_DoTrainerBattle:: @ 81A4FC7 + special ShowTrainerIntroSpeech waitmessage waitbuttonpress - goto_if_questlog EventScript_1A501A + goto_if_questlog EventScript_EndQuestLogBattle battlebegin - specialvar VAR_RESULT, ScrSpecial_GetTrainerBattleMode - compare VAR_RESULT, 0 - goto_if_eq EventScript_1A5017 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A5019 - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A5019 - compare VAR_RESULT, 6 - goto_if_eq EventScript_1A5019 - compare VAR_RESULT, 8 - goto_if_eq EventScript_1A5019 - -EventScript_1A5017:: @ 81A5017 + specialvar VAR_RESULT, GetTrainerBattleMode + compare VAR_RESULT, TRAINER_BATTLE_SINGLE + goto_if_eq EventScript_EndTrainerBattle + compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT + goto_if_eq EventScript_EndTrainerBattleContinueScript + compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC + goto_if_eq EventScript_EndTrainerBattleContinueScript + compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE + goto_if_eq EventScript_EndTrainerBattleContinueScript + compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC + goto_if_eq EventScript_EndTrainerBattleContinueScript +EventScript_EndTrainerBattle:: @ 81A5017 releaseall end -EventScript_1A5019:: @ 81A5019 +EventScript_EndTrainerBattleContinueScript:: @ 81A5019 ontrainerbattleendgoto -EventScript_1A501A:: @ 81A501A +EventScript_EndQuestLogBattle:: @ 81A501A special SetBattledTrainerFlag releaseall end diff --git a/data/specials.inc b/data/specials.inc index c44e1f3b4..1440f7798 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -59,15 +59,15 @@ gSpecials:: @ 815FD60 def_special NullFieldSpecial def_special NullFieldSpecial def_special IsEnigmaBerryValid - def_special ScrSpecial_GetTrainerBattleMode - def_special ScrSpecial_ShowTrainerIntroSpeech - def_special ScrSpecial_ShowTrainerNonBattlingSpeech + def_special GetTrainerBattleMode + def_special ShowTrainerIntroSpeech + def_special ShowTrainerCantBattleSpeech def_special ScrSpecial_HasTrainerBeenFought - def_special ScrSpecial_EndTrainerApproach + def_special EndTrainerApproach def_special PlayTrainerEncounterMusic def_special ShouldTryRematchBattle - def_special ScrSpecial_GetTrainerEyeRematchFlag - def_special ScrSpecial_StartTrainerEyeRematch + def_special IsTrainerReadyForRematch + def_special BattleSetup_StartRematchBattle def_special ShowPokemonStorageSystem def_special HasEnoughMonsForDoubleBattle def_special NullFieldSpecial -- cgit v1.2.3 From 11ce98c7acb6287ddb43981ef54ef9f95c8feb7f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 3 Mar 2020 15:19:33 -0500 Subject: Remove empty data/berry_crush.s --- data/berry_crush.s | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 data/berry_crush.s (limited to 'data') diff --git a/data/berry_crush.s b/data/berry_crush.s deleted file mode 100644 index 56cf980c2..000000000 --- a/data/berry_crush.s +++ /dev/null @@ -1,5 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 -- cgit v1.2.3 From 7af1b35d17b7077b13e04c2717b48a55960fa8ce Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 3 Mar 2020 16:18:45 -0500 Subject: Sync some specials/drop unnecessary prefixes --- data/event_scripts.s | 10 +- data/maps/BirthIsland_Exterior/scripts.inc | 10 +- data/maps/CeladonCity_Condominiums_3F/scripts.inc | 2 +- .../scripts.inc | 10 +- data/maps/CeladonCity_GameCorner/scripts.inc | 2 +- data/maps/CeruleanCave_B1F/scripts.inc | 6 +- .../CinnabarIsland_PokemonLab_Lounge/scripts.inc | 2 +- .../FiveIsland_ResortGorgeous_House/scripts.inc | 2 +- data/maps/FourIsland/scripts.inc | 2 +- data/maps/FourIsland_IcefallCave_1F/scripts.inc | 2 +- data/maps/FourIsland_LoreleisHouse/scripts.inc | 2 +- data/maps/FuchsiaCity/scripts.inc | 14 +- data/maps/FuchsiaCity_House3/scripts.inc | 14 +- .../FuchsiaCity_SafariZone_Entrance/scripts.inc | 2 +- data/maps/IndigoPlateau_Exterior/scripts.inc | 2 +- data/maps/LavenderTown_House2/scripts.inc | 14 +- data/maps/MtEmber_Summit/scripts.inc | 6 +- data/maps/NavelRock_Base/scripts.inc | 10 +- data/maps/NavelRock_Summit/scripts.inc | 10 +- data/maps/PalletTown/scripts.inc | 2 +- data/maps/PalletTown_GarysHouse/scripts.inc | 8 +- data/maps/PalletTown_PlayersHouse_2F/scripts.inc | 4 +- data/maps/PalletTown_ProfessorOaksLab/scripts.inc | 2 +- data/maps/PewterCity_Museum_1F/scripts.inc | 8 +- data/maps/PokemonLeague_ChampionsRoom/scripts.inc | 2 +- data/maps/PokemonLeague_HallOfFame/scripts.inc | 2 +- data/maps/PokemonTower_6F/scripts.inc | 2 +- data/maps/PowerPlant/scripts.inc | 10 +- data/maps/RocketHideout_Elevator/scripts.inc | 10 +- data/maps/Route10_PokemonCenter_1F/scripts.inc | 2 +- data/maps/Route11_EastEntrance_2F/scripts.inc | 2 +- data/maps/Route12/scripts.inc | 2 +- data/maps/Route12_FishingHouse/scripts.inc | 4 +- data/maps/Route15_WestEntrance_2F/scripts.inc | 4 +- data/maps/Route16/scripts.inc | 4 +- data/maps/Route16_NorthEntrance_2F/scripts.inc | 2 +- data/maps/Route18/scripts.inc | 2 +- data/maps/Route25_SeaCottage/scripts.inc | 8 +- data/maps/Route2_EastBuilding/scripts.inc | 2 +- data/maps/SSAnne_2F_Room1/scripts.inc | 2 +- data/maps/SSAnne_Exterior/scripts.inc | 2 +- data/maps/SeafoamIslands_B4F/scripts.inc | 8 +- data/maps/SevenIsland_House_Room2/scripts.inc | 4 +- .../scripts.inc | 6 +- data/maps/SilphCo_Elevator/scripts.inc | 10 +- .../SixIsland_DottedHole_SapphireRoom/scripts.inc | 2 +- data/maps/SixIsland_WaterPath_House1/scripts.inc | 4 +- data/maps/ThreeIsland_BerryForest/scripts.inc | 2 +- data/maps/ThreeIsland_House1/scripts.inc | 2 +- data/maps/TrainerTower_Elevator/scripts.inc | 12 +- data/maps/TrainerTower_Lobby/scripts.inc | 2 +- data/maps/TwoIsland_House/scripts.inc | 4 +- data/maps/TwoIsland_JoyfulGameCorner/scripts.inc | 2 +- data/maps/VermilionCity_Gym/scripts.inc | 4 +- data/maps/ViridianCity/scripts.inc | 4 +- data/scripts/cable_club.inc | 14 +- data/scripts/cave_of_origin.inc | 2 +- data/scripts/field_moves.inc | 2 +- data/scripts/itemfinder.inc | 2 +- data/scripts/move_tutors.inc | 4 +- data/scripts/mystery_event_club.inc | 4 +- data/scripts/obtain_item.inc | 8 +- data/scripts/pc.inc | 4 +- data/scripts/pkmn_center_nurse.inc | 2 +- data/scripts/pokedex_rating.inc | 6 +- data/scripts/pokemon_league.inc | 2 +- data/scripts/questionnaire.inc | 2 +- data/scripts/seagallop.inc | 8 +- data/scripts/silphco_doors.inc | 2 +- data/scripts/trainer_battle.inc | 4 +- data/scripts/trainer_card.inc | 2 +- data/scripts/white_out.inc | 4 +- data/specials.inc | 220 ++++++++++----------- 73 files changed, 283 insertions(+), 283 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 564e18fb9..36f184fa0 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1093,7 +1093,7 @@ EventScript_WallTownMap:: @ 81A6C32 msgbox Text_ATownMap goto_if_questlog EventScript_ReleaseEnd fadescreen FADE_TO_BLACK - special Special_TownMap + special ShowTownMap waitstate releaseall end @@ -1154,7 +1154,7 @@ EventScript_SetEnteringCyclingRoad:: @ 81A77C1 .include "data/scripts/route23.inc" EventScript_GetElevatorFloor:: @ 81A7AB9 - special Special_GetElevatorFloor + special GetElevatorFloor return .include "data/scripts/aide.inc" @@ -1198,7 +1198,7 @@ EventScript_GetInGameTradeSpeciesInfo:: @ 81A8CAD return EventScript_ChooseMonForInGameTrade:: @ 81A8CBD - special Special_ChooseMonFromParty + special ChoosePartyMon waitstate lock faceplayer @@ -1307,11 +1307,11 @@ EventScript_TryDarkenRuins:: @ 81A925E return EventScript_BrailleCursorWaitButton:: @ 81A926C - special Special_BrailleCursorToggle + special BrailleCursorToggle waitbuttonpress playse SE_SELECT setvar VAR_0x8006, 1 - special Special_BrailleCursorToggle + special BrailleCursorToggle return EventScript_NoMoreRoomForPokemon:: @ 81A927C diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index e2e75550a..2f26f58ab 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -5,7 +5,7 @@ BirthIsland_Exterior_MapScripts:: @ 8165203 .byte 0 BirthIsland_Exterior_OnReturnToField:: @ 8165213 - special Special_SetDeoxysTriangleObjectPal + special SetDeoxysTrianglePalette end BirthIsland_Exterior_OnTransition:: @ 8165217 @@ -33,7 +33,7 @@ BirthIsland_Exterior_OnResume:: @ 8165253 end BirthIsland_Exterior_EventScript_TryRemoveDeoxys:: @ 816525D - specialvar VAR_RESULT, Special_GetBattleOutcome + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne EventScript_Return removeobject 2 @@ -44,7 +44,7 @@ BirthIsland_Exterior_EventScript_Triangle:: @ 8165271 faceplayer goto_if_questlog EventScript_ReleaseEnd special sub_8112364 - special DoDeoxysRockInteraction + special DoDeoxysTriangleInteraction waitstate switch VAR_RESULT case 0, BirthIsland_Exterior_EventScript_NotSolved1 @@ -86,10 +86,10 @@ BirthIsland_Exterior_EventScript_Deoxys:: @ 81652C0 setvar VAR_0x8006, ITEM_NONE special CreateObedientEnemyMon setflag FLAG_SYS_SPECIAL_WILD_BATTLE - special Special_StartLegendaryBattle + special StartLegendaryBattle waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE - specialvar VAR_RESULT, Special_GetBattleOutcome + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON goto_if_eq BirthIsland_Exterior_EventScript_DefeatedDeoxys compare VAR_RESULT, B_OUTCOME_RAN diff --git a/data/maps/CeladonCity_Condominiums_3F/scripts.inc b/data/maps/CeladonCity_Condominiums_3F/scripts.inc index 878ed63e8..655993ac9 100644 --- a/data/maps/CeladonCity_Condominiums_3F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_3F/scripts.inc @@ -32,7 +32,7 @@ CeladonCity_Condominiums_3F_EventScript_ShowDiploma:: @ 816C418 waitmessage delay 60 goto_if_questlog EventScript_ReleaseEnd - special Special_ShowDiploma + special ShowDiploma waitstate release end diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index 9469abce4..b5f5ed682 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -6,11 +6,11 @@ CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelect:: @ 816C153 setvar VAR_0x8004, 3 call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR - special Special_DrawElevatorCurrentFloorWindow + special DrawElevatorCurrentFloorWindow message Text_WantWhichFloor waitmessage setvar VAR_0x8004, 3 - specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos + specialvar VAR_RESULT, InitElevatorFloorSelectMenuPos switch VAR_RESULT case 0, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom5F case 1, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom4F @@ -106,15 +106,15 @@ CeladonCity_DepartmentStore_Elevator_EventScript_To5F:: @ 816C2E6 end CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect:: @ 816C30E - special Special_CloseElevatorCurrentFloorWindow + special CloseElevatorCurrentFloorWindow releaseall end CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator:: @ 816C313 - special Special_CloseElevatorCurrentFloorWindow + special CloseElevatorCurrentFloorWindow closemessage waitse - special Special_AnimateElevator + special AnimateElevator waitstate setflag FLAG_TEMP_2 return diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 9032cd053..4e1ddae41 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -259,7 +259,7 @@ CeladonCity_GameCorner_EventScript_SlotMachine:: @ 816C96C setfieldeffectarg 2, 14 dofieldeffect FLDEFF_SMILEY_FACE_ICON waitfieldeffect FLDEFF_SMILEY_FACE_ICON - specialvar VAR_RESULT, Special_GetRandomSlotMachine + specialvar VAR_RESULT, GetRandomSlotMachineId playslotmachine VAR_RESULT releaseall end diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index b0452c3b1..e040978fc 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -8,7 +8,7 @@ CeruleanCave_B1F_OnResume:: @ 81624C9 end CeruleanCave_B1F_EventScript_TryRemoveMewtwo:: @ 81624D3 - specialvar VAR_RESULT, Special_GetBattleOutcome + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne EventScript_Return removeobject VAR_LAST_TALKED @@ -37,10 +37,10 @@ CeruleanCave_B1F_EventScript_Mewtwo:: @ 81624F5 waitbuttonpress setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE setflag FLAG_SYS_SPECIAL_WILD_BATTLE - special Special_StartLegendaryBattle + special StartLegendaryBattle waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE - specialvar VAR_RESULT, Special_GetBattleOutcome + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON goto_if_eq CeruleanCave_B1F_EventScript_DefeatedMewtwo compare VAR_RESULT, B_OUTCOME_RAN diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc index bcf1f17c9..5d9f99dd3 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc @@ -53,7 +53,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_Norma:: @ 816E33E msgbox Trade_Text_DoYouHaveMonWantToTradeForMon, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq CinnabarIsland_PokemonLab_Lounge_EventScript_NormaDeclineTrade - special Special_ChooseMonFromParty + special ChoosePartyMon waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, PARTY_SIZE diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index 367458ffa..4a5662865 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -33,7 +33,7 @@ FiveIsland_ResortGorgeous_House_EventScript_RequestTookTooLong:: @ 8171F0B FiveIsland_ResortGorgeous_House_EventScript_CheckForRequestedMon:: @ 8171F19 copyvar VAR_0x8004, VAR_RESORT_GORGEOUS_REQUESTED_MON - specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies + specialvar VAR_RESULT, DoesPlayerPartyContainSpecies compare VAR_RESULT, TRUE goto_if_eq FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon goto FiveIsland_ResortGorgeous_House_EventScript_RequestMon diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index cc2347dee..f8de01374 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -132,7 +132,7 @@ FourIsland_EventScript_CheckOnTwoMons:: @ 8167E19 special GetDaycareMonNicknames msgbox DayCare_Text_YourMonsAreDoingFine special SetDaycareCompatibilityString - special Special_ShowStringVar4AsFieldMessage + special ShowFieldMessageStringVar4 waitmessage waitbuttonpress release diff --git a/data/maps/FourIsland_IcefallCave_1F/scripts.inc b/data/maps/FourIsland_IcefallCave_1F/scripts.inc index c976122a7..be73f02fc 100644 --- a/data/maps/FourIsland_IcefallCave_1F/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_1F/scripts.inc @@ -9,7 +9,7 @@ FourIsland_IcefallCave_1F_OnResume:: @ 8163D54 end FourIsland_IcefallCave_1F_OnLoad:: @ 8163D57 - special Special_SetIcefallCaveCrackedIceMetatiles + special SetIcefallCaveCrackedIceMetatiles end FourIsland_IcefallCave_1F_OnFrame:: @ 8163D5B diff --git a/data/maps/FourIsland_LoreleisHouse/scripts.inc b/data/maps/FourIsland_LoreleisHouse/scripts.inc index 6259870e6..8c1f9e2fa 100644 --- a/data/maps/FourIsland_LoreleisHouse/scripts.inc +++ b/data/maps/FourIsland_LoreleisHouse/scripts.inc @@ -3,7 +3,7 @@ FourIsland_LoreleisHouse_MapScripts:: @ 8171C4E .byte 0 FourIsland_LoreleisHouse_OnTransition:: @ 8171C54 - special Special_ComputeLoreleiDollCollection + special UpdateLoreleiDollCollection end FourIsland_LoreleisHouse_EventScript_Lorelei:: @ 8171C58 diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc index ee144bf4c..0e4b9740f 100644 --- a/data/maps/FuchsiaCity/scripts.inc +++ b/data/maps/FuchsiaCity/scripts.inc @@ -71,7 +71,7 @@ FuchsiaCity_EventScript_GymSign:: @ 8166E07 FuchsiaCity_EventScript_ChanseySign:: @ 8166E1F lockall setvar VAR_0x8004, SPECIES_CHANSEY - special Special_SetSeenMon + special SetSeenMon drawmonpic SPECIES_CHANSEY, 10, 3 msgbox FuchsiaCity_Text_ChanseySign erasemonpic @@ -81,7 +81,7 @@ FuchsiaCity_EventScript_ChanseySign:: @ 8166E1F FuchsiaCity_EventScript_VoltorbSign:: @ 8166E38 lockall setvar VAR_0x8004, SPECIES_VOLTORB - special Special_SetSeenMon + special SetSeenMon drawmonpic SPECIES_VOLTORB, 10, 3 msgbox FuchsiaCity_Text_VoltorbSign erasemonpic @@ -91,7 +91,7 @@ FuchsiaCity_EventScript_VoltorbSign:: @ 8166E38 FuchsiaCity_EventScript_KangaskhanSign:: @ 8166E51 lockall setvar VAR_0x8004, SPECIES_KANGASKHAN - special Special_SetSeenMon + special SetSeenMon drawmonpic SPECIES_KANGASKHAN, 10, 3 msgbox FuchsiaCity_Text_KangaskhanSign erasemonpic @@ -101,7 +101,7 @@ FuchsiaCity_EventScript_KangaskhanSign:: @ 8166E51 FuchsiaCity_EventScript_SlowpokeSign:: @ 8166E6A lockall setvar VAR_0x8004, SPECIES_SLOWPOKE - special Special_SetSeenMon + special SetSeenMon drawmonpic SPECIES_SLOWPOKE, 10, 3 msgbox FuchsiaCity_Text_SlowpokeSign erasemonpic @@ -111,7 +111,7 @@ FuchsiaCity_EventScript_SlowpokeSign:: @ 8166E6A FuchsiaCity_EventScript_LaprasSign:: @ 8166E83 lockall setvar VAR_0x8004, SPECIES_LAPRAS - special Special_SetSeenMon + special SetSeenMon drawmonpic SPECIES_LAPRAS, 10, 3 msgbox FuchsiaCity_Text_LaprasSign erasemonpic @@ -122,7 +122,7 @@ FuchsiaCity_EventScript_FossilMonSign:: @ 8166E9C lockall goto_if_set FLAG_GOT_DOME_FOSSIL, FuchsiaCity_EventScript_OmanyteSign setvar VAR_0x8004, SPECIES_KABUTO - special Special_SetSeenMon + special SetSeenMon drawmonpic SPECIES_KABUTO, 10, 3 msgbox FuchsiaCity_Text_KabutoSign erasemonpic @@ -131,7 +131,7 @@ FuchsiaCity_EventScript_FossilMonSign:: @ 8166E9C FuchsiaCity_EventScript_OmanyteSign:: @ 8166EBE setvar VAR_0x8004, SPECIES_OMANYTE - special Special_SetSeenMon + special SetSeenMon drawmonpic SPECIES_OMANYTE, 10, 3 msgbox FuchsiaCity_Text_OmanyteSign erasemonpic diff --git a/data/maps/FuchsiaCity_House3/scripts.inc b/data/maps/FuchsiaCity_House3/scripts.inc index 5af270538..d392f0aaf 100644 --- a/data/maps/FuchsiaCity_House3/scripts.inc +++ b/data/maps/FuchsiaCity_House3/scripts.inc @@ -12,23 +12,23 @@ FuchsiaCity_House3_EventScript_MoveDeleter:: @ 816D895 FuchsiaCity_House3_EventScript_ChooseMonForMoveDeleter:: @ 816D8B0 msgbox FuchsiaCity_House3_Text_WhichMonShouldForgetMove - special Special_ChooseMonFromParty + special ChoosePartyMon waitstate compare VAR_0x8004, PARTY_SIZE goto_if_ge FuchsiaCity_House3_EventScript_CancelForgetMove - special Special_IsSelectedMonEgg + special IsSelectedMonEgg compare VAR_RESULT, TRUE goto_if_eq FuchsiaCity_House3_EventScript_CantForgetMoveEgg - special Special_GetNumMovesSelectedMonHas + special GetNumMovesSelectedMonHas compare VAR_RESULT, 1 goto_if_eq FuchsiaCity_House3_EventScript_CantForgetOnlyMove msgbox FuchsiaCity_House3_Text_WhichMoveShouldBeForgotten fadescreen FADE_TO_BLACK - special Special_SelectMove + special SelectMoveDeleterMove fadescreen FADE_FROM_BLACK compare VAR_0x8005, MAX_MON_MOVES goto_if_eq FuchsiaCity_House3_EventScript_ChooseMonForMoveDeleter - special Special_BufferMoveDeleterNicknameAndMove + special BufferMoveDeleterNicknameAndMove msgbox FuchsiaCity_House3_Text_MonsMoveShouldBeForgotten, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq FuchsiaCity_House3_EventScript_ForgetMove @@ -36,7 +36,7 @@ FuchsiaCity_House3_EventScript_ChooseMonForMoveDeleter:: @ 816D8B0 end FuchsiaCity_House3_EventScript_ForgetMove:: @ 816D919 - special Special_MoveDeleterForgetMove + special MoveDeleterForgetMove playfanfare MUS_ME_WASURE waitfanfare msgbox FuchsiaCity_House3_Text_MonHasForgottenMoveCompletely @@ -44,7 +44,7 @@ FuchsiaCity_House3_EventScript_ForgetMove:: @ 816D919 end FuchsiaCity_House3_EventScript_CantForgetOnlyMove:: @ 816D92A - special Special_BufferMoveDeleterNicknameAndMove + special BufferMoveDeleterNicknameAndMove msgbox FuchsiaCity_House3_Text_MonOnlyKnowsOneMove release end diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index ec9a7ca6a..5b0f06b08 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -158,7 +158,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_CheckSpaceForMons:: @ 816D462 getpartysize compare VAR_RESULT, PARTY_SIZE goto_if_ne EventScript_Return - specialvar VAR_RESULT, Special_IsThereRoomInAnyBoxForMorePokemon + specialvar VAR_RESULT, IsThereRoomInAnyBoxForMorePokemon compare VAR_RESULT, TRUE goto_if_eq EventScript_Return msgbox SafariZone_Text_ExcuseMeYourPCBoxIsFull diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index 70831a754..ecea7899a 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -81,7 +81,7 @@ IndigoPlateau_Exterior_EventScript_Credits:: @ 8167264 setvar VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 0 removeobject LOCALID_RIVAL removeobject LOCALID_PROF_OAK - special Special_Credits @ noreturn + special DoCredits waitstate releaseall end diff --git a/data/maps/LavenderTown_House2/scripts.inc b/data/maps/LavenderTown_House2/scripts.inc index 762f89401..0f69c84f8 100644 --- a/data/maps/LavenderTown_House2/scripts.inc +++ b/data/maps/LavenderTown_House2/scripts.inc @@ -13,7 +13,7 @@ LavenderTown_House2_EventScript_NameRater:: @ 816B266 LavenderTown_House2_EventScript_ChooseMon:: @ 816B287 msgbox LavenderTown_House2_Text_CritiqueWhichMonsNickname - special Special_ChooseMonFromParty + special ChoosePartyMon waitstate compare VAR_0x8004, PARTY_SIZE goto_if_lt LavenderTown_House2_EventScript_CheckCanRateMon @@ -27,15 +27,15 @@ LavenderTown_House2_EventScript_DontRateNickname:: @ 816B2AA end LavenderTown_House2_EventScript_CheckCanRateMon:: @ 816B2B4 - specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004 + specialvar VAR_RESULT, GetPartyMonSpecies compare VAR_RESULT, SPECIES_EGG goto_if_eq LavenderTown_House2_EventScript_CantNicknameEgg - special Special_GetMonNickname - special Special_IsMonOTIDNotPlayers + special BufferMonNickname + special IsMonOTIDNotPlayers compare VAR_RESULT, TRUE goto_if_eq LavenderTown_House2_EventScript_CantNicknameTradeMon - specialvar VAR_RESULT, Special_IsMonOTNameNotPlayers - special Special_GetMonNickname + specialvar VAR_RESULT, IsMonOTNameNotPlayers + special BufferMonNickname compare VAR_RESULT, TRUE goto_if_eq LavenderTown_House2_EventScript_CantNicknameTradeMon msgbox LavenderTown_House2_Text_GiveItANicerName, MSGBOX_YESNO @@ -59,7 +59,7 @@ LavenderTown_House2_EventScript_ChooseNewNickname:: @ 816B31B msgbox LavenderTown_House2_Text_WhatShallNewNicknameBe call EventScript_ChangePokemonNickname specialvar VAR_RESULT, NameRaterWasNicknameChanged - special Special_GetMonNickname + special BufferMonNickname compare VAR_RESULT, TRUE goto_if_eq LavenderTown_House2_EventScript_ChoseNewNickname msgbox LavenderTown_House2_Text_FromNowOnShallBeKnownAsSameName diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index e68a30c85..fef05c1ce 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -8,7 +8,7 @@ MtEmber_Summit_OnResume:: @ 8163B07 end MtEmber_Summit_EventScript_TryRemoveMoltres:: @ 8163B11 - specialvar VAR_RESULT, Special_GetBattleOutcome + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne EventScript_Return removeobject VAR_LAST_TALKED @@ -37,10 +37,10 @@ MtEmber_Summit_EventScript_Moltres:: @ 8163B33 playbgm MUS_EXEYE, 0 waitbuttonpress setflag FLAG_SYS_SPECIAL_WILD_BATTLE - special Special_StartLegendaryBattle + special StartLegendaryBattle waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE - specialvar VAR_RESULT, Special_GetBattleOutcome + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON goto_if_eq MtEmber_Summit_EventScript_DefeatedMoltres compare VAR_RESULT, B_OUTCOME_RAN diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 46bc6f2ee..707ad84f7 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -22,7 +22,7 @@ NavelRock_Base_OnResume:: @ 8165116 end NavelRock_Base_EventScript_TryRemoveLugia:: @ 8165120 - specialvar VAR_RESULT, Special_GetBattleOutcome + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne EventScript_Return removeobject 1 @@ -40,14 +40,14 @@ NavelRock_Base_EventScript_Lugia:: @ 8165134 setvar VAR_0x8005, 3 @ Horizontal pan setvar VAR_0x8006, 4 @ Num shakes setvar VAR_0x8007, 2 @ Shake delay - special Special_ShakeScreen + special ShakeScreen delay 30 playse SE_T_AME_E setvar VAR_0x8004, 0 @ Vertical pan setvar VAR_0x8005, 3 @ Horizontal pan setvar VAR_0x8006, 4 @ Num shakes setvar VAR_0x8007, 2 @ Shake delay - special Special_ShakeScreen + special ShakeScreen delay 30 delay 50 waitse @@ -59,10 +59,10 @@ NavelRock_Base_EventScript_Lugia:: @ 8165134 setvar VAR_0x8006, ITEM_NONE special CreateObedientEnemyMon setflag FLAG_SYS_SPECIAL_WILD_BATTLE - special Special_StartLegendaryBattle + special StartLegendaryBattle waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE - specialvar VAR_RESULT, Special_GetBattleOutcome + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON goto_if_eq NavelRock_Base_EventScript_DefeatedLugia compare VAR_RESULT, B_OUTCOME_RAN diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index b151bbbfe..b2983cf47 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -25,7 +25,7 @@ NavelRock_Summit_OnResume:: @ 8164FDD end NavelRock_Summit_EventScript_TryRemoveHoOh:: @ 8164FE7 - specialvar VAR_RESULT, Special_GetBattleOutcome + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne EventScript_Return removeobject 1 @@ -39,7 +39,7 @@ NavelRock_Summit_EventScript_HoOh:: @ 8164FFB special SpawnCameraObject setvar VAR_0x8004, 3 @ Num loops setvar VAR_0x8005, 35 @ Delay - special Special_LoopWingFlapSound + special LoopWingFlapSound applymovement 1, Movement_HoOhAppear applymovement OBJ_EVENT_ID_CAMERA, Movement_CameraPanUp waitmovement 0 @@ -53,7 +53,7 @@ NavelRock_Summit_EventScript_HoOh:: @ 8164FFB delay 60 setvar VAR_0x8004, 3 @ Num loops setvar VAR_0x8005, 35 @ Delay - special Special_LoopWingFlapSound + special LoopWingFlapSound applymovement OBJ_EVENT_ID_CAMERA, Movement_CameraPanDown applymovement 1, Movement_HoOhApproach waitmovement 0 @@ -63,11 +63,11 @@ NavelRock_Summit_EventScript_HoOh:: @ 8164FFB setvar VAR_0x8006, ITEM_NONE special CreateObedientEnemyMon setflag FLAG_SYS_SPECIAL_WILD_BATTLE - special Special_StartLegendaryBattle + special StartLegendaryBattle waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE setvar VAR_LAST_TALKED, 1 - specialvar VAR_RESULT, Special_GetBattleOutcome + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON goto_if_eq NavelRock_Summit_EventScript_DefeatedHoOh compare VAR_RESULT, B_OUTCOME_RAN diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 77fb4cb8c..eb8904713 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -56,7 +56,7 @@ PalletTown_EventScript_OakRatingScene:: @ 81654D8 goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, PalletTown_EventScript_NotBeenToOneIslandYet msgbox PalletTown_Text_OakLetMeSeePokedex setvar VAR_0x8004, 0 - specialvar VAR_RESULT, Special_GetPokedexCount + specialvar VAR_RESULT, GetPokedexCount copyvar VAR_0x8008, VAR_0x8005 copyvar VAR_0x8009, VAR_0x8006 getnumberstring 0, VAR_0x8008 diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index 16413d758..be4e8dd09 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -57,13 +57,13 @@ PalletTown_GarysHouse_EventScript_GroomMon:: @ 8168DB9 compare VAR_RESULT, NO goto_if_eq PalletTown_GarysHouse_EventScript_DeclineGrooming msgbox PalletTown_GarysHouse_Text_GroomWhichOne - special Special_ChooseMonFromParty + special ChoosePartyMon waitstate lock faceplayer compare VAR_0x8004, PARTY_SIZE goto_if_ge PalletTown_GarysHouse_EventScript_DeclineGrooming - specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004 + specialvar VAR_RESULT, GetPartyMonSpecies compare VAR_RESULT, SPECIES_EGG goto_if_eq PalletTown_GarysHouse_EventScript_CantGroomEgg msgbox PalletTown_GarysHouse_Text_LookingNiceInNoTime @@ -71,9 +71,9 @@ PalletTown_GarysHouse_EventScript_GroomMon:: @ 8168DB9 fadescreen FADE_TO_BLACK playfanfare MUS_ME_ASA waitfanfare - special Special_DaisyMassageServices + special DaisyMassageServices fadescreen FADE_FROM_BLACK - special Special_GetMonNickname + special BufferMonNickname msgbox PalletTown_GarysHouse_Text_ThereYouGoAllDone release end diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index de44c733a..644665017 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -35,7 +35,7 @@ PalletTown_PlayersHouse_2F_EventScript_PC:: @ 8168CE4 setvar VAR_0x8004, 32 special Special_SetSomeVariable setvar VAR_0x8004, 1 - special Special_AnimatePcTurnOn + special AnimatePcTurnOn playse SE_PC_ON msgbox Text_PlayerBootedUpPC special BedroomPC @@ -47,7 +47,7 @@ PalletTown_PlayersHouse_2F_EventScript_PC:: @ 8168CE4 EventScript_PalletTown_PlayersHouse_2F_ShutDownPC:: @ 8168D17 setvar VAR_0x8004, 1 playse SE_PC_OFF - special Special_AnimatePcTurnOff + special AnimatePcTurnOff special sub_812B35C releaseall end diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index ffa7d58f0..395d4d385 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -849,7 +849,7 @@ PalletTown_ProfessorOaksLab_Movement_OakWalkToDeskSouth:: @ 81698D0 PalletTown_ProfessorOaksLab_EventScript_RatePokedexOrTryGiveBalls:: @ 81698D6 setvar VAR_0x8004, 0 - specialvar VAR_RESULT, Special_GetPokedexCount + specialvar VAR_RESULT, GetPokedexCount copyvar VAR_0x8008, VAR_0x8005 copyvar VAR_0x8009, VAR_0x8006 getnumberstring 0, VAR_0x8008 diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index c75dd6218..6a3601717 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -182,9 +182,9 @@ PewterCity_Museum_1F_EventScript_AerodactylFossil:: @ 816A512 setvar VAR_0x8004, SPECIES_AERODACTYL setvar VAR_0x8005, 10 setvar VAR_0x8006, 3 - special Special_OpenMuseumFossilPic + special OpenMuseumFossilPic msgbox PewterCity_Museum_1F_Text_AerodactylFossil - special Special_CloseMuseumFossilPic + special CloseMuseumFossilPic releaseall end @@ -193,8 +193,8 @@ PewterCity_Museum_1F_EventScript_KabutopsFossil:: @ 816A532 setvar VAR_0x8004, SPECIES_KABUTOPS setvar VAR_0x8005, 10 setvar VAR_0x8006, 3 - special Special_OpenMuseumFossilPic + special OpenMuseumFossilPic msgbox PewterCity_Museum_1F_Text_KabutopsFossil - special Special_CloseMuseumFossilPic + special CloseMuseumFossilPic releaseall end diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 2821da205..817991d5a 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -78,7 +78,7 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom:: @ 8162B76 applymovement LOCALID_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakEnter waitmovement 0 delay 25 - specialvar VAR_RESULT, ScrSpecial_GetStarter + specialvar VAR_RESULT, GetStarterSpecies getspeciesname 0, VAR_RESULT msgbox PokemonLeague_ChampionsRoom_Text_OakCongratulations applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestRight diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc index 207cbb52d..e806d0157 100644 --- a/data/maps/PokemonLeague_HallOfFame/scripts.inc +++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc @@ -37,7 +37,7 @@ PokemonLeague_HallOfFame_EventScript_EnterRoom:: @ 8162D70 call EventScript_SetDefeatedEliteFourFlagsVars setrespawn SPAWN_PALLET_TOWN fadescreenspeed FADE_TO_BLACK, 24 - special Special_HallOfFame + special EnterHallOfFame waitstate releaseall end diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index 3caf16bfe..d5236139c 100644 --- a/data/maps/PokemonTower_6F/scripts.inc +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -7,7 +7,7 @@ PokemonTower_6F_EventScript_MarowakGhost:: @ 81634B8 msgbox PokemonTower_6F_Text_BeGoneIntruders goto_if_questlog EventScript_ReleaseEnd setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE - special ScrSpecial_StartMarowakBattle + special StartMarowakBattle waitstate special sub_8112364 compare VAR_RESULT, FALSE @ Set by CB2_EndMarowakBattle diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index 964a74e02..3877d5f57 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -8,7 +8,7 @@ PowerPlant_OnResume:: @ 816376F end PowerPlant_EventScript_TryRemoveStaticMon:: @ 8163779 - specialvar VAR_RESULT, Special_GetBattleOutcome + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne EventScript_Return removeobject VAR_LAST_TALKED @@ -48,10 +48,10 @@ PowerPlant_EventScript_Zapdos:: @ 81637B8 playbgm MUS_EXEYE, 0 waitbuttonpress setflag FLAG_SYS_SPECIAL_WILD_BATTLE - special Special_StartLegendaryBattle + special StartLegendaryBattle waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE - specialvar VAR_RESULT, Special_GetBattleOutcome + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON goto_if_eq PowerPlant_EventScript_DefeatedZapdos compare VAR_RESULT, B_OUTCOME_RAN @@ -85,7 +85,7 @@ PowerPlant_EventScript_Electrode1:: @ 816382F dowildbattle clearflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_8112364 - specialvar VAR_RESULT, Special_GetBattleOutcome + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON goto_if_eq PowerPlant_EventScript_FoughtElectrode1 compare VAR_RESULT, B_OUTCOME_RAN @@ -114,7 +114,7 @@ PowerPlant_EventScript_Electrode2:: @ 816388D dowildbattle clearflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_8112364 - specialvar VAR_RESULT, Special_GetBattleOutcome + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON goto_if_eq PowerPlant_EventScript_FoughtElectrode2 compare VAR_RESULT, B_OUTCOME_RAN diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc index f9f210fc0..43e3f8782 100644 --- a/data/maps/RocketHideout_Elevator/scripts.inc +++ b/data/maps/RocketHideout_Elevator/scripts.inc @@ -7,11 +7,11 @@ RocketHideout_Elevator_EventScript_FloorSelect:: @ 81614D9 setvar VAR_0x8004, 2 call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR - special Special_DrawElevatorCurrentFloorWindow + special DrawElevatorCurrentFloorWindow message Text_WantWhichFloor waitmessage setvar VAR_0x8004, 2 - specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos + specialvar VAR_RESULT, InitElevatorFloorSelectMenuPos switch VAR_RESULT case 0, RocketHideout_Elevator_EventScript_FloorSelectFromB1F case 1, RocketHideout_Elevator_EventScript_FloorSelectFromB2F @@ -73,15 +73,15 @@ RocketHideout_Elevator_EventScript_ToB4F:: @ 81615E1 end RocketHideout_Elevator_EventScript_ExitFloorSelect:: @ 8161609 - special Special_CloseElevatorCurrentFloorWindow + special CloseElevatorCurrentFloorWindow releaseall end RocketHideout_Elevator_EventScript_MoveElevator:: @ 816160E - special Special_CloseElevatorCurrentFloorWindow + special CloseElevatorCurrentFloorWindow closemessage waitse - special Special_AnimateElevator + special AnimateElevator waitstate setflag FLAG_TEMP_2 return diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index a4d477a4b..aa59cd95b 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -38,7 +38,7 @@ Route10_PokemonCenter_1F_EventScript_Aide:: @ 816FC65 compare VAR_RESULT, NO goto_if_eq Aide_EventScript_DeclineCheckMons setvar VAR_0x8004, 0 - specialvar VAR_RESULT, Special_GetPokedexCount + specialvar VAR_RESULT, GetPokedexCount getnumberstring 2, VAR_0x8006 call Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo compare VAR_0x8006, REQUIRED_OWNED_MONS diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index b8b6be3e7..22bd6e743 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -65,7 +65,7 @@ Route11_EastEntrance_2F_EventScript_Aide:: @ 816FDD8 compare VAR_RESULT, NO goto_if_eq Aide_EventScript_DeclineCheckMons setvar VAR_0x8004, 0 - specialvar VAR_RESULT, Special_GetPokedexCount + specialvar VAR_RESULT, GetPokedexCount getnumberstring 2, VAR_0x8006 call Route11_EastEntrance_2F_EventScript_GetAideRequestInfo compare VAR_0x8006, REQUIRED_CAUGHT_MONS diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index 9fe6d2e39..9ace7b7b0 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -30,7 +30,7 @@ Route12_EventScript_Snorlax:: @ 8168014 setflag FLAG_WOKE_UP_ROUTE_12_SNORLAX dowildbattle clearflag FLAG_SYS_SPECIAL_WILD_BATTLE - specialvar VAR_RESULT, Special_GetBattleOutcome + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON goto_if_eq Route12_EventScript_FoughtSnorlax compare VAR_RESULT, B_OUTCOME_RAN diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index 4b8386a86..70c8bf48f 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -33,12 +33,12 @@ Route12_FishingHouse_EventScript_CheckMagikarpRecord:: @ 816FF7F goto_if_questlog EventScript_ReleaseEnd special sub_8112364 setvar VAR_0x8004, SPECIES_MAGIKARP - specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies + specialvar VAR_RESULT, DoesPlayerPartyContainSpecies compare VAR_RESULT, FALSE goto_if_eq Route12_FishingHouse_EventScript_NoMagikarpInParty special GetMagikarpSizeRecordInfo msgbox Route12_FishingHouse_Text_OhMagikarpAllowMeToSee - special Special_ChooseMonFromParty + special ChoosePartyMon waitstate copyvar VAR_RESULT, VAR_0x8004 compare VAR_RESULT, PARTY_SIZE diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index 851ceb07f..9fa417865 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -11,7 +11,7 @@ Route15_WestEntrance_2F_EventScript_LeftBinoculars:: @ 8170093 waitbuttonpress erasemonpic setvar VAR_0x8004, SPECIES_ARTICUNO - special Special_SetSeenMon + special SetSeenMon releaseall end @@ -28,7 +28,7 @@ Route15_WestEntrance_2F_EventScript_Aide:: @ 81700B9 compare VAR_RESULT, NO goto_if_eq Aide_EventScript_DeclineCheckMons setvar VAR_0x8004, 0 - specialvar VAR_RESULT, Special_GetPokedexCount + specialvar VAR_RESULT, GetPokedexCount getnumberstring 2, VAR_0x8006 call Route15_WestEntrance_2F_EventScript_GetAideRequestInfo compare VAR_0x8006, REQUIRED_CAUGHT_MONS diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index 27a5efccc..62d47983f 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -26,7 +26,7 @@ Route16_OnWarp:: @ 8168113 .2byte 0 Route16_OnWarpCyclingRoad:: @ 816811D - special Special_ForcePlayerOntoBike + special ForcePlayerOntoBike end Route16_EventScript_Snorlax:: @ 8168121 @@ -48,7 +48,7 @@ Route16_EventScript_Snorlax:: @ 8168121 setflag FLAG_SYS_SPECIAL_WILD_BATTLE dowildbattle clearflag FLAG_SYS_SPECIAL_WILD_BATTLE - specialvar VAR_RESULT, Special_GetBattleOutcome + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON goto_if_eq Route16_EventScript_FoughtSnorlax compare VAR_RESULT, B_OUTCOME_RAN diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc index 0843978f2..08c02d0ee 100644 --- a/data/maps/Route16_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -28,7 +28,7 @@ Route16_NorthEntrance_2F_EventScript_Aide:: @ 81702E3 compare VAR_RESULT, NO goto_if_eq Aide_EventScript_DeclineCheckMons setvar VAR_0x8004, 0 - specialvar VAR_RESULT, Special_GetPokedexCount + specialvar VAR_RESULT, GetPokedexCount getnumberstring 2, VAR_0x8006 call Route16_NorthEntrance_2F_EventScript_GetAideRequestInfo compare VAR_0x8006, REQUIRED_CAUGHT_MONS diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc index 43d2b029e..385d60134 100644 --- a/data/maps/Route18/scripts.inc +++ b/data/maps/Route18/scripts.inc @@ -17,7 +17,7 @@ Route18_OnWarp:: @ 8168211 .2byte 0 Route18_OnWarpCyclingRoad:: @ 816821B - special Special_ForcePlayerOntoBike + special ForcePlayerOntoBike end Route18_EventScript_RouteSign:: @ 816821F diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 57c724c29..688cdc41d 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -262,7 +262,7 @@ Route25_SeaCottage_EventScript_ViewEevee:: @ 817082B waitbuttonpress erasemonpic setvar VAR_0x8004, SPECIES_EEVEE - special Special_SetSeenMon + special SetSeenMon goto Route25_SeaCottage_EventScript_BillsMonList end @@ -271,7 +271,7 @@ Route25_SeaCottage_EventScript_ViewFlareon:: @ 8170840 waitbuttonpress erasemonpic setvar VAR_0x8004, SPECIES_FLAREON - special Special_SetSeenMon + special SetSeenMon goto Route25_SeaCottage_EventScript_BillsMonList end @@ -280,7 +280,7 @@ Route25_SeaCottage_EventScript_ViewJolteon:: @ 8170855 waitbuttonpress erasemonpic setvar VAR_0x8004, SPECIES_JOLTEON - special Special_SetSeenMon + special SetSeenMon goto Route25_SeaCottage_EventScript_BillsMonList end @@ -289,7 +289,7 @@ Route25_SeaCottage_EventScript_ViewVaporeon:: @ 817086A waitbuttonpress erasemonpic setvar VAR_0x8004, SPECIES_VAPOREON - special Special_SetSeenMon + special SetSeenMon goto Route25_SeaCottage_EventScript_BillsMonList end diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc index a94d72fd7..c1a21bc35 100644 --- a/data/maps/Route2_EastBuilding/scripts.inc +++ b/data/maps/Route2_EastBuilding/scripts.inc @@ -12,7 +12,7 @@ Route2_EastBuilding_EventScript_Aide:: @ 816F67F compare VAR_RESULT, NO goto_if_eq Aide_EventScript_DeclineCheckMons setvar VAR_0x8004, 0 - specialvar VAR_RESULT, Special_GetPokedexCount + specialvar VAR_RESULT, GetPokedexCount getnumberstring 2, VAR_0x8006 call Route2_EastBuilding_EventScript_GetAideRequestInfo compare VAR_0x8006, REQUIRED_SEEN_MONS diff --git a/data/maps/SSAnne_2F_Room1/scripts.inc b/data/maps/SSAnne_2F_Room1/scripts.inc index a31c914c1..f713d6a7a 100644 --- a/data/maps/SSAnne_2F_Room1/scripts.inc +++ b/data/maps/SSAnne_2F_Room1/scripts.inc @@ -7,7 +7,7 @@ SSAnne_2F_Room1_EventScript_Gentleman:: @ 8160C97 message SSAnne_2F_Room1_Text_SleepingMonLookedLikeThis waitmessage setvar VAR_0x8004, SPECIES_SNORLAX - special Special_SetSeenMon + special SetSeenMon drawmonpic SPECIES_SNORLAX, 10, 3 waitbuttonpress erasemonpic diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index 416c98cd6..84a267ac8 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -20,7 +20,7 @@ SSAnne_Exterior_ExitSSAnne:: @ 8160859 call_if_ge SSAnne_Exterior_WalkInPlaceDown fadenewbgm MUS_NAMINORI delay 50 - special Special_SSAnneDepartureCutscene + special DoSSAnneDepartureCutscene waitstate removeobject 1 applymovement OBJ_EVENT_ID_PLAYER, SSAnne_Exterior_Movement_Exit diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index c7343fcb6..3e63ff0ed 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -13,7 +13,7 @@ SeafoamIslands_B4F_OnResume:: @ 8163048 end SeafoamIslands_B4F_EventScript_TryRemoveArticuno:: @ 8163052 - specialvar VAR_RESULT, Special_GetBattleOutcome + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne EventScript_Return removeobject VAR_LAST_TALKED @@ -64,7 +64,7 @@ SeafoamIslands_B4F_OnWarp:: @ 81630E7 SeafoamIslands_B4F_EventScript_WarpInOnCurrent:: @ 81630F1 turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH - special Special_ForcePlayerToStartSurfing + special ForcePlayerToStartSurfing end SeafoamIslands_B4F_OnFrame:: @ 81630F9 @@ -172,10 +172,10 @@ SeafoamIslands_B4F_EventScript_Articuno:: @ 81631AC playbgm MUS_EXEYE, 0 waitbuttonpress setflag FLAG_SYS_SPECIAL_WILD_BATTLE - special Special_StartLegendaryBattle + special StartLegendaryBattle waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE - specialvar VAR_RESULT, Special_GetBattleOutcome + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON goto_if_eq SeafoamIslands_B4F_EventScript_DefeatedArticuno compare VAR_RESULT, B_OUTCOME_RAN diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index 311c7200f..be7e4ac77 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -46,14 +46,14 @@ SevenIsland_House_Room2_EventScript_BattleTie:: @ 8170AFE SevenIsland_House_Room2_EventScript_BattleWon:: @ 8170B0C setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1 - special Special_ShowStringVar4AsFieldMessage + special ShowFieldMessageStringVar4 waitmessage waitbuttonpress return SevenIsland_House_Room2_EventScript_BattleLost:: @ 8170B17 setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2 - special Special_ShowStringVar4AsFieldMessage + special ShowFieldMessageStringVar4 waitmessage waitbuttonpress return diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc index 70ef487b8..54efea505 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc @@ -111,7 +111,7 @@ SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed:: @ 8164F2E setvar VAR_0x8005, 1 setvar VAR_0x8006, 8 setvar VAR_0x8007, 3 - special Special_ShakeScreen + special ShakeScreen delay 60 return @@ -120,13 +120,13 @@ SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolvedShakeScreen:: @ 8164 setvar VAR_0x8005, 2 setvar VAR_0x8006, 10 setvar VAR_0x8007, 3 - special Special_ShakeScreen + special ShakeScreen delay 60 setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 setvar VAR_0x8006, 12 setvar VAR_0x8007, 2 - special Special_ShakeScreen + special ShakeScreen delay 60 playse SE_FU_ZUZUZU waitse diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc index 790eba70a..758cc1e52 100644 --- a/data/maps/SilphCo_Elevator/scripts.inc +++ b/data/maps/SilphCo_Elevator/scripts.inc @@ -6,11 +6,11 @@ SilphCo_Elevator_EventScript_FloorSelect:: @ 8161F6F setvar VAR_0x8004, 1 call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR - special Special_DrawElevatorCurrentFloorWindow + special DrawElevatorCurrentFloorWindow message Text_WantWhichFloor waitmessage setvar VAR_0x8004, LISTMENU_SILPHCO_FLOORS - specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos + specialvar VAR_RESULT, InitElevatorFloorSelectMenuPos special Special_ListMenu waitstate switch VAR_RESULT @@ -140,15 +140,15 @@ SilphCo_Elevator_EventScript_To11F:: @ 81621BF end SilphCo_Elevator_EventScript_ExitFloorSelect:: @ 81621E7 - special Special_CloseElevatorCurrentFloorWindow + special CloseElevatorCurrentFloorWindow releaseall end SilphCo_Elevator_EventScript_MoveElevator:: @ 81621EC - special Special_CloseElevatorCurrentFloorWindow + special CloseElevatorCurrentFloorWindow closemessage waitse - special Special_AnimateElevator + special AnimateElevator waitstate setflag FLAG_TEMP_2 return diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index 67f4c6a2d..e0d558ae0 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -31,7 +31,7 @@ SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire:: @ 81641B5 setvar VAR_0x8005, 0 setvar VAR_0x8006, 12 setvar VAR_0x8007, 3 - special Special_ShakeScreen + special ShakeScreen delay 60 compare VAR_FACING, DIR_NORTH call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireNorth diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc index 173179ac3..9f9b33c7f 100644 --- a/data/maps/SixIsland_WaterPath_House1/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc @@ -7,12 +7,12 @@ SixIsland_WaterPath_House1_EventScript_Beauty:: @ 817206D goto_if_questlog EventScript_ReleaseEnd special sub_8112364 setvar VAR_0x8004, SPECIES_HERACROSS - specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies + specialvar VAR_RESULT, DoesPlayerPartyContainSpecies compare VAR_RESULT, FALSE goto_if_eq SixIsland_WaterPath_House1_EventScript_NoHeracrossInParty special GetHeracrossSizeRecordInfo msgbox SixIsland_WaterPath_House1_Text_MayIMeasureHeracross - special Special_ChooseMonFromParty + special ChoosePartyMon waitstate copyvar VAR_RESULT, VAR_0x8004 compare VAR_RESULT, PARTY_SIZE diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index cc750f1f4..dab6cb795 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -30,7 +30,7 @@ ThreeIsland_BerryForest_EventScript_Lostelle:: @ 8163C83 giveitem ITEM_IAPAPA_BERRY compare VAR_RESULT, FALSE call_if_eq ThreeIsland_BerryForest_EventScript_NoRoomForBerry - special Special_BufferBigGuyOrBigGirlString + special BufferBigGuyOrBigGirlString msgbox ThreeIsland_BerryForest_Text_LetsGoHome closemessage setflag FLAG_RESCUED_LOSTELLE diff --git a/data/maps/ThreeIsland_House1/scripts.inc b/data/maps/ThreeIsland_House1/scripts.inc index d05416f9d..603cc3095 100644 --- a/data/maps/ThreeIsland_House1/scripts.inc +++ b/data/maps/ThreeIsland_House1/scripts.inc @@ -4,7 +4,7 @@ ThreeIsland_House1_MapScripts:: @ 8171819 ThreeIsland_House1_EventScript_Lostelle:: @ 817181A lock faceplayer - special Special_BufferBigGuyOrBigGirlString + special BufferBigGuyOrBigGirlString msgbox ThreeIsland_House1_Text_YoureAlwaysSoCool release end diff --git a/data/maps/TrainerTower_Elevator/scripts.inc b/data/maps/TrainerTower_Elevator/scripts.inc index 349667102..b49a9b45a 100644 --- a/data/maps/TrainerTower_Elevator/scripts.inc +++ b/data/maps/TrainerTower_Elevator/scripts.inc @@ -8,11 +8,11 @@ TrainerTower_Elevator_EventScript_FloorSelect:: @ 8164B03 setvar VAR_0x8004, 6 call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR - special Special_DrawElevatorCurrentFloorWindow + special DrawElevatorCurrentFloorWindow message Text_WantWhichFloor waitmessage setvar VAR_0x8004, 6 - specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos + specialvar VAR_RESULT, InitElevatorFloorSelectMenuPos switch VAR_RESULT case 0, TrainerTower_Elevator_EventScript_FloorSelectFromRoof case 1, TrainerTower_Elevator_EventScript_FloorSelectFromLobby @@ -43,7 +43,7 @@ TrainerTower_Elevator_EventScript_SelectLobby:: @ 8164B90 goto_if_eq TrainerTower_Elevator_EventScript_CloseFloorSelect call TrainerTower_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 3 - special Special_CloseElevatorCurrentFloorWindow + special CloseElevatorCurrentFloorWindow delay 25 applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Elevator_Movement_ExitElevator waitmovement 0 @@ -57,15 +57,15 @@ TrainerTower_Elevator_EventScript_SelectRoof:: @ 8164BCD end TrainerTower_Elevator_EventScript_CloseFloorSelect:: @ 8164BD3 - special Special_CloseElevatorCurrentFloorWindow + special CloseElevatorCurrentFloorWindow releaseall end TrainerTower_Elevator_EventScript_MoveElevator:: @ 8164BD8 - special Special_CloseElevatorCurrentFloorWindow + special CloseElevatorCurrentFloorWindow closemessage waitse - special Special_AnimateElevator + special AnimateElevator waitstate setflag FLAG_TEMP_2 return diff --git a/data/maps/TrainerTower_Lobby/scripts.inc b/data/maps/TrainerTower_Lobby/scripts.inc index 0fc2422b6..bdda45de8 100644 --- a/data/maps/TrainerTower_Lobby/scripts.inc +++ b/data/maps/TrainerTower_Lobby/scripts.inc @@ -212,7 +212,7 @@ TrainerTower_Lobby_EventScript_ShowRecords:: @ 8164AD8 lockall fadescreen FADE_TO_BLACK setvar VAR_0x8004, 1 - special Special_BattleRecords + special ShowBattleRecords waitstate releaseall end diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index 241f317a4..20b0a2710 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -51,11 +51,11 @@ TwoIsland_House_EventScript_AskTutorMon:: @ 81716A5 TwoIsland_House_EventScript_ChooseMonToTutor:: @ 81716BE msgbox TwoIsland_House_Text_TutorWhichMon - special Special_SelectMoveTutorMon + special SelectMoveTutorMon waitstate compare VAR_0x8004, PARTY_SIZE goto_if_ge TwoIsland_House_EventScript_EndTutorMove - special Special_IsSelectedMonEgg + special IsSelectedMonEgg compare VAR_RESULT, TRUE goto_if_eq TwoIsland_House_EventScript_CantTutorEgg compare VAR_0x8005, 0 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index f3b5f4dff..2edfe5801 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -40,7 +40,7 @@ TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene:: @ 8171435 textcolor 0 msgbox TwoIsland_JoyfulGameCorner_Text_YouRescuedLostelle textcolor 1 - special Special_BufferBigGuyOrBigGirlString + special BufferBigGuyOrBigGirlString msgbox TwoIsland_JoyfulGameCorner_Text_LostelleItsOkayDaddy closemessage applymovement LOCALID_LOSTELLE, Movement_WalkInPlaceFastestDown diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index 5d3760df9..232453543 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -45,7 +45,7 @@ VermilionCity_Gym_OnTransition:: @ 816B772 VermilionCity_Gym_EventScript_InitTrashCans:: @ 816B778 goto_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, EventScript_Return - special Special_SetVermilionTrashCans + special SetVermilionTrashCans copyvar VAR_TEMP_0, SWITCH1_ID copyvar VAR_TEMP_1, SWITCH2_ID return @@ -168,7 +168,7 @@ VermilionCity_Gym_EventScript_TrySwitchTwo:: @ 816B89E goto_if_eq VermilionCity_Gym_EventScript_FoundSwitchTwo msgbox VermilionCity_Gym_Text_OnlyTrashLocksWereReset clearflag FOUND_FIRST_SWITCH - special Special_SetVermilionTrashCans + special SetVermilionTrashCans copyvar VAR_TEMP_0, SWITCH1_ID copyvar VAR_TEMP_1, SWITCH2_ID call VermilionCity_Gym_EventScript_SetBeamsOn diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 9e4f8f5c7..5309c0493 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -147,7 +147,7 @@ ViridianCity_EventScript_TutorialUnused:: @ 8165A65 msgbox ViridianCity_Text_ThatWasEducationalTakeThis goto_if_questlog EventScript_ReleaseEnd special sub_8112364 - special ScrSpecial_StartOldManTutorialBattle + special StartOldManTutorialBattle waitstate release end @@ -240,7 +240,7 @@ ViridianCity_EventScript_DoTutorialBattle:: @ 8165B4C closemessage goto_if_questlog EventScript_ReleaseEnd special sub_8112364 - special ScrSpecial_StartOldManTutorialBattle + special StartOldManTutorialBattle waitstate lock faceplayer diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index ad41b1afb..eb5e3a6df 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -446,7 +446,7 @@ CableClub_EventScript_CheckPartyTradeRequirements:: @ 81BB79C specialvar VAR_RESULT, CalculatePlayerPartyCount compare VAR_RESULT, 2 goto_if_lt CableClub_EventScript_NeedTwoMonsToTrade - specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty + specialvar VAR_RESULT, DoesPartyHaveEnigmaBerry compare VAR_RESULT, TRUE goto_if_eq CableClub_EventScript_CantTradeEnigmaBerry setvar VAR_RESULT, TRUE @@ -601,7 +601,7 @@ CableClub_EventScript_ShowBattleRecords:: @ 81BB8A7 lockall fadescreen FADE_TO_BLACK setvar VAR_0x8004, 0 - special Special_BattleRecords + special ShowBattleRecords waitstate releaseall end @@ -760,7 +760,7 @@ TradeCenter_TerminateLink:: @ 81BB9F0 textcolor 3 messageautoscroll Text_TerminateLinkConfirmation waitmessage - special sub_8081770 + special ExitLinkRoom end CableClub_EventScript_DoLinkRoomExit:: @ 81BB9FC @@ -775,7 +775,7 @@ CableClub_EventScript_UnionRoomAttendant:: @ 81BBA04 lock faceplayer goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements - specialvar VAR_RESULT, Special_BadEggInParty + specialvar VAR_RESULT, IsBadEggInParty compare VAR_RESULT, TRUE goto_if_eq CableClub_EventScript_AbortLinkPlayerHasBadEgg copyvar VAR_0x8007, VAR_LAST_TALKED @@ -842,7 +842,7 @@ CableClub_EventScript_CheckPartyUnionRoomRequirements:: @ 81BBB1E specialvar VAR_RESULT, CountPartyNonEggMons compare VAR_RESULT, 2 goto_if_lt CableClub_EventScript_NeedTwoMonsForUnionRoom - specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty + specialvar VAR_RESULT, DoesPartyHaveEnigmaBerry compare VAR_RESULT, TRUE goto_if_eq CableClub_EventScript_NoEnigmaBerryInUnionRoom setvar VAR_RESULT, TRUE @@ -885,7 +885,7 @@ CableClub_EventScript_DirectCornerAttendant:: @ 81BBB9C lock faceplayer goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements - specialvar VAR_RESULT, Special_BadEggInParty + specialvar VAR_RESULT, IsBadEggInParty compare VAR_RESULT, TRUE goto_if_eq CableClub_EventScript_AbortLinkPlayerHasBadEgg specialvar VAR_RESULT, IsWirelessAdapterConnected @@ -1149,7 +1149,7 @@ CableClub_EventScript_81BBFD8:: @ 81BBFD8 goto_if_eq CableClub_EventScript_AdapterNotConnected special HelpSystem_Disable fadescreen FADE_TO_BLACK - special Special_WirelessCommunicationScreen + special ShowWirelessCommunicationScreen waitstate msgbox CableClub_Text_ParticipantsStepUpToCounter special HelpSystem_Enable diff --git a/data/scripts/cave_of_origin.inc b/data/scripts/cave_of_origin.inc index 6a1f967f2..88e402ac3 100644 --- a/data/scripts/cave_of_origin.inc +++ b/data/scripts/cave_of_origin.inc @@ -22,7 +22,7 @@ CaveOfOrigin_EventScript_Shake:: @ 81A74B7 setvar VAR_0x8005, 1 setvar VAR_0x8006, 8 setvar VAR_0x8007, 5 - special Special_ShakeScreen + special ShakeScreen waitstate releaseall end diff --git a/data/scripts/field_moves.inc b/data/scripts/field_moves.inc index b26aa534c..282071755 100644 --- a/data/scripts/field_moves.inc +++ b/data/scripts/field_moves.inc @@ -89,7 +89,7 @@ EventScript_UseRockSmash:: @ 81BE06F applymovement VAR_LAST_TALKED, Movement_BreakRock waitmovement 0 removeobject VAR_LAST_TALKED - special ScrSpecial_RockSmashWildEncounter + special RockSmashWildEncounter compare VAR_RESULT, FALSE goto_if_eq EventScript_RockSmashNoEncounter waitstate diff --git a/data/scripts/itemfinder.inc b/data/scripts/itemfinder.inc index 8b806f815..6eabdc395 100644 --- a/data/scripts/itemfinder.inc +++ b/data/scripts/itemfinder.inc @@ -15,7 +15,7 @@ EventScript_DigUpItemPutInPocket:: waitmessage delay 60 msgbox Text_PutItemAway - special Special_SetHiddenItemFlag + special SetHiddenItemFlag releaseall end diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc index 744e50199..46d4a7c52 100644 --- a/data/scripts/move_tutors.inc +++ b/data/scripts/move_tutors.inc @@ -455,7 +455,7 @@ TwoIsland_CapeBrink_House_EventScript_StarterTutor:: @ 81C4DEC goto_if_set FLAG_TEMP_2, CapeBrinkTutor_EventScript_MoveJustTaught getfirstpartymonname 0 msgbox Text_UltimateMoveThatMon - specialvar VAR_RESULT, Special_CapeBrinkGetMoveToTeachLeadPokemon + specialvar VAR_RESULT, CapeBrinkGetMoveToTeachLeadPokemon compare VAR_RESULT, FALSE goto_if_eq CapeBrinkTutor_EventScript_NoLeadStarter copyvar VAR_0x8009, VAR_0x8005 @@ -496,7 +496,7 @@ CapeBrinkTutor_EventScript_TaughtAllMoves:: @ 81C4EA1 CapeBrinkTutor_EventScript_TaughtMove:: @ 81C4EAB copyvar VAR_0x8005, VAR_0x8009 - specialvar VAR_RESULT, Special_HasLearnedAllMovesFromCapeBrinkTutor + specialvar VAR_RESULT, HasLearnedAllMovesFromCapeBrinkTutor compare VAR_RESULT, TRUE goto_if_eq CapeBrinkTutor_EventScript_LearnedAllMoves msgbox Text_TaughtMove diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index bfc9fbbbd..8034ee0b1 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -45,7 +45,7 @@ EventScript_CancelGiveProfile: @ 81BEE9E EventScript_GaveProfile: @ 81BEEA8 setvar GAVE_PROFILE, TRUE setvar VAR_0x8004, 0 - special Special_BufferEasyChatMessage + special ShowEasyChatMessage waitmessage delay 80 msgbox Text_ProfileSaysSomethingAboutYou @@ -92,7 +92,7 @@ EventScript_DeclineGiveNewProfile: @ 81BEF35 EventScript_GaveSpecialProfile: @ 81BEF3F setvar GAVE_PROFILE, TRUE setvar VAR_0x8004, 0 - special Special_BufferEasyChatMessage + special ShowEasyChatMessage waitmessage delay 80 msgbox Text_HeardThatBefore diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc index a50693292..961be1971 100644 --- a/data/scripts/obtain_item.inc +++ b/data/scripts/obtain_item.inc @@ -133,7 +133,7 @@ Std_FindItem:: @ 81A67B3 EventScript_PickUpItem:: @ 81A67EE removeobject VAR_LAST_TALKED additem VAR_0x8004, VAR_0x8005 - specialvar VAR_RESULT, Special_ItemIsTM_GetMoveName + specialvar VAR_RESULT, BufferTMHMMoveName copyvar VAR_0x8008, VAR_RESULT compare VAR_0x8008, TRUE call_if_eq EventScript_FoundTMHM @@ -187,7 +187,7 @@ EventScript_PickedUpHiddenItem:: waitfanfare waitmessage msgbox Text_PutItemAway - special Special_SetHiddenItemFlag + special SetHiddenItemFlag releaseall end @@ -215,7 +215,7 @@ EventScript_NoRoomForHiddenItem:: EventScript_TryPickUpHiddenCoins:: goto_if_unset FLAG_GOT_COIN_CASE, EventScript_NoCaseForHiddenCoins checkcoins VAR_RESULT - specialvar VAR_RESULT, Special_CheckAddCoins + specialvar VAR_RESULT, CheckAddCoins compare VAR_RESULT, FALSE goto_if_eq EventScript_HiddenCoinsButCaseIsFull addcoins VAR_0x8006 @@ -225,7 +225,7 @@ EventScript_TryPickUpHiddenCoins:: waitfanfare waitmessage msgbox Text_PutCoinsAwayInCoinCase - special Special_SetHiddenItemFlag + special SetHiddenItemFlag releaseall end diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc index 16cb13647..a517bced1 100644 --- a/data/scripts/pc.inc +++ b/data/scripts/pc.inc @@ -5,7 +5,7 @@ EventScript_PC:: @ 81A6955 setvar VAR_0x8004, 27 special Special_SetSomeVariable setvar VAR_0x8004, 0 - special Special_AnimatePcTurnOn + special AnimatePcTurnOn playse SE_PC_ON msgbox Text_BootedUpPC goto EventScript_PCMainMenu @@ -66,7 +66,7 @@ EventScript_AccessBillsPC:: @ 81A6A3D EventScript_TurnOffPC:: @ 81A6A46 setvar VAR_0x8004, 0 playse SE_PC_OFF - special Special_AnimatePcTurnOff + special AnimatePcTurnOff special sub_812B35C releaseall end diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc index fddd3fd72..2d537c3af 100644 --- a/data/scripts/pkmn_center_nurse.inc +++ b/data/scripts/pkmn_center_nurse.inc @@ -29,7 +29,7 @@ EventScript_PkmnCenterNurse_TakeAndHealPkmn:: @ 81A65CE return EventScript_PkmnCenterNurse_CheckTrainerTowerAndUnionRoom:: @ 81A65EC - specialvar VAR_RESULT, Special_PlayerIsNotInTrainerTowerLobby + specialvar VAR_RESULT, IsPlayerNotInTrainerTowerLobby compare VAR_RESULT, FALSE goto_if_eq EventScript_PkmnCenterNurse_ReturnPkmn specialvar VAR_RESULT, BufferUnionRoomPlayerName diff --git a/data/scripts/pokedex_rating.inc b/data/scripts/pokedex_rating.inc index 8d313d200..903d06aa1 100644 --- a/data/scripts/pokedex_rating.inc +++ b/data/scripts/pokedex_rating.inc @@ -16,7 +16,7 @@ PokedexRating_EventScript_NormalIntro:: @ 81A73AD PokedexRating_EventScript_ShowRatingMsg:: @ 81A73B6 copyvar VAR_0x8004, VAR_0x8009 - special Special_GetProfOaksRatingMessage + special GetProfOaksRatingMessage waitmessage compare VAR_RESULT, FALSE call_if_eq PokedexRating_EventScript_NormalFanfare @@ -39,7 +39,7 @@ PokedexRating_EventScript_Rate:: @ 81A73E0 special HelpSystem_BackupSomeVariable special Special_SetSomeVariable setvar VAR_0x8004, 0 - specialvar VAR_RESULT, Special_GetPokedexCount + specialvar VAR_RESULT, GetPokedexCount copyvar VAR_0x8008, VAR_0x8005 copyvar VAR_0x8009, VAR_0x8006 copyvar VAR_0x800A, VAR_RESULT @@ -51,7 +51,7 @@ PokedexRating_EventScript_Rate:: @ 81A73E0 compare VAR_0x800A, FALSE goto_if_eq PokedexRating_EventScript_EndRating @ National Dex not enabled setvar VAR_0x8004, 1 - specialvar VAR_RESULT, Special_GetPokedexCount + specialvar VAR_RESULT, GetPokedexCount copyvar VAR_0x8008, VAR_0x8005 copyvar VAR_0x8009, VAR_0x8006 getnumberstring 0, VAR_0x8008 @ Num National Seen diff --git a/data/scripts/pokemon_league.inc b/data/scripts/pokemon_league.inc index 806e0976a..65baba59a 100644 --- a/data/scripts/pokemon_league.inc +++ b/data/scripts/pokemon_league.inc @@ -60,5 +60,5 @@ PokemonLeague_Movement_ForcePlayerIn:: @ 81A75D3 step_end PokemonLeague_EventScript_DoLightingEffect:: @ 81A75D5 - special Special_PokemonLeagueLightingEffect + special DoPokemonLeagueLightingEffect return diff --git a/data/scripts/questionnaire.inc b/data/scripts/questionnaire.inc index 8e28f80db..c7636ce22 100644 --- a/data/scripts/questionnaire.inc +++ b/data/scripts/questionnaire.inc @@ -8,7 +8,7 @@ EventScript_Questionnaire:: @ 81A7702 call Common_ShowEasyChatScreen lock faceplayer - specialvar VAR_0x8008, Special_GetMartClerkObjectId + specialvar VAR_0x8008, GetMartClerkObjectId textcolor 0 compare VAR_0x8004, 0 goto_if_eq EventScript_EnableMysteryGift diff --git a/data/scripts/seagallop.inc b/data/scripts/seagallop.inc index c5489d7ee..51fd0c675 100644 --- a/data/scripts/seagallop.inc +++ b/data/scripts/seagallop.inc @@ -138,9 +138,9 @@ VermilionCity_Movement_WalkUp:: @ 81A911C EventScript_SeviiDestinationsPage1:: @ 81A911E setvar VAR_0x8005, 0 - special Special_DrawSeagallopDestinationMenu + special DrawSeagallopDestinationMenu waitstate - specialvar VAR_0x8006, Special_GetSelectedSeagallopDestination + specialvar VAR_0x8006, GetSelectedSeagallopDestination switch VAR_0x8006 case SEAGALLOP_VERMILION_CITY, EventScript_SailToVermilionCity case SEAGALLOP_ONE_ISLAND, EventScript_SailToOneIsland @@ -153,9 +153,9 @@ EventScript_SeviiDestinationsPage1:: @ 81A911E EventScript_SeviiDestinationsPage2:: @ 81A917F setvar VAR_0x8005, 1 - special Special_DrawSeagallopDestinationMenu + special DrawSeagallopDestinationMenu waitstate - specialvar VAR_0x8006, Special_GetSelectedSeagallopDestination + specialvar VAR_0x8006, GetSelectedSeagallopDestination switch VAR_0x8006 case SEAGALLOP_FOUR_ISLAND, EventScript_SailToFourIsland case SEAGALLOP_FIVE_ISLAND, EventScript_SailToFiveIsland diff --git a/data/scripts/silphco_doors.inc b/data/scripts/silphco_doors.inc index 5abeb2316..c76d08bf3 100644 --- a/data/scripts/silphco_doors.inc +++ b/data/scripts/silphco_doors.inc @@ -559,6 +559,6 @@ EventScript_OpenDoor:: @ 81A8B32 playse SE_KI_GASYAN special DrawWholeMapView waitse - special Special_SetHiddenItemFlag + special SetHiddenItemFlag releaseall end diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc index a49700846..3e4eb2c44 100644 --- a/data/scripts/trainer_battle.inc +++ b/data/scripts/trainer_battle.inc @@ -63,7 +63,7 @@ EventScript_TryDoRematchBattle:: @ 81A4F3E waitmessage waitbuttonpress goto_if_questlog EventScript_EndQuestLogRematch - special BattleSetup_StartRematchBattle + special StartRematchBattle waitstate releaseall end @@ -84,7 +84,7 @@ EventScript_TryDoDoubleRematchBattle:: @ 81A4F73 waitmessage waitbuttonpress goto_if_questlog EventScript_EndQuestLogRematch - special BattleSetup_StartRematchBattle + special StartRematchBattle waitstate releaseall end diff --git a/data/scripts/trainer_card.inc b/data/scripts/trainer_card.inc index 8d441606f..993db55bc 100644 --- a/data/scripts/trainer_card.inc +++ b/data/scripts/trainer_card.inc @@ -47,7 +47,7 @@ CeladonCity_GameCorner_EventScript_PrintPhoto:: @ 81B2907 playse MUS_ME_PHOTO dofieldeffect FLDEFF_UNK_45 delay 60 - special Special_UpdateTrainerCardPhotoIcons + special UpdateTrainerCardPhotoIcons msgbox CeladonCity_GameCorner_Text_PrintIsReadyCheckTrainerCard hidemoneybox 0, 0 releaseall diff --git a/data/scripts/white_out.inc b/data/scripts/white_out.inc index b961a6cf2..2758737bc 100644 --- a/data/scripts/white_out.inc +++ b/data/scripts/white_out.inc @@ -55,7 +55,7 @@ EventScript_FieldWhiteOutNoMoney:: @ 81A8E2E end EventScript_FieldWhiteOutHasMoney:: @ 81A8E3C - special Special_OverworldWhiteOutGetMoneyLoss + special OverworldWhiteOutGetMoneyLoss msgbox Text_WhitedOutLostMoney goto EventScript_FieldWhiteOutFade end @@ -64,6 +64,6 @@ EventScript_FieldWhiteOutFade:: @ 81A8E4D special Script_FadeOutMapMusic waitstate fadescreen FADE_TO_BLACK - special SetCB2Whiteout + special SetCB2WhiteOut waitstate end diff --git a/data/specials.inc b/data/specials.inc index 1440f7798..0e3c6d5ea 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -13,8 +13,8 @@ gSpecials:: @ 815FD60 def_special DoCableClubWarp def_special ReturnFromLinkRoom def_special CleanupLinkRoomState - def_special sub_8081770 - def_special NullFieldSpecial + def_special ExitLinkRoom + def_special NullFieldSpecial @ Secret Base specials def_special NullFieldSpecial def_special NullFieldSpecial def_special NullFieldSpecial @@ -42,8 +42,8 @@ gSpecials:: @ 815FD60 def_special CloseLink def_special EnterColosseumPlayerSpot def_special EnterTradeSeat - def_special Special_WiredCableClubTrade - def_special Special_CableClub_AskSaveTheGame + def_special StartWiredCableClubTrade + def_special CableClub_AskSaveTheGame def_special NullFieldSpecial def_special NullFieldSpecial def_special NullFieldSpecial @@ -51,7 +51,7 @@ gSpecials:: @ 815FD60 def_special LoadPlayerParty def_special ChooseHalfPartyForBattle def_special Script_ShowLinkTrainerCard - def_special NullFieldSpecial + def_special NullFieldSpecial @ Berry Tree specials def_special NullFieldSpecial def_special NullFieldSpecial def_special NullFieldSpecial @@ -67,18 +67,18 @@ gSpecials:: @ 815FD60 def_special PlayTrainerEncounterMusic def_special ShouldTryRematchBattle def_special IsTrainerReadyForRematch - def_special BattleSetup_StartRematchBattle + def_special StartRematchBattle def_special ShowPokemonStorageSystem def_special HasEnoughMonsForDoubleBattle + def_special NullFieldSpecial @ Hoenn TV specials def_special NullFieldSpecial def_special NullFieldSpecial def_special NullFieldSpecial def_special NullFieldSpecial def_special NullFieldSpecial def_special NullFieldSpecial - def_special NullFieldSpecial - def_special Special_HasLeadMonBeenRenamed - def_special NullFieldSpecial + def_special HasLeadMonBeenRenamed + def_special NullFieldSpecial @ Contest specials def_special NullFieldSpecial def_special NullFieldSpecial def_special NullFieldSpecial @@ -102,10 +102,10 @@ gSpecials:: @ 815FD60 def_special NullFieldSpecial def_special sub_8081128 def_special Field_AskSaveTheGame - def_special nullsub_56 + def_special DoWateringBerryTreeAnim def_special ShowEasyChatScreen - def_special Special_BufferEasyChatMessage - def_special NullFieldSpecial + def_special ShowEasyChatMessage + def_special NullFieldSpecial @ Mauville Man specials def_special NullFieldSpecial def_special NullFieldSpecial def_special NullFieldSpecial @@ -132,8 +132,8 @@ gSpecials:: @ 815FD60 def_special GetMagikarpSizeRecordInfo def_special CompareMagikarpSize def_special NameRaterWasNicknameChanged - def_special Special_GetMonNickname - def_special Special_IsMonOTIDNotPlayers + def_special BufferMonNickname + def_special IsMonOTIDNotPlayers def_special NullFieldSpecial def_special NullFieldSpecial def_special BufferRandomHobbyOrLifestyleString @@ -142,33 +142,33 @@ gSpecials:: @ 815FD60 def_special CalculatePlayerPartyCount def_special CountPartyNonEggMons def_special CountPartyAliveNonEggMons_IgnoreVar0x8004Slot + def_special NullFieldSpecial @ Contest specials def_special NullFieldSpecial def_special NullFieldSpecial def_special NullFieldSpecial def_special NullFieldSpecial + def_special NullFieldSpecial @ Mauville Gym specials def_special NullFieldSpecial - def_special NullFieldSpecial - def_special NullFieldSpecial - def_special Special_ShowStringVar4AsFieldMessage + def_special ShowFieldMessageStringVar4 def_special DrawWholeMapView - def_special Special_GetPlayerXY - def_special NullFieldSpecial - def_special NullFieldSpecial + def_special GetPlayerXY + def_special NullFieldSpecial @ Mauville/Petalburg Gym specials def_special NullFieldSpecial - def_special Special_GetPlayerTrainerIdOnesDigit - def_special Special_BufferBigGuyOrBigGirlString - def_special Special_BufferSonOrDaughterString - def_special Special_SetHiddenItemFlag def_special NullFieldSpecial + def_special GetPlayerTrainerIdOnesDigit + def_special BufferBigGuyOrBigGirlString + def_special BufferSonOrDaughterString + def_special SetHiddenItemFlag + def_special NullFieldSpecial @ Cable Car specials def_special NullFieldSpecial def_special Overworld_PlaySpecialMapMusic + def_special NullFieldSpecial @ Wall Clock specials def_special NullFieldSpecial def_special NullFieldSpecial - def_special NullFieldSpecial - def_special ScrSpecial_StartOldManTutorialBattle + def_special StartOldManTutorialBattle def_special ChangePokemonNickname - def_special Special_ChooseMonFromParty - def_special NullFieldSpecial + def_special ChoosePartyMon + def_special NullFieldSpecial @ Berry Blender/Roulette specials def_special NullFieldSpecial def_special NullFieldSpecial def_special Special_IsFanClubMemberFanOfPlayer @@ -179,7 +179,8 @@ gSpecials:: @ 815FD60 def_special Special_SetPlayerGotFirstFans def_special Special_UpdateTrainerFanClubGameClear def_special Special_TryGainNewFanFromCounter - def_special ScrSpecial_RockSmashWildEncounter + def_special RockSmashWildEncounter + def_special NullFieldSpecial @ Gabby and Ty specials def_special NullFieldSpecial def_special NullFieldSpecial def_special NullFieldSpecial @@ -187,8 +188,7 @@ gSpecials:: @ 815FD60 def_special NullFieldSpecial def_special NullFieldSpecial def_special NullFieldSpecial - def_special NullFieldSpecial - def_special Special_GetBattleOutcome + def_special GetBattleOutcome def_special GetDaycareMonNicknames def_special GetDaycareState def_special RejectEggFromDayCare @@ -204,38 +204,38 @@ gSpecials:: @ 815FD60 def_special ScriptHatchMon def_special EggHatch def_special DaycareMonReceivedMail - def_special Special_BattleRecords + def_special ShowBattleRecords def_special IsEnoughForCostInVar0x8005 def_special SubtractMoneyFromVar0x8005 def_special TryFieldPoisonWhiteOut - def_special SetCB2Whiteout - def_special NullFieldSpecial - def_special NullFieldSpecial + def_special SetCB2WhiteOut + def_special NullFieldSpecial @ Rotating gate puzzle specials def_special NullFieldSpecial + def_special NullFieldSpecial @ SS Tidal specials def_special NullFieldSpecial def_special EnterSafariMode def_special ExitSafariMode + def_special NullFieldSpecial @ Misc Hoenn specials def_special NullFieldSpecial def_special NullFieldSpecial def_special NullFieldSpecial def_special NullFieldSpecial + def_special GetPokedexCount + def_special GetProfOaksRatingMessage + def_special AnimatePcTurnOn + def_special AnimatePcTurnOff + def_special GetElevatorFloor + def_special NullFieldSpecial @ Lottery Corner specials def_special NullFieldSpecial - def_special Special_GetPokedexCount - def_special Special_GetProfOaksRatingMessage - def_special Special_AnimatePcTurnOn - def_special Special_AnimatePcTurnOff - def_special Special_GetElevatorFloor - def_special NullFieldSpecial - def_special NullFieldSpecial - def_special Special_SelectMoveTutorMon - def_special Special_SelectMove - def_special Special_MoveDeleterForgetMove - def_special Special_BufferMoveDeleterNicknameAndMove - def_special Special_GetNumMovesSelectedMonHas + def_special SelectMoveTutorMon + def_special SelectMoveDeleterMove + def_special MoveDeleterForgetMove + def_special BufferMoveDeleterNicknameAndMove + def_special GetNumMovesSelectedMonHas def_special DisplayMoveTutorMenu + def_special NullFieldSpecial @ Hoenn Cycling Road specials def_special NullFieldSpecial - def_special NullFieldSpecial - def_special Special_GetPlayerAvatarBike + def_special GetPlayerAvatarBike def_special NullFieldSpecial def_special NullFieldSpecial def_special GetLeadMonFriendship @@ -259,12 +259,12 @@ gSpecials:: @ 815FD60 def_special ReducePlayerPartyToThree def_special BedroomPC def_special PlayerPC - def_special Special_TownMap + def_special ShowTownMap def_special GetInGameTradeSpeciesInfo def_special CreateInGameTradePokemon def_special DoInGameTradeScene def_special GetTradeSpecies - def_special NullFieldSpecial + def_special NullFieldSpecial @ Misc Hoenn specials def_special NullFieldSpecial def_special NullFieldSpecial def_special NullFieldSpecial @@ -272,20 +272,20 @@ gSpecials:: @ 815FD60 def_special NullFieldSpecial def_special ScrSpecial_CreatePCMenu def_special HallOfFamePCBeginFade - def_special Special_ShowDiploma - def_special NullFieldSpecial + def_special ShowDiploma + def_special NullFieldSpecial @ Check lead mon Contest strength specials def_special NullFieldSpecial def_special NullFieldSpecial def_special NullFieldSpecial def_special NullFieldSpecial - def_special nullsub_61 + def_special LookThroughPorthole def_special DoSoftReset - def_special Special_HallOfFame - def_special Special_AnimateElevator - def_special NullFieldSpecial + def_special EnterHallOfFame + def_special AnimateElevator + def_special NullFieldSpecial @ ShowGlassWorkshopMenu def_special SpawnCameraObject def_special RemoveCameraObject - def_special NullFieldSpecial + def_special NullFieldSpecial @ Misc Hoenn specials def_special NullFieldSpecial def_special NullFieldSpecial def_special NullFieldSpecial @@ -294,49 +294,49 @@ gSpecials:: @ 815FD60 def_special NullFieldSpecial def_special NullFieldSpecial def_special BufferEReaderTrainerName - def_special Special_GetRandomSlotMachine + def_special GetRandomSlotMachineId def_special GetPlayerFacingDirection - def_special NullFieldSpecial + def_special NullFieldSpecial @ Abandoned Ship room key specials def_special NullFieldSpecial def_special NullFieldSpecial def_special NullFieldSpecial def_special LeadMonHasEffortRibbon def_special GiveLeadMonEffortRibbon - def_special ScrSpecial_AreLeadMonEVsMaxedOut + def_special AreLeadMonEVsMaxedOut def_special Script_FacePlayer def_special Script_ClearHeldMovement def_special InitRoamer def_special NullFieldSpecial - def_special Special_PlayerHasGrassPokemonInParty + def_special PlayerHasGrassPokemonInParty def_special NullFieldSpecial def_special NullFieldSpecial - def_special Special_IsStarterFirstStageInParty + def_special IsStarterFirstStageInParty def_special NullFieldSpecial - def_special Special_IsThereRoomInAnyBoxForMorePokemon + def_special IsThereRoomInAnyBoxForMorePokemon def_special NullFieldSpecial - def_special Special_DrawElevatorCurrentFloorWindow + def_special DrawElevatorCurrentFloorWindow def_special NullFieldSpecial - def_special Special_CheckPartyPokerus - def_special Special_SetIcefallCaveCrackedIceMetatiles - def_special Special_ShakeScreen - def_special Special_StartGroudonKyogreBattle - def_special Special_StartLegendaryBattle - def_special Special_StartRegiBattle + def_special IsPokerusInParty + def_special SetIcefallCaveCrackedIceMetatiles + def_special ShakeScreen + def_special StartGroudonKyogreBattle + def_special StartLegendaryBattle + def_special StartRegiBattle def_special SetUpTrainerMovement def_special NullFieldSpecial def_special NullFieldSpecial - def_special sub_807B6C0 + def_special StartDroughtWeatherBlend def_special DoDiveWarp def_special DoFallWarp def_special NullFieldSpecial def_special NullFieldSpecial def_special SetEReaderTrainerGfxId - def_special ScrSpecial_StartSouthernIslandBattle + def_special StartSouthernIslandBattle def_special NullFieldSpecial def_special NullFieldSpecial def_special NullFieldSpecial - def_special Special_GetSpeciesOfPartySlot_x8004 - def_special Special_IsSelectedMonEgg + def_special GetPartyMonSpecies + def_special IsSelectedMonEgg def_special NullFieldSpecial def_special NullFieldSpecial def_special LoadPlayerBag @@ -344,51 +344,51 @@ gSpecials:: @ 815FD60 def_special NullFieldSpecial def_special NullFieldSpecial def_special HasAllKantoMons - def_special Special_IsMonOTNameNotPlayers + def_special IsMonOTNameNotPlayers def_special NullFieldSpecial def_special Dummy_TryEnableBravoTrainerBattleTower - def_special GetNameOfEnigmaBerryInPlayerParty + def_special DoesPartyHaveEnigmaBerry def_special NullFieldSpecial def_special sub_810B82C - def_special ScrSpecial_StartMarowakBattle - def_special Special_ForcePlayerOntoBike + def_special StartMarowakBattle + def_special ForcePlayerOntoBike def_special Special_ListMenu def_special Special_ReturnToListMenu def_special sub_80CADC4 - def_special Special_SetVermilionTrashCans + def_special SetVermilionTrashCans def_special sub_805D1A8 def_special SampleResortGorgeousMonAndReward - def_special Special_CheckAddCoins + def_special CheckAddCoins def_special GetDaycarePokemonCount - def_special Special_CloseElevatorCurrentFloorWindow - def_special Special_ForcePlayerToStartSurfing - def_special ScrSpecial_GetStarter - def_special Special_SetSeenMon + def_special CloseElevatorCurrentFloorWindow + def_special ForcePlayerToStartSurfing + def_special GetStarterSpecies + def_special SetSeenMon def_special sub_810C444 def_special ShouldShowBoxWasFullMessage def_special ChangeBoxPokemonNickname - def_special Special_UpdateTrainerCardPhotoIcons + def_special UpdateTrainerCardPhotoIcons def_special StickerManGetBragFlags def_special SetUsedPkmnCenterQuestLogEvent def_special IsWirelessAdapterConnected def_special TryBecomeLinkLeader def_special TryJoinLinkGroup def_special UnionRoomSpecial - def_special Special_WirelessCommunicationScreen + def_special ShowWirelessCommunicationScreen def_special EnableNationalPokedex def_special sub_80699E0 def_special sub_80699BC def_special sub_810C3A4 def_special SetFlavorTextFlagFromSpecialVars def_special UpdatePickStateFromSpecialVar8005 - def_special Special_OverworldWhiteOutGetMoneyLoss + def_special OverworldWhiteOutGetMoneyLoss def_special PutMonInRoute5Daycare def_special GetCostToWithdrawRoute5DaycareMon def_special IsThereMonInRoute5Daycare def_special GetNumLevelsGainedForRoute5DaycareMon def_special TakePokemonFromRoute5Daycare def_special DoSeagallopFerryScene - def_special Special_PlayerPartyContainsSpecies + def_special DoesPlayerPartyContainSpecies def_special Special_SetSomeVariable def_special HelpSystem_BackupSomeVariable def_special HelpSystem_RestoreSomeVariable @@ -397,25 +397,25 @@ gSpecials:: @ 815FD60 def_special InitUnionRoom def_special BufferUnionRoomPlayerName def_special sub_811390C - def_special Special_GetMartClerkObjectId + def_special GetMartClerkObjectId def_special Special_BattleCardAction - def_special Special_GetQuestLogState + def_special GetQuestLogState def_special sub_8112364 def_special Special_GetMENewsJisanItemAndState def_special GetPCBoxToSendMon - def_special Special_OpenMuseumFossilPic - def_special Special_CloseMuseumFossilPic + def_special OpenMuseumFossilPic + def_special CloseMuseumFossilPic def_special ChooseMonForMoveTutor def_special ChooseMonForWirelessMinigame def_special SetBattledTrainerFlag def_special sub_812B35C - def_special Special_SSAnneDepartureCutscene + def_special DoSSAnneDepartureCutscene def_special IsPokemonJumpSpeciesInParty def_special IsNationalPokedexEnabled def_special CallTrainerTowerFunc def_special ShowPokemonJumpRecords - def_special Special_ItemIsTM_GetMoveName - def_special Special_DaisyMassageServices + def_special BufferTMHMMoveName + def_special DaisyMassageServices def_special HelpSystem_Disable def_special HelpSystem_Enable def_special sub_810B82C @@ -425,31 +425,31 @@ gSpecials:: @ 815FD60 def_special Special_HasEnoughBerryPowder def_special Special_TakeBerryPowder def_special PrintPlayerBerryPowderAmount - def_special Special_PokemonLeagueLightingEffect + def_special DoPokemonLeagueLightingEffect def_special ShowBerryCrushRankings - def_special Special_CapeBrinkGetMoveToTeachLeadPokemon - def_special Special_HasLearnedAllMovesFromCapeBrinkTutor - def_special Special_Credits + def_special CapeBrinkGetMoveToTeachLeadPokemon + def_special HasLearnedAllMovesFromCapeBrinkTutor + def_special DoCredits def_special ShowDodrioBerryPickingRecords - def_special Special_DrawSeagallopDestinationMenu - def_special Special_GetSelectedSeagallopDestination + def_special DrawSeagallopDestinationMenu + def_special GetSelectedSeagallopDestination def_special GetSeagallopNumber def_special GetPlayerFacingDirection - def_special DoDeoxysRockInteraction - def_special Special_SetDeoxysTriangleObjectPal + def_special DoDeoxysTriangleInteraction + def_special SetDeoxysTrianglePalette def_special IsPlayerLeftOfVermilionSailor - def_special Special_BadEggInParty + def_special IsBadEggInParty def_special ReadTrainerTowerAndValidate def_special HasAllMons - def_special Special_PlayerIsNotInTrainerTowerLobby - def_special Special_BrailleCursorToggle + def_special IsPlayerNotInTrainerTowerLobby + def_special BrailleCursorToggle def_special Script_ResetUnionRoomTrade def_special PlayerPartyContainsSpeciesWithPlayerID def_special AnimateTeleporterHousing def_special IsDodrioInParty def_special AnimateTeleporterCable - def_special Special_InitElevatorFloorSelectMenuPos - def_special Special_ComputeLoreleiDollCollection - def_special Special_LoopWingFlapSound + def_special InitElevatorFloorSelectMenuPos + def_special UpdateLoreleiDollCollection + def_special LoopWingFlapSound def_special CreateObedientEnemyMon gSpecialsEnd:: -- cgit v1.2.3 From 9fbe7e14a898aadbef5d8fe4cd44507d02d1a991 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 3 Mar 2020 17:50:24 -0500 Subject: Label remaining JP script text --- data/event_scripts.s | 9 +++++---- data/maps/Route5_PokemonDayCare/text.inc | 2 +- data/maps/SilphCo_1F/text.inc | 3 ++- data/text/help_system.inc | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 36f184fa0..3c221d2aa 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -957,22 +957,23 @@ Text_VoiceRangOutDontRunAway:: @ 81A5C4D .string "Someone's voice rang out,\n" .string "“Don't run away!”$" -Text_1A5C79:: @ 81A5C79 +@ Uncear what the below unused JP texts were for +Text_IdLikeToSeeRequest:: @ 81A5C79 .string "えっとー\n" .string "{STR_VAR_2}が　みてみたいなー\p" .string "それも　{STR_VAR_1}{STR_VAR_3}\n" .string "{STR_VAR_2}が　みてみたいなー$" -Text_1A5C9F:: @ 81A5C9F +Text_ThankYouForShowingMe:: @ 81A5C9F .string "わぁー　すごい！\n" .string "{STR_VAR_1}{STR_VAR_3}{STR_VAR_2}だー！\p" .string "ありがとー\n" .string "また　よろしくねー！$" -Text_1A5CC3:: @ 81A5CC3 +Text_ThatsNotRight:: @ 81A5CC3 .string "それっ　ちがうよー！$" -Text_1A5CCE:: @ 81A5CCE +Text_ISee:: @ 81A5CCE .string "そっか‥$" Text_TheDoorIsClosed:: @ 81A5CD3 diff --git a/data/maps/Route5_PokemonDayCare/text.inc b/data/maps/Route5_PokemonDayCare/text.inc index 1bea7c875..2176583a1 100644 --- a/data/maps/Route5_PokemonDayCare/text.inc +++ b/data/maps/Route5_PokemonDayCare/text.inc @@ -59,7 +59,7 @@ Route5_PokemonDayCare_Text_YouveGotNoRoomForIt:: @ 819DFC2 Route5_PokemonDayCare_Text_DontHaveEnoughMoney:: @ 819E001 .string "You don't have enough money.$" -Route5_PokemonDayCare_Text_19E01E:: @ 819E01E +Route5_PokemonDayCare_Text_WantMeToTakeALookAtYours:: @ 819E01E .string "きみの\n" .string "みてみるかね？$" diff --git a/data/maps/SilphCo_1F/text.inc b/data/maps/SilphCo_1F/text.inc index 808aec46b..a62665236 100644 --- a/data/maps/SilphCo_1F/text.inc +++ b/data/maps/SilphCo_1F/text.inc @@ -3,7 +3,8 @@ SilphCo_1F_Text_WelcomePresidentInBoardroom:: @ 81754F7 .string "The PRESIDENT is in the boardroom\n" .string "on 11F.$" -SilphCo_1F_Text_17552A:: @ 817552A +@ Tentative translation. Unknown origin +SilphCo_1F_Text_DestroyedWontBeFixedForWhile:: @ 817552A .string "めちゃめちゃに　こわされてる\n" .string "とうぶん　なおりそうに　ない‥$" diff --git a/data/text/help_system.inc b/data/text/help_system.inc index b19427e2c..0ad59243e 100644 --- a/data/text/help_system.inc +++ b/data/text/help_system.inc @@ -19,7 +19,7 @@ Help_Text_Exit:: @ 81B2E6A Help_Text_Cancel:: @ 81B2E6F .string "CANCEL$" -gUnknown_81B2E76:: +Help_Text_TryDoingItOnYourOwn:: .string "じぶんの ちからで やってみよう！$" Help_Text_DescWhatShouldIDo:: @ 81B2E88 -- cgit v1.2.3 From 4c1d30a832439e9a4b2a0a43f281ca11150a09b5 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 3 Mar 2020 22:09:22 -0500 Subject: Add more metatile labels --- data/maps/FiveIsland_RocketWarehouse/scripts.inc | 4 +- data/maps/RocketHideout_B1F/scripts.inc | 24 +- data/maps/RocketHideout_B4F/scripts.inc | 24 +- data/scripts/cable_club.inc | 12 +- data/scripts/silphco_doors.inc | 478 +++++++++++------------ 5 files changed, 271 insertions(+), 271 deletions(-) (limited to 'data') diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index dfcb6e43f..fec6e0262 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -21,8 +21,8 @@ FiveIsland_RocketWarehouse_OnLoad:: @ 8163F3D end FiveIsland_RocketWarehouse_EventScript_SetArrowsForReEntry:: @ 8163F47 - setmetatile 26, 20, METATILE_Hideout_Arrow_Up, 0 - setmetatile 27, 20, METATILE_Hideout_Arrow_Up, 0 + setmetatile 26, 20, METATILE_SilphCo_Arrow_Up, 0 + setmetatile 27, 20, METATILE_SilphCo_Arrow_Up, 0 return FiveIsland_RocketWarehouse_EventScript_Cage:: @ 8163F5A diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc index ac95862a2..6149ac0c2 100644 --- a/data/maps/RocketHideout_B1F/scripts.inc +++ b/data/maps/RocketHideout_B1F/scripts.inc @@ -45,19 +45,19 @@ RocketHideout_B1F_EventScript_DefeatedGrunt5:: @ 8161225 end RocketHideout_B1F_EventScript_SetBarrier:: @ 8161233 - setmetatile 20, 19, METATILE_Hideout_Barrier_TopLeft_Floor, 1 - setmetatile 21, 19, METATILE_Hideout_Barrier_TopRight_Floor, 1 - setmetatile 20, 20, METATILE_Hideout_Barrier_BottomLeft, 1 - setmetatile 21, 20, METATILE_Hideout_Barrier_BottomRight, 1 - setmetatile 20, 21, METATILE_Hideout_Floor_ShadeFull, 0 - setmetatile 21, 21, METATILE_Hideout_Floor_ShadeFull, 0 + setmetatile 20, 19, METATILE_SilphCo_HideoutBarrier_TopLeft_Floor, 1 + setmetatile 21, 19, METATILE_SilphCo_HideoutBarrier_TopRight_Floor, 1 + setmetatile 20, 20, METATILE_SilphCo_HideoutBarrier_BottomLeft, 1 + setmetatile 21, 20, METATILE_SilphCo_HideoutBarrier_BottomRight, 1 + setmetatile 20, 21, METATILE_SilphCo_HideoutFloor_ShadeFull, 0 + setmetatile 21, 21, METATILE_SilphCo_HideoutFloor_ShadeFull, 0 return RocketHideout_B1F_EventScript_RemoveBarrier:: @ 816126A - setmetatile 20, 19, METATILE_Hideout_Floor_ShadeFull, 0 - setmetatile 21, 19, METATILE_Hideout_Floor, 0 - setmetatile 20, 20, METATILE_Hideout_Floor_ShadeFull, 0 - setmetatile 21, 20, METATILE_Hideout_Floor, 0 - setmetatile 20, 21, METATILE_Hideout_Floor_ShadeFull, 0 - setmetatile 21, 21, METATILE_Hideout_Floor, 0 + setmetatile 20, 19, METATILE_SilphCo_HideoutFloor_ShadeFull, 0 + setmetatile 21, 19, METATILE_SilphCo_HideoutFloor, 0 + setmetatile 20, 20, METATILE_SilphCo_HideoutFloor_ShadeFull, 0 + setmetatile 21, 20, METATILE_SilphCo_HideoutFloor, 0 + setmetatile 20, 21, METATILE_SilphCo_HideoutFloor_ShadeFull, 0 + setmetatile 21, 21, METATILE_SilphCo_HideoutFloor, 0 return diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index 63fff7d82..5919b342f 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -114,19 +114,19 @@ RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval:: @ 8161462 return RocketHideout_B4F_EventScript_SetBarrier:: @ 816146A - setmetatile 17, 12, METATILE_Hideout_Barrier_TopLeft_Floor, 1 - setmetatile 18, 12, METATILE_Hideout_Barrier_TopRight_Floor, 1 - setmetatile 17, 13, METATILE_Hideout_Barrier_BottomLeft, 1 - setmetatile 18, 13, METATILE_Hideout_Barrier_BottomRight, 1 - setmetatile 17, 14, METATILE_Hideout_Floor_ShadeFull, 0 - setmetatile 18, 14, METATILE_Hideout_Floor_ShadeFull, 0 + setmetatile 17, 12, METATILE_SilphCo_HideoutBarrier_TopLeft_Floor, 1 + setmetatile 18, 12, METATILE_SilphCo_HideoutBarrier_TopRight_Floor, 1 + setmetatile 17, 13, METATILE_SilphCo_HideoutBarrier_BottomLeft, 1 + setmetatile 18, 13, METATILE_SilphCo_HideoutBarrier_BottomRight, 1 + setmetatile 17, 14, METATILE_SilphCo_HideoutFloor_ShadeFull, 0 + setmetatile 18, 14, METATILE_SilphCo_HideoutFloor_ShadeFull, 0 return RocketHideout_B4F_EventScript_RemoveBarrier:: @ 81614A1 - setmetatile 17, 12, METATILE_Hideout_Floor_ShadeFull, 0 - setmetatile 18, 12, METATILE_Hideout_Floor, 0 - setmetatile 17, 13, METATILE_Hideout_Floor_ShadeFull, 0 - setmetatile 18, 13, METATILE_Hideout_Floor, 0 - setmetatile 17, 14, METATILE_Hideout_Floor_ShadeFull, 0 - setmetatile 18, 14, METATILE_Hideout_Floor, 0 + setmetatile 17, 12, METATILE_SilphCo_HideoutFloor_ShadeFull, 0 + setmetatile 18, 12, METATILE_SilphCo_HideoutFloor, 0 + setmetatile 17, 13, METATILE_SilphCo_HideoutFloor_ShadeFull, 0 + setmetatile 18, 13, METATILE_SilphCo_HideoutFloor, 0 + setmetatile 17, 14, METATILE_SilphCo_HideoutFloor_ShadeFull, 0 + setmetatile 18, 14, METATILE_SilphCo_HideoutFloor, 0 return diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index eb5e3a6df..01b0d9b34 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -1162,27 +1162,27 @@ CableClub_EventScript_AdapterNotConnected:: @ 81BC016 end CableClub_EventScript_OpenUnionRoomBarrier:: @ 81BC020 - setmetatile 5, 3, 709, 0 + setmetatile 5, 3, METATILE_PokemonCenter_Floor_ShadeLeft, 0 return CableClub_EventScript_CloseUnionRoomBarrier:: @ 81BC02A - setmetatile 5, 3, 761, 1 + setmetatile 5, 3, METATILE_PokemonCenter_CounterBarrier, 1 return CableClub_EventScript_OpenDirectCornerBarrier:: @ 81BC034 - setmetatile 9, 3, 709, 0 + setmetatile 9, 3, METATILE_PokemonCenter_Floor_ShadeLeft, 0 return CableClub_EventScript_CloseDirectCornerBarrier:: @ 81BC03E - setmetatile 9, 3, 761, 1 + setmetatile 9, 3, METATILE_PokemonCenter_CounterBarrier, 1 return CableClub_EventScript_OpenGameCornerBarrier:: @ 81BC048 - setmetatile 5, 3, 737, 0 + setmetatile 5, 3, METATILE_GameCorner_CheckeredFloor_ShadeLeft, 0 return CableClub_EventScript_CloseGameCornerBarrier:: @ 81BC052 - setmetatile 5, 3, 759, 1 + setmetatile 5, 3, METATILE_GameCorner_CounterBarrier, 1 return CableClub_OnResume:: @ 81BC05C diff --git a/data/scripts/silphco_doors.inc b/data/scripts/silphco_doors.inc index c76d08bf3..df619b345 100644 --- a/data/scripts/silphco_doors.inc +++ b/data/scripts/silphco_doors.inc @@ -9,347 +9,347 @@ EventScript_DoorUnlocked:: @ 81A813F end EventScript_Close2FDoor1:: @ 81A8149 - setmetatile 5, 8, 944, 1 - setmetatile 6, 8, 945, 1 - setmetatile 5, 9, 952, 1 - setmetatile 6, 9, 953, 1 - setmetatile 6, 10, 821, 0 + setmetatile 5, 8, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1 + setmetatile 6, 8, METATILE_SilphCo_HorizontalBarrier_TopRight, 1 + setmetatile 5, 9, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1 + setmetatile 6, 9, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1 + setmetatile 6, 10, METATILE_SilphCo_Floor_ShadeFull, 0 return EventScript_Close2FDoor2:: @ 81A8177 - setmetatile 5, 15, 944, 1 - setmetatile 6, 15, 945, 1 - setmetatile 5, 16, 952, 1 - setmetatile 6, 16, 953, 1 - setmetatile 6, 17, 821, 0 + setmetatile 5, 15, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1 + setmetatile 6, 15, METATILE_SilphCo_HorizontalBarrier_TopRight, 1 + setmetatile 5, 16, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1 + setmetatile 6, 16, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1 + setmetatile 6, 17, METATILE_SilphCo_Floor_ShadeFull, 0 return EventScript_Close3FDoor1:: @ 81A81A5 - setmetatile 9, 11, 960, 1 - setmetatile 10, 11, 961, 1 - setmetatile 9, 12, 962, 1 - setmetatile 10, 12, 963, 1 - setmetatile 9, 13, 964, 1 - setmetatile 10, 13, 965, 1 + setmetatile 9, 11, METATILE_SilphCo_VerticalBarrier_TopLeft, 1 + setmetatile 10, 11, METATILE_SilphCo_VerticalBarrier_TopRight, 1 + setmetatile 9, 12, METATILE_SilphCo_VerticalBarrier_MidLeft, 1 + setmetatile 10, 12, METATILE_SilphCo_VerticalBarrier_MidRight, 1 + setmetatile 9, 13, METATILE_SilphCo_VerticalBarrier_BottomLeft, 1 + setmetatile 10, 13, METATILE_SilphCo_VerticalBarrier_BottomRight, 1 return EventScript_Close3FDoor2:: @ 81A81DC - setmetatile 20, 11, 960, 1 - setmetatile 21, 11, 961, 1 - setmetatile 20, 12, 962, 1 - setmetatile 21, 12, 963, 1 - setmetatile 20, 13, 964, 1 - setmetatile 21, 13, 965, 1 + setmetatile 20, 11, METATILE_SilphCo_VerticalBarrier_TopLeft, 1 + setmetatile 21, 11, METATILE_SilphCo_VerticalBarrier_TopRight, 1 + setmetatile 20, 12, METATILE_SilphCo_VerticalBarrier_MidLeft, 1 + setmetatile 21, 12, METATILE_SilphCo_VerticalBarrier_MidRight, 1 + setmetatile 20, 13, METATILE_SilphCo_VerticalBarrier_BottomLeft, 1 + setmetatile 21, 13, METATILE_SilphCo_VerticalBarrier_BottomRight, 1 return EventScript_Close4FDoor1:: @ 81A8213 - setmetatile 3, 16, 944, 1 - setmetatile 4, 16, 945, 1 - setmetatile 3, 17, 952, 1 - setmetatile 4, 17, 953, 1 - setmetatile 4, 18, 821, 0 + setmetatile 3, 16, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1 + setmetatile 4, 16, METATILE_SilphCo_HorizontalBarrier_TopRight, 1 + setmetatile 3, 17, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1 + setmetatile 4, 17, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1 + setmetatile 4, 18, METATILE_SilphCo_Floor_ShadeFull, 0 return EventScript_Close4FDoor2:: @ 81A8241 - setmetatile 14, 11, 944, 1 - setmetatile 15, 11, 945, 1 - setmetatile 14, 12, 952, 1 - setmetatile 15, 12, 953, 1 - setmetatile 15, 13, 821, 0 + setmetatile 14, 11, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1 + setmetatile 15, 11, METATILE_SilphCo_HorizontalBarrier_TopRight, 1 + setmetatile 14, 12, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1 + setmetatile 15, 12, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1 + setmetatile 15, 13, METATILE_SilphCo_Floor_ShadeFull, 0 return -EventScript_Close5FDoor1:: @ 81A826F - setmetatile 7, 8, 960, 1 - setmetatile 8, 8, 961, 1 - setmetatile 7, 9, 962, 1 - setmetatile 8, 9, 963, 1 - setmetatile 7, 10, 964, 1 - setmetatile 8, 10, 965, 1 +EventScript_Close5FDoor1:: @ 81AMETATILE_SilphCo_Floor_WallRightCornerF + setmetatile 7, 8, METATILE_SilphCo_VerticalBarrier_TopLeft, 1 + setmetatile 8, 8, METATILE_SilphCo_VerticalBarrier_TopRight, 1 + setmetatile 7, 9, METATILE_SilphCo_VerticalBarrier_MidLeft, 1 + setmetatile 8, 9, METATILE_SilphCo_VerticalBarrier_MidRight, 1 + setmetatile 7, 10, METATILE_SilphCo_VerticalBarrier_BottomLeft, 1 + setmetatile 8, 10, METATILE_SilphCo_VerticalBarrier_BottomRight, 1 return EventScript_Close5FDoor2:: @ 81A82A6 - setmetatile 7, 17, 960, 1 - setmetatile 8, 17, 961, 1 - setmetatile 7, 18, 962, 1 - setmetatile 8, 18, 963, 1 - setmetatile 7, 19, 964, 1 - setmetatile 8, 19, 965, 1 + setmetatile 7, 17, METATILE_SilphCo_VerticalBarrier_TopLeft, 1 + setmetatile 8, 17, METATILE_SilphCo_VerticalBarrier_TopRight, 1 + setmetatile 7, 18, METATILE_SilphCo_VerticalBarrier_MidLeft, 1 + setmetatile 8, 18, METATILE_SilphCo_VerticalBarrier_MidRight, 1 + setmetatile 7, 19, METATILE_SilphCo_VerticalBarrier_BottomLeft, 1 + setmetatile 8, 19, METATILE_SilphCo_VerticalBarrier_BottomRight, 1 return EventScript_Close5FDoor3:: @ 81A82DD - setmetatile 18, 12, 960, 1 - setmetatile 19, 12, 961, 1 - setmetatile 18, 13, 962, 1 - setmetatile 19, 13, 963, 1 - setmetatile 18, 14, 964, 1 - setmetatile 19, 14, 965, 1 + setmetatile 18, 12, METATILE_SilphCo_VerticalBarrier_TopLeft, 1 + setmetatile 19, 12, METATILE_SilphCo_VerticalBarrier_TopRight, 1 + setmetatile 18, 13, METATILE_SilphCo_VerticalBarrier_MidLeft, 1 + setmetatile 19, 13, METATILE_SilphCo_VerticalBarrier_MidRight, 1 + setmetatile 18, 14, METATILE_SilphCo_VerticalBarrier_BottomLeft, 1 + setmetatile 19, 14, METATILE_SilphCo_VerticalBarrier_BottomRight, 1 return EventScript_Close6FDoor:: @ 81A8314 - setmetatile 5, 14, 960, 1 - setmetatile 6, 14, 961, 1 - setmetatile 5, 15, 962, 1 - setmetatile 6, 15, 963, 1 - setmetatile 5, 16, 964, 1 - setmetatile 6, 16, 965, 1 + setmetatile 5, 14, METATILE_SilphCo_VerticalBarrier_TopLeft, 1 + setmetatile 6, 14, METATILE_SilphCo_VerticalBarrier_TopRight, 1 + setmetatile 5, 15, METATILE_SilphCo_VerticalBarrier_MidLeft, 1 + setmetatile 6, 15, METATILE_SilphCo_VerticalBarrier_MidRight, 1 + setmetatile 5, 16, METATILE_SilphCo_VerticalBarrier_BottomLeft, 1 + setmetatile 6, 16, METATILE_SilphCo_VerticalBarrier_BottomRight, 1 return EventScript_Close7FDoor1:: @ 81A834B - setmetatile 11, 8, 944, 1 - setmetatile 12, 8, 945, 1 - setmetatile 11, 9, 952, 1 - setmetatile 12, 9, 953, 1 - setmetatile 12, 10, 821, 0 + setmetatile 11, 8, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1 + setmetatile 12, 8, METATILE_SilphCo_HorizontalBarrier_TopRight, 1 + setmetatile 11, 9, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1 + setmetatile 12, 9, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1 + setmetatile 12, 10, METATILE_SilphCo_Floor_ShadeFull, 0 return EventScript_Close7FDoor2:: @ 81A8379 - setmetatile 24, 7, 944, 1 - setmetatile 25, 7, 945, 1 - setmetatile 24, 8, 952, 1 - setmetatile 25, 8, 953, 1 - setmetatile 25, 9, 821, 0 + setmetatile 24, 7, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1 + setmetatile 25, 7, METATILE_SilphCo_HorizontalBarrier_TopRight, 1 + setmetatile 24, 8, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1 + setmetatile 25, 8, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1 + setmetatile 25, 9, METATILE_SilphCo_Floor_ShadeFull, 0 return EventScript_Close7FDoor3:: @ 81A83A7 - setmetatile 25, 13, 944, 1 - setmetatile 26, 13, 945, 1 - setmetatile 25, 14, 952, 1 - setmetatile 26, 14, 953, 1 - setmetatile 26, 15, 821, 0 + setmetatile 25, 13, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1 + setmetatile 26, 13, METATILE_SilphCo_HorizontalBarrier_TopRight, 1 + setmetatile 25, 14, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1 + setmetatile 26, 14, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1 + setmetatile 26, 15, METATILE_SilphCo_Floor_ShadeFull, 0 return EventScript_Close8FDoor:: @ 81A83D5 - setmetatile 5, 9, 960, 1 - setmetatile 6, 9, 961, 1 - setmetatile 5, 10, 962, 1 - setmetatile 6, 10, 963, 1 - setmetatile 5, 11, 964, 1 - setmetatile 6, 11, 965, 1 + setmetatile 5, 9, METATILE_SilphCo_VerticalBarrier_TopLeft, 1 + setmetatile 6, 9, METATILE_SilphCo_VerticalBarrier_TopRight, 1 + setmetatile 5, 10, METATILE_SilphCo_VerticalBarrier_MidLeft, 1 + setmetatile 6, 10, METATILE_SilphCo_VerticalBarrier_MidRight, 1 + setmetatile 5, 11, METATILE_SilphCo_VerticalBarrier_BottomLeft, 1 + setmetatile 6, 11, METATILE_SilphCo_VerticalBarrier_BottomRight, 1 return EventScript_Close9FDoor1:: @ 81A840C - setmetatile 2, 9, 960, 1 - setmetatile 3, 9, 961, 1 - setmetatile 2, 10, 962, 1 - setmetatile 3, 10, 963, 1 - setmetatile 2, 11, 964, 1 - setmetatile 3, 11, 965, 1 + setmetatile 2, 9, METATILE_SilphCo_VerticalBarrier_TopLeft, 1 + setmetatile 3, 9, METATILE_SilphCo_VerticalBarrier_TopRight, 1 + setmetatile 2, 10, METATILE_SilphCo_VerticalBarrier_MidLeft, 1 + setmetatile 3, 10, METATILE_SilphCo_VerticalBarrier_MidRight, 1 + setmetatile 2, 11, METATILE_SilphCo_VerticalBarrier_BottomLeft, 1 + setmetatile 3, 11, METATILE_SilphCo_VerticalBarrier_BottomRight, 1 return EventScript_Close9FDoor2:: @ 81A8443 - setmetatile 12, 15, 960, 1 - setmetatile 13, 15, 961, 1 - setmetatile 12, 16, 962, 1 - setmetatile 13, 16, 963, 1 - setmetatile 12, 17, 964, 1 - setmetatile 13, 17, 965, 1 + setmetatile 12, 15, METATILE_SilphCo_VerticalBarrier_TopLeft, 1 + setmetatile 13, 15, METATILE_SilphCo_VerticalBarrier_TopRight, 1 + setmetatile 12, 16, METATILE_SilphCo_VerticalBarrier_MidLeft, 1 + setmetatile 13, 16, METATILE_SilphCo_VerticalBarrier_MidRight, 1 + setmetatile 12, 17, METATILE_SilphCo_VerticalBarrier_BottomLeft, 1 + setmetatile 13, 17, METATILE_SilphCo_VerticalBarrier_BottomRight, 1 return EventScript_Close9FDoor3:: @ 81A847A - setmetatile 21, 6, 944, 1 - setmetatile 22, 6, 945, 1 - setmetatile 21, 7, 952, 1 - setmetatile 22, 7, 953, 1 - setmetatile 22, 8, 821, 0 + setmetatile 21, 6, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1 + setmetatile 22, 6, METATILE_SilphCo_HorizontalBarrier_TopRight, 1 + setmetatile 21, 7, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1 + setmetatile 22, 7, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1 + setmetatile 22, 8, METATILE_SilphCo_Floor_ShadeFull, 0 return EventScript_Close9FDoor4:: @ 81A84A8 - setmetatile 21, 12, 944, 1 - setmetatile 22, 12, 945, 1 - setmetatile 21, 13, 952, 1 - setmetatile 22, 13, 953, 1 - setmetatile 22, 14, 821, 0 + setmetatile 21, 12, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1 + setmetatile 22, 12, METATILE_SilphCo_HorizontalBarrier_TopRight, 1 + setmetatile 21, 13, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1 + setmetatile 22, 13, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1 + setmetatile 22, 14, METATILE_SilphCo_Floor_ShadeFull, 0 return EventScript_Close10FDoor:: @ 81A84D6 - setmetatile 12, 11, 944, 1 - setmetatile 13, 11, 945, 1 - setmetatile 12, 12, 952, 1 - setmetatile 13, 12, 953, 1 - setmetatile 13, 13, 821, 0 + setmetatile 12, 11, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1 + setmetatile 13, 11, METATILE_SilphCo_HorizontalBarrier_TopRight, 1 + setmetatile 12, 12, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1 + setmetatile 13, 12, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1 + setmetatile 13, 13, METATILE_SilphCo_Floor_ShadeFull, 0 return EventScript_Close11FDoor:: @ 81A8504 - setmetatile 5, 16, 944, 1 - setmetatile 6, 16, 945, 1 - setmetatile 5, 17, 952, 1 - setmetatile 6, 17, 953, 1 - setmetatile 6, 18, 821, 0 + setmetatile 5, 16, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1 + setmetatile 6, 16, METATILE_SilphCo_HorizontalBarrier_TopRight, 1 + setmetatile 5, 17, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1 + setmetatile 6, 17, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1 + setmetatile 6, 18, METATILE_SilphCo_Floor_ShadeFull, 0 return EventScript_Open2FDoor1:: @ 81A8532 - setmetatile 5, 8, 821, 0 - setmetatile 6, 8, 820, 0 - setmetatile 5, 9, 821, 0 - setmetatile 6, 9, 820, 0 - setmetatile 6, 10, 820, 0 + setmetatile 5, 8, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 6, 8, METATILE_SilphCo_Floor, 0 + setmetatile 5, 9, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 6, 9, METATILE_SilphCo_Floor, 0 + setmetatile 6, 10, METATILE_SilphCo_Floor, 0 return EventScript_Open2FDoor2:: @ 81A8560 - setmetatile 5, 15, 821, 0 - setmetatile 6, 15, 820, 0 - setmetatile 5, 16, 821, 0 - setmetatile 6, 16, 820, 0 - setmetatile 6, 17, 820, 0 + setmetatile 5, 15, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 6, 15, METATILE_SilphCo_Floor, 0 + setmetatile 5, 16, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 6, 16, METATILE_SilphCo_Floor, 0 + setmetatile 6, 17, METATILE_SilphCo_Floor, 0 return EventScript_Open3FDoor1:: @ 81A858E - setmetatile 9, 11, 839, 1 - setmetatile 10, 11, 838, 1 - setmetatile 9, 12, 821, 0 - setmetatile 10, 12, 821, 0 - setmetatile 9, 13, 825, 0 - setmetatile 10, 13, 826, 0 + setmetatile 9, 11, METATILE_SilphCo_Wall_LeftEdge, 1 + setmetatile 10, 11, METATILE_SilphCo_Wall_RightEdge, 1 + setmetatile 9, 12, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 10, 12, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 9, 13, METATILE_SilphCo_Floor_WallLeftCorner, 0 + setmetatile 10, 13, METATILE_SilphCo_Floor_WallRightCorner, 0 return EventScript_Open3FDoor2:: @ 81A85C5 - setmetatile 20, 11, 839, 1 - setmetatile 21, 11, 838, 1 - setmetatile 20, 12, 821, 0 - setmetatile 21, 12, 821, 0 - setmetatile 20, 13, 825, 0 - setmetatile 21, 13, 826, 0 + setmetatile 20, 11, METATILE_SilphCo_Wall_LeftEdge, 1 + setmetatile 21, 11, METATILE_SilphCo_Wall_RightEdge, 1 + setmetatile 20, 12, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 21, 12, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 20, 13, METATILE_SilphCo_Floor_WallLeftCorner, 0 + setmetatile 21, 13, METATILE_SilphCo_Floor_WallRightCorner, 0 return EventScript_Open4FDoor1:: @ 81A85FC - setmetatile 3, 16, 821, 0 - setmetatile 4, 16, 820, 0 - setmetatile 3, 17, 821, 0 - setmetatile 4, 17, 820, 0 - setmetatile 4, 18, 820, 0 + setmetatile 3, 16, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 4, 16, METATILE_SilphCo_Floor, 0 + setmetatile 3, 17, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 4, 17, METATILE_SilphCo_Floor, 0 + setmetatile 4, 18, METATILE_SilphCo_Floor, 0 return EventScript_Open4FDoor2:: @ 81A862A - setmetatile 14, 11, 821, 0 - setmetatile 15, 11, 820, 0 - setmetatile 14, 12, 821, 0 - setmetatile 15, 12, 820, 0 - setmetatile 15, 13, 820, 0 + setmetatile 14, 11, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 15, 11, METATILE_SilphCo_Floor, 0 + setmetatile 14, 12, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 15, 12, METATILE_SilphCo_Floor, 0 + setmetatile 15, 13, METATILE_SilphCo_Floor, 0 return EventScript_Open5FDoor1:: @ 81A8658 - setmetatile 7, 8, 839, 1 - setmetatile 8, 8, 838, 1 - setmetatile 7, 9, 821, 0 - setmetatile 8, 9, 821, 0 - setmetatile 7, 10, 825, 0 - setmetatile 8, 10, 826, 0 + setmetatile 7, 8, METATILE_SilphCo_Wall_LeftEdge, 1 + setmetatile 8, 8, METATILE_SilphCo_Wall_RightEdge, 1 + setmetatile 7, 9, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 8, 9, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 7, 10, METATILE_SilphCo_Floor_WallLeftCorner, 0 + setmetatile 8, 10, METATILE_SilphCo_Floor_WallRightCorner, 0 return EventScript_Open5FDoor2:: @ 81A868F - setmetatile 7, 17, 839, 1 - setmetatile 8, 17, 838, 1 - setmetatile 7, 18, 821, 0 - setmetatile 8, 18, 821, 0 - setmetatile 7, 19, 825, 0 - setmetatile 8, 19, 826, 0 + setmetatile 7, 17, METATILE_SilphCo_Wall_LeftEdge, 1 + setmetatile 8, 17, METATILE_SilphCo_Wall_RightEdge, 1 + setmetatile 7, 18, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 8, 18, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 7, 19, METATILE_SilphCo_Floor_WallLeftCorner, 0 + setmetatile 8, 19, METATILE_SilphCo_Floor_WallRightCorner, 0 return EventScript_Open5FDoor3:: @ 81A86C6 - setmetatile 18, 12, 839, 1 - setmetatile 19, 12, 838, 1 - setmetatile 18, 13, 821, 0 - setmetatile 19, 13, 821, 0 - setmetatile 18, 14, 825, 0 - setmetatile 19, 14, 826, 0 + setmetatile 18, 12, METATILE_SilphCo_Wall_LeftEdge, 1 + setmetatile 19, 12, METATILE_SilphCo_Wall_RightEdge, 1 + setmetatile 18, 13, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 19, 13, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 18, 14, METATILE_SilphCo_Floor_WallLeftCorner, 0 + setmetatile 19, 14, METATILE_SilphCo_Floor_WallRightCorner, 0 return EventScript_Open6FDoor:: @ 81A86FD - setmetatile 5, 14, 839, 1 - setmetatile 6, 14, 838, 1 - setmetatile 5, 15, 821, 0 - setmetatile 6, 15, 821, 0 - setmetatile 5, 16, 825, 0 - setmetatile 6, 16, 826, 0 + setmetatile 5, 14, METATILE_SilphCo_Wall_LeftEdge, 1 + setmetatile 6, 14, METATILE_SilphCo_Wall_RightEdge, 1 + setmetatile 5, 15, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 6, 15, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 5, 16, METATILE_SilphCo_Floor_WallLeftCorner, 0 + setmetatile 6, 16, METATILE_SilphCo_Floor_WallRightCorner, 0 return EventScript_Open7FDoor1:: @ 81A8734 - setmetatile 11, 8, 821, 0 - setmetatile 12, 8, 820, 0 - setmetatile 11, 9, 821, 0 - setmetatile 12, 9, 820, 0 - setmetatile 12, 10, 820, 0 + setmetatile 11, 8, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 12, 8, METATILE_SilphCo_Floor, 0 + setmetatile 11, 9, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 12, 9, METATILE_SilphCo_Floor, 0 + setmetatile 12, 10, METATILE_SilphCo_Floor, 0 return EventScript_Open7FDoor2:: @ 81A8762 - setmetatile 24, 7, 821, 0 - setmetatile 25, 7, 820, 0 - setmetatile 24, 8, 821, 0 - setmetatile 25, 8, 820, 0 - setmetatile 25, 9, 820, 0 + setmetatile 24, 7, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 25, 7, METATILE_SilphCo_Floor, 0 + setmetatile 24, 8, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 25, 8, METATILE_SilphCo_Floor, 0 + setmetatile 25, 9, METATILE_SilphCo_Floor, 0 return EventScript_Open7FDoor3:: @ 81A8790 - setmetatile 25, 13, 821, 0 - setmetatile 26, 13, 820, 0 - setmetatile 25, 14, 821, 0 - setmetatile 26, 14, 820, 0 - setmetatile 26, 15, 820, 0 + setmetatile 25, 13, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 26, 13, METATILE_SilphCo_Floor, 0 + setmetatile 25, 14, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 26, 14, METATILE_SilphCo_Floor, 0 + setmetatile 26, 15, METATILE_SilphCo_Floor, 0 return EventScript_Open8FDoor:: @ 81A87BE - setmetatile 5, 9, 839, 1 - setmetatile 6, 9, 838, 1 - setmetatile 5, 10, 821, 0 - setmetatile 6, 10, 821, 0 - setmetatile 5, 11, 825, 0 - setmetatile 6, 11, 826, 0 + setmetatile 5, 9, METATILE_SilphCo_Wall_LeftEdge, 1 + setmetatile 6, 9, METATILE_SilphCo_Wall_RightEdge, 1 + setmetatile 5, 10, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 6, 10, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 5, 11, METATILE_SilphCo_Floor_WallLeftCorner, 0 + setmetatile 6, 11, METATILE_SilphCo_Floor_WallRightCorner, 0 return EventScript_Open9FDoor1:: @ 81A87F5 - setmetatile 2, 9, 839, 1 - setmetatile 3, 9, 838, 1 - setmetatile 2, 10, 821, 0 - setmetatile 3, 10, 821, 0 - setmetatile 2, 11, 825, 0 - setmetatile 3, 11, 826, 0 + setmetatile 2, 9, METATILE_SilphCo_Wall_LeftEdge, 1 + setmetatile 3, 9, METATILE_SilphCo_Wall_RightEdge, 1 + setmetatile 2, 10, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 3, 10, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 2, 11, METATILE_SilphCo_Floor_WallLeftCorner, 0 + setmetatile 3, 11, METATILE_SilphCo_Floor_WallRightCorner, 0 return EventScript_Open9FDoor2:: @ 81A882C - setmetatile 12, 15, 839, 1 - setmetatile 13, 15, 838, 1 - setmetatile 12, 16, 821, 0 - setmetatile 13, 16, 821, 0 - setmetatile 12, 17, 825, 0 - setmetatile 13, 17, 826, 0 + setmetatile 12, 15, METATILE_SilphCo_Wall_LeftEdge, 1 + setmetatile 13, 15, METATILE_SilphCo_Wall_RightEdge, 1 + setmetatile 12, 16, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 13, 16, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 12, 17, METATILE_SilphCo_Floor_WallLeftCorner, 0 + setmetatile 13, 17, METATILE_SilphCo_Floor_WallRightCorner, 0 return EventScript_Open9FDoor3:: @ 81A8863 - setmetatile 21, 6, 821, 0 - setmetatile 22, 6, 820, 0 - setmetatile 21, 7, 821, 0 - setmetatile 22, 7, 820, 0 - setmetatile 22, 8, 820, 0 + setmetatile 21, 6, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 22, 6, METATILE_SilphCo_Floor, 0 + setmetatile 21, 7, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 22, 7, METATILE_SilphCo_Floor, 0 + setmetatile 22, 8, METATILE_SilphCo_Floor, 0 return EventScript_Open9FDoor4:: @ 81A8891 - setmetatile 21, 12, 821, 0 - setmetatile 22, 12, 820, 0 - setmetatile 21, 13, 821, 0 - setmetatile 22, 13, 820, 0 - setmetatile 22, 14, 820, 0 + setmetatile 21, 12, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 22, 12, METATILE_SilphCo_Floor, 0 + setmetatile 21, 13, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 22, 13, METATILE_SilphCo_Floor, 0 + setmetatile 22, 14, METATILE_SilphCo_Floor, 0 return EventScript_Open10FDoor:: @ 81A88BF - setmetatile 12, 11, 821, 0 - setmetatile 13, 11, 820, 0 - setmetatile 12, 12, 821, 0 - setmetatile 13, 12, 820, 0 - setmetatile 13, 13, 820, 0 + setmetatile 12, 11, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 13, 11, METATILE_SilphCo_Floor, 0 + setmetatile 12, 12, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 13, 12, METATILE_SilphCo_Floor, 0 + setmetatile 13, 13, METATILE_SilphCo_Floor, 0 return EventScript_Open11FDoor:: @ 81A88ED - setmetatile 5, 16, 821, 0 - setmetatile 6, 16, 820, 0 - setmetatile 5, 17, 821, 0 - setmetatile 6, 17, 820, 0 - setmetatile 6, 18, 820, 0 + setmetatile 5, 16, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 6, 16, METATILE_SilphCo_Floor, 0 + setmetatile 5, 17, METATILE_SilphCo_Floor_ShadeFull, 0 + setmetatile 6, 17, METATILE_SilphCo_Floor, 0 + setmetatile 6, 18, METATILE_SilphCo_Floor, 0 return SilphCo_2F_EventScript_Door1:: @ 81A891B lockall setvar VAR_TEMP_1, 1 - setvar VAR_0x8004, 634 + setvar VAR_0x8004, FLAG_SILPH_2F_DOOR_1 goto_if_set FLAG_SILPH_2F_DOOR_1, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -357,7 +357,7 @@ SilphCo_2F_EventScript_Door1:: @ 81A891B SilphCo_2F_EventScript_Door2:: @ 81A8935 lockall setvar VAR_TEMP_1, 2 - setvar VAR_0x8004, 635 + setvar VAR_0x8004, FLAG_SILPH_2F_DOOR_2 goto_if_set FLAG_SILPH_2F_DOOR_2, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -365,7 +365,7 @@ SilphCo_2F_EventScript_Door2:: @ 81A8935 SilphCo_3F_EventScript_Door1:: @ 81A894F lockall setvar VAR_TEMP_1, 3 - setvar VAR_0x8004, 636 + setvar VAR_0x8004, FLAG_SILPH_3F_DOOR_1 goto_if_set FLAG_SILPH_3F_DOOR_1, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -373,7 +373,7 @@ SilphCo_3F_EventScript_Door1:: @ 81A894F SilphCo_3F_EventScript_Door2:: @ 81A8969 lockall setvar VAR_TEMP_1, 4 - setvar VAR_0x8004, 637 + setvar VAR_0x8004, FLAG_SILPH_3F_DOOR_2 goto_if_set FLAG_SILPH_3F_DOOR_2, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -381,7 +381,7 @@ SilphCo_3F_EventScript_Door2:: @ 81A8969 SilphCo_4F_EventScript_Door1:: @ 81A8983 lockall setvar VAR_TEMP_1, 5 - setvar VAR_0x8004, 638 + setvar VAR_0x8004, FLAG_SILPH_4F_DOOR_1 goto_if_set FLAG_SILPH_4F_DOOR_1, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -389,7 +389,7 @@ SilphCo_4F_EventScript_Door1:: @ 81A8983 SilphCo_4F_EventScript_Door2:: @ 81A899D lockall setvar VAR_TEMP_1, 6 - setvar VAR_0x8004, 639 + setvar VAR_0x8004, FLAG_SILPH_4F_DOOR_2 goto_if_set FLAG_SILPH_4F_DOOR_2, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -397,7 +397,7 @@ SilphCo_4F_EventScript_Door2:: @ 81A899D SilphCo_5F_EventScript_Door1:: @ 81A89B7 lockall setvar VAR_TEMP_1, 7 - setvar VAR_0x8004, 640 + setvar VAR_0x8004, FLAG_SILPH_5F_DOOR_1 goto_if_set FLAG_SILPH_5F_DOOR_1, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -405,7 +405,7 @@ SilphCo_5F_EventScript_Door1:: @ 81A89B7 SilphCo_5F_EventScript_Door2:: @ 81A89D1 lockall setvar VAR_TEMP_1, 8 - setvar VAR_0x8004, 641 + setvar VAR_0x8004, FLAG_SILPH_5F_DOOR_2 goto_if_set FLAG_SILPH_5F_DOOR_2, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -413,7 +413,7 @@ SilphCo_5F_EventScript_Door2:: @ 81A89D1 SilphCo_5F_EventScript_Door3:: @ 81A89EB lockall setvar VAR_TEMP_1, 9 - setvar VAR_0x8004, 642 + setvar VAR_0x8004, FLAG_SILPH_5F_DOOR_3 goto_if_set FLAG_SILPH_5F_DOOR_3, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -421,7 +421,7 @@ SilphCo_5F_EventScript_Door3:: @ 81A89EB SilphCo_6F_EventScript_Door:: @ 81A8A05 lockall setvar VAR_TEMP_1, 10 - setvar VAR_0x8004, 643 + setvar VAR_0x8004, FLAG_SILPH_6F_DOOR goto_if_set FLAG_SILPH_6F_DOOR, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -429,7 +429,7 @@ SilphCo_6F_EventScript_Door:: @ 81A8A05 SilphCo_7F_EventScript_Door1:: @ 81A8A1F lockall setvar VAR_TEMP_1, 11 - setvar VAR_0x8004, 644 + setvar VAR_0x8004, FLAG_SILPH_7F_DOOR_1 goto_if_set FLAG_SILPH_7F_DOOR_1, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -437,7 +437,7 @@ SilphCo_7F_EventScript_Door1:: @ 81A8A1F SilphCo_7F_EventScript_Door2:: @ 81A8A39 lockall setvar VAR_TEMP_1, 12 - setvar VAR_0x8004, 645 + setvar VAR_0x8004, FLAG_SILPH_7F_DOOR_2 goto_if_set FLAG_SILPH_7F_DOOR_2, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -445,7 +445,7 @@ SilphCo_7F_EventScript_Door2:: @ 81A8A39 SilphCo_7F_EventScript_Door3:: @ 81A8A53 lockall setvar VAR_TEMP_1, 13 - setvar VAR_0x8004, 646 + setvar VAR_0x8004, FLAG_SILPH_7F_DOOR_3 goto_if_set FLAG_SILPH_7F_DOOR_3, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -453,7 +453,7 @@ SilphCo_7F_EventScript_Door3:: @ 81A8A53 SilphCo_8F_EventScript_Door:: @ 81A8A6D lockall setvar VAR_TEMP_1, 14 - setvar VAR_0x8004, 647 + setvar VAR_0x8004, FLAG_SILPH_8F_DOOR goto_if_set FLAG_SILPH_8F_DOOR, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -461,7 +461,7 @@ SilphCo_8F_EventScript_Door:: @ 81A8A6D SilphCo_9F_EventScript_Door1:: @ 81A8A87 lockall setvar VAR_TEMP_1, 15 - setvar VAR_0x8004, 648 + setvar VAR_0x8004, FLAG_SILPH_9F_DOOR_1 goto_if_set FLAG_SILPH_9F_DOOR_1, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -469,7 +469,7 @@ SilphCo_9F_EventScript_Door1:: @ 81A8A87 SilphCo_9F_EventScript_Door2:: @ 81A8AA1 lockall setvar VAR_TEMP_1, 16 - setvar VAR_0x8004, 649 + setvar VAR_0x8004, FLAG_SILPH_9F_DOOR_2 goto_if_set FLAG_SILPH_9F_DOOR_2, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -477,7 +477,7 @@ SilphCo_9F_EventScript_Door2:: @ 81A8AA1 SilphCo_9F_EventScript_Door3:: @ 81A8ABB lockall setvar VAR_TEMP_1, 17 - setvar VAR_0x8004, 650 + setvar VAR_0x8004, FLAG_SILPH_9F_DOOR_3 goto_if_set FLAG_SILPH_9F_DOOR_3, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -485,7 +485,7 @@ SilphCo_9F_EventScript_Door3:: @ 81A8ABB SilphCo_9F_EventScript_Door4:: @ 81A8AD5 lockall setvar VAR_TEMP_1, 18 - setvar VAR_0x8004, 651 + setvar VAR_0x8004, FLAG_SILPH_9F_DOOR_4 goto_if_set FLAG_SILPH_9F_DOOR_4, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -493,7 +493,7 @@ SilphCo_9F_EventScript_Door4:: @ 81A8AD5 SilphCo_10F_EventScript_Door:: @ 81A8AEF lockall setvar VAR_TEMP_1, 19 - setvar VAR_0x8004, 652 + setvar VAR_0x8004, FLAG_SILPH_10F_DOOR goto_if_set FLAG_SILPH_10F_DOOR, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end @@ -501,7 +501,7 @@ SilphCo_10F_EventScript_Door:: @ 81A8AEF SilphCo_11F_EventScript_Door:: @ 81A8B09 lockall setvar VAR_TEMP_1, 20 - setvar VAR_0x8004, 653 + setvar VAR_0x8004, FLAG_SILPH_11F_DOOR goto_if_set FLAG_SILPH_11F_DOOR, EventScript_DoorUnlocked goto EventScript_TryUnlockDoor end -- cgit v1.2.3 From ce3e1b8af0fa394e5711ea775bfe4099b9fc6680 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 3 Mar 2020 22:25:48 -0500 Subject: Add missing movement type constant use --- data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'data') diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index 8df872d7e..731ec532d 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -119,42 +119,42 @@ SaffronCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions:: @ 816F1 SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable:: @ 816F207 setobjectxyperm 1, 5, 2 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable:: @ 816F213 setobjectxyperm 3, 7, 4 - setobjectmovementtype 3, 9 + setobjectmovementtype 3, MOVEMENT_TYPE_FACE_LEFT return SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable:: @ 816F21F setobjectxyperm 4, 2, 2 - setobjectmovementtype 4, 7 + setobjectmovementtype 4, MOVEMENT_TYPE_FACE_UP return SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable:: @ 816F22B setobjectxyperm 2, 3, 4 - setobjectmovementtype 2, 10 + setobjectmovementtype 2, MOVEMENT_TYPE_FACE_RIGHT return SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable:: @ 816F237 setobjectxyperm 6, 4, 6 - setobjectmovementtype 6, 7 + setobjectmovementtype 6, MOVEMENT_TYPE_FACE_UP return SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable:: @ 816F243 setobjectxyperm 5, 10, 3 - setobjectmovementtype 5, 7 + setobjectmovementtype 5, MOVEMENT_TYPE_FACE_UP return SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable:: @ 816F24F setobjectxyperm 7, 7, 5 - setobjectmovementtype 7, 9 + setobjectmovementtype 7, MOVEMENT_TYPE_FACE_LEFT return SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable:: @ 816F25B setobjectxyperm 8, 9, 6 - setobjectmovementtype 8, 9 + setobjectmovementtype 8, MOVEMENT_TYPE_FACE_LEFT return SaffronCity_PokemonTrainerFanClub_EventScript_SetMemberPosForFirstMeeting:: @ 816F267 -- cgit v1.2.3 From 13e06bf7f88be6d25f420704b76828ed6f24cbc2 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 4 Mar 2020 10:42:16 -0500 Subject: Combine special prefixes, drop more --- data/maps/CeruleanCity_House1/scripts.inc | 4 +- data/maps/CeruleanCity_House4/scripts.inc | 2 +- data/maps/CeruleanCity_House5/scripts.inc | 6 +- data/maps/PalletTown_PlayersHouse_2F/scripts.inc | 2 +- data/maps/PokemonLeague_LancesRoom/scripts.inc | 2 +- .../SaffronCity_PokemonTrainerFanClub/scripts.inc | 82 +++++++++++----------- data/maps/SilphCo_Elevator/scripts.inc | 2 +- data/mystery_event_msg.s | 6 +- data/scripts/pc.inc | 8 +-- data/scripts/pokedex_rating.inc | 2 +- data/scripts/trainer_battle.inc | 4 +- data/specials.inc | 36 +++++----- 12 files changed, 78 insertions(+), 78 deletions(-) (limited to 'data') diff --git a/data/maps/CeruleanCity_House1/scripts.inc b/data/maps/CeruleanCity_House1/scripts.inc index 9eb558eba..4f83fe24b 100644 --- a/data/maps/CeruleanCity_House1/scripts.inc +++ b/data/maps/CeruleanCity_House1/scripts.inc @@ -8,7 +8,7 @@ CeruleanCity_House1_EventScript_BadgeGuy:: @ 816A7F0 message CeruleanCity_House1_Text_DescribeWhichBadge waitmessage setvar VAR_0x8004, LISTMENU_BADGES - special Special_ListMenu + special ListMenu waitstate switch VAR_RESULT case 0, CeruleanCity_House1_EventScript_DescribeBoulderBadge @@ -26,7 +26,7 @@ CeruleanCity_House1_EventScript_BadgeGuy:: @ 816A7F0 CeruleanCity_House1_EventScript_DescribeAnotherBadge:: @ 816A87D message CeruleanCity_House1_Text_DescribeWhichBadge waitmessage - special Special_ReturnToListMenu + special ReturnToListMenu waitstate switch VAR_RESULT case 0, CeruleanCity_House1_EventScript_DescribeBoulderBadge diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc index 3d96fd67c..b27579cee 100644 --- a/data/maps/CeruleanCity_House4/scripts.inc +++ b/data/maps/CeruleanCity_House4/scripts.inc @@ -5,7 +5,7 @@ CeruleanCity_House4_EventScript_WonderNewsBerryMan:: @ 816ACEF goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lock - specialvar VAR_0x8004, Special_GetMENewsJisanItemAndState + specialvar VAR_0x8004, GetMENewsJisanItemAndState copyvar VAR_0x8008, VAR_RESULT compare VAR_0x8004, 0 goto_if_eq CeruleanCity_House4_EventScript_NoNews diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc index 04615b895..dc5e2c2ff 100644 --- a/data/maps/CeruleanCity_House5/scripts.inc +++ b/data/maps/CeruleanCity_House5/scripts.inc @@ -38,7 +38,7 @@ CeruleanCity_House5_EventScript_ChooseExchangeItem:: @ 816AEC8 message CeruleanCity_House5_Text_ExchangeWithWhat waitmessage setvar VAR_0x8004, LISTMENU_BERRY_POWDER - special Special_ListMenu + special ListMenu waitstate switch VAR_RESULT case 0, CeruleanCity_House5_EventScript_EnergyPowder @@ -144,14 +144,14 @@ CeruleanCity_House5_EventScript_ExchangePowderForItem:: @ 816B055 compare VAR_RESULT, NO goto_if_eq CeruleanCity_House5_EventScript_ChooseExchangeItem copyvar VAR_0x8004, VAR_0x8009 - specialvar VAR_RESULT, Special_HasEnoughBerryPowder + specialvar VAR_RESULT, Script_HasEnoughBerryPowder compare VAR_RESULT, FALSE goto_if_eq CeruleanCity_House5_EventScript_NotEnoughBerryPowder giveitem VAR_0x8008 compare VAR_RESULT, FALSE goto_if_eq CeruleanCity_House5_EventScript_BagIsFull copyvar VAR_0x8004, VAR_0x8009 - special Special_TakeBerryPowder + special Script_TakeBerryPowder special PrintPlayerBerryPowderAmount msgbox CeruleanCity_House1_Text_TradeMoreBerryPowder, MSGBOX_YESNO compare VAR_RESULT, YES diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index 644665017..975da4be1 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -33,7 +33,7 @@ PalletTown_PlayersHouse_2F_EventScript_PC:: @ 8168CE4 goto_if_questlog EventScript_ReleaseEnd lockall setvar VAR_0x8004, 32 - special Special_SetSomeVariable + special HelpSystem_SetSomeVariable setvar VAR_0x8004, 1 special AnimatePcTurnOn playse SE_PC_ON diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 2328a777c..190e52d33 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -137,7 +137,7 @@ PokemonLeague_LancesRoom_EventScript_PostBattle:: @ 8162AA1 PokemonLeague_LancesRoom_EventScript_DefeatedLance:: @ 8162AAB setvar VAR_0x8004, 0 - special Special_TryGainNewFanFromCounter + special Script_TryGainNewFanFromCounter setflag FLAG_DEFEATED_LANCE call PokemonLeague_EventScript_OpenDoorLance msgbox PokemonLeague_LancesRoom_Text_PostBattle diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index 731ec532d..dd791a58f 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -82,37 +82,37 @@ SaffronCity_PokemonTrainerFanClub_OnTransition:: @ 816F144 end SaffronCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions:: @ 816F15B - special Special_TryLoseFansFromPlayTime + special Script_TryLoseFansFromPlayTime setvar VAR_0x8004, FANCLUB_MEMBER1 - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER2 - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER3 - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER4 - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER5 - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER6 - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER7 - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER8 - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable end @@ -169,13 +169,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl:: @ 816F281 lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER1 - special Special_BufferFanClubTrainerName + special Script_BufferFanClubTrainerName compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayerNotChampion - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyNonFan msgbox SaffronCity_PokemonTrainerFanClub_Text_WasYourFanNotAnymore @@ -183,7 +183,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl:: @ 816F281 end SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan:: @ 816F2C0 - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyFan msgbox SaffronCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou @@ -209,13 +209,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirl:: @ 816F2F8 lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER4 - special Special_BufferFanClubTrainerName + special Script_BufferFanClubTrainerName compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayerNotChampion - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyNonFan msgbox SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeSabrina @@ -223,7 +223,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirl:: @ 816F2F8 end SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan:: @ 816F337 - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyFan msgbox SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeYouOneDay @@ -249,13 +249,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Youngster:: @ 816F36F lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER2 - special Special_BufferFanClubTrainerName + special Script_BufferFanClubTrainerName compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayerNotChampion - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayersFan - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyNonFan msgbox SaffronCity_PokemonTrainerFanClub_Text_BrocksMyHero @@ -263,7 +263,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Youngster:: @ 816F36F end SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayersFan:: @ 816F3AE - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyFan msgbox SaffronCity_PokemonTrainerFanClub_Text_CanYouAutographShorts @@ -289,13 +289,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Gentleman:: @ 816F3E6 lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER3 - special Special_BufferFanClubTrainerName + special Script_BufferFanClubTrainerName compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayerNotChampion - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayersFan - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyNonFan msgbox SaffronCity_PokemonTrainerFanClub_Text_HmmAndYouAre @@ -303,7 +303,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Gentleman:: @ 816F3E6 end SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayersFan:: @ 816F425 - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyFan msgbox SaffronCity_PokemonTrainerFanClub_Text_HadPleasureOfWatchingYouBattle @@ -329,11 +329,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Woman:: @ 816F45D lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER6 - special Special_BufferFanClubTrainerName - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + special Script_BufferFanClubTrainerName + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyNonFan msgbox SaffronCity_PokemonTrainerFanClub_Text_TrainerHasBeenOnFire @@ -341,7 +341,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Woman:: @ 816F45D end SaffronCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan:: @ 816F491 - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyFan msgbox SaffronCity_PokemonTrainerFanClub_Text_AdoreWayYouBattle @@ -362,11 +362,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Rocker:: @ 816F4BF lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER5 - special Special_BufferFanClubTrainerName - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + special Script_BufferFanClubTrainerName + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerPlayersFan - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyNonFan msgbox SaffronCity_PokemonTrainerFanClub_Text_LoveWayTrainerTalks @@ -374,7 +374,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Rocker:: @ 816F4BF end SaffronCity_PokemonTrainerFanClub_EventScript_RockerPlayersFan:: @ 816F4F3 - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyFan msgbox SaffronCity_PokemonTrainerFanClub_Text_TheWayYouBattleIsCool @@ -395,11 +395,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Beauty:: @ 816F521 lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER7 - special Special_BufferFanClubTrainerName - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + special Script_BufferFanClubTrainerName + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyPlayersFan - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyNonFan msgbox SaffronCity_PokemonTrainerFanClub_Text_WhyCantOthersSeeMastersDignity @@ -407,7 +407,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Beauty:: @ 816F521 end SaffronCity_PokemonTrainerFanClub_EventScript_BeautyPlayersFan:: @ 816F555 - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyFan msgbox SaffronCity_PokemonTrainerFanClub_Text_YouReallyAreAmazing @@ -428,11 +428,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_BlackBelt:: @ 816F583 lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER8 - special Special_BufferFanClubTrainerName - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + special Script_BufferFanClubTrainerName + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltPlayersFan - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyNonFan msgbox SaffronCity_PokemonTrainerFanClub_Text_OnlyMasterHasMyRespect @@ -440,7 +440,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_BlackBelt:: @ 816F583 end SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltPlayersFan:: @ 816F5B7 - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyFan msgbox SaffronCity_PokemonTrainerFanClub_Text_YourBattleStyleIsEducational diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc index 758cc1e52..9a9017004 100644 --- a/data/maps/SilphCo_Elevator/scripts.inc +++ b/data/maps/SilphCo_Elevator/scripts.inc @@ -11,7 +11,7 @@ SilphCo_Elevator_EventScript_FloorSelect:: @ 8161F6F waitmessage setvar VAR_0x8004, LISTMENU_SILPHCO_FLOORS specialvar VAR_RESULT, InitElevatorFloorSelectMenuPos - special Special_ListMenu + special ListMenu waitstate switch VAR_RESULT case 0, SilphCo_Elevator_EventScript_To11F diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index 2eab73984..419a7ec53 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -17,9 +17,9 @@ MysteryEventScript_StampCard:: @ 8488E28 setvaddress MysteryEventScript_StampCard setorcopyvar VAR_RESULT, 1 - specialvar VAR_0x8008, Special_BattleCardAction + specialvar VAR_0x8008, BattleCardAction setorcopyvar VAR_RESULT, 0 - specialvar VAR_0x8009, Special_BattleCardAction + specialvar VAR_0x8009, BattleCardAction subvar VAR_0x8008, VAR_0x8009 getnumberstring 0, VAR_0x8008 lock @@ -169,7 +169,7 @@ MysteryEventScript_BattleCard:: @ 84892B9 setvaddress MysteryEventScript_BattleCard vgoto_if_set FLAG_MYSTERY_EVENT_DONE, MysteryEventScript_BattleCardInfo setorcopyvar VAR_RESULT, 2 - specialvar VAR_0x8008, Special_BattleCardAction + specialvar VAR_0x8008, BattleCardAction compare VAR_0x8008, 3 vgoto_if_ne MysteryEventScript_BattleCardInfo lock diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc index a517bced1..af9eca601 100644 --- a/data/scripts/pc.inc +++ b/data/scripts/pc.inc @@ -3,7 +3,7 @@ EventScript_PC:: @ 81A6955 lockall goto_if_set FLAG_SYS_PC_STORAGE_DISABLED, EventScript_PCDisabled setvar VAR_0x8004, 27 - special Special_SetSomeVariable + special HelpSystem_SetSomeVariable setvar VAR_0x8004, 0 special AnimatePcTurnOn playse SE_PC_ON @@ -20,7 +20,7 @@ EventScript_PCDisabled:: @ 81A698E EventScript_PCMainMenu:: @ 81A6998 message Text_AccessWhichPC waitmessage - special ScrSpecial_CreatePCMenu + special CreatePCMenu waitstate goto EventScript_ChoosePCMenu end @@ -51,7 +51,7 @@ EventScript_AccessPokemonStorage:: @ 81A6A05 special ShowPokemonStorageSystem waitstate setvar VAR_0x8004, 27 - special Special_SetSomeVariable + special HelpSystem_SetSomeVariable goto EventScript_PCMainMenu end @@ -76,7 +76,7 @@ EventScript_AccessHallOfFame:: @ 81A6A56 playse SE_PC_LOGIN setvar VAR_0x8004, 31 special HelpSystem_BackupSomeVariable - special Special_SetSomeVariable + special HelpSystem_SetSomeVariable special HallOfFamePCBeginFade waitstate special HelpSystem_RestoreSomeVariable diff --git a/data/scripts/pokedex_rating.inc b/data/scripts/pokedex_rating.inc index 903d06aa1..c8b126e60 100644 --- a/data/scripts/pokedex_rating.inc +++ b/data/scripts/pokedex_rating.inc @@ -37,7 +37,7 @@ PokedexRating_EventScript_DexCompleteFanfare:: @ 81A73DC PokedexRating_EventScript_Rate:: @ 81A73E0 setvar VAR_0x8004, 31 special HelpSystem_BackupSomeVariable - special Special_SetSomeVariable + special HelpSystem_SetSomeVariable setvar VAR_0x8004, 0 specialvar VAR_RESULT, GetPokedexCount copyvar VAR_0x8008, VAR_0x8005 diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc index 3e4eb2c44..6a5dc3345 100644 --- a/data/scripts/trainer_battle.inc +++ b/data/scripts/trainer_battle.inc @@ -10,7 +10,7 @@ EventScript_TryDoNormalTrainerBattle:: @ 81A4EC1 faceplayer applymovement VAR_LAST_TALKED, Movement_RevealTrainer waitmovement 0 - specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought + specialvar VAR_RESULT, Script_HasTrainerBeenFought compare VAR_RESULT, FALSE goto_if_ne EventScript_NoTrainerBattle special PlayTrainerEncounterMusic @@ -24,7 +24,7 @@ EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9 lock faceplayer call EventScript_RevealTrainer - specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought + specialvar VAR_RESULT, Script_HasTrainerBeenFought compare VAR_RESULT, FALSE goto_if_ne EventScript_NoDoubleTrainerBattle special HasEnoughMonsForDoubleBattle diff --git a/data/specials.inc b/data/specials.inc index 0e3c6d5ea..3f9addacb 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -62,7 +62,7 @@ gSpecials:: @ 815FD60 def_special GetTrainerBattleMode def_special ShowTrainerIntroSpeech def_special ShowTrainerCantBattleSpeech - def_special ScrSpecial_HasTrainerBeenFought + def_special Script_HasTrainerBeenFought def_special EndTrainerApproach def_special PlayTrainerEncounterMusic def_special ShouldTryRematchBattle @@ -171,14 +171,14 @@ gSpecials:: @ 815FD60 def_special NullFieldSpecial @ Berry Blender/Roulette specials def_special NullFieldSpecial def_special NullFieldSpecial - def_special Special_IsFanClubMemberFanOfPlayer - def_special Special_GetNumFansOfPlayerInTrainerFanClub - def_special Special_BufferFanClubTrainerName - def_special Special_TryLoseFansFromPlayTimeAfterLinkBattle - def_special Special_TryLoseFansFromPlayTime - def_special Special_SetPlayerGotFirstFans - def_special Special_UpdateTrainerFanClubGameClear - def_special Special_TryGainNewFanFromCounter + def_special Script_IsFanClubMemberFanOfPlayer + def_special Script_GetNumFansOfPlayerInTrainerFanClub + def_special Script_BufferFanClubTrainerName + def_special Script_TryLoseFansFromPlayTimeAfterLinkBattle + def_special Script_TryLoseFansFromPlayTime + def_special Script_SetPlayerGotFirstFans + def_special Script_UpdateTrainerFanClubGameClear + def_special Script_TryGainNewFanFromCounter def_special RockSmashWildEncounter def_special NullFieldSpecial @ Gabby and Ty specials def_special NullFieldSpecial @@ -239,7 +239,7 @@ gSpecials:: @ 815FD60 def_special NullFieldSpecial def_special NullFieldSpecial def_special GetLeadMonFriendship - def_special ScrSpecial_BattleTowerMapScript2 + def_special BattleTowerMapScript2 def_special ChooseNextBattleTowerTrainer def_special CheckPartyBattleTowerBanlist def_special PrintBattleTowerTrainerGreeting @@ -270,7 +270,7 @@ gSpecials:: @ 815FD60 def_special NullFieldSpecial def_special NullFieldSpecial def_special NullFieldSpecial - def_special ScrSpecial_CreatePCMenu + def_special CreatePCMenu def_special HallOfFamePCBeginFade def_special ShowDiploma def_special NullFieldSpecial @ Check lead mon Contest strength specials @@ -352,8 +352,8 @@ gSpecials:: @ 815FD60 def_special sub_810B82C def_special StartMarowakBattle def_special ForcePlayerOntoBike - def_special Special_ListMenu - def_special Special_ReturnToListMenu + def_special ListMenu + def_special ReturnToListMenu def_special sub_80CADC4 def_special SetVermilionTrashCans def_special sub_805D1A8 @@ -389,7 +389,7 @@ gSpecials:: @ 815FD60 def_special TakePokemonFromRoute5Daycare def_special DoSeagallopFerryScene def_special DoesPlayerPartyContainSpecies - def_special Special_SetSomeVariable + def_special HelpSystem_SetSomeVariable def_special HelpSystem_BackupSomeVariable def_special HelpSystem_RestoreSomeVariable def_special ValidateReceivedWonderCard @@ -398,10 +398,10 @@ gSpecials:: @ 815FD60 def_special BufferUnionRoomPlayerName def_special sub_811390C def_special GetMartClerkObjectId - def_special Special_BattleCardAction + def_special BattleCardAction def_special GetQuestLogState def_special sub_8112364 - def_special Special_GetMENewsJisanItemAndState + def_special GetMENewsJisanItemAndState def_special GetPCBoxToSendMon def_special OpenMuseumFossilPic def_special CloseMuseumFossilPic @@ -422,8 +422,8 @@ gSpecials:: @ 815FD60 def_special CheckHasAtLeastOneBerry def_special DisplayBerryPowderVendorMenu def_special RemoveBerryPowderVendorMenu - def_special Special_HasEnoughBerryPowder - def_special Special_TakeBerryPowder + def_special Script_HasEnoughBerryPowder + def_special Script_TakeBerryPowder def_special PrintPlayerBerryPowderAmount def_special DoPokemonLeagueLightingEffect def_special ShowBerryCrushRankings -- cgit v1.2.3 From 4df660dc76b5f35d2a89e0cb627180b79e9caa12 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 4 Mar 2020 10:42:40 -0500 Subject: Add enums for help system text, label help context --- data/event_scripts.s | 1 + data/maps/PalletTown_PlayersHouse_2F/scripts.inc | 8 ++++---- data/scripts/hall_of_fame.inc | 2 +- data/scripts/pc.inc | 18 +++++++++--------- data/scripts/pokedex_rating.inc | 8 ++++---- data/specials.inc | 8 ++++---- 6 files changed, 23 insertions(+), 22 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 3c221d2aa..ed293ba64 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -35,6 +35,7 @@ #include "constants/daycare.h" #include "constants/easy_chat.h" #include "constants/trainer_card.h" +#include "constants/help_system.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .set FALSE, 0 diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index 975da4be1..943056ea3 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -32,15 +32,15 @@ PalletTown_PlayersHouse_2F_EventScript_Sign:: @ 8168CDB PalletTown_PlayersHouse_2F_EventScript_PC:: @ 8168CE4 goto_if_questlog EventScript_ReleaseEnd lockall - setvar VAR_0x8004, 32 - special HelpSystem_SetSomeVariable + setvar VAR_0x8004, HELPCONTEXT_BEDROOM_PC + special Script_SetHelpContext setvar VAR_0x8004, 1 special AnimatePcTurnOn playse SE_PC_ON msgbox Text_PlayerBootedUpPC special BedroomPC waitstate - special sub_812B35C + special SetHelpContextForMap releaseall end @@ -48,6 +48,6 @@ EventScript_PalletTown_PlayersHouse_2F_ShutDownPC:: @ 8168D17 setvar VAR_0x8004, 1 playse SE_PC_OFF special AnimatePcTurnOff - special sub_812B35C + special SetHelpContextForMap releaseall end diff --git a/data/scripts/hall_of_fame.inc b/data/scripts/hall_of_fame.inc index 5ce427a6a..5657ff2dd 100644 --- a/data/scripts/hall_of_fame.inc +++ b/data/scripts/hall_of_fame.inc @@ -1,7 +1,7 @@ EventScript_SetDefeatedEliteFourFlagsVars:: @ 81A651A clearflag FLAG_HIDE_POSTGAME_GOSSIPERS call EventScript_ResetEliteFour - special Special_UpdateTrainerFanClubGameClear + special Script_UpdateTrainerFanClubGameClear specialvar VAR_RESULT, IsNationalPokedexEnabled compare VAR_RESULT, FALSE call_if_eq EventScript_SetReadyTryGiveNationalDexScene diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc index af9eca601..0c71b9c76 100644 --- a/data/scripts/pc.inc +++ b/data/scripts/pc.inc @@ -2,8 +2,8 @@ EventScript_PC:: @ 81A6955 goto_if_questlog EventScript_ReleaseEnd lockall goto_if_set FLAG_SYS_PC_STORAGE_DISABLED, EventScript_PCDisabled - setvar VAR_0x8004, 27 - special HelpSystem_SetSomeVariable + setvar VAR_0x8004, HELPCONTEXT_PC + special Script_SetHelpContext setvar VAR_0x8004, 0 special AnimatePcTurnOn playse SE_PC_ON @@ -50,8 +50,8 @@ EventScript_AccessPokemonStorage:: @ 81A6A05 msgbox Text_OpenedPkmnStorage special ShowPokemonStorageSystem waitstate - setvar VAR_0x8004, 27 - special HelpSystem_SetSomeVariable + setvar VAR_0x8004, HELPCONTEXT_PC + special Script_SetHelpContext goto EventScript_PCMainMenu end @@ -67,19 +67,19 @@ EventScript_TurnOffPC:: @ 81A6A46 setvar VAR_0x8004, 0 playse SE_PC_OFF special AnimatePcTurnOff - special sub_812B35C + special SetHelpContextForMap releaseall end EventScript_AccessHallOfFame:: @ 81A6A56 goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_TurnOffPC playse SE_PC_LOGIN - setvar VAR_0x8004, 31 - special HelpSystem_BackupSomeVariable - special HelpSystem_SetSomeVariable + setvar VAR_0x8004, HELPCONTEXT_PC_MISC + special BackupHelpContext + special Script_SetHelpContext special HallOfFamePCBeginFade waitstate - special HelpSystem_RestoreSomeVariable + special RestoreHelpContext goto EventScript_ChoosePCMenu end diff --git a/data/scripts/pokedex_rating.inc b/data/scripts/pokedex_rating.inc index c8b126e60..79f4ad84c 100644 --- a/data/scripts/pokedex_rating.inc +++ b/data/scripts/pokedex_rating.inc @@ -35,9 +35,9 @@ PokedexRating_EventScript_DexCompleteFanfare:: @ 81A73DC return PokedexRating_EventScript_Rate:: @ 81A73E0 - setvar VAR_0x8004, 31 - special HelpSystem_BackupSomeVariable - special HelpSystem_SetSomeVariable + setvar VAR_0x8004, HELPCONTEXT_PC_MISC + special BackupHelpContext + special Script_SetHelpContext setvar VAR_0x8004, 0 specialvar VAR_RESULT, GetPokedexCount copyvar VAR_0x8008, VAR_0x8005 @@ -80,5 +80,5 @@ PokedexRating_EventScript_DexComplete:: @ 81A747E end PokedexRating_EventScript_EndRating:: @ 81A748F - special HelpSystem_RestoreSomeVariable + special RestoreHelpContext return diff --git a/data/specials.inc b/data/specials.inc index 3f9addacb..0d7670f63 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -389,9 +389,9 @@ gSpecials:: @ 815FD60 def_special TakePokemonFromRoute5Daycare def_special DoSeagallopFerryScene def_special DoesPlayerPartyContainSpecies - def_special HelpSystem_SetSomeVariable - def_special HelpSystem_BackupSomeVariable - def_special HelpSystem_RestoreSomeVariable + def_special Script_SetHelpContext + def_special BackupHelpContext + def_special RestoreHelpContext def_special ValidateReceivedWonderCard def_special sub_810B810 def_special InitUnionRoom @@ -408,7 +408,7 @@ gSpecials:: @ 815FD60 def_special ChooseMonForMoveTutor def_special ChooseMonForWirelessMinigame def_special SetBattledTrainerFlag - def_special sub_812B35C + def_special SetHelpContextForMap def_special DoSSAnneDepartureCutscene def_special IsPokemonJumpSpeciesInParty def_special IsNationalPokedexEnabled -- cgit v1.2.3 From a82a7b5fcbb751f91db02d41e355b4b2a5bec8c9 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 4 Mar 2020 18:29:32 -0500 Subject: Lowercase new pokedude labels --- data/event_scripts.s | 2 +- data/text/poke_dude.inc | 130 ------------------------------------------------ data/text/pokedude.inc | 130 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 131 insertions(+), 131 deletions(-) delete mode 100644 data/text/poke_dude.inc create mode 100644 data/text/pokedude.inc (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index ed293ba64..0940cf955 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1358,4 +1358,4 @@ Text_TestMsg:: @ 81ACD45 .include "data/scripts/test.inc" .include "data/text/save.inc" .include "data/text/new_game_intro.inc" - .include "data/text/poke_dude.inc" + .include "data/text/pokedude.inc" diff --git a/data/text/poke_dude.inc b/data/text/poke_dude.inc deleted file mode 100644 index 79d7493e0..000000000 --- a/data/text/poke_dude.inc +++ /dev/null @@ -1,130 +0,0 @@ -PokeDude_Text_SpeedierBattlerGoesFirst:: - .string "POKé DUDE: The speedier of the\n" - .string "battlers gets to attack first.$" - -PokeDude_Text_MyRattataFasterThanPidgey:: - .string "It looks like my RATTATA was\n" - .string "faster than the PIDGEY.$" - -PokeDude_Text_BattlersTakeTurnsAttacking:: - .string "The battlers take turns attacking\n" - .string "and reducing each other's HP.$" - -PokeDude_Text_MyRattataWonGetsEXP:: - .string "My RATTATA reduced the foe's HP\n" - .string "to zero, so it wins!\p" - .string "The POKéMON that took part in the\n" - .string "battle get EXP. Points.\p" - .string "When a POKéMON collects enough\n" - .string "EXP. Points, it levels up.\p" - .string "Leveling up makes your POKéMON\n" - .string "stronger than before.$" - -PokeDude_Text_UhOhRattataPoisoned:: - .string "POKé DUDE: Uh-oh…\n" - .string "My RATTATA has been poisoned…\p" - .string "If a POKéMON is poisoned, it loses\n" - .string "HP steadily.$" - -PokeDude_Text_HealStatusRightAway:: - .string "If a POKéMON develops a status\n" - .string "problem, heal it right away.$" - -PokeDude_Text_UsingItemTakesTurn:: - .string "Using an item on a POKéMON uses\n" - .string "up one turn, though.\p" - .string "Now, it's the opponent's turn!$" - -PokeDude_Text_YayWeManagedToWin:: - .string "Yay!\n" - .string "We managed to win!$" - -PokeDude_Text_WaterNotVeryEffectiveAgainstGrass:: - .string "POKé DUDE: The move BUBBLE is\n" - .string "a WATER-type attack.\p" - .string "The targeted ODDISH is a\n" - .string "GRASS/POISON-type POKéMON.\p" - .string "The WATER-type attack is absorbed\n" - .string "by the GRASS-type POKéMON…\p" - .string "As a result, the move becomes not\n" - .string "very effective, and inflicts only\l" - .string "half the usual damage.$" - -PokeDude_Text_GrassEffectiveAgainstWater:: - .string "Uh-oh, this is not good!\p" - .string "The ABSORB attack you just saw\n" - .string "is a GRASS-type move.\p" - .string "POLIWAG is a WATER-type POKéMON.\p" - .string "So, ABSORB becomes super\n" - .string "effective, doubling the damage.$" - -PokeDude_Text_LetsTryShiftingMons:: - .string "It's not going to be easy to win\n" - .string "with this matchup…\p" - .string "Let's try shifting POKéMON!$" - -PokeDude_Text_ShiftingUsesTurn:: - .string "Shifting POKéMON in and out uses\n" - .string "up one turn.\p" - .string "Now, it's the opponent's turn.$" - -PokeDude_Text_ButterfreeDoubleResistsGrass:: - .string "BUTTERFREE is a BUG/FLYING-type\n" - .string "POKéMON.\p" - .string "Against this POKéMON, a GRASS-\n" - .string "type attack…\p" - .string "…inflicts only half the usual\n" - .string "damage on a BUG-type POKéMON…\p" - .string "…And, it also causes only half the\n" - .string "damage on a FLYING-type POKéMON.\p" - .string "Therefore, BUTTERFREE, being a\n" - .string "BUG/FLYING POKéMON, only takes\l" - .string "one quarter of the usual damage.$" - -PokeDude_Text_ButterfreeGoodAgainstOddish:: - .string "ODDISH is a GRASS/POISON-type\n" - .string "POKéMON.\p" - .string "A FLYING- or PSYCHIC-type attack\n" - .string "is super effective against it.\p" - .string "One of those types of attacks will\n" - .string "inflict double the usual damage.\p" - .string "Okay, here we go!$" - -PokeDude_Text_YeahWeWon:: - .string "Yeah!\n" - .string "We won!$" - -PokeDude_Text_WeakenMonBeforeCatching:: - .string "POKé DUDE: When you're trying to\n" - .string "catch a POKéMON, don't throw any\l" - .string "POKé BALLS right away.\p" - .string "First, you need to weaken it by\n" - .string "reducing its HP.$" - -PokeDude_Text_BestIfTargetStatused:: - .string "Okay, that should be good enough.\p" - .string "But, if it's possible, it would be\n" - .string "best if the target has a status\l" - .string "problem.\p" - .string "For instance, it would be easier\n" - .string "to catch if it were asleep or\l" - .string "paralyzed.$" - -PokeDude_Text_CantDoubleUpOnStatus:: - .string "This will make the POKéMON a lot\n" - .string "easier to catch!\p" - .string "Oh, yes. If you paralyze a\n" - .string "POKéMON, you can't make it fall\l" - .string "asleep on top of paralysis.\p" - .string "In other words, you can't double\n" - .string "up status problems, okay?$" - -PokeDude_Text_LetMeThrowBall:: - .string "Okay!\n" - .string "Let me throw my POKé BALL!$" - -PokeDude_Text_PickBestKindOfBall:: - .string "Before you throw a POKé BALL,\n" - .string "consider the condition and the\l" - .string "type of POKéMON, and pick the kind\l" - .string "of BALL that would work best.$" diff --git a/data/text/pokedude.inc b/data/text/pokedude.inc new file mode 100644 index 000000000..a7cfd8e9f --- /dev/null +++ b/data/text/pokedude.inc @@ -0,0 +1,130 @@ +Pokedude_Text_SpeedierBattlerGoesFirst:: + .string "POKé DUDE: The speedier of the\n" + .string "battlers gets to attack first.$" + +Pokedude_Text_MyRattataFasterThanPidgey:: + .string "It looks like my RATTATA was\n" + .string "faster than the PIDGEY.$" + +Pokedude_Text_BattlersTakeTurnsAttacking:: + .string "The battlers take turns attacking\n" + .string "and reducing each other's HP.$" + +Pokedude_Text_MyRattataWonGetsEXP:: + .string "My RATTATA reduced the foe's HP\n" + .string "to zero, so it wins!\p" + .string "The POKéMON that took part in the\n" + .string "battle get EXP. Points.\p" + .string "When a POKéMON collects enough\n" + .string "EXP. Points, it levels up.\p" + .string "Leveling up makes your POKéMON\n" + .string "stronger than before.$" + +Pokedude_Text_UhOhRattataPoisoned:: + .string "POKé DUDE: Uh-oh…\n" + .string "My RATTATA has been poisoned…\p" + .string "If a POKéMON is poisoned, it loses\n" + .string "HP steadily.$" + +Pokedude_Text_HealStatusRightAway:: + .string "If a POKéMON develops a status\n" + .string "problem, heal it right away.$" + +Pokedude_Text_UsingItemTakesTurn:: + .string "Using an item on a POKéMON uses\n" + .string "up one turn, though.\p" + .string "Now, it's the opponent's turn!$" + +Pokedude_Text_YayWeManagedToWin:: + .string "Yay!\n" + .string "We managed to win!$" + +Pokedude_Text_WaterNotVeryEffectiveAgainstGrass:: + .string "POKé DUDE: The move BUBBLE is\n" + .string "a WATER-type attack.\p" + .string "The targeted ODDISH is a\n" + .string "GRASS/POISON-type POKéMON.\p" + .string "The WATER-type attack is absorbed\n" + .string "by the GRASS-type POKéMON…\p" + .string "As a result, the move becomes not\n" + .string "very effective, and inflicts only\l" + .string "half the usual damage.$" + +Pokedude_Text_GrassEffectiveAgainstWater:: + .string "Uh-oh, this is not good!\p" + .string "The ABSORB attack you just saw\n" + .string "is a GRASS-type move.\p" + .string "POLIWAG is a WATER-type POKéMON.\p" + .string "So, ABSORB becomes super\n" + .string "effective, doubling the damage.$" + +Pokedude_Text_LetsTryShiftingMons:: + .string "It's not going to be easy to win\n" + .string "with this matchup…\p" + .string "Let's try shifting POKéMON!$" + +Pokedude_Text_ShiftingUsesTurn:: + .string "Shifting POKéMON in and out uses\n" + .string "up one turn.\p" + .string "Now, it's the opponent's turn.$" + +Pokedude_Text_ButterfreeDoubleResistsGrass:: + .string "BUTTERFREE is a BUG/FLYING-type\n" + .string "POKéMON.\p" + .string "Against this POKéMON, a GRASS-\n" + .string "type attack…\p" + .string "…inflicts only half the usual\n" + .string "damage on a BUG-type POKéMON…\p" + .string "…And, it also causes only half the\n" + .string "damage on a FLYING-type POKéMON.\p" + .string "Therefore, BUTTERFREE, being a\n" + .string "BUG/FLYING POKéMON, only takes\l" + .string "one quarter of the usual damage.$" + +Pokedude_Text_ButterfreeGoodAgainstOddish:: + .string "ODDISH is a GRASS/POISON-type\n" + .string "POKéMON.\p" + .string "A FLYING- or PSYCHIC-type attack\n" + .string "is super effective against it.\p" + .string "One of those types of attacks will\n" + .string "inflict double the usual damage.\p" + .string "Okay, here we go!$" + +Pokedude_Text_YeahWeWon:: + .string "Yeah!\n" + .string "We won!$" + +Pokedude_Text_WeakenMonBeforeCatching:: + .string "POKé DUDE: When you're trying to\n" + .string "catch a POKéMON, don't throw any\l" + .string "POKé BALLS right away.\p" + .string "First, you need to weaken it by\n" + .string "reducing its HP.$" + +Pokedude_Text_BestIfTargetStatused:: + .string "Okay, that should be good enough.\p" + .string "But, if it's possible, it would be\n" + .string "best if the target has a status\l" + .string "problem.\p" + .string "For instance, it would be easier\n" + .string "to catch if it were asleep or\l" + .string "paralyzed.$" + +Pokedude_Text_CantDoubleUpOnStatus:: + .string "This will make the POKéMON a lot\n" + .string "easier to catch!\p" + .string "Oh, yes. If you paralyze a\n" + .string "POKéMON, you can't make it fall\l" + .string "asleep on top of paralysis.\p" + .string "In other words, you can't double\n" + .string "up status problems, okay?$" + +Pokedude_Text_LetMeThrowBall:: + .string "Okay!\n" + .string "Let me throw my POKé BALL!$" + +Pokedude_Text_PickBestKindOfBall:: + .string "Before you throw a POKé BALL,\n" + .string "consider the condition and the\l" + .string "type of POKéMON, and pick the kind\l" + .string "of BALL that would work best.$" -- cgit v1.2.3 From eb4327a71439a272a7764d0a819461d24884a9f8 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 5 Mar 2020 13:33:00 -0500 Subject: Move strings.s to src --- data/strings.s | 4845 ----------------------------------------------- data/text/quest_log.inc | 482 ----- data/text/teachy_tv.inc | 227 --- 3 files changed, 5554 deletions(-) delete mode 100644 data/strings.s delete mode 100644 data/text/quest_log.inc delete mode 100644 data/text/teachy_tv.inc (limited to 'data') diff --git a/data/strings.s b/data/strings.s deleted file mode 100644 index 93a98960e..000000000 --- a/data/strings.s +++ /dev/null @@ -1,4845 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 -gExpandedPlaceholder_Empty:: @ 8415A20 - .string "$" - -gExpandedPlaceholder_Kun:: @ 8415A21 - .string "$" - -gExpandedPlaceholder_Chan:: @ 8415A22 - .string "$" - -gExpandedPlaceholder_Sapphire:: @ 0x8415A23 - .string "SAPPHIRE$" - -gExpandedPlaceholder_Ruby:: @ 8415A2C - .string "RUBY$" - -gExpandedPlaceholder_Aqua:: @ 8415A31 - .string "AQUA$" - -gExpandedPlaceholder_Magma:: @ 8415A36 - .string "MAGMA$" - -gExpandedPlaceholder_Archie:: @ 8415A3C - .string "ARCHIE$" - -gExpandedPlaceholder_Maxie:: @ 8415A43 - .string "MAXIE$" - -gExpandedPlaceholder_Kyogre:: @ 8415A49 - .string "KYOGRE$" - -gExpandedPlaceholder_Groudon:: @ 8415A50 - .string "GROUDON$" - -gExpandedPlaceholder_Red:: @ 8415A58 - .string "RED$" - -gExpandedPlaceholder_Green:: @ 8415A5C - .string "GREEN$" - -gText_EggNickname:: @ 8415A62 - .string "EGG$" - -gStartMenuText_Pokemon:: @ 8415A66 - .string "POKéMON$" - -gText_NewGame:: @ 8415A6E - .string "NEW GAME$" - -gText_Continue:: @ 8415A77 - .string "CONTINUE$" - -gTextJP_Options:: @ 0x8415A80 - .string "せっていを かえる$" - -gUnusedText_MysteryGift:: @ 0x8415A8A - .string "MYSTERY GIFT$" - -gText_MysteryGift:: @ 8415A97 - .string "MYSTERY GIFT$" - -gText_WirelessAdapterIsNotConnected:: @ 8415AA4 - .string "The Wireless Adapter is not\n" - .string "connected.$" - -gText_MysteryGiftCantBeUsedWhileWirelessAdapterIsAttached:: @ 8415ACB - .string "MYSTERY GIFT can't be used while\n" - .string "the Wireless Adapter is attached.$" - -gUnknown_8415B0E:: @ 0x8415B0E - .string "がいぶデ-タにより レポ-トを こうしんします\n" - .string "しばらく おまちください$" - -gUnknown_8415B33:: @ 0x8415B33 - .string "レポ-トが こうしんされました!$" - -gUnknown_8415B44:: @ 0x8415B44 - .string "レポ-トが こうしんされました!\p" - .string "これいじょう\n" - .string "レポ-トが かききれないので\l" - .string "バックアップカ-トリッジを\l" - .string "こうかんしてください!\p" - .string "くわしくは\n" - .string "にんてんどう サ-ビスセンタ- まで\l" - .string "おといあわせ ください$" - -gUnknown_8415BAA:: @ 0x8415BAA - .string "レポ-トの こうしんは\n" - .string "しっぱいしました!\p" - .string "バックアップカ-トリッジを\n" - .string "こうかんしてください!\p" - .string "くわしくは\n" - .string "にんてんどう サ-ビスセンタ- まで\l" - .string "おといあわせ ください$" - -gText_SaveFileCorruptedPrevWillBeLoaded:: @ 8415BFF - .string "The save file is corrupted.\p" - .string "The previous save file will be\n" - .string "loaded.$" - -gText_SaveFileHasBeenDeleted:: @ 8415C42 - .string "The save file has been\n" - .string "deleted...$" - -gText_1MSubCircuitBoardNotInstalled:: @ 8415C64 - .string "The 1M sub-circuit board is\n" - .string "not installed.$" - -gTextJP_InternalBatteryHasRunDry:: @ 0x8415C8F - .string "でんちぎれの ために\n" - .string "とけいが うごかなくなりました\p" - .string "とけいに かんけいする できごとは おきませんが\n" - .string "ゲ-ムを つづけて あそぶことは できます$" - -gUnknown_8415CD9:: @ 0x8415CD9 - .string "しゅじんこう$" - -gUnknown_8415CE0:: @ 0x8415CE0 - .string "ポケモンずかん$" - -gText_MainMenuTime:: @ 8415CE8 - .string "TIME$" - -gUnknown_8415CED:: @ 0x8415CED - .string "もっているバッジ$" - -gUnknown_8415CF6:: @ 0x8415CF6 - .string "Aボタン$" - -gUnknown_8415CFB:: @ 0x8415CFB - .string "Bボタン$" - -gUnknown_8415D00:: @ 0x8415D00 - .string "Rボタン$" - -gUnknown_8415D05:: @ 0x8415D05 - .string "Lボタン$" - -gUnknown_8415D0A:: @ 0x8415D0A - .string "スタ-トボタン$" - -gUnknown_8415D12:: @ 0x8415D12 - .string "セレクトボタン$" - -gUnknown_8415D1A:: @ 0x8415D1A - .string "じゅうじボタン$" - -gUnknown_8415D22:: @ 0x8415D22 - .string "Lボタン Rボタン$" - -gText_Controls:: @ 8415D2C - .string "CONTROLS$" - - .align 2 -gUnknown_8415D38:: @ 8415D2C - .string "{DPAD_UPDOWN}えらぶ {A_BUTTON}けってい$" - - .align 2 -gText_ABUTTONNext:: @ 8415D48 - .string "{A_BUTTON}NEXT$" - - .align 2 -gText_ABUTTONNext_BBUTTONBack:: @ 8415D50 - .string "{A_BUTTON}NEXT {B_BUTTON}BACK$" - - .align 2 -gText_UPDOWNPick_ABUTTONNext_BBUTTONBack:: @ 8415D60 - .string "{DPAD_UPDOWN}PICK {A_BUTTON}NEXT {B_BUTTON}CANCEL$" - - .align 2 -gText_UPDOWNPick_ABUTTONBBUTTONCancel:: @ 8415D78 - .string "{DPAD_UPDOWN}PICK {A_BUTTON}{B_BUTTON}CANCEL$" - - .align 2 -gText_ABUTTONExit:: @ 8415D8C - .string "{A_BUTTON}EXIT$" - -gText_Boy:: @ 8415D93 - .string "BOY$" - -gText_Girl:: @ 8415D97 - .string "GIRL$" - -gUnknown_8415D9C:: @ 8415D9C - .string "POKéDEX TABLE OF CONTENTS$" - -gUnknown_8415DB8:: @ 8415DB8 - .string "{DPAD_UPDOWN}PICK {A_BUTTON}OK$" - -gUnknown_8415DC4:: @ 8415DC4 - .string "Seen:$" - -gUnknown_8415DCA:: @ 8415DCA - .string "Owned:$" - -gUnknown_8415DD1:: @ 8415DD1 - .string "KANTO$" - -gUnknown_8415DD7:: @ 8415DD7 - .string "NATIONAL$" - -gUnknown_8415DE0:: @ 0x8415DE0 - .string "{COLOR WHITE2}{SHADOW LIGHT_BLUE}POKéMON HABITATS$" - -gText_DexCategory_GrasslandPkmn:: @ 0x8415DF7 - .string "Grassland POKéMON$" - -gText_DexCategory_ForestPkmn:: @ 0x8415E09 - .string "Forest POKéMON$" - -gText_DexCategory_WatersEdgePkmn:: @ 0x8415E18 - .string "Water's-edge POKéMON$" - -gText_DexCategory_SeaPkmn:: @ 0x8415E2D - .string "Sea POKéMON$" - -gText_DexCategory_CavePkmn:: @ 0x8415E39 - .string "Cave POKéMON$" - -gText_DexCategory_MountainPkmn:: @ 0x8415E46 - .string "Mountain POKéMON$" - -gText_DexCategory_RoughTerrainPkmn:: @ 0x8415E57 - .string "Rough-terrain POKéMON$" - -gText_DexCategory_UrbanPkmn:: @ 0x8415E6D - .string "Urban POKéMON$" - -gText_DexCategory_RarePkmn:: @ 0x8415E7B - .string "Rare POKéMON$" - -gUnknown_8415E88:: @ 0x8415E88 - .string "{COLOR WHITE2}{SHADOW LIGHT_BLUE}SEARCH$" - -gUnknown_8415E95:: @ 0x8415E95 - .string "NUMERICAL MODE$" - -gUnknown_8415EA4:: @ 0x8415EA4 - .string "A TO Z MODE$" - -gUnknown_8415EB0:: @ 0x8415EB0 - .string "{COLOR WHITE2}{SHADOW LIGHT_BLUE}OTHER$" - -gUnknown_8415EBC:: @ 0x8415EBC - .string "ずかんの つかいかた$" - -gUnknown_8415EC7:: @ 0x8415EC7 - .string "CLOSE POKéDEX$" - -gUnknown_8415ED5:: @ 0x8415ED5 - .string "TYPE MODE$" - -gUnknown_8415EDF:: @ 0x8415EDF - .string "LIGHTEST MODE$" - -gUnknown_8415EED:: @ 0x8415EED - .string "SMALLEST MODE$" - -gUnknown_8415EFB:: @ 0x8415EFB - .string "{COLOR WHITE2}{SHADOW LIGHT_BLUE}POKéMON LIST$" - -gUnknown_8415F0E:: @ 0x8415F0E - .string "NUMERICAL MODE: KANTO$" - -gUnknown_8415F24:: @ 0x8415F24 - .string "NUMERICAL MODE: NATIONAL$" - -gUnknown_8415F3D:: @ 8415F3D - .string "POKéMON LIST$" - -gUnknown_8415F4A:: @ 8415F4A - .string "SEARCH$" - -gText_PickOKExit:: @ 8415F51 - .string "{DPAD_UPDOWN}PICK {A_BUTTON}OK {B_BUTTON}CANCEL$" - -gUnknown_8415F66:: @ 8415F66 - .string "-----$" - -gUnknown_8415F6C:: @ 8415F6C - .string "{DPAD_LEFTRIGHT}PICK{PLUS}FLIP PAGE {A_BUTTON}CHECK {B_BUTTON}CANCEL$" - -gUnknown_8415F8F:: @ 8415F8F - .string " POKéMON$" - -gUnknown_8415F98:: @ 8415F98 - .string "HT$" - -gUnknown_8415F9B:: @ 8415F9B - .string "WT$" - -gUnknown_8415F9E:: @ 0x8415F9E - .string "”$" - -gUnknown_8415FA0:: @ 8415FA0 - .string "lbs.$" - -gUnknown_8415FA5:: @ 0x8415FA5 - .string "ポケモンデ-タ$" - -gUnknown_8415FAD:: @ 8415FAD - .string "{START_BUTTON}CRY$" - -gUnknown_8415FB3:: @ 8415FB3 - .string "{A_BUTTON}NEXT DATA {B_BUTTON}CANCEL$" - -gUnknown_8415FC8:: @ 8415FC8 - .string "{A_BUTTON}NEXT$" - -gUnknown_8415FCF:: @ 8415FCF - .string "{A_BUTTON}CANCEL {B_BUTTON}PREVIOUS DATA$" - -gUnknown_8415FE8:: @ 8415FE8 - .string "AREA$" - -gUnknown_8415FED:: @ 8415FED - .string "SIZE$" - -gUnknown_8415FF2:: @ 8415FF2 - .string "AREA UNKNOWN$" - -gUnknown_8415FFF:: @ 8415FFF - .string "{NO}$" - -gUnknown_8416002:: @ 8416002 - .string "PAGE$" - - .align 2 -gText_WelcomeToHOF:: @ 8416008 - .string "Welcome to the HALL OF FAME!$" - - .align 2 -gUnknown_8416028:: @ 0x8416028 - .string "みつけた ポケモン {STR_VAR_1}!\n" - .string "つかまえた ポケモン {STR_VAR_2}!\p" - .string "オダマキはかせの\n" - .string "ポケモンずかん ひょうか!\p" - .string "オダマキ“どれどれ\p" - .string "$" - - .align 2 -gUnknown_8416068:: @ 0x8416068 - .string "ここまでの レポ-トを かきしるしています!\n" - .string "でんげんを きらないでください$" - - .align 2 -gText_HOFCorrupted:: @ 8416090 - .string "The HALL OF FAME data is\n" - .string "corrupted.$" - -gText_HOFNumber:: @ 84160B4 - .string "HALL OF FAME No. {STR_VAR_1}$" - -gText_LeagueChamp:: @ 84160C8 - .string "LEAGUE CHAMPION!\n" - .string "CONGRATULATIONS!$" - - .align 2 -gText_Number:: @ 84160EC - .string "No. $" - - .align 2 -gText_Level:: @ 84160F4 - .string "Lv. $" - - .align 2 -gText_Name:: @ 84160FC - .string "NAME$" - - .align 2 -gText_IDNumber:: @ 8416104 - .string "IDNo.$" - -gUnknown_841610A:: @ 0x841610A - .string "{HIGHLIGHT WHITE2}{COLOR DARK_GREY}オダマキはかせが ピンチだ!\n" - .string "ポケモンを だして たすけてあげよう!$" - -gUnknown_8416133:: @ 0x8416133 - .string "{HIGHLIGHT WHITE2}{COLOR DARK_GREY}このポケモンにしますか?$" - -gUnknown_8416146:: @ 0x8416146 - .string "ポケモン$" - -gText_SaveError_PleaseExchangeBackupMemory:: @ 841614B - .string "Save error.\p" - .string "Please exchange the\n" - .string "backup memory.$" - -gSaveStatName_Player:: @ 841617A - .string "PLAYER$" - -gSaveStatName_Badges:: @ 8416181 - .string "BADGES$" - -gSaveStatName_Pokedex:: @ 8416188 - .string "POKéDEX$" - -gSaveStatName_Time:: @ 8416190 - .string "TIME$" - -gUnknown_8416195:: - .string "どこへ とびますか?$" - -gOtherText_Use:: - .string "USE$" - -gOtherText_Toss:: - .string "TOSS$" - -gOtherText_Register:: - .string "REGISTER$" - -gOtherText_Give:: - .string "GIVE$" - -gUnknown_84161B7:: - .string "けってい$" - -gOtherText_Walk:: - .string "WALK$" - -gFameCheckerText_Cancel:: @ 84161C1 - .string "CANCEL$" - -gOtherText_Exit:: @ 84161C8 - .string "EXIT$" - -gString_Dummy:: @ 84161CD - .string "$" - -gUnknown_84161CE:: - .string "キャンセル$" - -gText_Item:: - .string "ITEM$" - -gText_Mail:: - .string "MAIL$" - -gText_Take:: - .string "TAKE$" - -gText_Store:: - .string "STORE$" - -gOtherText_Check:: - .string "CHECK$" - -gUnknown_84161EF:: @ 84161EF - .string "NONE$" - -gOtherText_Open:: - .string "OPEN$" - -gOtherText_Deselect:: - .string "DESELECT$" - -gUnknown_8416202:: @ 8416202 - .string "???$" - -gUnknown_8416206:: - .string "?????$" - -gText_Slash:: @ 841620C - .string "/$" - -gUnknown_841620E:: @ 841620E - .string "-$" - -gUnknown_8416210:: @ 8416210 - .string "--$" - -gText_ThreeHyphens:: @ 8416213 - .string "---$" - -gText_SevenHyphens:: @ 8416217 - .string "-------$" - -gText_MaleSymbol:: @ 841621F - .string "♂$" - -gText_FemaleSymbol:: @ 8416221 - .string "♀$" - -gText_Lv:: @ 8416223 - .string "{LV_2}$" - -gOtherText_UnkF9_08_Clear_01:: @ 8416226 - .string "{NO}{CLEAR 0x01}$" - -gUnknown_841622C:: - .string "{PLUS}$" - -gUnknown_841622F:: - .string "{ESCAPE 0x03}$" - -gUnknown_8416233:: - .string "{ID}{NO}$" - -gUnknown_8416238:: @ 8416238 - .string "{PP}$" - -gFameCheckerText_ListMenuCursor:: @ 841623B - .string "▶$" - -gUnknown_841623D:: @ 841623D - .string "YES\n" - .string "NO$" - -gText_GoBackToThePreviousMenu:: - .string "Go back to the\n" - .string "previous menu.$" - -gText_WhatWouldYouLikeToDo:: @ 8416262 - .string "What would you like to do?$" - -gStartMenuText_Pokedex:: - .string "POKéDEX$" - -gStartMenuText_Bag:: @ 8416285 - .string "BAG$" - -gUnknown_8416289:: - .string "ポケナビ$" - -gStartMenuText_Player:: - .string "{PLAYER}$" - -gStartMenuText_Save:: - .string "SAVE$" - -gStartMenuText_Option:: - .string "OPTION$" - -gStartMenuText_Exit:: - .string "EXIT$" - -gStartMenuText_Retire:: - .string "RETIRE$" - -gUnknown_84162A9:: @ 84162A9 - .string "{STR_VAR_1}/{STR_VAR_2}\n" - .string "BALLS {STR_VAR_3}$" - -gText_TimesStrVar1:: @ 84162B9 - .string "×{STR_VAR_1}$" - -gUnknown_84162BD:: @ 84162BD - .string " BERRY$" - -gText_Coins:: @ 84162C4 - .string "{STR_VAR_1} COINS$" - -gText_Items2:: @ 0x84162CD - .string "ITEMS$" - -gText_PokeBalls2:: @ 0x84162D3 - .string "POKé BALLS$" - -gText_KeyItems2:: @ 0x84162DE - .string "KEY ITEMS$" - -gText_DepositItem:: @ 84162E8 - .string "DEPOSIT ITEM$" - -gText_CloseBag:: @ 84162F5 - .string "CLOSE BAG$" - -gOtherText_StrVar1:: @ 84162FF - .string "{STR_VAR_1}" - -gText_IsSelected:: @ 8416301 - .string " is\n" - .string "selected.$" - -gText_CantWriteMailHere:: @ 841630F - .string "You can't write\n" - .string "MAIL here.$" - -gText_ThereIsNoPokemon:: @ 841632A - .string "There is no\n" - .string "POKéMON.$" - -gOtherText_WhereShouldTheStrVar1BePlaced:: @ 841633F - .string "Where should the {STR_VAR_1}\n" - .string "be placed?$" - -gText_ItemCantBeHeld:: @ 841635E - .string "The {STR_VAR_1} can't be held.$" - -gText_TheStrVar1CantBeHeldHere:: @ 8416374 - .string "The {STR_VAR_1} can't be held\n" - .string "here.$" - -gText_DepositHowManyStrVars1:: @ 841638F - .string "Deposit how many\n" - .string "{STR_VAR_1}(s)?$" - -gText_DepositedStrVar2StrVar1s:: @ 84163A7 - .string "Deposited {STR_VAR_2}\n" - .string "{STR_VAR_1}(s).$" - -gText_NoRoomToStoreItems:: @ 84163BB - .string "There's no room to\n" - .string "store items.$" - -gText_TossOutHowManyStrVar1s:: @ 84163DB - .string "Toss out how many\n" - .string "{STR_VAR_1}(s)?$" - -gText_ThrewAwayStrVar2StrVar1s:: @ 84163F4 - .string "Threw away {STR_VAR_2}\n" - .string "{STR_VAR_1}(s).$" - -gText_ThrowAwayStrVar2OfThisItemQM:: @ 8416409 - .string "Throw away {STR_VAR_2} of\n" - .string "this item?$" - -gUnknown_8416425:: @ 8416425 - .string "OAK: {PLAYER}!\n" - .string "This isn't the time to use that!{PAUSE_UNTIL_PRESS}$" - -gUnknown_8416451:: @ 8416451 - .string "You can't dismount your BIKE here.{PAUSE_UNTIL_PRESS}$" - -gText_ItemfinderResponding:: @ 8416476 - .string "Huh?\n" - .string "The ITEMFINDER's responding!\p" - .string "There's an item buried around here!{PAUSE_UNTIL_PRESS}$" - -gText_ItemfinderShakingWildly:: @ 84164BE - .string "Oh!\n" - .string "The ITEMFINDER's shaking wildly!\p" - .string "There's an item buried underfoot!\p" - .string "‥ ‥ ‥ ‥ ‥ ‥{PAUSE_UNTIL_PRESS}$" - -gText_NopeTheresNoResponse:: @ 8416513 - .string "‥ ‥ ‥ ‥Nope!\n" - .string "There's no response.{PAUSE_UNTIL_PRESS}$" - -gUnknown_8416537:: @ 8416537 - .string "Your COINS:\n" - .string "{STR_VAR_1}{PAUSE_UNTIL_PRESS}$" - -gUnknown_8416548:: @ 0x8416548 - .string "わざマシンを きどうした!$" - -gUnknown_8416556:: @ 0x8416556 - .string "ひでんマシンを きどうした!$" - -gUnknown_8416565:: @ 0x8416565 - .string "なかには {STR_VAR_1}が\n" - .string "きろくされていた!\p" - .string "{STR_VAR_1}を\n" - .string "ポケモンに おぼえさせますか?$" - -gUnknown_841658C:: @ 841658C - .string "{PLAYER} used the\n" - .string "{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" - -gUnknown_841659E:: @ 841659E - .string "But the effects of a REPEL\n" - .string "lingered from earlier.{PAUSE_UNTIL_PRESS}$" - -gUnknown_84165D2:: @ 84165D2 - .string "{PLAYER} used the\n" - .string "{STR_VAR_2}.\p" - .string "Wild POKéMON will be lured.{PAUSE_UNTIL_PRESS}$" - -gUnknown_8416600:: @ 8416600 - .string "{PLAYER} used the\n" - .string "{STR_VAR_2}.\p" - .string "Wild POKéMON will be repelled.{PAUSE_UNTIL_PRESS}$" - -gUnknown_8416631:: @ 8416631 - .string "The BOX is full.{PAUSE_UNTIL_PRESS}$" - -gUnknown_8416644:: @ 8416644 - .string "POWDER QTY: {STR_VAR_1}{PAUSE_UNTIL_PRESS}$" - -gOtherText_Powder:: @ 8416655 - .string "POWDER$" - -gUnknown_841665C:: @ 841665C - .string "Played the POKé FLUTE.\p" - .string "Now, that's a catchy tune!{PAUSE_UNTIL_PRESS}$" - -gUnknown_8416690:: @ 8416690 - .string "Played the POKé FLUTE.$" - -gUnknown_84166A7:: @ 84166A7 - .string "The POKé FLUTE awakened sleeping\n" - .string "POKéMON.{PAUSE_UNTIL_PRESS}$" - -gText_TMCase:: @ 84166D3 - .string "TM CASE$" - -gText_Close:: @ 84166DB - .string "CLOSE$" - -gText_TMCaseWillBePutAway:: @ 84166E1 - .string "The TM CASE will be\n" - .string "put away.$" - -gText_FontSize0:: @ 84166FF - .string "{SIZE 0}$" - -gText_FontSize2:: @ 8416703 - .string "{SIZE 2}$" - -gUnknown_8416707:: @ 8416707 - .string " $" - -gText_BerryPouch:: @ 841670A - .string "BERRY POUCH$" - -gText_TheBerryPouchWillBePutAway:: @ 8416716 - .string "The BERRY POUCH will be\n" - .string "put away.$" - -gText_ShopBuy:: @ 0x8416738 - .string "BUY$" - -gText_ShopSell:: @ 0x841673C - .string "SELL$" - -gText_ShopQuit:: @ 0x8416741 - .string "SEE YA!$" - -gText_InBagVar1:: @ 8416749 - .string "IN BAG:{SMALL} {STR_VAR_1}$" - -gText_QuitShopping:: @ 8416757 - .string "Quit shopping.$" - -gText_Var1CertainlyHowMany:: @ 8416766 - .string "{STR_VAR_1}? Certainly.\n" - .string "How many would you like?$" - -gText_Var1AndYouWantedVar2:: @ 841678E - .string "{STR_VAR_1}, and you want {STR_VAR_2}.\n" - .string "That will be ¥{STR_VAR_3}. Okay?$" - -gUnknown_84167BB:: @ 0x84167BB - .string "{STR_VAR_1} だね!\n" - .string "{STR_VAR_2}¥ だけど かうかい?$" - -gUnknown_84167D0:: @ 0x84167D0 - .string "{STR_VAR_1} ですね!\n" - .string "{STR_VAR_2}¥ だけど かいますか?$" - -gText_HereYouGoThankYou:: @ 84167E7 - .string "Here you are!\n" - .string "Thank you!$" - -gUnknown_8416800:: @ 0x8416800 - .string "どうも ありがとう!\n" - .string "じたくの パソコンに おくって おきますね!$" - -gUnknown_8416822:: @ 0x8416822 - .string "どうも ありがとう!\n" - .string "じたくの パソコンに おくって おくね!$" - -gText_YouDontHaveMoney:: @ 8416842 - .string "You don't have enough money.{PAUSE_UNTIL_PRESS}$" - -gText_NoMoreRoomForThis:: @ 8416861 - .string "You have no more room for this\n" - .string "item.{PAUSE_UNTIL_PRESS}$" - -gUnknown_8416888:: @ 0x8416888 - .string "{STR_VAR_1}を\n" - .string "いれる ばしょが いっぱいです{PAUSE_UNTIL_PRESS}$" - -gText_CanIHelpWithAnythingElse:: @ 841689E - .string "Is there anything else I can do?$" - -gUnknown_84168BF:: @ 0x84168BF - .string "その ほかに\n" - .string "なにか ちからに なれることは?$" - -gUnknown_84168D7:: @ 0x84168D7 - .string "プレミアボ-ル 1コ\n" - .string "おまけ しておきますね!{PAUSE_UNTIL_PRESS}$" - -gText_OhNoICantBuyThat:: @ 84168F1 - .string "{STR_VAR_1}? Oh, no.\n" - .string "I can't buy that.{PAUSE_UNTIL_PRESS}$" - -gText_HowManyWouldYouLikeToSell:: @ 8416911 - .string "{STR_VAR_1}?\n" - .string "How many would you like to sell?$" - -gText_ICanPayThisMuch_WouldThatBeOkay:: @ 8416936 - .string "I can pay ¥{STR_VAR_3}.\n" - .string "Would that be okay?$" - -gText_TurnedOverItemsWorthYen:: @ 8416959 - .string "Turned over the {STR_VAR_1}シSス\n" - .string "worth ¥{STR_VAR_3}.$" - -gText_PokedollarVar1:: @ 841697A - .string "¥{STR_VAR_1}$" - -gText_Shift:: @ 0x841697E - .string "SHIFT$" - -gText_SendOut:: @ 0x8416984 - .string "SEND OUT$" - -gText_Switch2:: @ 0x841698D - .string "SWITCH$" - -gText_Summary5:: @ 0x8416994 - .string "SUMMARY$" - -gUnknown_841699C:: @ 0x841699C - .string "つかえるわざ$" - -gText_Enter:: @ 0x84169A3 - .string "ENTER$" - -gText_NoEntry:: @ 0x84169A9 - .string "NO ENTRY$" - -gText_Take2:: @ 0x84169B2 - .string "TAKE$" - -gText_Read2:: @ 0x84169B7 - .string "READ$" - -gText_Trade4:: @ 0x84169BC - .string "TRADE$" - -gText_HP3:: @ 84169C2 - .string "HP$" - -gText_SpAtk3:: @ 84169C5 - .string "SP. ATK$" - -gText_SpDef3:: @ 84169CD - .string "SP. DEF$" - -gMenuText_Confirm:: @ 84169D5 - .string "OK$" - -gUnknown_84169D8:: @ 0x84169D8 - .string "$" - -gText_PauseUntilPress:: @ 84169D9 - .string "{PAUSE_UNTIL_PRESS}$" - -gText_WontHaveEffect:: @ 84169DC - .string "It won't have any effect.{PAUSE_UNTIL_PRESS}$" - -gUnknown_84169F8:: @ 84169F8 - .string "This can't be used on\n" - .string "that POKéMON.{PAUSE_UNTIL_PRESS}$" - -gText_PkmnCantSwitchOut:: @ 8416A1E - .string "{STR_VAR_1} can't be switched\n" - .string "out!{PAUSE_UNTIL_PRESS}$" - -gText_PkmnAlreadyInBattle:: @ 8416A3A - .string "{STR_VAR_1} is already\n" - .string "in battle!{PAUSE_UNTIL_PRESS}$" - -gText_PkmnAlreadySelected:: @ 8416A55 - .string "{STR_VAR_1} has already been\n" - .string "selected.{PAUSE_UNTIL_PRESS}$" - -gText_PkmnHasNoEnergy:: @ 8416A75 - .string "{STR_VAR_1} has no energy\n" - .string "left to battle!{PAUSE_UNTIL_PRESS}$" - -gText_CantSwitchWithAlly:: @ 8416A98 - .string "You can't switch {STR_VAR_1}'s\n" - .string "POKéMON with one of yours!{PAUSE_UNTIL_PRESS}$" - -gText_EggCantBattle:: @ 8416ACB - .string "An EGG can't battle!{PAUSE_UNTIL_PRESS}$" - -gText_CantUseUntilNewBadge:: @ 8416AE2 - .string "This can't be used until a new\n" - .string "BADGE is obtained.{PAUSE_UNTIL_PRESS}$" - -gUnknown_8416B16:: @ 8416B16 - .string "No more than three POKéMON\n" - .string "may enter.{PAUSE_UNTIL_PRESS}$" - -gUnknown_8416B3E:: @ 8416B3E - .string "No more than two POKéMON\n" - .string "may enter.{PAUSE_UNTIL_PRESS}$" - -gText_SendMailToPC:: @ 8416B64 - .string "Send the removed MAIL to\n" - .string "your PC?$" - -gText_MailSentToPC:: @ 8416B86 - .string "The MAIL was sent to your PC.{PAUSE_UNTIL_PRESS}$" - -gText_PCMailboxFull:: @ 8416BA6 - .string "Your PC's MAILBOX is full.{PAUSE_UNTIL_PRESS}$" - -gText_MailMessageWillBeLost:: @ 8416BC3 - .string "If the MAIL is removed, the\n" - .string "message will be lost. Okay?$" - -gText_RemoveMailBeforeItem:: @ 8416BFB - .string "MAIL must be removed before\n" - .string "holding an item.{PAUSE_UNTIL_PRESS}$" - -gText_PkmnWasGivenItem:: @ 8416C2A - .string "{STR_VAR_1} was given the\n" - .string "{STR_VAR_2} to hold.{PAUSE_UNTIL_PRESS}$" - -gText_PkmnAlreadyHoldingItemSwitch:: @ 8416C49 - .string "{STR_VAR_1} is already holding\n" - .string "one {STR_VAR_2}.\p" - .string "Would you like to switch the\n" - .string "two items?$" - -gText_PkmnNotHolding:: @ 8416C8F - .string "{STR_VAR_1} isn't holding\n" - .string "anything.{PAUSE_UNTIL_PRESS}$" - -gText_ReceivedItemFromPkmn:: @ 8416CAC - .string "Received the {STR_VAR_2}\n" - .string "from {STR_VAR_1}.{PAUSE_UNTIL_PRESS}$" - -gText_MailTakenFromPkmn:: @ 8416CC7 - .string "MAIL was taken from the\n" - .string "POKéMON.{PAUSE_UNTIL_PRESS}$" - -gText_SwitchedPkmnItem:: @ 8416CEA - .string "The {STR_VAR_2} was taken and\n" - .string "replaced with the {STR_VAR_1}.{PAUSE_UNTIL_PRESS}$" - -gText_PkmnHoldingItemCantHoldMail:: @ 8416D17 - .string "This POKéMON is holding an\n" - .string "item. It cannot hold MAIL.{PAUSE_UNTIL_PRESS}$" - -gText_MailTransferredFromMailbox:: @ 8416D4F - .string "MAIL was transferred from\n" - .string "the MAILBOX.{PAUSE_UNTIL_PRESS}$" - -gText_BagFullCouldNotRemoveItem:: @ 8416D78 - .string "The {STR_VAR_1} is full. The POKéMON's\n" - .string "item could not be removed.{PAUSE_UNTIL_PRESS}$" - -gText_PkmnLearnedMove3:: @ 8416DB3 - .string "{STR_VAR_1} learned\n" - .string "{STR_VAR_2}!$" - -gText_PkmnCantLearnMove:: @ 8416DC2 - .string "{STR_VAR_1} and {STR_VAR_2}\n" - .string "are not compatible.\p" - .string "{STR_VAR_2} can't be\n" - .string "learned.{PAUSE_UNTIL_PRESS}$" - -gText_PkmnNeedsToReplaceMove:: @ 8416DF7 - .string "{STR_VAR_1} wants to learn the\n" - .string "move {STR_VAR_2}.\p" - .string "However, {STR_VAR_1} already\n" - .string "knows four moves.\p" - .string "Should a move be deleted and\n" - .string "replaced with {STR_VAR_2}?$" - -gText_StopLearningMove2:: @ 8416E6B - .string "Stop trying to teach\n" - .string "{STR_VAR_2}?$" - -gText_MoveNotLearned:: @ 8416E84 - .string "{STR_VAR_1} did not learn the\n" - .string "move {STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" - -gText_WhichMoveToForget:: @ 8416EA4 - .string "Which move should be forgotten?{PAUSE_UNTIL_PRESS}$" - -gText_12PoofForgotMove:: @ 8416EC6 - .string "1, {PAUSE 0x0F}2, and{PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}{PLAY_SE SE_KON}Poof!\p" - .string "{STR_VAR_1} forgot how to\n" - .string "use {STR_VAR_2}.\p" - .string "And...{PAUSE_UNTIL_PRESS}$" - -gText_PkmnAlreadyKnows:: @ 8416F10 - .string "{STR_VAR_1} already knows\n" - .string "{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" - -gText_PkmnHPRestoredByVar2:: @ 8416F27 - .string "{STR_VAR_1}'s HP was restored\n" - .string "by {STR_VAR_2} point(s).{PAUSE_UNTIL_PRESS}$" - -gText_PkmnCuredOfPoison:: @ 8416F4E - .string "{STR_VAR_1} was cured of its\n" - .string "poisoning.{PAUSE_UNTIL_PRESS}$" - -gText_PkmnCuredOfParalysis:: @ 8416F6F - .string "{STR_VAR_1} was cured of\n" - .string "paralysis.{PAUSE_UNTIL_PRESS}$" - -gText_PkmnWokeUp2:: @ 8416F8C - .string "{STR_VAR_1} woke up.{PAUSE_UNTIL_PRESS}$" - -gText_PkmnBurnHealed:: @ 8416F9A - .string "{STR_VAR_1}'s burn was healed.{PAUSE_UNTIL_PRESS}$" - -gText_PkmnThawedOut:: @ 8416FB2 - .string "{STR_VAR_1} was thawed out.{PAUSE_UNTIL_PRESS}$" - -gText_PPWasRestored:: @ 8416FC7 - .string "PP was restored.{PAUSE_UNTIL_PRESS}$" - -gUnknown_8416FDA:: @ 0x8416FDA - .string "{STR_VAR_1}は\n" - .string "げんきを とりもどした!{PAUSE_UNTIL_PRESS}$" - -gText_PkmnBecameHealthy:: @ 8416FED - .string "{STR_VAR_1} became healthy.{PAUSE_UNTIL_PRESS}$" - -gText_MovesPPIncreased:: @ 8417002 - .string "{STR_VAR_1}'s PP increased.{PAUSE_UNTIL_PRESS}$" - -gText_PkmnElevatedToLvVar2:: @ 8417017 - .string "{STR_VAR_1} was elevated to\n" - .string "Lv. {STR_VAR_2}.$" - -gText_PkmnBaseVar2StatIncreased:: @ 8417032 - .string "{STR_VAR_1}'s base {STR_VAR_2}\n" - .string "stat was raised.{PAUSE_UNTIL_PRESS}$" - -gText_PkmnSnappedOutOfConfusion:: @ 8417052 - .string "{STR_VAR_1} snapped out of its\n" - .string "confusion.{PAUSE_UNTIL_PRESS}$" - -gText_PkmnGotOverInfatuation:: @ 8417075 - .string "{STR_VAR_1} got over its\n" - .string "infatuation.{PAUSE_UNTIL_PRESS}$" - -gUnknown_8417094:: @ 0x8417094 - .string "That's your only\n" - .string "POKéMON for battle.$" - - .align 2 -gText_PkmnCantBeTradedNow:: @ 84170BC - .string "That POKéMON can't be traded\n" - .string "now.$" - - .align 2 -gText_EggCantBeTradedNow:: @ 84170E0 - .string "An EGG can't be traded now.$" - - .align 2 -gText_OtherTrainersPkmnCantBeTraded:: @ 0x84170FC - .string "The other TRAINER's POKéMON\n" - .string "can't be traded now.$" - - .align 2 -gText_OtherTrainerCantAcceptPkmn:: @ 0x8417130 - .string "The other TRAINER can't accept\n" - .string "that POKéMON now.$" - - .align 2 -gText_CantTradeWithTrainer:: @ 0x8417164 - .string "You can't trade with that\n" - .string "TRAINER now.$" - - .align 2 -gText_NotPkmnOtherTrainerWants:: @ 0x841718C - .string "That isn't the type of POKéMON\n" - .string "that the other TRAINER wants.$" - - .align 2 -gText_ThatIsntAnEgg:: @ 0x84171CC - .string "That isn't an EGG.$" - -gText_ChoosePokemon:: @ 0x84171DF - .string "Choose a POKéMON.$" - -gText_MoveToWhere:: @ 0x84171F1 - .string "Move to where?$" - -gText_TeachWhichPokemon:: @ 0x8417200 - .string "Teach which POKéMON?$" - -gText_UseOnWhichPokemon:: @ 0x8417215 - .string "Use on which POKéMON?$" - -gText_GiveToWhichPokemon:: @ 0x841722B - .string "Give to which POKéMON?$" - -gText_DoWhatWithPokemon:: @ 0x8417242 - .string "Do what with this {PKMN}?$" - -gText_NothingToCut:: @ 0x8417258 - .string "There's nothing to CUT.$" - -gText_CantSurfHere:: @ 0x8417270 - .string "No SURFING here!$" - -gText_AlreadySurfing:: @ 0x8417281 - .string "You're already SURFING.$" - -gText_CantUseHere:: @ 0x8417299 - .string "Can't use that here.$" - -gText_RestoreWhichMove:: @ 0x84172AE - .string "Restore which move?$" - -gText_BoostPp:: @ 0x84172C2 - .string "Boost PP of which?$" - -gText_DoWhatWithItem:: @ 0x84172D5 - .string "Do what with an item?$" - -gText_NoPokemonForBattle:: @ 0x84172EB - .string "No battling this way!$" - -gText_ChoosePokemon2:: @ 0x8417301 - .string "Choose a POKéMON.$" - -gText_NotEnoughHp:: @ 0x8417313 - .string "Not enough HP‥$" - -gText_ThreePkmnAreNeeded:: @ 0x8417322 - .string "Three {PKMN} are needed.$" - -gText_PokemonCantBeSame:: @ 0x8417337 - .string "{PKMN} can't be the same.$" - -gText_NoIdenticalHoldItems:: @ 0x841734D - .string "No same hold items!$" - -gText_CurrentIsTooFast:: @ 0x8417361 - .string "The current is much too fast!$" - -gText_DoWhatWithMail:: @ 0x841737F - .string "Do what with the MAIL?$" - -gText_ChoosePokemonCancel:: @ 0x8417396 - .string "Choose POKéMON or CANCEL.$" - -gText_ChoosePokemonConfirm:: @ 0x84173B0 - .string "Choose POKéMON and confirm.$" - -gText_TwoPokemonAreNeeded:: @ 0x84173CC - .string "Two POKéMON are needed.$" - -gText_EnjoyCycling:: @ 0x84173E4 - .string "Let's enjoy cycling!$" - -gText_InUseAlready_PM:: @ 0x84173F9 - .string "This is in use already.$" - -gText_NoUse:: @ 0x8417411 - .string "No use.$" - -gText_Able:: @ 0x8417419 - .string "ABLE$" - -gText_First_PM:: @ 0x841741E - .string "FIRST$" - -gText_Second_PM:: @ 0x8417424 - .string "SECOND$" - -gText_Third_PM:: @ 0x841742B - .string "THIRD$" - -gText_Able2:: @ 0x8417431 - .string "ABLE$" - -gText_NotAble:: @ 0x8417436 - .string "NOT ABLE$" - -gText_Able3:: @ 0x841743F - .string "ABLE!$" - -gText_NotAble2:: @ 0x8417445 - .string "NOT ABLE!$" - -gText_Learned:: @ 0x841744F - .string "LEARNED$" - -gUnknown_8417457:: @ 8417457 - .string "OAK: It's important to get to know\n" - .string "your POKéMON thoroughly.\p" - .string "$" - -gUnknown_8417494:: @ 8417494 - .string "This is a list of your POKéMON,\n" - .string "{PLAYER}.\p" - .string "Open this to check the skills\n" - .string "and moves of your POKéMON.\p" - .string "You also choose POKéMON here if\n" - .string "you want to use an item on one.{PAUSE_UNTIL_PRESS}$" - -gText_CutATreeOrGrass:: @ 0x8417533 - .string "Cut a tree or grass.$" - -gText_FlyToAKnownTown:: @ 0x8417548 - .string "Fly to a known town.$" - -gText_TravelOnWater:: @ 0x841755D - .string "Travel on water.$" - -gText_MoveHeavyBoulders:: @ 0x841756E - .string "Move heavy boulders.$" - -gText_LightUpDarkness:: @ 0x8417583 - .string "Light up darkness.$" - -gText_ShatterACrackedRock:: @ 0x8417596 - .string "Shatter a cracked rock.$" - -gText_ClimbAWaterfall:: @ 0x84175AE - .string "Climb a waterfall.$" - -gUnknown_84175C1:: @ 0x84175C1 - .string "すいちゅうに もぐる$" - -gText_EscapeFromHere:: @ 0x84175CC - .string "Escape from here.$" - -gText_LureWildPokemon:: @ 0x84175DE - .string "Lure wild POKéMON.$" - -gText_ShareHp:: @ 0x84175F1 - .string "Share HP.$" - -gText_ReturnToAHealingSpot:: @ 0x84175FB - .string "Return to a healing spot.$" - -gText_EscapeFromHereAndReturnTo:: @ 8417615 - .string "Want to escape from here and return\n" - .string "to {STR_VAR_1}?$" - -gText_ReturnToHealingSpot:: @ 8417640 - .string "Want to return to the healing spot\n" - .string "used last in {STR_VAR_1}?$" - -gText_Attack3:: @ 8417674 - .string "ATTACK$" - -gText_Defense3:: @ 841767B - .string "DEFENSE$" - -gUnknown_8417683:: @ 0x8417683 - .string "とくこう$" - -gUnknown_8417688:: @ 0x8417688 - .string "とくぼう$" - -gText_Speed2:: @ 841768D - .string "SPEED$" - -gUnknown_8417693:: @ 0x8417693 - .string "HP$" - -gText_PkmnCantParticipate:: @ 8417696 - .string "That POKéMON can't participate.{PAUSE_UNTIL_PRESS}$" - -gText_CancelParticipation:: @ 84176B8 - .string "Cancel participation?$" - -gUnknown_84176CE:: @ 0x84176CE - .string "$" - -gUnknown_84176CF:: @ 84176CF - .string "Cancel the battle?$" - -gText_TurnOff:: @ 0x84176E2 - .string "TURN OFF$" - -gUnknown_84176EB:: @ 0x84176EB - .string "もようがえ$" - -gText_ItemStorage:: @ 0x84176F1 - .string "ITEM STORAGE$" - -gText_Mailbox:: @ 84176FE - .string "MAILBOX$" - -gText_DepositItem2:: @ 0x8417706 - .string "DEPOSIT ITEM$" - -gText_WithdrawItem2:: @ 0x8417713 - .string "WITHDRAW ITEM$" - -gUnknown_8417721:: @ 0x8417721 - .string "どうぐを すてる$" - -gText_StoreItemsInThePC:: @ 0x841772A - .string "Store items in the PC.$" - -gText_TakeOutItemsFromThePC:: @ 0x8417741 - .string "Take out items from the PC.$" - -gUnknown_841775D:: @ 0x841775D - .string "パソコンに あずけている\n" - .string "どうぐを すてます$" - -gText_ThereAreNoItems:: @ 8417774 - .string "There are no items.{PAUSE_UNTIL_PRESS}$" - -gText_NoMoreRoomInBag:: @ 841778A - .string "There is no more\n" - .string "room in the BAG.$" - -gText_WithdrawHowMany:: @ 84177AC - .string "Withdraw how many\n" - .string "{STR_VAR_1}(s)?$" - -gText_WithdrewQuantItem:: @ 84177C5 - .string "Withdrew {STR_VAR_2}\n" - .string "{STR_VAR_1}(s).$" - -gOtherText_Read:: - .string "READ$" - -gOtherText_MoveToBag:: - .string "MOVE TO BAG$" - -gOtherText_Give2:: - .string "GIVE$" - -gText_TheresNoMailHere:: @ 84177EE - .string "There's no MAIL here.{PAUSE_UNTIL_PRESS}$" - -gText_WhatWouldYouLikeToDoWithPlayersMail:: @ 8417806 - .string "What would you like to do with\n" - .string "{STR_VAR_1}'s MAIL?$" - -gText_MessageWillBeLost:: @ 8417830 - .string "The message will be lost.\n" - .string "Is that okay?$" - -gText_BagIsFull:: @ 8417858 - .string "The BAG is full.{PAUSE_UNTIL_PRESS}$" - -gText_MailReturnedToBagMessageErased:: @ 841786B - .string "The MAIL was returned to the BAG\n" - .string "with its message erased.{PAUSE_UNTIL_PRESS}$" - -gText_WithdrawItem:: @ 84178A7 - .string "WITHDRAW\n" - .string "ITEM$" - -gText_Withdraw:: - .string "WITHDRAW$" - -gText_ReturnToPC:: @ 84178BE - .string "Return to the PC.$" - -gText_LtSurge:: @ 84178D0 - .string "LT. SURGE$" - -gText_Koga:: @ 84178DA - .string "KOGA$" - -gUnknown_84178DF:: @ 0x84178DF - .string "さんか する$" - -gText_Info:: @ 0x84178E6 - .string "INFO$" - -gText_Eggs:: @ 0x84178EB - .string "EGGS$" - -gText_HallOfFame:: @ 0x84178F0 - .string "HALL OF FAME$" - -gText_Victories:: @ 0x84178FD - .string "VICTORIES$" - -gText_Quit:: @ 0x8417907 - .string "QUIT$" - -gText_Psn:: @ 0x841790C - .string "PSN$" - -gText_Par:: @ 0x8417910 - .string "PAR$" - -gText_Slp:: @ 0x8417914 - .string "SLP$" - -gText_Brn:: @ 0x8417918 - .string "BRN$" - -gText_Frz:: @ 0x841791C - .string "FRZ$" - -gUnknown_8417920:: @ 0x8417920 - .string "TOXIC$" - -gUnknown_8417926:: @ 0x8417926 - .string "OK$" - -gOtherText_Quit:: @ 0x8417929 - .string "QUIT$" - -gUnknown_841792E:: @ 0x841792E - .string "みました$" - -gUnknown_8417933:: @ 0x8417933 - .string "これから$" - -gText_Yes:: @ 8417938 - .string "YES$" - -gText_No:: @ 841793C - .string "NO$" - -gUnknown_841793F:: @ 0x841793F - .string "せつめい$" - -gText_SingleBattle:: @ 0x8417944 - .string "SINGLE BATTLE$" - -gText_DoubleBattle:: @ 0x8417952 - .string "DOUBLE BATTLE$" - -gText_MultiBattle:: @ 0x8417960 - .string "MULTI BATTLE$" - -gText_MakeAChallenge:: @ 0x841796D - .string "Make a challenge.$" - -gText_Info_2:: @ 0x841797F - .string "INFO$" - -gText_FreshWater_200:: @ 0x8417984 - .string "FRESH WATER{CLEAR_TO 0x57}{SMALL}¥200$" - -gText_SodaPop_300:: @ 0x841799A - .string "SODA POP{CLEAR_TO 0x57}{SMALL}¥300$" - -gText_Lemonade_350:: @ 0x84179AD - .string "LEMONADE{CLEAR_TO 0x57}{SMALL}¥350$" - -gText_50Coins_1000:: @ 0x84179C0 - .string "{SMALL} 50 COINS{CLEAR_TO 0x45}¥1,000$" - -gText_500Coins_10000:: @ 0x84179D6 - .string "{SMALL}500 COINS{CLEAR_TO 0x40}¥10,000$" - -gText_Excellent:: @ 0x84179ED - .string "Excellent$" - -gText_NotSoBad:: @ 0x84179F7 - .string "Not so bad$" - -gText_RedShard:: @ 0x8417A02 - .string "RED SHARD$" - -gText_YellowShard:: @ 0x8417A0C - .string "YELLOW SHARD$" - -gText_BlueShard:: @ 0x8417A19 - .string "BLUE SHARD$" - -gText_GreenShard:: @ 0x8417A24 - .string "GREEN SHARD$" - -gUnknown_8417A30:: @ 0x8417A30 - .string "バトルタワ-$" - -gText_Right:: @ 0x8417A37 - .string "Right$" - -gText_Left:: @ 0x8417A3D - .string "Left$" - -gText_Tm13_4000Coins:: @ 0x8417A42 - .string "TM13{CLEAR_TO 0x48}{SMALL}4,000 COINS$" - -gText_Tm23_3500Coins:: @ 0x8417A58 - .string "TM23{CLEAR_TO 0x48}{SMALL}3,500 COINS$" - -gText_Tm24_4000Coins:: @ 0x8417A6E - .string "TM24{CLEAR_TO 0x48}{SMALL}4,000 COINS$" - -gText_Tm30_4500Coins:: @ 0x8417A84 - .string "TM30{CLEAR_TO 0x48}{SMALL}4,500 COINS$" - -gText_Tm35_4000Coins:: @ 0x8417A9A - .string "TM35{CLEAR_TO 0x48}{SMALL}4,000 COINS$" - -gText_1F_2:: @ 0x8417AB0 - .string "1F$" - -gText_2F_2:: @ 0x8417AB3 - .string "2F$" - -gText_3F_2:: @ 0x8417AB6 - .string "3F$" - -gText_4F_2:: @ 0x8417AB9 - .string "4F$" - -gText_5F_2:: @ 0x8417ABC - .string "5F$" - -gText_Cool:: @ 0x8417ABF - .string "COOL$" - -gText_Beauty:: @ 0x8417AC4 - .string "BEAUTY$" - -gText_Cute:: @ 0x8417ACB - .string "CUTE$" - -gText_Smart:: @ 0x8417AD0 - .string "SMART$" - -gText_Tough:: @ 0x8417AD6 - .string "TOUGH$" - -gText_Normal:: @ 0x8417ADC - .string "NORMAL$" - -gText_Black:: @ 0x8417AE3 - .string "BLACK$" - -gText_Pink:: @ 0x8417AE9 - .string "PINK$" - -gText_Sepia:: @ 0x8417AEE - .string "SEPIA$" - -gText_Cool_2:: @ 0x8417AF4 - .string "COOL$" - -gText_Beauty_2:: @ 0x8417AF9 - .string "BEAUTY$" - -gText_Cute_2:: @ 0x8417B00 - .string "CUTE$" - -gText_Smart_2:: @ 0x8417B05 - .string "SMART$" - -gText_Tough_2:: @ 0x8417B0B - .string "TOUGH$" - -gText_Items:: @ 0x8417B11 - .string "ITEMS$" - -gText_KeyItems:: @ 0x8417B17 - .string "KEY ITEMS$" - -gText_PokeBalls:: @ 0x8417B21 - .string "POKé BALLS$" - -gText_TMsAndHMs:: @ 0x8417B2C - .string "TMs & HMs$" - -gText_Berries:: @ 0x8417B36 - .string "BERRIES$" - -gText_Boulderbadge:: @ 0x8417B3E - .string "BOULDERBADGE$" - -gText_Cascadebadge:: @ 0x8417B4B - .string "CASCADEBADGE$" - -gText_Thunderbadge:: @ 0x8417B58 - .string "THUNDERBADGE$" - -gText_Rainbowbadge:: @ 0x8417B65 - .string "RAINBOWBADGE$" - -gText_Soulbadge:: @ 0x8417B72 - .string "SOULBADGE$" - -gText_Marshbadge:: @ 0x8417B7C - .string "MARSHBADGE$" - -gText_Volcanobadge:: @ 0x8417B87 - .string "VOLCANOBADGE$" - -gText_Earthbadge:: @ 0x8417B94 - .string "EARTHBADGE$" - -gText_SomeoneSPc:: @ 8417B9F - .string "SOMEONE'S PC$" - -gText_BillSPc:: @ 8417BAC - .string "BILL'S PC$" - -gText_SPc:: @ 8417BB6 - .string "{PLAYER}'s PC$" - -gText_HallOfFame_2:: @ 8417BBE - .string "HALL OF FAME$" - -gText_LogOff:: @ 8417BCB - .string "LOG OFF$" - -gText_ProfOakSPc:: @ 8417BD3 - .string "PROF. OAK's PC$" - -gText_Eevee:: @ 0x8417BE2 - .string "EEVEE$" - -gText_Flareon:: @ 0x8417BE8 - .string "FLAREON$" - -gText_Jolteon:: @ 0x8417BF0 - .string "JOLTEON$" - -gText_Vaporeon:: @ 0x8417BF8 - .string "VAPOREON$" - -gText_QuitLooking:: @ 0x8417C01 - .string "Quit looking.$" - -gText_FreshWater:: @ 0x8417C0F - .string "FRESH WATER$" - -gText_SodaPop:: @ 0x8417C1B - .string "SODA POP$" - -gText_Lemonade:: @ 0x8417C24 - .string "LEMONADE$" - -gText_Coins_2:: @ 8417C2D - .string "COINS$" - -gText_Bicycle_1000000:: @ 0x8417C33 - .string "BICYCLE{CLEAR_TO 0x49}{SMALL}¥1,000,000$" - -gText_NoThanks:: @ 0x8417C4B - .string "NO THANKS$" - -gText_Abra_180Coins:: @ 0x8417C55 - .string "ABRA{CLEAR_TO 0x55}{SMALL} 180 COINS$" - -gText_Clefairy_500Coins:: @ 0x8417C6A - .string "CLEFAIRY{CLEAR_TO 0x55}{SMALL} 500 COINS$" - -gText_Dratini_2800Coins:: @ 0x8417C83 - .string "DRATINI{CLEAR_TO 0x4B}{SMALL} 2,800 COINS$" - -gText_Scyther_5500Coins:: @ 0x8417C9D - .string "SCYTHER{CLEAR_TO 0x4B}{SMALL} 5,500 COINS$" - -gText_Porygon_9999Coins:: @ 0x8417CB7 - .string "PORYGON{CLEAR_TO 0x4B}{SMALL} 9,999 COINS$" - -gText_Abra_120Coins:: @ 0x8417CD1 - .string "ABRA{CLEAR_TO 0x55}{SMALL} 120 COINS$" - -gText_Clefairy_750Coins:: @ 0x8417CE6 - .string "CLEFAIRY{CLEAR_TO 0x55}{SMALL} 750 COINS$" - -gText_Pinsir_2500Coins:: @ 0x8417CFF - .string "PINSIR{CLEAR_TO 0x4B}{SMALL} 2,500 COINS$" - -gText_Dratini_4600Coins:: @ 0x8417D18 - .string "DRATINI{CLEAR_TO 0x4B}{SMALL} 4,600 COINS$" - -gText_Porygon_6500Coins:: @ 0x8417D32 - .string "PORYGON{CLEAR_TO 0x4B}{SMALL} 6,500 COINS$" - -gText_NoThanks_2:: @ 0x8417D4C - .string "NO THANKS$" - -gText_HelixFossil:: @ 0x8417D56 - .string "HELIX FOSSIL$" - -gText_DomeFossil:: @ 0x8417D63 - .string "DOME FOSSIL$" - -gText_OldAmber:: @ 0x8417D6F - .string "OLD AMBER$" - -gText_TradeCenter:: @ 0x8417D79 - .string "TRADE CENTER$" - -gText_Colosseum:: @ 0x8417D86 - .string "COLOSSEUM$" - -gText_GameLinkCable:: @ 0x8417D90 - .string "Game Link cable$" - -gText_Wireless:: @ 0x8417DA0 - .string "Wireless$" - -gText_ItemsPocket:: @ 0x8417DA9 - .string "ITEMS POCKET$" - -gText_KeyItemsPocket:: @ 0x8417DB6 - .string "KEY ITEMS POCKET$" - -gText_PokeBallsPocket:: @ 0x8417DC7 - .string "POKé BALLS POCKET$" - -gText_TmCase:: @ 0x8417DD9 - .string "TM CASE$" - -gText_BerryPouch_2:: @ 0x8417DE1 - .string "BERRY POUCH$" - -gText_Other:: @ 8417DED - .string "OTHER$" - -gText_OneIsland:: @ 0x8417DF3 - .string "ONE ISLAND$" - -gText_TwoIsland:: @ 0x8417DFE - .string "TWO ISLAND$" - -gText_ThreeIsland:: @ 0x8417E09 - .string "THREE ISLAND$" - -gText_FourIsland:: @ 0x8417E16 - .string "FOUR ISLAND$" - -gText_FiveIsland:: @ 0x8417E22 - .string "FIVE ISLAND$" - -gText_SixIsland:: @ 0x8417E2E - .string "SIX ISLAND$" - -gText_SevenIsland:: @ 0x8417E39 - .string "SEVEN ISLAND$" - -gText_Vermilion:: @ 0x8417E46 - .string "VERMILION$" - -gText_Colosseum_2:: @ 0x8417E50 - .string "COLOSSEUM$" - -gText_BerryCrush:: @ 0x8417E5A - .string "BERRY CRUSH$" - -gText_Dummy_8417E66:: @ 0x8417E66 - .string "$" - -gText_Dummy_8417E67:: @ 0x8417E67 - .string "$" - -gUnknown_8417E68:: @ 0x8417E68 - .string "せつめいを きく$" - -gText_Dummy_8417E71:: @ 0x8417E71 - .string "$" - -gText_PokemonJump:: @ 0x8417E72 - .string "POKéMON JUMP$" - -gText_DodrioBerryPicking:: @ 0x8417E7F - .string "DODRIO BERRY-PICKING$" - -gText_2Tinymushrooms:: @ 0x8417E94 - .string "2 TINYMUSHROOMS$" - -gText_1BigMushroom:: @ 0x8417EA4 - .string "1 BIG MUSHROOM$" - -gText_SeviiIslands:: @ 0x8417EB3 - .string "SEVII ISLANDS$" - -gText_NavelRock:: @ 0x8417EC1 - .string "NAVEL ROCK$" - -gText_BirthIsland:: @ 0x8417ECC - .string "BIRTH ISLAND$" - -gText_MiracleSeed_1000Coins:: @ 0x8417ED9 - .string "MIRACLE SEED{CLEAR_TO 0x50}{SMALL}1,000 COINS$" - -gText_Charcoal_1000Coins:: @ 0x8417EF7 - .string "CHARCOAL{CLEAR_TO 0x50}{SMALL}1,000 COINS$" - -gText_MysticWater_1000Coins:: @ 0x8417F11 - .string "MYSTIC WATER{CLEAR_TO 0x50}{SMALL}1,000 COINS$" - -gText_YellowFlute_1600Coins:: @ 0x8417F2F - .string "YELLOW FLUTE{CLEAR_TO 0x50}{SMALL}1,600 COINS$" - -gText_SmokeBall_800Coins:: @ 0x8417F4D - .string "SMOKE BALL{CLEAR_TO 0x5A}{SMALL}800 COINS$" - -gText_Dummy_8417F67:: @ 0x8417F67 - .string "$" - -gText_Dummy_8417F68:: @ 0x8417F68 - .string "$" - -gText_BecomeLeader:: @ 0x8417F69 - .string "BECOME LEADER$" - -gText_JoinGroup:: @ 0x8417F77 - .string "JOIN GROUP$" - -gOtherText_Single:: @ 0x8417F82 - .string "SINGLE$" - -gOtherText_Double:: @ 0x8417F89 - .string "DOUBLE$" - -gOtherText_Knockout:: @ 0x8417F90 - .string "KNOCKOUT$" - -gOtherText_Mixed:: @ 0x8417F99 - .string "MIXED$" - -gUnknown_8417F9F:: @ 0x8417F9F - .string "99かい いじょう$" - -gUnknown_8417FA9:: @ 0x8417FA9 - .string "1ぷん いじょう$" - -gUnknown_8417FB2:: @ 0x8417FB2 - .string "びょう$" - -gUnknown_8417FB6:: @ 0x8417FB6 - .string "かい$" - -gText_DecimalPoint:: @ 8417FB9 - .string ".$" - -gText_BigGuy:: @ 8417FBB - .string "Big guy$" - -gText_BigGirl:: @ 8417FC3 - .string "Big girl$" - -gText_Daughter:: @ 8417FCC - .string "son$" - -gText_Son:: @ 8417FD0 - .string "daughter$" - -gText_BoulderBadge:: @ 0x8417FD9 - .string "BOULDERBADGE$" - -gText_CascadeBadge:: @ 0x8417FE6 - .string "CASCADEBADGE$" - -gText_ThunderBadge:: @ 0x8417FF3 - .string "THUNDERBADGE$" - -gText_RainbowBadge:: @ 0x8418000 - .string "RAINBOWBADGE$" - -gText_SoulBadge:: @ 0x841800D - .string "SOULBADGE$" - -gText_MarshBadge:: @ 0x8418017 - .string "MARSHBADGE$" - -gText_VolcanoBadge:: @ 0x8418022 - .string "VOLCANOBADGE$" - -gText_EarthBadge:: @ 0x841802F - .string "EARTHBADGE$" - -gText_1F:: @ 0x841803A - .string "1F$" - -gText_2F:: @ 0x841803D - .string "2F$" - -gText_3F:: @ 0x8418040 - .string "3F$" - -gText_4F:: @ 0x8418043 - .string "4F$" - -gText_5F:: @ 0x8418046 - .string "5F$" - -gText_6F:: @ 0x8418049 - .string "6F$" - -gText_7F:: @ 0x841804C - .string "7F$" - -gText_8F:: @ 0x841804F - .string "8F$" - -gText_9F:: @ 0x8418052 - .string "9F$" - -gText_10F:: @ 0x8418055 - .string "10F$" - -gText_11F:: @ 0x8418059 - .string "11F$" - -gText_B1F:: @ 0x841805D - .string "B1F$" - -gText_B2F:: @ 0x8418061 - .string "B2F$" - -gText_B3F:: @ 0x8418065 - .string "B3F$" - -gText_B4F:: @ 0x8418069 - .string "B4F$" - -gText_Rooftop:: @ 0x841806D - .string "ROOFTOP$" - -gText_NowOn:: @ 8418075 - .string "Now on:$" - -gText_LinkedGamePlay:: @ 0x841807D - .string "LINKED GAME PLAY$" - -gText_DirectCorner:: @ 0x841808E - .string "DIRECT CORNER$" - -gText_UnionRoom:: @ 0x841809C - .string "UNION ROOM$" - -gText_Energypowder_50:: @ 0x84180A7 - .string "ENERGYPOWDER{CLEAR_TO 0x74}{SMALL}50$" - -gText_EnergyRoot_80:: @ 0x84180BC - .string "ENERGY ROOT{CLEAR_TO 0x74}{SMALL}80$" - -gText_HealPowder_50:: @ 0x84180D0 - .string "HEAL POWDER{CLEAR_TO 0x74}{SMALL}50$" - -gText_RevivalHerb_300:: @ 0x84180E4 - .string "REVIVAL HERB{CLEAR_TO 0x6F}{SMALL}300$" - -gText_Protein_1000:: @ 0x84180FA - .string "PROTEIN{CLEAR_TO 0x65}{SMALL}1,000$" - -gText_Iron_1000:: @ 0x841810D - .string "IRON{CLEAR_TO 0x65}{SMALL}1,000$" - -gText_Carbos_1000:: @ 0x841811D - .string "CARBOS{CLEAR_TO 0x65}{SMALL}1,000$" - -gText_Calcium_1000:: @ 0x841812F - .string "CALCIUM{CLEAR_TO 0x65}{SMALL}1,000$" - -gText_Zinc_1000:: @ 0x8418142 - .string "ZINC{CLEAR_TO 0x65}{SMALL}1,000$" - -gText_HpUp_1000:: @ 0x8418152 - .string "HP UP{CLEAR_TO 0x65}{SMALL}1,000$" - -gText_PpUp_3000:: @ 0x8418163 - .string "PP UP{CLEAR_TO 0x65}{SMALL}3,000$" - -gString_BattleRecords_PlayersBattleResults:: @ 8418174 - .string "{PLAYER}'s BATTLE RESULTS$" - -gString_BattleRecords_TotalRecord:: @ 8418188 - .string "TOTAL RECORD W:{STR_VAR_1} L:{STR_VAR_2} D:{STR_VAR_3}$" - -gString_BattleRecords_ColumnHeaders:: @ 84181A4 - .string "WIN{CLEAR_TO 0x30}LOSE{CLEAR_TO 0x60}DRAW$" - -gString_BattleRecords_7Dashes:: @ 84181B6 - .string "-------$" - -gString_BattleRecords_4Dashes:: @ 84181BE - .string "----$" - -gFameCheckerText_FameCheckerWillBeClosed:: @ 84181C3 - .string "The FAME CHECKER will be closed.$" - -gFameCheckerText_ClearTextbox:: @ 84181E4 - .string "\n" - .string " $" - -gUnknown_8418204:: @ 8418204 - .string "やめる$" - -gUnknown_8418208:: @ 0x8418208 - .string "Exit from the BOX.$" - -gUnknown_841821B:: @ 0x841821B - .string "What do you want to do?$" - -gUnknown_8418233:: @ 0x8418233 - .string "Please pick a theme.$" - -gUnknown_8418248:: @ 0x8418248 - .string "Pick the wallpaper.$" - -gUnknown_841825C:: @ 0x841825C - .string "{DYNAMIC 0x00} is selected.$" - -gUnknown_841826C:: @ 0x841826C - .string "Jump to which BOX?$" - -gUnknown_841827F:: @ 0x841827F - .string "Deposit in which BOX?$" - -gUnknown_8418295:: @ 0x8418295 - .string "{DYNAMIC 0x00} was deposited.$" - -gUnknown_84182A7:: @ 0x84182A7 - .string "The BOX is full.$" - -gUnknown_84182B8:: @ 0x84182B8 - .string "Release this POKéMON?$" - -gUnknown_84182CE:: @ 0x84182CE - .string "{DYNAMIC 0x00} was released.$" - -gUnknown_84182DF:: @ 0x84182DF - .string "Bye-bye, {DYNAMIC 0x00}!$" - -gUnknown_84182EC:: @ 0x84182EC - .string "Mark your POKéMON.$" - -gUnknown_84182FF:: @ 0x84182FF - .string "That's your last POKéMON!$" - -gUnknown_8418319:: @ 0x8418319 - .string "Your party's full!$" - -gUnknown_841832C:: @ 0x841832C - .string "You're holding a POKéMON!$" - -gUnknown_8418346:: @ 0x8418346 - .string "Which one will you take?$" - -gUnknown_841835F:: @ 0x841835F - .string "You can't release an EGG.$" - -gUnknown_8418379:: @ 0x8418379 - .string "Continue BOX operations?$" - -gUnknown_8418392:: @ 0x8418392 - .string "{DYNAMIC 0x00} came back!$" - -gUnknown_84183A0:: @ 0x84183A0 - .string "Was it worried about you?$" - -gUnknown_84183BA:: @ 0x84183BA - .string "‥ ‥ ‥ ‥ ‥!$" - -gUnknown_84183C5:: @ 0x84183C5 - .string "Please remove the MAIL.$" - -gUnknown_84183DD:: @ 0x84183DD - .string "GIVE to a POKéMON?$" - -gUnknown_84183F0:: @ 0x84183F0 - .string "Placed item in the BAG.$" - -gUnknown_8418408:: @ 0x8418408 - .string "The BAG is full.$" - -gUnknown_8418419:: @ 0x8418419 - .string "Put this item in the BAG?$" - -gUnknown_8418433:: @ 0x8418433 - .string "{DYNAMIC 0x00} is now held.$" - -gUnknown_8418443:: @ 0x8418443 - .string "Changed to {DYNAMIC 0x00}.$" - -gUnknown_8418452:: @ 0x8418452 - .string "MAIL can't be stored!$" - -gUnknown_8418468:: @ 0x8418468 - .string "CANCEL$" - -gUnknown_841846F:: @ 0x841846F - .string "STORE$" - -gUnknown_8418475:: @ 0x8418475 - .string "WITHDRAW$" - -gUnknown_841847E:: @ 0x841847E - .string "SHIFT$" - -gUnknown_8418484:: @ 0x8418484 - .string "MOVE$" - -gUnknown_8418489:: @ 0x8418489 - .string "PLACE$" - -gUnknown_841848F:: @ 0x841848F - .string "SUMMARY$" - -gUnknown_8418497:: @ 0x8418497 - .string "RELEASE$" - -gUnknown_841849F:: @ 0x841849F - .string "MARK$" - -gUnknown_84184A4:: @ 0x84184A4 - .string "NAME$" - -gUnknown_84184A9:: @ 0x84184A9 - .string "JUMP$" - -gUnknown_84184AE:: @ 0x84184AE - .string "WALLPAPER$" - -gUnknown_84184B8:: @ 0x84184B8 - .string "TAKE$" - -gUnknown_84184BD:: @ 0x84184BD - .string "GIVE$" - -gUnknown_84184C2:: @ 0x84184C2 - .string "SWITCH$" - -gUnknown_84184C9:: @ 0x84184C9 - .string "BAG$" - -gUnknown_84184CD:: @ 0x84184CD - .string "INFO$" - -gUnknown_84184D2:: @ 0x84184D2 - .string "SCENERY 1$" - -gUnknown_84184DC:: @ 0x84184DC - .string "SCENERY 2$" - -gUnknown_84184E6:: @ 0x84184E6 - .string "SCENERY 3$" - -gUnknown_84184F0:: @ 0x84184F0 - .string "ETCETERA$" - -gUnknown_84184F9:: @ 0x84184F9 - .string "FOREST$" - -gUnknown_8418500:: @ 0x8418500 - .string "CITY$" - -gUnknown_8418505:: @ 0x8418505 - .string "DESERT$" - -gUnknown_841850C:: @ 0x841850C - .string "SAVANNA$" - -gUnknown_8418514:: @ 0x8418514 - .string "CRAG$" - -gUnknown_8418519:: @ 0x8418519 - .string "VOLCANO$" - -gUnknown_8418521:: @ 0x8418521 - .string "SNOW$" - -gUnknown_8418526:: @ 0x8418526 - .string "CAVE$" - -gUnknown_841852B:: @ 0x841852B - .string "BEACH$" - -gUnknown_8418531:: @ 0x8418531 - .string "SEAFLOOR$" - -gUnknown_841853A:: @ 0x841853A - .string "RIVER$" - -gUnknown_8418540:: @ 0x8418540 - .string "SKY$" - -gUnknown_8418544:: @ 0x8418544 - .string "STARS$" - -gUnknown_841854A:: @ 0x841854A - .string "POKéCENTER$" - -gUnknown_8418555:: @ 0x8418555 - .string "TILES$" - -gUnknown_841855B:: @ 0x841855B - .string "SIMPLE$" - -gUnknown_8418562:: @ 0x8418562 - .string "なにを しますか?$" - -gUnknown_841856C:: @ 0x841856C - .string "WITHDRAW POKéMON$" - -gUnknown_841857D:: @ 0x841857D - .string "DEPOSIT POKéMON$" - -gUnknown_841858D:: @ 0x841858D - .string "MOVE POKéMON$" - -gUnknown_841859A:: @ 0x841859A - .string "MOVE ITEMS$" - -gUnknown_84185A5:: @ 0x84185A5 - .string "SEE YA!$" - -gUnknown_84185AD:: @ 0x84185AD - .string "You can withdraw a POKéMON if you\n" - .string "have any in a BOX.$" - -gUnknown_84185E2:: @ 0x84185E2 - .string "You can deposit your party\n" - .string "POKéMON in any BOX.$" - -gUnknown_8418611:: @ 0x8418611 - .string "You can move POKéMON that are\n" - .string "stored in any BOX.$" - -gUnknown_8418642:: @ 0x8418642 - .string "You can move items held by any\n" - .string "POKéMON in a BOX or your party.$" - -gUnknown_8418681:: @ 0x8418681 - .string "See you later!$" - -gUnknown_8418690:: @ 8418690 - .string "Can't deposit the last POKéMON!$" - -gUnknown_84186B0:: @ 84186B0 - .string "Can't take any more POKéMON.$" - -gUnknown_84186CD:: @ 84186CD - .string "BOX$" - -gUnknown_84186D1:: @ 0x84186D1 - .string "Combine four words or phrases$" - -gUnknown_84186EF:: @ 0x84186EF - .string "and make your profile.$" - -gUnknown_8418706:: @ 0x8418706 - .string "Make a message of six phrases.$" - -gUnknown_8418725:: @ 0x8418725 - .string "Max two 12-letter phrases/line.$" - -gUnknown_8418745:: @ 0x8418745 - .string "Find words that describe your$" - -gUnknown_8418763:: @ 0x8418763 - .string "feelings right now.$" - -gUnknown_8418777:: @ 0x8418777 - .string "4つの ことばで$" - -gUnknown_8418780:: @ 0x8418780 - .string "Combine nine words or phrases$" - -gUnknown_841879E:: @ 0x841879E - .string "and make a message.$" - -gUnknown_84187B2:: @ 0x84187B2 - .string "Change just one word or phrase$" - -gUnknown_84187D1:: @ 0x84187D1 - .string "and improve the BARD's song.$" - -gUnknown_84187EE:: @ 0x84187EE - .string "and fill out the questionnaire.$" - -gUnknown_841880E:: @ 0x841880E - .string "Your profile$" - -gUnknown_841881B:: @ 0x841881B - .string "Your feeling at the battle's start$" - -gUnknown_841883E:: @ 0x841883E - .string "What you say if you win a battle$" - -gUnknown_841885F:: @ 0x841885F - .string "What you say if you lose a battle$" - -gUnknown_8418881:: @ 0x8418881 - .string "The answer$" - -gUnknown_841888C:: @ 0x841888C - .string "The MAIL message$" - -gUnknown_841889D:: @ 0x841889D - .string "はがきに のせる あいさつは$" - -gUnknown_84188AC:: @ 0x84188AC - .string "The new song$" - -gUnknown_84188B9:: @ 0x84188B9 - .string "Combine two words or phrases$" - -gUnknown_84188D6:: @ 0x84188D6 - .string "and make a trendy saying.$" - -gUnknown_84188F0:: @ 0x84188F0 - .string "The trendy saying$" - -gUnknown_8418902:: @ 0x8418902 - .string "is as shown. Okay?$" - -gUnknown_8418915:: @ 0x8418915 - .string "2つの ことばを くみあわせて$" - -gUnknown_8418925:: @ 0x8418925 - .string "いい ことばを おしえてあげよう!$" - -gUnknown_8418937:: @ 8418937 - .string "All the text being edited will$" - -gUnknown_8418956:: @ 8418956 - .string "be deleted. Is that okay?$" - -gUnknown_8418970:: @ 0x8418970 - .string "なにか ことばを いれてください!$" - -gUnknown_8418982:: @ 0x8418982 - .string "ことばを ぜんぶ けすことは できません!$" - -gUnknown_8418998:: @ 0x8418998 - .string "かえられる ことばは 1つ までです!$" - -gUnknown_84189AC:: @ 0x84189AC - .string "うたを もとに もどします!$" - -gUnknown_84189BB:: @ 0x84189BB - .string "それは もう はやっています!$" - -gUnknown_84189CB:: @ 0x84189CB - .string "2つの ことばを くみあわせてください!$" - -gUnknown_84189E0:: @ 84189E0 - .string "Quit editing?$" - -gUnknown_84189EE:: @ 84189EE - .string "Stop giving the POKéMON MAIL?$" - -gUnknown_8418A0C:: @ 0x8418A0C - .string "へんしゅうした ことばは ほぞん$" - -gUnknown_8418A1D:: @ 0x8418A1D - .string "されませんが いいですか?$" - -gUnknown_8418A2B:: @ 0x8418A2B - .string "PROFILE$" - -gUnknown_8418A33:: @ 0x8418A33 - .string "At the battle's start:$" - -gUnknown_8418A4A:: @ 0x8418A4A - .string "Upon winning a battle:$" - -gUnknown_8418A61:: @ 0x8418A61 - .string "Upon losing a battle:$" - -gUnknown_8418A77:: @ 0x8418A77 - .string "The BARD's Song$" - -gUnknown_8418A87:: @ 0x8418A87 - .string "What's hip and happening?$" - -gUnknown_8418AA1:: @ 0x8418AA1 - .string "Interview$" - -gUnknown_8418AAB:: @ 0x8418AAB - .string "いい ことば$" - -gUnknown_8418AB2:: @ 0x8418AB2 - .string "QUESTIONNAIRE$" - -gUnknown_8418AC0:: @ 0x8418AC0 - .string " きれい だよね-$" - -gUnknown_8418ACA:: @ 0x8418ACA - .string " かわいい よね-$" - -gUnknown_8418AD4:: @ 0x8418AD4 - .string " のんびり だよね-$" - -gUnknown_8418ADF:: @ 0x8418ADF - .string " ぽっかぽか だよね-$" - -gUnknown_8418AEB:: @ 0x8418AEB - .string " あこがれる よね-$" - -gUnknown_8418AF6:: @ 0x8418AF6 - .string " ドキドキ するよね-$" - -gUnknown_8418B02:: @ 0x8418B02 - .string " おもしろい よね-$" - -gUnknown_8418B0D:: @ 0x8418B0D - .string " ふしぎ だよね-$" - -gUnknown_8418B17:: @ 0x8418B17 - .string "って$" - -gUnknown_8418B1A:: @ 0x8418B1A - .string "\n" - .string "そう おもわない?$" - -gUnknown_8418B25:: @ 0x8418B25 - .string "たびに でたいな-\n" - .string "どこか いい ところ しらない?$" - -gUnknown_8418B40:: @ 0x8418B40 - .string "120しょくの クレヨン かったんだ-\n" - .string "いいでしょう?$" - -gUnknown_8418B5C:: @ 0x8418B5C - .string "しゃぼんだまに のって とべるように\n" - .string "ならないかな-$" - -gUnknown_8418B77:: @ 0x8418B77 - .string "すなはまに かいた もじは\n" - .string "すぐに きえちゃうのが かなしいよね-$" - -gUnknown_8418B99:: @ 0x8418B99 - .string "うみの そこって どうなってるのかな-\n" - .string "いちどで いいから みて みたいな-$" - -gUnknown_8418BC0:: @ 0x8418BC0 - .string "ゆうやけを みると\n" - .string "ウチに かえりたく ならない?$" - -gUnknown_8418BDA:: @ 0x8418BDA - .string "みどりの しばで ねころがると\n" - .string "きもちいいよね-$" - -gUnknown_8418BF3:: @ 0x8418BF3 - .string "ひみつきち って いいよね!\n" - .string "なんか わくわく してこない?$" - -gUnknown_8418C12:: @ 0x8418C12 - .string "ポケモン リ-グ$" - -gText_PokemonCenter:: @ 8418C1B - .string "POKéMON CENTER$" - -gUnknown_8418C2A:: @ 8418C2A - .string "に ポロックを あげますか?$" - -gUnknown_8418C39:: @ 0x8418C39 - .string "かっこよさ$" - -gUnknown_8418C3F:: @ 0x8418C3F - .string "うつくしさ$" - -gUnknown_8418C45:: @ 0x8418C45 - .string "かわいさ$" - -gUnknown_8418C4A:: @ 0x8418C4A - .string "かしこさ$" - -gUnknown_8418C4F:: @ 0x8418C4F - .string "たくましさ$" - -gUnknown_8418C55:: @ 0x8418C55 - .string "に みがきが かかった!$" - -gUnknown_8418C62:: @ 0x8418C62 - .string "なにも かわらなかった!$" - -gUnknown_8418C6F:: @ 0x8418C6F - .string "もう これいじょう たべない みたい‥$" - -gText_SaveFailedScreen_CheckingBackupMemory:: @ 8418C83 - .string "Save failed.\n" - .string "Checking the backup memory‥\n" - .string "Please wait.\n" - .string "“Time required:\n" - .string "about 1 minute”$" - -gText_SaveFailedScreen_BackupMemoryDamaged:: @ 8418CD9 - .string "The backup memory is damaged or\n" - .string "the game's battery has run dry.\n" - .string "The game can be played, but its\n" - .string "progress cannot be saved.\n" - .string "“Please press the A Button.”$" - -gUnknown_8418D70:: @ 8418D70 - .string "{COLOR RED}“このまま ぼうけんをつづけることは できません\n" - .string "タイトルに もどります”$" - -gUnknown_8418D99:: @ 0x8418D99 - .string "けんさが しゅうりょうしました!\n" - .string "もういちど レポ-トを かきこみます\n" - .string "しばらくおまちください$" - -gUnknown_8418DC9:: @ 0x8418DC9 - .string "レポ-トの かきこみは しゅうりょうしました\n" - .string "{COLOR RED}“このまま ぼうけんをつづけることは できません\n" - .string "タイトルに もどります”$" - -gText_SaveFailedScreen_SaveCompleted:: @ 8418E09 - .string "Save completed.\n" - .string "“Please press the A Button.”$" - -gUnknown_8418E36:: @ 0x8418E36 - .string "れんらくせん$" - -gUnknown_8418E3D:: @ 0x8418E3D - .string "ひみつきち$" - -gUnknown_8418E43:: @ 0x8418E43 - .string "アジト$" - -gUnknown_8418E47:: @ 0x8418E47 - .string "YOUR NAME?$" - -gUnknown_8418E52:: @ 0x8418E52 - .string "BOX NAME?$" - -gUnknown_8418E5C:: @ 0x8418E5C - .string "'s nickname?$" - -gUnknown_8418E69:: @ 0x8418E69 - .string "RIVAL's NAME?$" - -gUnknown_8418E77:: @ 8418E77 - .string "{DPAD_ANY}MOVE {A_BUTTON}OK {B_BUTTON}BACK$" - -gUnknown_8418E8A:: @ 8418E8A - .string "$" - -gText_RegionMap_Space:: @ 8418E8B - .string " $" - -gText_RegionMap_AButtonGuide:: @ 8418E8D - .string "{A_BUTTON}GUIDE$" - -gText_RegionMap_AButtonCancel:: @ 8418E95 - .string "{A_BUTTON}CANCEL$" - -gText_RegionMap_AButtonCancel2:: @ 8418E9E - .string "{A_BUTTON}CANCEL$" - -gText_RegionMap_AButtonSwitch:: @ 8418EA7 - .string "{A_BUTTON}SWITCH$" - -gText_RegionMap_AButtonOK:: @ 8418EB0 - .string "{A_BUTTON}OK$" - -gText_RegionMap_DPadMove:: @ 8418EB5 - .string "{DPAD_ANY}MOVE$" - -gText_RegionMap_UpDownPick:: @ 8418EBC - .string "{DPAD_UPDOWN}PICK$" - -gText_RegionMap_NoData:: @ 8418EC3 - .string "No data$" - -gText_RegionMap_AreaDesc_ViridianForest:: - .string "A deep and sprawling forest that\n" - .string "extends around VIRIDIAN CITY.\n" - .string "A natural maze, many people\n" - .string "become lost inside.$" - -gText_RegionMap_AreaDesc_MtMoon:: - .string "A mystical mountain that is known\n" - .string "for its frequent meteor falls.\n" - .string "The shards of stars that fall\n" - .string "here are known as MOON STONES.$" - -gText_RegionMap_AreaDesc_DiglettsCave:: - .string "A seemingly plain tunnel that was\n" - .string "dug by wild DIGLETT.\n" - .string "It is famous for connecting\n" - .string "ROUTES 2 and 11.$" - -gText_RegionMap_AreaDesc_VictoryRoad:: - .string "A tunnel situated on ROUTE 23.\n" - .string "It earned its name because it\n" - .string "must be traveled by all TRAINERS\n" - .string "aiming for the top.$" - -gText_RegionMap_AreaDesc_PokemonMansion:: - .string "A decrepit, burned-down mansion\n" - .string "on CINNABAR ISLAND.\n" - .string "It got its name because a famous\n" - .string "POKéMON researcher lived there.$" - -gText_RegionMap_AreaDesc_SafariZone:: - .string "An amusement park outside FUCHSIA\n" - .string "CITY where many rare POKéMON can\n" - .string "be observed in the wild.\n" - .string "Catch them in a popular game!$" - -gText_RegionMap_AreaDesc_RockTunnel:: - .string "A naturally formed underground\n" - .string "tunnel. Because it has not been\n" - .string "developed, it is inky dark inside.\n" - .string "A light is needed to get through.$" - -gText_RegionMap_AreaDesc_SeafoamIslands:: - .string "A pair of islands that is situated\n" - .string "on ROUTE 20.\n" - .string "The two islands are shaped the\n" - .string "same, as if they were twins.$" - -gText_RegionMap_AreaDesc_PokemonTower:: - .string "A tower that houses the graves of\n" - .string "countless POKéMON.\n" - .string "Many people visit it daily to pay\n" - .string "their respects to the fallen.$" - -gText_RegionMap_AreaDesc_CeruleanCave:: - .string "A mysterious cave that is filled\n" - .string "with terribly tough POKéMON.\n" - .string "It is so dangerous, the POKéMON\n" - .string "LEAGUE is in charge of it.$" - -gText_RegionMap_AreaDesc_PowerPlant:: - .string "A power plant that was abandoned\n" - .string "years ago, though some of the\n" - .string "machines still work. It is infested\n" - .string "with electric POKéMON.$" - -gText_RegionMap_AreaDesc_MtEmber:: - .string "Supposedly an inactive volcano.\n" - .string "However, there are persistent\n" - .string "reports that the peak blazes\n" - .string "with fire at night.$" - -gText_RegionMap_AreaDesc_BerryForest:: - .string "A forest on a small islet off the\n" - .string "coast of THREE ISLAND. BERRIES\n" - .string "grow wildly in profusion, quickly\n" - .string "replenishing those that fall off.$" - -gText_RegionMap_AreaDesc_IcefallCave:: - .string "A cave which is covered by water\n" - .string "and ice on FOUR ISLAND.\n" - .string "It seems like the end of the cave\n" - .string "is connected to the ocean.$" - -gText_RegionMap_AreaDesc_LostCave:: - .string "A bewildering cave off the coast\n" - .string "of RESORT GORGEOUS.\n" - .string "Some curious thrill seekers have\n" - .string "never emerged from it.$" - -gText_RegionMap_AreaDesc_TanobyRuins:: - .string "An ancient ruin that is rumored to\n" - .string "be home to a peculiar POKéMON.\n" - .string "However, so far, the POKéMON\n" - .string "remains an unconfirmed rumor.$" - -gText_RegionMap_AreaDesc_AlteringCave:: - .string "This island has been known by this\n" - .string "name since the distant past.\n" - .string "No one today knows where it got\n" - .string "this name, however.$" - -gText_RegionMap_AreaDesc_PatternBush:: - .string "A lush and bush-like area. \n" - .string "In it are patterns where no grass\n" - .string "grows. Some study it in the belief\n" - .string "that a secret is concealed.$" - -gText_RegionMap_AreaDesc_DottedHole:: - .string "A mysterious, just-discovered\n" - .string "ruin from an ancient time.\n" - .string "It got its name from the six dots\n" - .string "on its door.$" - -gUnknown_8419782:: @ 8419782 - .string "{DYNAMIC 0x00} nature.\n" - .string "Met in a trade.$" - -gUnknown_841979D:: @ 841979D - .string "{DYNAMIC 0x00} nature.\n" - .string "Met in a trade.$" - -gUnknown_84197B8:: @ 84197B8 - .string "{DYNAMIC 0x00} nature.\n" - .string "Met in a fateful encounter when\n" - .string "at {LV_2} {DYNAMIC 0x01}.$" - -gUnknown_84197ED:: @ 84197ED - .string "{DYNAMIC 0x00} nature.\n" - .string "Met in a fateful encounter when\n" - .string "at {LV_2} {DYNAMIC 0x01}.$" - -gUnknown_8419822:: @ 8419822 - .string "{DYNAMIC 0x00} nature.\n" - .string "Met in {DYNAMIC 0x02} at {LV_2} {DYNAMIC 0x01}.$" - -gUnknown_8419841:: @ 8419841 - .string "{DYNAMIC 0x00} nature.\n" - .string "Met in {DYNAMIC 0x02} at {LV_2} {DYNAMIC 0x01}.$" - -gUnknown_8419860:: @ 8419860 - .string "{DYNAMIC 0x00} nature.\n" - .string "Apparently met in {DYNAMIC 0x02}\n" - .string "at {LV_2} {DYNAMIC 0x01}.$" - -gUnknown_841988A:: @ 841988A - .string "{DYNAMIC 0x00} nature.\n" - .string "Apparently met in {DYNAMIC 0x02}\n" - .string "at {LV_2} {DYNAMIC 0x01}.$" - -gUnknown_84198B4:: @ 84198B4 - .string "{DYNAMIC 0x00} nature.\n" - .string "Hatched: {DYNAMIC 0x02}\n" - .string "at {LV_2} {DYNAMIC 0x01}.$" - -gUnknown_84198D5:: @ 84198D5 - .string "{DYNAMIC 0x00} nature.\n" - .string "Hatched: {DYNAMIC 0x02}\n" - .string "at {LV_2} {DYNAMIC 0x01}.$" - -@ TODO: Replace this gibberish with the proper Hiragana -gUnknown_84198F6:: @ 84198F6 - .string "{DYNAMIC 0x00}ßÓÁÉË {LV_2}{DYNAMIC 0x01}çÑÊ\n" - .string "{DYNAMIC 0x02}で ÉÇっŒ ùÂだ$" - -gUnknown_8419913:: @ 8419913 - .string "{DYNAMIC 0x00}ÓÁÉË {LV_2}{DYNAMIC 0x01}çÑÊ\n" - .string "{DYNAMIC 0x02}で ÉÇっŒ ùÂだ$" - -gUnknown_841992F:: @ 841992F - .string "{DYNAMIC 0x00} nature. Met in a fateful\n" - .string "encounter (hatched: {DYNAMIC 0x02}\n" - .string "at {LV_2} {DYNAMIC 0x01}).$" - -gUnknown_841996D:: @ 841996D - .string "{DYNAMIC 0x00} nature. Met in a fateful\n" - .string "encounter (hatched: {DYNAMIC 0x02}\n" - .string "at {LV_2} {DYNAMIC 0x01}).$" - -gUnknown_84199AB:: @ 84199AB - .string "{DYNAMIC 0x00} nature. Apparently met in\n" - .string "a fateful encounter (hatched:\n" - .string "{DYNAMIC 0x02} at {LV_2} {DYNAMIC 0x01}).$" - -gUnknown_84199F4:: @ 84199F4 - .string "{DYNAMIC 0x00} nature. Apparently met in\n" - .string "a fateful encounter シhatched:\n" - .string "{DYNAMIC 0x02} at {LV_2} {DYNAMIC 0x01}ス.$" - -gUnknown_8419A3D:: @ 0x8419A3D - .string "An odd POKéMON EGG found by the\n" - .string "DAY-CARE couple.$" - -gUnknown_8419A6E:: @ 0x8419A6E - .string "An odd POKéMON EGG obtained from\n" - .string "the traveling man.$" - -gUnknown_8419AA2:: @ 0x8419AA2 - .string "A wondrously peculiar POKéMON EGG\n" - .string "obtained at a nice place.$" - -gUnknown_8419ADE:: @ 0x8419ADE - .string "An odd POKéMON EGG obtained from\n" - .string "an old woman at the SPA.$" - -gUnknown_8419B18:: @ 0x8419B18 - .string "A peculiar POKéMON EGG obtained\n" - .string "in a trade.$" - -gUnknown_8419B44:: @ 0x8419B44 - .string "It looks like this\n" - .string "EGG will take a\n" - .string "long time to hatch.$" - -gUnknown_8419B7B:: @ 0x8419B7B - .string "What will hatch\n" - .string "from this? It will\n" - .string "take some time.$" - -gUnknown_8419BAE:: @ 0x8419BAE - .string "It occasionally\n" - .string "moves. It should\n" - .string "hatch soon.$" - -gUnknown_8419BDB:: @ 0x8419BDB - .string "It's making sounds.\n" - .string "It's almost ready\n" - .string "to hatch!$" - -gUnknown_8419C0B:: @ 8419C0B - .string "a trade$" - -gUnknown_8419C13:: @ 8419C13 - .string "Somewhere$" - -gUnknown_8419C1D:: @ 8419C1D - .string "POKéMON INFO$" - -gUnknown_8419C2A:: @ 8419C2A - .string "POKéMON SKILLS$" - -gUnknown_8419C39:: @ 8419C39 - .string "KNOWN MOVES$" - -gUnknown_8419C45:: @ 8419C45 - .string "No data$" - -gUnknown_8419C4D:: @ 8419C4D - .string "EXP. POINTS$" - -gUnknown_8419C59:: @ 8419C59 - .string "NEXT LV.$" - -gUnknown_8419C62:: @ 8419C62 - .string "{DPAD_RIGHT}PAGE {A_BUTTON}CANCEL$" - -gUnknown_8419C72:: @ 8419C72 - .string "{A_BUTTON}CANCEL$" - -gUnknown_8419C7B:: @ 8419C7B - .string "{DPAD_LEFTRIGHT}PAGE$" - -gUnknown_8419C82:: @ 8419C82 - .string "{DPAD_LEFT}PAGE {A_BUTTON}DETAIL$" - -gUnknown_8419C92:: @ 8419C92 - .string "{DPAD_UPDOWN}PICK {A_BUTTON}SWITCH$" - -gUnknown_8419CA2:: @ 8419CA2 - .string "{DPAD_UPDOWN}PICK$" - -gUnknown_8419CA9:: @ 8419CA9 - .string "{DPAD_UPDOWN}PICK {A_BUTTON}DELETE$" - -gUnknown_8419CB9:: @ 8419CB9 - .string "HM moves can't be\n" - .string "forgotten now.$" - -gText_TrainerCardName:: @ 8419CDA - .string "NAME: $" - -gText_TrainerCardIDNo:: @ 8419CE1 - .string "IDNo.$" - -gText_TrainerCardMoney:: @ 8419CE7 - .string "MONEY$" - -gText_TrainerCardYen:: @ 8419CED - .string "¥$" - -gText_TrainerCardPokedex:: @ 8419CEF - .string "POKéDEX$" - -gText_TrainerCardNull:: @ 8419CF7 - .string "$" - -gText_Colon2:: @ 8419CF8 - .string ":$" - -gUnknown_8419CFA:: @ 0x8419CFA - .string "てん$" - -gText_TrainerCardTime:: @ 8419CFD - .string "TIME$" - -gUnknown_8419D02:: @ 0x8419D02 - .string "ゲ-ムポイント$" - -gText_Var1sTrainerCard:: @ 8419D0A - .string "'s TRAINER CARD$" - -gText_HallOfFameDebut:: @ 8419D1A - .string "HALL OF FAME DEBUT $" - -gText_LinkBattles:: @ 0x8419D2F - .string "LINK BATTLES$" - -gText_LinkCableBattles:: @ 0x8419D3C - .string "LINK CABLE BATTLES$" - -gText_WinLossRatio:: @ 8419D4F - .string "W:{CLEAR_TO 0x30}L:$" - -gText_PokemonTrades:: @ 8419D57 - .string "POKéMON TRADES$" - -gText_UnionRoomTradesBattles:: @ 8419D66 - .string "UNION TRADES & BATTLES$" - -gText_BerryCrushes:: @ 8419D7D - .string "BERRY CRUSH$" - -gText_WaitingTrainerFinishReading:: @ 8419D89 - .string "Waiting for the other TRAINER to\n" - .string "finish reading your TRAINER CARD.$" - -gText_MenuOption:: @ 8419DCC - .string "OPTION$" - -gText_TextSpeed:: @ 0x8419DD3 - .string "TEXT SPEED$" - -gText_BattleScene:: @ 0x8419DDE - .string "BATTLE SCENE$" - -gText_BattleStyle:: @ 0x8419DEB - .string "BATTLE STYLE$" - -gText_Sound:: @ 0x8419DF8 - .string "SOUND$" - -gText_ButtonMode:: @ 0x8419DFE - .string "BUTTON MODE$" - -gText_Frame:: @ 0x8419E0A - .string "FRAME$" - -gText_OptionMenuCancel:: @ 0x8419E10 - .string "CANCEL$" - -gText_TextSpeedSlow:: @ 0x8419E17 - .string "SLOW$" - -gText_TextSpeedMid:: @ 0x8419E1C - .string "MID$" - -gText_TextSpeedFast:: @ 0x8419E20 - .string "FAST$" - -gText_BattleSceneOn:: @ 0x8419E25 - .string "ON$" - -gText_BattleSceneOff:: @ 0x8419E28 - .string "OFF$" - -gText_BattleStyleShift:: @ 0x8419E2C - .string "SHIFT$" - -gText_BattleStyleSet:: @ 0x8419E32 - .string "SET$" - -gText_SoundMono:: @ 0x8419E36 - .string "MONO$" - -gText_SoundStereo:: @ 0x8419E3B - .string "STEREO$" - -gTextJP_Type:: @ 0x8419E42 - .string "タイプ$" - -gText_ButtonTypeHelp:: @ 0x8419E46 - .string "HELP$" - -gText_ButtonTypeLEqualsA:: @ 0x8419E4B - .string "L=A$" - -gText_ButtonTypeLR:: @ 0x8419E4F - .string "LR$" - -gText_FrameType:: @ 8419E52 - .string "TYPE$" - -gText_PickSwitchCancel:: @ 8419E57 - .string "{DPAD_UPDOWN}PICK {DPAD_LEFTRIGHT}SWITCH {A_BUTTON}{B_BUTTON}CANCEL$" - -gUnknown_8419E72:: @ 0x8419E72 - .string "RTCを リセットします\n" - .string "Aで けってい Bで キャンセル$" - -gUnknown_8419E90:: @ 0x8419E90 - .string "げんざいの ゲ-ムない じかん$" - -gUnknown_8419EA0:: @ 0x8419EA0 - .string "ぜんかいの ゲ-ムない じかん$" - -gUnknown_8419EB0:: @ 0x8419EB0 - .string "じかんを さいせってい してください$" - -gUnknown_8419EC3:: @ 0x8419EC3 - .string "じかんを さいせってい しました!\n" - .string "レポ-トを かいています おまちください$" - -gUnknown_8419EEA:: @ 0x8419EEA - .string "レポ-トを かきこみました!$" - -gUnknown_8419EF9:: @ 0x8419EF9 - .string "レポ-トの かきこみに\n" - .string "しっぱい しました‥$" - -gUnknown_8419F10:: @ 0x8419F10 - .string "レポ-トが ないので\n" - .string "じかんの せっていは できません!$" - -gUnknown_8419F2D:: @ 0x8419F2D - .string "ゲ-ムない じかんの しゅうせい システムが\n" - .string "つかえる ように なりました!$" - -gText_SavingDontTurnOffThePower2:: @ 8419F54 - .string "SAVING…\n" - .string "DON'T TURN OFF THE POWER.$" - -// Start menu option descriptions -gStartMenuDesc_Pokedex:: @ 8419F76 // Pokedex - .string "A device that records POKéMON secrets\n" - .string "upon meeting or catching them.$" - -gStartMenuDesc_Pokemon:: @ 8419FBB // Pokemon - .string "Check and organize POKéMON that are\n" - .string "traveling with you in your party.$" - -gStartMenuDesc_Bag:: @ 841A001 // Bag - .string "Equipped with pockets for storing items\n" - .string "you bought, received, or found.$" - -gStartMenuDesc_Player:: @ 841A049 // {PLAYER} - .string "Check your money and other game data.$" - -gStartMenuDesc_Save:: @ 841A06F // Save - .string "Save your game with a complete record\n" - .string "of your progress to take a break.$" - -gStartMenuDesc_Option:: @ 841A0B7 // Options - .string "Adjust various game settings such as text\n" - .string "speed, game rules, etc.$" - -gStartMenuDesc_Exit:: @ 841A0F9 // Quit - .string "Close this MENU window.$" - -gStartMenuDesc_Retire:: @ 841A111 // Retire - .string "Retire from the SAFARI GAME and return to\n" - .string "the registration counter.$" - - .include "data/text/quest_log.inc" - -gUnknown_841B285:: @ 841B285 - .string " was used on\n" - .string "$" - -gUnknown_841B293:: @ 841B293 - .string ".$" - -gUnknown_841B295:: @ 841B295 - .string "'s level rose to\n" - .string "$" - -gUnknown_841B2A7:: @ 841B2A7 - .string ".$" - -gUnknown_841B2A9:: @ 0x841B2A9 - .string "{SMALL}MAX.{SIZE 0x02} HP$" - -gUnknown_841B2B7:: @ 0x841B2B7 - .string "ATTACK$" - -gUnknown_841B2BE:: @ 0x841B2BE - .string "DEFENSE$" - -gUnknown_841B2C6:: @ 0x841B2C6 - .string "SPEED$" - -gUnknown_841B2CC:: @ 0x841B2CC - .string "SP. ATK$" - -gUnknown_841B2D4:: @ 0x841B2D4 - .string "SP. DEF$" - -gUnknown_841B2DC:: @ 841B2DC - .string "{SMALL}{PLUS}{SIZE 0x02}$" - -gUnknown_841B2E5:: @ 841B2E5 - .string "{SMALL}-{SIZE 0x02}$" - -gUnknown_841B2ED:: @ 841B2ED - .string "1, $" - -gUnknown_841B2F1:: @ 841B2F1 - .string "2, and ‥ ‥ ‥ $" - -gUnknown_841B2FF:: @ 0x841B2FF - .string "Poof!\p" - .string "$" - -gUnknown_841B306:: @ 841B306 - .string "{DYNAMIC 0x00} forgot\n" - .string "{DYNAMIC 0x01}.\p" - .string "$" - -gUnknown_841B315:: @ 841B315 - .string "And‥\p" - .string "$" - -gUnknown_841B31B:: @ 841B31B - .string "Machine set!\p" - .string "$" - -gUnknown_841B329:: @ 841B329 - .string "Huh?$" - -gUnknown_841B32E:: @ 841B32E - .string "{DYNAMIC 0x00} learned\n" - .string "{DYNAMIC 0x01}!$" - -gText_Upper:: @ 0x841B33D - .string "UPPER$" - -gText_Lower:: @ 0x841B343 - .string "lower$" - -gText_Others:: @ 0x841B349 - .string "OTHERS$" - -gText_Symbols:: @ 0x841B350 - .string "SYMBOLS$" - -gText_Register2:: @ 0x841B358 - .string "REGISTER$" - -gText_Exit:: @ 0x841B361 - .string "EXIT$" - -gText_QuitChatting:: @ 0x841B366 - .string "Quit chatting?$" - -gText_RegisterTextWhere:: @ 0x841B375 - .string "Register text where?$" - -gText_RegisterTextHere:: @ 0x841B38A - .string "Register text here?$" - -gText_InputText:: @ 0x841B39E - .string "Input text.$" - -gText_F700JoinedChat:: @ 841B3AA - .string "{DYNAMIC 0x00} joined the chat!$" - -gText_F700LeftChat:: @ 841B3BE - .string "{DYNAMIC 0x00} left the chat.$" - -gUnknown_841B3D0:: @ 0x841B3D0 - .string "{DYNAMIC 0x00}の{DYNAMIC 0x01}ひきめ:$" - -gUnknown_841B3DA:: @ 0x841B3DA - .string "{DYNAMIC 0x00}の{DYNAMIC 0x01}ひきめは いません$" - -gText_ExitingTheChat:: @ 0x841B3E9 - .string "Exiting the chat‥$" - -gText_LeaderHasLeftEndingChat:: @ 0x841B3FB - .string "The LEADER, {DYNAMIC 0x00}, has\n" - .string "left, ending the chat.$" - -gText_RegisteredTextChanged_OKtoSave:: @ 0x841B426 - .string "The registered text has been changed.\n" - .string "Is it okay to save the game?$" - -gText_RegisteredTextChanged_AlreadySavedFile:: @ 0x841B469 - .string "There is already a saved file.\n" - .string "Is it okay to overwrite it?$" - -gText_RegisteredTextChanged_SavingDontTurnOff:: @ 0x841B4A4 - .string "SAVING‥\n" - .string "DON'T TURN OFF THE POWER.$" - -gText_RegisteredTextChanged_SavedTheGame:: @ 0x841B4C6 - .string "{DYNAMIC 0x00} saved the game.$" - -gText_IfLeaderLeavesChatWillEnd:: @ 0x841B4D9 - .string "If the LEADER leaves, the chat\n" - .string "will end. Is that okay?$" - -gText_Hello:: @ 841B510 - .string "HELLO$" - -gText_Pokemon2:: @ 841B516 - .string "POKéMON$" - -gText_Trade:: @ 841B51E - .string "TRADE$" - -gText_Battle:: @ 841B524 - .string "BATTLE$" - -gText_Lets:: @ 841B52B - .string "LET'S$" - -gText_Ok:: @ 841B531 - .string "OK!$" - -gText_Sorry:: @ 841B535 - .string "SORRY$" - -gText_YaySmileEmoji:: @ 841B53B - .string "YAY{EXTRA 0xF9}$" - -gText_ThankYou:: @ 841B541 - .string "THANK YOU$" - -gText_ByeBye:: @ 841B54B - .string "BYE-BYE!$" - -gUnknown_841B554:: @ 841B554 - .string "{PLAYER} scurried to a POKéMON CENTER,\n" - .string "protecting the exhausted and fainted\n" - .string "POKéMON from further harm‥\p" - .string "$" - -gUnknown_841B5B6:: @ 841B5B6 - .string "{PLAYER} scurried back home, protecting\n" - .string "the exhausted and fainted POKéMON from\n" - .string "further harm‥\p" - .string "$" - -gUnknown_841B60E:: @ 841B60E - .string "PLAYER: {DYNAMIC 0x00}$" - -gUnknown_841B619:: @ 841B619 - .string "This document is issued in\n" - .string "recognition of your magnificent\n" - .string "achievement - the completion of\n" - .string "the {DYNAMIC 0x01} POKéDEX.$" - -gUnknown_841B684:: @ 841B684 - .string "GAME FREAK$" - -gUnknown_841B68F:: @ 841B68F - .string "NATIONAL$" - -gUnknown_841B698:: @ 841B698 - .string "KANTO$" - -gUnknown_841B69E:: @ 841B69E - .string "Clear all save data areas?$" - -gUnknown_841B6B9:: @ 841B6B9 - .string "Clearing data‥\n" - .string "Please wait.$" - -gText_Player:: @ 841B6D5 - .string "PLAYER$" - -gText_Time:: @ 841B6DC - .string "TIME$" - -gText_Colon:: @ 0x841B6E1 - .string ":$" - -gText_Pokedex:: @ 841B6E3 - .string "POKéDEX$" - -gTextJPDummy_Hiki:: @ 841B6EB - .string "$" - -gText_Badges:: @ 841B6EC - .string "BADGES$" - -gTextJPDummy_Ko:: @ 841B6F3 - .string "$" - -gText_Register:: @ 0x841B6F4 - .string "REGISTER$" - -gText_HatchedFromEgg:: @ 841B6FD - .string "{STR_VAR_1} hatched from the EGG!$" - -gText_NickHatchPrompt:: @ 841B716 - .string "Would you like to nickname the newly\n" - .string "hatched {STR_VAR_1}?$" - -gString_OutOfCoins:: @ 841B747 - .string "You've run out of COINS.\n" - .string "Game over!$" - -gString_QuitPlaying:: @ 841B76B - .string "Quit playing?$" - -gString_SlotMachineControls:: @ 841B779 - .string "{DPAD_LEFTRIGHT}COMBOS {DPAD_DOWN}WAGER {A_BUTTON}STOP {B_BUTTON}EXIT$" - -gUnknown_841B798:: @ 0x841B798 - .string "おしえテレビ$" - -gUnknown_841B79F:: @ 0x841B79F - .string "おしまい$" - - .include "data/text/teachy_tv.inc" - -gString_Bill:: @ 841CB3C - .string "BILL$" - -gString_Someone:: @ 841CB41 - .string "SOMEONE$" - -gString_Help:: @ 841CB49 - .string "HELP$" - -gString_HelpSystem_ClearTo8:: @ 841CB4E - .string "{CLEAR_TO 8}$" - -gText_SpacePoints2:: @ 841CB52 - .string " points$" - -gText_SpaceTimes3:: @ 841CB5A - .string " time(s)$" - -gText_PkmnJumpRecords:: @ 841CB63 - .string "POKéMON JUMP RECORDS$" - -gText_JumpsInARow:: - .string "Jumps in a row:$" - -gText_BestScore2:: - .string "Best score:$" - -gText_ExcellentsInARow:: - .string "EXCELLENTS in a row:$" - -gText_AwesomeWonF701F700:: @ 841CBA9 - .string "Awesome score! You've\n" - .string "won {DYNAMIC 01} {DYNAMIC 00}!$" - -gText_FilledStorageSpace2:: @ 841CBCA - .string "There's no room left now.$" - -gText_CantHoldMore:: @ 841CBE4 - .string "You can't hold any more!$" - -gText_WantToPlayAgain2:: @ 841CBFD - .string "Want to play again?$" - -gText_SomeoneDroppedOut2:: @ 841CC11 - .string "Somebody dropped out.\n" - .string "The link will be canceled.$" - -gText_SavingDontTurnOffPower:: @ 841CC42 - .string "SAVING…\n" - .string "DON'T TURN OFF THE POWER.$" - -gText_CommunicationStandby4:: @ 841CC64 - .string "Communication standby…$" - - .string "SAVING...\n" - .string "DON'T TURN OFF THE POWER.$" - -gText_BerryPickingRecords:: - .string "DODRIO BERRY-PICKING RECORDS$" - -gText_BerriesPicked:: - .string "BERRIES picked:$" - -gText_BestScore:: - .string "Best score:$" - -gText_BerriesInRowFivePlayers:: - .string "BERRIES picked in a row with\n" - .string "five players:$" - -gText_BerryPickingResults:: @ 841CD03 - .string "Announcing BERRY-PICKING results!$" - -gText_10P30P50P50P:: @ 841CD25 - .string "10P 30P 50P {EXTRA 0xDD}50P$" - -gText_AnnouncingRankings:: @ 841CD43 - .string "Announcing rankings!$" - -gText_AnnouncingPrizes:: @ 841CD58 - .string "Announcing prizes!$" - -gText_1Colon:: - .string "1:$" - -gText_2Colon:: - .string "2:$" - -gText_3Colon:: - .string "3:$" - -gText_4Colon:: - .string "4:$" - -gText_5Colon:: - .string "5:$" - -gText_FirstPlacePrize:: @ 841CD7A - .string "The first-place winner gets\n" - .string "this {DYNAMIC 00}!$" - -gText_CantHoldAnyMore:: @ 841CD9F - .string "You can't hold any more...$" - -gText_FilledStorageSpace:: @ 841CDBA - .string "It filled its storage space.$" - -gText_WantToPlayAgain:: @ 841CDD7 - .string "Want to play again?$" - -gText_SomeoneDroppedOut:: @ 841CDEB - .string "Somebody dropped out.\n" - .string "The link will be canceled.$" - -gText_SpacePoints:: @ 841CE1C - .string " points$" - -gText_CommunicationStandby3:: @ 841CE24 - .string "Communication standby…$" - - .align 2 -gUnknown_841CE3C:: @ 841CE3C - .string "Are you ready to BERRY-CRUSH?\n" - .string "Please pick a BERRY for use.\p" - .string "$" - - .align 2 -gUnknown_841CE78:: @ 841CE78 - .string "Please wait while each member\n" - .string "chooses a BERRY.$" - - .align 2 -gUnknown_841CEA8:: @ 841CEA8 - .string "{PAUSE_MUSIC}{PLAY_BGM MUS_FANFA1}You ended up with {STR_VAR_1} units of\n" - .string "silky-smooth BERRY POWDER.{RESUME_MUSIC}\p" - .string "Your total amount of BERRY POWDER\n" - .string "is {STR_VAR_2}.\p" - .string "$" - - .align 2 -gUnknown_841CF14:: @ 841CF14 - .string "Recording your game results in the\n" - .string "save file.\n" - .string "Please wait.$" - - .align 2 -gUnknown_841CF50:: @ 841CF50 - .string "Want to play BERRY CRUSH again?$" - - .align 2 -gUnknown_841CF70:: @ 841CF70 - .string "You have no BERRIES.\n" - .string "The game will be canceled.$" - - .align 2 -gUnknown_841CFA0:: @ 841CFA0 - .string "A member dropped out.\n" - .string "The game will be canceled.$" - - .align 2 -gUnknown_841CFD4:: @ 841CFD4 - .string "Time's up.\p" - .string "Good BERRY POWDER could not be\n" - .string "made…\p" - .string "$" - - .align 2 -gUnknown_841D008:: @ 841D008 - .string "Communication standby…$" - - .align 2 -gText_1_ClrLtGryShdwBlk_Dynamic0:: @ 841D020 - .string "1. {COLOR LIGHT_GRAY}{SHADOW BLACK}{DYNAMIC 0x00}$" - -gText_1_Dynamic0:: @ 841D02C - .string "1. {DYNAMIC 0x00}$" - - .align 2 -gText_SpaceTimes:: @ 0x841D034 - .string " times$" - - .align 2 -gText_XDotY:: @ 0x841D03C - .string "{STR_VAR_1}.{STR_VAR_2}$" - - .align 2 -gText_StrVar1Berry:: @ 0x841D044 - .string "{STR_VAR_1} BERRY$" - - .align 2 -gText_TimeColon:: @ 841D050 - .string "Time:$" - - .align 2 -gText_PressingSpeed:: @ 841D058 - .string "Pressing Speed:$" - -gText_Silkiness:: @ 841D068 - .string "Silkiness:$" - - .align 2 -gText_StrVar1:: @ 841D074 - .string "{STR_VAR_1}$" - - .align 2 -gText_SpaceMin:: @ 841D078 - .string "min.$" - - .align 2 -gText_XDotY2:: @ 841D080 - .string "{STR_VAR_1}.{STR_VAR_2}$" - - .align 2 -gText_SpaceSec:: @ 841D088 - .string "sec.$" - - .align 2 -gText_XDotY3:: @ 841D090 - .string "{STR_VAR_1}.{STR_VAR_2}$" - - .align 2 -gText_TimesPerSec:: @ 841D098 - .string "Times/sec.$" - - .align 2 -gText_Var1Percent:: @ 841D0A4 - .string "{STR_VAR_1}%$" - - .align 2 -gText_PressesRankings:: @ 841D0A8 - .string "No. of Presses Rankings$" - - .align 2 -gText_CrushingResults:: @ 841D0C0 - .string "Crushing Results$" - - .align 2 -gText_NeatnessRankings:: @ 0x841D0D4 - .string "Neatness Rankings$" - - .align 2 -gText_CooperativeRankings:: @ 0x841D0E8 - .string "Cooperative Rankings$" - - .align 2 -gText_PressingPowerRankings:: @ 0x841D100 - .string "Pressing-Power Rankings$" - -gText_BerryCrush2:: @ 841D118 - .string "BERRY CRUSH$" - -gText_PressingSpeedRankings:: @ 841D124 - .string "Pressing-Speed Rankings$" - -gText_Var1Players:: @ 841D13C - .string "{STR_VAR_1} PLAYERS$" - - .align 2 -gText_Ghost:: @ 841D148 - .string "GHOST$" - -gUnknown_841D14E:: @ 841D14E - .string "A POKéMON's on the hook!{PAUSE_UNTIL_PRESS}$" - -gUnknown_841D169:: @ 841D169 - .string "Not even a nibble‥{PAUSE_UNTIL_PRESS}$" - -gUnknown_841D17E:: @ 841D17E - .string "It got away‥{PAUSE_UNTIL_PRESS}$" - -gUnknown_841D18D:: @ 841D18D - .string "ROOFTOP$" - - .align 2 -gString_PokemonFireRed_Staff:: @ 841D198 - .string "Pokémon FireRed Version\n" - .string "Staff$" - - .align 2 -gString_PokemonLeafGreen_Staff:: @ 0x841D1B8 - .string "Pokémon LeafGreen Version\n" - .string "Staff$" - - .align 2 -gCreditsString_Director:: @ 0x841D1D8 - .string "\n" - .string "\nDirector\n" - .string "\n\n" - .string "\n$" - - .align 2 -gCreditsString_Junichi_Masuda:: @ 0x841D1E8 - .string "\n" - .string "\n\n" - .string "Junichi Masuda\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_Art_Director_Battle_Director:: @ 0x841D200 - .string "\n" - .string "Art Director\n" - .string "\nBattle Director\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_Ken_Sugimori_Shigeki_Morimoto:: @ 0x841D224 - .string "\n" - .string "\nKen Sugimori\n" - .string "\nShigeki Morimoto\n" - .string "\n$" - - .align 2 -gCreditsString_Program_Leader_Planning_Leader_Graphic_Design_Leader:: @ 0x841D248 - .string "Program Leader\n" - .string "\nPlanning Leader\n" - .string "\nGraphic Design Leader\n" - .string "\n$" - - .align 2 -gCreditsString_Tetsuya_Watanabe_Koji_Nishino_Takao_Unno:: @ 0x841D284 - .string "\n" - .string "Tetsuya Watanabe\n" - .string "\nKoji Nishino\n" - .string "\nTakao Unno\n" - .string "$" - - .align 2 -gCreditsString_Programmers:: @ 0x841D2B4 - .string "Programmers\n" - .string "\n\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_Hiroyuki_Nakamura_Masao_Taya_Satoshi_Nohara_Miyuki_Iwasawa_Daisuke_Goto:: @ 0x841D2C8 - .string "\n" - .string "Hiroyuki Nakamura\n" - .string "Masao Taya\n" - .string "Satoshi Nohara\n" - .string "Miyuki Iwasawa\n" - .string "Daisuke Goto\n" - .string "$" - - .align 2 -gCreditsString_System_Programmers:: @ 0x841D314 - .string "System Programmers\n" - .string "\n\n" - .string "\n\n" - .string "\n$" - - .align 2 -gCreditsString_Tetsuya_Watanabe_Akito_Mori_Hisashi_Sogabe_Sousuke_Tamada:: @ 0x841D330 - .string "\n" - .string "Tetsuya Watanabe\n" - .string "Akito Mori\n" - .string "Hisashi Sogabe\n" - .string "Sousuke Tamada\n" - .string "\n$" - - .align 2 -gCreditsString_Graphic_Designers:: @ 0x841D370 - .string "Graphic Designers\n" - .string "\n\n" - .string "\n\n" - .string "\n$" - - .align 2 -gCreditsString_Takao_Unno_Asuka_Iwashita_Kanako_Eo_Hiroki_Fuchino:: @ 0x841D388 - .string "\n" - .string "Takao Unno\n" - .string "Asuka Iwashita\n" - .string "Kanako Eo\n" - .string "Hiroki Fuchino\n" - .string "\n$" - - .align 2 -gCreditsString_Graphic_Designers_2:: @ 0x841D3C0 - .string "\n" - .string "Graphic Designers\n" - .string "\n\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_Ken_Sugimori_Hironobu_Yoshida:: @ 0x841D3D8 - .string "\n" - .string "\nKen Sugimori\n" - .string "Hironobu Yoshida\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_Music_Composition:: @ 0x841D3FC - .string "\n" - .string "Music Composition\n" - .string "\n\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_Go_Ichinose_Junichi_Masuda:: @ 0x841D414 - .string "\n" - .string "\nGo Ichinose\n" - .string "Junichi Masuda\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_Sound_Effects:: @ 0x841D434 - .string "\n" - .string "\nSound Effects\n" - .string "\n\n" - .string "\n$" - - .align 2 -gCreditsString_Go_Ichinose:: @ 0x841D448 - .string "\n" - .string "\n\n" - .string "Go Ichinose\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_Game_Designers:: @ 0x841D45C - .string "\n" - .string "Game Designers\n" - .string "\n\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_Junichi_Masuda_Koji_Nishino_Tetsuji_Ohta:: @ 0x841D474 - .string "\n" - .string "\nJunichi Masuda\n" - .string "Koji Nishino\n" - .string "Tetsuji Ohta\n" - .string "\n$" - - .align 2 -gCreditsString_Game_Designers_2:: @ 0x841D4A4 - .string "\n" - .string "Game Designers\n" - .string "\n\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_Hitomi_Sato_Shigeru_Ohmori_Tadashi_Takahashi:: @ 0x841D4BC - .string "\n" - .string "\nHitomi Sato\n" - .string "Shigeru Ohmori\n" - .string "Tadashi Takahashi\n" - .string "\n$" - - .align 2 -gCreditsString_Game_Scenario:: @ 0x841D4F0 - .string "\n" - .string "Game Scenario\n" - .string "\n\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_Hitomi_Sato_Satoshi_Tajiri:: @ 0x841D504 - .string "\n" - .string "\nHitomi Sato\n" - .string "Satoshi Tajiri\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_Script_Designer_Map_Designer:: @ 0x841D524 - .string "\n" - .string "Script Designer\n" - .string "\nMap Designer\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_Satoshi_Nohara_Shigeru_Ohmori:: @ 0x841D548 - .string "\n" - .string "\nSatoshi Nohara\n" - .string "\nShigeru Ohmori\n" - .string "\n$" - - .align 2 -gCreditsString_Parametric_Designers:: @ 0x841D56C - .string "\n" - .string "Parametric Designers\n" - .string "\n\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_Koji_Nishino_Tetsuji_Ohta_Shigeki_Morimoto:: @ 0x841D588 - .string "\n" - .string "\nKoji Nishino\n" - .string "Tetsuji Ohta\n" - .string "Shigeki Morimoto\n" - .string "\n$" - - .align 2 -gCreditsString_POKeDEX_Text:: @ 0x841D5B8 - .string "\n" - .string "\nPOKéDEX Text\n" - .string "\n\n" - .string "\n$" - - .align 2 -gCreditsString_Kenji_Matsushima:: @ 0x841D5CC - .string "\n" - .string "\n\n" - .string "Kenji Matsushima\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_POKeMON_Designers:: @ 0x841D5E4 - .string "POKéMON Designers\n" - .string "\n\n" - .string "\n\n" - .string "\n$" - - .align 2 -gCreditsString_Ken_Sugimori_Motofumi_Fujiwara_Shigeki_Morimoto_Hironobu_Yoshida:: @ 0x841D5FC - .string "\n" - .string "Ken Sugimori\n" - .string "Motofumi Fujiwara\n" - .string "Shigeki Morimoto\n" - .string "Hironobu Yoshida\n" - .string "\n$" - - .align 2 -gCreditsString_POKeMON_Designers_2:: @ 0x841D640 - .string "POKéMON Designers\n" - .string "\n\n" - .string "\n\n" - .string "\n$" - - .align 2 -gCreditsString_Satoshi_Ohta_Asuka_Iwashita_Takao_Unno_Kanako_Eo_Aimi_Tomita:: @ 0x841D658 - .string "\n" - .string "Satoshi Ohta\n" - .string "Asuka Iwashita\n" - .string "Takao Unno\n" - .string "Kanako Eo\n" - .string "Aimi Tomita\n" - .string "$" - - .align 2 -gCreditsString_POKeMON_Designers_3:: @ 0x841D698 - .string "POKéMON Designers\n" - .string "\n\n" - .string "\n\n" - .string "\n$" - - .align 2 -gCreditsString_Atsuko_Nishida_Muneo_Saito_Rena_Yoshikawa_Jun_Okutani:: @ 0x841D6B0 - .string "\n" - .string "Atsuko Nishida\n" - .string "Muneo Saito\n" - .string "Rena Yoshikawa\n" - .string "Jun Okutani\n" - .string "\n$" - - .align 2 -gCreditsString_Supporting_Programmers:: @ 0x841D6EC - .string "Supporting Programmers\n" - .string "\n\n" - .string "\n$" - - .align 2 -gCreditsString_Teruyuki_Yoshioka_Takao_Nakano_Satoshi_Mitsuhara_Daisuke_Hoshino:: @ 0x841D708 - .string "\n" - .string "Teruyuki Yoshioka\n" - .string "Takao Nakano\n" - .string "\nSatoshi Mitsuhara\n" - .string "Daisuke Hoshino\n" - .string "$" - - .align 2 -gCreditsString_NCL_Product_Testing:: @ 0x841D74C - .string "\n" - .string "\nNCL Product Testing\n" - .string "\n\n" - .string "\n$" - - .align 2 -gCreditsString_NCL_Super_Mario_Club:: @ 0x841D768 - .string "\n" - .string "\n\n" - .string "NCL Super Mario Club\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_Special_Thanks:: @ 0x841D784 - .string "Special Thanks\n" - .string "\n\n" - .string "\n\n" - .string "\n$" - - .align 2 -gCreditsString_Hiro_Nakamura_Hiroyuki_Uesugi_Teruki_Murakawa_Kazuya_Suyama:: @ 0x841D79C - .string "\n" - .string "Hiro Nakamura\n" - .string "Hiroyuki Uesugi\n" - .string "Teruki Murakawa\n" - .string "\nKazuya Suyama\n" - .string "$" - - .align 2 -gCreditsString_Special_Thanks_2:: @ 0x841D7DC - .string "Special Thanks\n" - .string "\n\n" - .string "\n\n" - .string "\n$" - - .align 2 -gCreditsString_Kenji_Tominaga_Kenjiro_Ito_Tomotaka_Komura_Michiko_Takizawa:: @ 0x841D7F4 - .string "\n" - .string "Kenji Tominaga\n" - .string "\nKenjiro Ito\n" - .string "Tomotaka Komura\n" - .string "Michiko Takizawa\n" - .string "$" - - .align 2 -gCreditsString_Special_Thanks_3:: @ 0x841D834 - .string "Special Thanks\n" - .string "\n\n" - .string "\n\n" - .string "\n$" - - .align 2 -gCreditsString_Makiko_Takada_Mikiko_Ohashi_Shusaku_Egami_Takanao_Kondo_Rui_Kawaguchi:: @ 0x841D84C - .string "\n" - .string "Makiko Takada\n" - .string "Mikiko Ohashi\n" - .string "Shusaku Egami\n" - .string "Takanao Kondo\n" - .string "Rui Kawaguchi\n" - .string "$" - - .align 2 -gCreditsString_Braille_Code_Check:: @ 0x841D894 - .string "\n" - .string "\nBraille Code Check\n" - .string "\n\n" - .string "\n$" - - .align 2 -gCreditsString_Japan_Braille_Library:: @ 0x841D8B0 - .string "\n" - .string "\n\n" - .string "Japan Braille Library\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_Information_Supervisors:: @ 0x841D8CC - .string "Information Supervisors\n" - .string "\n\n" - .string "\n\n" - .string "\n$" - - .align 2 -gCreditsString_Hiroki_Enomoto_Kazuyuki_Terada_Yuri_Sakurai_Yumi_Funasaka_Naoko_Yanase:: @ 0x841D8EC - .string "\n" - .string "Hiroki Enomoto\n" - .string "Kazuyuki Terada\n" - .string "Yuri Sakurai\n" - .string "Yumi Funasaka\n" - .string "Naoko Yanase\n" - .string "$" - - .align 2 -gCreditsString_Coordinators:: @ 0x841D938 - .string "Coordinators\n" - .string "\n\n" - .string "\n\n" - .string "\n$" - - .align 2 -gCreditsString_Azusa_Tajima_Akira_Kinashi_Kazuki_Yoshihara_Retsuji_Nomoto:: @ 0x841D94C - .string "\n" - .string "Azusa Tajima\n" - .string "Akira Kinashi\n" - .string "Kazuki Yoshihara\n" - .string "\nRetsuji Nomoto\n" - .string "$" - - .align 2 -gCreditsString_Task_Managers:: @ 0x841D98C - .string "\n" - .string "Task Managers\n" - .string "\n\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_Hitoshi_Yamagami_Gakuji_Nomoto:: @ 0x841D9A0 - .string "\n" - .string "\nHitoshi Yamagami\n" - .string "Gakuji Nomoto\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_Producers:: @ 0x841D9C4 - .string "\n" - .string "Producers\n" - .string "\n\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_Hiroyuki_Jinnai_Takehiro_Izushi_Hiroaki_Tsuru:: @ 0x841D9D4 - .string "\n" - .string "\nHiroyuki Jinnai\n" - .string "Takehiro Izushi\n" - .string "Hiroaki Tsuru\n" - .string "\n$" - - .align 2 -gCreditsString_Executive_Director:: @ 0x841DA08 - .string "\n" - .string "\nExecutive Director\n" - .string "\n\n" - .string "\n$" - - .align 2 -gCreditsString_Satoshi_Tajiri:: @ 0x841DA24 - .string "\n" - .string "\n\n" - .string "Satoshi Tajiri\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_Executive_Producer:: @ 0x841DA3C - .string "\n" - .string "\nExecutive Producer\n" - .string "\n\n" - .string "\n$" - - .align 2 -gCreditsString_Satoru_Iwata:: @ 0x841DA58 - .string "\n" - .string "\n\n" - .string "Satoru Iwata\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_Executive_Producer_2:: @ 0x841DA6C - .string "\n" - .string "\nExecutive Producer\n" - .string "\n\n" - .string "\n$" - - .align 2 -gCreditsString_Tsunekaz_Ishihara:: @ 0x841DA88 - .string "\n" - .string "\n\n" - .string "Tsunekaz Ishihara\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_English_Version_Coordinators:: @ 0x841DAA0 - .string "\n" - .string "English Version Coordinators\n" - .string "\n\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_Hiro_Nakamura_Seth_McMahill:: @ 0x841DAC4 - .string "\n" - .string "\nHiro Nakamura\n" - .string "Seth McMahill\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_Translator_Text_Editor:: @ 0x841DAE8 - .string "\n" - .string "Translator\n" - .string "\nText Editor\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_Nob_Ogasawara_Teresa_Lillygren:: @ 0x841DB04 - .string "\n" - .string "\nNob Ogasawara\n" - .string "\nTeresa Lillygren\n" - .string "\n$" - - .align 2 -gCreditsString_Programmers_2:: @ 0x841DB28 - .string "Programmers\n" - .string "\n\n" - .string "\n\n" - .string "\n$" - - .align 2 -gCreditsString_Teruki_Murakawa_Souichi_Yamamoto_Yuichiro_Ito_Akira_Kinashi:: @ 0x841DB3C - .string "\n" - .string "Teruki Murakawa\n" - .string "Souichi Yamamoto\n" - .string "Yuichiro Ito\n" - .string "Akira Kinashi\n" - .string "\n$" - - .align 2 -gCreditsString_Environment_Tool_Programmers:: @ 0x841DB7C - .string "\n" - .string "Environment & Tool Programmers\n" - .string "\n\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_Teruki_Murakawa_Souichi_Yamamoto_Kimiko_Nakamichi:: @ 0x841DBA4 - .string "\n" - .string "\nTeruki Murakawa\n" - .string "Souichi Yamamoto\n" - .string "Kimiko Nakamichi\n" - .string "\n$" - - .align 2 -gCreditsString_NOA_Product_Testing:: @ 0x841DBDC - .string "NOA Product Testing\n" - .string "\n\n" - .string "\n\n" - .string "\n$" - - .align 2 -gCreditsString_Thomas_Hertzog_Kathy_Huguenard_Mika_Kurosawa:: @ 0x841DBF8 - .string "\n" - .string "Thomas Hertzog\n" - .string "Kathy Huguenard\n" - .string "Mika Kurosawa\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_Braille_Code_Check_2:: @ 0x841DC2C - .string "Braille Code Check\n" - .string "\n\n" - .string "\n\n" - .string "\n$" - - .align 2 -gCreditsString_National_Federation_of_the_Blind_Patricia_A_Maurer_Japan_Braille_Library_European_Blind_Union:: @ 0x841DC48 - .string "\n" - .string "National Federation\n" - .string "{CLEAR_TO 0x13}of the Blind\n" - .string "Patricia A. Maurer\n" - .string "Japan Braille Library\n" - .string "European Blind Union\n" - .string "$" - - .align 2 -gCreditsString_Braille_Code_Check_3:: @ 0x841DCAC - .string "\n" - .string "Braille Code Check\n" - .string "\n\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_National_Information_Library_Service_Margaret_Campion:: @ 0x841DCC8 - .string "\n" - .string "\nNational Information Library\n" - .string "{CLEAR_TO 0x2D}Service\n" - .string "Margaret Campion\n" - .string "\n$" - - .align 2 -gCreditsString_Special_Thanks_4:: @ 0x841DD08 - .string "Special Thanks\n" - .string "\n\n" - .string "\n\n" - .string "\n$" - - .align 2 -gCreditsString_Takehiro_Izushi_Motoyasu_Tojima_Hitoshi_Yamagami_Hiroyuki_Uesugi:: @ 0x841DD20 - .string "\n" - .string "Takehiro Izushi\n" - .string "Motoyasu Tojima\n" - .string "Hitoshi Yamagami\n" - .string "Hiroyuki Uesugi\n" - .string "\n$" - - .align 2 -gCreditsString_Special_Thanks_5:: @ 0x841DD64 - .string "Special Thanks\n" - .string "\n\n" - .string "\n\n" - .string "\n$" - - .align 2 -gCreditsString_Nicola_Pratt_Barlow_Shellie_Dow_Anthony_Howitt_Naoko_Saeki_Kyoko_Onishi:: @ 0x841DD7C - .string "\n" - .string "Nicola Pratt-Barlow\n" - .string "Shellie Dow\n" - .string "Anthony Howitt\n" - .string "Naoko Saeki\n" - .string "Kyoko Onishi\n" - .string "$" - - .align 2 -gCreditsString_Braille_Code_Check_4:: @ 0x841DDC8 - .string "\n" - .string "Braille Code Check\n" - .string "\n\n" - .string "\n\n" - .string "$" - - .align 2 -gCreditsString_The_Royal_New_Zealand_Foundation_of_the_Blind_Greg_Moran:: @ 0x841DDE4 - .string "\n" - .string "\nThe Royal New Zealand\n" - .string "Foundation of the Blind\n" - .string "Greg Moran\n" - .string "\n$" - - .align 2 -gCreditsString_Graphic_Designer:: @ 0x841DE24 - .string "\n" - .string "\nGraphic Designer\n" - .string "\n\n" - .string "\n$" - - .align 2 -gCreditsString_Akira_Kinashi:: @ 0x841DE3C - .string "\n" - .string "\n\n" - .string "Akira Kinashi\n" - .string "\n\n" - .string "$" - -gJPText_MysteryGift:: @ 841DE50 - .string "$" - -gJPText_DecideStop:: @ 841DE51 - .string "$" - -gJPText_ReceiveMysteryGiftWithEReader:: @ 841DE52 - .string "$" - -gJPText_SelectConnectFromEReaderMenu:: @ 841DE53 - .string "$" - -gJPText_SelectConnectWithGBA:: @ 841DE54 - .string "$" - -gJPText_SelectConnectAndPressA:: @ 841DE55 - .string "カ-ドeリ-ダ-{PLUS}の ‘つうしん'を\n" - .string "えらんで Aボタンを おしてください$" - -gJPText_LinkIsIncorrect:: @ 841DE7C - .string "$" - -gJPText_CardReadingHasBeenHalted:: @ 841DE7D - .string "$" - -gJPText_UnableConnectWithEReader:: @ 841DE7E - .string "カ-ドeリ-ダ-{PLUS}と\n" - .string "つうしん できません$" - -gJPText_Connecting:: @ 841DE95 - .string "$" - -gJPText_ConnectionErrorCheckLink:: @ 841DE96 - .string "$" - -gJPText_ConnectionErrorTryAgain:: @ 841DE97 - .string "$" - -gJPText_AllowEReaderToLoadCard:: @ 841DE98 - .string "$" - -gJPText_ConnectionComplete:: @ 841DE99 - .string "$" - -gJPText_NewTrainerHasComeToSevii:: @ 841DE9A - .string "$" - -gJPText_PleaseWaitAMoment:: @ 841DE9B - .string "$" - -gJPText_WriteErrorUnableToSaveData:: @ 841DE9C - .string "$" - -gText_CommErrorCheckConnections:: @ 841DE9D - .string "Communication error…\n" - .string "Please check all connections,\n" - .string "then turn the power OFF and ON.$" - -gText_CommErrorEllipsis:: @ 841DEF0 - .string "Communication error…$" - -gText_MoveCloserToLinkPartner:: @ 841DF05 - .string "Move closer to your link partner(s).\n" - .string "Avoid obstacles between partners.$" - -gText_ABtnRegistrationCounter:: @ 841DF4C - .string "A Button: Registration Counter$" - -gText_ABtnTitleScreen:: @ 841DF6B - .string "A Button: Title Screen$" - -gUnknown_841DF82:: @ 841DF82 - .string "{STR_VAR_1}P LINK$" - -gUnknown_841DF8B:: @ 841DF8B - .string "BRONZE$" - -gUnknown_841DF92:: @ 841DF92 - .string "COPPER$" - -gUnknown_841DF99:: @ 841DF99 - .string "SILVER$" - -gUnknown_841DFA0:: @ 841DFA0 - .string "GOLD$" - -gUnknown_841DFA5:: @ 841DFA5 - .string "{A_BUTTON}NEXT$" - -gUnknown_841DFAC:: @ 841DFAC - .string "{DPAD_UPDOWN}PICK {A_BUTTON}OK {B_BUTTON}END$" - -gUnknown_841DFBE:: @ 841DFBE - .string "{A_BUTTON}{B_BUTTON}CANCEL$" - -gUnknown_841DFC9:: @ 841DFC9 - .string "{DPAD_UPDOWN}PICK {A_BUTTON}OK {B_BUTTON}CANCEL$" - -gEasyChatGroupName_Pokemon:: @ 841E08A @ easy chat categories - .string "POKéMON$" - -gEasyChatGroupName_Trainer:: @ 841DFE6 - .string "TRAINER$" - -gEasyChatGroupName_Status:: @ 841DFEE - .string "STATUS$" - -gEasyChatGroupName_Battle:: @ 841DFF5 - .string "BATTLE$" - -gEasyChatGroupName_Greetings:: @ 841DFFC - .string "GREETINGS$" - -gEasyChatGroupName_People:: @ 841E006 - .string "PEOPLE$" - -gEasyChatGroupName_Voices:: @ 841E00D - .string "VOICES$" - -gEasyChatGroupName_Speech:: @ 841E014 - .string "SPEECH$" - -gEasyChatGroupName_Endings:: @ 841E01B - .string "ENDINGS$" - -gEasyChatGroupName_Feelings:: @ 841E023 - .string "FEELINGS$" - -gEasyChatGroupName_Conditions:: @ 841E02C - .string "CONDITIONS$" - -gEasyChatGroupName_Actions:: @ 841E037 - .string "ACTIONS$" - -gEasyChatGroupName_Lifestyle:: @ 841E03F - .string "LIFESTYLE$" - -gEasyChatGroupName_Hobbies:: @ 841E049 - .string "HOBBIES$" - -gEasyChatGroupName_Time:: @ 841E051 - .string "TIME$" - -gEasyChatGroupName_Misc:: @ 841E056 - .string "MISC.$" - -gEasyChatGroupName_Adjectives:: @ 841E05C - .string "ADJECTIVES$" - -gEasyChatGroupName_Events:: @ 841E067 - .string "EVENTS$" - -gEasyChatGroupName_Move1:: @ 841E06E - .string "MOVE 1$" - -gEasyChatGroupName_Move2:: @ 841E075 - .string "MOVE 2$" - -gEasyChatGroupName_TrendySaying:: @ 841E07C - .string "TRENDY SAYING$" - -gEasyChatGroupName_Pokemon2:: @ 841DFDE - .string "POKéMON2$" - - @ trade-related -gText_ThreeQuestionMarks:: @ 841E093 - .string "???$" - - .string "$" - - .string "Lv$" - - .string "---$" - -gUnknown_841E09F:: @ 841E09F - .string "????$" - - .string "$" - -gUnknown_841E0A5:: @ 841E0A5 - .string "Is this trade okay?$" - -gTradeText_Cancel:: - .string "CANCEL$" - -gTradeText_ChooseAPokemon:: - .string "Choose a POKéMON.$" - -gTradeText_Summary:: - .string "SUMMARY$" - -gTradeText_Trade:: - .string "TRADE$" - -gTradeText_CancelTrade:: - .string "Cancel trade?$" - -gTradeText_PressBButtonToExit:: - .string "Press the B Button to exit.$" - -gUnknown_841E10A:: - .string "SUMMARY$" - -gUnknown_841E112:: - .string "TRADE$" - -gUnknown_841E118:: - .string "{COLOR RED}{HIGHLIGHT DARK_GREY}{SHADOW GREEN}Communication standby…\n" - .string "Please wait.$" - -gUnknown_841E145:: - .string "{COLOR RED}{HIGHLIGHT DARK_GREY}{SHADOW GREEN}The trade has been canceled.$" - -gUnknown_841E16B:: - .string "{COLOR RED}{HIGHLIGHT DARK_GREY}{SHADOW GREEN}That's your only POKéMON\n" - .string "for battle.$" - -gUnknown_841E199:: - .string "{COLOR RED}{HIGHLIGHT DARK_GREY}{SHADOW GREEN}Waiting for your friend\n" - .string "to finish…$" - -gUnknown_841E1C5:: - .string "Your friend wants\n" - .string "to trade POKéMON.$" - -gText_XWillBeSentToY:: @ 841E1E9 - .string "{STR_VAR_2} will be\n" - .string "sent to {STR_VAR_1}.$" - -gText_ByeByeVar1:: @ 841E200 - .string "Bye-bye, {STR_VAR_2}!$" - -gText_XSentOverY:: @ 841E20D - .string "{STR_VAR_1} sent over {STR_VAR_3}.$" - -gText_TakeGoodCareOfX:: @ 841E21E - .string "Take good care of {STR_VAR_3}!$" - -gText_From:: @ 841E234 - .string "From $" - -gUnknown_841E23A:: @ 841E23A - .string "$" - -gUnknown_841E23B:: @ 841E23B - .string "$" - -gUnknown_841E23C:: @ 841E23C - .string "$" - -gUnknown_841E23D:: @ 841E23D - .string "$" - -gUnknown_841E23E:: @ 841E23E - .string "$" - -gUnknown_841E23F:: @ 841E23F - .string "$" - -gUnknown_841E240:: @ 841E240 - .string "$" - -gUnknown_841E241:: @ 841E241 - .string "$" - -gUnknown_841E242:: @ 841E242 - .string "$" - -gUnknown_841E243:: @ 841E243 - .string "$" - -gUnknown_841E244:: @ 841E244 - .string "$" - -gText_WirelessCommunicationStatus:: @ 841E245 - .string "Wireless Communication Status$" - -gText_PeopleTrading:: @ 841E263 - .string "People trading:$" - -gText_PeopleBattling:: @ 841E273 - .string "People battling:$" - -gText_PeopleInUnionRoom:: @ 841E284 - .string "People in the UNION ROOM:$" - -gText_PeopleCommunicating:: @ 841E29E - .string "People communicating:$" - -gUnknown_841E2B4:: @ 841E2B4 - .string "{DYNAMIC 0x00} players$" - -gUnknown_841E2BF:: @ 841E2BF - .string "{DYNAMIC 0x01} player$" - -gUnknown_841E2C9:: @ 841E2C9 - .string "{DYNAMIC 0x02} players$" - -gUnknown_841E2D4:: @ 841E2D4 - .string "{DYNAMIC 0x03} players$" - -gUnknown_841E2DF:: @ 841E2DF - .string "{DPAD_ANY}えらぶ:{A_BUTTON}けってい$" - -gUnknown_841E2EC:: @ 841E2EC - .string "{B_BUTTON}CANCEL$" - -gUnknown_841E2F5:: @ 841E2F5 - .string "{COLOR BLUE}{SHADOW YELLOW} たいせんの くみあわせ\n" - .string "{COLOR RED}{SHADOW GREEN}じぶんの ばしょをきめて ください$" - -gUnknown_841E322:: @ 841E322 - .string "{ID}$" - -gText_CommunicationStandby5:: @ 841E325 - .string "Communication standby…$" - -gDaycareText_GetAlongVeryWell:: @ 841E33C - .string "The two seem to get along\n" - .string "very well.$" - -gDaycareText_GetAlong:: @ 841E361 - .string "The two seem to get along.$" - -gDaycareText_DontLikeOther:: @ 841E37C - .string "The two don't seem to like\n" - .string "each other much.$" - -gDaycareText_PlayOther:: @ 841E3A8 - .string "The two prefer to play with other\n" - .string "POKéMON than each other.$" - -gText_TeachWhichMoveToMon:: @ 841E3E3 - .string "Teach which move to {STR_VAR_1}?$" - -gText_TeachMoveQues:: @ 841E3FB - .string "Teach {STR_VAR_2}?$" - -gText_MonLearnedMove:: @ 841E405 - .string "{STR_VAR_1} learned\n" - .string "{STR_VAR_2}.$" - -gText_MonIsTryingToLearnMove:: @ 841E414 - .string "{STR_VAR_1} is trying to learn\n" - .string "{STR_VAR_2}.\p" - .string "But {STR_VAR_1} can't learn more\n" - .string "than four moves.\p" - .string "Delete an older move to make\n" - .string "room for {STR_VAR_2}?$" - -gText_StopLearningMove:: @ 841E481 - .string "Stop learning {STR_VAR_2}?$" - -gText_1_2_and_Poof:: @ 841E493 - .string "{PAUSE 0x20}1, {PAUSE 0x0F}2, and {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}{PLAY_SE SE_KON}Poof!\p" - .string "$" - -gText_MonForgotOldMoveAndMonLearnedNewMove:: @ 841E4C0 - .string "{STR_VAR_1} forgot {STR_VAR_3}.\p" - .string "And‥\p" - .string "{STR_VAR_1}\n" - .string "learned {STR_VAR_2}.$" - -gText_GiveUpTryingToTeachNewMove:: @ 841E4E2 - .string "Give up trying to teach a new\n" - .string "move to {STR_VAR_1}?$" - -gText_WhichMoveShouldBeForgotten:: @ 841E50C - .string "Which move should be forgotten?\p" - .string "$" - -gUnknown_841E52D:: @ 0x841E52D - .string "----------$" - -gText_CommStandbyAwaitingOtherPlayer:: @ 841E538 - .string "Communication standby‥\n" - .string "Awaiting another player to choose.$" - -gText_BattleWasRefused:: @ 841E572 - .string "The battle was refused.{PAUSE 0x3C}$" - -gText_RefusedBattle:: @ 841E58D - .string "Refused the battle.{PAUSE 0x3C}$" - -gFameCheckerText_MainScreenUI:: @ 841E5A4 - .string "{START_BUTTON}PICK {DPAD_UPDOWN}SELECT {A_BUTTON}OK$" - -gFameCheckerText_PickScreenUI:: @ 841E5B9 - .string "{START_BUTTON}PICK {DPAD_UPDOWN}SELECT {B_BUTTON}CANCEL$" - -gFameCheckerText_FlavorTextUI:: @ 841E5D2 - .string "{DPAD_ANY}PICK {A_BUTTON}READ {B_BUTTON}CANCEL$" - -gFameCheckerOakName:: @ 841E5E9 - .string "OAK$" - -gFameCheckerDaisyName:: @ 841E5ED - .string "DAISY$" - -gFameCheckerBillName:: @ 841E5F3 - .string "BILL$" - -gFameCheckerMrFujiName:: @ 841E5F8 - .string "FUJI$" - -gText_VarietyOfEventsImportedWireless:: @ 841E5FD - .string "A variety of events will be imported\n" - .string "over Wireless Communication.$" - -gText_WonderCardsInPossession:: @ 841E63F - .string "Read the WONDER CARDS in your\n" - .string "possession.$" - -gText_ReadNewsThatArrived:: @ 841E669 - .string "Read the NEWS that arrived.$" - -gText_ReturnToTitle:: @ 841E685 - .string "Return to the title screen.$" - -gText_DontHaveCardNewOneInput:: @ 841E6A1 - .string "You don't have a WONDER CARD,\n" - .string "so a new CARD will be input.$" - -gText_DontHaveNewsNewOneInput:: @ 841E6DC - .string "You don't have any WONDER NEWS,\n" - .string "so new NEWS will be input.$" - -gText_WhereShouldCardBeAccessed:: @ 841E717 - .string "Where should the WONDER CARD\n" - .string "be accessed?$" - -gText_WhereShouldNewsBeAccessed:: @ 841E741 - .string "Where should the WONDER NEWS\n" - .string "be accessed?$" - -gUnknown_841E76B:: @ 841E76B - .string "Link standby...\n" - .string "... ... B Button: Cancel$" - -gText_Communicating:: @ 841E794 - .string "Communicating…$" - -gText_CommunicationCompleted:: @ 841E7A3 - .string "Communication completed.$" - -gText_CommunicationError:: @ 841E7BC - .string "Communication error.$" - -gText_CommunicationCanceled:: @ 841E7D1 - .string "Communication has been canceled.$" - -gText_ThrowAwayWonderCard:: @ 841E7F2 - .string "Throw away the WONDER CARD\n" - .string "and input a new CARD?$" - -gText_HaventReceivedCardsGift:: @ 841E823 - .string "You haven't received the CARD's gift\n" - .string "yet. Input a new CARD anyway?$" - -gText_WonderCardReceivedFrom:: @ 841E866 - .string "A WONDER CARD has been received\n" - .string "from {STR_VAR_1}.$" - -gText_WonderNewsReceivedFrom:: @ 841E88F - .string "A WONDER NEWS item has been\n" - .string "received from {STR_VAR_1}.$" - -gText_WonderCardReceived:: @ 841E8BD - .string "A new WONDER CARD has been\n" - .string "received.$" - -gText_WonderNewsReceived:: @ 841E8E2 - .string "A new WONDER NEWS item has been\n" - .string "received.$" - -gText_NewStampReceived:: @ 841E90C - .string "A new STAMP has been received.$" - -gText_NewTrainerReceived:: @ 841E92B - .string "A new TRAINER has arrived.$" - -gText_AlreadyHadCard:: @ 841E946 - .string "You already had that\n" - .string "WONDER CARD.$" - -gText_AlreadyHadNews:: @ 841E968 - .string "You already had that\n" - .string "WONDER NEWS item.$" - -gText_AlreadyHadStamp:: @ 841E98F - .string "You already had that\n" - .string "STAMP.$" - -gText_NoMoreRoomForStamps:: @ 841E9AB - .string "There's no more room for adding\n" - .string "STAMPS.$" - -gText_RecordUploadedViaWireless:: @ 841E9D3 - .string "Your record has been uploaded via\n" - .string "WIRELESS COMMUNICATION.$" - -gText_CantAcceptCardFromTrainer:: @ 841EA0D - .string "You can't accept a WONDER CARD\n" - .string "from this TRAINER.$" - -gText_CantAcceptNewsFromTrainer:: @ 841EA3F - .string "You can't accept WONDER NEWS\n" - .string "from this TRAINER.$" - -gText_NothingSentOver:: @ 841EA6F - .string "Nothing was sent over…$" - -gText_WhatToDoWithCards:: @ 841EA86 - .string "What would you like to do\n" - .string "with the WONDER CARDS?$" - -gText_WhatToDoWithNews:: @ 841EAB7 - .string "What would you like to do\n" - .string "with the WONDER NEWS?$" - -gText_SendingWonderCard:: @ 841EAE7 - .string "Sending your WONDER CARD…$" - -gText_SendingWonderNews:: @ 841EB01 - .string "Sending your WONDER NEWS item…$" - -gText_WonderCardSentTo:: @ 841EB20 - .string "Your WONDER CARD has been sent\n" - .string "to {STR_VAR_1}.$" - -gText_WonderNewsSentTo:: @ 841EB46 - .string "Your WONDER NEWS item has been\n" - .string "sent to {STR_VAR_1}.$" - -gText_StampSentTo:: @ 841EB71 - .string "A STAMP has been sent to {STR_VAR_1}.$" - -gText_GiftSentTo:: @ 841EB8E - .string "A GIFT has been sent to {STR_VAR_1}.$" - -gText_OtherTrainerHasCard:: @ 841EBAA - .string "The other TRAINER has the same\n" - .string "WONDER CARD already.$" - -gText_OtherTrainerHasNews:: @ 841EBDE - .string "The other TRAINER has the same\n" - .string "WONDER NEWS already.$" - -gText_OtherTrainerHasStamp:: @ 841EC12 - .string "The other TRAINER has the same\n" - .string "STAMP already.$" - -gText_OtherTrainerCanceled:: @ 841EC40 - .string "The other TRAINER canceled\n" - .string "communication.$" - -gText_CantSendGiftToTrainer:: @ 841EC6A - .string "You can't send a MYSTERY GIFT to\n" - .string "this TRAINER.$" - -gText_IfThrowAwayCardEventWontHappen:: @ 841EC99 - .string "If you throw away the CARD,\n" - .string "its event won't happen. Okay?$" - -gText_OkayToDiscardNews:: @ 841ECD3 - .string "Is it okay to discard this\n" - .string "NEWS item?$" - -gText_HaventReceivedGiftOkayToDiscard:: @ 841ECF9 - .string "You haven't received the\n" - .string "GIFT. Is it okay to discard?$" - -gText_DataWillBeSaved:: @ 841ED2F - .string "Data will be saved.\n" - .string "Please wait.$" - -gText_SaveCompletedPressA:: @ 841ED50 - .string "Save completed.\n" - .string "Please press the A Button.$" - -gText_WonderCardThrownAway:: @ 841ED7B - .string "The WONDER CARD was thrown away.$" - -gText_WonderNewsThrownAway:: @ 841ED9C - .string "The WONDER NEWS was thrown away.$" - -gText_MysteryGift2:: @ 841EDBD - .string "MYSTERY GIFT$" - -gText_PickOKCancel:: @ 841EDCA - .string "{DPAD_UPDOWN}PICK {A_BUTTON}OK {B_BUTTON}EXIT$" - -gText_WonderCards:: - .string "WONDER CARDS$" - -gText_WonderNews:: - .string "WONDER NEWS$" - -gText_WirelessCommunication:: - .string "WIRELESS COMMUNICATION$" - -gText_Friend2:: - .string "FRIEND$" - -gText_Exit3:: - .string "EXIT$" - -gText_Receive:: - .string "RECEIVE$" - -gText_Send:: - .string "SEND$" - -gText_Toss:: - .string "TOSS$" - -gUnknown_841EE2B:: @ 841EE2B - .string "DEL. ALL{CLEAR_TO 0x57}CANCEL{CLEAR_TO 0xA4}OK$" - diff --git a/data/text/quest_log.inc b/data/text/quest_log.inc deleted file mode 100644 index f03343802..000000000 --- a/data/text/quest_log.inc +++ /dev/null @@ -1,482 +0,0 @@ -QuestLog_Text_PreviouslyOnYourQuest:: @ 841A155 - .string "Previously on your quest…$" - -QuestLog_Text_SwitchMon1WithMon2:: @ 841A16F - .string "{PLAYER} switched the POKéMON\n" - .string "{STR_VAR_1} with {STR_VAR_2}.$" - -QuestLog_Text_SwappedHeldItemsOnMon:: @ 841A193 - .string "Took the item {STR_VAR_2} from\n" - .string "{STR_VAR_1} and gave it the item\n" - .string "{STR_VAR_3} to hold.$" - -QuestLog_Text_TookHeldItemFromMon:: @ 841A1CD - .string "Took the item {STR_VAR_2} from\n" - .string "{STR_VAR_1}.$" - -QuestLog_Text_UsedItemOnMonAtThisLocation:: @ 841A1E7 - .string "Used the item {STR_VAR_1} on {STR_VAR_2}\n" - .string "at this location.$" - -QuestLog_Text_UsedTheItem:: @ 841A210 - .string "{PLAYER} used the\n" - .string "{STR_VAR_1}.$" - -QuestLog_Text_UsedTheKeyItem:: @ 841A220 - .string "Used the item {STR_VAR_1}, which was\n" - .string "in the KEY ITEMS POCKET.$" - -QuestLog_Text_MonLearnedMoveFromTM:: @ 841A255 - .string "{STR_VAR_1} learned the move\n" - .string "{STR_VAR_2} from a TM.$" - -QuestLog_Text_MonReplacedMoveWithTM:: @ 841A277 - .string "{STR_VAR_1} learned the move\n" - .string "{STR_VAR_2} from a TM and forgot\n" - .string "the move {STR_VAR_3}.$" - -QuestLog_Text_MonsWereFullyRestoredAtCenter:: @ 841A2B0 - .string "POKéMON were fully restored\n" - .string "at a POKéMON CENTER.$" - -QuestLog_Text_PlayerBattledChampionRival:: @ 841A2E1 - .string "{DYNAMIC 0x00} had a marvelous battle\n" - .string "with the CHAMPION, {DYNAMIC 0x01}.$" - -QuestLog_Text_PlayerSentOutMon1RivalSentOutMon2:: @ 841A312 - .string "In the end, {DYNAMIC 0x00} sent out {DYNAMIC 0x01}\n" - .string "while {DYNAMIC 0x02} countered with\n" - .string "{DYNAMIC 0x03}.$" - -QuestLog_Text_WonTheMatchAsAResult:: @ 841A349 - .string "And, as a result of battling with every\n" - .string "bit of power, {DYNAMIC 0x00} won\n" - .string "the match.$" - -QuestLog_Text_StoredItemInPC:: @ 841A391 - .string "Removed the item {STR_VAR_1} from\n" - .string "the BAG's ITEMS POCKET and stored it\n" - .string "on the PC.$" - -QuestLog_Text_WithdrewItemFromPC:: @ 841A3DA - .string "{PLAYER} withdrew the item {STR_VAR_1}\n" - .string "from the PC.$" - -QuestLog_Text_TradedMon1ForPersonsMon2:: @ 841A3FF - .string "Traded {STR_VAR_3} in exchange for\n" - .string "{STR_VAR_1}'s {STR_VAR_2}.$" - -QuestLog_Text_SingleBattleWithPersonResultedInOutcome:: @ 841A422 - .string "Took on {DYNAMIC 0x00} in a SINGLE BATTLE.\n" - .string "It was a hotly contested match that\n" - .string "resulted in a {DYNAMIC 0x01}.$" - -QuestLog_Text_DoubleBattleWithPersonResultedInOutcome:: @ 841A477 - .string "Took on {DYNAMIC 0x00} in a DOUBLE BATTLE.\n" - .string "It was an extended match that resulted\n" - .string "in a {DYNAMIC 0x01}.$" - -QuestLog_Text_MultiBattleWithPeopleResultedInOutcome:: @ 841A4C6 - .string "{DYNAMIC 0x00} and {DYNAMIC 0x01} took on\n" - .string "{DYNAMIC 0x02} and {DYNAMIC 0x03} in a\n" - .string "MULTI BATTLE and got a {DYNAMIC 0x04}.$" - -QuestLog_Text_Win:: - .string "win$" - -QuestLog_Text_Loss:: - .string "loss$" - -QuestLog_Text_MingledInUnionRoom:: @ 841A50B - .string "Mingled with other TRAINERS in\n" - .string "the UNION ROOM.$" - -QuestLog_Text_DepartedPlaceInTownForNextDestination:: @ 841A53A - .string "Departed {STR_VAR_2}\n" - .string "in {STR_VAR_1} for the next\n" - .string "destination.$" - -QuestLog_Text_SwitchedMonsBetweenBoxes:: @ 841A566 - .string "After consideration, switched\n" - .string "{DYNAMIC 0x01} in {DYNAMIC 0x00} with\n" - .string "{DYNAMIC 0x03} in {DYNAMIC 0x02}.$" - -QuestLog_Text_MovedMonToNewBox:: @ 841A59C - .string "After deep thought, switched\n" - .string "{DYNAMIC 0x01} in BOX “{DYNAMIC 0x00}” to\n" - .string "the BOX “{DYNAMIC 0x02}.”$" - -QuestLog_Text_SwitchedMonsWithinBox:: @ 841A5D9 - .string "Switched around {DYNAMIC 0x01} and\n" - .string "{DYNAMIC 0x02} in {DYNAMIC 0x00}.$" - -QuestLog_Text_MovedMonWithinBox:: @ 841A5FA - .string "Moved {DYNAMIC 0x01} in {DYNAMIC 0x00}.$" - -QuestLog_Text_SwitchedPartyMonForPCMon:: @ 841A60A - .string "Switched {DYNAMIC 0x01} in {DYNAMIC 0x00}\n" - .string "with {DYNAMIC 0x02} in the party.$" - -QuestLog_Text_WithdrewMonFromPC:: @ 841A632 - .string "Added {DYNAMIC 0x01} in {DYNAMIC 0x00}\n" - .string "to the party.$" - -QuestLog_Text_DepositedMonInPC:: @ 841A64F - .string "Moved {DYNAMIC 0x00} from the party\n" - .string "to {DYNAMIC 0x01}.$" - -QuestLog_Text_SwitchedMultipleMons:: @ 841A66E - .string "Moved a group of POKéMON in\n" - .string "{DYNAMIC 0x00} to {DYNAMIC 0x01}.$" - -QuestLog_Text_ADifferentSpot:: @ 841A694 - .string "a different spot$" - -QuestLog_Text_GaveMonHeldItemFromPC:: @ 841A6A5 - .string "Removed the item {STR_VAR_1} from\n" - .string "{PLAYER}'s PC and gave it to {STR_VAR_2}\n" - .string "to hold.$" - -QuestLog_Text_SwappedHeldItemFromPC:: @ 841A6E1 - .string "Removed the item {STR_VAR_1} from\n" - .string "a PC, gave it to {STR_VAR_2}, and put\n" - .string "the {STR_VAR_3} it held in the BAG.$" - -QuestLog_Text_ChattedWithManyTrainers:: @ 841A732 - .string "Chatted with many TRAINERS.$" - -QuestLog_Text_Handily:: - .string "handily$" - -QuestLog_Text_Tenaciously:: - .string "tenaciously$" - -QuestLog_Text_Somehow:: - .string "somehow$" - -QuestLog_Text_TradedMon1ForTrainersMon2:: @ 841A76A - .string "Met and traded with {STR_VAR_1}.\n" - .string "Obtained the TRAINER's {STR_VAR_2} in\n" - .string "exchange for {STR_VAR_3}.$" - -QuestLog_Text_BattledTrainerEndedInOutcome:: @ 841A7B0 - .string "Met and battled {STR_VAR_1}.\n" - .string "The match ended in a {STR_VAR_2}.$" - -QuestLog_Text_BoughtItem:: @ 841A7DD - .string "Went to the POKéMON MART in\n" - .string "{DYNAMIC 0x00} and bought one \n" - .string "{DYNAMIC 0x01}.$" - -QuestLog_Text_BoughtItemsIncludingItem:: @ 841A810 - .string "Went to the POKéMON MART in\n" - .string "{DYNAMIC 0x00} and spent ¥{DYNAMIC 0x02} for\n" - .string "items including {DYNAMIC 0x01}(s).$" - -QuestLog_Text_SoldNumOfItem:: @ 841A858 - .string "{DYNAMIC 0x00} went to the POKéMON MART in\n" - .string "{DYNAMIC 0x01} and sold {DYNAMIC 0x03} of\n" - .string "the item {DYNAMIC 0x02}.$" - -QuestLog_Text_SoldItemsIncludingItem:: @ 841A896 - .string "Sold items including {DYNAMIC 0x01} at\n" - .string "the POKéMON MART in {DYNAMIC 0x00},\n" - .string "worth ¥{DYNAMIC 0x02}.$" - -QuestLog_Text_JustOne:: @ 841A8D4 - .string "just one$" - -QuestLog_Text_Num:: @ 841A8DD - .string "{DYNAMIC 0x04}$" - -QuestLog_Text_UsedSoftboiled:: @ 841A8E0 - .string "{STR_VAR_1} shared its HP using the move\n" - .string "SOFTBOILED.$" - -QuestLog_Text_UsedMilkDrink:: @ 841A90C - .string "{STR_VAR_1} shared its HP using the move\n" - .string "MILK DRINK.$" - -QuestLog_Text_MonLearnedMoveFromHM:: @ 841A938 - .string "{STR_VAR_1} securely learned the move\n" - .string "{STR_VAR_2} using an HM.$" - -QuestLog_Text_MonReplacedMoveWithHM:: @ 841A965 - .string "{STR_VAR_1} securely learned the move\n" - .string "{STR_VAR_2} using an HM and forgot\n" - .string "the move {STR_VAR_3}.$" - -QuestLog_Text_DefeatedWildMon:: @ 841A9A9 - .string "{DYNAMIC 0x05} managed to defeat the POKéMON\n" - .string "{DYNAMIC 0x01} in {DYNAMIC 0x00}.$" - -QuestLog_Text_DefeatedWildMons:: @ 841A9D4 - .string "Defeated {DYNAMIC 0x02} wild POKéMON including\n" - .string "{DYNAMIC 0x01} in {DYNAMIC 0x00}.$" - -QuestLog_Text_CaughtWildMon:: @ 841AA01 - .string "{DYNAMIC 0x05} managed to catch the POKéMON\n" - .string "{DYNAMIC 0x03} in {DYNAMIC 0x00}.$" - -QuestLog_Text_CaughtWildMons:: @ 841AA2B - .string "Threw POKé BALLS in a frenzy, catching\n" - .string "{DYNAMIC 0x04} POKéMON including {DYNAMIC 0x03} here\n" - .string "in {DYNAMIC 0x00}.$" - -QuestLog_Text_DefeatedWildMonAndCaughtWildMon:: @ 841AA76 - .string "{DYNAMIC 0x05} defeated the POKéMON\n" - .string "{DYNAMIC 0x01} and caught one {DYNAMIC 0x03}\n" - .string "in {DYNAMIC 0x00}.$" - -QuestLog_Text_DefeatedWildMonAndCaughtWildMons:: @ 841AAAA - .string "Defeated the POKéMON {DYNAMIC 0x01}\n" - .string "and caught {DYNAMIC 0x04} POKéMON including\n" - .string "{DYNAMIC 0x03} in {DYNAMIC 0x00}.$" - -QuestLog_Text_DefeatedWildMonsAndCaughtWildMon:: @ 841AAEC - .string "{DYNAMIC 0x05} defeated {DYNAMIC 0x02} POKéMON including\n" - .string "{DYNAMIC 0x01} and caught one {DYNAMIC 0x03}\n" - .string "in {DYNAMIC 0x00}.$" - -QuestLog_Text_DefeatedWildMonsAndCaughtWildMons:: @ 841AB29 - .string "Defeated {DYNAMIC 0x02} POKéMON including\n" - .string "{DYNAMIC 0x01} and caught {DYNAMIC 0x04} POKéMON\n" - .string "including {DYNAMIC 0x03} in {DYNAMIC 0x00}.$" - -QuestLog_Text_GaveMonHeldItem:: @ 841AB74 - .string "Made {STR_VAR_1} hold the item\n" - .string "{STR_VAR_2}.$" - -QuestLog_Text_GaveMonHeldItem2:: @ 841AB8E - .string "{PLAYER} made {STR_VAR_1} hold the item\n" - .string "{STR_VAR_2}.$" - -QuestLog_Text_UsedCut:: @ 841ABAB - .string "{STR_VAR_1} used the Hidden Move\n" - .string "CUT here.$" - -QuestLog_Text_UsedFly:: @ 841ABCD - .string "{STR_VAR_1} used the Hidden Move\n" - .string "FLY and flew to {STR_VAR_2}.$" - -QuestLog_Text_UsedSurf:: @ 841ABF9 - .string "{STR_VAR_1} used the Hidden Move\n" - .string "SURF and rode the waves.$" - -QuestLog_Text_UsedStrength:: @ 841AC2A - .string "{STR_VAR_1} used the Hidden Move\n" - .string "STRENGTH here.$" - -QuestLog_Text_UsedFlash:: @ 841AC51 - .string "{STR_VAR_1} used the Hidden Move\n" - .string "FLASH and illuminated a pitch-black\n" - .string "cave.$" - -QuestLog_Text_UsedRockSmash:: @ 841AC93 - .string "{STR_VAR_1} used the Hidden Move\n" - .string "ROCK SMASH here.$" - -QuestLog_Text_UsedWaterfall:: @ 841ACBC - .string "{STR_VAR_1} used the Hidden Move\n" - .string "WATERFALL to scale a raging torrent.$" - -@ Unused -QuestLog_Text_UsedDive:: @ 841ACF9 - .string "{STR_VAR_1}は　ふかい　ところを　めざし\n" - .string "ひでんわざ\n" - .string "ダイビングを　つかった！$" - -QuestLog_Text_UsedDigInLocation:: @ 841AD1D - .string "{STR_VAR_1} used DIG to escape from\n" - .string "{STR_VAR_2}.$" - -QuestLog_Text_UsedSweetScent:: @ 841AD3C - .string "{STR_VAR_1} used SWEET SCENT to attract\n" - .string "wild POKéMON.$" - -QuestLog_Text_UsedTeleportToLocation:: @ 841AD69 - .string "{STR_VAR_1} used TELEPORT, transporting\n" - .string "the party to {STR_VAR_2}'s\n" - .string "{STR_VAR_3}.$" - -QuestLog_Text_LeftTownsLocationForNextDestination:: @ 841AD9E - .string "{PLAYER} left {STR_VAR_1}'s\n" - .string "{STR_VAR_2} for the next\n" - .string "destination.$" - -QuestLog_Text_PlayedGamesAtGameCorner:: @ 841ADC8 - .string "Played a lot of games at the ROCKET\n" - .string "GAME CORNER in {STR_VAR_1}.$" - -QuestLog_Text_RestedAtHome:: @ 841ADFF - .string "{PLAYER} rested comfortably at home.$" - -QuestLog_Text_LeftOaksLab:: @ 841AE1E - .string "{PLAYER} left PROF. OAK's POKéMON\n" - .string "RESEARCH LAB.$" - -QuestLog_Text_GymWasFullOfToughTrainers:: @ 841AE48 - .string "The GYM in {STR_VAR_1} was full of\n" - .string "tough TRAINERS…\n" - .string "Preparations had to be made.$" - -QuestLog_Text_DepartedGym:: @ 841AE8F - .string "Departed the GYM in {STR_VAR_1}.$" - -QuestLog_Text_HadGreatTimeInSafariZone:: @ 841AEA7 - .string "{PLAYER} had a great time with POKéMON\n" - .string "in the SAFARI ZONE.$" - -QuestLog_Text_ManagedToGetOutOfLocation:: @ 841AEDC - .string "Managed to get out of {STR_VAR_2}\n" - .string "after wandering about.$" - -QuestLog_Text_TookOnGymLeadersMonWithMonAndWon:: @ 841AF0C - .string "Took on {DYNAMIC 0x00} GYM LEADER\n" - .string "{DYNAMIC 0x01}'s {DYNAMIC 0x02} with {DYNAMIC 0x03}\n" - .string "and won {DYNAMIC 0x04}!$" - -QuestLog_Text_TookOnEliteFoursMonWithMonAndWon:: @ 841AF3E - .string "Took on ELITE FOUR {DYNAMIC 0x00}'s\n" - .string "{DYNAMIC 0x01} with {DYNAMIC 0x02} and\n" - .string "won {DYNAMIC 0x03}!$" - -QuestLog_Text_TookOnTrainersMonWithMonAndWon:: @ 841AF6D - .string "In {DYNAMIC 0x00}, took on\n" - .string "{DYNAMIC 0x01}'s {DYNAMIC 0x02} with {DYNAMIC 0x03}\n" - .string "and won {DYNAMIC 0x04}!$" - -QuestLog_Text_Coolly:: @ 841AF98 - .string "coolly$" - -QuestLog_Text_Barely:: @ 841AF9F - .string "barely$" - -QuestLog_Text_UsedEscapeRope:: @ 841AFA6 - .string "{PLAYER} used an ESCAPE ROPE to get\n" - .string "out from {STR_VAR_2}.$" - -QuestLog_Text_Draw:: @ 841AFD1 - .string "draw$" - -QuestLog_Text_DepartedTheLocationForNextDestination:: @ 841AFD6 - .string "Departed from the {STR_VAR_2}\n" - .string "for the next destination.$" - -QuestLog_Text_DepartedFromLocationToNextDestination:: @ 841B005 - .string "{PLAYER} departed from\n" - .string "{STR_VAR_2} and made way\n" - .string "to the next destination.$" - -QuestLog_Text_ObtainedItemInLocation:: @ 841B03F - .string "Here in {STR_VAR_1}, {PLAYER}\n" - .string "obtained the item {STR_VAR_2}.$" - -QuestLog_Text_ArrivedInLocation:: @ 841B064 - .string "Arrived in {STR_VAR_1}.$" - -QuestLog_Text_SavedGameAtLocation:: @ 841B073 - .string "And {PLAYER} saved the game at this\n" - .string "location: {STR_VAR_1}.$" - -QuestLog_Text_Home:: @ 841B09F - .string "HOME$" - -QuestLog_Text_OakResearchLab:: @ 841B0A4 - .string "OAK RESEARCH LAB$" - -QuestLog_Text_Gym:: @ 841B0B5 - .string "GYM$" - -QuestLog_Text_PokemonLeagueGate:: @ 841B0B9 - .string "POKéMON LEAGUE GATE$" - -QuestLog_Text_ViridianForest:: @ 841B0CD - .string "VIRIDIAN FOREST$" - -QuestLog_Text_PewterMuseumOfScience:: @ 841B0DD - .string "PEWTER MUSEUM OF SCIENCE$" - -QuestLog_Text_MtMoon:: @ 841B0F6 - .string "MT. MOON$" - -QuestLog_Text_BikeShop:: @ 841B0FF - .string "BIKE SHOP$" - -QuestLog_Text_BillsHouse:: @ 841B109 - .string "BILL'S HOUSE$" - -QuestLog_Text_DayCare:: @ 841B116 - .string "DAY CARE$" - -QuestLog_Text_UndergroundPath:: @ 841B11F - .string "UNDERGROUND PATH$" - -QuestLog_Text_PokemonFanClub:: @ 841B130 - .string "POKéMON FAN CLUB$" - -QuestLog_Text_SSAnne:: @ 841B141 - .string "S.S. ANNE$" - -QuestLog_Text_DiglettsCave:: @ 841B14B - .string "DIGLETT'S CAVE$" - -QuestLog_Text_RockTunnel:: @ 841B15A - .string "ROCK TUNNEL$" - -QuestLog_Text_PowerPlant:: @ 841B166 - .string "POWER PLANT$" - -QuestLog_Text_PokemonTower:: @ 841B172 - .string "POKéMON TOWER$" - -QuestLog_Text_VolunteerHouse:: @ 841B180 - .string "VOLUNTEER HOUSE$" - -QuestLog_Text_NameRatersHouse:: @ 841B190 - .string "NAME RATER'S HOUSE$" - -QuestLog_Text_CeladonDeptStore:: @ 841B1A3 - .string "CELADON DEPT. STORE$" - -QuestLog_Text_CeladonMansion:: @ 841B1B7 - .string "CELADON MANSION$" - -QuestLog_Text_RocketGameCorner:: @ 841B1C7 - .string "ROCKET GAME CORNER$" - -QuestLog_Text_Restaurant:: @ 841B1DA - .string "RESTAURANT$" - -QuestLog_Text_RocketHideout:: @ 841B1E5 - .string "ROCKET HIDEOUT$" - -QuestLog_Text_SafariZone:: @ 841B1F4 - .string "SAFARI ZONE$" - -QuestLog_Text_WardensHome:: @ 841B200 - .string "WARDEN'S HOME$" - -QuestLog_Text_FightingDojo:: @ 841B20E - .string "FIGHTING DOJO$" - -QuestLog_Text_SilphCo:: @ 841B21C - .string "SILPH CO.$" - -QuestLog_Text_SeafoamIslands:: @ 841B226 - .string "SEAFOAM ISLANDS$" - -QuestLog_Text_PokemonMansion:: @ 841B236 - .string "POKéMON MANSION$" - -QuestLog_Text_PokemonResearchLab:: @ 841B246 - .string "POKéMON RESEARCH LAB$" - -QuestLog_Text_VictoryRoad:: @ 841B25B - .string "VICTORY ROAD$" - -QuestLog_Text_PokemonLeague:: @ 841B268 - .string "POKéMON LEAGUE$" - -QuestLog_Text_CeruleanCave:: @ 841B277 - .string "CERULEAN CAVE$" diff --git a/data/text/teachy_tv.inc b/data/text/teachy_tv.inc deleted file mode 100644 index ae0731142..000000000 --- a/data/text/teachy_tv.inc +++ /dev/null @@ -1,227 +0,0 @@ -gTeachyTvString_TeachBattle:: @ 841B7A4 - .string "Teach me how to battle.$" - -gTeachyTvString_StatusProblems:: @ 841B7BC - .string "What are status problems?$" - -gTeachyTvString_TypeMatchups:: @ 841B7D6 - .string "What are type matchups?$" - -gTeachyTvString_CatchPkmn:: @ 841B7EE - .string "I want to catch POKéMON.$" - -gTeachyTvString_AboutTMs:: @ 841B807 - .string "Teach me about TMs.$" - -gTeachyTvString_RegisterItem:: @ 841B81B - .string "How do I register an item?$" - -gTeachyTvString_Cancel:: @ 841B836 - .string "CANCEL$" - -gTeachyTvText_PokedudeSaysHello:: @ 841B83D - .string "Hey, all you TRAINERS out there!\n" - .string "HELLO, TRAINERS!\p" - .string "……… ……… ………\p" - .string "Come on, let me hear you!\n" - .string "HELLO, TRAINERS!\l" - .string "It's me, the POKé DUDE!\p" - .string "$" - -gTeachyTvText_BattleScript1:: @ 841B8BF - .string "Today, the POKé DUDE's here to\n" - .string "tell you about how you can battle\l" - .string "POKéMON!\p" - .string "Say you're out for a stroll when,\n" - .string "suddenly, a wild POKéMON appears!\p" - .string "It's up to you to smartly use your\n" - .string "POKéMON and their moves to reduce\l" - .string "the opponent's HP to nothing, and\l" - .string "claim victory!\p" - .string "I'll show you how to do that in\n" - .string "person and for sure!\p" - .string "All righty, here goes!\p" - .string "Keep your eyes glued to the super\n" - .string "POKé DUDE SHOW!$" - -gTeachyTvText_BattleScript2:: @ 841BA41 - .string "Well, did you get that?\p" - .string "Even if your own POKéMON's HP\n" - .string "falls to zero, and it becomes\l" - .string "unable to battle, not to worry!\p" - .string "Just take it to any POKéMON\n" - .string "CENTER and heal it!\p" - .string "All righty, be seeing you!\p" - .string "Remember, TRAINERS, a good deed\n" - .string "a day brings happiness to stay!$" - -gTeachyTvText_StatusScript1:: @ 841BB40 - .string "Today, the POKé DUDE's here to\n" - .string "tell you about status problems!\p" - .string "Status problems include poisoning,\n" - .string "paralysis, sleep, burn…\p" - .string "There are a couple others, but\n" - .string "they really are trouble.\p" - .string "Get any one, and your POKéMON\n" - .string "may become useless in battle.\p" - .string "You know, it hurts the POKé DUDE\n" - .string "to see a POKéMON suffer…\p" - .string "So, what should you do if your\n" - .string "POKéMON gets a status problem?\p" - .string "Well, you've got me to show you!\p" - .string "All righty, here goes!\p" - .string "Keep your eyes glued to the super\n" - .string "POKé DUDE SHOW!$" - -gTeachyTvText_StatusScript2:: @ 841BD10 - .string "Poisoning or paralysis don't go\n" - .string "away after a battle.\p" - .string "If a POKéMON is poisoned, it loses\n" - .string "HP even while you're walking.\p" - .string "You should heal POKéMON of these\n" - .string "kinds of problems right away.\p" - .string "Use an item, or try to get to a\n" - .string "POKéMON CENTER for healing.\p" - .string "That wasn't hard, was it?\n" - .string "All righty, be seeing you!\p" - .string "Remember, TRAINERS, a good deed\n" - .string "a day brings happiness to stay!$" - -gTeachyTvText_MatchupsScript1:: @ 841BE76 - .string "Does everyone know about type\n" - .string "matchups?\p" - .string "POKéMON and their moves all\n" - .string "belong to certain types.\p" - .string "For example, there are such types\n" - .string "as GRASS and WATER.\p" - .string "You need to consider the type of\n" - .string "the move used to attack…\p" - .string "And, the type of the POKéMON that\n" - .string "is hit by that attack.\p" - .string "Depending on how those two types\n" - .string "match up, the damage can change.\p" - .string "You see, it depends on whether\n" - .string "the type matchup is good or bad.\p" - .string "If you don't know how matchups\n" - .string "work, battles will be tough.\p" - .string "So, let me demonstrate exactly\n" - .string "what I mean.\p" - .string "All righty, here goes!\p" - .string "Keep your eyes glued to the super\n" - .string "POKé DUDE SHOW!$" - -gTeachyTvText_MatchupsScript2:: @ 841C0AF - .string "Is it possible to launch an attack\n" - .string "that will inflict heavy damage?\p" - .string "Does the opposing POKéMON pose\n" - .string "a threat to your POKéMON?\p" - .string "Is there any chance that it may\n" - .string "have disastrously tough moves?\p" - .string "Watch the type matchups to gain\n" - .string "the upper hand!\p" - .string "All righty, be seeing you!\p" - .string "Oh, for the COOL-type POKé DUDE,\n" - .string "AWESOME-type kids like you match\l" - .string "up perfectly!\p" - .string "Remember, a good deed a day\n" - .string "brings happiness to stay!$" - -gTeachyTvText_CatchingScript1:: @ 841C23B - .string "Today, the POKé DUDE's going to\n" - .string "show you how to catch POKéMON!\p" - .string "Just imagine… A groovy POKéMON\n" - .string "suddenly appearing in the wild!\p" - .string "Oh, you want it!\n" - .string "You just can't help it!\p" - .string "Oh, you have to catch it!\n" - .string "You gotta have it!\p" - .string "Let me show you how you can make\n" - .string "it happen!\p" - .string "All righty, here goes!\p" - .string "Keep your eyes glued to the super\n" - .string "POKé DUDE SHOW!$" - -gTeachyTvText_CatchingScript2:: @ 841C384 - .string "If your first POKé BALL fails to\n" - .string "catch the POKéMON, don't give up!\p" - .string "Keep throwing POKé BALLS…\n" - .string "It's bound to work sometime!\p" - .string "All righty, be seeing you!\p" - .string "Remember, TRAINERS, a good deed\n" - .string "a day brings happiness to stay!$" - -gTeachyTvText_TMsScript1:: @ 841C459 - .string "Hey, everyone!\n" - .string "Do you all have TMs?\p" - .string "A TM, Technical Machine, is an\n" - .string "amazingly great item!\p" - .string "It teaches POKéMON a move that\n" - .string "it may not learn when leveling up!\p" - .string "Isn't that just great? What a\n" - .string "convenient world we live in!\p" - .string "Open the TM CASE and check out\n" - .string "the TMs you have.\p" - .string "You can check them out in detail,\n" - .string "too.$" - -gPokedudeText_TMTypes:: @ 841C587 - .string "POKé DUDE: NORMAL, WATER, GRASS…\n" - .string "TMs also come in types.\p" - .string "Check the type and teach it to\n" - .string "a POKéMON that matches up well.\p" - .string "For example, WATER PULSE is\n" - .string "suitable for WATER-type POKéMON.\p" - .string "BULLET SEED is a move that most\n" - .string "GRASS-type POKéMON can learn.\p" - .string "There's one other thing!$" - -gPokedudeText_ReadTMDescription:: @ 841C693 - .string "Don't just look at the type, read\n" - .string "the description, too.\p" - .string "It will contain hints about what\n" - .string "POKéMON might learn the move.\p" - .string "For example, take a move like\n" - .string "FOCUS PUNCH.\p" - .string "It doesn't sound like anything a\n" - .string "bird or fish POKéMON can learn.\p" - .string "So, try using it on POKéMON with\n" - .string "arms that can throw punches!$" - -gTeachyTvText_TMsScript2:: @ 841C7B4 - .string "Wow, I talked a lot today!\n" - .string "All righty, be seeing you!\p" - .string "Remember, TRAINERS, a good deed\n" - .string "a day brings happiness to stay!$" - -gTeachyTvText_RegisterScript1:: @ 841C82A - .string "A TRAINER's BAG has a bunch of\n" - .string "nifty, convenient features!\p" - .string "Take stuff in the KEY ITEMS\n" - .string "POCKET, for instance.\p" - .string "You can use a key item without\n" - .string "opening the BAG every time.\p" - .string "For example, let's pretend I have\n" - .string "a TEACHY TV in my BAG.\p" - .string "I can register it for instant use,\n" - .string "and I'll show you how!\p" - .string "All righty, here goes!\p" - .string "Keep your eyes glued to the sorta\n" - .string "super POKé DUDE SHOW!$" - -gTeachyTvText_RegisterScript2:: @ 841C994 - .string "And now, your TEACHY TV is\n" - .string "registered.\p" - .string "How do you use it?\n" - .string "Well, here's how it works.\p" - .string "Once an item in the KEY ITEMS\n" - .string "POKCET is registered, you can use\l" - .string "it by pressing SELECT.\p" - .string "So, you've given yourself\n" - .string "one-touch access to TEACHY TV.\p" - .string "All it takes for you to see me is\n" - .string "pressing one button!\p" - .string "That kind of attention is a little\n" - .string "embarrassing!\p" - .string "All righty, be seeing you!\p" - .string "Remember, TRAINERS, a good deed\n" - .string "a day brings happiness to stay!$" -- cgit v1.2.3 From 3581ce9ba202377282ee58ffe14037088634b954 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 6 Mar 2020 10:57:42 -0500 Subject: Decomp and doc clear_save_data_screen --- data/clear_save_data_screen.s | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'data') diff --git a/data/clear_save_data_screen.s b/data/clear_save_data_screen.s index 32a2d422a..7b0827b6c 100644 --- a/data/clear_save_data_screen.s +++ b/data/clear_save_data_screen.s @@ -5,26 +5,3 @@ .include "constants/constants.inc" .section .rodata .align 2 - -gUnknown_841EE64:: @ 841EE64 - .4byte 0x000001f0 - @ { - @ .bg = 0, - @ .charBaseIndex = 0, - @ .mapBaseIndex = 31, - @ .screenSize = 0, - @ .paletteMode = 0, - @ .priority = 0, - @ .baseTile = 0x0000 - @ } - -gUnknown_841EE68:: @ 841EE68 - .byte 0, 3, 5, 6, 4, 15 - .2byte 0x000a - .byte 0, 3, 15, 23, 4, 15 - .2byte 0x0022 - .byte 255, 0, 0, 0, 0, 0 - .2byte 0x0000 - -gUnknown_841EE80:: @ 841EE80 - .byte 0x01, 0x02, 0x03 -- cgit v1.2.3 From 3b88ba66376f13deb5338cd61b608adc901cc27e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 6 Mar 2020 12:17:56 -0500 Subject: Remove data/clear_save_data_screen.s --- data/clear_save_data_screen.s | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 data/clear_save_data_screen.s (limited to 'data') diff --git a/data/clear_save_data_screen.s b/data/clear_save_data_screen.s deleted file mode 100644 index 7b0827b6c..000000000 --- a/data/clear_save_data_screen.s +++ /dev/null @@ -1,7 +0,0 @@ -#include "constants/region_map.h" -#include "constants/flags.h" -#include "constants/moves.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - .section .rodata - .align 2 -- cgit v1.2.3 From ecf7cf9835ca2f50b4c483c9ee4156d2057e5406 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 6 Mar 2020 17:07:36 -0500 Subject: through sub_80FFF80 --- data/easy_chat_2.s | 74 ------------------------------------------------------ 1 file changed, 74 deletions(-) (limited to 'data') diff --git a/data/easy_chat_2.s b/data/easy_chat_2.s index 79be01714..4cf0bcfb3 100644 --- a/data/easy_chat_2.s +++ b/data/easy_chat_2.s @@ -7,80 +7,6 @@ .section .rodata .align 2 -gUnknown_843F29C:: @ 843F29C - .2byte 0x143a, 0x1817, 0x100b, 0x200f - -gUnknown_843F2A4:: @ 843F2A4 - .2byte 0x0209, 0x140b, 0x1030, 0x102a - -gUnknown_843F2AC:: @ 843F2AC - .byte 0, 2, 2, 0 - .4byte gUnknown_8418A2B - .4byte gUnknown_84186D1 - .4byte gUnknown_84186EF - .4byte gUnknown_841880E - .4byte gUnknown_8418902 - .byte 1, 2, 3, 1 - .4byte gUnknown_8418A33 - .4byte gUnknown_8418706 - .4byte gUnknown_8418725 - .4byte gUnknown_841881B - .4byte gUnknown_8418902 - .byte 2, 2, 3, 1 - .4byte gUnknown_8418A4A - .4byte gUnknown_8418706 - .4byte gUnknown_8418725 - .4byte gUnknown_841883E - .4byte gUnknown_8418902 - .byte 3, 2, 3, 1 - .4byte gUnknown_8418A61 - .4byte gUnknown_8418706 - .4byte gUnknown_8418725 - .4byte gUnknown_841885F - .4byte gUnknown_8418902 - .byte 4, 2, 5, 2 - .4byte NULL - .4byte gUnknown_8418780 - .4byte gUnknown_841879E - .4byte gUnknown_841888C - .4byte gUnknown_8418902 - .byte 5, 2, 2, 0 - .4byte NULL - .4byte gUnknown_8418780 - .4byte gUnknown_841879E - .4byte NULL - .4byte NULL - .byte 6, 2, 3, 1 - .4byte gUnknown_8418A77 - .4byte gUnknown_84187B2 - .4byte gUnknown_84187D1 - .4byte gUnknown_84188AC - .4byte gUnknown_8418902 - .byte 7, 2, 3, 1 - .4byte gUnknown_8418AA1 - .4byte gUnknown_8418745 - .4byte gUnknown_8418763 - .4byte gUnknown_8418881 - .4byte gUnknown_8418902 - .byte 9, 2, 1, 3 - .4byte gUnknown_8418A87 - .4byte gUnknown_84188B9 - .4byte gUnknown_84188D6 - .4byte gUnknown_84188F0 - .4byte gUnknown_8418902 - .byte 14, 2, 2, 0 - .4byte gUnknown_8418AB2 - .4byte gUnknown_84186D1 - .4byte gUnknown_84187EE - .4byte gUnknown_8418881 - .4byte gUnknown_8418902 - -gUnknown_843F39C:: @ 843F39C data8 4x7 - .byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00 - .byte 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x00 - .byte 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13 - .byte 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a - gUnknown_843F3B8:: @ 843F3B8 gbapal .incbin "graphics/link_rfu/unk_843F3F8.gbapal" -- cgit v1.2.3 From 6ce70985ebcb78267290e35e65aadb6a433c1cba Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 7 Mar 2020 12:37:18 -0500 Subject: through sub_8100B70 --- data/easy_chat_2.s | 85 ------------------------------------------------------ 1 file changed, 85 deletions(-) (limited to 'data') diff --git a/data/easy_chat_2.s b/data/easy_chat_2.s index 4cf0bcfb3..04270adac 100644 --- a/data/easy_chat_2.s +++ b/data/easy_chat_2.s @@ -7,91 +7,6 @@ .section .rodata .align 2 -gUnknown_843F3B8:: @ 843F3B8 gbapal - .incbin "graphics/link_rfu/unk_843F3F8.gbapal" - -gUnknown_843F3D8:: @ 843F3D8 gbapal - .incbin "graphics/link_rfu/unk_8E9BD28.gbapal" - -gUnknown_843F3F8:: @ 843F3F8 4bpp - .incbin "graphics/link_rfu/unk_843F3F8.4bpp" - -gUnknown_843F418:: @ 843F418 4bpp - .incbin "graphics/link_rfu/unk_843F418.4bpp" - -gUnknown_843F518:: @ 843F518 4bpp - .incbin "graphics/link_rfu/unk_843F518.4bpp" - -gUnknown_843F618:: @ 843F618 gbapal - .incbin "graphics/link_rfu/unk_843F638.gbapal" - -gUnknown_843F638:: @ 843F638 4bpp.lz - .incbin "graphics/link_rfu/unk_843F638.4bpp.lz" - -gUnknown_843F76C:: @ 843F76C gbapal - .incbin "graphics/link_rfu/unk_843F76C.gbapal" - -gUnknown_843F78C:: @ 843F78C gbapal - .incbin "graphics/link_rfu/unk_843F78C.gbapal" - -gUnknown_843F7AC:: @ 843F7AC 4bpp.lz - .incbin "graphics/link_rfu/unk_843F7AC.4bpp.lz" - -gUnknown_843F874:: @ 843F874 gbapal - .2byte RGB(0, 0, 0) - .2byte RGB(0, 0, 0) - .2byte RGB(7, 25, 31) - .2byte RGB(21, 21, 29) - -gUnknown_843F87C:: @ 843F87C gbapal - .2byte RGB(0, 0, 0) - .2byte RGB(31, 31, 31) - .2byte RGB(12, 12, 12) - .2byte RGB(27, 26, 27) - .2byte RGB(8, 17, 9) - - .align 2 -gUnknown_843F888:: @ 843F888 data8 6x4 - .byte 0x03, 0x04, 0x18, 0x04 - .byte 0x01, 0x04, 0x1b, 0x04 - .byte 0x03, 0x00, 0x18, 0x0a - .byte 0x06, 0x06, 0x12, 0x04 - .byte 0x10, 0x04, 0x09, 0x02 - .byte 0x0e, 0x04, 0x12, 0x04 - -gUnknown_843F8A0:: @ 843F8A0 bg_template - .4byte 0x000001c0, 0x000011dd, 0x002021e2, 0x000031fb - -gUnknown_843F8B0:: @ 843F8B0 window_template - .align 2 - .byte 0x01, 0x07, 0x00, 0x10, 0x02, 0x0a - .2byte 0x0010 - @ {0x01, 0x07, 0x00, 0x10, 0x02, 0x0a, 0x0010} - .align 2 - .byte 0x00, 0x04, 0x0f, 0x16, 0x04, 0x0f - .2byte 0x000a - @ {0x00, 0x04, 0x0f, 0x16, 0x04, 0x0f, 0x000a} - .align 2 - .byte 0x02, 0x01, 0x00, 0x1c, 0x20, 0x03 - .2byte 0x0000 - @ {0x02, 0x01, 0x00, 0x1c, 0x20, 0x03, 0x0000} - .align 2 - .byte 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 - .2byte 0x0000 - @ {0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000} - -gUnknown_843F8D0:: @ 843F8D0 window_template - .align 2 - .byte 0x00, 0x16, 0x09, 0x05, 0x04, 0x0f - .2byte 0x0062 - @ {0x00, 0x16, 0x09, 0x05, 0x04, 0x0f, 0x0062} - -gUnknown_843F8D8:: @ 843F8D8 text - .string "{UNDERSCORE}$" - -gUnknown_843F8DB:: @ 843F8DB text - .string "{CLEAR 17}$" - .align 2 gUnknown_843F8E0:: @ 843F8E0 .4byte gUnknown_847A8D8 -- cgit v1.2.3 From ab1d075682a34164ed82810108f909e1f9b46390 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 7 Mar 2020 18:05:54 -0500 Subject: through sub_8101558 --- data/data_8479668.s | 6 +++++- data/easy_chat_2.s | 7 ------- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'data') diff --git a/data/data_8479668.s b/data/data_8479668.s index 0ddecfe58..50ce06127 100644 --- a/data/data_8479668.s +++ b/data/data_8479668.s @@ -13,7 +13,7 @@ .section .rodata - // berry_fix_program + // easy_chat_2 gUnknown_847A8D8:: .string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others$" @@ -27,6 +27,8 @@ gUnknown_847A913:: gUnknown_847A934:: .string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $" + // naming_screen + gUnknown_847A955:: .string "{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 26}.$" @@ -63,6 +65,8 @@ gUnknown_847AA8F:: gUnknown_847AAA8:: .string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 18}'{CLEAR 18} $" + // union_room_chat + gText_UnionRoomChatKeyboard_ABCDE:: .string "ABCDE$" diff --git a/data/easy_chat_2.s b/data/easy_chat_2.s index 04270adac..2eca1d8b0 100644 --- a/data/easy_chat_2.s +++ b/data/easy_chat_2.s @@ -7,13 +7,6 @@ .section .rodata .align 2 - .align 2 -gUnknown_843F8E0:: @ 843F8E0 - .4byte gUnknown_847A8D8 - .4byte gUnknown_847A8FA - .4byte gUnknown_847A913 - .4byte gUnknown_847A934 - gUnknown_843F8F0:: @ 843F8F0 sprite_sheet obj_tiles gUnknown_843F3F8, 0x0020, 0 obj_tiles gUnknown_843F418, 0x0100, 2 -- cgit v1.2.3 From 40e4ef8f77caf47932d3b2c75481be9680eeea17 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 7 Mar 2020 20:46:29 -0500 Subject: through sub_8101BA8 --- data/easy_chat_2.s | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'data') diff --git a/data/easy_chat_2.s b/data/easy_chat_2.s index 2eca1d8b0..8298f8cbb 100644 --- a/data/easy_chat_2.s +++ b/data/easy_chat_2.s @@ -7,34 +7,6 @@ .section .rodata .align 2 -gUnknown_843F8F0:: @ 843F8F0 sprite_sheet - obj_tiles gUnknown_843F3F8, 0x0020, 0 - obj_tiles gUnknown_843F418, 0x0100, 2 - obj_tiles gUnknown_843F518, 0x0100, 3 - null_obj_tiles - -gUnknown_843F910:: @ 843F910 sprite_palette - obj_pal gUnknown_843F3B8, 0 - obj_pal gUnknown_843F3D8, 1 - obj_pal gUnknown_8E99F24, 2 - obj_pal gUnknown_843F618, 3 - null_obj_pal - -gUnknown_843F938:: @ 843F938 sprite_sheet - obj_tiles gUnknown_843F638, 0x0800, 5 - obj_tiles gUnknown_8E9BD28, 0x1000, 1 - obj_tiles gUnknown_8E99F44, 0x0800, 6 - obj_tiles gUnknown_8E9A168, 0x1000, 4 - -gUnknown_843F958:: @ 843F958 data8 - .byte 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x00 - -gUnknown_843F960:: - .4byte 0x00000000, 0x00000c00 - -gUnknown_843F968:: @ 843F968 sprite_template - spr_template 0, 0, gUnknown_843F960, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8101B20 - gUnknown_843F980:: .4byte 0xc0004000, 0x00000400 -- cgit v1.2.3 From c81edda7956500731d66b55b5b3c98cada723347 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 7 Mar 2020 21:29:31 -0500 Subject: through sub_8101F80 --- data/easy_chat_2.s | 64 ------------------------------------------------------ 1 file changed, 64 deletions(-) (limited to 'data') diff --git a/data/easy_chat_2.s b/data/easy_chat_2.s index 8298f8cbb..854454238 100644 --- a/data/easy_chat_2.s +++ b/data/easy_chat_2.s @@ -7,70 +7,6 @@ .section .rodata .align 2 -gUnknown_843F980:: - .4byte 0xc0004000, 0x00000400 - -gUnknown_843F988:: - obj_image_anim_frame 0x0000, 0 - obj_image_anim_end - -gUnknown_843F990:: - obj_image_anim_frame 0x0020, 0 - obj_image_anim_end - -gUnknown_843F998:: - obj_image_anim_frame 0x0040, 0 - obj_image_anim_end - -gUnknown_843F9A0:: - obj_image_anim_frame 0x0060, 0 - obj_image_anim_end - -gUnknown_843F9A8:: - .4byte gUnknown_843F988 - .4byte gUnknown_843F990 - .4byte gUnknown_843F998 - .4byte gUnknown_843F9A0 - -gUnknown_843F9B8:: @ 843F9B8 sprite_template - spr_template 1, 1, gUnknown_843F980, gUnknown_843F9A8, NULL, gDummySpriteAffineAnimTable, sub_8101B20 - -gUnknown_843F9D0:: - .4byte 0xc0004000, 0x00000400 - -gUnknown_843F9D8:: - obj_image_anim_frame 0x0060, 0 - obj_image_anim_end - -gUnknown_843F9E0:: - obj_image_anim_frame 0x0040, 4 - obj_image_anim_frame 0x0020, 4 - obj_image_anim_end - -gUnknown_843F9EC:: - obj_image_anim_frame 0x0040, 4 - obj_image_anim_frame 0x0000, 4 - obj_image_anim_end - -gUnknown_843F9F8:: - obj_image_anim_frame 0x0040, 4 - obj_image_anim_frame 0x0060, 0 - obj_image_anim_end - -gUnknown_843FA04:: - obj_image_anim_frame 0x0040, 4 - obj_image_anim_end - -gUnknown_843FA0C:: - .4byte gUnknown_843F9D8 - .4byte gUnknown_843F9E0 - .4byte gUnknown_843F9EC - .4byte gUnknown_843F9F8 - .4byte gUnknown_843FA04 - -gUnknown_843FA20:: @ 843FA20 sprite_template - spr_template 4, 2, gUnknown_843F9D0, gUnknown_843FA0C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - gUnknown_843FA38:: .4byte 0xc0000000, 0x00000c00 -- cgit v1.2.3 From e1537a1d728a8e2d217d5224e3d813da6f5fa222 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 8 Mar 2020 09:49:07 -0400 Subject: easy_chat_3 finish decomp --- data/easy_chat_2.s | 38 -------------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 data/easy_chat_2.s (limited to 'data') diff --git a/data/easy_chat_2.s b/data/easy_chat_2.s deleted file mode 100644 index 854454238..000000000 --- a/data/easy_chat_2.s +++ /dev/null @@ -1,38 +0,0 @@ -#include "constants/region_map.h" -#include "constants/flags.h" -#include "constants/moves.h" -#define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10)) - .include "asm/macros.inc" - .include "constants/constants.inc" - .section .rodata - .align 2 - -gUnknown_843FA38:: - .4byte 0xc0000000, 0x00000c00 - -gUnknown_843FA40:: @ 843FA40 sprite_template - spr_template 6, 2, gUnknown_843FA38, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_843FA58:: - .4byte 0x40004000, 0x00000400 - -gUnknown_843FA60:: - .4byte 0x40000000, 0x00000400 - -gUnknown_843FA68:: - obj_image_anim_frame 0x0000, 0 - obj_image_anim_end - -gUnknown_843FA70:: - obj_image_anim_frame 0x0004, 0 - obj_image_anim_end - -gUnknown_843FA78:: - .4byte gUnknown_843FA68 - .4byte gUnknown_843FA70 - -gUnknown_843FA80:: @ 843FA80 sprite_template - spr_template 3, 2, gUnknown_843FA58, gUnknown_843FA78, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_843FA98:: @ 843FA98 sprite_template - spr_template 2, 2, gUnknown_843FA60, gUnknown_843FA78, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy -- cgit v1.2.3 From 5d7c0e9bb041ec4c7d8fd3c88c02ac1f25e200a7 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 8 Mar 2020 12:55:16 -0400 Subject: Remove duplicate decl; use EASY_CHAT_TYPE define in mystery_event_club.inc --- data/scripts/mystery_event_club.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index 8034ee0b1..5c4432714 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -100,7 +100,7 @@ EventScript_GaveSpecialProfile: @ 81BEF3F end EventScript_GiveProfile: @ 81BEF5A - setvar VAR_0x8004, 0 + setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE call Common_ShowEasyChatScreen lock faceplayer -- cgit v1.2.3 From 9f4f0df4d708f720990111034131de703ebfbb19 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 8 Mar 2020 18:38:30 -0400 Subject: fldeff_flash.c --- data/fldeff_flash.s | 74 ----------------------------------------------------- 1 file changed, 74 deletions(-) delete mode 100644 data/fldeff_flash.s (limited to 'data') diff --git a/data/fldeff_flash.s b/data/fldeff_flash.s deleted file mode 100644 index ddffff5c1..000000000 --- a/data/fldeff_flash.s +++ /dev/null @@ -1,74 +0,0 @@ -#include "constants/species.h" -#include "constants/items.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - .section .rodata - .align 2 - -gUnknown_83F5738:: @ 83F5738 - .byte 1, 4, 1, 0 - .4byte sub_80C9FD4 - .4byte sub_80CA160 - .byte 2, 4, 1, 0 - .4byte sub_80C9FD4 - .4byte sub_80CA160 - .byte 3, 4, 1, 0 - .4byte sub_80C9FD4 - .4byte sub_80CA160 - .byte 5, 4, 1, 0 - .4byte sub_80C9FD4 - .4byte sub_80CA160 - .byte 6, 4, 1, 0 - .4byte sub_80C9FD4 - .4byte sub_80CA160 - .byte 7, 4, 1, 0 - .4byte sub_80C9FD4 - .4byte sub_80CA160 - .byte 8, 4, 1, 0 - .4byte sub_80C9FD4 - .4byte sub_80CA160 - .byte 9, 4, 1, 0 - .4byte sub_80C9FD4 - .4byte sub_80CA160 - .byte 4, 1, 0, 1 - .4byte sub_80C9E1C - .4byte sub_80CA160 - .byte 4, 2, 0, 1 - .4byte sub_80C9E1C - .4byte sub_80CA160 - .byte 4, 3, 0, 1 - .4byte sub_80C9E1C - .4byte sub_80CA160 - .byte 4, 5, 0, 1 - .4byte sub_80C9E1C - .4byte sub_80CA160 - .byte 4, 6, 0, 1 - .4byte sub_80C9E1C - .4byte sub_80CA160 - .byte 4, 7, 0, 1 - .4byte sub_80C9E1C - .4byte sub_80CA160 - .byte 4, 8, 0, 1 - .4byte sub_80C9E1C - .4byte sub_80CA160 - .byte 4, 9, 0, 1 - .4byte sub_80C9E1C - .4byte sub_80CA160 - .byte 0, 0, 0, 0 - .4byte NULL - .4byte NULL - -gUnknown_83F5804:: @ 83F5804 - .incbin "graphics/field_effects/flash_white.gbapal" - -gUnknown_83F5824:: @ 83F5824 - .incbin "graphics/field_effects/flash_black.gbapal" - -gUnknown_83F5844:: @ 83F5844 - .incbin "graphics/field_effects/flash_gradient.gbapal" - -gUnknown_83F5864:: @ 83F5864 - .incbin "graphics/field_effects/flash_effect_map.bin.lz" - -gUnknown_83F5A44:: @ 83F5A44 - .incbin "graphics/field_effects/flash_effect_tiles.4bpp.lz" -- cgit v1.2.3 From 0fdffabbc8682c347694aa06f9fb7a7a8aad4e8e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 9 Mar 2020 14:28:13 -0400 Subject: through pokemon_store --- data/naming_screen.s | 165 +-------------------------------------------------- 1 file changed, 3 insertions(+), 162 deletions(-) (limited to 'data') diff --git a/data/naming_screen.s b/data/naming_screen.s index b7d348165..e06159b00 100644 --- a/data/naming_screen.s +++ b/data/naming_screen.s @@ -6,166 +6,6 @@ .section .rodata .align 2 -gUnknown_83E1800:: @ 83E1800 - .incbin "graphics/interface/naming_screen_83E1800.4bpp" - -gUnknown_83E18C0:: @ 83E18C0 - .incbin "graphics/interface/naming_screen_83E18C0.4bpp" - -gUnknown_83E1980:: @ 83E1980 - .incbin "graphics/interface/naming_screen_83E1980.4bpp" - -gUnknown_83E2280:: @ 83E2280 - .4byte Text_MonSentToBoxInSomeonesPC - .4byte Text_MonSentToBoxInBillsPC - .4byte Text_MonSentToBoxSomeonesBoxFull - .4byte Text_MonSentToBoxBillsBoxFull - -gUnknown_83E2290:: @ 83E2290 - .4byte 0x000001e0 - @ { - @ .bg = 0, - @ .charBaseIndex = 0, - @ .mapBaseIndex = 30, - @ .screenSize = 0, - @ .paletteMode = 0, - @ .priority = 0, - @ .baseTile = 0x0000 - @ } - .4byte 0x000011d9 - @ { - @ .bg = 1, - @ .charBaseIndex = 2, - @ .mapBaseIndex = 29, - @ .screenSize = 0, - @ .paletteMode = 0, - @ .priority = 1, - @ .baseTile = 0x0000 - @ } - .4byte 0x000021ca - @ { - @ .bg = 2, - @ .charBaseIndex = 2, - @ .mapBaseIndex = 28, - @ .screenSize = 0, - @ .paletteMode = 0, - @ .priority = 2, - @ .baseTile = 0x0000 - @ } - .4byte 0x000031ff - @ { - @ .bg = 3, - @ .charBaseIndex = 3, - @ .mapBaseIndex = 31, - @ .screenSize = 0, - @ .paletteMode = 0, - @ .priority = 3, - @ .baseTile = 0x0000 - @ } - -gUnknown_83E22A0:: @ 83E22A0 - .byte 1, 3, 10, 19, 8, 10 - .2byte 0x0030 - @ { - @ .bg = 1, - @ .tilemapLeft = 3, - @ .tilemapTop = 10, - @ .width = 19, - @ .height = 8, - @ .paletteNum = 10, - @ .baseBlock = 0x0030 - @ } - .byte 2, 3, 10, 19, 8, 10 - .2byte 0x00c8 - @ { - @ .bg = 2, - @ .tilemapLeft = 3, - @ .tilemapTop = 10, - @ .width = 19, - @ .height = 8, - @ .paletteNum = 10, - @ .baseBlock = 0x00c8 - @ } - .byte 3, 8, 6, 14, 2, 10 - .2byte 0x0030 - @ { - @ .bg = 3, - @ .tilemapLeft = 8, - @ .tilemapTop = 6, - @ .width = 14, - @ .height = 2, - @ .paletteNum = 10, - @ .baseBlock = 0x0030 - @ } - .byte 3, 9, 4, 16, 2, 10 - .2byte 0x004c - @ { - @ .bg = 3, - @ .tilemapLeft = 9, - @ .tilemapTop = 4, - @ .width = 16, - @ .height = 2, - @ .paletteNum = 10, - @ .baseBlock = 0x004c - @ } - .byte 0, 0, 0, 30, 2, 11 - .2byte 0x006c - @ { - @ .bg = 0, - @ .tilemapLeft = 0, - @ .tilemapTop = 0, - @ .width = 30, - @ .height = 2, - @ .paletteNum = 11, - @ .baseBlock = 0x006c - @ } - .byte 255, 0, 0, 0, 0, 0 - .2byte 0x0000 - @ { - @ .bg = 255, - @ .tilemapLeft = 0, - @ .tilemapTop = 0, - @ .width = 0, - @ .height = 0, - @ .paletteNum = 0, - @ .baseBlock = 0x0000 - @ } - -gUnknown_83E22D0:: @ 83E22D0 - .string "abcdef .", 8 - .string "ghijkl ,", 8 - .string "mnopqrs", 8 - .string "tuvwxyz", 8 - .string "ABCDEF .", 8 - .string "GHIJKL ,", 8 - .string "MNOPQRS", 8 - .string "TUVWXYZ", 8 - .string "01234", 8 - .string "56789", 8 - .string "!?♂♀/-", 8 - .string "…“”‘'", 8 - -gUnknown_83E2330:: @ 83E2330 - .byte 0x08, 0x08, 0x06 - -gUnknown_83E2333:: @ 83E2333 - .byte 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x7b, 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x7b, 0x00, 0x16, 0x2c, 0x42, 0x58, 0x6e, 0x00, 0x00 - -gUnknown_83E234B:: @ 83E234B - .byte 0x00, 0x02, 0x01 - -gUnknown_83E234E:: @ 83E234E - .byte 0x01, 0x00, 0x02 - -gUnknown_83E2351:: @ 83E2351 - .byte 0x02, 0x01, 0x00 - -gUnknown_83E2354:: @ 83E2354 - .4byte sub_809E384 - .4byte sub_809E3AC - .4byte sub_809E440 - .4byte sub_809E4D4 - gUnknown_83E2364:: @ 83E2364 .2byte 0x0000, 0xfffc, 0xfffe, 0xffff @@ -173,8 +13,9 @@ gUnknown_83E236C:: @ 83E236C .2byte 0x0002, 0x0003, 0x0002, 0x0001 gUnknown_83E2374:: @ 83E2374 - .byte 0x01, 0x02, 0x03, 0x00 + .byte 0x01, 0x02, 0x03 + .align 2 gUnknown_83E2378:: @ 83E2378 .4byte sub_809EC7C .4byte sub_809ECD0 @@ -293,7 +134,7 @@ gUnknown_83E2480:: @ 83E2480 .align 2 .4byte gUnknown_8418E69 -gUnknown_83E248C:: @ 83E248C +sNamingScreenTemplates:: @ 83E248C .4byte gUnknown_83E245C .4byte gUnknown_83E2468 .4byte gUnknown_83E2474 -- cgit v1.2.3 From 1689cb55a7601a893912f171ff44166b33f97af8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 9 Mar 2020 16:58:40 -0400 Subject: through sub_809EC54 --- data/naming_screen.s | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'data') diff --git a/data/naming_screen.s b/data/naming_screen.s index e06159b00..366638746 100644 --- a/data/naming_screen.s +++ b/data/naming_screen.s @@ -6,22 +6,6 @@ .section .rodata .align 2 -gUnknown_83E2364:: @ 83E2364 - .2byte 0x0000, 0xfffc, 0xfffe, 0xffff - -gUnknown_83E236C:: @ 83E236C - .2byte 0x0002, 0x0003, 0x0002, 0x0001 - -gUnknown_83E2374:: @ 83E2374 - .byte 0x01, 0x02, 0x03 - - .align 2 -gUnknown_83E2378:: @ 83E2378 - .4byte sub_809EC7C - .4byte sub_809ECD0 - .4byte sub_809ECD4 - .4byte sub_809ED48 - gUnknown_83E2388:: @ 83E2388 .2byte 0x0001, 0x0003, 0x0002 -- cgit v1.2.3 From 98d63a5268258a7f83ee776300dd4a664ad45f59 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 10 Mar 2020 09:55:29 -0400 Subject: through NamingScreen_CreateRivalIcon --- data/naming_screen.s | 45 ++++++++------------------------------------- 1 file changed, 8 insertions(+), 37 deletions(-) (limited to 'data') diff --git a/data/naming_screen.s b/data/naming_screen.s index 366638746..4f89d013f 100644 --- a/data/naming_screen.s +++ b/data/naming_screen.s @@ -6,35 +6,6 @@ .section .rodata .align 2 -gUnknown_83E2388:: @ 83E2388 - .2byte 0x0001, 0x0003, 0x0002 - -gUnknown_83E238E:: @ 83E238E - .2byte 0x0004, 0x0006, 0x0005 - -gUnknown_83E2394:: @ 83E2394 - .4byte nullsub_54 - .4byte sub_809EF54 - .4byte sub_809EFB0 - .4byte sub_809EFF0 - .4byte sub_809F04C - -gUnknown_83E23A8:: @ 83E23A8 - obj_image_anim_frame 0, 10 - obj_image_anim_frame 24, 10 - obj_image_anim_frame 0, 10 - obj_image_anim_frame 32, 10 - obj_image_anim_jump 0 - -gUnknown_83E23BC:: @ 83E23BC - .4byte gUnknown_83E23A8 - -gUnknown_83E23C0:: @ 83E23C0 - obj_tiles gUnknown_83E1980, 0x0900, 255 - -gUnknown_83E23C8:: @ 83E23C8 - obj_pal gUnknown_8E98004, 255 - gUnknown_83E23D0:: @ 83E23D0 .4byte sub_809F11C .4byte KeyboardKeyHandler_Page @@ -119,11 +90,11 @@ gUnknown_83E2480:: @ 83E2480 .4byte gUnknown_8418E69 sNamingScreenTemplates:: @ 83E248C - .4byte gUnknown_83E245C - .4byte gUnknown_83E2468 - .4byte gUnknown_83E2474 - .4byte gUnknown_83E2474 - .4byte gUnknown_83E2480 + .4byte gUnknown_83E245C @ NAMING_SCREEN_PLAYER + .4byte gUnknown_83E2468 @ NAMING_SCREEN_BOX + .4byte gUnknown_83E2474 @ NAMING_SCREEN_CAUGHT_MON + .4byte gUnknown_83E2474 @ NAMING_SCREEN_NAME_RATER + .4byte gUnknown_83E2480 @ NAMING_SCREEN_RIVAL gUnknown_83E24A0:: @ 83E24A0 .4byte 0x00000000, 0x00000000 @@ -216,7 +187,7 @@ gUnknown_83E2570:: @ 83E2570 .4byte gUnknown_83E2558 gUnknown_83E2574:: @ 83E2574 - spr_template 2, 4, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, sub_809EC54 + spr_template 2, 4, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, SpriteCB_PageSwap gUnknown_83E258C:: @ 83E258C spr_template 3, 1, gUnknown_83E24B0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy @@ -233,10 +204,10 @@ gUnknown_83E25D4:: @ 83E25D4 gUnknown_83E25EC:: @ 83E25EC spr_template 7, 5, gUnknown_83E24A8, gUnknown_83E2568, NULL, gDummySpriteAffineAnimTable, sub_809E700 -gUnknown_83E2604:: @ 83E2604 +sSpriteTemplate_InputArrow:: @ 83E2604 spr_template 10, 3, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, sub_809E7F0 -gUnknown_83E261C:: @ 83E261C +sSpriteTemplate_Underscore:: @ 83E261C spr_template 11, 3, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, sub_809E83C gUnknown_83E2634:: @ 83E2634 -- cgit v1.2.3 From 9aa9c22a7f73afa710c26144a0a4da50b7cdadf9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 10 Mar 2020 11:32:18 -0400 Subject: Finish naming_screen --- data/data_8479668.s | 24 ++--- data/naming_screen.s | 254 --------------------------------------------------- 2 files changed, 12 insertions(+), 266 deletions(-) delete mode 100644 data/naming_screen.s (limited to 'data') diff --git a/data/data_8479668.s b/data/data_8479668.s index 50ce06127..695d98def 100644 --- a/data/data_8479668.s +++ b/data/data_8479668.s @@ -29,40 +29,40 @@ gUnknown_847A934:: // naming_screen -gUnknown_847A955:: +gText_NamingScreenKeyboard_abcdef:: .string "{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 26}.$" -gUnknown_847A976:: +gText_NamingScreenKeyboard_ghijkl:: .string "{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 6}k{CLEAR 6}l{CLEAR 7} {CLEAR 26},$" -gUnknown_847A997:: +gText_NamingScreenKeyboard_mnopqrs:: .string "{CLEAR 11}m{CLEAR 6}n{CLEAR 7}o{CLEAR 26}p{CLEAR 6}q{CLEAR 7}r{CLEAR 6}s{CLEAR 27} $" -gUnknown_847A9B8:: +gText_NamingScreenKeyboard_tuvwxyz:: .string "{CLEAR 12}t{CLEAR 6}u{CLEAR 6}v{CLEAR 26}w{CLEAR 6}x{CLEAR 6}y{CLEAR 6}z{CLEAR 26} $" -gUnknown_847A9D9:: +gText_NamingScreenKeyboard_ABCDEF:: .string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 26}.$" -gUnknown_847A9FA:: +gText_NamingScreenKeyboard_GHIJKL:: .string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 26},$" -gUnknown_847AA1B:: +gText_NamingScreenKeyboard_MNOPQRS:: .string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $" -gUnknown_847AA3C:: +gText_NamingScreenKeyboard_TUVWXYZ:: .string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $" -gUnknown_847AA5D:: +gText_NamingScreenKeyboard_01234:: .string "{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} $" -gUnknown_847AA76:: +gText_NamingScreenKeyboard_56789:: .string "{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} $" -gUnknown_847AA8F:: +gText_NamingScreenKeyboard_Symbols1:: .string "{CLEAR 11}!{CLEAR 16}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 16}-$" -gUnknown_847AAA8:: +gText_NamingScreenKeyboard_Symbols2:: .string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 18}'{CLEAR 18} $" // union_room_chat diff --git a/data/naming_screen.s b/data/naming_screen.s deleted file mode 100644 index 4f89d013f..000000000 --- a/data/naming_screen.s +++ /dev/null @@ -1,254 +0,0 @@ -#include "constants/maps.h" -#include "constants/species.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnknown_83E23D0:: @ 83E23D0 - .4byte sub_809F11C - .4byte KeyboardKeyHandler_Page - .4byte KeyboardKeyHandler_Backspace - .4byte KeyboardKeyHandler_OK - -gUnknown_83E23E0:: @ 83E23E0 - .4byte InputState_Disabled - .4byte InputState_Enabled - -gUnknown_83E23E8:: @ 83E23E8 - .2byte 0x0000, 0x0000, 0x0000, 0xffff, 0x0001 - -gUnknown_83E23F2:: @ 83E23F2 - .2byte 0x0000, 0xffff, 0x0001, 0x0000, 0x0000 - -gUnknown_83E23FC:: @ 83E23FC - .2byte 0x0000, 0x0001, 0x0001, 0x0002 - -gUnknown_83E2404:: @ 83E2404 - .2byte 0x0000, 0x0000, 0x0003, 0x0000 - -gUnknown_83E240C:: @ 83E240C - .4byte sub_809F49C - .4byte sub_809F49C - .4byte sub_809F4F0 - .4byte sub_809F4F0 - .4byte sub_809F49C - -gUnknown_83E2420:: @ 83E2420 - .4byte nullsub_55 - .4byte sub_809F5C4 - -gUnknown_83E2428:: @ 83E2428 - .byte 0x00, 0x09, 0x08, 0x00 - .byte 0x05, 0x04, 0x00, 0x00 - -gUnknown_83E2430:: @ 83E2430 - .byte 0x0d, 0x01, 0x02, 0x00 - -gUnknown_83E2434:: @ 83E2434 - .byte 0x0e, 0x01, 0x02, 0x00 - -gUnknown_83E2438:: @ 83E2438 - .byte 0x0f, 0x01, 0x02, 0x00 - -gUnknown_83E243C:: @ 83E243C - .byte 0xee, 0xdd, 0xff, 0x00 - -gUnknown_83E2440:: @ 83E2440 - .4byte gUnknown_83E2434 - .4byte gUnknown_83E2430 - .4byte gUnknown_83E2438 - -gUnknown_83E244C:: @ 83E244C - .4byte gUnknown_8E98398 - .4byte gUnknown_8E98458 - .4byte gUnknown_8E98518 - -gUnknown_83E2458:: @ 83E2458 - .byte 0x0f, 0x01, 0x02 - - .align 2 -gUnknown_83E245C:: @ 83E245C - .byte 0x00, 0x07, 0x01, 0x00, 0x01 - .align 2 - .4byte gUnknown_8418E47 - -gUnknown_83E2468:: @ 83E2468 - .byte 0x00, 0x08, 0x02, 0x00, 0x01 - .align 2 - .4byte gUnknown_8418E52 - -gUnknown_83E2474:: @ 83E2474 - .byte 0x00, 0x0a, 0x03, 0x01, 0x01 - .align 2 - .4byte gUnknown_8418E5C - -gUnknown_83E2480:: @ 83E2480 - .byte 0x00, 0x07, 0x04, 0x00, 0x01 - .align 2 - .4byte gUnknown_8418E69 - -sNamingScreenTemplates:: @ 83E248C - .4byte gUnknown_83E245C @ NAMING_SCREEN_PLAYER - .4byte gUnknown_83E2468 @ NAMING_SCREEN_BOX - .4byte gUnknown_83E2474 @ NAMING_SCREEN_CAUGHT_MON - .4byte gUnknown_83E2474 @ NAMING_SCREEN_NAME_RATER - .4byte gUnknown_83E2480 @ NAMING_SCREEN_RIVAL - -gUnknown_83E24A0:: @ 83E24A0 - .4byte 0x00000000, 0x00000000 - -gUnknown_83E24A8:: @ 3E24A8 - .4byte 0x40000000, 0x00000000 - -gUnknown_83E24B0:: @ 3E24B0 - .4byte 0x80004000, 0x00000000 - -gUnknown_83E24B8:: @ 83E24B8 - subsprite 236, 240, 1, 0x0000, 32x8 - subsprite 12, 240, 1, 0x0004, 8x8 - subsprite 236, 248, 1, 0x0005, 32x8 - subsprite 12, 248, 1, 0x0009, 8x8 - subsprite 236, 0, 1, 0x000a, 32x8 - subsprite 12, 0, 1, 0x000e, 8x8 - subsprite 236, 8, 1, 0x000f, 32x8 - subsprite 12, 8, 1, 0x0013, 8x8 - -gUnknown_83E24D8:: @ 83E24D8 - subsprite 244, 252, 1, 0x0000, 16x8 - subsprite 4, 252, 1, 0x0002, 8x8 - -gUnknown_83E24E0:: @ 83E24E0 - subsprite 236, 244, 1, 0x0000, 32x8 - subsprite 12, 244, 1, 0x0004, 8x8 - subsprite 236, 252, 1, 0x0005, 32x8 - subsprite 12, 252, 1, 0x0009, 8x8 - subsprite 236, 4, 1, 0x000a, 32x8 - subsprite 12, 4, 1, 0x000e, 8x8 - -gUnknown_83E24F8:: - subsprite 248, 244, 3, 0x0000, 16x8 - subsprite 248, 252, 3, 0x0002, 16x8 - subsprite 248, 4, 3, 0x0004, 16x8 - -gUnknown_83E2504:: @ 83E2504 - .byte 0x08 - .align 2 - .4byte gUnknown_83E24B8 - -gUnknown_83E250C:: @ 83E250C - .byte 0x02 - .align 2 - .4byte gUnknown_83E24D8 - .byte 0x02 - .align 2 - .4byte gUnknown_83E24D8 - .byte 0x02 - .align 2 - .4byte gUnknown_83E24D8 - -gUnknown_83E2524:: @ 83E2524 - .byte 0x06 - .align 2 - .4byte gUnknown_83E24E0 - -gUnknown_83E252C:: @ 83E252C - .byte 0x03 - .align 2 - .4byte gUnknown_83E24F8 - -gUnknown_83E2534:: @ 83E2534 - obj_frame_tiles gUnknown_83E1800, 0x00c0 - obj_frame_tiles gUnknown_83E18C0, 0x00c0 - -gUnknown_83E2544:: @ 83E2544 - obj_image_anim_frame 0, 1 - obj_image_anim_jump 0 - -gUnknown_83E254C:: @ 83E254C - obj_image_anim_frame 4, 8 - obj_image_anim_frame 8, 8 - obj_image_anim_end - -gUnknown_83E2558:: @ 83E2558 - obj_image_anim_frame 0, 2 - obj_image_anim_frame 1, 2 - obj_image_anim_jump 0 - -gUnknown_83E2564:: @ 83E2564 - .4byte gUnknown_83E2544 - -gUnknown_83E2568:: @ 83E2568 - .4byte gUnknown_83E2544 - .4byte gUnknown_83E254C - -gUnknown_83E2570:: @ 83E2570 - .4byte gUnknown_83E2558 - -gUnknown_83E2574:: @ 83E2574 - spr_template 2, 4, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, SpriteCB_PageSwap - -gUnknown_83E258C:: @ 83E258C - spr_template 3, 1, gUnknown_83E24B0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_83E25A4:: @ 83E25A4 - spr_template 4, 4, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_83E25BC:: @ 83E25BC - spr_template 0, 6, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_83E25D4:: @ 83E25D4 - spr_template 1, 7, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_83E25EC:: @ 83E25EC - spr_template 7, 5, gUnknown_83E24A8, gUnknown_83E2568, NULL, gDummySpriteAffineAnimTable, sub_809E700 - -sSpriteTemplate_InputArrow:: @ 83E2604 - spr_template 10, 3, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, sub_809E7F0 - -sSpriteTemplate_Underscore:: @ 83E261C - spr_template 11, 3, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, sub_809E83C - -gUnknown_83E2634:: @ 83E2634 - spr_template 65535, 0, gUnknown_83E24A0, gUnknown_83E2570, gUnknown_83E2534, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_83E264C:: @ 83E264C - .4byte gUnknown_847A955 - .4byte gUnknown_847A976 - .4byte gUnknown_847A997 - .4byte gUnknown_847A9B8 - .4byte gUnknown_847A9D9 - .4byte gUnknown_847A9FA - .4byte gUnknown_847AA1B - .4byte gUnknown_847AA3C - .4byte gUnknown_847AA5D - .4byte gUnknown_847AA76 - .4byte gUnknown_847AA8F - .4byte gUnknown_847AAA8 - -gUnknown_83E267C:: @ 83E267C - obj_tiles gUnknown_8E98858, 0x01e0, 0 - obj_tiles gUnknown_8E98A38, 0x01e0, 1 - obj_tiles gUnknown_8E985D8, 0x0280, 2 - obj_tiles gUnknown_8E98FD8, 0x0100, 3 - obj_tiles gUnknown_8E98C18, 0x0060, 4 - obj_tiles gUnknown_8E98CB8, 0x0060, 5 - obj_tiles gUnknown_8E98D58, 0x0060, 6 - obj_tiles gUnknown_8E98DF8, 0x0080, 7 - obj_tiles gUnknown_8E98E98, 0x0080, 8 - obj_tiles gUnknown_8E98F38, 0x0080, 9 - obj_tiles gUnknown_8E990D8, 0x0020, 10 - obj_tiles gUnknown_8E990F8, 0x0020, 11 - null_obj_tiles - -gUnknown_83E26E4:: @ 83E26E4 - obj_pal gUnknown_8E98024, 0 - obj_pal gUnknown_8E98044, 1 - obj_pal gUnknown_8E98064, 2 - obj_pal gUnknown_8E98084, 3 - obj_pal gUnknown_8E980A4, 4 - obj_pal gUnknown_8E980C4, 5 - obj_pal gUnknown_8E980A4, 6 - obj_pal gUnknown_8E980A4, 7 - null_obj_pal -- cgit v1.2.3 From bbaa60ab1c9bc497937c67ebd4f3efc4a4b8484a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 10 Mar 2020 13:23:32 -0400 Subject: Address review comments --- data/data_8479668.s | 153 ---------------------------------------------------- 1 file changed, 153 deletions(-) (limited to 'data') diff --git a/data/data_8479668.s b/data/data_8479668.s index 695d98def..5c00ff639 100644 --- a/data/data_8479668.s +++ b/data/data_8479668.s @@ -13,159 +13,6 @@ .section .rodata - // easy_chat_2 - -gUnknown_847A8D8:: - .string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others$" - -gUnknown_847A8FA:: - .string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L$" - -gUnknown_847A913:: - .string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $" - -gUnknown_847A934:: - .string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $" - - // naming_screen - -gText_NamingScreenKeyboard_abcdef:: - .string "{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 26}.$" - -gText_NamingScreenKeyboard_ghijkl:: - .string "{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 6}k{CLEAR 6}l{CLEAR 7} {CLEAR 26},$" - -gText_NamingScreenKeyboard_mnopqrs:: - .string "{CLEAR 11}m{CLEAR 6}n{CLEAR 7}o{CLEAR 26}p{CLEAR 6}q{CLEAR 7}r{CLEAR 6}s{CLEAR 27} $" - -gText_NamingScreenKeyboard_tuvwxyz:: - .string "{CLEAR 12}t{CLEAR 6}u{CLEAR 6}v{CLEAR 26}w{CLEAR 6}x{CLEAR 6}y{CLEAR 6}z{CLEAR 26} $" - -gText_NamingScreenKeyboard_ABCDEF:: - .string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 26}.$" - -gText_NamingScreenKeyboard_GHIJKL:: - .string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 26},$" - -gText_NamingScreenKeyboard_MNOPQRS:: - .string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $" - -gText_NamingScreenKeyboard_TUVWXYZ:: - .string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $" - -gText_NamingScreenKeyboard_01234:: - .string "{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} $" - -gText_NamingScreenKeyboard_56789:: - .string "{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} $" - -gText_NamingScreenKeyboard_Symbols1:: - .string "{CLEAR 11}!{CLEAR 16}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 16}-$" - -gText_NamingScreenKeyboard_Symbols2:: - .string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 18}'{CLEAR 18} $" - - // union_room_chat - -gText_UnionRoomChatKeyboard_ABCDE:: - .string "ABCDE$" - -gText_UnionRoomChatKeyboard_FGHIJ:: - .string "FGHIJ$" - -gText_UnionRoomChatKeyboard_KLMNO:: - .string "KLMNO$" - -gText_UnionRoomChatKeyboard_PQRST:: - .string "PQRST$" - -gText_UnionRoomChatKeyboard_UVWXY:: - .string "UVWXY$" - -gText_UnionRoomChatKeyboard_Z:: - .string "Z $" - -gText_UnionRoomChatKeyboard_01234Upper:: - .string "01234$" - -gText_UnionRoomChatKeyboard_56789Upper:: - .string "56789$" - -gText_UnionRoomChatKeyboard_PunctuationUpper:: - .string ".,!? $" - -gText_UnionRoomChatKeyboard_SymbolsUpper:: - .string "-/&… $" - -gText_UnionRoomChatKeyboard_abcde:: - .string "abcde$" - -gText_UnionRoomChatKeyboard_fghij:: - .string "fghij$" - -gText_UnionRoomChatKeyboard_klmno:: - .string "klmno$" - -gText_UnionRoomChatKeyboard_pqrst:: - .string "pqrst$" - -gText_UnionRoomChatKeyboard_uvwxy:: - .string "uvwxy$" - -gText_UnionRoomChatKeyboard_z:: - .string "z $" - -gText_UnionRoomChatKeyboard_01234Lower:: - .string "01234$" - -gText_UnionRoomChatKeyboard_56789Lower:: - .string "56789$" - -gText_UnionRoomChatKeyboard_PunctuationLower:: - .string ".,!? $" - -gText_UnionRoomChatKeyboard_SymbolsLower:: - .string "-/&… $" - - .string "$" - .string "$" - .string "$" - .string "$" - .string "$" - .string "$" - .string "$" - .string "$" - -gText_UnionRoomChatKeyboard_Emoji1:: - .string "{EXTRA 245}{EXTRA 246}{EXTRA 247}{EXTRA 248}{EXTRA 254}$" - -gText_UnionRoomChatKeyboard_Emoji2:: - .string "{EXTRA 249}{EXTRA 250}{EXTRA 252}{EXTRA 251}{EXTRA 253}$" - -gText_UnionRoomChatKeyboard_Emoji3:: - .string "{EXTRA 236}{EXTRA 237}{EXTRA 238}{EXTRA 235}{EXTRA 234}$" - -gText_UnionRoomChatKeyboard_Emoji4:: - .string "♂♀{EXTRA 212}{EXTRA 213}{EXTRA 211}$" - -gText_UnionRoomChatKeyboard_Emoji5:: - .string "{EXTRA 216}{EXTRA 217}{EXTRA 242}{EXTRA 243}{EXTRA 244}$" - -gText_UnionRoomChatKeyboard_Emoji6:: - .string "{EXTRA 218}{EXTRA 241}{EXTRA 224}{EXTRA 226}{EXTRA 227}$" - -gText_UnionRoomChatKeyboard_Emoji7:: - .string "{EXTRA 240}{EXTRA 239}{EXTRA 225}{EXTRA 214}{EXTRA 215}$" - -gText_UnionRoomChatKeyboard_Emoji8:: - .string "{EXTRA 228}{EXTRA 229}{EXTRA 230}{EXTRA 231}{EXTRA 232}$" - -gText_UnionRoomChatKeyboard_Emoji9:: - .string "{EXTRA 233}{EXTRA 220}{EXTRA 221}{EXTRA 222}{EXTRA 209}$" - -gText_UnionRoomChatKeyboard_Emoji10:: - .string "{EXTRA 210}{EXTRA 208}ょ: $" - @ 847ABAC .align 2 .include "data/trainer_tower/trainers.inc" -- cgit v1.2.3 From cbe6e27f3760d6e95d9f2af301c8320aa0a809e2 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 11 Mar 2020 01:04:27 -0400 Subject: region_map.h to region_map_sections.h --- data/field_weather.s | 2 +- data/maps.s | 2 +- data/pokedex_screen.s | 2 +- data/pokemon_special_anim.s | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'data') diff --git a/data/field_weather.s b/data/field_weather.s index c8acca001..d872998bf 100644 --- a/data/field_weather.s +++ b/data/field_weather.s @@ -1,4 +1,4 @@ -#include "constants/region_map.h" +#include "constants/region_map_sections.h" #include "constants/flags.h" #include "constants/moves.h" #define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10)) diff --git a/data/maps.s b/data/maps.s index 1bf2350bb..ad3f9c993 100644 --- a/data/maps.s +++ b/data/maps.s @@ -1,6 +1,6 @@ #include "constants/layouts.h" #include "constants/maps.h" -#include "constants/region_map.h" +#include "constants/region_map_sections.h" #include "constants/songs.h" #include "constants/items.h" #include "constants/weather.h" diff --git a/data/pokedex_screen.s b/data/pokedex_screen.s index 64d1fba0c..ebbb3da72 100644 --- a/data/pokedex_screen.s +++ b/data/pokedex_screen.s @@ -1,4 +1,4 @@ -#include "constants/region_map.h" +#include "constants/region_map_sections.h" #include "constants/flags.h" #include "constants/moves.h" #include "constants/species.h" diff --git a/data/pokemon_special_anim.s b/data/pokemon_special_anim.s index 16593e4d8..1c479d0c0 100644 --- a/data/pokemon_special_anim.s +++ b/data/pokemon_special_anim.s @@ -1,4 +1,4 @@ -#include "constants/region_map.h" +#include "constants/region_map_sections.h" #include "constants/flags.h" #include "constants/moves.h" .include "asm/macros.inc" -- cgit v1.2.3