diff options
| author | klektron <klektron@users.noreply.github.com> | 2021-01-03 17:31:10 +0100 |
|---|---|---|
| committer | klektron <klektron@users.noreply.github.com> | 2021-01-03 17:31:10 +0100 |
| commit | 779c7ddaa2613e41ce86e10893ee1b94ecc5b899 (patch) | |
| tree | 286b04873ddce3f576d02a4ad58c843686fb80df | |
| parent | a20ca92534f9cc6922f40e5f736a22862754db4b (diff) | |
| parent | 21908ba30a8bae5c5e1c86b1164402ec95da0220 (diff) | |
Merge last changes from pret
908 files changed, 162 insertions, 134 deletions
diff --git a/.travis.yml b/.travis.yml index 1147a117..0d3b9f7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ os: install: - |- ( cd - git clone -b v0.4.1 --depth=1 https://github.com/gbdev/rgbds + git clone -b v0.4.2 --depth=1 https://github.com/gbdev/rgbds sudo make -C rgbds install rm -rf rgbds ) @@ -42,9 +42,9 @@ Run setup and leave the default settings. At the "**Select Packages**" step, cho Double click on the text that says "**Skip**" next to each package to select the most recent version to install. -Then follow the [**rgbds** install instructions](https://rgbds.gbdev.io/install/windows) for Windows with Cygwin to install **rgbds 0.4.1**. +Then follow the [**rgbds** install instructions](https://rgbds.gbdev.io/install/windows) for Windows with Cygwin to install **rgbds 0.4.2**. -**Note:** If you already have an older rgbds, you will need to update to 0.4.1. Ignore this if you have never installed rgbds before. If a version newer than 0.4.1 does not work, try downloading 0.4.1. +**Note:** If you already have an older rgbds, you will need to update to 0.4.2. Ignore this if you have never installed rgbds before. If a version newer than 0.4.2 does not work, try downloading 0.4.2. Now open the **Cygwin terminal** and enter the following commands. @@ -67,7 +67,7 @@ Install [**Homebrew**](https://brew.sh/). Follow the official instructions. Open **Terminal** and prepare to enter commands. -Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/macos) for macOS to install **rgbds 0.4.1**. +Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/macos) for macOS to install **rgbds 0.4.2**. Now you're ready to [build **pokered**](#build-pokered). @@ -84,7 +84,7 @@ To install the software required for **pokered**: sudo apt-get install make gcc git ``` -Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.4.1** from source. +Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.4.2** from source. ### OpenSUSE @@ -94,7 +94,7 @@ To install the software required for **pokered**: sudo zypper install make gcc git ``` -Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.4.1** from source. +Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.4.2** from source. ### Arch Linux @@ -104,9 +104,9 @@ To install the software required for **pokered**: sudo pacman -S make gcc git ``` -Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/arch) for Arch Linux to install **rgbds 0.4.1**. +Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/arch) for Arch Linux to install **rgbds 0.4.2**. -If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.4.1** from source. +If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.4.2** from source. ### Termux @@ -122,7 +122,7 @@ To install **rgbds**: sudo apt install rgbds ``` -If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.4.1** from source. +If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.4.2** from source. ### Other distros @@ -133,7 +133,7 @@ If your distro is not listed here, try to find the required software in its repo - `git` - `rgbds` -If `rgbds` is not available, you'll need to follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.4.1** from source. +If `rgbds` is not available, you'll need to follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.4.2** from source. Now you're ready to [build **pokered**](#build-pokered). @@ -411,7 +411,7 @@ INCLUDE "audio/music/pokecenter.asm" SECTION "Music 2", ROMX INCLUDE "audio/sfx/pokeflute_ch5_ch6.asm" -INCLUDE "audio/sfx/unused2_2.asm" +INCLUDE "audio/sfx/unused_fanfare.asm" INCLUDE "audio/music/gymleaderbattle.asm" INCLUDE "audio/music/trainerbattle.asm" INCLUDE "audio/music/wildbattle.asm" diff --git a/audio/headers/musicheaders1.asm b/audio/headers/musicheaders1.asm index ef85eae6..ef85eae6 100755..100644 --- a/audio/headers/musicheaders1.asm +++ b/audio/headers/musicheaders1.asm diff --git a/audio/headers/musicheaders2.asm b/audio/headers/musicheaders2.asm index d6cca9a9..d6cca9a9 100755..100644 --- a/audio/headers/musicheaders2.asm +++ b/audio/headers/musicheaders2.asm diff --git a/audio/headers/musicheaders3.asm b/audio/headers/musicheaders3.asm index ca21b419..ca21b419 100755..100644 --- a/audio/headers/musicheaders3.asm +++ b/audio/headers/musicheaders3.asm diff --git a/audio/sfx/unused2_2.asm b/audio/sfx/unused_fanfare.asm index aa93f91c..d41bb080 100644 --- a/audio/sfx/unused2_2.asm +++ b/audio/sfx/unused_fanfare.asm @@ -1,4 +1,5 @@ -SFX_Unused2_Ch5: +; This corresponds to SFX_KEY_ITEM in pokegold and pokecrystal. +SFX_UnusedFanfare_Ch5: ; unreferenced execute_music tempo 256 volume 7, 7 @@ -16,8 +17,7 @@ SFX_Unused2_Ch5: note E_, 8 sound_ret - -SFX_Unused2_Ch6: +SFX_UnusedFanfare_Ch6: ; unreferenced execute_music vibrato 8, 2, 7 duty_cycle 2 @@ -32,8 +32,7 @@ SFX_Unused2_Ch6: note B_, 8 sound_ret - -SFX_Unused2_Ch7: +SFX_UnusedFanfare_Ch7: ; unreferenced execute_music note_type 6, 1, 0 octave 4 diff --git a/constants/event_constants.asm b/constants/event_constants.asm index 4f169880..4f169880 100755..100644 --- a/constants/event_constants.asm +++ b/constants/event_constants.asm diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index 82e80bae..82e80bae 100755..100644 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm diff --git a/constants/item_constants.asm b/constants/item_constants.asm index 67416600..67416600 100755..100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm diff --git a/constants/list_constants.asm b/constants/list_constants.asm index 840856df..840856df 100755..100644 --- a/constants/list_constants.asm +++ b/constants/list_constants.asm diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index 5efd9928..605e7013 100755..100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -4,13 +4,13 @@ MAP_BORDER EQU 3 ; connection directions const_def - shift_const EAST ; 1 - shift_const WEST ; 2 - shift_const SOUTH ; 4 - shift_const NORTH ; 8 + shift_const EAST ; 1 + shift_const WEST ; 2 + shift_const SOUTH ; 4 + shift_const NORTH ; 8 -; tileset environments +; flower and water tile animations const_def - const INDOOR ; 0 - const CAVE ; 1 - const OUTDOOR ; 2 + const TILEANIM_NONE ; 0 + const TILEANIM_WATER ; 1 + const TILEANIM_WATER_FLOWER ; 2 diff --git a/constants/oam_constants.asm b/constants/oam_constants.asm index be63dc24..be63dc24 100755..100644 --- a/constants/oam_constants.asm +++ b/constants/oam_constants.asm diff --git a/constants/palette_constants.asm b/constants/palette_constants.asm index 177f8b81..177f8b81 100755..100644 --- a/constants/palette_constants.asm +++ b/constants/palette_constants.asm diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index a0e5b257..a0e5b257 100755..100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index a4354996..a4354996 100755..100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index 6fdc5d4e..6fdc5d4e 100755..100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm diff --git a/constants/type_constants.asm b/constants/type_constants.asm index 6ae3408d..6ae3408d 100755..100644 --- a/constants/type_constants.asm +++ b/constants/type_constants.asm diff --git a/data/credits/credits_mons.asm b/data/credits/credits_mons.asm index 23142f9f..23142f9f 100755..100644 --- a/data/credits/credits_mons.asm +++ b/data/credits/credits_mons.asm diff --git a/data/credits/credits_order.asm b/data/credits/credits_order.asm index 19f4fe6c..19f4fe6c 100755..100644 --- a/data/credits/credits_order.asm +++ b/data/credits/credits_order.asm diff --git a/data/credits/credits_text.asm b/data/credits/credits_text.asm index 2cbd0d97..2cbd0d97 100755..100644 --- a/data/credits/credits_text.asm +++ b/data/credits/credits_text.asm diff --git a/data/events/hidden_coins.asm b/data/events/hidden_coins.asm index bcdbcd80..bcdbcd80 100755..100644 --- a/data/events/hidden_coins.asm +++ b/data/events/hidden_coins.asm diff --git a/data/events/hidden_item_coords.asm b/data/events/hidden_item_coords.asm index 115f53aa..115f53aa 100755..100644 --- a/data/events/hidden_item_coords.asm +++ b/data/events/hidden_item_coords.asm diff --git a/data/events/hidden_objects.asm b/data/events/hidden_objects.asm index efb99026..efb99026 100755..100644 --- a/data/events/hidden_objects.asm +++ b/data/events/hidden_objects.asm diff --git a/data/events/prize_mon_levels.asm b/data/events/prize_mon_levels.asm index eb30ac80..eb30ac80 100755..100644 --- a/data/events/prize_mon_levels.asm +++ b/data/events/prize_mon_levels.asm diff --git a/data/events/prizes.asm b/data/events/prizes.asm index 67186815..67186815 100755..100644 --- a/data/events/prizes.asm +++ b/data/events/prizes.asm diff --git a/data/events/slot_machine_wheels.asm b/data/events/slot_machine_wheels.asm index 88a89822..88a89822 100755..100644 --- a/data/events/slot_machine_wheels.asm +++ b/data/events/slot_machine_wheels.asm diff --git a/data/events/trades.asm b/data/events/trades.asm index c71987a9..c71987a9 100755..100644 --- a/data/events/trades.asm +++ b/data/events/trades.asm diff --git a/data/growth_rates.asm b/data/growth_rates.asm index 32354a64..e2cb8c90 100644 --- a/data/growth_rates.asm +++ b/data/growth_rates.asm @@ -1,8 +1,8 @@ growth_rate: MACRO ; [1]/[2]*n**3 + [3]*n**2 + [4]*n - [5] dn \1, \2 - if \3 & $80 ; signed - db -\3 | $80 + if \3 < 0 + db -\3 | $80 ; signed magnitude else db \3 endc diff --git a/data/items/key_items.asm b/data/items/key_items.asm index aca8cf81..aca8cf81 100755..100644 --- a/data/items/key_items.asm +++ b/data/items/key_items.asm diff --git a/data/items/marts.asm b/data/items/marts.asm index 80d62931..80d62931 100755..100644 --- a/data/items/marts.asm +++ b/data/items/marts.asm diff --git a/data/items/names.asm b/data/items/names.asm index 0e75c3fc..0e75c3fc 100755..100644 --- a/data/items/names.asm +++ b/data/items/names.asm diff --git a/data/items/prices.asm b/data/items/prices.asm index f3d8f76b..f3d8f76b 100755..100644 --- a/data/items/prices.asm +++ b/data/items/prices.asm diff --git a/data/items/tm_prices.asm b/data/items/tm_prices.asm index 7f007e9d..7f007e9d 100755..100644 --- a/data/items/tm_prices.asm +++ b/data/items/tm_prices.asm diff --git a/data/maps/force_bike_surf.asm b/data/maps/force_bike_surf.asm index 74eba325..74eba325 100755..100644 --- a/data/maps/force_bike_surf.asm +++ b/data/maps/force_bike_surf.asm diff --git a/data/maps/headers/AgathasRoom.asm b/data/maps/headers/AgathasRoom.asm index d04e0cfd..d04e0cfd 100755..100644 --- a/data/maps/headers/AgathasRoom.asm +++ b/data/maps/headers/AgathasRoom.asm diff --git a/data/maps/headers/BikeShop.asm b/data/maps/headers/BikeShop.asm index b4b520e2..b4b520e2 100755..100644 --- a/data/maps/headers/BikeShop.asm +++ b/data/maps/headers/BikeShop.asm diff --git a/data/maps/headers/BillsHouse.asm b/data/maps/headers/BillsHouse.asm index 6063175d..6063175d 100755..100644 --- a/data/maps/headers/BillsHouse.asm +++ b/data/maps/headers/BillsHouse.asm diff --git a/data/maps/headers/BluesHouse.asm b/data/maps/headers/BluesHouse.asm index 33cee254..33cee254 100755..100644 --- a/data/maps/headers/BluesHouse.asm +++ b/data/maps/headers/BluesHouse.asm diff --git a/data/maps/headers/BrunosRoom.asm b/data/maps/headers/BrunosRoom.asm index a0b2d4fd..a0b2d4fd 100755..100644 --- a/data/maps/headers/BrunosRoom.asm +++ b/data/maps/headers/BrunosRoom.asm diff --git a/data/maps/headers/CeladonChiefHouse.asm b/data/maps/headers/CeladonChiefHouse.asm index 34f17273..34f17273 100755..100644 --- a/data/maps/headers/CeladonChiefHouse.asm +++ b/data/maps/headers/CeladonChiefHouse.asm diff --git a/data/maps/headers/CeladonCity.asm b/data/maps/headers/CeladonCity.asm index 6faa6f48..6faa6f48 100755..100644 --- a/data/maps/headers/CeladonCity.asm +++ b/data/maps/headers/CeladonCity.asm diff --git a/data/maps/headers/CeladonDiner.asm b/data/maps/headers/CeladonDiner.asm index b18d9633..b18d9633 100755..100644 --- a/data/maps/headers/CeladonDiner.asm +++ b/data/maps/headers/CeladonDiner.asm diff --git a/data/maps/headers/CeladonGym.asm b/data/maps/headers/CeladonGym.asm index 2302c65a..2302c65a 100755..100644 --- a/data/maps/headers/CeladonGym.asm +++ b/data/maps/headers/CeladonGym.asm diff --git a/data/maps/headers/CeladonHotel.asm b/data/maps/headers/CeladonHotel.asm index 2339c14d..2339c14d 100755..100644 --- a/data/maps/headers/CeladonHotel.asm +++ b/data/maps/headers/CeladonHotel.asm diff --git a/data/maps/headers/CeladonMansion1F.asm b/data/maps/headers/CeladonMansion1F.asm index 45970028..45970028 100755..100644 --- a/data/maps/headers/CeladonMansion1F.asm +++ b/data/maps/headers/CeladonMansion1F.asm diff --git a/data/maps/headers/CeladonMansion2F.asm b/data/maps/headers/CeladonMansion2F.asm index d5e3e77b..d5e3e77b 100755..100644 --- a/data/maps/headers/CeladonMansion2F.asm +++ b/data/maps/headers/CeladonMansion2F.asm diff --git a/data/maps/headers/CeladonMansion3F.asm b/data/maps/headers/CeladonMansion3F.asm index 7566caad..7566caad 100755..100644 --- a/data/maps/headers/CeladonMansion3F.asm +++ b/data/maps/headers/CeladonMansion3F.asm diff --git a/data/maps/headers/CeladonMansionRoof.asm b/data/maps/headers/CeladonMansionRoof.asm index 9cbae6f6..9cbae6f6 100755..100644 --- a/data/maps/headers/CeladonMansionRoof.asm +++ b/data/maps/headers/CeladonMansionRoof.asm diff --git a/data/maps/headers/CeladonMansionRoofHouse.asm b/data/maps/headers/CeladonMansionRoofHouse.asm index cb80fac8..cb80fac8 100755..100644 --- a/data/maps/headers/CeladonMansionRoofHouse.asm +++ b/data/maps/headers/CeladonMansionRoofHouse.asm diff --git a/data/maps/headers/CeladonMart1F.asm b/data/maps/headers/CeladonMart1F.asm index 30bd9ba9..30bd9ba9 100755..100644 --- a/data/maps/headers/CeladonMart1F.asm +++ b/data/maps/headers/CeladonMart1F.asm diff --git a/data/maps/headers/CeladonMart2F.asm b/data/maps/headers/CeladonMart2F.asm index d78dfe28..d78dfe28 100755..100644 --- a/data/maps/headers/CeladonMart2F.asm +++ b/data/maps/headers/CeladonMart2F.asm diff --git a/data/maps/headers/CeladonMart3F.asm b/data/maps/headers/CeladonMart3F.asm index ad415eee..ad415eee 100755..100644 --- a/data/maps/headers/CeladonMart3F.asm +++ b/data/maps/headers/CeladonMart3F.asm diff --git a/data/maps/headers/CeladonMart4F.asm b/data/maps/headers/CeladonMart4F.asm index b9ce5b34..b9ce5b34 100755..100644 --- a/data/maps/headers/CeladonMart4F.asm +++ b/data/maps/headers/CeladonMart4F.asm diff --git a/data/maps/headers/CeladonMart5F.asm b/data/maps/headers/CeladonMart5F.asm index 04d65b2b..04d65b2b 100755..100644 --- a/data/maps/headers/CeladonMart5F.asm +++ b/data/maps/headers/CeladonMart5F.asm diff --git a/data/maps/headers/CeladonMartElevator.asm b/data/maps/headers/CeladonMartElevator.asm index 2a98ccb0..2a98ccb0 100755..100644 --- a/data/maps/headers/CeladonMartElevator.asm +++ b/data/maps/headers/CeladonMartElevator.asm diff --git a/data/maps/headers/CeladonMartRoof.asm b/data/maps/headers/CeladonMartRoof.asm index 823ff25f..823ff25f 100755..100644 --- a/data/maps/headers/CeladonMartRoof.asm +++ b/data/maps/headers/CeladonMartRoof.asm diff --git a/data/maps/headers/CeladonPokecenter.asm b/data/maps/headers/CeladonPokecenter.asm index 378a41ec..378a41ec 100755..100644 --- a/data/maps/headers/CeladonPokecenter.asm +++ b/data/maps/headers/CeladonPokecenter.asm diff --git a/data/maps/headers/CeruleanBadgeHouse.asm b/data/maps/headers/CeruleanBadgeHouse.asm index 47a97b14..47a97b14 100755..100644 --- a/data/maps/headers/CeruleanBadgeHouse.asm +++ b/data/maps/headers/CeruleanBadgeHouse.asm diff --git a/data/maps/headers/CeruleanCave1F.asm b/data/maps/headers/CeruleanCave1F.asm index 7c80bbeb..7c80bbeb 100755..100644 --- a/data/maps/headers/CeruleanCave1F.asm +++ b/data/maps/headers/CeruleanCave1F.asm diff --git a/data/maps/headers/CeruleanCave2F.asm b/data/maps/headers/CeruleanCave2F.asm index 353e265b..353e265b 100755..100644 --- a/data/maps/headers/CeruleanCave2F.asm +++ b/data/maps/headers/CeruleanCave2F.asm diff --git a/data/maps/headers/CeruleanCaveB1F.asm b/data/maps/headers/CeruleanCaveB1F.asm index d759aa6b..d759aa6b 100755..100644 --- a/data/maps/headers/CeruleanCaveB1F.asm +++ b/data/maps/headers/CeruleanCaveB1F.asm diff --git a/data/maps/headers/CeruleanCity.asm b/data/maps/headers/CeruleanCity.asm index c925713c..c925713c 100755..100644 --- a/data/maps/headers/CeruleanCity.asm +++ b/data/maps/headers/CeruleanCity.asm diff --git a/data/maps/headers/CeruleanGym.asm b/data/maps/headers/CeruleanGym.asm index b1010ac3..b1010ac3 100755..100644 --- a/data/maps/headers/CeruleanGym.asm +++ b/data/maps/headers/CeruleanGym.asm diff --git a/data/maps/headers/CeruleanMart.asm b/data/maps/headers/CeruleanMart.asm index 2ee31666..2ee31666 100755..100644 --- a/data/maps/headers/CeruleanMart.asm +++ b/data/maps/headers/CeruleanMart.asm diff --git a/data/maps/headers/CeruleanPokecenter.asm b/data/maps/headers/CeruleanPokecenter.asm index b79e7aff..b79e7aff 100755..100644 --- a/data/maps/headers/CeruleanPokecenter.asm +++ b/data/maps/headers/CeruleanPokecenter.asm diff --git a/data/maps/headers/CeruleanTradeHouse.asm b/data/maps/headers/CeruleanTradeHouse.asm index 20970b77..20970b77 100755..100644 --- a/data/maps/headers/CeruleanTradeHouse.asm +++ b/data/maps/headers/CeruleanTradeHouse.asm diff --git a/data/maps/headers/CeruleanTrashedHouse.asm b/data/maps/headers/CeruleanTrashedHouse.asm index 192a4195..192a4195 100755..100644 --- a/data/maps/headers/CeruleanTrashedHouse.asm +++ b/data/maps/headers/CeruleanTrashedHouse.asm diff --git a/data/maps/headers/ChampionsRoom.asm b/data/maps/headers/ChampionsRoom.asm index aadc70a6..aadc70a6 100755..100644 --- a/data/maps/headers/ChampionsRoom.asm +++ b/data/maps/headers/ChampionsRoom.asm diff --git a/data/maps/headers/CinnabarGym.asm b/data/maps/headers/CinnabarGym.asm index cc6dc1d7..cc6dc1d7 100755..100644 --- a/data/maps/headers/CinnabarGym.asm +++ b/data/maps/headers/CinnabarGym.asm diff --git a/data/maps/headers/CinnabarIsland.asm b/data/maps/headers/CinnabarIsland.asm index a94498be..a94498be 100755..100644 --- a/data/maps/headers/CinnabarIsland.asm +++ b/data/maps/headers/CinnabarIsland.asm diff --git a/data/maps/headers/CinnabarLab.asm b/data/maps/headers/CinnabarLab.asm index e8081e75..e8081e75 100755..100644 --- a/data/maps/headers/CinnabarLab.asm +++ b/data/maps/headers/CinnabarLab.asm diff --git a/data/maps/headers/CinnabarLabFossilRoom.asm b/data/maps/headers/CinnabarLabFossilRoom.asm index 3cb88437..3cb88437 100755..100644 --- a/data/maps/headers/CinnabarLabFossilRoom.asm +++ b/data/maps/headers/CinnabarLabFossilRoom.asm diff --git a/data/maps/headers/CinnabarLabMetronomeRoom.asm b/data/maps/headers/CinnabarLabMetronomeRoom.asm index d77338c8..d77338c8 100755..100644 --- a/data/maps/headers/CinnabarLabMetronomeRoom.asm +++ b/data/maps/headers/CinnabarLabMetronomeRoom.asm diff --git a/data/maps/headers/CinnabarLabTradeRoom.asm b/data/maps/headers/CinnabarLabTradeRoom.asm index c23d9c15..c23d9c15 100755..100644 --- a/data/maps/headers/CinnabarLabTradeRoom.asm +++ b/data/maps/headers/CinnabarLabTradeRoom.asm diff --git a/data/maps/headers/CinnabarMart.asm b/data/maps/headers/CinnabarMart.asm index c68d582a..c68d582a 100755..100644 --- a/data/maps/headers/CinnabarMart.asm +++ b/data/maps/headers/CinnabarMart.asm diff --git a/data/maps/headers/CinnabarPokecenter.asm b/data/maps/headers/CinnabarPokecenter.asm index d910133b..d910133b 100755..100644 --- a/data/maps/headers/CinnabarPokecenter.asm +++ b/data/maps/headers/CinnabarPokecenter.asm diff --git a/data/maps/headers/Colosseum.asm b/data/maps/headers/Colosseum.asm index faf03eb4..faf03eb4 100755..100644 --- a/data/maps/headers/Colosseum.asm +++ b/data/maps/headers/Colosseum.asm diff --git a/data/maps/headers/CopycatsHouse1F.asm b/data/maps/headers/CopycatsHouse1F.asm index 532cef93..532cef93 100755..100644 --- a/data/maps/headers/CopycatsHouse1F.asm +++ b/data/maps/headers/CopycatsHouse1F.asm diff --git a/data/maps/headers/CopycatsHouse2F.asm b/data/maps/headers/CopycatsHouse2F.asm index 38b1fbbb..38b1fbbb 100755..100644 --- a/data/maps/headers/CopycatsHouse2F.asm +++ b/data/maps/headers/CopycatsHouse2F.asm diff --git a/data/maps/headers/Daycare.asm b/data/maps/headers/Daycare.asm index dabeedd9..dabeedd9 100755..100644 --- a/data/maps/headers/Daycare.asm +++ b/data/maps/headers/Daycare.asm diff --git a/data/maps/headers/DiglettsCave.asm b/data/maps/headers/DiglettsCave.asm index d3777d31..d3777d31 100755..100644 --- a/data/maps/headers/DiglettsCave.asm +++ b/data/maps/headers/DiglettsCave.asm diff --git a/data/maps/headers/DiglettsCaveRoute11.asm b/data/maps/headers/DiglettsCaveRoute11.asm index d8bdd704..d8bdd704 100755..100644 --- a/data/maps/headers/DiglettsCaveRoute11.asm +++ b/data/maps/headers/DiglettsCaveRoute11.asm diff --git a/data/maps/headers/DiglettsCaveRoute2.asm b/data/maps/headers/DiglettsCaveRoute2.asm index 86f5ae35..86f5ae35 100755..100644 --- a/data/maps/headers/DiglettsCaveRoute2.asm +++ b/data/maps/headers/DiglettsCaveRoute2.asm diff --git a/data/maps/headers/FightingDojo.asm b/data/maps/headers/FightingDojo.asm index 7ecadc57..7ecadc57 100755..100644 --- a/data/maps/headers/FightingDojo.asm +++ b/data/maps/headers/FightingDojo.asm diff --git a/data/maps/headers/FuchsiaBillsGrandpasHouse.asm b/data/maps/headers/FuchsiaBillsGrandpasHouse.asm index 10ba48e9..10ba48e9 100755..100644 --- a/data/maps/headers/FuchsiaBillsGrandpasHouse.asm +++ b/data/maps/headers/FuchsiaBillsGrandpasHouse.asm diff --git a/data/maps/headers/FuchsiaCity.asm b/data/maps/headers/FuchsiaCity.asm index 6028bce0..6028bce0 100755..100644 --- a/data/maps/headers/FuchsiaCity.asm +++ b/data/maps/headers/FuchsiaCity.asm diff --git a/data/maps/headers/FuchsiaGoodRodHouse.asm b/data/maps/headers/FuchsiaGoodRodHouse.asm index d21611c1..d21611c1 100755..100644 --- a/data/maps/headers/FuchsiaGoodRodHouse.asm +++ b/data/maps/headers/FuchsiaGoodRodHouse.asm diff --git a/data/maps/headers/FuchsiaGym.asm b/data/maps/headers/FuchsiaGym.asm index 44be2971..44be2971 100755..100644 --- a/data/maps/headers/FuchsiaGym.asm +++ b/data/maps/headers/FuchsiaGym.asm diff --git a/data/maps/headers/FuchsiaMart.asm b/data/maps/headers/FuchsiaMart.asm index 120fe305..120fe305 100755..100644 --- a/data/maps/headers/FuchsiaMart.asm +++ b/data/maps/headers/FuchsiaMart.asm diff --git a/data/maps/headers/FuchsiaMeetingRoom.asm b/data/maps/headers/FuchsiaMeetingRoom.asm index a5ab4f04..a5ab4f04 100755..100644 --- a/data/maps/headers/FuchsiaMeetingRoom.asm +++ b/data/maps/headers/FuchsiaMeetingRoom.asm diff --git a/data/maps/headers/FuchsiaPokecenter.asm b/data/maps/headers/FuchsiaPokecenter.asm index c1c683bd..c1c683bd 100755..100644 --- a/data/maps/headers/FuchsiaPokecenter.asm +++ b/data/maps/headers/FuchsiaPokecenter.asm diff --git a/data/maps/headers/GameCorner.asm b/data/maps/headers/GameCorner.asm index ad367b93..ad367b93 100755..100644 --- a/data/maps/headers/GameCorner.asm +++ b/data/maps/headers/GameCorner.asm diff --git a/data/maps/headers/GameCornerPrizeRoom.asm b/data/maps/headers/GameCornerPrizeRoom.asm index 4668cbb8..4668cbb8 100755..100644 --- a/data/maps/headers/GameCornerPrizeRoom.asm +++ b/data/maps/headers/GameCornerPrizeRoom.asm diff --git a/data/maps/headers/HallOfFame.asm b/data/maps/headers/HallOfFame.asm index e2dc3fb3..e2dc3fb3 100755..100644 --- a/data/maps/headers/HallOfFame.asm +++ b/data/maps/headers/HallOfFame.asm diff --git a/data/maps/headers/IndigoPlateau.asm b/data/maps/headers/IndigoPlateau.asm index ff394dfe..ff394dfe 100755..100644 --- a/data/maps/headers/IndigoPlateau.asm +++ b/data/maps/headers/IndigoPlateau.asm diff --git a/data/maps/headers/IndigoPlateauLobby.asm b/data/maps/headers/IndigoPlateauLobby.asm index b13afa12..b13afa12 100755..100644 --- a/data/maps/headers/IndigoPlateauLobby.asm +++ b/data/maps/headers/IndigoPlateauLobby.asm diff --git a/data/maps/headers/LancesRoom.asm b/data/maps/headers/LancesRoom.asm index 0b69970e..0b69970e 100755..100644 --- a/data/maps/headers/LancesRoom.asm +++ b/data/maps/headers/LancesRoom.asm diff --git a/data/maps/headers/LavenderCuboneHouse.asm b/data/maps/headers/LavenderCuboneHouse.asm index dfd38ff1..dfd38ff1 100755..100644 --- a/data/maps/headers/LavenderCuboneHouse.asm +++ b/data/maps/headers/LavenderCuboneHouse.asm diff --git a/data/maps/headers/LavenderMart.asm b/data/maps/headers/LavenderMart.asm index 82c239e6..82c239e6 100755..100644 --- a/data/maps/headers/LavenderMart.asm +++ b/data/maps/headers/LavenderMart.asm diff --git a/data/maps/headers/LavenderPokecenter.asm b/data/maps/headers/LavenderPokecenter.asm index c0cd0adf..c0cd0adf 100755..100644 --- a/data/maps/headers/LavenderPokecenter.asm +++ b/data/maps/headers/LavenderPokecenter.asm diff --git a/data/maps/headers/LavenderTown.asm b/data/maps/headers/LavenderTown.asm index 7c1c9c46..7c1c9c46 100755..100644 --- a/data/maps/headers/LavenderTown.asm +++ b/data/maps/headers/LavenderTown.asm diff --git a/data/maps/headers/LoreleisRoom.asm b/data/maps/headers/LoreleisRoom.asm index feff946c..feff946c 100755..100644 --- a/data/maps/headers/LoreleisRoom.asm +++ b/data/maps/headers/LoreleisRoom.asm diff --git a/data/maps/headers/MrFujisHouse.asm b/data/maps/headers/MrFujisHouse.asm index 023cb501..023cb501 100755..100644 --- a/data/maps/headers/MrFujisHouse.asm +++ b/data/maps/headers/MrFujisHouse.asm diff --git a/data/maps/headers/MrPsychicsHouse.asm b/data/maps/headers/MrPsychicsHouse.asm index 628db044..628db044 100755..100644 --- a/data/maps/headers/MrPsychicsHouse.asm +++ b/data/maps/headers/MrPsychicsHouse.asm diff --git a/data/maps/headers/MtMoon1F.asm b/data/maps/headers/MtMoon1F.asm index 8de2be3e..8de2be3e 100755..100644 --- a/data/maps/headers/MtMoon1F.asm +++ b/data/maps/headers/MtMoon1F.asm diff --git a/data/maps/headers/MtMoonB1F.asm b/data/maps/headers/MtMoonB1F.asm index 9c97b5c7..9c97b5c7 100755..100644 --- a/data/maps/headers/MtMoonB1F.asm +++ b/data/maps/headers/MtMoonB1F.asm diff --git a/data/maps/headers/MtMoonB2F.asm b/data/maps/headers/MtMoonB2F.asm index 0ed1f96e..0ed1f96e 100755..100644 --- a/data/maps/headers/MtMoonB2F.asm +++ b/data/maps/headers/MtMoonB2F.asm diff --git a/data/maps/headers/MtMoonPokecenter.asm b/data/maps/headers/MtMoonPokecenter.asm index 0425eae7..0425eae7 100755..100644 --- a/data/maps/headers/MtMoonPokecenter.asm +++ b/data/maps/headers/MtMoonPokecenter.asm diff --git a/data/maps/headers/Museum1F.asm b/data/maps/headers/Museum1F.asm index d92176d2..d92176d2 100755..100644 --- a/data/maps/headers/Museum1F.asm +++ b/data/maps/headers/Museum1F.asm diff --git a/data/maps/headers/Museum2F.asm b/data/maps/headers/Museum2F.asm index d5bf8918..d5bf8918 100755..100644 --- a/data/maps/headers/Museum2F.asm +++ b/data/maps/headers/Museum2F.asm diff --git a/data/maps/headers/NameRatersHouse.asm b/data/maps/headers/NameRatersHouse.asm index 3f9010f0..3f9010f0 100755..100644 --- a/data/maps/headers/NameRatersHouse.asm +++ b/data/maps/headers/NameRatersHouse.asm diff --git a/data/maps/headers/OaksLab.asm b/data/maps/headers/OaksLab.asm index 42bb76e8..42bb76e8 100755..100644 --- a/data/maps/headers/OaksLab.asm +++ b/data/maps/headers/OaksLab.asm diff --git a/data/maps/headers/PalletTown.asm b/data/maps/headers/PalletTown.asm index 2745bdc1..2745bdc1 100755..100644 --- a/data/maps/headers/PalletTown.asm +++ b/data/maps/headers/PalletTown.asm diff --git a/data/maps/headers/PewterCity.asm b/data/maps/headers/PewterCity.asm index 268adb7a..268adb7a 100755..100644 --- a/data/maps/headers/PewterCity.asm +++ b/data/maps/headers/PewterCity.asm diff --git a/data/maps/headers/PewterGym.asm b/data/maps/headers/PewterGym.asm index a1659e42..a1659e42 100755..100644 --- a/data/maps/headers/PewterGym.asm +++ b/data/maps/headers/PewterGym.asm diff --git a/data/maps/headers/PewterMart.asm b/data/maps/headers/PewterMart.asm index c9b24eb2..c9b24eb2 100755..100644 --- a/data/maps/headers/PewterMart.asm +++ b/data/maps/headers/PewterMart.asm diff --git a/data/maps/headers/PewterNidoranHouse.asm b/data/maps/headers/PewterNidoranHouse.asm index ee2e46ca..ee2e46ca 100755..100644 --- a/data/maps/headers/PewterNidoranHouse.asm +++ b/data/maps/headers/PewterNidoranHouse.asm diff --git a/data/maps/headers/PewterPokecenter.asm b/data/maps/headers/PewterPokecenter.asm index 4e420bf8..4e420bf8 100755..100644 --- a/data/maps/headers/PewterPokecenter.asm +++ b/data/maps/headers/PewterPokecenter.asm diff --git a/data/maps/headers/PewterSpeechHouse.asm b/data/maps/headers/PewterSpeechHouse.asm index a378d61e..a378d61e 100755..100644 --- a/data/maps/headers/PewterSpeechHouse.asm +++ b/data/maps/headers/PewterSpeechHouse.asm diff --git a/data/maps/headers/PokemonFanClub.asm b/data/maps/headers/PokemonFanClub.asm index b4ff8e1c..b4ff8e1c 100755..100644 --- a/data/maps/headers/PokemonFanClub.asm +++ b/data/maps/headers/PokemonFanClub.asm diff --git a/data/maps/headers/PokemonMansion1F.asm b/data/maps/headers/PokemonMansion1F.asm index 9407f956..9407f956 100755..100644 --- a/data/maps/headers/PokemonMansion1F.asm +++ b/data/maps/headers/PokemonMansion1F.asm diff --git a/data/maps/headers/PokemonMansion2F.asm b/data/maps/headers/PokemonMansion2F.asm index deb7c84f..deb7c84f 100755..100644 --- a/data/maps/headers/PokemonMansion2F.asm +++ b/data/maps/headers/PokemonMansion2F.asm diff --git a/data/maps/headers/PokemonMansion3F.asm b/data/maps/headers/PokemonMansion3F.asm index e4baa709..e4baa709 100755..100644 --- a/data/maps/headers/PokemonMansion3F.asm +++ b/data/maps/headers/PokemonMansion3F.asm diff --git a/data/maps/headers/PokemonMansionB1F.asm b/data/maps/headers/PokemonMansionB1F.asm index 0aae67e6..0aae67e6 100755..100644 --- a/data/maps/headers/PokemonMansionB1F.asm +++ b/data/maps/headers/PokemonMansionB1F.asm diff --git a/data/maps/headers/PokemonTower1F.asm b/data/maps/headers/PokemonTower1F.asm index 185fd2c0..185fd2c0 100755..100644 --- a/data/maps/headers/PokemonTower1F.asm +++ b/data/maps/headers/PokemonTower1F.asm diff --git a/data/maps/headers/PokemonTower2F.asm b/data/maps/headers/PokemonTower2F.asm index 5a6046c8..5a6046c8 100755..100644 --- a/data/maps/headers/PokemonTower2F.asm +++ b/data/maps/headers/PokemonTower2F.asm diff --git a/data/maps/headers/PokemonTower3F.asm b/data/maps/headers/PokemonTower3F.asm index 49ebc4e7..49ebc4e7 100755..100644 --- a/data/maps/headers/PokemonTower3F.asm +++ b/data/maps/headers/PokemonTower3F.asm diff --git a/data/maps/headers/PokemonTower4F.asm b/data/maps/headers/PokemonTower4F.asm index 0eb9a0d6..0eb9a0d6 100755..100644 --- a/data/maps/headers/PokemonTower4F.asm +++ b/data/maps/headers/PokemonTower4F.asm diff --git a/data/maps/headers/PokemonTower5F.asm b/data/maps/headers/PokemonTower5F.asm index e58c63c6..e58c63c6 100755..100644 --- a/data/maps/headers/PokemonTower5F.asm +++ b/data/maps/headers/PokemonTower5F.asm diff --git a/data/maps/headers/PokemonTower6F.asm b/data/maps/headers/PokemonTower6F.asm index ba53347b..ba53347b 100755..100644 --- a/data/maps/headers/PokemonTower6F.asm +++ b/data/maps/headers/PokemonTower6F.asm diff --git a/data/maps/headers/PokemonTower7F.asm b/data/maps/headers/PokemonTower7F.asm index bd9f839b..bd9f839b 100755..100644 --- a/data/maps/headers/PokemonTower7F.asm +++ b/data/maps/headers/PokemonTower7F.asm diff --git a/data/maps/headers/PowerPlant.asm b/data/maps/headers/PowerPlant.asm index 88d82ae2..88d82ae2 100755..100644 --- a/data/maps/headers/PowerPlant.asm +++ b/data/maps/headers/PowerPlant.asm diff --git a/data/maps/headers/RedsHouse1F.asm b/data/maps/headers/RedsHouse1F.asm index 018bdc80..018bdc80 100755..100644 --- a/data/maps/headers/RedsHouse1F.asm +++ b/data/maps/headers/RedsHouse1F.asm diff --git a/data/maps/headers/RedsHouse2F.asm b/data/maps/headers/RedsHouse2F.asm index 10332e2c..10332e2c 100755..100644 --- a/data/maps/headers/RedsHouse2F.asm +++ b/data/maps/headers/RedsHouse2F.asm diff --git a/data/maps/headers/RockTunnel1F.asm b/data/maps/headers/RockTunnel1F.asm index 268ee645..268ee645 100755..100644 --- a/data/maps/headers/RockTunnel1F.asm +++ b/data/maps/headers/RockTunnel1F.asm diff --git a/data/maps/headers/RockTunnelB1F.asm b/data/maps/headers/RockTunnelB1F.asm index 7b13f647..7b13f647 100755..100644 --- a/data/maps/headers/RockTunnelB1F.asm +++ b/data/maps/headers/RockTunnelB1F.asm diff --git a/data/maps/headers/RockTunnelPokecenter.asm b/data/maps/headers/RockTunnelPokecenter.asm index a873854b..a873854b 100755..100644 --- a/data/maps/headers/RockTunnelPokecenter.asm +++ b/data/maps/headers/RockTunnelPokecenter.asm diff --git a/data/maps/headers/RocketHideoutB1F.asm b/data/maps/headers/RocketHideoutB1F.asm index 521a6693..521a6693 100755..100644 --- a/data/maps/headers/RocketHideoutB1F.asm +++ b/data/maps/headers/RocketHideoutB1F.asm diff --git a/data/maps/headers/RocketHideoutB2F.asm b/data/maps/headers/RocketHideoutB2F.asm index ab2a965d..ab2a965d 100755..100644 --- a/data/maps/headers/RocketHideoutB2F.asm +++ b/data/maps/headers/RocketHideoutB2F.asm diff --git a/data/maps/headers/RocketHideoutB3F.asm b/data/maps/headers/RocketHideoutB3F.asm index 0a04b00e..0a04b00e 100755..100644 --- a/data/maps/headers/RocketHideoutB3F.asm +++ b/data/maps/headers/RocketHideoutB3F.asm diff --git a/data/maps/headers/RocketHideoutB4F.asm b/data/maps/headers/RocketHideoutB4F.asm index 11512c01..11512c01 100755..100644 --- a/data/maps/headers/RocketHideoutB4F.asm +++ b/data/maps/headers/RocketHideoutB4F.asm diff --git a/data/maps/headers/RocketHideoutElevator.asm b/data/maps/headers/RocketHideoutElevator.asm index 90ece237..90ece237 100755..100644 --- a/data/maps/headers/RocketHideoutElevator.asm +++ b/data/maps/headers/RocketHideoutElevator.asm diff --git a/data/maps/headers/Route1.asm b/data/maps/headers/Route1.asm index 6eeb0347..6eeb0347 100755..100644 --- a/data/maps/headers/Route1.asm +++ b/data/maps/headers/Route1.asm diff --git a/data/maps/headers/Route10.asm b/data/maps/headers/Route10.asm index ba498b0a..ba498b0a 100755..100644 --- a/data/maps/headers/Route10.asm +++ b/data/maps/headers/Route10.asm diff --git a/data/maps/headers/Route11.asm b/data/maps/headers/Route11.asm index d8f2e72f..d8f2e72f 100755..100644 --- a/data/maps/headers/Route11.asm +++ b/data/maps/headers/Route11.asm diff --git a/data/maps/headers/Route11Gate1F.asm b/data/maps/headers/Route11Gate1F.asm index aa97b791..aa97b791 100755..100644 --- a/data/maps/headers/Route11Gate1F.asm +++ b/data/maps/headers/Route11Gate1F.asm diff --git a/data/maps/headers/Route11Gate2F.asm b/data/maps/headers/Route11Gate2F.asm index 560d38db..560d38db 100755..100644 --- a/data/maps/headers/Route11Gate2F.asm +++ b/data/maps/headers/Route11Gate2F.asm diff --git a/data/maps/headers/Route12.asm b/data/maps/headers/Route12.asm index 931ddf1d..931ddf1d 100755..100644 --- a/data/maps/headers/Route12.asm +++ b/data/maps/headers/Route12.asm diff --git a/data/maps/headers/Route12Gate1F.asm b/data/maps/headers/Route12Gate1F.asm index 047a670c..047a670c 100755..100644 --- a/data/maps/headers/Route12Gate1F.asm +++ b/data/maps/headers/Route12Gate1F.asm diff --git a/data/maps/headers/Route12Gate2F.asm b/data/maps/headers/Route12Gate2F.asm index e1366736..e1366736 100755..100644 --- a/data/maps/headers/Route12Gate2F.asm +++ b/data/maps/headers/Route12Gate2F.asm diff --git a/data/maps/headers/Route12SuperRodHouse.asm b/data/maps/headers/Route12SuperRodHouse.asm index 2195a9b1..2195a9b1 100755..100644 --- a/data/maps/headers/Route12SuperRodHouse.asm +++ b/data/maps/headers/Route12SuperRodHouse.asm diff --git a/data/maps/headers/Route13.asm b/data/maps/headers/Route13.asm index 242aaa02..242aaa02 100755..100644 --- a/data/maps/headers/Route13.asm +++ b/data/maps/headers/Route13.asm diff --git a/data/maps/headers/Route14.asm b/data/maps/headers/Route14.asm index c0c39c56..c0c39c56 100755..100644 --- a/data/maps/headers/Route14.asm +++ b/data/maps/headers/Route14.asm diff --git a/data/maps/headers/Route15.asm b/data/maps/headers/Route15.asm index 28a811d2..28a811d2 100755..100644 --- a/data/maps/headers/Route15.asm +++ b/data/maps/headers/Route15.asm diff --git a/data/maps/headers/Route15Gate1F.asm b/data/maps/headers/Route15Gate1F.asm index a23d15a0..a23d15a0 100755..100644 --- a/data/maps/headers/Route15Gate1F.asm +++ b/data/maps/headers/Route15Gate1F.asm diff --git a/data/maps/headers/Route15Gate2F.asm b/data/maps/headers/Route15Gate2F.asm index 8ca89872..8ca89872 100755..100644 --- a/data/maps/headers/Route15Gate2F.asm +++ b/data/maps/headers/Route15Gate2F.asm diff --git a/data/maps/headers/Route16.asm b/data/maps/headers/Route16.asm index 423c7af2..423c7af2 100755..100644 --- a/data/maps/headers/Route16.asm +++ b/data/maps/headers/Route16.asm diff --git a/data/maps/headers/Route16FlyHouse.asm b/data/maps/headers/Route16FlyHouse.asm index 240b6df4..240b6df4 100755..100644 --- a/data/maps/headers/Route16FlyHouse.asm +++ b/data/maps/headers/Route16FlyHouse.asm diff --git a/data/maps/headers/Route16Gate1F.asm b/data/maps/headers/Route16Gate1F.asm index 74fd1b7f..74fd1b7f 100755..100644 --- a/data/maps/headers/Route16Gate1F.asm +++ b/data/maps/headers/Route16Gate1F.asm diff --git a/data/maps/headers/Route16Gate2F.asm b/data/maps/headers/Route16Gate2F.asm index ed889f4b..ed889f4b 100755..100644 --- a/data/maps/headers/Route16Gate2F.asm +++ b/data/maps/headers/Route16Gate2F.asm diff --git a/data/maps/headers/Route17.asm b/data/maps/headers/Route17.asm index 5e853299..5e853299 100755..100644 --- a/data/maps/headers/Route17.asm +++ b/data/maps/headers/Route17.asm diff --git a/data/maps/headers/Route18.asm b/data/maps/headers/Route18.asm index 34573051..34573051 100755..100644 --- a/data/maps/headers/Route18.asm +++ b/data/maps/headers/Route18.asm diff --git a/data/maps/headers/Route18Gate1F.asm b/data/maps/headers/Route18Gate1F.asm index 2847e0e3..2847e0e3 100755..100644 --- a/data/maps/headers/Route18Gate1F.asm +++ b/data/maps/headers/Route18Gate1F.asm diff --git a/data/maps/headers/Route18Gate2F.asm b/data/maps/headers/Route18Gate2F.asm index f25fa700..f25fa700 100755..100644 --- a/data/maps/headers/Route18Gate2F.asm +++ b/data/maps/headers/Route18Gate2F.asm diff --git a/data/maps/headers/Route19.asm b/data/maps/headers/Route19.asm index 7f01c804..7f01c804 100755..100644 --- a/data/maps/headers/Route19.asm +++ b/data/maps/headers/Route19.asm diff --git a/data/maps/headers/Route2.asm b/data/maps/headers/Route2.asm index 521eef69..521eef69 100755..100644 --- a/data/maps/headers/Route2.asm +++ b/data/maps/headers/Route2.asm diff --git a/data/maps/headers/Route20.asm b/data/maps/headers/Route20.asm index 3495b785..3495b785 100755..100644 --- a/data/maps/headers/Route20.asm +++ b/data/maps/headers/Route20.asm diff --git a/data/maps/headers/Route21.asm b/data/maps/headers/Route21.asm index 803bf217..803bf217 100755..100644 --- a/data/maps/headers/Route21.asm +++ b/data/maps/headers/Route21.asm diff --git a/data/maps/headers/Route22.asm b/data/maps/headers/Route22.asm index e235efa1..e235efa1 100755..100644 --- a/data/maps/headers/Route22.asm +++ b/data/maps/headers/Route22.asm diff --git a/data/maps/headers/Route22Gate.asm b/data/maps/headers/Route22Gate.asm index a9d1dd37..a9d1dd37 100755..100644 --- a/data/maps/headers/Route22Gate.asm +++ b/data/maps/headers/Route22Gate.asm diff --git a/data/maps/headers/Route23.asm b/data/maps/headers/Route23.asm index e1535c9d..e1535c9d 100755..100644 --- a/data/maps/headers/Route23.asm +++ b/data/maps/headers/Route23.asm diff --git a/data/maps/headers/Route24.asm b/data/maps/headers/Route24.asm index faf53660..faf53660 100755..100644 --- a/data/maps/headers/Route24.asm +++ b/data/maps/headers/Route24.asm diff --git a/data/maps/headers/Route25.asm b/data/maps/headers/Route25.asm index 1873d19b..1873d19b 100755..100644 --- a/data/maps/headers/Route25.asm +++ b/data/maps/headers/Route25.asm diff --git a/data/maps/headers/Route2Gate.asm b/data/maps/headers/Route2Gate.asm index 730d8f2d..730d8f2d 100755..100644 --- a/data/maps/headers/Route2Gate.asm +++ b/data/maps/headers/Route2Gate.asm diff --git a/data/maps/headers/Route2TradeHouse.asm b/data/maps/headers/Route2TradeHouse.asm index b9937dad..b9937dad 100755..100644 --- a/data/maps/headers/Route2TradeHouse.asm +++ b/data/maps/headers/Route2TradeHouse.asm diff --git a/data/maps/headers/Route3.asm b/data/maps/headers/Route3.asm index ddbd7783..ddbd7783 100755..100644 --- a/data/maps/headers/Route3.asm +++ b/data/maps/headers/Route3.asm diff --git a/data/maps/headers/Route4.asm b/data/maps/headers/Route4.asm index 6c43171a..6c43171a 100755..100644 --- a/data/maps/headers/Route4.asm +++ b/data/maps/headers/Route4.asm diff --git a/data/maps/headers/Route5.asm b/data/maps/headers/Route5.asm index ea84090c..ea84090c 100755..100644 --- a/data/maps/headers/Route5.asm +++ b/data/maps/headers/Route5.asm diff --git a/data/maps/headers/Route5Gate.asm b/data/maps/headers/Route5Gate.asm index a0115533..a0115533 100755..100644 --- a/data/maps/headers/Route5Gate.asm +++ b/data/maps/headers/Route5Gate.asm diff --git a/data/maps/headers/Route6.asm b/data/maps/headers/Route6.asm index 956aa4d6..956aa4d6 100755..100644 --- a/data/maps/headers/Route6.asm +++ b/data/maps/headers/Route6.asm diff --git a/data/maps/headers/Route6Gate.asm b/data/maps/headers/Route6Gate.asm index f80b57c8..f80b57c8 100755..100644 --- a/data/maps/headers/Route6Gate.asm +++ b/data/maps/headers/Route6Gate.asm diff --git a/data/maps/headers/Route7.asm b/data/maps/headers/Route7.asm index 8368c3fe..8368c3fe 100755..100644 --- a/data/maps/headers/Route7.asm +++ b/data/maps/headers/Route7.asm diff --git a/data/maps/headers/Route7Gate.asm b/data/maps/headers/Route7Gate.asm index e9b9b16d..e9b9b16d 100755..100644 --- a/data/maps/headers/Route7Gate.asm +++ b/data/maps/headers/Route7Gate.asm diff --git a/data/maps/headers/Route8.asm b/data/maps/headers/Route8.asm index 8df9e023..8df9e023 100755..100644 --- a/data/maps/headers/Route8.asm +++ b/data/maps/headers/Route8.asm diff --git a/data/maps/headers/Route8Gate.asm b/data/maps/headers/Route8Gate.asm index f6a320a4..f6a320a4 100755..100644 --- a/data/maps/headers/Route8Gate.asm +++ b/data/maps/headers/Route8Gate.asm diff --git a/data/maps/headers/Route9.asm b/data/maps/headers/Route9.asm index c1ed9225..c1ed9225 100755..100644 --- a/data/maps/headers/Route9.asm +++ b/data/maps/headers/Route9.asm diff --git a/data/maps/headers/SSAnne1F.asm b/data/maps/headers/SSAnne1F.asm index 80d25e2d..80d25e2d 100755..100644 --- a/data/maps/headers/SSAnne1F.asm +++ b/data/maps/headers/SSAnne1F.asm diff --git a/data/maps/headers/SSAnne1FRooms.asm b/data/maps/headers/SSAnne1FRooms.asm index 8bdd8d00..8bdd8d00 100755..100644 --- a/data/maps/headers/SSAnne1FRooms.asm +++ b/data/maps/headers/SSAnne1FRooms.asm diff --git a/data/maps/headers/SSAnne2F.asm b/data/maps/headers/SSAnne2F.asm index b2fe14d7..b2fe14d7 100755..100644 --- a/data/maps/headers/SSAnne2F.asm +++ b/data/maps/headers/SSAnne2F.asm diff --git a/data/maps/headers/SSAnne2FRooms.asm b/data/maps/headers/SSAnne2FRooms.asm index 2d349e4c..2d349e4c 100755..100644 --- a/data/maps/headers/SSAnne2FRooms.asm +++ b/data/maps/headers/SSAnne2FRooms.asm diff --git a/data/maps/headers/SSAnne3F.asm b/data/maps/headers/SSAnne3F.asm index f391a0cd..f391a0cd 100755..100644 --- a/data/maps/headers/SSAnne3F.asm +++ b/data/maps/headers/SSAnne3F.asm diff --git a/data/maps/headers/SSAnneB1F.asm b/data/maps/headers/SSAnneB1F.asm index c21d7cff..c21d7cff 100755..100644 --- a/data/maps/headers/SSAnneB1F.asm +++ b/data/maps/headers/SSAnneB1F.asm diff --git a/data/maps/headers/SSAnneB1FRooms.asm b/data/maps/headers/SSAnneB1FRooms.asm index 1b8b4620..1b8b4620 100755..100644 --- a/data/maps/headers/SSAnneB1FRooms.asm +++ b/data/maps/headers/SSAnneB1FRooms.asm diff --git a/data/maps/headers/SSAnneBow.asm b/data/maps/headers/SSAnneBow.asm index 2195e970..2195e970 100755..100644 --- a/data/maps/headers/SSAnneBow.asm +++ b/data/maps/headers/SSAnneBow.asm diff --git a/data/maps/headers/SSAnneCaptainsRoom.asm b/data/maps/headers/SSAnneCaptainsRoom.asm index a24f930d..a24f930d 100755..100644 --- a/data/maps/headers/SSAnneCaptainsRoom.asm +++ b/data/maps/headers/SSAnneCaptainsRoom.asm diff --git a/data/maps/headers/SSAnneKitchen.asm b/data/maps/headers/SSAnneKitchen.asm index 47e84fbe..47e84fbe 100755..100644 --- a/data/maps/headers/SSAnneKitchen.asm +++ b/data/maps/headers/SSAnneKitchen.asm diff --git a/data/maps/headers/SafariZoneCenter.asm b/data/maps/headers/SafariZoneCenter.asm index ccc58ed1..ccc58ed1 100755..100644 --- a/data/maps/headers/SafariZoneCenter.asm +++ b/data/maps/headers/SafariZoneCenter.asm diff --git a/data/maps/headers/SafariZoneCenterRestHouse.asm b/data/maps/headers/SafariZoneCenterRestHouse.asm index a866003f..a866003f 100755..100644 --- a/data/maps/headers/SafariZoneCenterRestHouse.asm +++ b/data/maps/headers/SafariZoneCenterRestHouse.asm diff --git a/data/maps/headers/SafariZoneEast.asm b/data/maps/headers/SafariZoneEast.asm index c23e9334..c23e9334 100755..100644 --- a/data/maps/headers/SafariZoneEast.asm +++ b/data/maps/headers/SafariZoneEast.asm diff --git a/data/maps/headers/SafariZoneEastRestHouse.asm b/data/maps/headers/SafariZoneEastRestHouse.asm index 1f8d76c6..1f8d76c6 100755..100644 --- a/data/maps/headers/SafariZoneEastRestHouse.asm +++ b/data/maps/headers/SafariZoneEastRestHouse.asm diff --git a/data/maps/headers/SafariZoneGate.asm b/data/maps/headers/SafariZoneGate.asm index 7816460d..7816460d 100755..100644 --- a/data/maps/headers/SafariZoneGate.asm +++ b/data/maps/headers/SafariZoneGate.asm diff --git a/data/maps/headers/SafariZoneNorth.asm b/data/maps/headers/SafariZoneNorth.asm index 32639d22..32639d22 100755..100644 --- a/data/maps/headers/SafariZoneNorth.asm +++ b/data/maps/headers/SafariZoneNorth.asm diff --git a/data/maps/headers/SafariZoneNorthRestHouse.asm b/data/maps/headers/SafariZoneNorthRestHouse.asm index ec083803..ec083803 100755..100644 --- a/data/maps/headers/SafariZoneNorthRestHouse.asm +++ b/data/maps/headers/SafariZoneNorthRestHouse.asm diff --git a/data/maps/headers/SafariZoneSecretHouse.asm b/data/maps/headers/SafariZoneSecretHouse.asm index 630577c4..630577c4 100755..100644 --- a/data/maps/headers/SafariZoneSecretHouse.asm +++ b/data/maps/headers/SafariZoneSecretHouse.asm diff --git a/data/maps/headers/SafariZoneWest.asm b/data/maps/headers/SafariZoneWest.asm index a1117d09..a1117d09 100755..100644 --- a/data/maps/headers/SafariZoneWest.asm +++ b/data/maps/headers/SafariZoneWest.asm diff --git a/data/maps/headers/SafariZoneWestRestHouse.asm b/data/maps/headers/SafariZoneWestRestHouse.asm index e4618e1d..e4618e1d 100755..100644 --- a/data/maps/headers/SafariZoneWestRestHouse.asm +++ b/data/maps/headers/SafariZoneWestRestHouse.asm diff --git a/data/maps/headers/SaffronCity.asm b/data/maps/headers/SaffronCity.asm index ee1f71e4..ee1f71e4 100755..100644 --- a/data/maps/headers/SaffronCity.asm +++ b/data/maps/headers/SaffronCity.asm diff --git a/data/maps/headers/SaffronGym.asm b/data/maps/headers/SaffronGym.asm index 14ee3323..14ee3323 100755..100644 --- a/data/maps/headers/SaffronGym.asm +++ b/data/maps/headers/SaffronGym.asm diff --git a/data/maps/headers/SaffronMart.asm b/data/maps/headers/SaffronMart.asm index f03132d2..f03132d2 100755..100644 --- a/data/maps/headers/SaffronMart.asm +++ b/data/maps/headers/SaffronMart.asm diff --git a/data/maps/headers/SaffronPidgeyHouse.asm b/data/maps/headers/SaffronPidgeyHouse.asm index e9f8dde7..e9f8dde7 100755..100644 --- a/data/maps/headers/SaffronPidgeyHouse.asm +++ b/data/maps/headers/SaffronPidgeyHouse.asm diff --git a/data/maps/headers/SaffronPokecenter.asm b/data/maps/headers/SaffronPokecenter.asm index 9b250050..9b250050 100755..100644 --- a/data/maps/headers/SaffronPokecenter.asm +++ b/data/maps/headers/SaffronPokecenter.asm diff --git a/data/maps/headers/SeafoamIslands1F.asm b/data/maps/headers/SeafoamIslands1F.asm index db530549..db530549 100755..100644 --- a/data/maps/headers/SeafoamIslands1F.asm +++ b/data/maps/headers/SeafoamIslands1F.asm diff --git a/data/maps/headers/SeafoamIslandsB1F.asm b/data/maps/headers/SeafoamIslandsB1F.asm index 589eef93..589eef93 100755..100644 --- a/data/maps/headers/SeafoamIslandsB1F.asm +++ b/data/maps/headers/SeafoamIslandsB1F.asm diff --git a/data/maps/headers/SeafoamIslandsB2F.asm b/data/maps/headers/SeafoamIslandsB2F.asm index f7e624ed..f7e624ed 100755..100644 --- a/data/maps/headers/SeafoamIslandsB2F.asm +++ b/data/maps/headers/SeafoamIslandsB2F.asm diff --git a/data/maps/headers/SeafoamIslandsB3F.asm b/data/maps/headers/SeafoamIslandsB3F.asm index b57da3c0..b57da3c0 100755..100644 --- a/data/maps/headers/SeafoamIslandsB3F.asm +++ b/data/maps/headers/SeafoamIslandsB3F.asm diff --git a/data/maps/headers/SeafoamIslandsB4F.asm b/data/maps/headers/SeafoamIslandsB4F.asm index bae1e3a2..bae1e3a2 100755..100644 --- a/data/maps/headers/SeafoamIslandsB4F.asm +++ b/data/maps/headers/SeafoamIslandsB4F.asm diff --git a/data/maps/headers/SilphCo10F.asm b/data/maps/headers/SilphCo10F.asm index 7a6786e7..7a6786e7 100755..100644 --- a/data/maps/headers/SilphCo10F.asm +++ b/data/maps/headers/SilphCo10F.asm diff --git a/data/maps/headers/SilphCo11F.asm b/data/maps/headers/SilphCo11F.asm index 72eaaca2..72eaaca2 100755..100644 --- a/data/maps/headers/SilphCo11F.asm +++ b/data/maps/headers/SilphCo11F.asm diff --git a/data/maps/headers/SilphCo1F.asm b/data/maps/headers/SilphCo1F.asm index 4c4ac97d..4c4ac97d 100755..100644 --- a/data/maps/headers/SilphCo1F.asm +++ b/data/maps/headers/SilphCo1F.asm diff --git a/data/maps/headers/SilphCo2F.asm b/data/maps/headers/SilphCo2F.asm index 7dc44a55..7dc44a55 100755..100644 --- a/data/maps/headers/SilphCo2F.asm +++ b/data/maps/headers/SilphCo2F.asm diff --git a/data/maps/headers/SilphCo3F.asm b/data/maps/headers/SilphCo3F.asm index 99e4aa15..99e4aa15 100755..100644 --- a/data/maps/headers/SilphCo3F.asm +++ b/data/maps/headers/SilphCo3F.asm diff --git a/data/maps/headers/SilphCo4F.asm b/data/maps/headers/SilphCo4F.asm index 8eed0f9a..8eed0f9a 100755..100644 --- a/data/maps/headers/SilphCo4F.asm +++ b/data/maps/headers/SilphCo4F.asm diff --git a/data/maps/headers/SilphCo5F.asm b/data/maps/headers/SilphCo5F.asm index 3b40c360..3b40c360 100755..100644 --- a/data/maps/headers/SilphCo5F.asm +++ b/data/maps/headers/SilphCo5F.asm diff --git a/data/maps/headers/SilphCo6F.asm b/data/maps/headers/SilphCo6F.asm index 3d2b3b8c..3d2b3b8c 100755..100644 --- a/data/maps/headers/SilphCo6F.asm +++ b/data/maps/headers/SilphCo6F.asm diff --git a/data/maps/headers/SilphCo7F.asm b/data/maps/headers/SilphCo7F.asm index 1591837a..1591837a 100755..100644 --- a/data/maps/headers/SilphCo7F.asm +++ b/data/maps/headers/SilphCo7F.asm diff --git a/data/maps/headers/SilphCo8F.asm b/data/maps/headers/SilphCo8F.asm index e676fa86..e676fa86 100755..100644 --- a/data/maps/headers/SilphCo8F.asm +++ b/data/maps/headers/SilphCo8F.asm diff --git a/data/maps/headers/SilphCo9F.asm b/data/maps/headers/SilphCo9F.asm index 89f0300a..89f0300a 100755..100644 --- a/data/maps/headers/SilphCo9F.asm +++ b/data/maps/headers/SilphCo9F.asm diff --git a/data/maps/headers/SilphCoElevator.asm b/data/maps/headers/SilphCoElevator.asm index 4dd9cd9f..4dd9cd9f 100755..100644 --- a/data/maps/headers/SilphCoElevator.asm +++ b/data/maps/headers/SilphCoElevator.asm diff --git a/data/maps/headers/TradeCenter.asm b/data/maps/headers/TradeCenter.asm index 268d76b2..268d76b2 100755..100644 --- a/data/maps/headers/TradeCenter.asm +++ b/data/maps/headers/TradeCenter.asm diff --git a/data/maps/headers/UndergroundPathNorthSouth.asm b/data/maps/headers/UndergroundPathNorthSouth.asm index 4bb03c79..4bb03c79 100755..100644 --- a/data/maps/headers/UndergroundPathNorthSouth.asm +++ b/data/maps/headers/UndergroundPathNorthSouth.asm diff --git a/data/maps/headers/UndergroundPathRoute5.asm b/data/maps/headers/UndergroundPathRoute5.asm index 18287254..18287254 100755..100644 --- a/data/maps/headers/UndergroundPathRoute5.asm +++ b/data/maps/headers/UndergroundPathRoute5.asm diff --git a/data/maps/headers/UndergroundPathRoute6.asm b/data/maps/headers/UndergroundPathRoute6.asm index 67772543..67772543 100755..100644 --- a/data/maps/headers/UndergroundPathRoute6.asm +++ b/data/maps/headers/UndergroundPathRoute6.asm diff --git a/data/maps/headers/UndergroundPathRoute7.asm b/data/maps/headers/UndergroundPathRoute7.asm index d70548ed..d70548ed 100755..100644 --- a/data/maps/headers/UndergroundPathRoute7.asm +++ b/data/maps/headers/UndergroundPathRoute7.asm diff --git a/data/maps/headers/UndergroundPathRoute7Copy.asm b/data/maps/headers/UndergroundPathRoute7Copy.asm index 30bb70a8..30bb70a8 100755..100644 --- a/data/maps/headers/UndergroundPathRoute7Copy.asm +++ b/data/maps/headers/UndergroundPathRoute7Copy.asm diff --git a/data/maps/headers/UndergroundPathRoute8.asm b/data/maps/headers/UndergroundPathRoute8.asm index 102d8413..102d8413 100755..100644 --- a/data/maps/headers/UndergroundPathRoute8.asm +++ b/data/maps/headers/UndergroundPathRoute8.asm diff --git a/data/maps/headers/UndergroundPathWestEast.asm b/data/maps/headers/UndergroundPathWestEast.asm index 05976e87..05976e87 100755..100644 --- a/data/maps/headers/UndergroundPathWestEast.asm +++ b/data/maps/headers/UndergroundPathWestEast.asm diff --git a/data/maps/headers/VermilionCity.asm b/data/maps/headers/VermilionCity.asm index e211562c..e211562c 100755..100644 --- a/data/maps/headers/VermilionCity.asm +++ b/data/maps/headers/VermilionCity.asm diff --git a/data/maps/headers/VermilionDock.asm b/data/maps/headers/VermilionDock.asm index 9a9b61c2..9a9b61c2 100755..100644 --- a/data/maps/headers/VermilionDock.asm +++ b/data/maps/headers/VermilionDock.asm diff --git a/data/maps/headers/VermilionGym.asm b/data/maps/headers/VermilionGym.asm index ca75b8c1..ca75b8c1 100755..100644 --- a/data/maps/headers/VermilionGym.asm +++ b/data/maps/headers/VermilionGym.asm diff --git a/data/maps/headers/VermilionMart.asm b/data/maps/headers/VermilionMart.asm index 5777db4b..5777db4b 100755..100644 --- a/data/maps/headers/VermilionMart.asm +++ b/data/maps/headers/VermilionMart.asm diff --git a/data/maps/headers/VermilionOldRodHouse.asm b/data/maps/headers/VermilionOldRodHouse.asm index f9c890e0..f9c890e0 100755..100644 --- a/data/maps/headers/VermilionOldRodHouse.asm +++ b/data/maps/headers/VermilionOldRodHouse.asm diff --git a/data/maps/headers/VermilionPidgeyHouse.asm b/data/maps/headers/VermilionPidgeyHouse.asm index afb81784..afb81784 100755..100644 --- a/data/maps/headers/VermilionPidgeyHouse.asm +++ b/data/maps/headers/VermilionPidgeyHouse.asm diff --git a/data/maps/headers/VermilionPokecenter.asm b/data/maps/headers/VermilionPokecenter.asm index af9827ac..af9827ac 100755..100644 --- a/data/maps/headers/VermilionPokecenter.asm +++ b/data/maps/headers/VermilionPokecenter.asm diff --git a/data/maps/headers/VermilionTradeHouse.asm b/data/maps/headers/VermilionTradeHouse.asm index 3cb82c47..3cb82c47 100755..100644 --- a/data/maps/headers/VermilionTradeHouse.asm +++ b/data/maps/headers/VermilionTradeHouse.asm diff --git a/data/maps/headers/VictoryRoad1F.asm b/data/maps/headers/VictoryRoad1F.asm index dae95f16..dae95f16 100755..100644 --- a/data/maps/headers/VictoryRoad1F.asm +++ b/data/maps/headers/VictoryRoad1F.asm diff --git a/data/maps/headers/VictoryRoad2F.asm b/data/maps/headers/VictoryRoad2F.asm index 99079ad3..99079ad3 100755..100644 --- a/data/maps/headers/VictoryRoad2F.asm +++ b/data/maps/headers/VictoryRoad2F.asm diff --git a/data/maps/headers/VictoryRoad3F.asm b/data/maps/headers/VictoryRoad3F.asm index bc15cad7..bc15cad7 100755..100644 --- a/data/maps/headers/VictoryRoad3F.asm +++ b/data/maps/headers/VictoryRoad3F.asm diff --git a/data/maps/headers/ViridianCity.asm b/data/maps/headers/ViridianCity.asm index 0771cc81..0771cc81 100755..100644 --- a/data/maps/headers/ViridianCity.asm +++ b/data/maps/headers/ViridianCity.asm diff --git a/data/maps/headers/ViridianForest.asm b/data/maps/headers/ViridianForest.asm index d531ec86..d531ec86 100755..100644 --- a/data/maps/headers/ViridianForest.asm +++ b/data/maps/headers/ViridianForest.asm diff --git a/data/maps/headers/ViridianForestNorthGate.asm b/data/maps/headers/ViridianForestNorthGate.asm index 5bfcd6ed..5bfcd6ed 100755..100644 --- a/data/maps/headers/ViridianForestNorthGate.asm +++ b/data/maps/headers/ViridianForestNorthGate.asm diff --git a/data/maps/headers/ViridianForestSouthGate.asm b/data/maps/headers/ViridianForestSouthGate.asm index 87a49284..87a49284 100755..100644 --- a/data/maps/headers/ViridianForestSouthGate.asm +++ b/data/maps/headers/ViridianForestSouthGate.asm diff --git a/data/maps/headers/ViridianGym.asm b/data/maps/headers/ViridianGym.asm index 640a71b6..640a71b6 100755..100644 --- a/data/maps/headers/ViridianGym.asm +++ b/data/maps/headers/ViridianGym.asm diff --git a/data/maps/headers/ViridianMart.asm b/data/maps/headers/ViridianMart.asm index 817b5265..817b5265 100755..100644 --- a/data/maps/headers/ViridianMart.asm +++ b/data/maps/headers/ViridianMart.asm diff --git a/data/maps/headers/ViridianNicknameHouse.asm b/data/maps/headers/ViridianNicknameHouse.asm index 5a7c272f..5a7c272f 100755..100644 --- a/data/maps/headers/ViridianNicknameHouse.asm +++ b/data/maps/headers/ViridianNicknameHouse.asm diff --git a/data/maps/headers/ViridianPokecenter.asm b/data/maps/headers/ViridianPokecenter.asm index daac19f3..daac19f3 100755..100644 --- a/data/maps/headers/ViridianPokecenter.asm +++ b/data/maps/headers/ViridianPokecenter.asm diff --git a/data/maps/headers/ViridianSchoolHouse.asm b/data/maps/headers/ViridianSchoolHouse.asm index f5b77212..f5b77212 100755..100644 --- a/data/maps/headers/ViridianSchoolHouse.asm +++ b/data/maps/headers/ViridianSchoolHouse.asm diff --git a/data/maps/headers/WardensHouse.asm b/data/maps/headers/WardensHouse.asm index 08216f59..08216f59 100755..100644 --- a/data/maps/headers/WardensHouse.asm +++ b/data/maps/headers/WardensHouse.asm diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index fa0599f4..fa0599f4 100755..100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm diff --git a/data/maps/map_header_banks.asm b/data/maps/map_header_banks.asm index d698cfee..d698cfee 100755..100644 --- a/data/maps/map_header_banks.asm +++ b/data/maps/map_header_banks.asm diff --git a/data/maps/map_header_pointers.asm b/data/maps/map_header_pointers.asm index 9d85eaae..9d85eaae 100755..100644 --- a/data/maps/map_header_pointers.asm +++ b/data/maps/map_header_pointers.asm diff --git a/data/maps/names.asm b/data/maps/names.asm index 70b08f16..70b08f16 100755..100644 --- a/data/maps/names.asm +++ b/data/maps/names.asm diff --git a/data/maps/objects/AgathasRoom.asm b/data/maps/objects/AgathasRoom.asm index 0f00ea20..0f00ea20 100755..100644 --- a/data/maps/objects/AgathasRoom.asm +++ b/data/maps/objects/AgathasRoom.asm diff --git a/data/maps/objects/BikeShop.asm b/data/maps/objects/BikeShop.asm index 6a6fe6d6..6a6fe6d6 100755..100644 --- a/data/maps/objects/BikeShop.asm +++ b/data/maps/objects/BikeShop.asm diff --git a/data/maps/objects/BillsHouse.asm b/data/maps/objects/BillsHouse.asm index fad8df05..fad8df05 100755..100644 --- a/data/maps/objects/BillsHouse.asm +++ b/data/maps/objects/BillsHouse.asm diff --git a/data/maps/objects/BluesHouse.asm b/data/maps/objects/BluesHouse.asm index 4858b785..4858b785 100755..100644 --- a/data/maps/objects/BluesHouse.asm +++ b/data/maps/objects/BluesHouse.asm diff --git a/data/maps/objects/BrunosRoom.asm b/data/maps/objects/BrunosRoom.asm index f5399874..f5399874 100755..100644 --- a/data/maps/objects/BrunosRoom.asm +++ b/data/maps/objects/BrunosRoom.asm diff --git a/data/maps/objects/CeladonChiefHouse.asm b/data/maps/objects/CeladonChiefHouse.asm index 97b9e4c9..97b9e4c9 100755..100644 --- a/data/maps/objects/CeladonChiefHouse.asm +++ b/data/maps/objects/CeladonChiefHouse.asm diff --git a/data/maps/objects/CeladonCity.asm b/data/maps/objects/CeladonCity.asm index ddf0afdb..ddf0afdb 100755..100644 --- a/data/maps/objects/CeladonCity.asm +++ b/data/maps/objects/CeladonCity.asm diff --git a/data/maps/objects/CeladonDiner.asm b/data/maps/objects/CeladonDiner.asm index 37c8c876..37c8c876 100755..100644 --- a/data/maps/objects/CeladonDiner.asm +++ b/data/maps/objects/CeladonDiner.asm diff --git a/data/maps/objects/CeladonGym.asm b/data/maps/objects/CeladonGym.asm index 197a254b..197a254b 100755..100644 --- a/data/maps/objects/CeladonGym.asm +++ b/data/maps/objects/CeladonGym.asm diff --git a/data/maps/objects/CeladonHotel.asm b/data/maps/objects/CeladonHotel.asm index a516f141..a516f141 100755..100644 --- a/data/maps/objects/CeladonHotel.asm +++ b/data/maps/objects/CeladonHotel.asm diff --git a/data/maps/objects/CeladonMansion1F.asm b/data/maps/objects/CeladonMansion1F.asm index 63eb686c..63eb686c 100755..100644 --- a/data/maps/objects/CeladonMansion1F.asm +++ b/data/maps/objects/CeladonMansion1F.asm diff --git a/data/maps/objects/CeladonMansion2F.asm b/data/maps/objects/CeladonMansion2F.asm index 211abbda..211abbda 100755..100644 --- a/data/maps/objects/CeladonMansion2F.asm +++ b/data/maps/objects/CeladonMansion2F.asm diff --git a/data/maps/objects/CeladonMansion3F.asm b/data/maps/objects/CeladonMansion3F.asm index 442f3c23..442f3c23 100755..100644 --- a/data/maps/objects/CeladonMansion3F.asm +++ b/data/maps/objects/CeladonMansion3F.asm diff --git a/data/maps/objects/CeladonMansionRoof.asm b/data/maps/objects/CeladonMansionRoof.asm index e3eb8aa7..e3eb8aa7 100755..100644 --- a/data/maps/objects/CeladonMansionRoof.asm +++ b/data/maps/objects/CeladonMansionRoof.asm diff --git a/data/maps/objects/CeladonMansionRoofHouse.asm b/data/maps/objects/CeladonMansionRoofHouse.asm index 1656bdcf..1656bdcf 100755..100644 --- a/data/maps/objects/CeladonMansionRoofHouse.asm +++ b/data/maps/objects/CeladonMansionRoofHouse.asm diff --git a/data/maps/objects/CeladonMart1F.asm b/data/maps/objects/CeladonMart1F.asm index 3edcbe3f..3edcbe3f 100755..100644 --- a/data/maps/objects/CeladonMart1F.asm +++ b/data/maps/objects/CeladonMart1F.asm diff --git a/data/maps/objects/CeladonMart2F.asm b/data/maps/objects/CeladonMart2F.asm index 19b2aa59..19b2aa59 100755..100644 --- a/data/maps/objects/CeladonMart2F.asm +++ b/data/maps/objects/CeladonMart2F.asm diff --git a/data/maps/objects/CeladonMart3F.asm b/data/maps/objects/CeladonMart3F.asm index e1e8c8f2..e1e8c8f2 100755..100644 --- a/data/maps/objects/CeladonMart3F.asm +++ b/data/maps/objects/CeladonMart3F.asm diff --git a/data/maps/objects/CeladonMart4F.asm b/data/maps/objects/CeladonMart4F.asm index 72ed0338..72ed0338 100755..100644 --- a/data/maps/objects/CeladonMart4F.asm +++ b/data/maps/objects/CeladonMart4F.asm diff --git a/data/maps/objects/CeladonMart5F.asm b/data/maps/objects/CeladonMart5F.asm index 2583526c..2583526c 100755..100644 --- a/data/maps/objects/CeladonMart5F.asm +++ b/data/maps/objects/CeladonMart5F.asm diff --git a/data/maps/objects/CeladonMartElevator.asm b/data/maps/objects/CeladonMartElevator.asm index d03984a6..d03984a6 100755..100644 --- a/data/maps/objects/CeladonMartElevator.asm +++ b/data/maps/objects/CeladonMartElevator.asm diff --git a/data/maps/objects/CeladonMartRoof.asm b/data/maps/objects/CeladonMartRoof.asm index 49b5ab6f..49b5ab6f 100755..100644 --- a/data/maps/objects/CeladonMartRoof.asm +++ b/data/maps/objects/CeladonMartRoof.asm diff --git a/data/maps/objects/CeladonPokecenter.asm b/data/maps/objects/CeladonPokecenter.asm index 65a04a1c..65a04a1c 100755..100644 --- a/data/maps/objects/CeladonPokecenter.asm +++ b/data/maps/objects/CeladonPokecenter.asm diff --git a/data/maps/objects/CeruleanBadgeHouse.asm b/data/maps/objects/CeruleanBadgeHouse.asm index 50d2087a..50d2087a 100755..100644 --- a/data/maps/objects/CeruleanBadgeHouse.asm +++ b/data/maps/objects/CeruleanBadgeHouse.asm diff --git a/data/maps/objects/CeruleanCave1F.asm b/data/maps/objects/CeruleanCave1F.asm index 7e5e8c85..7e5e8c85 100755..100644 --- a/data/maps/objects/CeruleanCave1F.asm +++ b/data/maps/objects/CeruleanCave1F.asm diff --git a/data/maps/objects/CeruleanCave2F.asm b/data/maps/objects/CeruleanCave2F.asm index 6622bb77..6622bb77 100755..100644 --- a/data/maps/objects/CeruleanCave2F.asm +++ b/data/maps/objects/CeruleanCave2F.asm diff --git a/data/maps/objects/CeruleanCaveB1F.asm b/data/maps/objects/CeruleanCaveB1F.asm index 886238c2..886238c2 100755..100644 --- a/data/maps/objects/CeruleanCaveB1F.asm +++ b/data/maps/objects/CeruleanCaveB1F.asm diff --git a/data/maps/objects/CeruleanCity.asm b/data/maps/objects/CeruleanCity.asm index 9b15c1c5..9b15c1c5 100755..100644 --- a/data/maps/objects/CeruleanCity.asm +++ b/data/maps/objects/CeruleanCity.asm diff --git a/data/maps/objects/CeruleanGym.asm b/data/maps/objects/CeruleanGym.asm index 26709cae..26709cae 100755..100644 --- a/data/maps/objects/CeruleanGym.asm +++ b/data/maps/objects/CeruleanGym.asm diff --git a/data/maps/objects/CeruleanMart.asm b/data/maps/objects/CeruleanMart.asm index 144edd80..144edd80 100755..100644 --- a/data/maps/objects/CeruleanMart.asm +++ b/data/maps/objects/CeruleanMart.asm diff --git a/data/maps/objects/CeruleanPokecenter.asm b/data/maps/objects/CeruleanPokecenter.asm index af6c0ac3..af6c0ac3 100755..100644 --- a/data/maps/objects/CeruleanPokecenter.asm +++ b/data/maps/objects/CeruleanPokecenter.asm diff --git a/data/maps/objects/CeruleanTradeHouse.asm b/data/maps/objects/CeruleanTradeHouse.asm index 04638ded..04638ded 100755..100644 --- a/data/maps/objects/CeruleanTradeHouse.asm +++ b/data/maps/objects/CeruleanTradeHouse.asm diff --git a/data/maps/objects/CeruleanTrashedHouse.asm b/data/maps/objects/CeruleanTrashedHouse.asm index 9f502319..9f502319 100755..100644 --- a/data/maps/objects/CeruleanTrashedHouse.asm +++ b/data/maps/objects/CeruleanTrashedHouse.asm diff --git a/data/maps/objects/ChampionsRoom.asm b/data/maps/objects/ChampionsRoom.asm index 2380fd04..2380fd04 100755..100644 --- a/data/maps/objects/ChampionsRoom.asm +++ b/data/maps/objects/ChampionsRoom.asm diff --git a/data/maps/objects/CinnabarGym.asm b/data/maps/objects/CinnabarGym.asm index b2dccbd3..b2dccbd3 100755..100644 --- a/data/maps/objects/CinnabarGym.asm +++ b/data/maps/objects/CinnabarGym.asm diff --git a/data/maps/objects/CinnabarIsland.asm b/data/maps/objects/CinnabarIsland.asm index 1dd11a43..1dd11a43 100755..100644 --- a/data/maps/objects/CinnabarIsland.asm +++ b/data/maps/objects/CinnabarIsland.asm diff --git a/data/maps/objects/CinnabarLab.asm b/data/maps/objects/CinnabarLab.asm index 0e007e3a..0e007e3a 100755..100644 --- a/data/maps/objects/CinnabarLab.asm +++ b/data/maps/objects/CinnabarLab.asm diff --git a/data/maps/objects/CinnabarLabFossilRoom.asm b/data/maps/objects/CinnabarLabFossilRoom.asm index 8269eaeb..8269eaeb 100755..100644 --- a/data/maps/objects/CinnabarLabFossilRoom.asm +++ b/data/maps/objects/CinnabarLabFossilRoom.asm diff --git a/data/maps/objects/CinnabarLabMetronomeRoom.asm b/data/maps/objects/CinnabarLabMetronomeRoom.asm index b5969dfa..b5969dfa 100755..100644 --- a/data/maps/objects/CinnabarLabMetronomeRoom.asm +++ b/data/maps/objects/CinnabarLabMetronomeRoom.asm diff --git a/data/maps/objects/CinnabarLabTradeRoom.asm b/data/maps/objects/CinnabarLabTradeRoom.asm index e23a19cf..e23a19cf 100755..100644 --- a/data/maps/objects/CinnabarLabTradeRoom.asm +++ b/data/maps/objects/CinnabarLabTradeRoom.asm diff --git a/data/maps/objects/CinnabarMart.asm b/data/maps/objects/CinnabarMart.asm index 2413d993..2413d993 100755..100644 --- a/data/maps/objects/CinnabarMart.asm +++ b/data/maps/objects/CinnabarMart.asm diff --git a/data/maps/objects/CinnabarPokecenter.asm b/data/maps/objects/CinnabarPokecenter.asm index b1d89678..b1d89678 100755..100644 --- a/data/maps/objects/CinnabarPokecenter.asm +++ b/data/maps/objects/CinnabarPokecenter.asm diff --git a/data/maps/objects/Colosseum.asm b/data/maps/objects/Colosseum.asm index dac9bc09..dac9bc09 100755..100644 --- a/data/maps/objects/Colosseum.asm +++ b/data/maps/objects/Colosseum.asm diff --git a/data/maps/objects/CopycatsHouse1F.asm b/data/maps/objects/CopycatsHouse1F.asm index c1250c91..c1250c91 100755..100644 --- a/data/maps/objects/CopycatsHouse1F.asm +++ b/data/maps/objects/CopycatsHouse1F.asm diff --git a/data/maps/objects/CopycatsHouse2F.asm b/data/maps/objects/CopycatsHouse2F.asm index e04edee7..e04edee7 100755..100644 --- a/data/maps/objects/CopycatsHouse2F.asm +++ b/data/maps/objects/CopycatsHouse2F.asm diff --git a/data/maps/objects/Daycare.asm b/data/maps/objects/Daycare.asm index 2feecff3..2feecff3 100755..100644 --- a/data/maps/objects/Daycare.asm +++ b/data/maps/objects/Daycare.asm diff --git a/data/maps/objects/DiglettsCave.asm b/data/maps/objects/DiglettsCave.asm index dc4889e5..dc4889e5 100755..100644 --- a/data/maps/objects/DiglettsCave.asm +++ b/data/maps/objects/DiglettsCave.asm diff --git a/data/maps/objects/DiglettsCaveRoute11.asm b/data/maps/objects/DiglettsCaveRoute11.asm index f6c884d9..f6c884d9 100755..100644 --- a/data/maps/objects/DiglettsCaveRoute11.asm +++ b/data/maps/objects/DiglettsCaveRoute11.asm diff --git a/data/maps/objects/DiglettsCaveRoute2.asm b/data/maps/objects/DiglettsCaveRoute2.asm index 948a82e3..948a82e3 100755..100644 --- a/data/maps/objects/DiglettsCaveRoute2.asm +++ b/data/maps/objects/DiglettsCaveRoute2.asm diff --git a/data/maps/objects/FightingDojo.asm b/data/maps/objects/FightingDojo.asm index 5345a7aa..5345a7aa 100755..100644 --- a/data/maps/objects/FightingDojo.asm +++ b/data/maps/objects/FightingDojo.asm diff --git a/data/maps/objects/FuchsiaBillsGrandpasHouse.asm b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm index 30aff6c5..30aff6c5 100755..100644 --- a/data/maps/objects/FuchsiaBillsGrandpasHouse.asm +++ b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm diff --git a/data/maps/objects/FuchsiaCity.asm b/data/maps/objects/FuchsiaCity.asm index d0230a01..d0230a01 100755..100644 --- a/data/maps/objects/FuchsiaCity.asm +++ b/data/maps/objects/FuchsiaCity.asm diff --git a/data/maps/objects/FuchsiaGoodRodHouse.asm b/data/maps/objects/FuchsiaGoodRodHouse.asm index 434cec8b..434cec8b 100755..100644 --- a/data/maps/objects/FuchsiaGoodRodHouse.asm +++ b/data/maps/objects/FuchsiaGoodRodHouse.asm diff --git a/data/maps/objects/FuchsiaGym.asm b/data/maps/objects/FuchsiaGym.asm index a48794ff..a48794ff 100755..100644 --- a/data/maps/objects/FuchsiaGym.asm +++ b/data/maps/objects/FuchsiaGym.asm diff --git a/data/maps/objects/FuchsiaMart.asm b/data/maps/objects/FuchsiaMart.asm index 0a238a87..0a238a87 100755..100644 --- a/data/maps/objects/FuchsiaMart.asm +++ b/data/maps/objects/FuchsiaMart.asm diff --git a/data/maps/objects/FuchsiaMeetingRoom.asm b/data/maps/objects/FuchsiaMeetingRoom.asm index e4c2a83b..e4c2a83b 100755..100644 --- a/data/maps/objects/FuchsiaMeetingRoom.asm +++ b/data/maps/objects/FuchsiaMeetingRoom.asm diff --git a/data/maps/objects/FuchsiaPokecenter.asm b/data/maps/objects/FuchsiaPokecenter.asm index 54c5952b..54c5952b 100755..100644 --- a/data/maps/objects/FuchsiaPokecenter.asm +++ b/data/maps/objects/FuchsiaPokecenter.asm diff --git a/data/maps/objects/GameCorner.asm b/data/maps/objects/GameCorner.asm index 90708941..90708941 100755..100644 --- a/data/maps/objects/GameCorner.asm +++ b/data/maps/objects/GameCorner.asm diff --git a/data/maps/objects/GameCornerPrizeRoom.asm b/data/maps/objects/GameCornerPrizeRoom.asm index d55decf1..d55decf1 100755..100644 --- a/data/maps/objects/GameCornerPrizeRoom.asm +++ b/data/maps/objects/GameCornerPrizeRoom.asm diff --git a/data/maps/objects/HallOfFame.asm b/data/maps/objects/HallOfFame.asm index caa55bf6..caa55bf6 100755..100644 --- a/data/maps/objects/HallOfFame.asm +++ b/data/maps/objects/HallOfFame.asm diff --git a/data/maps/objects/IndigoPlateau.asm b/data/maps/objects/IndigoPlateau.asm index d67c9f8a..d67c9f8a 100755..100644 --- a/data/maps/objects/IndigoPlateau.asm +++ b/data/maps/objects/IndigoPlateau.asm diff --git a/data/maps/objects/IndigoPlateauLobby.asm b/data/maps/objects/IndigoPlateauLobby.asm index 3244b4ad..3244b4ad 100755..100644 --- a/data/maps/objects/IndigoPlateauLobby.asm +++ b/data/maps/objects/IndigoPlateauLobby.asm diff --git a/data/maps/objects/LancesRoom.asm b/data/maps/objects/LancesRoom.asm index a8dc4777..a8dc4777 100755..100644 --- a/data/maps/objects/LancesRoom.asm +++ b/data/maps/objects/LancesRoom.asm diff --git a/data/maps/objects/LavenderCuboneHouse.asm b/data/maps/objects/LavenderCuboneHouse.asm index 7e7443e2..7e7443e2 100755..100644 --- a/data/maps/objects/LavenderCuboneHouse.asm +++ b/data/maps/objects/LavenderCuboneHouse.asm diff --git a/data/maps/objects/LavenderMart.asm b/data/maps/objects/LavenderMart.asm index 00d5a64b..00d5a64b 100755..100644 --- a/data/maps/objects/LavenderMart.asm +++ b/data/maps/objects/LavenderMart.asm diff --git a/data/maps/objects/LavenderPokecenter.asm b/data/maps/objects/LavenderPokecenter.asm index 98975531..98975531 100755..100644 --- a/data/maps/objects/LavenderPokecenter.asm +++ b/data/maps/objects/LavenderPokecenter.asm diff --git a/data/maps/objects/LavenderTown.asm b/data/maps/objects/LavenderTown.asm index f34659c1..f34659c1 100755..100644 --- a/data/maps/objects/LavenderTown.asm +++ b/data/maps/objects/LavenderTown.asm diff --git a/data/maps/objects/LoreleisRoom.asm b/data/maps/objects/LoreleisRoom.asm index 91a306b8..91a306b8 100755..100644 --- a/data/maps/objects/LoreleisRoom.asm +++ b/data/maps/objects/LoreleisRoom.asm diff --git a/data/maps/objects/MrFujisHouse.asm b/data/maps/objects/MrFujisHouse.asm index 6ec762f6..6ec762f6 100755..100644 --- a/data/maps/objects/MrFujisHouse.asm +++ b/data/maps/objects/MrFujisHouse.asm diff --git a/data/maps/objects/MrPsychicsHouse.asm b/data/maps/objects/MrPsychicsHouse.asm index 44367b20..44367b20 100755..100644 --- a/data/maps/objects/MrPsychicsHouse.asm +++ b/data/maps/objects/MrPsychicsHouse.asm diff --git a/data/maps/objects/MtMoon1F.asm b/data/maps/objects/MtMoon1F.asm index 8b40ac4f..8b40ac4f 100755..100644 --- a/data/maps/objects/MtMoon1F.asm +++ b/data/maps/objects/MtMoon1F.asm diff --git a/data/maps/objects/MtMoonB1F.asm b/data/maps/objects/MtMoonB1F.asm index 69fa3c17..69fa3c17 100755..100644 --- a/data/maps/objects/MtMoonB1F.asm +++ b/data/maps/objects/MtMoonB1F.asm diff --git a/data/maps/objects/MtMoonB2F.asm b/data/maps/objects/MtMoonB2F.asm index 7b2e7e5a..7b2e7e5a 100755..100644 --- a/data/maps/objects/MtMoonB2F.asm +++ b/data/maps/objects/MtMoonB2F.asm diff --git a/data/maps/objects/MtMoonPokecenter.asm b/data/maps/objects/MtMoonPokecenter.asm index 5648de6e..5648de6e 100755..100644 --- a/data/maps/objects/MtMoonPokecenter.asm +++ b/data/maps/objects/MtMoonPokecenter.asm diff --git a/data/maps/objects/Museum1F.asm b/data/maps/objects/Museum1F.asm index 3628173c..3628173c 100755..100644 --- a/data/maps/objects/Museum1F.asm +++ b/data/maps/objects/Museum1F.asm diff --git a/data/maps/objects/Museum2F.asm b/data/maps/objects/Museum2F.asm index 72f98f9b..72f98f9b 100755..100644 --- a/data/maps/objects/Museum2F.asm +++ b/data/maps/objects/Museum2F.asm diff --git a/data/maps/objects/NameRatersHouse.asm b/data/maps/objects/NameRatersHouse.asm index 935a6887..935a6887 100755..100644 --- a/data/maps/objects/NameRatersHouse.asm +++ b/data/maps/objects/NameRatersHouse.asm diff --git a/data/maps/objects/OaksLab.asm b/data/maps/objects/OaksLab.asm index e7f3701c..e7f3701c 100755..100644 --- a/data/maps/objects/OaksLab.asm +++ b/data/maps/objects/OaksLab.asm diff --git a/data/maps/objects/PalletTown.asm b/data/maps/objects/PalletTown.asm index d362b2c9..d362b2c9 100755..100644 --- a/data/maps/objects/PalletTown.asm +++ b/data/maps/objects/PalletTown.asm diff --git a/data/maps/objects/PewterCity.asm b/data/maps/objects/PewterCity.asm index 13d228f2..13d228f2 100755..100644 --- a/data/maps/objects/PewterCity.asm +++ b/data/maps/objects/PewterCity.asm diff --git a/data/maps/objects/PewterGym.asm b/data/maps/objects/PewterGym.asm index 9c21701a..9c21701a 100755..100644 --- a/data/maps/objects/PewterGym.asm +++ b/data/maps/objects/PewterGym.asm diff --git a/data/maps/objects/PewterMart.asm b/data/maps/objects/PewterMart.asm index 9685d5c7..9685d5c7 100755..100644 --- a/data/maps/objects/PewterMart.asm +++ b/data/maps/objects/PewterMart.asm diff --git a/data/maps/objects/PewterNidoranHouse.asm b/data/maps/objects/PewterNidoranHouse.asm index b1fd0a74..b1fd0a74 100755..100644 --- a/data/maps/objects/PewterNidoranHouse.asm +++ b/data/maps/objects/PewterNidoranHouse.asm diff --git a/data/maps/objects/PewterPokecenter.asm b/data/maps/objects/PewterPokecenter.asm index 8d41a155..8d41a155 100755..100644 --- a/data/maps/objects/PewterPokecenter.asm +++ b/data/maps/objects/PewterPokecenter.asm diff --git a/data/maps/objects/PewterSpeechHouse.asm b/data/maps/objects/PewterSpeechHouse.asm index 4dafb7be..4dafb7be 100755..100644 --- a/data/maps/objects/PewterSpeechHouse.asm +++ b/data/maps/objects/PewterSpeechHouse.asm diff --git a/data/maps/objects/PokemonFanClub.asm b/data/maps/objects/PokemonFanClub.asm index 19fbb129..19fbb129 100755..100644 --- a/data/maps/objects/PokemonFanClub.asm +++ b/data/maps/objects/PokemonFanClub.asm diff --git a/data/maps/objects/PokemonMansion1F.asm b/data/maps/objects/PokemonMansion1F.asm index 70eef1a1..70eef1a1 100755..100644 --- a/data/maps/objects/PokemonMansion1F.asm +++ b/data/maps/objects/PokemonMansion1F.asm diff --git a/data/maps/objects/PokemonMansion2F.asm b/data/maps/objects/PokemonMansion2F.asm index 8d504eef..8d504eef 100755..100644 --- a/data/maps/objects/PokemonMansion2F.asm +++ b/data/maps/objects/PokemonMansion2F.asm diff --git a/data/maps/objects/PokemonMansion3F.asm b/data/maps/objects/PokemonMansion3F.asm index fdf16a8d..fdf16a8d 100755..100644 --- a/data/maps/objects/PokemonMansion3F.asm +++ b/data/maps/objects/PokemonMansion3F.asm diff --git a/data/maps/objects/PokemonMansionB1F.asm b/data/maps/objects/PokemonMansionB1F.asm index bf0ea0a4..bf0ea0a4 100755..100644 --- a/data/maps/objects/PokemonMansionB1F.asm +++ b/data/maps/objects/PokemonMansionB1F.asm diff --git a/data/maps/objects/PokemonTower1F.asm b/data/maps/objects/PokemonTower1F.asm index b73c7562..b73c7562 100755..100644 --- a/data/maps/objects/PokemonTower1F.asm +++ b/data/maps/objects/PokemonTower1F.asm diff --git a/data/maps/objects/PokemonTower2F.asm b/data/maps/objects/PokemonTower2F.asm index 27bd2f1b..27bd2f1b 100755..100644 --- a/data/maps/objects/PokemonTower2F.asm +++ b/data/maps/objects/PokemonTower2F.asm diff --git a/data/maps/objects/PokemonTower3F.asm b/data/maps/objects/PokemonTower3F.asm index af1b17dc..af1b17dc 100755..100644 --- a/data/maps/objects/PokemonTower3F.asm +++ b/data/maps/objects/PokemonTower3F.asm diff --git a/data/maps/objects/PokemonTower4F.asm b/data/maps/objects/PokemonTower4F.asm index 64801e23..64801e23 100755..100644 --- a/data/maps/objects/PokemonTower4F.asm +++ b/data/maps/objects/PokemonTower4F.asm diff --git a/data/maps/objects/PokemonTower5F.asm b/data/maps/objects/PokemonTower5F.asm index 33482ed5..33482ed5 100755..100644 --- a/data/maps/objects/PokemonTower5F.asm +++ b/data/maps/objects/PokemonTower5F.asm diff --git a/data/maps/objects/PokemonTower6F.asm b/data/maps/objects/PokemonTower6F.asm index 8e7b276c..8e7b276c 100755..100644 --- a/data/maps/objects/PokemonTower6F.asm +++ b/data/maps/objects/PokemonTower6F.asm diff --git a/data/maps/objects/PokemonTower7F.asm b/data/maps/objects/PokemonTower7F.asm index 6d258f0d..6d258f0d 100755..100644 --- a/data/maps/objects/PokemonTower7F.asm +++ b/data/maps/objects/PokemonTower7F.asm diff --git a/data/maps/objects/PowerPlant.asm b/data/maps/objects/PowerPlant.asm index 6802ce4f..6802ce4f 100755..100644 --- a/data/maps/objects/PowerPlant.asm +++ b/data/maps/objects/PowerPlant.asm diff --git a/data/maps/objects/RedsHouse1F.asm b/data/maps/objects/RedsHouse1F.asm index f7cd0819..f7cd0819 100755..100644 --- a/data/maps/objects/RedsHouse1F.asm +++ b/data/maps/objects/RedsHouse1F.asm diff --git a/data/maps/objects/RedsHouse2F.asm b/data/maps/objects/RedsHouse2F.asm index 826e68fd..826e68fd 100755..100644 --- a/data/maps/objects/RedsHouse2F.asm +++ b/data/maps/objects/RedsHouse2F.asm diff --git a/data/maps/objects/RockTunnel1F.asm b/data/maps/objects/RockTunnel1F.asm index b3d4da48..b3d4da48 100755..100644 --- a/data/maps/objects/RockTunnel1F.asm +++ b/data/maps/objects/RockTunnel1F.asm diff --git a/data/maps/objects/RockTunnelB1F.asm b/data/maps/objects/RockTunnelB1F.asm index 3fadaa5b..3fadaa5b 100755..100644 --- a/data/maps/objects/RockTunnelB1F.asm +++ b/data/maps/objects/RockTunnelB1F.asm diff --git a/data/maps/objects/RockTunnelPokecenter.asm b/data/maps/objects/RockTunnelPokecenter.asm index 4f5a1906..4f5a1906 100755..100644 --- a/data/maps/objects/RockTunnelPokecenter.asm +++ b/data/maps/objects/RockTunnelPokecenter.asm diff --git a/data/maps/objects/RocketHideoutB1F.asm b/data/maps/objects/RocketHideoutB1F.asm index 81049d63..81049d63 100755..100644 --- a/data/maps/objects/RocketHideoutB1F.asm +++ b/data/maps/objects/RocketHideoutB1F.asm diff --git a/data/maps/objects/RocketHideoutB2F.asm b/data/maps/objects/RocketHideoutB2F.asm index f6ce5113..f6ce5113 100755..100644 --- a/data/maps/objects/RocketHideoutB2F.asm +++ b/data/maps/objects/RocketHideoutB2F.asm diff --git a/data/maps/objects/RocketHideoutB3F.asm b/data/maps/objects/RocketHideoutB3F.asm index 4cba5422..4cba5422 100755..100644 --- a/data/maps/objects/RocketHideoutB3F.asm +++ b/data/maps/objects/RocketHideoutB3F.asm diff --git a/data/maps/objects/RocketHideoutB4F.asm b/data/maps/objects/RocketHideoutB4F.asm index 5dcf107f..5dcf107f 100755..100644 --- a/data/maps/objects/RocketHideoutB4F.asm +++ b/data/maps/objects/RocketHideoutB4F.asm diff --git a/data/maps/objects/RocketHideoutElevator.asm b/data/maps/objects/RocketHideoutElevator.asm index 20ab4956..20ab4956 100755..100644 --- a/data/maps/objects/RocketHideoutElevator.asm +++ b/data/maps/objects/RocketHideoutElevator.asm diff --git a/data/maps/objects/Route1.asm b/data/maps/objects/Route1.asm index ee1b03a5..ee1b03a5 100755..100644 --- a/data/maps/objects/Route1.asm +++ b/data/maps/objects/Route1.asm diff --git a/data/maps/objects/Route10.asm b/data/maps/objects/Route10.asm index 54a0936e..54a0936e 100755..100644 --- a/data/maps/objects/Route10.asm +++ b/data/maps/objects/Route10.asm diff --git a/data/maps/objects/Route11.asm b/data/maps/objects/Route11.asm index ce7d3490..ce7d3490 100755..100644 --- a/data/maps/objects/Route11.asm +++ b/data/maps/objects/Route11.asm diff --git a/data/maps/objects/Route11Gate1F.asm b/data/maps/objects/Route11Gate1F.asm index d0c9c461..d0c9c461 100755..100644 --- a/data/maps/objects/Route11Gate1F.asm +++ b/data/maps/objects/Route11Gate1F.asm diff --git a/data/maps/objects/Route11Gate2F.asm b/data/maps/objects/Route11Gate2F.asm index fa48409c..fa48409c 100755..100644 --- a/data/maps/objects/Route11Gate2F.asm +++ b/data/maps/objects/Route11Gate2F.asm diff --git a/data/maps/objects/Route12.asm b/data/maps/objects/Route12.asm index 22ac15e8..22ac15e8 100755..100644 --- a/data/maps/objects/Route12.asm +++ b/data/maps/objects/Route12.asm diff --git a/data/maps/objects/Route12Gate1F.asm b/data/maps/objects/Route12Gate1F.asm index 356bf67a..356bf67a 100755..100644 --- a/data/maps/objects/Route12Gate1F.asm +++ b/data/maps/objects/Route12Gate1F.asm diff --git a/data/maps/objects/Route12Gate2F.asm b/data/maps/objects/Route12Gate2F.asm index 413adf25..413adf25 100755..100644 --- a/data/maps/objects/Route12Gate2F.asm +++ b/data/maps/objects/Route12Gate2F.asm diff --git a/data/maps/objects/Route12SuperRodHouse.asm b/data/maps/objects/Route12SuperRodHouse.asm index 4cd43639..4cd43639 100755..100644 --- a/data/maps/objects/Route12SuperRodHouse.asm +++ b/data/maps/objects/Route12SuperRodHouse.asm diff --git a/data/maps/objects/Route13.asm b/data/maps/objects/Route13.asm index 365eea7d..365eea7d 100755..100644 --- a/data/maps/objects/Route13.asm +++ b/data/maps/objects/Route13.asm diff --git a/data/maps/objects/Route14.asm b/data/maps/objects/Route14.asm index 4a2240e6..4a2240e6 100755..100644 --- a/data/maps/objects/Route14.asm +++ b/data/maps/objects/Route14.asm diff --git a/data/maps/objects/Route15.asm b/data/maps/objects/Route15.asm index d145dbfb..d145dbfb 100755..100644 --- a/data/maps/objects/Route15.asm +++ b/data/maps/objects/Route15.asm diff --git a/data/maps/objects/Route15Gate1F.asm b/data/maps/objects/Route15Gate1F.asm index e611e98b..e611e98b 100755..100644 --- a/data/maps/objects/Route15Gate1F.asm +++ b/data/maps/objects/Route15Gate1F.asm diff --git a/data/maps/objects/Route15Gate2F.asm b/data/maps/objects/Route15Gate2F.asm index 608b69e5..608b69e5 100755..100644 --- a/data/maps/objects/Route15Gate2F.asm +++ b/data/maps/objects/Route15Gate2F.asm diff --git a/data/maps/objects/Route16.asm b/data/maps/objects/Route16.asm index 44e2de01..44e2de01 100755..100644 --- a/data/maps/objects/Route16.asm +++ b/data/maps/objects/Route16.asm diff --git a/data/maps/objects/Route16FlyHouse.asm b/data/maps/objects/Route16FlyHouse.asm index be6cdc61..be6cdc61 100755..100644 --- a/data/maps/objects/Route16FlyHouse.asm +++ b/data/maps/objects/Route16FlyHouse.asm diff --git a/data/maps/objects/Route16Gate1F.asm b/data/maps/objects/Route16Gate1F.asm index 4f876e7f..4f876e7f 100755..100644 --- a/data/maps/objects/Route16Gate1F.asm +++ b/data/maps/objects/Route16Gate1F.asm diff --git a/data/maps/objects/Route16Gate2F.asm b/data/maps/objects/Route16Gate2F.asm index 53511ae5..53511ae5 100755..100644 --- a/data/maps/objects/Route16Gate2F.asm +++ b/data/maps/objects/Route16Gate2F.asm diff --git a/data/maps/objects/Route17.asm b/data/maps/objects/Route17.asm index f170b695..f170b695 100755..100644 --- a/data/maps/objects/Route17.asm +++ b/data/maps/objects/Route17.asm diff --git a/data/maps/objects/Route18.asm b/data/maps/objects/Route18.asm index eafdf1d0..eafdf1d0 100755..100644 --- a/data/maps/objects/Route18.asm +++ b/data/maps/objects/Route18.asm diff --git a/data/maps/objects/Route18Gate1F.asm b/data/maps/objects/Route18Gate1F.asm index 3bfdefaa..3bfdefaa 100755..100644 --- a/data/maps/objects/Route18Gate1F.asm +++ b/data/maps/objects/Route18Gate1F.asm diff --git a/data/maps/objects/Route18Gate2F.asm b/data/maps/objects/Route18Gate2F.asm index 2fa6fd58..2fa6fd58 100755..100644 --- a/data/maps/objects/Route18Gate2F.asm +++ b/data/maps/objects/Route18Gate2F.asm diff --git a/data/maps/objects/Route19.asm b/data/maps/objects/Route19.asm index 224b2cbb..224b2cbb 100755..100644 --- a/data/maps/objects/Route19.asm +++ b/data/maps/objects/Route19.asm diff --git a/data/maps/objects/Route2.asm b/data/maps/objects/Route2.asm index 66f9ff1e..66f9ff1e 100755..100644 --- a/data/maps/objects/Route2.asm +++ b/data/maps/objects/Route2.asm diff --git a/data/maps/objects/Route20.asm b/data/maps/objects/Route20.asm index 19e7cce7..19e7cce7 100755..100644 --- a/data/maps/objects/Route20.asm +++ b/data/maps/objects/Route20.asm diff --git a/data/maps/objects/Route21.asm b/data/maps/objects/Route21.asm index 71817640..71817640 100755..100644 --- a/data/maps/objects/Route21.asm +++ b/data/maps/objects/Route21.asm diff --git a/data/maps/objects/Route22.asm b/data/maps/objects/Route22.asm index 857b8a86..857b8a86 100755..100644 --- a/data/maps/objects/Route22.asm +++ b/data/maps/objects/Route22.asm diff --git a/data/maps/objects/Route22Gate.asm b/data/maps/objects/Route22Gate.asm index 68593daa..68593daa 100755..100644 --- a/data/maps/objects/Route22Gate.asm +++ b/data/maps/objects/Route22Gate.asm diff --git a/data/maps/objects/Route23.asm b/data/maps/objects/Route23.asm index bd74afb4..bd74afb4 100755..100644 --- a/data/maps/objects/Route23.asm +++ b/data/maps/objects/Route23.asm diff --git a/data/maps/objects/Route24.asm b/data/maps/objects/Route24.asm index d621e2b3..d621e2b3 100755..100644 --- a/data/maps/objects/Route24.asm +++ b/data/maps/objects/Route24.asm diff --git a/data/maps/objects/Route25.asm b/data/maps/objects/Route25.asm index 4f0be4d4..4f0be4d4 100755..100644 --- a/data/maps/objects/Route25.asm +++ b/data/maps/objects/Route25.asm diff --git a/data/maps/objects/Route2Gate.asm b/data/maps/objects/Route2Gate.asm index 3151ce79..3151ce79 100755..100644 --- a/data/maps/objects/Route2Gate.asm +++ b/data/maps/objects/Route2Gate.asm diff --git a/data/maps/objects/Route2TradeHouse.asm b/data/maps/objects/Route2TradeHouse.asm index d14df485..d14df485 100755..100644 --- a/data/maps/objects/Route2TradeHouse.asm +++ b/data/maps/objects/Route2TradeHouse.asm diff --git a/data/maps/objects/Route3.asm b/data/maps/objects/Route3.asm index 153fa795..153fa795 100755..100644 --- a/data/maps/objects/Route3.asm +++ b/data/maps/objects/Route3.asm diff --git a/data/maps/objects/Route4.asm b/data/maps/objects/Route4.asm index 79e79b79..79e79b79 100755..100644 --- a/data/maps/objects/Route4.asm +++ b/data/maps/objects/Route4.asm diff --git a/data/maps/objects/Route5.asm b/data/maps/objects/Route5.asm index 75f4a629..75f4a629 100755..100644 --- a/data/maps/objects/Route5.asm +++ b/data/maps/objects/Route5.asm diff --git a/data/maps/objects/Route5Gate.asm b/data/maps/objects/Route5Gate.asm index 81c8c43e..81c8c43e 100755..100644 --- a/data/maps/objects/Route5Gate.asm +++ b/data/maps/objects/Route5Gate.asm diff --git a/data/maps/objects/Route6.asm b/data/maps/objects/Route6.asm index bafcdf90..bafcdf90 100755..100644 --- a/data/maps/objects/Route6.asm +++ b/data/maps/objects/Route6.asm diff --git a/data/maps/objects/Route6Gate.asm b/data/maps/objects/Route6Gate.asm index 2ef5a8b5..2ef5a8b5 100755..100644 --- a/data/maps/objects/Route6Gate.asm +++ b/data/maps/objects/Route6Gate.asm diff --git a/data/maps/objects/Route7.asm b/data/maps/objects/Route7.asm index d2346f2c..d2346f2c 100755..100644 --- a/data/maps/objects/Route7.asm +++ b/data/maps/objects/Route7.asm diff --git a/data/maps/objects/Route7Gate.asm b/data/maps/objects/Route7Gate.asm index 2b165016..2b165016 100755..100644 --- a/data/maps/objects/Route7Gate.asm +++ b/data/maps/objects/Route7Gate.asm diff --git a/data/maps/objects/Route8.asm b/data/maps/objects/Route8.asm index d375b23e..d375b23e 100755..100644 --- a/data/maps/objects/Route8.asm +++ b/data/maps/objects/Route8.asm diff --git a/data/maps/objects/Route8Gate.asm b/data/maps/objects/Route8Gate.asm index f03530b5..f03530b5 100755..100644 --- a/data/maps/objects/Route8Gate.asm +++ b/data/maps/objects/Route8Gate.asm diff --git a/data/maps/objects/Route9.asm b/data/maps/objects/Route9.asm index 8d110629..8d110629 100755..100644 --- a/data/maps/objects/Route9.asm +++ b/data/maps/objects/Route9.asm diff --git a/data/maps/objects/SSAnne1F.asm b/data/maps/objects/SSAnne1F.asm index bf4e7292..bf4e7292 100755..100644 --- a/data/maps/objects/SSAnne1F.asm +++ b/data/maps/objects/SSAnne1F.asm diff --git a/data/maps/objects/SSAnne1FRooms.asm b/data/maps/objects/SSAnne1FRooms.asm index 3a1fc459..3a1fc459 100755..100644 --- a/data/maps/objects/SSAnne1FRooms.asm +++ b/data/maps/objects/SSAnne1FRooms.asm diff --git a/data/maps/objects/SSAnne2F.asm b/data/maps/objects/SSAnne2F.asm index dda0fee6..dda0fee6 100755..100644 --- a/data/maps/objects/SSAnne2F.asm +++ b/data/maps/objects/SSAnne2F.asm diff --git a/data/maps/objects/SSAnne2FRooms.asm b/data/maps/objects/SSAnne2FRooms.asm index 78a2dd38..78a2dd38 100755..100644 --- a/data/maps/objects/SSAnne2FRooms.asm +++ b/data/maps/objects/SSAnne2FRooms.asm diff --git a/data/maps/objects/SSAnne3F.asm b/data/maps/objects/SSAnne3F.asm index f230aeb9..f230aeb9 100755..100644 --- a/data/maps/objects/SSAnne3F.asm +++ b/data/maps/objects/SSAnne3F.asm diff --git a/data/maps/objects/SSAnneB1F.asm b/data/maps/objects/SSAnneB1F.asm index 619dd33c..619dd33c 100755..100644 --- a/data/maps/objects/SSAnneB1F.asm +++ b/data/maps/objects/SSAnneB1F.asm diff --git a/data/maps/objects/SSAnneB1FRooms.asm b/data/maps/objects/SSAnneB1FRooms.asm index c7540482..c7540482 100755..100644 --- a/data/maps/objects/SSAnneB1FRooms.asm +++ b/data/maps/objects/SSAnneB1FRooms.asm diff --git a/data/maps/objects/SSAnneBow.asm b/data/maps/objects/SSAnneBow.asm index 080fe623..080fe623 100755..100644 --- a/data/maps/objects/SSAnneBow.asm +++ b/data/maps/objects/SSAnneBow.asm diff --git a/data/maps/objects/SSAnneCaptainsRoom.asm b/data/maps/objects/SSAnneCaptainsRoom.asm index c07be59e..c07be59e 100755..100644 --- a/data/maps/objects/SSAnneCaptainsRoom.asm +++ b/data/maps/objects/SSAnneCaptainsRoom.asm diff --git a/data/maps/objects/SSAnneKitchen.asm b/data/maps/objects/SSAnneKitchen.asm index 75fc497f..75fc497f 100755..100644 --- a/data/maps/objects/SSAnneKitchen.asm +++ b/data/maps/objects/SSAnneKitchen.asm diff --git a/data/maps/objects/SafariZoneCenter.asm b/data/maps/objects/SafariZoneCenter.asm index 59f4e2a4..59f4e2a4 100755..100644 --- a/data/maps/objects/SafariZoneCenter.asm +++ b/data/maps/objects/SafariZoneCenter.asm diff --git a/data/maps/objects/SafariZoneCenterRestHouse.asm b/data/maps/objects/SafariZoneCenterRestHouse.asm index 5b256347..5b256347 100755..100644 --- a/data/maps/objects/SafariZoneCenterRestHouse.asm +++ b/data/maps/objects/SafariZoneCenterRestHouse.asm diff --git a/data/maps/objects/SafariZoneEast.asm b/data/maps/objects/SafariZoneEast.asm index 999c51b0..999c51b0 100755..100644 --- a/data/maps/objects/SafariZoneEast.asm +++ b/data/maps/objects/SafariZoneEast.asm diff --git a/data/maps/objects/SafariZoneEastRestHouse.asm b/data/maps/objects/SafariZoneEastRestHouse.asm index 31940542..31940542 100755..100644 --- a/data/maps/objects/SafariZoneEastRestHouse.asm +++ b/data/maps/objects/SafariZoneEastRestHouse.asm diff --git a/data/maps/objects/SafariZoneGate.asm b/data/maps/objects/SafariZoneGate.asm index 2423ae8a..2423ae8a 100755..100644 --- a/data/maps/objects/SafariZoneGate.asm +++ b/data/maps/objects/SafariZoneGate.asm diff --git a/data/maps/objects/SafariZoneNorth.asm b/data/maps/objects/SafariZoneNorth.asm index 2094e742..2094e742 100755..100644 --- a/data/maps/objects/SafariZoneNorth.asm +++ b/data/maps/objects/SafariZoneNorth.asm diff --git a/data/maps/objects/SafariZoneNorthRestHouse.asm b/data/maps/objects/SafariZoneNorthRestHouse.asm index 38087622..38087622 100755..100644 --- a/data/maps/objects/SafariZoneNorthRestHouse.asm +++ b/data/maps/objects/SafariZoneNorthRestHouse.asm diff --git a/data/maps/objects/SafariZoneSecretHouse.asm b/data/maps/objects/SafariZoneSecretHouse.asm index 1431d711..1431d711 100755..100644 --- a/data/maps/objects/SafariZoneSecretHouse.asm +++ b/data/maps/objects/SafariZoneSecretHouse.asm diff --git a/data/maps/objects/SafariZoneWest.asm b/data/maps/objects/SafariZoneWest.asm index d53ee37b..d53ee37b 100755..100644 --- a/data/maps/objects/SafariZoneWest.asm +++ b/data/maps/objects/SafariZoneWest.asm diff --git a/data/maps/objects/SafariZoneWestRestHouse.asm b/data/maps/objects/SafariZoneWestRestHouse.asm index 26bb481e..26bb481e 100755..100644 --- a/data/maps/objects/SafariZoneWestRestHouse.asm +++ b/data/maps/objects/SafariZoneWestRestHouse.asm diff --git a/data/maps/objects/SaffronCity.asm b/data/maps/objects/SaffronCity.asm index f69b3333..f69b3333 100755..100644 --- a/data/maps/objects/SaffronCity.asm +++ b/data/maps/objects/SaffronCity.asm diff --git a/data/maps/objects/SaffronGym.asm b/data/maps/objects/SaffronGym.asm index 9623440a..9623440a 100755..100644 --- a/data/maps/objects/SaffronGym.asm +++ b/data/maps/objects/SaffronGym.asm diff --git a/data/maps/objects/SaffronMart.asm b/data/maps/objects/SaffronMart.asm index 0a9aed7a..0a9aed7a 100755..100644 --- a/data/maps/objects/SaffronMart.asm +++ b/data/maps/objects/SaffronMart.asm diff --git a/data/maps/objects/SaffronPidgeyHouse.asm b/data/maps/objects/SaffronPidgeyHouse.asm index 59af6fc0..59af6fc0 100755..100644 --- a/data/maps/objects/SaffronPidgeyHouse.asm +++ b/data/maps/objects/SaffronPidgeyHouse.asm diff --git a/data/maps/objects/SaffronPokecenter.asm b/data/maps/objects/SaffronPokecenter.asm index aa6161ca..aa6161ca 100755..100644 --- a/data/maps/objects/SaffronPokecenter.asm +++ b/data/maps/objects/SaffronPokecenter.asm diff --git a/data/maps/objects/SeafoamIslands1F.asm b/data/maps/objects/SeafoamIslands1F.asm index 3d92f199..3d92f199 100755..100644 --- a/data/maps/objects/SeafoamIslands1F.asm +++ b/data/maps/objects/SeafoamIslands1F.asm diff --git a/data/maps/objects/SeafoamIslandsB1F.asm b/data/maps/objects/SeafoamIslandsB1F.asm index c9a4d235..c9a4d235 100755..100644 --- a/data/maps/objects/SeafoamIslandsB1F.asm +++ b/data/maps/objects/SeafoamIslandsB1F.asm diff --git a/data/maps/objects/SeafoamIslandsB2F.asm b/data/maps/objects/SeafoamIslandsB2F.asm index ff9e55fd..ff9e55fd 100755..100644 --- a/data/maps/objects/SeafoamIslandsB2F.asm +++ b/data/maps/objects/SeafoamIslandsB2F.asm diff --git a/data/maps/objects/SeafoamIslandsB3F.asm b/data/maps/objects/SeafoamIslandsB3F.asm index 418cdde6..418cdde6 100755..100644 --- a/data/maps/objects/SeafoamIslandsB3F.asm +++ b/data/maps/objects/SeafoamIslandsB3F.asm diff --git a/data/maps/objects/SeafoamIslandsB4F.asm b/data/maps/objects/SeafoamIslandsB4F.asm index f2d35831..f2d35831 100755..100644 --- a/data/maps/objects/SeafoamIslandsB4F.asm +++ b/data/maps/objects/SeafoamIslandsB4F.asm diff --git a/data/maps/objects/SilphCo10F.asm b/data/maps/objects/SilphCo10F.asm index 6840c13a..6840c13a 100755..100644 --- a/data/maps/objects/SilphCo10F.asm +++ b/data/maps/objects/SilphCo10F.asm diff --git a/data/maps/objects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm index fd1167f0..fd1167f0 100755..100644 --- a/data/maps/objects/SilphCo11F.asm +++ b/data/maps/objects/SilphCo11F.asm diff --git a/data/maps/objects/SilphCo1F.asm b/data/maps/objects/SilphCo1F.asm index 7a9bdb61..7a9bdb61 100755..100644 --- a/data/maps/objects/SilphCo1F.asm +++ b/data/maps/objects/SilphCo1F.asm diff --git a/data/maps/objects/SilphCo2F.asm b/data/maps/objects/SilphCo2F.asm index 186d1581..186d1581 100755..100644 --- a/data/maps/objects/SilphCo2F.asm +++ b/data/maps/objects/SilphCo2F.asm diff --git a/data/maps/objects/SilphCo3F.asm b/data/maps/objects/SilphCo3F.asm index e9ea1cce..e9ea1cce 100755..100644 --- a/data/maps/objects/SilphCo3F.asm +++ b/data/maps/objects/SilphCo3F.asm diff --git a/data/maps/objects/SilphCo4F.asm b/data/maps/objects/SilphCo4F.asm index 6c30b526..6c30b526 100755..100644 --- a/data/maps/objects/SilphCo4F.asm +++ b/data/maps/objects/SilphCo4F.asm diff --git a/data/maps/objects/SilphCo5F.asm b/data/maps/objects/SilphCo5F.asm index 553ec0c3..553ec0c3 100755..100644 --- a/data/maps/objects/SilphCo5F.asm +++ b/data/maps/objects/SilphCo5F.asm diff --git a/data/maps/objects/SilphCo6F.asm b/data/maps/objects/SilphCo6F.asm index 3dba7414..3dba7414 100755..100644 --- a/data/maps/objects/SilphCo6F.asm +++ b/data/maps/objects/SilphCo6F.asm diff --git a/data/maps/objects/SilphCo7F.asm b/data/maps/objects/SilphCo7F.asm index 55f2ade6..55f2ade6 100755..100644 --- a/data/maps/objects/SilphCo7F.asm +++ b/data/maps/objects/SilphCo7F.asm diff --git a/data/maps/objects/SilphCo8F.asm b/data/maps/objects/SilphCo8F.asm index 1a50df07..1a50df07 100755..100644 --- a/data/maps/objects/SilphCo8F.asm +++ b/data/maps/objects/SilphCo8F.asm diff --git a/data/maps/objects/SilphCo9F.asm b/data/maps/objects/SilphCo9F.asm index e6de70fd..e6de70fd 100755..100644 --- a/data/maps/objects/SilphCo9F.asm +++ b/data/maps/objects/SilphCo9F.asm diff --git a/data/maps/objects/SilphCoElevator.asm b/data/maps/objects/SilphCoElevator.asm index d894ba65..d894ba65 100755..100644 --- a/data/maps/objects/SilphCoElevator.asm +++ b/data/maps/objects/SilphCoElevator.asm diff --git a/data/maps/objects/TradeCenter.asm b/data/maps/objects/TradeCenter.asm index ff74a4fa..ff74a4fa 100755..100644 --- a/data/maps/objects/TradeCenter.asm +++ b/data/maps/objects/TradeCenter.asm diff --git a/data/maps/objects/UndergroundPathNorthSouth.asm b/data/maps/objects/UndergroundPathNorthSouth.asm index abf2d715..abf2d715 100755..100644 --- a/data/maps/objects/UndergroundPathNorthSouth.asm +++ b/data/maps/objects/UndergroundPathNorthSouth.asm diff --git a/data/maps/objects/UndergroundPathRoute5.asm b/data/maps/objects/UndergroundPathRoute5.asm index 0e0f64e0..0e0f64e0 100755..100644 --- a/data/maps/objects/UndergroundPathRoute5.asm +++ b/data/maps/objects/UndergroundPathRoute5.asm diff --git a/data/maps/objects/UndergroundPathRoute6.asm b/data/maps/objects/UndergroundPathRoute6.asm index ff4d66b3..ff4d66b3 100755..100644 --- a/data/maps/objects/UndergroundPathRoute6.asm +++ b/data/maps/objects/UndergroundPathRoute6.asm diff --git a/data/maps/objects/UndergroundPathRoute7.asm b/data/maps/objects/UndergroundPathRoute7.asm index 2532c380..2532c380 100755..100644 --- a/data/maps/objects/UndergroundPathRoute7.asm +++ b/data/maps/objects/UndergroundPathRoute7.asm diff --git a/data/maps/objects/UndergroundPathRoute7Copy.asm b/data/maps/objects/UndergroundPathRoute7Copy.asm index 57e6d093..57e6d093 100755..100644 --- a/data/maps/objects/UndergroundPathRoute7Copy.asm +++ b/data/maps/objects/UndergroundPathRoute7Copy.asm diff --git a/data/maps/objects/UndergroundPathRoute8.asm b/data/maps/objects/UndergroundPathRoute8.asm index d84188ab..d84188ab 100755..100644 --- a/data/maps/objects/UndergroundPathRoute8.asm +++ b/data/maps/objects/UndergroundPathRoute8.asm diff --git a/data/maps/objects/UndergroundPathWestEast.asm b/data/maps/objects/UndergroundPathWestEast.asm index 15141e93..15141e93 100755..100644 --- a/data/maps/objects/UndergroundPathWestEast.asm +++ b/data/maps/objects/UndergroundPathWestEast.asm diff --git a/data/maps/objects/VermilionCity.asm b/data/maps/objects/VermilionCity.asm index 1b989ad7..1b989ad7 100755..100644 --- a/data/maps/objects/VermilionCity.asm +++ b/data/maps/objects/VermilionCity.asm diff --git a/data/maps/objects/VermilionDock.asm b/data/maps/objects/VermilionDock.asm index f8143aaa..f8143aaa 100755..100644 --- a/data/maps/objects/VermilionDock.asm +++ b/data/maps/objects/VermilionDock.asm diff --git a/data/maps/objects/VermilionGym.asm b/data/maps/objects/VermilionGym.asm index ce0fd9f0..ce0fd9f0 100755..100644 --- a/data/maps/objects/VermilionGym.asm +++ b/data/maps/objects/VermilionGym.asm diff --git a/data/maps/objects/VermilionMart.asm b/data/maps/objects/VermilionMart.asm index c473b5d1..c473b5d1 100755..100644 --- a/data/maps/objects/VermilionMart.asm +++ b/data/maps/objects/VermilionMart.asm diff --git a/data/maps/objects/VermilionOldRodHouse.asm b/data/maps/objects/VermilionOldRodHouse.asm index 878262f2..878262f2 100755..100644 --- a/data/maps/objects/VermilionOldRodHouse.asm +++ b/data/maps/objects/VermilionOldRodHouse.asm diff --git a/data/maps/objects/VermilionPidgeyHouse.asm b/data/maps/objects/VermilionPidgeyHouse.asm index 0a357409..0a357409 100755..100644 --- a/data/maps/objects/VermilionPidgeyHouse.asm +++ b/data/maps/objects/VermilionPidgeyHouse.asm diff --git a/data/maps/objects/VermilionPokecenter.asm b/data/maps/objects/VermilionPokecenter.asm index e656b80c..e656b80c 100755..100644 --- a/data/maps/objects/VermilionPokecenter.asm +++ b/data/maps/objects/VermilionPokecenter.asm diff --git a/data/maps/objects/VermilionTradeHouse.asm b/data/maps/objects/VermilionTradeHouse.asm index ec60415f..ec60415f 100755..100644 --- a/data/maps/objects/VermilionTradeHouse.asm +++ b/data/maps/objects/VermilionTradeHouse.asm diff --git a/data/maps/objects/VictoryRoad1F.asm b/data/maps/objects/VictoryRoad1F.asm index e3798128..e3798128 100755..100644 --- a/data/maps/objects/VictoryRoad1F.asm +++ b/data/maps/objects/VictoryRoad1F.asm diff --git a/data/maps/objects/VictoryRoad2F.asm b/data/maps/objects/VictoryRoad2F.asm index 84a32fa2..84a32fa2 100755..100644 --- a/data/maps/objects/VictoryRoad2F.asm +++ b/data/maps/objects/VictoryRoad2F.asm diff --git a/data/maps/objects/VictoryRoad3F.asm b/data/maps/objects/VictoryRoad3F.asm index fcab3e74..fcab3e74 100755..100644 --- a/data/maps/objects/VictoryRoad3F.asm +++ b/data/maps/objects/VictoryRoad3F.asm diff --git a/data/maps/objects/ViridianCity.asm b/data/maps/objects/ViridianCity.asm index c4ee9b69..c4ee9b69 100755..100644 --- a/data/maps/objects/ViridianCity.asm +++ b/data/maps/objects/ViridianCity.asm diff --git a/data/maps/objects/ViridianForest.asm b/data/maps/objects/ViridianForest.asm index 22d0b67a..22d0b67a 100755..100644 --- a/data/maps/objects/ViridianForest.asm +++ b/data/maps/objects/ViridianForest.asm diff --git a/data/maps/objects/ViridianForestNorthGate.asm b/data/maps/objects/ViridianForestNorthGate.asm index 137b8b3b..137b8b3b 100755..100644 --- a/data/maps/objects/ViridianForestNorthGate.asm +++ b/data/maps/objects/ViridianForestNorthGate.asm diff --git a/data/maps/objects/ViridianForestSouthGate.asm b/data/maps/objects/ViridianForestSouthGate.asm index 3693e7ec..3693e7ec 100755..100644 --- a/data/maps/objects/ViridianForestSouthGate.asm +++ b/data/maps/objects/ViridianForestSouthGate.asm diff --git a/data/maps/objects/ViridianGym.asm b/data/maps/objects/ViridianGym.asm index cc158928..cc158928 100755..100644 --- a/data/maps/objects/ViridianGym.asm +++ b/data/maps/objects/ViridianGym.asm diff --git a/data/maps/objects/ViridianMart.asm b/data/maps/objects/ViridianMart.asm index cbb5a4a3..cbb5a4a3 100755..100644 --- a/data/maps/objects/ViridianMart.asm +++ b/data/maps/objects/ViridianMart.asm diff --git a/data/maps/objects/ViridianNicknameHouse.asm b/data/maps/objects/ViridianNicknameHouse.asm index c2e6b70f..c2e6b70f 100755..100644 --- a/data/maps/objects/ViridianNicknameHouse.asm +++ b/data/maps/objects/ViridianNicknameHouse.asm diff --git a/data/maps/objects/ViridianPokecenter.asm b/data/maps/objects/ViridianPokecenter.asm index 889281e1..889281e1 100755..100644 --- a/data/maps/objects/ViridianPokecenter.asm +++ b/data/maps/objects/ViridianPokecenter.asm diff --git a/data/maps/objects/ViridianSchoolHouse.asm b/data/maps/objects/ViridianSchoolHouse.asm index 8f228632..8f228632 100755..100644 --- a/data/maps/objects/ViridianSchoolHouse.asm +++ b/data/maps/objects/ViridianSchoolHouse.asm diff --git a/data/maps/objects/WardensHouse.asm b/data/maps/objects/WardensHouse.asm index 68210d65..68210d65 100755..100644 --- a/data/maps/objects/WardensHouse.asm +++ b/data/maps/objects/WardensHouse.asm diff --git a/data/maps/songs.asm b/data/maps/songs.asm index 28e17223..28e17223 100755..100644 --- a/data/maps/songs.asm +++ b/data/maps/songs.asm diff --git a/data/maps/special_warps.asm b/data/maps/special_warps.asm index 56dac3a5..56dac3a5 100755..100644 --- a/data/maps/special_warps.asm +++ b/data/maps/special_warps.asm diff --git a/data/maps/sprite_sets.asm b/data/maps/sprite_sets.asm index b2c9371c..b2c9371c 100755..100644 --- a/data/maps/sprite_sets.asm +++ b/data/maps/sprite_sets.asm diff --git a/data/maps/town_map_entries.asm b/data/maps/town_map_entries.asm index 9b0cde26..9b0cde26 100755..100644 --- a/data/maps/town_map_entries.asm +++ b/data/maps/town_map_entries.asm diff --git a/data/maps/town_map_order.asm b/data/maps/town_map_order.asm index a082c376..a082c376 100755..100644 --- a/data/maps/town_map_order.asm +++ b/data/maps/town_map_order.asm diff --git a/data/moves/animations.asm b/data/moves/animations.asm index 8249c50d..8249c50d 100755..100644 --- a/data/moves/animations.asm +++ b/data/moves/animations.asm diff --git a/data/moves/moves.asm b/data/moves/moves.asm index 85b6dcfc..85b6dcfc 100755..100644 --- a/data/moves/moves.asm +++ b/data/moves/moves.asm diff --git a/data/moves/tmhm_moves.asm b/data/moves/tmhm_moves.asm index a5b0bfec..a5b0bfec 100755..100644 --- a/data/moves/tmhm_moves.asm +++ b/data/moves/tmhm_moves.asm diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 809ae8eb..91ccbe08 100755..100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -151,3 +151,5 @@ INCLUDE "data/pokemon/base_stats/dratini.asm" INCLUDE "data/pokemon/base_stats/dragonair.asm" INCLUDE "data/pokemon/base_stats/dragonite.asm" INCLUDE "data/pokemon/base_stats/mewtwo.asm" +BaseStatsEnd:: + assert BaseStatsEnd - BaseStats == (wMonHeaderEnd - wMonHeader) * (NUM_POKEMON - 1) ; discount Mew diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index e4bf07d9..e4bf07d9 100755..100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index d100919f..d100919f 100755..100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm diff --git a/data/pokemon/dex_order.asm b/data/pokemon/dex_order.asm index 0e293946..0e293946 100755..100644 --- a/data/pokemon/dex_order.asm +++ b/data/pokemon/dex_order.asm diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index 51f6b244..51f6b244 100755..100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 471ee846..471ee846 100755..100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index 83a45b77..83a45b77 100755..100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 8c4d0bc0..8c4d0bc0 100755..100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm diff --git a/data/pokemon/title_mons.asm b/data/pokemon/title_mons.asm index c0acd13a..c0acd13a 100755..100644 --- a/data/pokemon/title_mons.asm +++ b/data/pokemon/title_mons.asm diff --git a/data/sgb/sgb_border.asm b/data/sgb/sgb_border.asm index aa11a326..aa11a326 100755..100644 --- a/data/sgb/sgb_border.asm +++ b/data/sgb/sgb_border.asm diff --git a/data/sgb/sgb_packets.asm b/data/sgb/sgb_packets.asm index 0b6219e1..0b6219e1 100755..100644 --- a/data/sgb/sgb_packets.asm +++ b/data/sgb/sgb_packets.asm diff --git a/data/sgb/sgb_palettes.asm b/data/sgb/sgb_palettes.asm index 7029b4e8..7029b4e8 100755..100644 --- a/data/sgb/sgb_palettes.asm +++ b/data/sgb/sgb_palettes.asm diff --git a/data/tilesets/bike_riding_tilesets.asm b/data/tilesets/bike_riding_tilesets.asm index b78c7c8c..b78c7c8c 100755..100644 --- a/data/tilesets/bike_riding_tilesets.asm +++ b/data/tilesets/bike_riding_tilesets.asm diff --git a/data/tilesets/dungeon_tilesets.asm b/data/tilesets/dungeon_tilesets.asm index 2af36696..2af36696 100755..100644 --- a/data/tilesets/dungeon_tilesets.asm +++ b/data/tilesets/dungeon_tilesets.asm diff --git a/data/tilesets/tileset_headers.asm b/data/tilesets/tileset_headers.asm index 998c6cb1..65fc4fa9 100755..100644 --- a/data/tilesets/tileset_headers.asm +++ b/data/tilesets/tileset_headers.asm @@ -3,32 +3,32 @@ tileset: MACRO dw \1, \2, \3 ; Block, GFX, Coll db \4, \5, \6 ; counter tiles db \7 ; grass tile - db \8 ; permission (indoor, cave, outdoor) + db \8 ; animations (TILEANIM_* value) ENDM Tilesets: - ; block, gfx, coll, 3 counter tiles, grass tile, permission - tileset Overworld_Block, Overworld_GFX, Overworld_Coll, $FF,$FF,$FF, $52, OUTDOOR - tileset RedsHouse1_Block, RedsHouse1_GFX, RedsHouse1_Coll, $FF,$FF,$FF, $FF, INDOOR - tileset Mart_Block, Mart_GFX, Mart_Coll, $18,$19,$1E, $FF, INDOOR - tileset Forest_Block, Forest_GFX, Forest_Coll, $FF,$FF,$FF, $20, CAVE - tileset RedsHouse2_Block, RedsHouse2_GFX, RedsHouse2_Coll, $FF,$FF,$FF, $FF, INDOOR - tileset Dojo_Block, Dojo_GFX, Dojo_Coll, $3A,$FF,$FF, $FF, OUTDOOR - tileset Pokecenter_Block, Pokecenter_GFX, Pokecenter_Coll, $18,$19,$1E, $FF, INDOOR - tileset Gym_Block, Gym_GFX, Gym_Coll, $3A,$FF,$FF, $FF, OUTDOOR - tileset House_Block, House_GFX, House_Coll, $FF,$FF,$FF, $FF, INDOOR - tileset ForestGate_Block, ForestGate_GFX, ForestGate_Coll, $17,$32,$FF, $FF, INDOOR - tileset Museum_Block, Museum_GFX, Museum_Coll, $17,$32,$FF, $FF, INDOOR - tileset Underground_Block, Underground_GFX, Underground_Coll, $FF,$FF,$FF, $FF, INDOOR - tileset Gate_Block, Gate_GFX, Gate_Coll, $17,$32,$FF, $FF, INDOOR - tileset Ship_Block, Ship_GFX, Ship_Coll, $FF,$FF,$FF, $FF, CAVE - tileset ShipPort_Block, ShipPort_GFX, ShipPort_Coll, $FF,$FF,$FF, $FF, CAVE - tileset Cemetery_Block, Cemetery_GFX, Cemetery_Coll, $12,$FF,$FF, $FF, INDOOR - tileset Interior_Block, Interior_GFX, Interior_Coll, $FF,$FF,$FF, $FF, INDOOR - tileset Cavern_Block, Cavern_GFX, Cavern_Coll, $FF,$FF,$FF, $FF, CAVE - tileset Lobby_Block, Lobby_GFX, Lobby_Coll, $15,$36,$FF, $FF, INDOOR - tileset Mansion_Block, Mansion_GFX, Mansion_Coll, $FF,$FF,$FF, $FF, INDOOR - tileset Lab_Block, Lab_GFX, Lab_Coll, $FF,$FF,$FF, $FF, INDOOR - tileset Club_Block, Club_GFX, Club_Coll, $07,$17,$FF, $FF, INDOOR - tileset Facility_Block, Facility_GFX, Facility_Coll, $12,$FF,$FF, $FF, CAVE - tileset Plateau_Block, Plateau_GFX, Plateau_Coll, $FF,$FF,$FF, $45, CAVE + ; block, gfx, coll, 3 counter tiles, grass tile, animations + tileset Overworld_Block, Overworld_GFX, Overworld_Coll, $FF,$FF,$FF, $52, TILEANIM_WATER_FLOWER + tileset RedsHouse1_Block, RedsHouse1_GFX, RedsHouse1_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE + tileset Mart_Block, Mart_GFX, Mart_Coll, $18,$19,$1E, $FF, TILEANIM_NONE + tileset Forest_Block, Forest_GFX, Forest_Coll, $FF,$FF,$FF, $20, TILEANIM_WATER + tileset RedsHouse2_Block, RedsHouse2_GFX, RedsHouse2_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE + tileset Dojo_Block, Dojo_GFX, Dojo_Coll, $3A,$FF,$FF, $FF, TILEANIM_WATER_FLOWER + tileset Pokecenter_Block, Pokecenter_GFX, Pokecenter_Coll, $18,$19,$1E, $FF, TILEANIM_NONE + tileset Gym_Block, Gym_GFX, Gym_Coll, $3A,$FF,$FF, $FF, TILEANIM_WATER_FLOWER + tileset House_Block, House_GFX, House_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE + tileset ForestGate_Block, ForestGate_GFX, ForestGate_Coll, $17,$32,$FF, $FF, TILEANIM_NONE + tileset Museum_Block, Museum_GFX, Museum_Coll, $17,$32,$FF, $FF, TILEANIM_NONE + tileset Underground_Block, Underground_GFX, Underground_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE + tileset Gate_Block, Gate_GFX, Gate_Coll, $17,$32,$FF, $FF, TILEANIM_NONE + tileset Ship_Block, Ship_GFX, Ship_Coll, $FF,$FF,$FF, $FF, TILEANIM_WATER + tileset ShipPort_Block, ShipPort_GFX, ShipPort_Coll, $FF,$FF,$FF, $FF, TILEANIM_WATER + tileset Cemetery_Block, Cemetery_GFX, Cemetery_Coll, $12,$FF,$FF, $FF, TILEANIM_NONE + tileset Interior_Block, Interior_GFX, Interior_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE + tileset Cavern_Block, Cavern_GFX, Cavern_Coll, $FF,$FF,$FF, $FF, TILEANIM_WATER + tileset Lobby_Block, Lobby_GFX, Lobby_Coll, $15,$36,$FF, $FF, TILEANIM_NONE + tileset Mansion_Block, Mansion_GFX, Mansion_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE + tileset Lab_Block, Lab_GFX, Lab_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE + tileset Club_Block, Club_GFX, Club_Coll, $07,$17,$FF, $FF, TILEANIM_NONE + tileset Facility_Block, Facility_GFX, Facility_Coll, $12,$FF,$FF, $FF, TILEANIM_WATER + tileset Plateau_Block, Plateau_GFX, Plateau_Coll, $FF,$FF,$FF, $45, TILEANIM_WATER diff --git a/data/tilesets/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm index db005dcf..db005dcf 100755..100644 --- a/data/tilesets/warp_tile_ids.asm +++ b/data/tilesets/warp_tile_ids.asm diff --git a/data/trainers/encounter_types.asm b/data/trainers/encounter_types.asm index 5bca2517..5bca2517 100755..100644 --- a/data/trainers/encounter_types.asm +++ b/data/trainers/encounter_types.asm diff --git a/data/trainers/names.asm b/data/trainers/names.asm index 9a89e5ed..9a89e5ed 100755..100644 --- a/data/trainers/names.asm +++ b/data/trainers/names.asm diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 005cb1dd..005cb1dd 100755..100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm diff --git a/data/trainers/pic_pointers_money.asm b/data/trainers/pic_pointers_money.asm index d4007394..d4007394 100755..100644 --- a/data/trainers/pic_pointers_money.asm +++ b/data/trainers/pic_pointers_money.asm diff --git a/data/trainers/special_moves.asm b/data/trainers/special_moves.asm index b797d1c7..b797d1c7 100755..100644 --- a/data/trainers/special_moves.asm +++ b/data/trainers/special_moves.asm diff --git a/data/types/names.asm b/data/types/names.asm index cc2eb89b..cc2eb89b 100755..100644 --- a/data/types/names.asm +++ b/data/types/names.asm diff --git a/data/types/type_matchups.asm b/data/types/type_matchups.asm index 52e3d956..52e3d956 100755..100644 --- a/data/types/type_matchups.asm +++ b/data/types/type_matchups.asm diff --git a/data/wild/good_rod.asm b/data/wild/good_rod.asm index 700a5516..700a5516 100755..100644 --- a/data/wild/good_rod.asm +++ b/data/wild/good_rod.asm diff --git a/data/wild/grass_water.asm b/data/wild/grass_water.asm index 56ef25c4..56ef25c4 100755..100644 --- a/data/wild/grass_water.asm +++ b/data/wild/grass_water.asm diff --git a/data/wild/maps/DiglettsCave.asm b/data/wild/maps/DiglettsCave.asm index d1e73af4..d1e73af4 100755..100644 --- a/data/wild/maps/DiglettsCave.asm +++ b/data/wild/maps/DiglettsCave.asm diff --git a/data/wild/maps/MtMoon1F.asm b/data/wild/maps/MtMoon1F.asm index d8c9ba1b..d8c9ba1b 100755..100644 --- a/data/wild/maps/MtMoon1F.asm +++ b/data/wild/maps/MtMoon1F.asm diff --git a/data/wild/maps/MtMoonB1F.asm b/data/wild/maps/MtMoonB1F.asm index 875a7256..875a7256 100755..100644 --- a/data/wild/maps/MtMoonB1F.asm +++ b/data/wild/maps/MtMoonB1F.asm diff --git a/data/wild/maps/MtMoonB2F.asm b/data/wild/maps/MtMoonB2F.asm index ae90ed1e..ae90ed1e 100755..100644 --- a/data/wild/maps/MtMoonB2F.asm +++ b/data/wild/maps/MtMoonB2F.asm diff --git a/data/wild/maps/PokemonMansion1F.asm b/data/wild/maps/PokemonMansion1F.asm index 3be7fb18..3be7fb18 100755..100644 --- a/data/wild/maps/PokemonMansion1F.asm +++ b/data/wild/maps/PokemonMansion1F.asm diff --git a/data/wild/maps/PokemonMansion2F.asm b/data/wild/maps/PokemonMansion2F.asm index 494973b2..494973b2 100755..100644 --- a/data/wild/maps/PokemonMansion2F.asm +++ b/data/wild/maps/PokemonMansion2F.asm diff --git a/data/wild/maps/PokemonMansion3F.asm b/data/wild/maps/PokemonMansion3F.asm index bbb14213..bbb14213 100755..100644 --- a/data/wild/maps/PokemonMansion3F.asm +++ b/data/wild/maps/PokemonMansion3F.asm diff --git a/data/wild/maps/PokemonMansionB1F.asm b/data/wild/maps/PokemonMansionB1F.asm index 77f989b2..77f989b2 100755..100644 --- a/data/wild/maps/PokemonMansionB1F.asm +++ b/data/wild/maps/PokemonMansionB1F.asm diff --git a/data/wild/maps/PokemonTower1F.asm b/data/wild/maps/PokemonTower1F.asm index 95bef4a3..95bef4a3 100755..100644 --- a/data/wild/maps/PokemonTower1F.asm +++ b/data/wild/maps/PokemonTower1F.asm diff --git a/data/wild/maps/PokemonTower2F.asm b/data/wild/maps/PokemonTower2F.asm index 77b7d415..77b7d415 100755..100644 --- a/data/wild/maps/PokemonTower2F.asm +++ b/data/wild/maps/PokemonTower2F.asm diff --git a/data/wild/maps/PokemonTower3F.asm b/data/wild/maps/PokemonTower3F.asm index 177497e9..177497e9 100755..100644 --- a/data/wild/maps/PokemonTower3F.asm +++ b/data/wild/maps/PokemonTower3F.asm diff --git a/data/wild/maps/PokemonTower4F.asm b/data/wild/maps/PokemonTower4F.asm index b6e82d14..b6e82d14 100755..100644 --- a/data/wild/maps/PokemonTower4F.asm +++ b/data/wild/maps/PokemonTower4F.asm diff --git a/data/wild/maps/PokemonTower5F.asm b/data/wild/maps/PokemonTower5F.asm index 03c41eba..03c41eba 100755..100644 --- a/data/wild/maps/PokemonTower5F.asm +++ b/data/wild/maps/PokemonTower5F.asm diff --git a/data/wild/maps/PokemonTower6F.asm b/data/wild/maps/PokemonTower6F.asm index 38898de1..38898de1 100755..100644 --- a/data/wild/maps/PokemonTower6F.asm +++ b/data/wild/maps/PokemonTower6F.asm diff --git a/data/wild/maps/PokemonTower7F.asm b/data/wild/maps/PokemonTower7F.asm index b2faa100..b2faa100 100755..100644 --- a/data/wild/maps/PokemonTower7F.asm +++ b/data/wild/maps/PokemonTower7F.asm diff --git a/data/wild/maps/PowerPlant.asm b/data/wild/maps/PowerPlant.asm index f70dfbcb..f70dfbcb 100755..100644 --- a/data/wild/maps/PowerPlant.asm +++ b/data/wild/maps/PowerPlant.asm diff --git a/data/wild/maps/RockTunnel1F.asm b/data/wild/maps/RockTunnel1F.asm index 42a6d58b..42a6d58b 100755..100644 --- a/data/wild/maps/RockTunnel1F.asm +++ b/data/wild/maps/RockTunnel1F.asm diff --git a/data/wild/maps/RockTunnelB1F.asm b/data/wild/maps/RockTunnelB1F.asm index 2f970332..2f970332 100755..100644 --- a/data/wild/maps/RockTunnelB1F.asm +++ b/data/wild/maps/RockTunnelB1F.asm diff --git a/data/wild/maps/Route1.asm b/data/wild/maps/Route1.asm index e75ded3b..e75ded3b 100755..100644 --- a/data/wild/maps/Route1.asm +++ b/data/wild/maps/Route1.asm diff --git a/data/wild/maps/Route10.asm b/data/wild/maps/Route10.asm index 603dc389..603dc389 100755..100644 --- a/data/wild/maps/Route10.asm +++ b/data/wild/maps/Route10.asm diff --git a/data/wild/maps/Route11.asm b/data/wild/maps/Route11.asm index ea053c07..ea053c07 100755..100644 --- a/data/wild/maps/Route11.asm +++ b/data/wild/maps/Route11.asm diff --git a/data/wild/maps/Route12.asm b/data/wild/maps/Route12.asm index acdfe6b6..acdfe6b6 100755..100644 --- a/data/wild/maps/Route12.asm +++ b/data/wild/maps/Route12.asm diff --git a/data/wild/maps/Route13.asm b/data/wild/maps/Route13.asm index 4d0c0a46..4d0c0a46 100755..100644 --- a/data/wild/maps/Route13.asm +++ b/data/wild/maps/Route13.asm diff --git a/data/wild/maps/Route14.asm b/data/wild/maps/Route14.asm index a91631a8..a91631a8 100755..100644 --- a/data/wild/maps/Route14.asm +++ b/data/wild/maps/Route14.asm diff --git a/data/wild/maps/Route15.asm b/data/wild/maps/Route15.asm index 13bd7f32..13bd7f32 100755..100644 --- a/data/wild/maps/Route15.asm +++ b/data/wild/maps/Route15.asm diff --git a/data/wild/maps/Route16.asm b/data/wild/maps/Route16.asm index ecab87c1..ecab87c1 100755..100644 --- a/data/wild/maps/Route16.asm +++ b/data/wild/maps/Route16.asm diff --git a/data/wild/maps/Route17.asm b/data/wild/maps/Route17.asm index 762b5449..762b5449 100755..100644 --- a/data/wild/maps/Route17.asm +++ b/data/wild/maps/Route17.asm diff --git a/data/wild/maps/Route18.asm b/data/wild/maps/Route18.asm index d8123c5e..d8123c5e 100755..100644 --- a/data/wild/maps/Route18.asm +++ b/data/wild/maps/Route18.asm diff --git a/data/wild/maps/Route2.asm b/data/wild/maps/Route2.asm index 035e5b28..035e5b28 100755..100644 --- a/data/wild/maps/Route2.asm +++ b/data/wild/maps/Route2.asm diff --git a/data/wild/maps/Route21.asm b/data/wild/maps/Route21.asm index 13ffe445..13ffe445 100755..100644 --- a/data/wild/maps/Route21.asm +++ b/data/wild/maps/Route21.asm diff --git a/data/wild/maps/Route22.asm b/data/wild/maps/Route22.asm index c8f72608..c8f72608 100755..100644 --- a/data/wild/maps/Route22.asm +++ b/data/wild/maps/Route22.asm diff --git a/data/wild/maps/Route23.asm b/data/wild/maps/Route23.asm index 77f019a3..77f019a3 100755..100644 --- a/data/wild/maps/Route23.asm +++ b/data/wild/maps/Route23.asm diff --git a/data/wild/maps/Route24.asm b/data/wild/maps/Route24.asm index 8ba7d232..8ba7d232 100755..100644 --- a/data/wild/maps/Route24.asm +++ b/data/wild/maps/Route24.asm diff --git a/data/wild/maps/Route25.asm b/data/wild/maps/Route25.asm index 7e0ded65..7e0ded65 100755..100644 --- a/data/wild/maps/Route25.asm +++ b/data/wild/maps/Route25.asm diff --git a/data/wild/maps/Route3.asm b/data/wild/maps/Route3.asm index b397b1d1..b397b1d1 100755..100644 --- a/data/wild/maps/Route3.asm +++ b/data/wild/maps/Route3.asm diff --git a/data/wild/maps/Route4.asm b/data/wild/maps/Route4.asm index d4f4763b..d4f4763b 100755..100644 --- a/data/wild/maps/Route4.asm +++ b/data/wild/maps/Route4.asm diff --git a/data/wild/maps/Route5.asm b/data/wild/maps/Route5.asm index dd200378..dd200378 100755..100644 --- a/data/wild/maps/Route5.asm +++ b/data/wild/maps/Route5.asm diff --git a/data/wild/maps/Route6.asm b/data/wild/maps/Route6.asm index 15585ea4..15585ea4 100755..100644 --- a/data/wild/maps/Route6.asm +++ b/data/wild/maps/Route6.asm diff --git a/data/wild/maps/Route7.asm b/data/wild/maps/Route7.asm index 39508bf0..39508bf0 100755..100644 --- a/data/wild/maps/Route7.asm +++ b/data/wild/maps/Route7.asm diff --git a/data/wild/maps/Route8.asm b/data/wild/maps/Route8.asm index 005ee677..005ee677 100755..100644 --- a/data/wild/maps/Route8.asm +++ b/data/wild/maps/Route8.asm diff --git a/data/wild/maps/Route9.asm b/data/wild/maps/Route9.asm index a38fc35f..a38fc35f 100755..100644 --- a/data/wild/maps/Route9.asm +++ b/data/wild/maps/Route9.asm diff --git a/data/wild/maps/SafariZoneCenter.asm b/data/wild/maps/SafariZoneCenter.asm index 4661b927..4661b927 100755..100644 --- a/data/wild/maps/SafariZoneCenter.asm +++ b/data/wild/maps/SafariZoneCenter.asm diff --git a/data/wild/maps/SafariZoneEast.asm b/data/wild/maps/SafariZoneEast.asm index 9910bf12..9910bf12 100755..100644 --- a/data/wild/maps/SafariZoneEast.asm +++ b/data/wild/maps/SafariZoneEast.asm diff --git a/data/wild/maps/SafariZoneNorth.asm b/data/wild/maps/SafariZoneNorth.asm index 4482571b..4482571b 100755..100644 --- a/data/wild/maps/SafariZoneNorth.asm +++ b/data/wild/maps/SafariZoneNorth.asm diff --git a/data/wild/maps/SafariZoneWest.asm b/data/wild/maps/SafariZoneWest.asm index c9989cc9..c9989cc9 100755..100644 --- a/data/wild/maps/SafariZoneWest.asm +++ b/data/wild/maps/SafariZoneWest.asm diff --git a/data/wild/maps/SeaRoutes.asm b/data/wild/maps/SeaRoutes.asm index 72ea781d..72ea781d 100755..100644 --- a/data/wild/maps/SeaRoutes.asm +++ b/data/wild/maps/SeaRoutes.asm diff --git a/data/wild/maps/SeafoamIslands1F.asm b/data/wild/maps/SeafoamIslands1F.asm index b191de13..b191de13 100755..100644 --- a/data/wild/maps/SeafoamIslands1F.asm +++ b/data/wild/maps/SeafoamIslands1F.asm diff --git a/data/wild/maps/SeafoamIslandsB1F.asm b/data/wild/maps/SeafoamIslandsB1F.asm index 79762821..79762821 100755..100644 --- a/data/wild/maps/SeafoamIslandsB1F.asm +++ b/data/wild/maps/SeafoamIslandsB1F.asm diff --git a/data/wild/maps/SeafoamIslandsB2F.asm b/data/wild/maps/SeafoamIslandsB2F.asm index e68d71cc..e68d71cc 100755..100644 --- a/data/wild/maps/SeafoamIslandsB2F.asm +++ b/data/wild/maps/SeafoamIslandsB2F.asm diff --git a/data/wild/maps/SeafoamIslandsB3F.asm b/data/wild/maps/SeafoamIslandsB3F.asm index 35319df9..35319df9 100755..100644 --- a/data/wild/maps/SeafoamIslandsB3F.asm +++ b/data/wild/maps/SeafoamIslandsB3F.asm diff --git a/data/wild/maps/SeafoamIslandsB4F.asm b/data/wild/maps/SeafoamIslandsB4F.asm index c5e3766b..c5e3766b 100755..100644 --- a/data/wild/maps/SeafoamIslandsB4F.asm +++ b/data/wild/maps/SeafoamIslandsB4F.asm diff --git a/data/wild/maps/VictoryRoad1F.asm b/data/wild/maps/VictoryRoad1F.asm index 71adde2e..71adde2e 100755..100644 --- a/data/wild/maps/VictoryRoad1F.asm +++ b/data/wild/maps/VictoryRoad1F.asm diff --git a/data/wild/maps/VictoryRoad2F.asm b/data/wild/maps/VictoryRoad2F.asm index ee660e3a..ee660e3a 100755..100644 --- a/data/wild/maps/VictoryRoad2F.asm +++ b/data/wild/maps/VictoryRoad2F.asm diff --git a/data/wild/maps/VictoryRoad3F.asm b/data/wild/maps/VictoryRoad3F.asm index 754557bf..754557bf 100755..100644 --- a/data/wild/maps/VictoryRoad3F.asm +++ b/data/wild/maps/VictoryRoad3F.asm diff --git a/data/wild/maps/ViridianForest.asm b/data/wild/maps/ViridianForest.asm index d11fc34e..d11fc34e 100755..100644 --- a/data/wild/maps/ViridianForest.asm +++ b/data/wild/maps/ViridianForest.asm diff --git a/data/wild/maps/nothing.asm b/data/wild/maps/nothing.asm index 19570b50..19570b50 100755..100644 --- a/data/wild/maps/nothing.asm +++ b/data/wild/maps/nothing.asm diff --git a/data/wild/super_rod.asm b/data/wild/super_rod.asm index 20a52a6c..20a52a6c 100755..100644 --- a/data/wild/super_rod.asm +++ b/data/wild/super_rod.asm diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 0673b518..0673b518 100755..100644 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 1ca4fa43..8869b4ae 100755..100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -51,7 +51,7 @@ SlidePlayerAndEnemySilhouettesOnScreen: ldh [hWY], a ldh [rWY], a xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a ldh [hSCY], a dec a ld [wUpdateSpritesEnabled], a @@ -2013,18 +2013,19 @@ DisplayBattleMenu:: .menuselected ld [wTextBoxID], a call DisplayTextBoxID + ; handle menu input if it's not the old man tutorial ld a, [wBattleType] dec a - jp nz, .handleBattleMenuInput ; handle menu input if it's not the old man tutorial + jp nz, .handleBattleMenuInput ; the following happens for the old man tutorial - ; Temporarily save the player name in wGrassRate, - ; which is supposed to get overwritten when entering a - ; map with wild Pokémon. - ; Due to an oversight, the data may not get - ; overwritten (on Cinnabar and Route 21) and the infamous - ; Missingno. glitch can show up. + ; Temporarily save the player name in wLinkEnemyTrainerName. + ; Since wLinkEnemyTrainerName == wGrassRate, this affects wild encounters. + ; The wGrassRate byte and following wGrassMons buffer are supposed + ; to get overwritten when entering a map with wild Pokémon, + ; but an oversight prevents this in Cinnabar and Route 21, + ; so the infamous MissingNo. glitch can show up. ld hl, wPlayerName - ld de, wGrassRate + ld de, wLinkEnemyTrainerName ld bc, NAME_LENGTH call CopyData ld hl, .oldManName @@ -6275,7 +6276,7 @@ DoBattleTransitionAndInitBattleVariables: ldh [hAutoBGTransferEnabled], a ldh [hWY], a ldh [rWY], a - ldh [hTilesetType], a + ldh [hTileAnimations], a ld hl, wPlayerStatsToDouble ld [hli], a ld [hli], a @@ -6865,8 +6866,8 @@ _InitBattleCommon: ld [wLetterPrintingDelayFlags], a pop af ld [wMapPalOffset], a - ld a, [wSavedTilesetType] - ldh [hTilesetType], a + ld a, [wSavedTileAnimations] + ldh [hTileAnimations], a scf ret .emptyString diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm index ab556aca..ab556aca 100755..100644 --- a/engine/battle/end_of_battle.asm +++ b/engine/battle/end_of_battle.asm diff --git a/engine/battle/init_battle_variables.asm b/engine/battle/init_battle_variables.asm index 0d403b55..dd9f9714 100644 --- a/engine/battle/init_battle_variables.asm +++ b/engine/battle/init_battle_variables.asm @@ -1,6 +1,6 @@ InitBattleVariables: - ldh a, [hTilesetType] - ld [wSavedTilesetType], a + ldh a, [hTileAnimations] + ld [wSavedTileAnimations], a xor a ld [wActionResultOrTookBattleTurn], a ld [wBattleResult], a diff --git a/engine/battle/misc.asm b/engine/battle/misc.asm index 33af6f6f..33af6f6f 100755..100644 --- a/engine/battle/misc.asm +++ b/engine/battle/misc.asm diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm index a0132a4f..a0132a4f 100755..100644 --- a/engine/battle/read_trainer_party.asm +++ b/engine/battle/read_trainer_party.asm diff --git a/engine/battle/safari_zone.asm b/engine/battle/safari_zone.asm index a61f402f..a61f402f 100755..100644 --- a/engine/battle/safari_zone.asm +++ b/engine/battle/safari_zone.asm diff --git a/engine/events/card_key.asm b/engine/events/card_key.asm index b052d3e2..b052d3e2 100755..100644 --- a/engine/events/card_key.asm +++ b/engine/events/card_key.asm diff --git a/engine/events/cinnabar_lab.asm b/engine/events/cinnabar_lab.asm index bccc95d1..bccc95d1 100755..100644 --- a/engine/events/cinnabar_lab.asm +++ b/engine/events/cinnabar_lab.asm diff --git a/engine/events/diploma.asm b/engine/events/diploma.asm index 410217d5..410217d5 100755..100644 --- a/engine/events/diploma.asm +++ b/engine/events/diploma.asm diff --git a/engine/events/elevator.asm b/engine/events/elevator.asm index 8e871456..8e871456 100755..100644 --- a/engine/events/elevator.asm +++ b/engine/events/elevator.asm diff --git a/engine/events/evolve_trade.asm b/engine/events/evolve_trade.asm index 409925c1..409925c1 100755..100644 --- a/engine/events/evolve_trade.asm +++ b/engine/events/evolve_trade.asm diff --git a/engine/events/give_pokemon.asm b/engine/events/give_pokemon.asm index ef01ef99..ef01ef99 100755..100644 --- a/engine/events/give_pokemon.asm +++ b/engine/events/give_pokemon.asm diff --git a/engine/events/hidden_items.asm b/engine/events/hidden_items.asm index 97bb0b71..97bb0b71 100755..100644 --- a/engine/events/hidden_items.asm +++ b/engine/events/hidden_items.asm diff --git a/engine/events/in_game_trades.asm b/engine/events/in_game_trades.asm index c6951615..c6951615 100755..100644 --- a/engine/events/in_game_trades.asm +++ b/engine/events/in_game_trades.asm diff --git a/engine/events/oaks_aide.asm b/engine/events/oaks_aide.asm index f1801f5c..f1801f5c 100755..100644 --- a/engine/events/oaks_aide.asm +++ b/engine/events/oaks_aide.asm diff --git a/engine/events/pewter_guys.asm b/engine/events/pewter_guys.asm index 532fa4bf..532fa4bf 100755..100644 --- a/engine/events/pewter_guys.asm +++ b/engine/events/pewter_guys.asm diff --git a/engine/events/pokecenter.asm b/engine/events/pokecenter.asm index 97dbcd53..97dbcd53 100755..100644 --- a/engine/events/pokecenter.asm +++ b/engine/events/pokecenter.asm diff --git a/engine/events/pokedex_rating.asm b/engine/events/pokedex_rating.asm index c61253b7..c61253b7 100755..100644 --- a/engine/events/pokedex_rating.asm +++ b/engine/events/pokedex_rating.asm diff --git a/engine/events/pokemart.asm b/engine/events/pokemart.asm index c7cb8115..c7cb8115 100755..100644 --- a/engine/events/pokemart.asm +++ b/engine/events/pokemart.asm diff --git a/engine/events/prize_menu.asm b/engine/events/prize_menu.asm index c12e5188..c12e5188 100755..100644 --- a/engine/events/prize_menu.asm +++ b/engine/events/prize_menu.asm diff --git a/engine/events/saffron_guards.asm b/engine/events/saffron_guards.asm index bf30b8c5..bf30b8c5 100755..100644 --- a/engine/events/saffron_guards.asm +++ b/engine/events/saffron_guards.asm diff --git a/engine/events/starter_dex.asm b/engine/events/starter_dex.asm index 7cfe9af2..7cfe9af2 100755..100644 --- a/engine/events/starter_dex.asm +++ b/engine/events/starter_dex.asm diff --git a/engine/events/vending_machine.asm b/engine/events/vending_machine.asm index 37460c5b..37460c5b 100755..100644 --- a/engine/events/vending_machine.asm +++ b/engine/events/vending_machine.asm diff --git a/engine/gfx/hp_bar.asm b/engine/gfx/hp_bar.asm index b7bd97f2..b7bd97f2 100755..100644 --- a/engine/gfx/hp_bar.asm +++ b/engine/gfx/hp_bar.asm diff --git a/engine/gfx/load_pokedex_tiles.asm b/engine/gfx/load_pokedex_tiles.asm index a3f69171..a3f69171 100755..100644 --- a/engine/gfx/load_pokedex_tiles.asm +++ b/engine/gfx/load_pokedex_tiles.asm diff --git a/engine/gfx/mon_icons.asm b/engine/gfx/mon_icons.asm index 16409640..16409640 100755..100644 --- a/engine/gfx/mon_icons.asm +++ b/engine/gfx/mon_icons.asm diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index a43c66ba..a43c66ba 100755..100644 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm diff --git a/engine/gfx/screen_effects.asm b/engine/gfx/screen_effects.asm index c7a68734..c7a68734 100755..100644 --- a/engine/gfx/screen_effects.asm +++ b/engine/gfx/screen_effects.asm diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index fb0bc847..fb0bc847 100755..100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm diff --git a/engine/items/itemfinder.asm b/engine/items/itemfinder.asm index 7c15d4bb..7c15d4bb 100755..100644 --- a/engine/items/itemfinder.asm +++ b/engine/items/itemfinder.asm diff --git a/engine/items/tm_prices.asm b/engine/items/tm_prices.asm index df9761bd..df9761bd 100755..100644 --- a/engine/items/tm_prices.asm +++ b/engine/items/tm_prices.asm diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index a11cd736..a11cd736 100755..100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm diff --git a/engine/items/tms.asm b/engine/items/tms.asm index ea7fbcad..ea7fbcad 100755..100644 --- a/engine/items/tms.asm +++ b/engine/items/tms.asm diff --git a/engine/items/town_map.asm b/engine/items/town_map.asm index e630958b..e630958b 100755..100644 --- a/engine/items/town_map.asm +++ b/engine/items/town_map.asm diff --git a/engine/link/cable_club.asm b/engine/link/cable_club.asm index f2c1c5fc..f2c1c5fc 100755..100644 --- a/engine/link/cable_club.asm +++ b/engine/link/cable_club.asm diff --git a/engine/link/cable_club_npc.asm b/engine/link/cable_club_npc.asm index 594adf08..594adf08 100755..100644 --- a/engine/link/cable_club_npc.asm +++ b/engine/link/cable_club_npc.asm diff --git a/engine/math/multiply_divide.asm b/engine/math/multiply_divide.asm index 2fcda158..2fcda158 100755..100644 --- a/engine/math/multiply_divide.asm +++ b/engine/math/multiply_divide.asm diff --git a/engine/math/random.asm b/engine/math/random.asm index c8760157..c8760157 100755..100644 --- a/engine/math/random.asm +++ b/engine/math/random.asm diff --git a/engine/menus/league_pc.asm b/engine/menus/league_pc.asm index 999090ff..517f95d6 100755..100644 --- a/engine/menus/league_pc.asm +++ b/engine/menus/league_pc.asm @@ -6,10 +6,10 @@ PKMNLeaguePC: push hl ld a, [wUpdateSpritesEnabled] push af - ldh a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a ld [wSpriteFlipped], a ld [wUpdateSpritesEnabled], a ld [wHoFTeamIndex2], a @@ -40,7 +40,7 @@ PKMNLeaguePC: jr nz, .loop .doneShowingTeams pop af - ldh [hTilesetType], a + ldh [hTileAnimations], a pop af ld [wUpdateSpritesEnabled], a pop hl diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index ac2aa3c0..ac2aa3c0 100755..100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index 181978fc..181978fc 100755..100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm diff --git a/engine/menus/oaks_pc.asm b/engine/menus/oaks_pc.asm index 7743e5df..7743e5df 100755..100644 --- a/engine/menus/oaks_pc.asm +++ b/engine/menus/oaks_pc.asm diff --git a/engine/menus/party_menu.asm b/engine/menus/party_menu.asm index 2fdd9cd1..2fdd9cd1 100755..100644 --- a/engine/menus/party_menu.asm +++ b/engine/menus/party_menu.asm diff --git a/engine/menus/pc.asm b/engine/menus/pc.asm index 4c340e7b..4c340e7b 100755..100644 --- a/engine/menus/pc.asm +++ b/engine/menus/pc.asm diff --git a/engine/menus/players_pc.asm b/engine/menus/players_pc.asm index e896cfae..e896cfae 100755..100644 --- a/engine/menus/players_pc.asm +++ b/engine/menus/players_pc.asm diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm index 2b41ab6b..c2e7de5a 100755..100644 --- a/engine/menus/pokedex.asm +++ b/engine/menus/pokedex.asm @@ -410,10 +410,10 @@ ShowPokedexDataInternal: call RunPaletteCommand pop af ld [wd11e], a - ldh a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a hlcoord 0, 0 ld de, 1 @@ -578,7 +578,7 @@ ShowPokedexDataInternal: and A_BUTTON | B_BUTTON jr z, .waitForButtonPress pop af - ldh [hTilesetType], a + ldh [hTileAnimations], a call GBPalWhiteOut call ClearScreen call RunDefaultPaletteCommand diff --git a/engine/menus/save.asm b/engine/menus/save.asm index aeb042e2..a01e767e 100755..100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -69,8 +69,8 @@ LoadSAV0: ld de, wSpriteDataStart ld bc, wSpriteDataEnd - wSpriteDataStart call CopyData - ld a, [sTilesetType] - ldh [hTilesetType], a + ld a, [sTileAnimations] + ldh [hTileAnimations], a ld hl, sCurBoxData ld de, wBoxDataStart ld bc, wBoxDataEnd - wBoxDataStart @@ -217,8 +217,8 @@ SaveSAVtoSRAM0: ld de, sCurBoxData ld bc, wBoxDataEnd - wBoxDataStart call CopyData - ldh a, [hTilesetType] - ld [sTilesetType], a + ldh a, [hTileAnimations] + ld [sTileAnimations], a ld hl, sPlayerName ld bc, sMainDataCheckSum - sPlayerName call SAVCheckSum diff --git a/engine/menus/start_sub_menus.asm b/engine/menus/start_sub_menus.asm index 72a6c8c5..115036e9 100755..100644 --- a/engine/menus/start_sub_menus.asm +++ b/engine/menus/start_sub_menus.asm @@ -454,10 +454,10 @@ StartMenu_TrainerInfo:: call GBPalWhiteOut call ClearScreen call UpdateSprites - ldh a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a call DrawTrainerInfo predef DrawBadges ; draw badges ld b, SET_PAL_TRAINER_CARD @@ -471,7 +471,7 @@ StartMenu_TrainerInfo:: call ReloadMapData call LoadGBPal pop af - ldh [hTilesetType], a + ldh [hTileAnimations], a jp RedisplayStartMenu ; loads tile patterns and draws everything except for gym leader faces / badges diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm index 0410de21..0410de21 100755..100644 --- a/engine/movie/credits.asm +++ b/engine/movie/credits.asm diff --git a/engine/movie/evolution.asm b/engine/movie/evolution.asm index cabe7254..77840556 100755..100644 --- a/engine/movie/evolution.asm +++ b/engine/movie/evolution.asm @@ -19,7 +19,7 @@ EvolveMon: call Delay3 xor a ldh [hAutoBGTransferEnabled], a - ldh [hTilesetType], a + ldh [hTileAnimations], a ld a, [wEvoOldSpecies] ld [wWholeScreenPaletteMonSpecies], a ld c, 0 diff --git a/engine/movie/hall_of_fame.asm b/engine/movie/hall_of_fame.asm index 07082cb5..f60ec811 100755..100644 --- a/engine/movie/hall_of_fame.asm +++ b/engine/movie/hall_of_fame.asm @@ -19,7 +19,7 @@ AnimateHallOfFame: call FillMemory xor a ld [wUpdateSpritesEnabled], a - ldh [hTilesetType], a + ldh [hTileAnimations], a ld [wSpriteFlipped], a ld [wLetterPrintingDelayFlags], a ; no delay ld [wHoFMonOrPlayer], a ; mon diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm index 9813d67c..9813d67c 100755..100644 --- a/engine/movie/intro.asm +++ b/engine/movie/intro.asm diff --git a/engine/movie/oak_speech/clear_save.asm b/engine/movie/oak_speech/clear_save.asm index d5c04e6e..d5c04e6e 100755..100644 --- a/engine/movie/oak_speech/clear_save.asm +++ b/engine/movie/oak_speech/clear_save.asm diff --git a/engine/movie/oak_speech/oak_speech.asm b/engine/movie/oak_speech/oak_speech.asm index 4b64f20d..93cdfaab 100755..100644 --- a/engine/movie/oak_speech/oak_speech.asm +++ b/engine/movie/oak_speech/oak_speech.asm @@ -52,7 +52,7 @@ OakSpeech: ld [wDestinationMap], a call SpecialWarpIn xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a ld a, [wd732] bit 1, a ; possibly a debug mode bit jp nz, .skipChoosingNames diff --git a/engine/movie/oak_speech/oak_speech2.asm b/engine/movie/oak_speech/oak_speech2.asm index 5371ae76..5371ae76 100755..100644 --- a/engine/movie/oak_speech/oak_speech2.asm +++ b/engine/movie/oak_speech/oak_speech2.asm diff --git a/engine/movie/splash.asm b/engine/movie/splash.asm index eede8ccb..eede8ccb 100755..100644 --- a/engine/movie/splash.asm +++ b/engine/movie/splash.asm diff --git a/engine/movie/title.asm b/engine/movie/title.asm index d24c58f9..8f3e0b4e 100755..100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -26,7 +26,7 @@ DisplayTitleScreen: ld a, $1 ldh [hAutoBGTransferEnabled], a xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a ldh [hSCX], a ld a, $40 ldh [hSCY], a diff --git a/engine/movie/title2.asm b/engine/movie/title2.asm index 315cf6b5..315cf6b5 100755..100644 --- a/engine/movie/title2.asm +++ b/engine/movie/title2.asm diff --git a/engine/movie/trade.asm b/engine/movie/trade.asm index bb06f231..bb06f231 100755..100644 --- a/engine/movie/trade.asm +++ b/engine/movie/trade.asm diff --git a/engine/movie/trade2.asm b/engine/movie/trade2.asm index 38ae741c..38ae741c 100755..100644 --- a/engine/movie/trade2.asm +++ b/engine/movie/trade2.asm diff --git a/engine/overworld/auto_movement.asm b/engine/overworld/auto_movement.asm index 9c078f08..9c078f08 100755..100644 --- a/engine/overworld/auto_movement.asm +++ b/engine/overworld/auto_movement.asm diff --git a/engine/overworld/cut.asm b/engine/overworld/cut.asm index 6a92ccc0..6a92ccc0 100755..100644 --- a/engine/overworld/cut.asm +++ b/engine/overworld/cut.asm diff --git a/engine/overworld/cut2.asm b/engine/overworld/cut2.asm index 3d4a5905..3d4a5905 100755..100644 --- a/engine/overworld/cut2.asm +++ b/engine/overworld/cut2.asm diff --git a/engine/overworld/doors.asm b/engine/overworld/doors.asm index d38818fa..d38818fa 100755..100644 --- a/engine/overworld/doors.asm +++ b/engine/overworld/doors.asm diff --git a/engine/overworld/dust_smoke.asm b/engine/overworld/dust_smoke.asm index a20a0591..a20a0591 100755..100644 --- a/engine/overworld/dust_smoke.asm +++ b/engine/overworld/dust_smoke.asm diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm index fa404602..fa404602 100755..100644 --- a/engine/overworld/elevator.asm +++ b/engine/overworld/elevator.asm diff --git a/engine/overworld/emotion_bubbles.asm b/engine/overworld/emotion_bubbles.asm index 5a41c226..5a41c226 100755..100644 --- a/engine/overworld/emotion_bubbles.asm +++ b/engine/overworld/emotion_bubbles.asm diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index 62abc7ee..62abc7ee 100755..100644 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm diff --git a/engine/overworld/hidden_objects.asm b/engine/overworld/hidden_objects.asm index 855328e7..855328e7 100755..100644 --- a/engine/overworld/hidden_objects.asm +++ b/engine/overworld/hidden_objects.asm diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm index f01ae5ef..f01ae5ef 100755..100644 --- a/engine/overworld/ledges.asm +++ b/engine/overworld/ledges.asm diff --git a/engine/overworld/map_sprites.asm b/engine/overworld/map_sprites.asm index fa3a37dc..fa3a37dc 100755..100644 --- a/engine/overworld/map_sprites.asm +++ b/engine/overworld/map_sprites.asm diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index c458a013..c458a013 100755..100644 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm diff --git a/engine/overworld/tilesets.asm b/engine/overworld/tilesets.asm index f40cbbc2..fa5cf626 100644 --- a/engine/overworld/tilesets.asm +++ b/engine/overworld/tilesets.asm @@ -23,7 +23,7 @@ LoadTilesetHeader: dec c jr nz, .copyTilesetHeaderLoop ld a, [hl] - ldh [hTilesetType], a + ldh [hTileAnimations], a xor a ldh [hMovingBGTilesCounter1], a pop hl diff --git a/engine/overworld/trainer_sight.asm b/engine/overworld/trainer_sight.asm index 816dea7f..816dea7f 100755..100644 --- a/engine/overworld/trainer_sight.asm +++ b/engine/overworld/trainer_sight.asm diff --git a/engine/overworld/turn_sprite.asm b/engine/overworld/turn_sprite.asm index 7b34a03a..7b34a03a 100755..100644 --- a/engine/overworld/turn_sprite.asm +++ b/engine/overworld/turn_sprite.asm diff --git a/engine/overworld/update_map.asm b/engine/overworld/update_map.asm index 53a5592d..dbf28dae 100644 --- a/engine/overworld/update_map.asm +++ b/engine/overworld/update_map.asm @@ -52,11 +52,11 @@ RedrawMapView: ret z ldh a, [hAutoBGTransferEnabled] push af - ldh a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a ldh [hAutoBGTransferEnabled], a - ldh [hTilesetType], a ; no flower/water BG tile animations + ldh [hTileAnimations], a call LoadCurrentMapView call RunDefaultPaletteCommand ld hl, wMapViewVRAMPointer @@ -112,7 +112,7 @@ RedrawMapView: dec c jr nz, .redrawRowLoop pop af - ldh [hTilesetType], a + ldh [hTileAnimations], a pop af ldh [hAutoBGTransferEnabled], a ret diff --git a/engine/play_time.asm b/engine/play_time.asm index 29897242..29897242 100755..100644 --- a/engine/play_time.asm +++ b/engine/play_time.asm diff --git a/engine/pokemon/evos_moves.asm b/engine/pokemon/evos_moves.asm index ed44f9a6..21b1c9f4 100755..100644 --- a/engine/pokemon/evos_moves.asm +++ b/engine/pokemon/evos_moves.asm @@ -11,7 +11,7 @@ TryEvolvingMon: ; this is only called after battle ; it is supposed to do level up evolutions, though there is a bug that allows item evolutions to occur EvolutionAfterBattle: - ldh a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a ld [wEvolutionOccurred], a @@ -245,7 +245,7 @@ Evolution_PartyMonLoop: ; loop over party mons pop bc pop hl pop af - ldh [hTilesetType], a + ldh [hTileAnimations], a ld a, [wLinkState] cp LINK_STATE_TRADING ret z diff --git a/engine/pokemon/experience.asm b/engine/pokemon/experience.asm index 427d2a7f..427d2a7f 100755..100644 --- a/engine/pokemon/experience.asm +++ b/engine/pokemon/experience.asm diff --git a/engine/pokemon/learn_move.asm b/engine/pokemon/learn_move.asm index 8e852fd4..8e852fd4 100755..100644 --- a/engine/pokemon/learn_move.asm +++ b/engine/pokemon/learn_move.asm diff --git a/engine/pokemon/set_types.asm b/engine/pokemon/set_types.asm index e9235f13..e9235f13 100755..100644 --- a/engine/pokemon/set_types.asm +++ b/engine/pokemon/set_types.asm diff --git a/engine/pokemon/status_ailments.asm b/engine/pokemon/status_ailments.asm index 1047cea1..1047cea1 100755..100644 --- a/engine/pokemon/status_ailments.asm +++ b/engine/pokemon/status_ailments.asm diff --git a/engine/pokemon/status_screen.asm b/engine/pokemon/status_screen.asm index 9d53c003..61653a11 100755..100644 --- a/engine/pokemon/status_screen.asm +++ b/engine/pokemon/status_screen.asm @@ -101,10 +101,10 @@ StatusScreen: ld hl, vChars2 tile $72 lb bc, BANK(PTile), 1 call CopyVideoDataDouble ; bold P (for PP) - ldh a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a hlcoord 19, 1 lb bc, 6, 10 call DrawLineBox ; Draws the box around name, HP and status @@ -174,7 +174,7 @@ StatusScreen: call PlayCry ; play Pokémon cry call WaitForTextScrollButtonPress ; wait for button pop af - ldh [hTilesetType], a + ldh [hTileAnimations], a ret .GetStringPointer @@ -296,10 +296,10 @@ StatsText: next "ESPECIAL@" StatusScreen2: - ldh a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a ldh [hAutoBGTransferEnabled], a ld bc, NUM_MOVES + 1 ld hl, wMoves @@ -428,7 +428,7 @@ StatusScreen2: call Delay3 call WaitForTextScrollButtonPress ; wait for button pop af - ldh [hTilesetType], a + ldh [hTileAnimations], a ld hl, wd72c res 1, [hl] ld a, $77 diff --git a/engine/predefs.asm b/engine/predefs.asm index a9877739..a9877739 100755..100644 --- a/engine/predefs.asm +++ b/engine/predefs.asm diff --git a/engine/slots/game_corner_slots.asm b/engine/slots/game_corner_slots.asm index 48321974..48321974 100755..100644 --- a/engine/slots/game_corner_slots.asm +++ b/engine/slots/game_corner_slots.asm diff --git a/engine/slots/game_corner_slots2.asm b/engine/slots/game_corner_slots2.asm index a4ba4ec1..a4ba4ec1 100755..100644 --- a/engine/slots/game_corner_slots2.asm +++ b/engine/slots/game_corner_slots2.asm diff --git a/engine/slots/slot_machine.asm b/engine/slots/slot_machine.asm index fe137632..fe137632 100755..100644 --- a/engine/slots/slot_machine.asm +++ b/engine/slots/slot_machine.asm diff --git a/gfx/town_map/town_map.rle b/gfx/town_map/town_map.rle Binary files differindex f9ede0ec..f9ede0ec 100755..100644 --- a/gfx/town_map/town_map.rle +++ b/gfx/town_map/town_map.rle diff --git a/home/init.asm b/home/init.asm index fe7dc9a9..e5840e65 100644 --- a/home/init.asm +++ b/home/init.asm @@ -65,7 +65,7 @@ rLCDC_DEFAULT EQU %11100011 call WriteDMACodeToHRAM xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a ldh [rSTAT], a ldh [hSCX], a ldh [hSCY], a diff --git a/home/overworld.asm b/home/overworld.asm index a9cfba24..be2c5d55 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -813,7 +813,7 @@ LoadPlayerSpriteGraphics:: dec a jr z, .ridingBike - ldh a, [hTilesetType] + ldh a, [hTileAnimations] and a jr nz, .determineGraphics jr .startWalking diff --git a/home/pokemon.asm b/home/pokemon.asm index 2a54d390..143d6faa 100644 --- a/home/pokemon.asm +++ b/home/pokemon.asm @@ -175,10 +175,10 @@ GetCryData:: ret DisplayPartyMenu:: - ldh a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a call GBPalWhiteOutWithDelay3 call ClearSprites call PartyMenuInit @@ -186,10 +186,10 @@ DisplayPartyMenu:: jp HandlePartyMenuInput GoBackToPartyMenu:: - ldh a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a call PartyMenuInit call RedrawPartyMenu jp HandlePartyMenuInput @@ -251,7 +251,7 @@ HandlePartyMenuInput:: and a jp nz, .swappingPokemon pop af - ldh [hTilesetType], a + ldh [hTileAnimations], a bit 1, b jr nz, .noPokemonChosen ld a, [wPartyCount] diff --git a/home/start_menu.asm b/home/start_menu.asm index 5b29f67a..5b29f67a 100755..100644 --- a/home/start_menu.asm +++ b/home/start_menu.asm diff --git a/home/vcopy.asm b/home/vcopy.asm index 458fa610..882773a8 100644 --- a/home/vcopy.asm +++ b/home/vcopy.asm @@ -379,7 +379,7 @@ UpdateMovingBgTiles:: ; Animate water and flower ; tiles in the overworld. - ldh a, [hTilesetType] + ldh a, [hTileAnimations] and a ret z ; no animations if indoors (or if a menu set this to 0) @@ -417,7 +417,7 @@ UpdateMovingBgTiles:: dec c jr nz, .left .done - ldh a, [hTilesetType] + ldh a, [hTileAnimations] rrca ret nc ; if in a cave, no flower animations @@ -277,11 +277,11 @@ hFrameCounter:: db ; decremented every V-blank (used for delays) ; you can detect that the V-blank handler has run since then. hVBlankOccurred:: db -; 00 = indoor -; 01 = cave -; 02 = outdoor -; this is often set to 00 in order to turn off water and flower BG tile animations -hTilesetType:: db +; Controls which tiles are animated. +; 0 = no animations (breaks Surf) +; 1 = water tile $14 is animated +; 2 = water tile $14 and flower tile $03 are animated +hTileAnimations:: db hMovingBGTilesCounter1:: db diff --git a/macros/code.asm b/macros/code.asm index e0b3e9c9..e0b3e9c9 100755..100644 --- a/macros/code.asm +++ b/macros/code.asm diff --git a/macros/data.asm b/macros/data.asm index 16742d53..16742d53 100755..100644 --- a/macros/data.asm +++ b/macros/data.asm diff --git a/macros/scripts/audio.asm b/macros/scripts/audio.asm index b12a2adc..b12a2adc 100755..100644 --- a/macros/scripts/audio.asm +++ b/macros/scripts/audio.asm diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index 8087c5c2..8087c5c2 100755..100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm diff --git a/macros/scripts/text.asm b/macros/scripts/text.asm index 9f724e4c..9f724e4c 100755..100644 --- a/macros/scripts/text.asm +++ b/macros/scripts/text.asm diff --git a/maps/Route15Gate2F.blk b/maps/Route15Gate2F.blk Binary files differindex f90c7db9..f90c7db9 100755..100644 --- a/maps/Route15Gate2F.blk +++ b/maps/Route15Gate2F.blk diff --git a/maps/UnusedDiglettsCaveCopy.blk b/maps/UnusedDiglettsCaveCopy.blk index ff81fc7d..ff81fc7d 100755..100644 --- a/maps/UnusedDiglettsCaveCopy.blk +++ b/maps/UnusedDiglettsCaveCopy.blk diff --git a/maps/UnusedEmptyMap.blk b/maps/UnusedEmptyMap.blk index 21808bb7..21808bb7 100755..100644 --- a/maps/UnusedEmptyMap.blk +++ b/maps/UnusedEmptyMap.blk diff --git a/maps/UnusedPokecenterCopy.blk b/maps/UnusedPokecenterCopy.blk index 9641efe4..9641efe4 100755..100644 --- a/maps/UnusedPokecenterCopy.blk +++ b/maps/UnusedPokecenterCopy.blk diff --git a/rgbdscheck.asm b/rgbdscheck.asm index 73a10332..63df3575 100644 --- a/rgbdscheck.asm +++ b/rgbdscheck.asm @@ -1,12 +1,14 @@ -; pokered requires rgbds 0.4.1 or newer. +; pokered requires rgbds 0.4.2 or newer. MAJOR EQU 0 MINOR EQU 4 -PATCH EQU 1 +PATCH EQU 2 IF !DEF(__RGBDS_MAJOR__) || !DEF(__RGBDS_MINOR__) || !DEF(__RGBDS_PATCH__) - fail "pokered requires rgbds {MAJOR}.{MINOR}.{PATCH} or newer." -ELIF (__RGBDS_MAJOR__ < MAJOR) || \ + fail "pokered requires rgbds 0.4.2 or newer." +ELSE +IF (__RGBDS_MAJOR__ < MAJOR) || \ (__RGBDS_MAJOR__ == MAJOR && __RGBDS_MINOR__ < MINOR) || \ (__RGBDS_MAJOR__ == MAJOR && __RGBDS_MINOR__ == MINOR && __RGBDS_PATCH__ < PATCH) - fail "pokered requires rgbds {MAJOR}.{MINOR}.{PATCH} or newer." + fail "pokered requires rgbds 0.4.2 or newer." +ENDC ENDC diff --git a/scripts/AgathasRoom.asm b/scripts/AgathasRoom.asm index 3c5740e9..3c5740e9 100755..100644 --- a/scripts/AgathasRoom.asm +++ b/scripts/AgathasRoom.asm diff --git a/scripts/BikeShop.asm b/scripts/BikeShop.asm index 6fa42240..6fa42240 100755..100644 --- a/scripts/BikeShop.asm +++ b/scripts/BikeShop.asm diff --git a/scripts/BillsHouse.asm b/scripts/BillsHouse.asm index 2085f417..2085f417 100755..100644 --- a/scripts/BillsHouse.asm +++ b/scripts/BillsHouse.asm diff --git a/scripts/BluesHouse.asm b/scripts/BluesHouse.asm index 1ab0fd06..1ab0fd06 100755..100644 --- a/scripts/BluesHouse.asm +++ b/scripts/BluesHouse.asm diff --git a/scripts/BrunosRoom.asm b/scripts/BrunosRoom.asm index 578cbb98..578cbb98 100755..100644 --- a/scripts/BrunosRoom.asm +++ b/scripts/BrunosRoom.asm diff --git a/scripts/CeladonChiefHouse.asm b/scripts/CeladonChiefHouse.asm index ad604b98..ad604b98 100755..100644 --- a/scripts/CeladonChiefHouse.asm +++ b/scripts/CeladonChiefHouse.asm diff --git a/scripts/CeladonCity.asm b/scripts/CeladonCity.asm index bd0228d8..bd0228d8 100755..100644 --- a/scripts/CeladonCity.asm +++ b/scripts/CeladonCity.asm diff --git a/scripts/CeladonDiner.asm b/scripts/CeladonDiner.asm index e95035f0..e95035f0 100755..100644 --- a/scripts/CeladonDiner.asm +++ b/scripts/CeladonDiner.asm diff --git a/scripts/CeladonGym.asm b/scripts/CeladonGym.asm index 72def27c..72def27c 100755..100644 --- a/scripts/CeladonGym.asm +++ b/scripts/CeladonGym.asm diff --git a/scripts/CeladonHotel.asm b/scripts/CeladonHotel.asm index 2cdd95b0..2cdd95b0 100755..100644 --- a/scripts/CeladonHotel.asm +++ b/scripts/CeladonHotel.asm diff --git a/scripts/CeladonMansion1F.asm b/scripts/CeladonMansion1F.asm index fa901ff9..fa901ff9 100755..100644 --- a/scripts/CeladonMansion1F.asm +++ b/scripts/CeladonMansion1F.asm diff --git a/scripts/CeladonMansion2F.asm b/scripts/CeladonMansion2F.asm index 8f83e86a..8f83e86a 100755..100644 --- a/scripts/CeladonMansion2F.asm +++ b/scripts/CeladonMansion2F.asm diff --git a/scripts/CeladonMansion3F.asm b/scripts/CeladonMansion3F.asm index f8972793..f8972793 100755..100644 --- a/scripts/CeladonMansion3F.asm +++ b/scripts/CeladonMansion3F.asm diff --git a/scripts/CeladonMansionRoof.asm b/scripts/CeladonMansionRoof.asm index 860fcbdf..860fcbdf 100755..100644 --- a/scripts/CeladonMansionRoof.asm +++ b/scripts/CeladonMansionRoof.asm diff --git a/scripts/CeladonMansionRoofHouse.asm b/scripts/CeladonMansionRoofHouse.asm index bd564dcc..bd564dcc 100755..100644 --- a/scripts/CeladonMansionRoofHouse.asm +++ b/scripts/CeladonMansionRoofHouse.asm diff --git a/scripts/CeladonMart1F.asm b/scripts/CeladonMart1F.asm index dca3c796..dca3c796 100755..100644 --- a/scripts/CeladonMart1F.asm +++ b/scripts/CeladonMart1F.asm diff --git a/scripts/CeladonMart2F.asm b/scripts/CeladonMart2F.asm index 11827128..11827128 100755..100644 --- a/scripts/CeladonMart2F.asm +++ b/scripts/CeladonMart2F.asm diff --git a/scripts/CeladonMart3F.asm b/scripts/CeladonMart3F.asm index 55081982..55081982 100755..100644 --- a/scripts/CeladonMart3F.asm +++ b/scripts/CeladonMart3F.asm diff --git a/scripts/CeladonMart4F.asm b/scripts/CeladonMart4F.asm index 1365dd0d..1365dd0d 100755..100644 --- a/scripts/CeladonMart4F.asm +++ b/scripts/CeladonMart4F.asm diff --git a/scripts/CeladonMart5F.asm b/scripts/CeladonMart5F.asm index 91748706..91748706 100755..100644 --- a/scripts/CeladonMart5F.asm +++ b/scripts/CeladonMart5F.asm diff --git a/scripts/CeladonMartElevator.asm b/scripts/CeladonMartElevator.asm index b657b3f9..b657b3f9 100755..100644 --- a/scripts/CeladonMartElevator.asm +++ b/scripts/CeladonMartElevator.asm diff --git a/scripts/CeladonMartRoof.asm b/scripts/CeladonMartRoof.asm index 37b8671e..37b8671e 100755..100644 --- a/scripts/CeladonMartRoof.asm +++ b/scripts/CeladonMartRoof.asm diff --git a/scripts/CeladonPokecenter.asm b/scripts/CeladonPokecenter.asm index 0f28e1b2..0f28e1b2 100755..100644 --- a/scripts/CeladonPokecenter.asm +++ b/scripts/CeladonPokecenter.asm diff --git a/scripts/CeruleanBadgeHouse.asm b/scripts/CeruleanBadgeHouse.asm index 5e35b079..5e35b079 100755..100644 --- a/scripts/CeruleanBadgeHouse.asm +++ b/scripts/CeruleanBadgeHouse.asm diff --git a/scripts/CeruleanCave1F.asm b/scripts/CeruleanCave1F.asm index 6f5c7b13..6f5c7b13 100755..100644 --- a/scripts/CeruleanCave1F.asm +++ b/scripts/CeruleanCave1F.asm diff --git a/scripts/CeruleanCave2F.asm b/scripts/CeruleanCave2F.asm index 1bc8457b..1bc8457b 100755..100644 --- a/scripts/CeruleanCave2F.asm +++ b/scripts/CeruleanCave2F.asm diff --git a/scripts/CeruleanCaveB1F.asm b/scripts/CeruleanCaveB1F.asm index 621815b0..621815b0 100755..100644 --- a/scripts/CeruleanCaveB1F.asm +++ b/scripts/CeruleanCaveB1F.asm diff --git a/scripts/CeruleanCity.asm b/scripts/CeruleanCity.asm index 7505cb20..7505cb20 100755..100644 --- a/scripts/CeruleanCity.asm +++ b/scripts/CeruleanCity.asm diff --git a/scripts/CeruleanCity_2.asm b/scripts/CeruleanCity_2.asm index 53ace5c8..53ace5c8 100755..100644 --- a/scripts/CeruleanCity_2.asm +++ b/scripts/CeruleanCity_2.asm diff --git a/scripts/CeruleanGym.asm b/scripts/CeruleanGym.asm index ed87b03c..ed87b03c 100755..100644 --- a/scripts/CeruleanGym.asm +++ b/scripts/CeruleanGym.asm diff --git a/scripts/CeruleanMart.asm b/scripts/CeruleanMart.asm index beb0fa1b..beb0fa1b 100755..100644 --- a/scripts/CeruleanMart.asm +++ b/scripts/CeruleanMart.asm diff --git a/scripts/CeruleanPokecenter.asm b/scripts/CeruleanPokecenter.asm index 680640f4..680640f4 100755..100644 --- a/scripts/CeruleanPokecenter.asm +++ b/scripts/CeruleanPokecenter.asm diff --git a/scripts/CeruleanTradeHouse.asm b/scripts/CeruleanTradeHouse.asm index 66952cd4..66952cd4 100755..100644 --- a/scripts/CeruleanTradeHouse.asm +++ b/scripts/CeruleanTradeHouse.asm diff --git a/scripts/CeruleanTrashedHouse.asm b/scripts/CeruleanTrashedHouse.asm index d11c7721..d11c7721 100755..100644 --- a/scripts/CeruleanTrashedHouse.asm +++ b/scripts/CeruleanTrashedHouse.asm diff --git a/scripts/ChampionsRoom.asm b/scripts/ChampionsRoom.asm index 11f99ee1..11f99ee1 100755..100644 --- a/scripts/ChampionsRoom.asm +++ b/scripts/ChampionsRoom.asm diff --git a/scripts/CinnabarGym.asm b/scripts/CinnabarGym.asm index a859e17a..a859e17a 100755..100644 --- a/scripts/CinnabarGym.asm +++ b/scripts/CinnabarGym.asm diff --git a/scripts/CinnabarIsland.asm b/scripts/CinnabarIsland.asm index a1b20cd3..a1b20cd3 100755..100644 --- a/scripts/CinnabarIsland.asm +++ b/scripts/CinnabarIsland.asm diff --git a/scripts/CinnabarLab.asm b/scripts/CinnabarLab.asm index 2f4be7f2..2f4be7f2 100755..100644 --- a/scripts/CinnabarLab.asm +++ b/scripts/CinnabarLab.asm diff --git a/scripts/CinnabarLabFossilRoom.asm b/scripts/CinnabarLabFossilRoom.asm index 2c388119..2c388119 100755..100644 --- a/scripts/CinnabarLabFossilRoom.asm +++ b/scripts/CinnabarLabFossilRoom.asm diff --git a/scripts/CinnabarLabMetronomeRoom.asm b/scripts/CinnabarLabMetronomeRoom.asm index b43f98e2..b43f98e2 100755..100644 --- a/scripts/CinnabarLabMetronomeRoom.asm +++ b/scripts/CinnabarLabMetronomeRoom.asm diff --git a/scripts/CinnabarLabTradeRoom.asm b/scripts/CinnabarLabTradeRoom.asm index 1f8710be..1f8710be 100755..100644 --- a/scripts/CinnabarLabTradeRoom.asm +++ b/scripts/CinnabarLabTradeRoom.asm diff --git a/scripts/CinnabarMart.asm b/scripts/CinnabarMart.asm index e614bd29..e614bd29 100755..100644 --- a/scripts/CinnabarMart.asm +++ b/scripts/CinnabarMart.asm diff --git a/scripts/CinnabarPokecenter.asm b/scripts/CinnabarPokecenter.asm index 9396f851..9396f851 100755..100644 --- a/scripts/CinnabarPokecenter.asm +++ b/scripts/CinnabarPokecenter.asm diff --git a/scripts/Colosseum.asm b/scripts/Colosseum.asm index 83d41bdc..83d41bdc 100755..100644 --- a/scripts/Colosseum.asm +++ b/scripts/Colosseum.asm diff --git a/scripts/CopycatsHouse1F.asm b/scripts/CopycatsHouse1F.asm index fc5ff3cf..fc5ff3cf 100755..100644 --- a/scripts/CopycatsHouse1F.asm +++ b/scripts/CopycatsHouse1F.asm diff --git a/scripts/CopycatsHouse2F.asm b/scripts/CopycatsHouse2F.asm index ef0742ab..ef0742ab 100755..100644 --- a/scripts/CopycatsHouse2F.asm +++ b/scripts/CopycatsHouse2F.asm diff --git a/scripts/Daycare.asm b/scripts/Daycare.asm index 481d7e14..481d7e14 100755..100644 --- a/scripts/Daycare.asm +++ b/scripts/Daycare.asm diff --git a/scripts/DiglettsCave.asm b/scripts/DiglettsCave.asm index f9f2e590..f9f2e590 100755..100644 --- a/scripts/DiglettsCave.asm +++ b/scripts/DiglettsCave.asm diff --git a/scripts/DiglettsCaveRoute11.asm b/scripts/DiglettsCaveRoute11.asm index 648fe2bc..648fe2bc 100755..100644 --- a/scripts/DiglettsCaveRoute11.asm +++ b/scripts/DiglettsCaveRoute11.asm diff --git a/scripts/DiglettsCaveRoute2.asm b/scripts/DiglettsCaveRoute2.asm index 32f17d65..32f17d65 100755..100644 --- a/scripts/DiglettsCaveRoute2.asm +++ b/scripts/DiglettsCaveRoute2.asm diff --git a/scripts/FightingDojo.asm b/scripts/FightingDojo.asm index e5d0a0a7..e5d0a0a7 100755..100644 --- a/scripts/FightingDojo.asm +++ b/scripts/FightingDojo.asm diff --git a/scripts/FuchsiaBillsGrandpasHouse.asm b/scripts/FuchsiaBillsGrandpasHouse.asm index 69ce1cf1..69ce1cf1 100755..100644 --- a/scripts/FuchsiaBillsGrandpasHouse.asm +++ b/scripts/FuchsiaBillsGrandpasHouse.asm diff --git a/scripts/FuchsiaCity.asm b/scripts/FuchsiaCity.asm index ac9f273b..ac9f273b 100755..100644 --- a/scripts/FuchsiaCity.asm +++ b/scripts/FuchsiaCity.asm diff --git a/scripts/FuchsiaGoodRodHouse.asm b/scripts/FuchsiaGoodRodHouse.asm index 28f6d056..28f6d056 100755..100644 --- a/scripts/FuchsiaGoodRodHouse.asm +++ b/scripts/FuchsiaGoodRodHouse.asm diff --git a/scripts/FuchsiaGym.asm b/scripts/FuchsiaGym.asm index f9472220..f9472220 100755..100644 --- a/scripts/FuchsiaGym.asm +++ b/scripts/FuchsiaGym.asm diff --git a/scripts/FuchsiaMart.asm b/scripts/FuchsiaMart.asm index e6d64c53..e6d64c53 100755..100644 --- a/scripts/FuchsiaMart.asm +++ b/scripts/FuchsiaMart.asm diff --git a/scripts/FuchsiaMeetingRoom.asm b/scripts/FuchsiaMeetingRoom.asm index 4fc05b1f..4fc05b1f 100755..100644 --- a/scripts/FuchsiaMeetingRoom.asm +++ b/scripts/FuchsiaMeetingRoom.asm diff --git a/scripts/FuchsiaPokecenter.asm b/scripts/FuchsiaPokecenter.asm index 788ee24b..788ee24b 100755..100644 --- a/scripts/FuchsiaPokecenter.asm +++ b/scripts/FuchsiaPokecenter.asm diff --git a/scripts/GameCorner.asm b/scripts/GameCorner.asm index 1a3a70a9..1a3a70a9 100755..100644 --- a/scripts/GameCorner.asm +++ b/scripts/GameCorner.asm diff --git a/scripts/GameCornerPrizeRoom.asm b/scripts/GameCornerPrizeRoom.asm index c8dddf71..c8dddf71 100755..100644 --- a/scripts/GameCornerPrizeRoom.asm +++ b/scripts/GameCornerPrizeRoom.asm diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm index fd13719b..fd13719b 100755..100644 --- a/scripts/HallOfFame.asm +++ b/scripts/HallOfFame.asm diff --git a/scripts/IndigoPlateau.asm b/scripts/IndigoPlateau.asm index 86f38b2a..86f38b2a 100755..100644 --- a/scripts/IndigoPlateau.asm +++ b/scripts/IndigoPlateau.asm diff --git a/scripts/IndigoPlateauLobby.asm b/scripts/IndigoPlateauLobby.asm index a9b549e3..a9b549e3 100755..100644 --- a/scripts/IndigoPlateauLobby.asm +++ b/scripts/IndigoPlateauLobby.asm diff --git a/scripts/LancesRoom.asm b/scripts/LancesRoom.asm index 6de0283e..6de0283e 100755..100644 --- a/scripts/LancesRoom.asm +++ b/scripts/LancesRoom.asm diff --git a/scripts/LavenderCuboneHouse.asm b/scripts/LavenderCuboneHouse.asm index 69d74ede..69d74ede 100755..100644 --- a/scripts/LavenderCuboneHouse.asm +++ b/scripts/LavenderCuboneHouse.asm diff --git a/scripts/LavenderMart.asm b/scripts/LavenderMart.asm index 2b67aaa6..2b67aaa6 100755..100644 --- a/scripts/LavenderMart.asm +++ b/scripts/LavenderMart.asm diff --git a/scripts/LavenderPokecenter.asm b/scripts/LavenderPokecenter.asm index b8a1d2a5..b8a1d2a5 100755..100644 --- a/scripts/LavenderPokecenter.asm +++ b/scripts/LavenderPokecenter.asm diff --git a/scripts/LavenderTown.asm b/scripts/LavenderTown.asm index d0c66208..d0c66208 100755..100644 --- a/scripts/LavenderTown.asm +++ b/scripts/LavenderTown.asm diff --git a/scripts/LoreleisRoom.asm b/scripts/LoreleisRoom.asm index 8e9730ff..8e9730ff 100755..100644 --- a/scripts/LoreleisRoom.asm +++ b/scripts/LoreleisRoom.asm diff --git a/scripts/MrFujisHouse.asm b/scripts/MrFujisHouse.asm index 3ef3017a..3ef3017a 100755..100644 --- a/scripts/MrFujisHouse.asm +++ b/scripts/MrFujisHouse.asm diff --git a/scripts/MrPsychicsHouse.asm b/scripts/MrPsychicsHouse.asm index 399edfbd..399edfbd 100755..100644 --- a/scripts/MrPsychicsHouse.asm +++ b/scripts/MrPsychicsHouse.asm diff --git a/scripts/MtMoon1F.asm b/scripts/MtMoon1F.asm index 68dacf29..68dacf29 100755..100644 --- a/scripts/MtMoon1F.asm +++ b/scripts/MtMoon1F.asm diff --git a/scripts/MtMoonB1F.asm b/scripts/MtMoonB1F.asm index 06af2dd3..06af2dd3 100755..100644 --- a/scripts/MtMoonB1F.asm +++ b/scripts/MtMoonB1F.asm diff --git a/scripts/MtMoonB2F.asm b/scripts/MtMoonB2F.asm index ab6e673e..ab6e673e 100755..100644 --- a/scripts/MtMoonB2F.asm +++ b/scripts/MtMoonB2F.asm diff --git a/scripts/MtMoonPokecenter.asm b/scripts/MtMoonPokecenter.asm index e4b881d1..e4b881d1 100755..100644 --- a/scripts/MtMoonPokecenter.asm +++ b/scripts/MtMoonPokecenter.asm diff --git a/scripts/Museum1F.asm b/scripts/Museum1F.asm index ee3473ff..ee3473ff 100755..100644 --- a/scripts/Museum1F.asm +++ b/scripts/Museum1F.asm diff --git a/scripts/Museum2F.asm b/scripts/Museum2F.asm index 8b1aa0bf..8b1aa0bf 100755..100644 --- a/scripts/Museum2F.asm +++ b/scripts/Museum2F.asm diff --git a/scripts/NameRatersHouse.asm b/scripts/NameRatersHouse.asm index cecf97e7..cecf97e7 100755..100644 --- a/scripts/NameRatersHouse.asm +++ b/scripts/NameRatersHouse.asm diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm index d1755fa8..d1755fa8 100755..100644 --- a/scripts/OaksLab.asm +++ b/scripts/OaksLab.asm diff --git a/scripts/PalletTown.asm b/scripts/PalletTown.asm index 5c26fc55..5c26fc55 100755..100644 --- a/scripts/PalletTown.asm +++ b/scripts/PalletTown.asm diff --git a/scripts/PewterCity.asm b/scripts/PewterCity.asm index 2575ed60..2575ed60 100755..100644 --- a/scripts/PewterCity.asm +++ b/scripts/PewterCity.asm diff --git a/scripts/PewterGym.asm b/scripts/PewterGym.asm index 3a766d54..3a766d54 100755..100644 --- a/scripts/PewterGym.asm +++ b/scripts/PewterGym.asm diff --git a/scripts/PewterMart.asm b/scripts/PewterMart.asm index a0e9e63e..a0e9e63e 100755..100644 --- a/scripts/PewterMart.asm +++ b/scripts/PewterMart.asm diff --git a/scripts/PewterNidoranHouse.asm b/scripts/PewterNidoranHouse.asm index 93d430c0..93d430c0 100755..100644 --- a/scripts/PewterNidoranHouse.asm +++ b/scripts/PewterNidoranHouse.asm diff --git a/scripts/PewterPokecenter.asm b/scripts/PewterPokecenter.asm index 5030244c..5030244c 100755..100644 --- a/scripts/PewterPokecenter.asm +++ b/scripts/PewterPokecenter.asm diff --git a/scripts/PewterSpeechHouse.asm b/scripts/PewterSpeechHouse.asm index 5d3d9249..5d3d9249 100755..100644 --- a/scripts/PewterSpeechHouse.asm +++ b/scripts/PewterSpeechHouse.asm diff --git a/scripts/PokemonFanClub.asm b/scripts/PokemonFanClub.asm index 717ba4bb..717ba4bb 100755..100644 --- a/scripts/PokemonFanClub.asm +++ b/scripts/PokemonFanClub.asm diff --git a/scripts/PokemonMansion1F.asm b/scripts/PokemonMansion1F.asm index ac86d626..ac86d626 100755..100644 --- a/scripts/PokemonMansion1F.asm +++ b/scripts/PokemonMansion1F.asm diff --git a/scripts/PokemonMansion2F.asm b/scripts/PokemonMansion2F.asm index 2edd0fb6..2edd0fb6 100755..100644 --- a/scripts/PokemonMansion2F.asm +++ b/scripts/PokemonMansion2F.asm diff --git a/scripts/PokemonMansion3F.asm b/scripts/PokemonMansion3F.asm index 0f62d6e0..0f62d6e0 100755..100644 --- a/scripts/PokemonMansion3F.asm +++ b/scripts/PokemonMansion3F.asm diff --git a/scripts/PokemonMansionB1F.asm b/scripts/PokemonMansionB1F.asm index f3b62793..f3b62793 100755..100644 --- a/scripts/PokemonMansionB1F.asm +++ b/scripts/PokemonMansionB1F.asm diff --git a/scripts/PokemonTower1F.asm b/scripts/PokemonTower1F.asm index 65614523..65614523 100755..100644 --- a/scripts/PokemonTower1F.asm +++ b/scripts/PokemonTower1F.asm diff --git a/scripts/PokemonTower2F.asm b/scripts/PokemonTower2F.asm index be3b5b89..be3b5b89 100755..100644 --- a/scripts/PokemonTower2F.asm +++ b/scripts/PokemonTower2F.asm diff --git a/scripts/PokemonTower3F.asm b/scripts/PokemonTower3F.asm index cf56904f..cf56904f 100755..100644 --- a/scripts/PokemonTower3F.asm +++ b/scripts/PokemonTower3F.asm diff --git a/scripts/PokemonTower4F.asm b/scripts/PokemonTower4F.asm index e3431644..e3431644 100755..100644 --- a/scripts/PokemonTower4F.asm +++ b/scripts/PokemonTower4F.asm diff --git a/scripts/PokemonTower5F.asm b/scripts/PokemonTower5F.asm index 10189a8e..10189a8e 100755..100644 --- a/scripts/PokemonTower5F.asm +++ b/scripts/PokemonTower5F.asm diff --git a/scripts/PokemonTower6F.asm b/scripts/PokemonTower6F.asm index e236488e..e236488e 100755..100644 --- a/scripts/PokemonTower6F.asm +++ b/scripts/PokemonTower6F.asm diff --git a/scripts/PokemonTower7F.asm b/scripts/PokemonTower7F.asm index e098b95f..e098b95f 100755..100644 --- a/scripts/PokemonTower7F.asm +++ b/scripts/PokemonTower7F.asm diff --git a/scripts/PowerPlant.asm b/scripts/PowerPlant.asm index 76859218..76859218 100755..100644 --- a/scripts/PowerPlant.asm +++ b/scripts/PowerPlant.asm diff --git a/scripts/RedsHouse1F.asm b/scripts/RedsHouse1F.asm index bdeb96d7..bdeb96d7 100755..100644 --- a/scripts/RedsHouse1F.asm +++ b/scripts/RedsHouse1F.asm diff --git a/scripts/RedsHouse2F.asm b/scripts/RedsHouse2F.asm index b44b9f98..b44b9f98 100755..100644 --- a/scripts/RedsHouse2F.asm +++ b/scripts/RedsHouse2F.asm diff --git a/scripts/RockTunnel1F.asm b/scripts/RockTunnel1F.asm index 606e0317..606e0317 100755..100644 --- a/scripts/RockTunnel1F.asm +++ b/scripts/RockTunnel1F.asm diff --git a/scripts/RockTunnelB1F.asm b/scripts/RockTunnelB1F.asm index 9cba9c3e..9cba9c3e 100755..100644 --- a/scripts/RockTunnelB1F.asm +++ b/scripts/RockTunnelB1F.asm diff --git a/scripts/RockTunnelPokecenter.asm b/scripts/RockTunnelPokecenter.asm index 755bb8f8..755bb8f8 100755..100644 --- a/scripts/RockTunnelPokecenter.asm +++ b/scripts/RockTunnelPokecenter.asm diff --git a/scripts/RocketHideoutB1F.asm b/scripts/RocketHideoutB1F.asm index f20c0892..f20c0892 100755..100644 --- a/scripts/RocketHideoutB1F.asm +++ b/scripts/RocketHideoutB1F.asm diff --git a/scripts/RocketHideoutB2F.asm b/scripts/RocketHideoutB2F.asm index d6fae24f..d6fae24f 100755..100644 --- a/scripts/RocketHideoutB2F.asm +++ b/scripts/RocketHideoutB2F.asm diff --git a/scripts/RocketHideoutB3F.asm b/scripts/RocketHideoutB3F.asm index 88876f04..88876f04 100755..100644 --- a/scripts/RocketHideoutB3F.asm +++ b/scripts/RocketHideoutB3F.asm diff --git a/scripts/RocketHideoutB4F.asm b/scripts/RocketHideoutB4F.asm index bc13da12..bc13da12 100755..100644 --- a/scripts/RocketHideoutB4F.asm +++ b/scripts/RocketHideoutB4F.asm diff --git a/scripts/RocketHideoutElevator.asm b/scripts/RocketHideoutElevator.asm index 8c51294e..8c51294e 100755..100644 --- a/scripts/RocketHideoutElevator.asm +++ b/scripts/RocketHideoutElevator.asm diff --git a/scripts/Route1.asm b/scripts/Route1.asm index bd9afea3..bd9afea3 100755..100644 --- a/scripts/Route1.asm +++ b/scripts/Route1.asm diff --git a/scripts/Route10.asm b/scripts/Route10.asm index 93012b9a..93012b9a 100755..100644 --- a/scripts/Route10.asm +++ b/scripts/Route10.asm diff --git a/scripts/Route11.asm b/scripts/Route11.asm index 924c0276..924c0276 100755..100644 --- a/scripts/Route11.asm +++ b/scripts/Route11.asm diff --git a/scripts/Route11Gate1F.asm b/scripts/Route11Gate1F.asm index d1ebe6ea..d1ebe6ea 100755..100644 --- a/scripts/Route11Gate1F.asm +++ b/scripts/Route11Gate1F.asm diff --git a/scripts/Route11Gate2F.asm b/scripts/Route11Gate2F.asm index 47c8db22..47c8db22 100755..100644 --- a/scripts/Route11Gate2F.asm +++ b/scripts/Route11Gate2F.asm diff --git a/scripts/Route12.asm b/scripts/Route12.asm index 3c0d77e1..3c0d77e1 100755..100644 --- a/scripts/Route12.asm +++ b/scripts/Route12.asm diff --git a/scripts/Route12Gate1F.asm b/scripts/Route12Gate1F.asm index 72f2dfbf..72f2dfbf 100755..100644 --- a/scripts/Route12Gate1F.asm +++ b/scripts/Route12Gate1F.asm diff --git a/scripts/Route12Gate2F.asm b/scripts/Route12Gate2F.asm index 2174fba8..2174fba8 100755..100644 --- a/scripts/Route12Gate2F.asm +++ b/scripts/Route12Gate2F.asm diff --git a/scripts/Route12SuperRodHouse.asm b/scripts/Route12SuperRodHouse.asm index fba5426e..fba5426e 100755..100644 --- a/scripts/Route12SuperRodHouse.asm +++ b/scripts/Route12SuperRodHouse.asm diff --git a/scripts/Route13.asm b/scripts/Route13.asm index c01ed514..c01ed514 100755..100644 --- a/scripts/Route13.asm +++ b/scripts/Route13.asm diff --git a/scripts/Route14.asm b/scripts/Route14.asm index 988fbe32..988fbe32 100755..100644 --- a/scripts/Route14.asm +++ b/scripts/Route14.asm diff --git a/scripts/Route15.asm b/scripts/Route15.asm index 3eed25d5..3eed25d5 100755..100644 --- a/scripts/Route15.asm +++ b/scripts/Route15.asm diff --git a/scripts/Route15Gate1F.asm b/scripts/Route15Gate1F.asm index dfbce9d4..dfbce9d4 100755..100644 --- a/scripts/Route15Gate1F.asm +++ b/scripts/Route15Gate1F.asm diff --git a/scripts/Route15Gate2F.asm b/scripts/Route15Gate2F.asm index 1b85e34e..1b85e34e 100755..100644 --- a/scripts/Route15Gate2F.asm +++ b/scripts/Route15Gate2F.asm diff --git a/scripts/Route16.asm b/scripts/Route16.asm index e7b1eb9a..e7b1eb9a 100755..100644 --- a/scripts/Route16.asm +++ b/scripts/Route16.asm diff --git a/scripts/Route16FlyHouse.asm b/scripts/Route16FlyHouse.asm index 3bb34b75..3bb34b75 100755..100644 --- a/scripts/Route16FlyHouse.asm +++ b/scripts/Route16FlyHouse.asm diff --git a/scripts/Route16Gate1F.asm b/scripts/Route16Gate1F.asm index e992fa44..e992fa44 100755..100644 --- a/scripts/Route16Gate1F.asm +++ b/scripts/Route16Gate1F.asm diff --git a/scripts/Route16Gate2F.asm b/scripts/Route16Gate2F.asm index 27e147a1..27e147a1 100755..100644 --- a/scripts/Route16Gate2F.asm +++ b/scripts/Route16Gate2F.asm diff --git a/scripts/Route17.asm b/scripts/Route17.asm index 27693f9f..27693f9f 100755..100644 --- a/scripts/Route17.asm +++ b/scripts/Route17.asm diff --git a/scripts/Route18.asm b/scripts/Route18.asm index f6738fc6..f6738fc6 100755..100644 --- a/scripts/Route18.asm +++ b/scripts/Route18.asm diff --git a/scripts/Route18Gate1F.asm b/scripts/Route18Gate1F.asm index 2caeaedd..2caeaedd 100755..100644 --- a/scripts/Route18Gate1F.asm +++ b/scripts/Route18Gate1F.asm diff --git a/scripts/Route18Gate2F.asm b/scripts/Route18Gate2F.asm index efb6d70a..efb6d70a 100755..100644 --- a/scripts/Route18Gate2F.asm +++ b/scripts/Route18Gate2F.asm diff --git a/scripts/Route19.asm b/scripts/Route19.asm index 8d0c9629..8d0c9629 100755..100644 --- a/scripts/Route19.asm +++ b/scripts/Route19.asm diff --git a/scripts/Route2.asm b/scripts/Route2.asm index c6886ce4..c6886ce4 100755..100644 --- a/scripts/Route2.asm +++ b/scripts/Route2.asm diff --git a/scripts/Route20.asm b/scripts/Route20.asm index f9904d4e..f9904d4e 100755..100644 --- a/scripts/Route20.asm +++ b/scripts/Route20.asm diff --git a/scripts/Route21.asm b/scripts/Route21.asm index 7afe350f..7afe350f 100755..100644 --- a/scripts/Route21.asm +++ b/scripts/Route21.asm diff --git a/scripts/Route22.asm b/scripts/Route22.asm index 1b02752f..1b02752f 100755..100644 --- a/scripts/Route22.asm +++ b/scripts/Route22.asm diff --git a/scripts/Route22Gate.asm b/scripts/Route22Gate.asm index 8a726515..8a726515 100755..100644 --- a/scripts/Route22Gate.asm +++ b/scripts/Route22Gate.asm diff --git a/scripts/Route23.asm b/scripts/Route23.asm index 20d2933a..20d2933a 100755..100644 --- a/scripts/Route23.asm +++ b/scripts/Route23.asm diff --git a/scripts/Route24.asm b/scripts/Route24.asm index aed112ac..aed112ac 100755..100644 --- a/scripts/Route24.asm +++ b/scripts/Route24.asm diff --git a/scripts/Route25.asm b/scripts/Route25.asm index fba28bc4..fba28bc4 100755..100644 --- a/scripts/Route25.asm +++ b/scripts/Route25.asm diff --git a/scripts/Route2Gate.asm b/scripts/Route2Gate.asm index 60f6ffe1..60f6ffe1 100755..100644 --- a/scripts/Route2Gate.asm +++ b/scripts/Route2Gate.asm diff --git a/scripts/Route2TradeHouse.asm b/scripts/Route2TradeHouse.asm index 85ed2d34..85ed2d34 100755..100644 --- a/scripts/Route2TradeHouse.asm +++ b/scripts/Route2TradeHouse.asm diff --git a/scripts/Route3.asm b/scripts/Route3.asm index 74140b40..74140b40 100755..100644 --- a/scripts/Route3.asm +++ b/scripts/Route3.asm diff --git a/scripts/Route4.asm b/scripts/Route4.asm index b69a88c7..b69a88c7 100755..100644 --- a/scripts/Route4.asm +++ b/scripts/Route4.asm diff --git a/scripts/Route5.asm b/scripts/Route5.asm index 33f3c345..33f3c345 100755..100644 --- a/scripts/Route5.asm +++ b/scripts/Route5.asm diff --git a/scripts/Route5Gate.asm b/scripts/Route5Gate.asm index e155694a..e155694a 100755..100644 --- a/scripts/Route5Gate.asm +++ b/scripts/Route5Gate.asm diff --git a/scripts/Route6.asm b/scripts/Route6.asm index 36883e09..36883e09 100755..100644 --- a/scripts/Route6.asm +++ b/scripts/Route6.asm diff --git a/scripts/Route6Gate.asm b/scripts/Route6Gate.asm index 143f60ae..143f60ae 100755..100644 --- a/scripts/Route6Gate.asm +++ b/scripts/Route6Gate.asm diff --git a/scripts/Route7.asm b/scripts/Route7.asm index 1fd38abb..1fd38abb 100755..100644 --- a/scripts/Route7.asm +++ b/scripts/Route7.asm diff --git a/scripts/Route7Gate.asm b/scripts/Route7Gate.asm index 9a647965..9a647965 100755..100644 --- a/scripts/Route7Gate.asm +++ b/scripts/Route7Gate.asm diff --git a/scripts/Route8.asm b/scripts/Route8.asm index f50167c0..f50167c0 100755..100644 --- a/scripts/Route8.asm +++ b/scripts/Route8.asm diff --git a/scripts/Route8Gate.asm b/scripts/Route8Gate.asm index 3167cd76..3167cd76 100755..100644 --- a/scripts/Route8Gate.asm +++ b/scripts/Route8Gate.asm diff --git a/scripts/Route9.asm b/scripts/Route9.asm index 5dc060c4..5dc060c4 100755..100644 --- a/scripts/Route9.asm +++ b/scripts/Route9.asm diff --git a/scripts/SSAnne1F.asm b/scripts/SSAnne1F.asm index c819f470..c819f470 100755..100644 --- a/scripts/SSAnne1F.asm +++ b/scripts/SSAnne1F.asm diff --git a/scripts/SSAnne1FRooms.asm b/scripts/SSAnne1FRooms.asm index e4e4813d..e4e4813d 100755..100644 --- a/scripts/SSAnne1FRooms.asm +++ b/scripts/SSAnne1FRooms.asm diff --git a/scripts/SSAnne2F.asm b/scripts/SSAnne2F.asm index d15ec180..d15ec180 100755..100644 --- a/scripts/SSAnne2F.asm +++ b/scripts/SSAnne2F.asm diff --git a/scripts/SSAnne2FRooms.asm b/scripts/SSAnne2FRooms.asm index 3fe2d34f..3fe2d34f 100755..100644 --- a/scripts/SSAnne2FRooms.asm +++ b/scripts/SSAnne2FRooms.asm diff --git a/scripts/SSAnne3F.asm b/scripts/SSAnne3F.asm index e3e7a1d3..e3e7a1d3 100755..100644 --- a/scripts/SSAnne3F.asm +++ b/scripts/SSAnne3F.asm diff --git a/scripts/SSAnneB1F.asm b/scripts/SSAnneB1F.asm index f66fdfaa..f66fdfaa 100755..100644 --- a/scripts/SSAnneB1F.asm +++ b/scripts/SSAnneB1F.asm diff --git a/scripts/SSAnneB1FRooms.asm b/scripts/SSAnneB1FRooms.asm index 2a077c33..2a077c33 100755..100644 --- a/scripts/SSAnneB1FRooms.asm +++ b/scripts/SSAnneB1FRooms.asm diff --git a/scripts/SSAnneBow.asm b/scripts/SSAnneBow.asm index 0621785d..0621785d 100755..100644 --- a/scripts/SSAnneBow.asm +++ b/scripts/SSAnneBow.asm diff --git a/scripts/SSAnneCaptainsRoom.asm b/scripts/SSAnneCaptainsRoom.asm index d618a69e..d618a69e 100755..100644 --- a/scripts/SSAnneCaptainsRoom.asm +++ b/scripts/SSAnneCaptainsRoom.asm diff --git a/scripts/SSAnneKitchen.asm b/scripts/SSAnneKitchen.asm index 30a9830f..30a9830f 100755..100644 --- a/scripts/SSAnneKitchen.asm +++ b/scripts/SSAnneKitchen.asm diff --git a/scripts/SafariZoneCenter.asm b/scripts/SafariZoneCenter.asm index 1e7db243..1e7db243 100755..100644 --- a/scripts/SafariZoneCenter.asm +++ b/scripts/SafariZoneCenter.asm diff --git a/scripts/SafariZoneCenterRestHouse.asm b/scripts/SafariZoneCenterRestHouse.asm index a03823cc..a03823cc 100755..100644 --- a/scripts/SafariZoneCenterRestHouse.asm +++ b/scripts/SafariZoneCenterRestHouse.asm diff --git a/scripts/SafariZoneEast.asm b/scripts/SafariZoneEast.asm index 062eeab1..062eeab1 100755..100644 --- a/scripts/SafariZoneEast.asm +++ b/scripts/SafariZoneEast.asm diff --git a/scripts/SafariZoneEastRestHouse.asm b/scripts/SafariZoneEastRestHouse.asm index 03655d69..03655d69 100755..100644 --- a/scripts/SafariZoneEastRestHouse.asm +++ b/scripts/SafariZoneEastRestHouse.asm diff --git a/scripts/SafariZoneGate.asm b/scripts/SafariZoneGate.asm index fd9a0884..fd9a0884 100755..100644 --- a/scripts/SafariZoneGate.asm +++ b/scripts/SafariZoneGate.asm diff --git a/scripts/SafariZoneNorth.asm b/scripts/SafariZoneNorth.asm index aaf39ea2..aaf39ea2 100755..100644 --- a/scripts/SafariZoneNorth.asm +++ b/scripts/SafariZoneNorth.asm diff --git a/scripts/SafariZoneNorthRestHouse.asm b/scripts/SafariZoneNorthRestHouse.asm index b7a690a1..b7a690a1 100755..100644 --- a/scripts/SafariZoneNorthRestHouse.asm +++ b/scripts/SafariZoneNorthRestHouse.asm diff --git a/scripts/SafariZoneSecretHouse.asm b/scripts/SafariZoneSecretHouse.asm index 6eeff8ad..6eeff8ad 100755..100644 --- a/scripts/SafariZoneSecretHouse.asm +++ b/scripts/SafariZoneSecretHouse.asm diff --git a/scripts/SafariZoneWest.asm b/scripts/SafariZoneWest.asm index 7ae0807d..7ae0807d 100755..100644 --- a/scripts/SafariZoneWest.asm +++ b/scripts/SafariZoneWest.asm diff --git a/scripts/SafariZoneWestRestHouse.asm b/scripts/SafariZoneWestRestHouse.asm index 74ad98fe..74ad98fe 100755..100644 --- a/scripts/SafariZoneWestRestHouse.asm +++ b/scripts/SafariZoneWestRestHouse.asm diff --git a/scripts/SaffronCity.asm b/scripts/SaffronCity.asm index 84982534..84982534 100755..100644 --- a/scripts/SaffronCity.asm +++ b/scripts/SaffronCity.asm diff --git a/scripts/SaffronGym.asm b/scripts/SaffronGym.asm index ccb1efb1..ccb1efb1 100755..100644 --- a/scripts/SaffronGym.asm +++ b/scripts/SaffronGym.asm diff --git a/scripts/SaffronMart.asm b/scripts/SaffronMart.asm index bfa47eb1..bfa47eb1 100755..100644 --- a/scripts/SaffronMart.asm +++ b/scripts/SaffronMart.asm diff --git a/scripts/SaffronPidgeyHouse.asm b/scripts/SaffronPidgeyHouse.asm index 90078e81..90078e81 100755..100644 --- a/scripts/SaffronPidgeyHouse.asm +++ b/scripts/SaffronPidgeyHouse.asm diff --git a/scripts/SaffronPokecenter.asm b/scripts/SaffronPokecenter.asm index 68eb4fc6..68eb4fc6 100755..100644 --- a/scripts/SaffronPokecenter.asm +++ b/scripts/SaffronPokecenter.asm diff --git a/scripts/SeafoamIslands1F.asm b/scripts/SeafoamIslands1F.asm index ceb2a2fb..ceb2a2fb 100755..100644 --- a/scripts/SeafoamIslands1F.asm +++ b/scripts/SeafoamIslands1F.asm diff --git a/scripts/SeafoamIslandsB1F.asm b/scripts/SeafoamIslandsB1F.asm index ac667513..ac667513 100755..100644 --- a/scripts/SeafoamIslandsB1F.asm +++ b/scripts/SeafoamIslandsB1F.asm diff --git a/scripts/SeafoamIslandsB2F.asm b/scripts/SeafoamIslandsB2F.asm index fe4b3ead..fe4b3ead 100755..100644 --- a/scripts/SeafoamIslandsB2F.asm +++ b/scripts/SeafoamIslandsB2F.asm diff --git a/scripts/SeafoamIslandsB3F.asm b/scripts/SeafoamIslandsB3F.asm index 9d1093e5..9d1093e5 100755..100644 --- a/scripts/SeafoamIslandsB3F.asm +++ b/scripts/SeafoamIslandsB3F.asm diff --git a/scripts/SeafoamIslandsB4F.asm b/scripts/SeafoamIslandsB4F.asm index bf80d3e0..bf80d3e0 100755..100644 --- a/scripts/SeafoamIslandsB4F.asm +++ b/scripts/SeafoamIslandsB4F.asm diff --git a/scripts/SilphCo10F.asm b/scripts/SilphCo10F.asm index 29b640fd..29b640fd 100755..100644 --- a/scripts/SilphCo10F.asm +++ b/scripts/SilphCo10F.asm diff --git a/scripts/SilphCo11F.asm b/scripts/SilphCo11F.asm index f3a7088b..f3a7088b 100755..100644 --- a/scripts/SilphCo11F.asm +++ b/scripts/SilphCo11F.asm diff --git a/scripts/SilphCo1F.asm b/scripts/SilphCo1F.asm index bc484b7c..bc484b7c 100755..100644 --- a/scripts/SilphCo1F.asm +++ b/scripts/SilphCo1F.asm diff --git a/scripts/SilphCo2F.asm b/scripts/SilphCo2F.asm index 4b96c314..4b96c314 100755..100644 --- a/scripts/SilphCo2F.asm +++ b/scripts/SilphCo2F.asm diff --git a/scripts/SilphCo3F.asm b/scripts/SilphCo3F.asm index 69dfdad9..69dfdad9 100755..100644 --- a/scripts/SilphCo3F.asm +++ b/scripts/SilphCo3F.asm diff --git a/scripts/SilphCo4F.asm b/scripts/SilphCo4F.asm index 8d5d696a..8d5d696a 100755..100644 --- a/scripts/SilphCo4F.asm +++ b/scripts/SilphCo4F.asm diff --git a/scripts/SilphCo5F.asm b/scripts/SilphCo5F.asm index 975dacac..975dacac 100755..100644 --- a/scripts/SilphCo5F.asm +++ b/scripts/SilphCo5F.asm diff --git a/scripts/SilphCo6F.asm b/scripts/SilphCo6F.asm index ea8c20c2..ea8c20c2 100755..100644 --- a/scripts/SilphCo6F.asm +++ b/scripts/SilphCo6F.asm diff --git a/scripts/SilphCo7F.asm b/scripts/SilphCo7F.asm index 59f90f0e..59f90f0e 100755..100644 --- a/scripts/SilphCo7F.asm +++ b/scripts/SilphCo7F.asm diff --git a/scripts/SilphCo8F.asm b/scripts/SilphCo8F.asm index c4e022d4..c4e022d4 100755..100644 --- a/scripts/SilphCo8F.asm +++ b/scripts/SilphCo8F.asm diff --git a/scripts/SilphCo9F.asm b/scripts/SilphCo9F.asm index 1efb3d78..1efb3d78 100755..100644 --- a/scripts/SilphCo9F.asm +++ b/scripts/SilphCo9F.asm diff --git a/scripts/SilphCoElevator.asm b/scripts/SilphCoElevator.asm index c898cbd1..c898cbd1 100755..100644 --- a/scripts/SilphCoElevator.asm +++ b/scripts/SilphCoElevator.asm diff --git a/scripts/TradeCenter.asm b/scripts/TradeCenter.asm index dbed79c1..dbed79c1 100755..100644 --- a/scripts/TradeCenter.asm +++ b/scripts/TradeCenter.asm diff --git a/scripts/UndergroundPathNorthSouth.asm b/scripts/UndergroundPathNorthSouth.asm index 00a7ef90..00a7ef90 100755..100644 --- a/scripts/UndergroundPathNorthSouth.asm +++ b/scripts/UndergroundPathNorthSouth.asm diff --git a/scripts/UndergroundPathRoute5.asm b/scripts/UndergroundPathRoute5.asm index 5c078050..5c078050 100755..100644 --- a/scripts/UndergroundPathRoute5.asm +++ b/scripts/UndergroundPathRoute5.asm diff --git a/scripts/UndergroundPathRoute6.asm b/scripts/UndergroundPathRoute6.asm index e3994e33..e3994e33 100755..100644 --- a/scripts/UndergroundPathRoute6.asm +++ b/scripts/UndergroundPathRoute6.asm diff --git a/scripts/UndergroundPathRoute7.asm b/scripts/UndergroundPathRoute7.asm index c311b409..c311b409 100755..100644 --- a/scripts/UndergroundPathRoute7.asm +++ b/scripts/UndergroundPathRoute7.asm diff --git a/scripts/UndergroundPathRoute7Copy.asm b/scripts/UndergroundPathRoute7Copy.asm index 2eb74fce..2eb74fce 100755..100644 --- a/scripts/UndergroundPathRoute7Copy.asm +++ b/scripts/UndergroundPathRoute7Copy.asm diff --git a/scripts/UndergroundPathRoute8.asm b/scripts/UndergroundPathRoute8.asm index 6eab58c2..6eab58c2 100755..100644 --- a/scripts/UndergroundPathRoute8.asm +++ b/scripts/UndergroundPathRoute8.asm diff --git a/scripts/UndergroundPathWestEast.asm b/scripts/UndergroundPathWestEast.asm index 98571e17..98571e17 100755..100644 --- a/scripts/UndergroundPathWestEast.asm +++ b/scripts/UndergroundPathWestEast.asm diff --git a/scripts/VermilionCity.asm b/scripts/VermilionCity.asm index 629bb0c8..629bb0c8 100755..100644 --- a/scripts/VermilionCity.asm +++ b/scripts/VermilionCity.asm diff --git a/scripts/VermilionDock.asm b/scripts/VermilionDock.asm index ea1fae79..ea1fae79 100755..100644 --- a/scripts/VermilionDock.asm +++ b/scripts/VermilionDock.asm diff --git a/scripts/VermilionGym.asm b/scripts/VermilionGym.asm index db24ec75..db24ec75 100755..100644 --- a/scripts/VermilionGym.asm +++ b/scripts/VermilionGym.asm diff --git a/scripts/VermilionMart.asm b/scripts/VermilionMart.asm index 88a632c8..88a632c8 100755..100644 --- a/scripts/VermilionMart.asm +++ b/scripts/VermilionMart.asm diff --git a/scripts/VermilionOldRodHouse.asm b/scripts/VermilionOldRodHouse.asm index 524395d4..524395d4 100755..100644 --- a/scripts/VermilionOldRodHouse.asm +++ b/scripts/VermilionOldRodHouse.asm diff --git a/scripts/VermilionPidgeyHouse.asm b/scripts/VermilionPidgeyHouse.asm index fef476d5..fef476d5 100755..100644 --- a/scripts/VermilionPidgeyHouse.asm +++ b/scripts/VermilionPidgeyHouse.asm diff --git a/scripts/VermilionPokecenter.asm b/scripts/VermilionPokecenter.asm index 65b5a3df..65b5a3df 100755..100644 --- a/scripts/VermilionPokecenter.asm +++ b/scripts/VermilionPokecenter.asm diff --git a/scripts/VermilionTradeHouse.asm b/scripts/VermilionTradeHouse.asm index 7fdb9f40..7fdb9f40 100755..100644 --- a/scripts/VermilionTradeHouse.asm +++ b/scripts/VermilionTradeHouse.asm diff --git a/scripts/VictoryRoad1F.asm b/scripts/VictoryRoad1F.asm index b70f0dd4..b70f0dd4 100755..100644 --- a/scripts/VictoryRoad1F.asm +++ b/scripts/VictoryRoad1F.asm diff --git a/scripts/VictoryRoad2F.asm b/scripts/VictoryRoad2F.asm index 61843e5e..61843e5e 100755..100644 --- a/scripts/VictoryRoad2F.asm +++ b/scripts/VictoryRoad2F.asm diff --git a/scripts/VictoryRoad3F.asm b/scripts/VictoryRoad3F.asm index 7febdd3d..7febdd3d 100755..100644 --- a/scripts/VictoryRoad3F.asm +++ b/scripts/VictoryRoad3F.asm diff --git a/scripts/ViridianCity.asm b/scripts/ViridianCity.asm index 96e58a19..96e58a19 100755..100644 --- a/scripts/ViridianCity.asm +++ b/scripts/ViridianCity.asm diff --git a/scripts/ViridianForest.asm b/scripts/ViridianForest.asm index a7e4acf8..a7e4acf8 100755..100644 --- a/scripts/ViridianForest.asm +++ b/scripts/ViridianForest.asm diff --git a/scripts/ViridianForestNorthGate.asm b/scripts/ViridianForestNorthGate.asm index 6aef26d3..6aef26d3 100755..100644 --- a/scripts/ViridianForestNorthGate.asm +++ b/scripts/ViridianForestNorthGate.asm diff --git a/scripts/ViridianForestSouthGate.asm b/scripts/ViridianForestSouthGate.asm index 996ac2ae..996ac2ae 100755..100644 --- a/scripts/ViridianForestSouthGate.asm +++ b/scripts/ViridianForestSouthGate.asm diff --git a/scripts/ViridianGym.asm b/scripts/ViridianGym.asm index 62b0c3f9..62b0c3f9 100755..100644 --- a/scripts/ViridianGym.asm +++ b/scripts/ViridianGym.asm diff --git a/scripts/ViridianMart.asm b/scripts/ViridianMart.asm index f71cc6ef..f71cc6ef 100755..100644 --- a/scripts/ViridianMart.asm +++ b/scripts/ViridianMart.asm diff --git a/scripts/ViridianNicknameHouse.asm b/scripts/ViridianNicknameHouse.asm index df7482c2..df7482c2 100755..100644 --- a/scripts/ViridianNicknameHouse.asm +++ b/scripts/ViridianNicknameHouse.asm diff --git a/scripts/ViridianPokecenter.asm b/scripts/ViridianPokecenter.asm index 08577678..08577678 100755..100644 --- a/scripts/ViridianPokecenter.asm +++ b/scripts/ViridianPokecenter.asm diff --git a/scripts/ViridianSchoolHouse.asm b/scripts/ViridianSchoolHouse.asm index 731e2dac..731e2dac 100755..100644 --- a/scripts/ViridianSchoolHouse.asm +++ b/scripts/ViridianSchoolHouse.asm diff --git a/scripts/WardensHouse.asm b/scripts/WardensHouse.asm index 2dd0410c..2dd0410c 100755..100644 --- a/scripts/WardensHouse.asm +++ b/scripts/WardensHouse.asm @@ -17,7 +17,7 @@ sMainData:: ds wMainDataEnd - wMainDataStart sSpriteData:: ds wSpriteDataEnd - wSpriteDataStart sPartyData:: ds wPartyDataEnd - wPartyDataStart sCurBoxData:: ds wBoxDataEnd - wBoxDataStart -sTilesetType:: ds 1 +sTileAnimations:: ds 1 sMainDataCheckSum:: ds 1 diff --git a/tools/unnamed.py b/tools/unnamed.py index 803685df..f99a38d8 100755 --- a/tools/unnamed.py +++ b/tools/unnamed.py @@ -82,17 +82,38 @@ for objfile in objects: elif magic == b'RGB9': obj_ver = 10 + unpack_file("<I", f)[0] - if obj_ver not in [6, 10, 11, 12, 13, 15]: + if obj_ver not in [6, 10, 11, 12, 13, 15, 16]: print("Error: File '%s' is of an unknown format." % objfile, file=stderr) exit(1) - num_symbols = unpack_file("<II", f)[0] + num_symbols = unpack_file("<I", f)[0] + unpack_file("<I", f) # skip num sections + + if obj_ver in [16]: + node_filenames = [] + num_nodes = unpack_file("<I", f)[0] + for x in range(num_nodes): + unpack_file("<II", f) # parent id, parent line no + node_type = unpack_file("<B", f)[0] + if node_type: + node_filenames.append(read_string(f)) + else: + node_filenames.append("rept") + depth = unpack_file("<I", f)[0] + for i in range(depth): + unpack_file("<I", f) # rept iterations + node_filenames.reverse() + for x in range(num_symbols): sym_name = read_string(f) sym_type = symtype(unpack_file("<B", f)[0] & 0x7f) if sym_type == symtype.IMPORT: continue - sym_filename = read_string(f) + if obj_ver in [16]: + sym_fileno = unpack_file("<I", f)[0] + sym_filename = node_filenames[sym_fileno] + else: + sym_filename = read_string(f) unpack_file("<III", f) if sym_name not in symbols: continue @@ -1998,10 +1998,11 @@ wMonHGrowthRate:: wMonHLearnset:: ; bit field - flag_array 50 + 5 + flag_array NUM_TMS + NUM_HMS ds 1 +wMonHeaderEnd:: -wSavedTilesetType:: +wSavedTileAnimations:: ; saved at the start of a battle and then written back at the end of the battle ds 1 @@ -3036,31 +3037,33 @@ wSecondLockTrashCanIndex:: wEventFlags:: flag_array NUM_EVENTS + +UNION +wGrassRate:: db +wGrassMons:: + ds 10 * 2 + + ds 8 + +wWaterRate:: db +wWaterMons:: + ds 10 * 2 + +NEXTU wLinkEnemyTrainerName:: ; linked game's trainer name + ds NAME_LENGTH -wGrassRate:: ds 1 -wGrassMons:: -; ds 20 - - ds 11 -; Overload wGrassMons wSerialEnemyDataBlock:: +; ds $1a8 + ds 9 wEnemyPartyCount:: ds 1 wEnemyPartyMons:: ds PARTY_LENGTH + 1 -; Overload enemy party data -UNION - -wWaterRate:: db -wWaterMons:: db - -NEXTU - wEnemyMons:: wEnemyMon1:: party_struct wEnemyMon1 wEnemyMon2:: party_struct wEnemyMon2 |