diff options
Diffstat (limited to 'data')
231 files changed, 232 insertions, 231 deletions
diff --git a/data/baseStats/bulbasaur.asm b/data/baseStats/bulbasaur.asm index 7b3567b5..32650d06 100644 --- a/data/baseStats/bulbasaur.asm +++ b/data/baseStats/bulbasaur.asm @@ -1,4 +1,3 @@ -MonBaseStats: db DEX_BULBASAUR ; pokedex id db 45 ; base hp db 49 ; base attack @@ -27,4 +26,3 @@ db 3 ; growth rate tmlearn 44 tmlearn 50,51 db 0 ; padding -MonBaseStatsEnd: diff --git a/data/baseStats/mew.asm b/data/baseStats/mew.asm index 6919fd0e..046b4d86 100644 --- a/data/baseStats/mew.asm +++ b/data/baseStats/mew.asm @@ -1,4 +1,4 @@ -MewBaseStats: +MewBaseStats:: db DEX_MEW ; pokedex id db 100 ; base hp db 100 ; base attack diff --git a/data/base_stats.asm b/data/base_stats.asm index a84693a4..7aa36735 100755 --- a/data/base_stats.asm +++ b/data/base_stats.asm @@ -1,4 +1,7 @@ +BaseStats:: +MonBaseStats:: INCLUDE "data/baseStats/bulbasaur.asm" +MonBaseStatsEnd:: INCLUDE "data/baseStats/ivysaur.asm" INCLUDE "data/baseStats/venusaur.asm" INCLUDE "data/baseStats/charmander.asm" diff --git a/data/cries.asm b/data/cries.asm index 7031536e..1fc9960f 100755 --- a/data/cries.asm +++ b/data/cries.asm @@ -1,4 +1,4 @@ -CryData: +CryData:: ;$BaseCry, $Pitch, $Length db $11, $00, $80; Rhydon db $03, $00, $80; Kangaskhan diff --git a/data/item_prices.asm b/data/item_prices.asm index 15a1bd34..f3d8f76b 100755 --- a/data/item_prices.asm +++ b/data/item_prices.asm @@ -1,4 +1,4 @@ -ItemPrices: +ItemPrices:: money 0 ; MASTER_BALL money 1200 ; ULTRA_BALL money 600 ; GREAT_BALL diff --git a/data/mapHeaders/AgathasRoom.asm b/data/mapHeaders/AgathasRoom.asm index 73cd7291..6e31225c 100755 --- a/data/mapHeaders/AgathasRoom.asm +++ b/data/mapHeaders/AgathasRoom.asm @@ -1,4 +1,4 @@ -AgathasRoom_h: +AgathasRoom_h:: db CEMETERY ; tileset db AGATHAS_ROOM_HEIGHT, AGATHAS_ROOM_WIDTH ; dimensions (y, x) dw AgathasRoom_Blocks ; blocks diff --git a/data/mapHeaders/BikeShop.asm b/data/mapHeaders/BikeShop.asm index c447fd80..ea6f8d60 100755 --- a/data/mapHeaders/BikeShop.asm +++ b/data/mapHeaders/BikeShop.asm @@ -1,4 +1,4 @@ -BikeShop_h: +BikeShop_h:: db CLUB ; tileset db BIKE_SHOP_HEIGHT, BIKE_SHOP_WIDTH ; dimensions (y, x) dw BikeShop_Blocks ; blocks diff --git a/data/mapHeaders/BillsHouse.asm b/data/mapHeaders/BillsHouse.asm index bba9cf83..e58cbd5b 100755 --- a/data/mapHeaders/BillsHouse.asm +++ b/data/mapHeaders/BillsHouse.asm @@ -1,4 +1,4 @@ -BillsHouse_h: +BillsHouse_h:: db INTERIOR ; tileset db BILLS_HOUSE_HEIGHT, BILLS_HOUSE_WIDTH ; dimensions (y, x) dw BillsHouse_Blocks ; blocks diff --git a/data/mapHeaders/BluesHouse.asm b/data/mapHeaders/BluesHouse.asm index 6ef0433e..bc9ed3de 100755 --- a/data/mapHeaders/BluesHouse.asm +++ b/data/mapHeaders/BluesHouse.asm @@ -1,4 +1,4 @@ -BluesHouse_h: +BluesHouse_h:: db HOUSE ; tileset db BLUES_HOUSE_HEIGHT, BLUES_HOUSE_WIDTH ; dimensions (y, x) dw BluesHouse_Blocks ; blocks diff --git a/data/mapHeaders/BrunosRoom.asm b/data/mapHeaders/BrunosRoom.asm index 78c7989d..03398603 100755 --- a/data/mapHeaders/BrunosRoom.asm +++ b/data/mapHeaders/BrunosRoom.asm @@ -1,4 +1,4 @@ -BrunosRoom_h: +BrunosRoom_h:: db GYM ; tileset db BRUNOS_ROOM_HEIGHT, BRUNOS_ROOM_WIDTH ; dimensions (y, x) dw BrunosRoom_Blocks ; blocks diff --git a/data/mapHeaders/CeladonChiefHouse.asm b/data/mapHeaders/CeladonChiefHouse.asm index a31c8121..e29f722f 100755 --- a/data/mapHeaders/CeladonChiefHouse.asm +++ b/data/mapHeaders/CeladonChiefHouse.asm @@ -1,4 +1,4 @@ -CeladonChiefHouse_h: +CeladonChiefHouse_h:: db MANSION ; tileset db CELADON_CHIEF_HOUSE_HEIGHT, CELADON_CHIEF_HOUSE_WIDTH ; dimensions (y, x) dw CeladonChiefHouse_Blocks ; blocks diff --git a/data/mapHeaders/CeladonCity.asm b/data/mapHeaders/CeladonCity.asm index 62243d27..f2ce1831 100755 --- a/data/mapHeaders/CeladonCity.asm +++ b/data/mapHeaders/CeladonCity.asm @@ -1,4 +1,4 @@ -CeladonCity_h: +CeladonCity_h:: db OVERWORLD ; tileset db CELADON_CITY_HEIGHT, CELADON_CITY_WIDTH ; dimensions (y, x) dw CeladonCity_Blocks ; blocks diff --git a/data/mapHeaders/CeladonDiner.asm b/data/mapHeaders/CeladonDiner.asm index d4220db7..14501d83 100755 --- a/data/mapHeaders/CeladonDiner.asm +++ b/data/mapHeaders/CeladonDiner.asm @@ -1,4 +1,4 @@ -CeladonDiner_h: +CeladonDiner_h:: db LOBBY ; tileset db CELADON_DINER_HEIGHT, CELADON_DINER_WIDTH ; dimensions (y, x) dw CeladonDiner_Blocks ; blocks diff --git a/data/mapHeaders/CeladonGym.asm b/data/mapHeaders/CeladonGym.asm index 04a9427c..b64c5e19 100755 --- a/data/mapHeaders/CeladonGym.asm +++ b/data/mapHeaders/CeladonGym.asm @@ -1,4 +1,4 @@ -CeladonGym_h: +CeladonGym_h:: db GYM ; tileset db CELADON_GYM_HEIGHT, CELADON_GYM_WIDTH ; dimensions (y, x) dw CeladonGym_Blocks ; blocks diff --git a/data/mapHeaders/CeladonHotel.asm b/data/mapHeaders/CeladonHotel.asm index e06c2fd3..ecc943c2 100755 --- a/data/mapHeaders/CeladonHotel.asm +++ b/data/mapHeaders/CeladonHotel.asm @@ -1,4 +1,4 @@ -CeladonHotel_h: +CeladonHotel_h:: db POKECENTER ; tileset db CELADON_HOTEL_HEIGHT, CELADON_HOTEL_WIDTH ; dimensions (y, x) dw CeladonHotel_Blocks ; blocks diff --git a/data/mapHeaders/CeladonMansion1F.asm b/data/mapHeaders/CeladonMansion1F.asm index d2d0ee99..b13f76a7 100755 --- a/data/mapHeaders/CeladonMansion1F.asm +++ b/data/mapHeaders/CeladonMansion1F.asm @@ -1,4 +1,4 @@ -CeladonMansion1F_h: +CeladonMansion1F_h:: db MANSION ; tileset db CELADON_MANSION_1F_HEIGHT, CELADON_MANSION_1F_WIDTH ; dimensions (y, x) dw CeladonMansion1F_Blocks ; blocks diff --git a/data/mapHeaders/CeladonMansion2F.asm b/data/mapHeaders/CeladonMansion2F.asm index eceac30e..33493510 100755 --- a/data/mapHeaders/CeladonMansion2F.asm +++ b/data/mapHeaders/CeladonMansion2F.asm @@ -1,4 +1,4 @@ -CeladonMansion2F_h: +CeladonMansion2F_h:: db MANSION ; tileset db CELADON_MANSION_2F_HEIGHT, CELADON_MANSION_2F_WIDTH ; dimensions (y, x) dw CeladonMansion2F_Blocks ; blocks diff --git a/data/mapHeaders/CeladonMansion3F.asm b/data/mapHeaders/CeladonMansion3F.asm index b5a0a705..89d0cfe6 100755 --- a/data/mapHeaders/CeladonMansion3F.asm +++ b/data/mapHeaders/CeladonMansion3F.asm @@ -1,4 +1,4 @@ -CeladonMansion3F_h: +CeladonMansion3F_h:: db MANSION ; tileset db CELADON_MANSION_3F_HEIGHT, CELADON_MANSION_3F_WIDTH ; dimensions (y, x) dw CeladonMansion3F_Blocks ; blocks diff --git a/data/mapHeaders/CeladonMansionRoof.asm b/data/mapHeaders/CeladonMansionRoof.asm index d7a050c8..7f7fa4ac 100755 --- a/data/mapHeaders/CeladonMansionRoof.asm +++ b/data/mapHeaders/CeladonMansionRoof.asm @@ -1,4 +1,4 @@ -CeladonMansionRoof_h: +CeladonMansionRoof_h:: db MANSION ; tileset db CELADON_MANSION_ROOF_HEIGHT, CELADON_MANSION_ROOF_WIDTH ; dimensions (y, x) dw CeladonMansionRoof_Blocks ; blocks diff --git a/data/mapHeaders/CeladonMansionRoofHouse.asm b/data/mapHeaders/CeladonMansionRoofHouse.asm index 7fcf49e1..de6771b7 100755 --- a/data/mapHeaders/CeladonMansionRoofHouse.asm +++ b/data/mapHeaders/CeladonMansionRoofHouse.asm @@ -1,4 +1,4 @@ -CeladonMansionRoofHouse_h: +CeladonMansionRoofHouse_h:: db HOUSE ; tileset db CELADON_MANSION_ROOF_HOUSE_HEIGHT, CELADON_MANSION_ROOF_HOUSE_WIDTH ; dimensions (y, x) dw CeladonMansionRoofHouse_Blocks ; blocks diff --git a/data/mapHeaders/CeladonMart1F.asm b/data/mapHeaders/CeladonMart1F.asm index 51e968fa..d392f8a7 100755 --- a/data/mapHeaders/CeladonMart1F.asm +++ b/data/mapHeaders/CeladonMart1F.asm @@ -1,4 +1,4 @@ -CeladonMart1F_h: +CeladonMart1F_h:: db LOBBY ; tileset db CELADON_MART_1F_HEIGHT, CELADON_MART_1F_WIDTH ; dimensions (y, x) dw CeladonMart1F_Blocks ; blocks diff --git a/data/mapHeaders/CeladonMart2F.asm b/data/mapHeaders/CeladonMart2F.asm index 77106405..ff39a08c 100755 --- a/data/mapHeaders/CeladonMart2F.asm +++ b/data/mapHeaders/CeladonMart2F.asm @@ -1,4 +1,4 @@ -CeladonMart2F_h: +CeladonMart2F_h:: db LOBBY ; tileset db CELADON_MART_2F_HEIGHT, CELADON_MART_2F_WIDTH ; dimensions (y, x) dw CeladonMart2F_Blocks ; blocks diff --git a/data/mapHeaders/CeladonMart3F.asm b/data/mapHeaders/CeladonMart3F.asm index c460945c..2bdd384f 100755 --- a/data/mapHeaders/CeladonMart3F.asm +++ b/data/mapHeaders/CeladonMart3F.asm @@ -1,4 +1,4 @@ -CeladonMart3F_h: +CeladonMart3F_h:: db LOBBY ; tileset db CELADON_MART_3F_HEIGHT, CELADON_MART_3F_WIDTH ; dimensions (y, x) dw CeladonMart3F_Blocks ; blocks diff --git a/data/mapHeaders/CeladonMart4F.asm b/data/mapHeaders/CeladonMart4F.asm index a742570b..d03bde7a 100755 --- a/data/mapHeaders/CeladonMart4F.asm +++ b/data/mapHeaders/CeladonMart4F.asm @@ -1,4 +1,4 @@ -CeladonMart4F_h: +CeladonMart4F_h:: db LOBBY ; tileset db CELADON_MART_4F_HEIGHT, CELADON_MART_4F_WIDTH ; dimensions (y, x) dw CeladonMart4F_Blocks ; blocks diff --git a/data/mapHeaders/CeladonMart5F.asm b/data/mapHeaders/CeladonMart5F.asm index 4b5223e0..e0f9c436 100755 --- a/data/mapHeaders/CeladonMart5F.asm +++ b/data/mapHeaders/CeladonMart5F.asm @@ -1,4 +1,4 @@ -CeladonMart5F_h: +CeladonMart5F_h:: db LOBBY ; tileset db CELADON_MART_5F_HEIGHT, CELADON_MART_5F_WIDTH ; dimensions (y, x) dw CeladonMart5F_Blocks ; blocks diff --git a/data/mapHeaders/CeladonMartElevator.asm b/data/mapHeaders/CeladonMartElevator.asm index 06e87608..391f65fd 100755 --- a/data/mapHeaders/CeladonMartElevator.asm +++ b/data/mapHeaders/CeladonMartElevator.asm @@ -1,4 +1,4 @@ -CeladonMartElevator_h: +CeladonMartElevator_h:: db LOBBY ; tileset db CELADON_MART_ELEVATOR_HEIGHT, CELADON_MART_ELEVATOR_WIDTH ; dimensions (y, x) dw CeladonMartElevator_Blocks ; blocks diff --git a/data/mapHeaders/CeladonMartRoof.asm b/data/mapHeaders/CeladonMartRoof.asm index 163e25ed..38f863f1 100755 --- a/data/mapHeaders/CeladonMartRoof.asm +++ b/data/mapHeaders/CeladonMartRoof.asm @@ -1,4 +1,4 @@ -CeladonMartRoof_h: +CeladonMartRoof_h:: db LOBBY ; tileset db CELADON_MART_ROOF_HEIGHT, CELADON_MART_ROOF_WIDTH ; dimensions (y, x) dw CeladonMartRoof_Blocks ; blocks diff --git a/data/mapHeaders/CeladonPokecenter.asm b/data/mapHeaders/CeladonPokecenter.asm index b5d9bd73..5b945d50 100755 --- a/data/mapHeaders/CeladonPokecenter.asm +++ b/data/mapHeaders/CeladonPokecenter.asm @@ -1,4 +1,4 @@ -CeladonPokecenter_h: +CeladonPokecenter_h:: db POKECENTER ; tileset db CELADON_POKECENTER_HEIGHT, CELADON_POKECENTER_WIDTH ; dimensions (y, x) dw CeladonPokecenter_Blocks ; blocks diff --git a/data/mapHeaders/CeruleanBadgeHouse.asm b/data/mapHeaders/CeruleanBadgeHouse.asm index a94f1912..eaf77bb7 100755 --- a/data/mapHeaders/CeruleanBadgeHouse.asm +++ b/data/mapHeaders/CeruleanBadgeHouse.asm @@ -1,4 +1,4 @@ -CeruleanBadgeHouse_h: +CeruleanBadgeHouse_h:: db SHIP ; tileset db CERULEAN_BADGE_HOUSE_HEIGHT, CERULEAN_BADGE_HOUSE_WIDTH ; dimensions (y, x) dw CeruleanBadgeHouse_Blocks ; blocks diff --git a/data/mapHeaders/CeruleanCave1F.asm b/data/mapHeaders/CeruleanCave1F.asm index 932dfb48..0ab0ecf0 100755 --- a/data/mapHeaders/CeruleanCave1F.asm +++ b/data/mapHeaders/CeruleanCave1F.asm @@ -1,4 +1,4 @@ -CeruleanCave1F_h: +CeruleanCave1F_h:: db CAVERN ; tileset db CERULEAN_CAVE_1F_HEIGHT, CERULEAN_CAVE_1F_WIDTH ; dimensions (y, x) dw CeruleanCave1F_Blocks ; blocks diff --git a/data/mapHeaders/CeruleanCave2F.asm b/data/mapHeaders/CeruleanCave2F.asm index 7cf82371..4002e73a 100755 --- a/data/mapHeaders/CeruleanCave2F.asm +++ b/data/mapHeaders/CeruleanCave2F.asm @@ -1,4 +1,4 @@ -CeruleanCave2F_h: +CeruleanCave2F_h:: db CAVERN ; tileset db CERULEAN_CAVE_2F_HEIGHT, CERULEAN_CAVE_2F_WIDTH ; dimensions (y, x) dw CeruleanCave2F_Blocks ; blocks diff --git a/data/mapHeaders/CeruleanCaveB1F.asm b/data/mapHeaders/CeruleanCaveB1F.asm index eb940faa..e3e9980f 100755 --- a/data/mapHeaders/CeruleanCaveB1F.asm +++ b/data/mapHeaders/CeruleanCaveB1F.asm @@ -1,4 +1,4 @@ -CeruleanCaveB1F_h: +CeruleanCaveB1F_h:: db CAVERN ; tileset db CERULEAN_CAVE_B1F_HEIGHT, CERULEAN_CAVE_B1F_WIDTH ; dimensions (y, x) dw CeruleanCaveB1F_Blocks ; blocks diff --git a/data/mapHeaders/CeruleanCity.asm b/data/mapHeaders/CeruleanCity.asm index cd5444ab..23206c0a 100755 --- a/data/mapHeaders/CeruleanCity.asm +++ b/data/mapHeaders/CeruleanCity.asm @@ -1,4 +1,4 @@ -CeruleanCity_h: +CeruleanCity_h:: db OVERWORLD ; tileset db CERULEAN_CITY_HEIGHT, CERULEAN_CITY_WIDTH ; dimensions (y, x) dw CeruleanCity_Blocks ; blocks diff --git a/data/mapHeaders/CeruleanGym.asm b/data/mapHeaders/CeruleanGym.asm index 3bdb0283..32bb563f 100755 --- a/data/mapHeaders/CeruleanGym.asm +++ b/data/mapHeaders/CeruleanGym.asm @@ -1,4 +1,4 @@ -CeruleanGym_h: +CeruleanGym_h:: db GYM ; tileset db CERULEAN_GYM_HEIGHT, CERULEAN_GYM_WIDTH ; dimensions (y, x) dw CeruleanGym_Blocks ; blocks diff --git a/data/mapHeaders/CeruleanMart.asm b/data/mapHeaders/CeruleanMart.asm index f020d4a3..106b664c 100755 --- a/data/mapHeaders/CeruleanMart.asm +++ b/data/mapHeaders/CeruleanMart.asm @@ -1,4 +1,4 @@ -CeruleanMart_h: +CeruleanMart_h:: db MART ; tileset db CERULEAN_MART_HEIGHT, CERULEAN_MART_WIDTH ; dimensions (y, x) dw CeruleanMart_Blocks ; blocks diff --git a/data/mapHeaders/CeruleanPokecenter.asm b/data/mapHeaders/CeruleanPokecenter.asm index 3286acbb..d81c0183 100755 --- a/data/mapHeaders/CeruleanPokecenter.asm +++ b/data/mapHeaders/CeruleanPokecenter.asm @@ -1,4 +1,4 @@ -CeruleanPokecenter_h: +CeruleanPokecenter_h:: db POKECENTER ; tileset db CERULEAN_POKECENTER_HEIGHT, CERULEAN_POKECENTER_WIDTH ; dimensions (y, x) dw CeruleanPokecenter_Blocks ; blocks diff --git a/data/mapHeaders/CeruleanTradeHouse.asm b/data/mapHeaders/CeruleanTradeHouse.asm index 23c5062c..171586fa 100755 --- a/data/mapHeaders/CeruleanTradeHouse.asm +++ b/data/mapHeaders/CeruleanTradeHouse.asm @@ -1,4 +1,4 @@ -CeruleanTradeHouse_h: +CeruleanTradeHouse_h:: db HOUSE ; tileset db CERULEAN_TRADE_HOUSE_HEIGHT, CERULEAN_TRADE_HOUSE_WIDTH ; dimensions (y, x) dw CeruleanTradeHouse_Blocks ; blocks diff --git a/data/mapHeaders/CeruleanTrashedHouse.asm b/data/mapHeaders/CeruleanTrashedHouse.asm index e105b1ed..b9d53cdb 100755 --- a/data/mapHeaders/CeruleanTrashedHouse.asm +++ b/data/mapHeaders/CeruleanTrashedHouse.asm @@ -1,4 +1,4 @@ -CeruleanTrashedHouse_h: +CeruleanTrashedHouse_h:: db HOUSE ; tileset db CERULEAN_TRASHED_HOUSE_HEIGHT, CERULEAN_TRASHED_HOUSE_WIDTH ; dimensions (y, x) dw CeruleanTrashedHouse_Blocks ; blocks diff --git a/data/mapHeaders/ChampionsRoom.asm b/data/mapHeaders/ChampionsRoom.asm index a22b236a..c6794804 100755 --- a/data/mapHeaders/ChampionsRoom.asm +++ b/data/mapHeaders/ChampionsRoom.asm @@ -1,4 +1,4 @@ -ChampionsRoom_h: +ChampionsRoom_h:: db GYM ; tileset db CHAMPIONS_ROOM_HEIGHT, CHAMPIONS_ROOM_WIDTH ; dimensions (y, x) dw ChampionsRoom_Blocks ; blocks diff --git a/data/mapHeaders/CinnabarGym.asm b/data/mapHeaders/CinnabarGym.asm index e871b8f3..96154af7 100755 --- a/data/mapHeaders/CinnabarGym.asm +++ b/data/mapHeaders/CinnabarGym.asm @@ -1,4 +1,4 @@ -CinnabarGym_h: +CinnabarGym_h:: db FACILITY ; tileset db CINNABAR_GYM_HEIGHT, CINNABAR_GYM_WIDTH ; dimensions (y, x) dw CinnabarGym_Blocks ; blocks diff --git a/data/mapHeaders/CinnabarIsland.asm b/data/mapHeaders/CinnabarIsland.asm index b8c5d7d4..3489fe3c 100755 --- a/data/mapHeaders/CinnabarIsland.asm +++ b/data/mapHeaders/CinnabarIsland.asm @@ -1,4 +1,4 @@ -CinnabarIsland_h: +CinnabarIsland_h:: db OVERWORLD ; tileset db CINNABAR_ISLAND_HEIGHT, CINNABAR_ISLAND_WIDTH ; dimensions (y, x) dw CinnabarIsland_Blocks ; blocks diff --git a/data/mapHeaders/CinnabarLab.asm b/data/mapHeaders/CinnabarLab.asm index c1167960..ffa3a037 100755 --- a/data/mapHeaders/CinnabarLab.asm +++ b/data/mapHeaders/CinnabarLab.asm @@ -1,4 +1,4 @@ -CinnabarLab_h: +CinnabarLab_h:: db LAB ; tileset db CINNABAR_LAB_HEIGHT, CINNABAR_LAB_WIDTH ; dimensions (y, x) dw CinnabarLab_Blocks ; blocks diff --git a/data/mapHeaders/CinnabarLabFossilRoom.asm b/data/mapHeaders/CinnabarLabFossilRoom.asm index 4ac2963b..8e833f70 100755 --- a/data/mapHeaders/CinnabarLabFossilRoom.asm +++ b/data/mapHeaders/CinnabarLabFossilRoom.asm @@ -1,4 +1,4 @@ -CinnabarLabFossilRoom_h: +CinnabarLabFossilRoom_h:: db LAB ; tileset db CINNABAR_LAB_FOSSIL_ROOM_HEIGHT, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; dimensions (y, x) dw CinnabarLabFossilRoom_Blocks ; blocks diff --git a/data/mapHeaders/CinnabarLabMetronomeRoom.asm b/data/mapHeaders/CinnabarLabMetronomeRoom.asm index 8eb9e502..35169504 100755 --- a/data/mapHeaders/CinnabarLabMetronomeRoom.asm +++ b/data/mapHeaders/CinnabarLabMetronomeRoom.asm @@ -1,4 +1,4 @@ -CinnabarLabMetronomeRoom_h: +CinnabarLabMetronomeRoom_h:: db LAB ; tileset db CINNABAR_LAB_METRONOME_ROOM_HEIGHT, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; dimensions (y, x) dw CinnabarLabMetronomeRoom_Blocks ; blocks diff --git a/data/mapHeaders/CinnabarLabTradeRoom.asm b/data/mapHeaders/CinnabarLabTradeRoom.asm index 1e0ffd0e..a18e6eed 100755 --- a/data/mapHeaders/CinnabarLabTradeRoom.asm +++ b/data/mapHeaders/CinnabarLabTradeRoom.asm @@ -1,4 +1,4 @@ -CinnabarLabTradeRoom_h: +CinnabarLabTradeRoom_h:: db LAB ; tileset db CINNABAR_LAB_TRADE_ROOM_HEIGHT, CINNABAR_LAB_TRADE_ROOM_WIDTH ; dimensions (y, x) dw CinnabarLabTradeRoom_Blocks ; blocks diff --git a/data/mapHeaders/CinnabarMart.asm b/data/mapHeaders/CinnabarMart.asm index 5833b2ef..aac1c69f 100755 --- a/data/mapHeaders/CinnabarMart.asm +++ b/data/mapHeaders/CinnabarMart.asm @@ -1,4 +1,4 @@ -CinnabarMart_h: +CinnabarMart_h:: db MART ; tileset db CINNABAR_MART_HEIGHT, CINNABAR_MART_WIDTH ; dimensions (y, x) dw CinnabarMart_Blocks ; blocks diff --git a/data/mapHeaders/CinnabarPokecenter.asm b/data/mapHeaders/CinnabarPokecenter.asm index 9c54b9b9..d9ade14c 100755 --- a/data/mapHeaders/CinnabarPokecenter.asm +++ b/data/mapHeaders/CinnabarPokecenter.asm @@ -1,4 +1,4 @@ -CinnabarPokecenter_h: +CinnabarPokecenter_h:: db POKECENTER ; tileset db CINNABAR_POKECENTER_HEIGHT, CINNABAR_POKECENTER_WIDTH ; dimensions (y, x) dw CinnabarPokecenter_Blocks ; blocks diff --git a/data/mapHeaders/Colosseum.asm b/data/mapHeaders/Colosseum.asm index 9b106204..3375e0f1 100755 --- a/data/mapHeaders/Colosseum.asm +++ b/data/mapHeaders/Colosseum.asm @@ -1,4 +1,4 @@ -Colosseum_h: +Colosseum_h:: db CLUB ; tileset db COLOSSEUM_HEIGHT, COLOSSEUM_WIDTH ; dimensions (y, x) dw Colosseum_Blocks ; blocks diff --git a/data/mapHeaders/CopycatsHouse1F.asm b/data/mapHeaders/CopycatsHouse1F.asm index f3cfc261..b68728ae 100755 --- a/data/mapHeaders/CopycatsHouse1F.asm +++ b/data/mapHeaders/CopycatsHouse1F.asm @@ -1,4 +1,4 @@ -CopycatsHouse1F_h: +CopycatsHouse1F_h:: db REDS_HOUSE_1 ; tileset db COPYCATS_HOUSE_1F_HEIGHT, COPYCATS_HOUSE_1F_WIDTH ; dimensions (y, x) dw CopycatsHouse1F_Blocks ; blocks diff --git a/data/mapHeaders/CopycatsHouse2F.asm b/data/mapHeaders/CopycatsHouse2F.asm index 453ba455..1c7d9af9 100755 --- a/data/mapHeaders/CopycatsHouse2F.asm +++ b/data/mapHeaders/CopycatsHouse2F.asm @@ -1,4 +1,4 @@ -CopycatsHouse2F_h: +CopycatsHouse2F_h:: db REDS_HOUSE_2 ; tileset db COPYCATS_HOUSE_2F_HEIGHT, COPYCATS_HOUSE_2F_WIDTH ; dimensions (y, x) dw CopycatsHouse2F_Blocks ; blocks diff --git a/data/mapHeaders/Daycare.asm b/data/mapHeaders/Daycare.asm index 2fb7a771..4f2e41e7 100755 --- a/data/mapHeaders/Daycare.asm +++ b/data/mapHeaders/Daycare.asm @@ -1,4 +1,4 @@ -Daycare_h: +Daycare_h:: db HOUSE ; tileset db DAYCARE_HEIGHT, DAYCARE_WIDTH ; dimensions (y, x) dw Daycare_Blocks ; blocks diff --git a/data/mapHeaders/DiglettsCave.asm b/data/mapHeaders/DiglettsCave.asm index 096019de..9742d306 100755 --- a/data/mapHeaders/DiglettsCave.asm +++ b/data/mapHeaders/DiglettsCave.asm @@ -1,4 +1,4 @@ -DiglettsCave_h: +DiglettsCave_h:: db CAVERN ; tileset db DIGLETTS_CAVE_HEIGHT, DIGLETTS_CAVE_WIDTH ; dimensions (y, x) dw DiglettsCave_Blocks ; blocks diff --git a/data/mapHeaders/DiglettsCaveRoute11.asm b/data/mapHeaders/DiglettsCaveRoute11.asm index 363859b2..ac9082ed 100755 --- a/data/mapHeaders/DiglettsCaveRoute11.asm +++ b/data/mapHeaders/DiglettsCaveRoute11.asm @@ -1,4 +1,4 @@ -DiglettsCaveRoute11_h: +DiglettsCaveRoute11_h:: db CAVERN ; tileset db DIGLETTS_CAVE_ROUTE_11_HEIGHT, DIGLETTS_CAVE_ROUTE_11_WIDTH ; dimensions (y, x) dw DiglettsCaveRoute11_Blocks ; blocks diff --git a/data/mapHeaders/DiglettsCaveRoute2.asm b/data/mapHeaders/DiglettsCaveRoute2.asm index c977415b..1279e89f 100755 --- a/data/mapHeaders/DiglettsCaveRoute2.asm +++ b/data/mapHeaders/DiglettsCaveRoute2.asm @@ -1,4 +1,4 @@ -DiglettsCaveRoute2_h: +DiglettsCaveRoute2_h:: db CAVERN ; tileset db DIGLETTS_CAVE_ROUTE_2_HEIGHT, DIGLETTS_CAVE_ROUTE_2_WIDTH ; dimensions (y, x) dw DiglettsCaveRoute2_Blocks ; blocks diff --git a/data/mapHeaders/FightingDojo.asm b/data/mapHeaders/FightingDojo.asm index 5c802843..da8a589a 100755 --- a/data/mapHeaders/FightingDojo.asm +++ b/data/mapHeaders/FightingDojo.asm @@ -1,4 +1,4 @@ -FightingDojo_h: +FightingDojo_h:: db DOJO ; tileset db FIGHTING_DOJO_HEIGHT, FIGHTING_DOJO_WIDTH ; dimensions (y, x) dw FightingDojo_Blocks ; blocks diff --git a/data/mapHeaders/FuchsiaBillsGrandpasHouse.asm b/data/mapHeaders/FuchsiaBillsGrandpasHouse.asm index bc4fe8e6..cbef462c 100755 --- a/data/mapHeaders/FuchsiaBillsGrandpasHouse.asm +++ b/data/mapHeaders/FuchsiaBillsGrandpasHouse.asm @@ -1,4 +1,4 @@ -FuchsiaBillsGrandpasHouse_h: +FuchsiaBillsGrandpasHouse_h:: db HOUSE ; tileset db FUCHSIA_BILLS_GRANDPAS_HOUSE_HEIGHT, FUCHSIA_BILLS_GRANDPAS_HOUSE_WIDTH ; dimensions (y, x) dw FuchsiaBillsGrandpasHouse_Blocks ; blocks diff --git a/data/mapHeaders/FuchsiaCity.asm b/data/mapHeaders/FuchsiaCity.asm index 87398877..1b247678 100755 --- a/data/mapHeaders/FuchsiaCity.asm +++ b/data/mapHeaders/FuchsiaCity.asm @@ -1,4 +1,4 @@ -FuchsiaCity_h: +FuchsiaCity_h:: db OVERWORLD ; tileset db FUCHSIA_CITY_HEIGHT, FUCHSIA_CITY_WIDTH ; dimensions (y, x) dw FuchsiaCity_Blocks ; blocks diff --git a/data/mapHeaders/FuchsiaGoodRodHouse.asm b/data/mapHeaders/FuchsiaGoodRodHouse.asm index 4871970e..fd2e36b4 100755 --- a/data/mapHeaders/FuchsiaGoodRodHouse.asm +++ b/data/mapHeaders/FuchsiaGoodRodHouse.asm @@ -1,4 +1,4 @@ -FuchsiaGoodRodHouse_h: +FuchsiaGoodRodHouse_h:: db SHIP ; tileset db FUCHSIA_GOOD_ROD_HOUSE_HEIGHT, FUCHSIA_GOOD_ROD_HOUSE_WIDTH ; dimensions (y, x) dw FuchsiaGoodRodHouse_Blocks ; blocks diff --git a/data/mapHeaders/FuchsiaGym.asm b/data/mapHeaders/FuchsiaGym.asm index 71ef5960..ffc5c0fe 100755 --- a/data/mapHeaders/FuchsiaGym.asm +++ b/data/mapHeaders/FuchsiaGym.asm @@ -1,4 +1,4 @@ -FuchsiaGym_h: +FuchsiaGym_h:: db GYM ; tileset db FUCHSIA_GYM_HEIGHT, FUCHSIA_GYM_WIDTH ; dimensions (y, x) dw FuchsiaGym_Blocks ; blocks diff --git a/data/mapHeaders/FuchsiaMart.asm b/data/mapHeaders/FuchsiaMart.asm index 7c1c34d2..b9c0d938 100755 --- a/data/mapHeaders/FuchsiaMart.asm +++ b/data/mapHeaders/FuchsiaMart.asm @@ -1,4 +1,4 @@ -FuchsiaMart_h: +FuchsiaMart_h:: db MART ; tileset db FUCHSIA_MART_HEIGHT, FUCHSIA_MART_WIDTH ; dimensions (y, x) dw FuchsiaMart_Blocks ; blocks diff --git a/data/mapHeaders/FuchsiaMeetingRoom.asm b/data/mapHeaders/FuchsiaMeetingRoom.asm index 8bc0cdbf..a3198eea 100755 --- a/data/mapHeaders/FuchsiaMeetingRoom.asm +++ b/data/mapHeaders/FuchsiaMeetingRoom.asm @@ -1,4 +1,4 @@ -FuchsiaMeetingRoom_h: +FuchsiaMeetingRoom_h:: db LAB ; tileset db FUCHSIA_MEETING_ROOM_HEIGHT, FUCHSIA_MEETING_ROOM_WIDTH ; dimensions (y, x) dw FuchsiaMeetingRoom_Blocks ; blocks diff --git a/data/mapHeaders/FuchsiaPokecenter.asm b/data/mapHeaders/FuchsiaPokecenter.asm index bf654ea6..beea4fc2 100755 --- a/data/mapHeaders/FuchsiaPokecenter.asm +++ b/data/mapHeaders/FuchsiaPokecenter.asm @@ -1,4 +1,4 @@ -FuchsiaPokecenter_h: +FuchsiaPokecenter_h:: db POKECENTER ; tileset db FUCHSIA_POKECENTER_HEIGHT, FUCHSIA_POKECENTER_WIDTH ; dimensions (y, x) dw FuchsiaPokecenter_Blocks ; blocks diff --git a/data/mapHeaders/GameCorner.asm b/data/mapHeaders/GameCorner.asm index c8b69724..6965e276 100755 --- a/data/mapHeaders/GameCorner.asm +++ b/data/mapHeaders/GameCorner.asm @@ -1,4 +1,4 @@ -GameCorner_h: +GameCorner_h:: db LOBBY ; tileset db GAME_CORNER_HEIGHT, GAME_CORNER_WIDTH ; dimensions (y, x) dw GameCorner_Blocks ; blocks diff --git a/data/mapHeaders/GameCornerPrizeRoom.asm b/data/mapHeaders/GameCornerPrizeRoom.asm index e43d2ec7..035f1112 100755 --- a/data/mapHeaders/GameCornerPrizeRoom.asm +++ b/data/mapHeaders/GameCornerPrizeRoom.asm @@ -1,4 +1,4 @@ -GameCornerPrizeRoom_h: +GameCornerPrizeRoom_h:: db LOBBY ; tileset db GAME_CORNER_PRIZE_ROOM_HEIGHT, GAME_CORNER_PRIZE_ROOM_WIDTH ; dimensions (y, x) dw GameCornerPrizeRoom_Blocks ; blocks diff --git a/data/mapHeaders/HallOfFame.asm b/data/mapHeaders/HallOfFame.asm index e7f7a982..7752ddb5 100755 --- a/data/mapHeaders/HallOfFame.asm +++ b/data/mapHeaders/HallOfFame.asm @@ -1,4 +1,4 @@ -HallOfFame_h: +HallOfFame_h:: db GYM ; tileset db HALL_OF_FAME_HEIGHT, HALL_OF_FAME_WIDTH ; dimensions (y, x) dw HallOfFame_Blocks ; blocks diff --git a/data/mapHeaders/IndigoPlateau.asm b/data/mapHeaders/IndigoPlateau.asm index ee8b2f0c..b5dcf3de 100755 --- a/data/mapHeaders/IndigoPlateau.asm +++ b/data/mapHeaders/IndigoPlateau.asm @@ -1,4 +1,4 @@ -IndigoPlateau_h: +IndigoPlateau_h:: db PLATEAU ; tileset db INDIGO_PLATEAU_HEIGHT, INDIGO_PLATEAU_WIDTH ; dimensions (y, x) dw IndigoPlateau_Blocks ; blocks diff --git a/data/mapHeaders/IndigoPlateauLobby.asm b/data/mapHeaders/IndigoPlateauLobby.asm index f099c87d..dc32f7d1 100755 --- a/data/mapHeaders/IndigoPlateauLobby.asm +++ b/data/mapHeaders/IndigoPlateauLobby.asm @@ -1,4 +1,4 @@ -IndigoPlateauLobby_h: +IndigoPlateauLobby_h:: db MART ; tileset db INDIGO_PLATEAU_LOBBY_HEIGHT, INDIGO_PLATEAU_LOBBY_WIDTH ; dimensions (y, x) dw IndigoPlateauLobby_Blocks ; blocks diff --git a/data/mapHeaders/LancesRoom.asm b/data/mapHeaders/LancesRoom.asm index a9cea4b6..5373f010 100755 --- a/data/mapHeaders/LancesRoom.asm +++ b/data/mapHeaders/LancesRoom.asm @@ -1,4 +1,4 @@ -LancesRoom_h: +LancesRoom_h:: db DOJO ; tileset db LANCES_ROOM_HEIGHT, LANCES_ROOM_WIDTH ; dimensions (y, x) dw LancesRoom_Blocks ; blocks diff --git a/data/mapHeaders/LavenderCuboneHouse.asm b/data/mapHeaders/LavenderCuboneHouse.asm index 06e9cb40..6d883655 100755 --- a/data/mapHeaders/LavenderCuboneHouse.asm +++ b/data/mapHeaders/LavenderCuboneHouse.asm @@ -1,4 +1,4 @@ -LavenderCuboneHouse_h: +LavenderCuboneHouse_h:: db HOUSE ; tileset db LAVENDER_CUBONE_HOUSE_HEIGHT, LAVENDER_CUBONE_HOUSE_WIDTH ; dimensions (y, x) dw LavenderCuboneHouse_Blocks ; blocks diff --git a/data/mapHeaders/LavenderMart.asm b/data/mapHeaders/LavenderMart.asm index c6869d3c..500287b4 100755 --- a/data/mapHeaders/LavenderMart.asm +++ b/data/mapHeaders/LavenderMart.asm @@ -1,4 +1,4 @@ -LavenderMart_h: +LavenderMart_h:: db MART ; tileset db LAVENDER_MART_HEIGHT, LAVENDER_MART_WIDTH ; dimensions (y, x) dw LavenderMart_Blocks ; blocks diff --git a/data/mapHeaders/LavenderPokecenter.asm b/data/mapHeaders/LavenderPokecenter.asm index 820e19cd..2c87b401 100755 --- a/data/mapHeaders/LavenderPokecenter.asm +++ b/data/mapHeaders/LavenderPokecenter.asm @@ -1,4 +1,4 @@ -LavenderPokecenter_h: +LavenderPokecenter_h:: db POKECENTER ; tileset db LAVENDER_POKECENTER_HEIGHT, LAVENDER_POKECENTER_WIDTH ; dimensions (y, x) dw LavenderPokecenter_Blocks ; blocks diff --git a/data/mapHeaders/LavenderTown.asm b/data/mapHeaders/LavenderTown.asm index 99c9515d..67a88189 100755 --- a/data/mapHeaders/LavenderTown.asm +++ b/data/mapHeaders/LavenderTown.asm @@ -1,4 +1,4 @@ -LavenderTown_h: +LavenderTown_h:: db OVERWORLD ; tileset db LAVENDER_TOWN_HEIGHT, LAVENDER_TOWN_WIDTH ; dimensions (y, x) dw LavenderTown_Blocks ; blocks diff --git a/data/mapHeaders/LoreleisRoom.asm b/data/mapHeaders/LoreleisRoom.asm index 216b6621..d580d9fe 100755 --- a/data/mapHeaders/LoreleisRoom.asm +++ b/data/mapHeaders/LoreleisRoom.asm @@ -1,4 +1,4 @@ -LoreleisRoom_h: +LoreleisRoom_h:: db GYM ; tileset db LORELEIS_ROOM_HEIGHT, LORELEIS_ROOM_WIDTH ; dimensions (y, x) dw LoreleisRoom_Blocks ; blocks diff --git a/data/mapHeaders/MrFujisHouse.asm b/data/mapHeaders/MrFujisHouse.asm index 4ae9c5b7..ee82e49c 100755 --- a/data/mapHeaders/MrFujisHouse.asm +++ b/data/mapHeaders/MrFujisHouse.asm @@ -1,4 +1,4 @@ -MrFujisHouse_h: +MrFujisHouse_h:: db HOUSE ; tileset db MR_FUJIS_HOUSE_HEIGHT, MR_FUJIS_HOUSE_WIDTH ; dimensions (y, x) dw MrFujisHouse_Blocks ; blocks diff --git a/data/mapHeaders/MrPsychicsHouse.asm b/data/mapHeaders/MrPsychicsHouse.asm index 5e4ce91b..ec559ec7 100755 --- a/data/mapHeaders/MrPsychicsHouse.asm +++ b/data/mapHeaders/MrPsychicsHouse.asm @@ -1,4 +1,4 @@ -MrPsychicsHouse_h: +MrPsychicsHouse_h:: db HOUSE ; tileset db MR_PSYCHICS_HOUSE_HEIGHT, MR_PSYCHICS_HOUSE_WIDTH ; dimensions (y, x) dw MrPsychicsHouse_Blocks ; blocks diff --git a/data/mapHeaders/MtMoon1F.asm b/data/mapHeaders/MtMoon1F.asm index 29ce5d6b..37c0ba59 100755 --- a/data/mapHeaders/MtMoon1F.asm +++ b/data/mapHeaders/MtMoon1F.asm @@ -1,4 +1,4 @@ -MtMoon1F_h: +MtMoon1F_h:: db CAVERN ; tileset db MT_MOON_1F_HEIGHT, MT_MOON_1F_WIDTH ; dimensions (y, x) dw MtMoon1F_Blocks ; blocks diff --git a/data/mapHeaders/MtMoonB1F.asm b/data/mapHeaders/MtMoonB1F.asm index 7ebc3dab..c14d35d0 100755 --- a/data/mapHeaders/MtMoonB1F.asm +++ b/data/mapHeaders/MtMoonB1F.asm @@ -1,4 +1,4 @@ -MtMoonB1F_h: +MtMoonB1F_h:: db CAVERN ; tileset db MT_MOON_B1F_HEIGHT, MT_MOON_B1F_WIDTH ; dimensions (y, x) dw MtMoonB1F_Blocks ; blocks diff --git a/data/mapHeaders/MtMoonB2F.asm b/data/mapHeaders/MtMoonB2F.asm index 2ec86247..cce8454b 100755 --- a/data/mapHeaders/MtMoonB2F.asm +++ b/data/mapHeaders/MtMoonB2F.asm @@ -1,4 +1,4 @@ -MtMoonB2F_h: +MtMoonB2F_h:: db CAVERN ; tileset db MT_MOON_B2F_HEIGHT, MT_MOON_B2F_WIDTH ; dimensions (y, x) dw MtMoonB2F_Blocks ; blocks diff --git a/data/mapHeaders/MtMoonPokecenter.asm b/data/mapHeaders/MtMoonPokecenter.asm index c3c014ff..31f7ec7a 100755 --- a/data/mapHeaders/MtMoonPokecenter.asm +++ b/data/mapHeaders/MtMoonPokecenter.asm @@ -1,4 +1,4 @@ -MtMoonPokecenter_h: +MtMoonPokecenter_h:: db POKECENTER ; tileset db MT_MOON_POKECENTER_HEIGHT, MT_MOON_POKECENTER_WIDTH ; dimensions (y, x) dw MtMoonPokecenter_Blocks ; blocks diff --git a/data/mapHeaders/Museum1F.asm b/data/mapHeaders/Museum1F.asm index 55625fc4..f0c967aa 100755 --- a/data/mapHeaders/Museum1F.asm +++ b/data/mapHeaders/Museum1F.asm @@ -1,4 +1,4 @@ -Museum1F_h: +Museum1F_h:: db MUSEUM ; tileset db MUSEUM_1F_HEIGHT, MUSEUM_1F_WIDTH ; dimensions (y, x) dw Museum1F_Blocks ; blocks diff --git a/data/mapHeaders/Museum2F.asm b/data/mapHeaders/Museum2F.asm index b39e161d..9ab38801 100755 --- a/data/mapHeaders/Museum2F.asm +++ b/data/mapHeaders/Museum2F.asm @@ -1,4 +1,4 @@ -Museum2F_h: +Museum2F_h:: db MUSEUM ; tileset db MUSEUM_2F_HEIGHT, MUSEUM_2F_WIDTH ; dimensions (y, x) dw Museum2F_Blocks ; blocks diff --git a/data/mapHeaders/NameRatersHouse.asm b/data/mapHeaders/NameRatersHouse.asm index 7e3acee1..a727b334 100755 --- a/data/mapHeaders/NameRatersHouse.asm +++ b/data/mapHeaders/NameRatersHouse.asm @@ -1,4 +1,4 @@ -NameRatersHouse_h: +NameRatersHouse_h:: db HOUSE ; tileset db NAME_RATERS_HOUSE_HEIGHT, NAME_RATERS_HOUSE_WIDTH ; dimensions (y, x) dw NameRatersHouse_Blocks ; blocks diff --git a/data/mapHeaders/OaksLab.asm b/data/mapHeaders/OaksLab.asm index ffbcdd52..ceee34eb 100755 --- a/data/mapHeaders/OaksLab.asm +++ b/data/mapHeaders/OaksLab.asm @@ -1,4 +1,4 @@ -OaksLab_h: +OaksLab_h:: db DOJO ; tileset db OAKS_LAB_HEIGHT, OAKS_LAB_WIDTH ; dimensions (y, x) dw OaksLab_Blocks ; blocks diff --git a/data/mapHeaders/PalletTown.asm b/data/mapHeaders/PalletTown.asm index eb8525ae..72d138e7 100755 --- a/data/mapHeaders/PalletTown.asm +++ b/data/mapHeaders/PalletTown.asm @@ -1,4 +1,4 @@ -PalletTown_h: +PalletTown_h:: db OVERWORLD ; tileset db PALLET_TOWN_HEIGHT, PALLET_TOWN_WIDTH ; dimensions (y, x) dw PalletTown_Blocks ; blocks diff --git a/data/mapHeaders/PewterCity.asm b/data/mapHeaders/PewterCity.asm index 73610f86..17d1d2f3 100755 --- a/data/mapHeaders/PewterCity.asm +++ b/data/mapHeaders/PewterCity.asm @@ -1,4 +1,4 @@ -PewterCity_h: +PewterCity_h:: db OVERWORLD ; tileset db PEWTER_CITY_HEIGHT, PEWTER_CITY_WIDTH ; dimensions (y, x) dw PewterCity_Blocks ; blocks diff --git a/data/mapHeaders/PewterGym.asm b/data/mapHeaders/PewterGym.asm index bb9c2e84..94cdd401 100755 --- a/data/mapHeaders/PewterGym.asm +++ b/data/mapHeaders/PewterGym.asm @@ -1,4 +1,4 @@ -PewterGym_h: +PewterGym_h:: db GYM ; tileset db PEWTER_GYM_HEIGHT, PEWTER_GYM_WIDTH ; dimensions (y, x) dw PewterGym_Blocks ; blocks diff --git a/data/mapHeaders/PewterMart.asm b/data/mapHeaders/PewterMart.asm index dc8c5c78..962634f4 100755 --- a/data/mapHeaders/PewterMart.asm +++ b/data/mapHeaders/PewterMart.asm @@ -1,4 +1,4 @@ -PewterMart_h: +PewterMart_h:: db MART ; tileset db PEWTER_MART_HEIGHT, PEWTER_MART_WIDTH ; dimensions (y, x) dw PewterMart_Blocks ; blocks diff --git a/data/mapHeaders/PewterNidoranHouse.asm b/data/mapHeaders/PewterNidoranHouse.asm index ffab8473..9900360b 100755 --- a/data/mapHeaders/PewterNidoranHouse.asm +++ b/data/mapHeaders/PewterNidoranHouse.asm @@ -1,4 +1,4 @@ -PewterNidoranHouse_h: +PewterNidoranHouse_h:: db HOUSE ; tileset db PEWTER_NIDORAN_HOUSE_HEIGHT, PEWTER_NIDORAN_HOUSE_WIDTH ; dimensions (y, x) dw PewterNidoranHouse_Blocks ; blocks diff --git a/data/mapHeaders/PewterPokecenter.asm b/data/mapHeaders/PewterPokecenter.asm index 89adbb80..5738cb64 100755 --- a/data/mapHeaders/PewterPokecenter.asm +++ b/data/mapHeaders/PewterPokecenter.asm @@ -1,4 +1,4 @@ -PewterPokecenter_h: +PewterPokecenter_h:: db POKECENTER ; tileset db PEWTER_POKECENTER_HEIGHT, PEWTER_POKECENTER_WIDTH ; dimensions (y, x) dw PewterPokecenter_Blocks ; blocks diff --git a/data/mapHeaders/PewterSpeechHouse.asm b/data/mapHeaders/PewterSpeechHouse.asm index 7750c8c7..9cc2d360 100755 --- a/data/mapHeaders/PewterSpeechHouse.asm +++ b/data/mapHeaders/PewterSpeechHouse.asm @@ -1,4 +1,4 @@ -PewterSpeechHouse_h: +PewterSpeechHouse_h:: db HOUSE ; tileset db PEWTER_SPEECH_HOUSE_HEIGHT, PEWTER_SPEECH_HOUSE_WIDTH ; dimensions (y, x) dw PewterSpeechHouse_Blocks ; blocks diff --git a/data/mapHeaders/PokemonFanClub.asm b/data/mapHeaders/PokemonFanClub.asm index 18ebb923..251ac2c4 100755 --- a/data/mapHeaders/PokemonFanClub.asm +++ b/data/mapHeaders/PokemonFanClub.asm @@ -1,4 +1,4 @@ -PokemonFanClub_h: +PokemonFanClub_h:: db INTERIOR ; tileset db POKEMON_FAN_CLUB_HEIGHT, POKEMON_FAN_CLUB_WIDTH ; dimensions (y, x) dw PokemonFanClub_Blocks ; blocks diff --git a/data/mapHeaders/PokemonMansion1F.asm b/data/mapHeaders/PokemonMansion1F.asm index 357b0cbb..b3bebb5f 100755 --- a/data/mapHeaders/PokemonMansion1F.asm +++ b/data/mapHeaders/PokemonMansion1F.asm @@ -1,4 +1,4 @@ -PokemonMansion1F_h: +PokemonMansion1F_h:: db FACILITY ; tileset db POKEMON_MANSION_1F_HEIGHT, POKEMON_MANSION_1F_WIDTH ; dimensions (y, x) dw PokemonMansion1F_Blocks ; blocks diff --git a/data/mapHeaders/PokemonMansion2F.asm b/data/mapHeaders/PokemonMansion2F.asm index 71c0e3bb..d532db2a 100755 --- a/data/mapHeaders/PokemonMansion2F.asm +++ b/data/mapHeaders/PokemonMansion2F.asm @@ -1,4 +1,4 @@ -PokemonMansion2F_h: +PokemonMansion2F_h:: db FACILITY ; tileset db POKEMON_MANSION_2F_HEIGHT, POKEMON_MANSION_2F_WIDTH ; dimensions (y, x) dw PokemonMansion2F_Blocks ; blocks diff --git a/data/mapHeaders/PokemonMansion3F.asm b/data/mapHeaders/PokemonMansion3F.asm index fe4076f9..e8887551 100755 --- a/data/mapHeaders/PokemonMansion3F.asm +++ b/data/mapHeaders/PokemonMansion3F.asm @@ -1,4 +1,4 @@ -PokemonMansion3F_h: +PokemonMansion3F_h:: db FACILITY ; tileset db POKEMON_MANSION_3F_HEIGHT, POKEMON_MANSION_3F_WIDTH ; dimensions (y, x) dw PokemonMansion3F_Blocks ; blocks diff --git a/data/mapHeaders/PokemonMansionB1F.asm b/data/mapHeaders/PokemonMansionB1F.asm index ccf892b2..08ec13f4 100755 --- a/data/mapHeaders/PokemonMansionB1F.asm +++ b/data/mapHeaders/PokemonMansionB1F.asm @@ -1,4 +1,4 @@ -PokemonMansionB1F_h: +PokemonMansionB1F_h:: db FACILITY ; tileset db POKEMON_MANSION_B1F_HEIGHT, POKEMON_MANSION_B1F_WIDTH ; dimensions (y, x) dw PokemonMansionB1F_Blocks ; blocks diff --git a/data/mapHeaders/PokemonTower1F.asm b/data/mapHeaders/PokemonTower1F.asm index 561274bb..99b129e8 100755 --- a/data/mapHeaders/PokemonTower1F.asm +++ b/data/mapHeaders/PokemonTower1F.asm @@ -1,4 +1,4 @@ -PokemonTower1F_h: +PokemonTower1F_h:: db CEMETERY ; tileset db POKEMON_TOWER_1F_HEIGHT, POKEMON_TOWER_1F_WIDTH ; dimensions (y, x) dw PokemonTower1F_Blocks ; blocks diff --git a/data/mapHeaders/PokemonTower2F.asm b/data/mapHeaders/PokemonTower2F.asm index 41e3271e..ce0ea13d 100755 --- a/data/mapHeaders/PokemonTower2F.asm +++ b/data/mapHeaders/PokemonTower2F.asm @@ -1,4 +1,4 @@ -PokemonTower2F_h: +PokemonTower2F_h:: db CEMETERY ; tileset db POKEMON_TOWER_2F_HEIGHT, POKEMON_TOWER_2F_WIDTH ; dimensions (y, x) dw PokemonTower2F_Blocks ; blocks diff --git a/data/mapHeaders/PokemonTower3F.asm b/data/mapHeaders/PokemonTower3F.asm index 932c4a20..a495b30f 100755 --- a/data/mapHeaders/PokemonTower3F.asm +++ b/data/mapHeaders/PokemonTower3F.asm @@ -1,4 +1,4 @@ -PokemonTower3F_h: +PokemonTower3F_h:: db CEMETERY ; tileset db POKEMON_TOWER_3F_HEIGHT, POKEMON_TOWER_3F_WIDTH ; dimensions (y, x) dw PokemonTower3F_Blocks ; blocks diff --git a/data/mapHeaders/PokemonTower4F.asm b/data/mapHeaders/PokemonTower4F.asm index b3027cb0..b6932406 100755 --- a/data/mapHeaders/PokemonTower4F.asm +++ b/data/mapHeaders/PokemonTower4F.asm @@ -1,4 +1,4 @@ -PokemonTower4F_h: +PokemonTower4F_h:: db CEMETERY ; tileset db POKEMON_TOWER_4F_HEIGHT, POKEMON_TOWER_4F_WIDTH ; dimensions (y, x) dw PokemonTower4F_Blocks ; blocks diff --git a/data/mapHeaders/PokemonTower5F.asm b/data/mapHeaders/PokemonTower5F.asm index 9452c553..f51e6990 100755 --- a/data/mapHeaders/PokemonTower5F.asm +++ b/data/mapHeaders/PokemonTower5F.asm @@ -1,4 +1,4 @@ -PokemonTower5F_h: +PokemonTower5F_h:: db CEMETERY ; tileset db POKEMON_TOWER_5F_HEIGHT, POKEMON_TOWER_5F_WIDTH ; dimensions (y, x) dw PokemonTower5F_Blocks ; blocks diff --git a/data/mapHeaders/PokemonTower6F.asm b/data/mapHeaders/PokemonTower6F.asm index 336c8f66..5fa1a035 100755 --- a/data/mapHeaders/PokemonTower6F.asm +++ b/data/mapHeaders/PokemonTower6F.asm @@ -1,4 +1,4 @@ -PokemonTower6F_h: +PokemonTower6F_h:: db CEMETERY ; tileset db POKEMON_TOWER_6F_HEIGHT, POKEMON_TOWER_6F_WIDTH ; dimensions (y, x) dw PokemonTower6F_Blocks ; blocks diff --git a/data/mapHeaders/PokemonTower7F.asm b/data/mapHeaders/PokemonTower7F.asm index da10fa53..90fc1d8b 100755 --- a/data/mapHeaders/PokemonTower7F.asm +++ b/data/mapHeaders/PokemonTower7F.asm @@ -1,4 +1,4 @@ -PokemonTower7F_h: +PokemonTower7F_h:: db CEMETERY ; tileset db POKEMON_TOWER_7F_HEIGHT, POKEMON_TOWER_7F_WIDTH ; dimensions (y, x) dw PokemonTower7F_Blocks ; blocks diff --git a/data/mapHeaders/PowerPlant.asm b/data/mapHeaders/PowerPlant.asm index 91f03d63..3cb4efcd 100755 --- a/data/mapHeaders/PowerPlant.asm +++ b/data/mapHeaders/PowerPlant.asm @@ -1,4 +1,4 @@ -PowerPlant_h: +PowerPlant_h:: db FACILITY ; tileset db POWER_PLANT_HEIGHT, POWER_PLANT_WIDTH ; dimensions (y, x) dw PowerPlant_Blocks ; blocks diff --git a/data/mapHeaders/RedsHouse1F.asm b/data/mapHeaders/RedsHouse1F.asm index c9acc489..b13008ae 100755 --- a/data/mapHeaders/RedsHouse1F.asm +++ b/data/mapHeaders/RedsHouse1F.asm @@ -1,4 +1,4 @@ -RedsHouse1F_h: +RedsHouse1F_h:: db REDS_HOUSE_1 ; tileset db REDS_HOUSE_1F_HEIGHT, REDS_HOUSE_1F_WIDTH ; dimensions (y, x) dw RedsHouse1F_Blocks ; blocks diff --git a/data/mapHeaders/RedsHouse2F.asm b/data/mapHeaders/RedsHouse2F.asm index 42215466..8824ebf2 100755 --- a/data/mapHeaders/RedsHouse2F.asm +++ b/data/mapHeaders/RedsHouse2F.asm @@ -1,4 +1,4 @@ -RedsHouse2F_h: +RedsHouse2F_h:: db REDS_HOUSE_2 ; tileset db REDS_HOUSE_2F_HEIGHT, REDS_HOUSE_2F_WIDTH ; dimensions (y, x) dw RedsHouse2F_Blocks ; blocks diff --git a/data/mapHeaders/RockTunnel1F.asm b/data/mapHeaders/RockTunnel1F.asm index dd552ac9..8dd5929b 100755 --- a/data/mapHeaders/RockTunnel1F.asm +++ b/data/mapHeaders/RockTunnel1F.asm @@ -1,4 +1,4 @@ -RockTunnel1F_h: +RockTunnel1F_h:: db CAVERN ; tileset db ROCK_TUNNEL_1F_HEIGHT, ROCK_TUNNEL_1F_WIDTH ; dimensions (y, x) dw RockTunnel1F_Blocks ; blocks diff --git a/data/mapHeaders/RockTunnelB1F.asm b/data/mapHeaders/RockTunnelB1F.asm index 4e765f20..36cd7f37 100755 --- a/data/mapHeaders/RockTunnelB1F.asm +++ b/data/mapHeaders/RockTunnelB1F.asm @@ -1,4 +1,4 @@ -RockTunnelB1F_h: +RockTunnelB1F_h:: db CAVERN ; tileset db ROCK_TUNNEL_B1F_HEIGHT, ROCK_TUNNEL_B1F_WIDTH ; dimensions (y, x) dw RockTunnelB1F_Blocks ; blocks diff --git a/data/mapHeaders/RockTunnelPokecenter.asm b/data/mapHeaders/RockTunnelPokecenter.asm index ac29f1cf..3d0bbed0 100755 --- a/data/mapHeaders/RockTunnelPokecenter.asm +++ b/data/mapHeaders/RockTunnelPokecenter.asm @@ -1,4 +1,4 @@ -RockTunnelPokecenter_h: +RockTunnelPokecenter_h:: db POKECENTER ; tileset db ROCK_TUNNEL_POKECENTER_HEIGHT, ROCK_TUNNEL_POKECENTER_WIDTH ; dimensions (y, x) dw RockTunnelPokecenter_Blocks ; blocks diff --git a/data/mapHeaders/RocketHideoutB1F.asm b/data/mapHeaders/RocketHideoutB1F.asm index 3c842f1e..4d875a1b 100755 --- a/data/mapHeaders/RocketHideoutB1F.asm +++ b/data/mapHeaders/RocketHideoutB1F.asm @@ -1,4 +1,4 @@ -RocketHideoutB1F_h: +RocketHideoutB1F_h:: db FACILITY ; tileset db ROCKET_HIDEOUT_B1F_HEIGHT, ROCKET_HIDEOUT_B1F_WIDTH ; dimensions (y, x) dw RocketHideoutB1F_Blocks ; blocks diff --git a/data/mapHeaders/RocketHideoutB2F.asm b/data/mapHeaders/RocketHideoutB2F.asm index b570c2a6..0d56f2a1 100755 --- a/data/mapHeaders/RocketHideoutB2F.asm +++ b/data/mapHeaders/RocketHideoutB2F.asm @@ -1,4 +1,4 @@ -RocketHideoutB2F_h: +RocketHideoutB2F_h:: db FACILITY ; tileset db ROCKET_HIDEOUT_B2F_HEIGHT, ROCKET_HIDEOUT_B2F_WIDTH ; dimensions (y, x) dw RocketHideoutB2F_Blocks ; blocks diff --git a/data/mapHeaders/RocketHideoutB3F.asm b/data/mapHeaders/RocketHideoutB3F.asm index 7eab257e..e71fcff1 100755 --- a/data/mapHeaders/RocketHideoutB3F.asm +++ b/data/mapHeaders/RocketHideoutB3F.asm @@ -1,4 +1,4 @@ -RocketHideoutB3F_h: +RocketHideoutB3F_h:: db FACILITY ; tileset db ROCKET_HIDEOUT_B3F_HEIGHT, ROCKET_HIDEOUT_B3F_WIDTH ; dimensions (y, x) dw RocketHideoutB3F_Blocks ; blocks diff --git a/data/mapHeaders/RocketHideoutB4F.asm b/data/mapHeaders/RocketHideoutB4F.asm index 57797c56..05ad471a 100755 --- a/data/mapHeaders/RocketHideoutB4F.asm +++ b/data/mapHeaders/RocketHideoutB4F.asm @@ -1,4 +1,4 @@ -RocketHideoutB4F_h: +RocketHideoutB4F_h:: db FACILITY ; tileset db ROCKET_HIDEOUT_B4F_HEIGHT, ROCKET_HIDEOUT_B4F_WIDTH ; dimensions (y, x) dw RocketHideoutB4F_Blocks ; blocks diff --git a/data/mapHeaders/RocketHideoutElevator.asm b/data/mapHeaders/RocketHideoutElevator.asm index 742d0038..6221dddd 100755 --- a/data/mapHeaders/RocketHideoutElevator.asm +++ b/data/mapHeaders/RocketHideoutElevator.asm @@ -1,4 +1,4 @@ -RocketHideoutElevator_h: +RocketHideoutElevator_h:: db LOBBY ; tileset db ROCKET_HIDEOUT_ELEVATOR_HEIGHT, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; dimensions (y, x) dw RocketHideoutElevator_Blocks ; blocks diff --git a/data/mapHeaders/Route1.asm b/data/mapHeaders/Route1.asm index ce460937..20d389ab 100755 --- a/data/mapHeaders/Route1.asm +++ b/data/mapHeaders/Route1.asm @@ -1,4 +1,4 @@ -Route1_h: +Route1_h:: db OVERWORLD ; tileset db ROUTE_1_HEIGHT, ROUTE_1_WIDTH ; dimensions (y, x) dw Route1_Blocks ; blocks diff --git a/data/mapHeaders/Route10.asm b/data/mapHeaders/Route10.asm index 8c51bfc6..5759483b 100755 --- a/data/mapHeaders/Route10.asm +++ b/data/mapHeaders/Route10.asm @@ -1,4 +1,4 @@ -Route10_h: +Route10_h:: db OVERWORLD ; tileset db ROUTE_10_HEIGHT, ROUTE_10_WIDTH ; dimensions (y, x) dw Route10_Blocks ; blocks diff --git a/data/mapHeaders/Route11.asm b/data/mapHeaders/Route11.asm index b7814465..6b95cebc 100755 --- a/data/mapHeaders/Route11.asm +++ b/data/mapHeaders/Route11.asm @@ -1,4 +1,4 @@ -Route11_h: +Route11_h:: db OVERWORLD ; tileset db ROUTE_11_HEIGHT, ROUTE_11_WIDTH ; dimensions (y, x) dw Route11_Blocks ; blocks diff --git a/data/mapHeaders/Route11Gate1F.asm b/data/mapHeaders/Route11Gate1F.asm index 2e01d168..0f26b117 100755 --- a/data/mapHeaders/Route11Gate1F.asm +++ b/data/mapHeaders/Route11Gate1F.asm @@ -1,4 +1,4 @@ -Route11Gate1F_h: +Route11Gate1F_h:: db GATE ; tileset db ROUTE_11_GATE_1F_HEIGHT, ROUTE_11_GATE_1F_WIDTH ; dimensions (y, x) dw Route11Gate1F_Blocks ; blocks diff --git a/data/mapHeaders/Route11Gate2F.asm b/data/mapHeaders/Route11Gate2F.asm index ecb2ab7c..b408b5a7 100755 --- a/data/mapHeaders/Route11Gate2F.asm +++ b/data/mapHeaders/Route11Gate2F.asm @@ -1,4 +1,4 @@ -Route11Gate2F_h: +Route11Gate2F_h:: db GATE ; tileset db ROUTE_11_GATE_2F_HEIGHT, ROUTE_11_GATE_2F_WIDTH ; dimensions (y, x) dw Route11Gate2F_Blocks ; blocks diff --git a/data/mapHeaders/Route12.asm b/data/mapHeaders/Route12.asm index 2f76aa27..284105fa 100755 --- a/data/mapHeaders/Route12.asm +++ b/data/mapHeaders/Route12.asm @@ -1,4 +1,4 @@ -Route12_h: +Route12_h:: db OVERWORLD ; tileset db ROUTE_12_HEIGHT, ROUTE_12_WIDTH ; dimensions (y, x) dw Route12_Blocks ; blocks diff --git a/data/mapHeaders/Route12Gate1F.asm b/data/mapHeaders/Route12Gate1F.asm index e44aecab..dbce0ab9 100755 --- a/data/mapHeaders/Route12Gate1F.asm +++ b/data/mapHeaders/Route12Gate1F.asm @@ -1,4 +1,4 @@ -Route12Gate1F_h: +Route12Gate1F_h:: db GATE ; tileset db ROUTE_12_GATE_1F_HEIGHT, ROUTE_12_GATE_1F_WIDTH ; dimensions (y, x) dw Route12Gate1F_Blocks ; blocks diff --git a/data/mapHeaders/Route12Gate2F.asm b/data/mapHeaders/Route12Gate2F.asm index 94d5d54c..f4e2330d 100755 --- a/data/mapHeaders/Route12Gate2F.asm +++ b/data/mapHeaders/Route12Gate2F.asm @@ -1,4 +1,4 @@ -Route12Gate2F_h: +Route12Gate2F_h:: db GATE ; tileset db ROUTE_12_GATE_2F_HEIGHT, ROUTE_12_GATE_2F_WIDTH ; dimensions (y, x) dw Route12Gate2F_Blocks ; blocks diff --git a/data/mapHeaders/Route12SuperRodHouse.asm b/data/mapHeaders/Route12SuperRodHouse.asm index ef5e0f2c..70357a3a 100755 --- a/data/mapHeaders/Route12SuperRodHouse.asm +++ b/data/mapHeaders/Route12SuperRodHouse.asm @@ -1,4 +1,4 @@ -Route12SuperRodHouse_h: +Route12SuperRodHouse_h:: db HOUSE ; tileset db ROUTE_12_SUPER_ROD_HOUSE_HEIGHT, ROUTE_12_SUPER_ROD_HOUSE_WIDTH ; dimensions (y, x) dw Route12SuperRodHouse_Blocks ; blocks diff --git a/data/mapHeaders/Route13.asm b/data/mapHeaders/Route13.asm index e6e244b9..fb85dd60 100755 --- a/data/mapHeaders/Route13.asm +++ b/data/mapHeaders/Route13.asm @@ -1,4 +1,4 @@ -Route13_h: +Route13_h:: db OVERWORLD ; tileset db ROUTE_13_HEIGHT, ROUTE_13_WIDTH ; dimensions (y, x) dw Route13_Blocks ; blocks diff --git a/data/mapHeaders/Route14.asm b/data/mapHeaders/Route14.asm index c3934ac5..d1484f6b 100755 --- a/data/mapHeaders/Route14.asm +++ b/data/mapHeaders/Route14.asm @@ -1,4 +1,4 @@ -Route14_h: +Route14_h:: db OVERWORLD ; tileset db ROUTE_14_HEIGHT, ROUTE_14_WIDTH ; dimensions (y, x) dw Route14_Blocks ; blocks diff --git a/data/mapHeaders/Route15.asm b/data/mapHeaders/Route15.asm index eb14d750..5f66a521 100755 --- a/data/mapHeaders/Route15.asm +++ b/data/mapHeaders/Route15.asm @@ -1,4 +1,4 @@ -Route15_h: +Route15_h:: db OVERWORLD ; tileset db ROUTE_15_HEIGHT, ROUTE_15_WIDTH ; dimensions (y, x) dw Route15_Blocks ; blocks diff --git a/data/mapHeaders/Route15Gate1F.asm b/data/mapHeaders/Route15Gate1F.asm index b1ae5662..d3f5a377 100755 --- a/data/mapHeaders/Route15Gate1F.asm +++ b/data/mapHeaders/Route15Gate1F.asm @@ -1,4 +1,4 @@ -Route15Gate1F_h: +Route15Gate1F_h:: db GATE ; tileset db ROUTE_15_GATE_1F_HEIGHT, ROUTE_15_GATE_1F_WIDTH ; dimensions (y, x) dw Route15Gate1F_Blocks ; blocks diff --git a/data/mapHeaders/Route15Gate2F.asm b/data/mapHeaders/Route15Gate2F.asm index 501da092..87b05105 100755 --- a/data/mapHeaders/Route15Gate2F.asm +++ b/data/mapHeaders/Route15Gate2F.asm @@ -1,4 +1,4 @@ -Route15Gate2F_h: +Route15Gate2F_h:: db GATE ; tileset db ROUTE_15_GATE_2F_HEIGHT, ROUTE_15_GATE_2F_WIDTH ; dimensions (y, x) dw Route15Gate2F_Blocks ; blocks diff --git a/data/mapHeaders/Route16.asm b/data/mapHeaders/Route16.asm index d12b6ea9..be436134 100755 --- a/data/mapHeaders/Route16.asm +++ b/data/mapHeaders/Route16.asm @@ -1,4 +1,4 @@ -Route16_h: +Route16_h:: db OVERWORLD ; tileset db ROUTE_16_HEIGHT, ROUTE_16_WIDTH ; dimensions (y, x) dw Route16_Blocks ; blocks diff --git a/data/mapHeaders/Route16FlyHouse.asm b/data/mapHeaders/Route16FlyHouse.asm index 0d3f828d..6bc41d1d 100755 --- a/data/mapHeaders/Route16FlyHouse.asm +++ b/data/mapHeaders/Route16FlyHouse.asm @@ -1,4 +1,4 @@ -Route16FlyHouse_h: +Route16FlyHouse_h:: db HOUSE ; tileset db ROUTE_16_FLY_HOUSE_HEIGHT, ROUTE_16_FLY_HOUSE_WIDTH ; dimensions (y, x) dw Route16FlyHouse_Blocks ; blocks diff --git a/data/mapHeaders/Route16Gate1F.asm b/data/mapHeaders/Route16Gate1F.asm index 561fb597..16bbb30b 100755 --- a/data/mapHeaders/Route16Gate1F.asm +++ b/data/mapHeaders/Route16Gate1F.asm @@ -1,4 +1,4 @@ -Route16Gate1F_h: +Route16Gate1F_h:: db GATE ; tileset db ROUTE_16_GATE_1F_HEIGHT, ROUTE_16_GATE_1F_WIDTH ; dimensions (y, x) dw Route16Gate1F_Blocks ; blocks diff --git a/data/mapHeaders/Route16Gate2F.asm b/data/mapHeaders/Route16Gate2F.asm index 90783ab7..600101c9 100755 --- a/data/mapHeaders/Route16Gate2F.asm +++ b/data/mapHeaders/Route16Gate2F.asm @@ -1,4 +1,4 @@ -Route16Gate2F_h: +Route16Gate2F_h:: db GATE ; tileset db ROUTE_16_GATE_2F_HEIGHT, ROUTE_16_GATE_2F_WIDTH ; dimensions (y, x) dw Route16Gate2F_Blocks ; blocks diff --git a/data/mapHeaders/Route17.asm b/data/mapHeaders/Route17.asm index 58a785b4..32bdb541 100755 --- a/data/mapHeaders/Route17.asm +++ b/data/mapHeaders/Route17.asm @@ -1,4 +1,4 @@ -Route17_h: +Route17_h:: db OVERWORLD ; tileset db ROUTE_17_HEIGHT, ROUTE_17_WIDTH ; dimensions (y, x) dw Route17_Blocks ; blocks diff --git a/data/mapHeaders/Route18.asm b/data/mapHeaders/Route18.asm index 5e10bdbd..e0b5daef 100755 --- a/data/mapHeaders/Route18.asm +++ b/data/mapHeaders/Route18.asm @@ -1,4 +1,4 @@ -Route18_h: +Route18_h:: db OVERWORLD ; tileset db ROUTE_18_HEIGHT, ROUTE_18_WIDTH ; dimensions (y, x) dw Route18_Blocks ; blocks diff --git a/data/mapHeaders/Route18Gate1F.asm b/data/mapHeaders/Route18Gate1F.asm index 0e4a0dc3..d04288d5 100755 --- a/data/mapHeaders/Route18Gate1F.asm +++ b/data/mapHeaders/Route18Gate1F.asm @@ -1,4 +1,4 @@ -Route18Gate1F_h: +Route18Gate1F_h:: db GATE ; tileset db ROUTE_18_GATE_1F_HEIGHT, ROUTE_18_GATE_1F_WIDTH ; dimensions (y, x) dw Route18Gate1F_Blocks ; blocks diff --git a/data/mapHeaders/Route18Gate2F.asm b/data/mapHeaders/Route18Gate2F.asm index 5d8f7126..cf8c6d6a 100755 --- a/data/mapHeaders/Route18Gate2F.asm +++ b/data/mapHeaders/Route18Gate2F.asm @@ -1,4 +1,4 @@ -Route18Gate2F_h: +Route18Gate2F_h:: db GATE ; tileset db ROUTE_18_GATE_2F_HEIGHT, ROUTE_18_GATE_2F_WIDTH ; dimensions (y, x) dw Route18Gate2F_Blocks ; blocks diff --git a/data/mapHeaders/Route19.asm b/data/mapHeaders/Route19.asm index 79972677..2b6c8ca2 100755 --- a/data/mapHeaders/Route19.asm +++ b/data/mapHeaders/Route19.asm @@ -1,4 +1,4 @@ -Route19_h: +Route19_h:: db OVERWORLD ; tileset db ROUTE_19_HEIGHT, ROUTE_19_WIDTH ; dimensions (y, x) dw Route19_Blocks ; blocks diff --git a/data/mapHeaders/Route2.asm b/data/mapHeaders/Route2.asm index 94511d06..6dc96c4e 100755 --- a/data/mapHeaders/Route2.asm +++ b/data/mapHeaders/Route2.asm @@ -1,4 +1,4 @@ -Route2_h: +Route2_h:: db OVERWORLD ; tileset db ROUTE_2_HEIGHT, ROUTE_2_WIDTH ; dimensions (y, x) dw Route2_Blocks ; blocks diff --git a/data/mapHeaders/Route20.asm b/data/mapHeaders/Route20.asm index 689f51cd..03455c54 100755 --- a/data/mapHeaders/Route20.asm +++ b/data/mapHeaders/Route20.asm @@ -1,4 +1,4 @@ -Route20_h: +Route20_h:: db OVERWORLD ; tileset db ROUTE_20_HEIGHT, ROUTE_20_WIDTH ; dimensions (y, x) dw Route20_Blocks ; blocks diff --git a/data/mapHeaders/Route21.asm b/data/mapHeaders/Route21.asm index f37869dc..81e749e0 100755 --- a/data/mapHeaders/Route21.asm +++ b/data/mapHeaders/Route21.asm @@ -1,4 +1,4 @@ -Route21_h: +Route21_h:: db OVERWORLD ; tileset db ROUTE_21_HEIGHT, ROUTE_21_WIDTH ; dimensions (y, x) dw Route21_Blocks ; blocks diff --git a/data/mapHeaders/Route22.asm b/data/mapHeaders/Route22.asm index 4d07475f..083652cc 100755 --- a/data/mapHeaders/Route22.asm +++ b/data/mapHeaders/Route22.asm @@ -1,4 +1,4 @@ -Route22_h: +Route22_h:: db OVERWORLD ; tileset db ROUTE_22_HEIGHT, ROUTE_22_WIDTH ; dimensions (y, x) dw Route22_Blocks ; blocks diff --git a/data/mapHeaders/Route22Gate.asm b/data/mapHeaders/Route22Gate.asm index 4d3ae0cc..b0fae3e4 100755 --- a/data/mapHeaders/Route22Gate.asm +++ b/data/mapHeaders/Route22Gate.asm @@ -1,4 +1,4 @@ -Route22Gate_h: +Route22Gate_h:: db GATE ; tileset db ROUTE_22_GATE_HEIGHT, ROUTE_22_GATE_WIDTH ; dimensions (y, x) dw Route22Gate_Blocks ; blocks diff --git a/data/mapHeaders/Route23.asm b/data/mapHeaders/Route23.asm index 6b1fde97..1bc27a5f 100755 --- a/data/mapHeaders/Route23.asm +++ b/data/mapHeaders/Route23.asm @@ -1,4 +1,4 @@ -Route23_h: +Route23_h:: db PLATEAU ; tileset db ROUTE_23_HEIGHT, ROUTE_23_WIDTH ; dimensions (y, x) dw Route23_Blocks ; blocks diff --git a/data/mapHeaders/Route24.asm b/data/mapHeaders/Route24.asm index 87776f60..acb98d40 100755 --- a/data/mapHeaders/Route24.asm +++ b/data/mapHeaders/Route24.asm @@ -1,4 +1,4 @@ -Route24_h: +Route24_h:: db OVERWORLD ; tileset db ROUTE_24_HEIGHT, ROUTE_24_WIDTH ; dimensions (y, x) dw Route24_Blocks ; blocks diff --git a/data/mapHeaders/Route25.asm b/data/mapHeaders/Route25.asm index c300eeb3..d8da8583 100755 --- a/data/mapHeaders/Route25.asm +++ b/data/mapHeaders/Route25.asm @@ -1,4 +1,4 @@ -Route25_h: +Route25_h:: db OVERWORLD ; tileset db ROUTE_25_HEIGHT, ROUTE_25_WIDTH ; dimensions (y, x) dw Route25_Blocks ; blocks diff --git a/data/mapHeaders/Route2Gate.asm b/data/mapHeaders/Route2Gate.asm index 9b284178..68581910 100755 --- a/data/mapHeaders/Route2Gate.asm +++ b/data/mapHeaders/Route2Gate.asm @@ -1,4 +1,4 @@ -Route2Gate_h: +Route2Gate_h:: db GATE ; tileset db ROUTE_2_GATE_HEIGHT, ROUTE_2_GATE_WIDTH ; dimensions (y, x) dw Route2Gate_Blocks ; blocks diff --git a/data/mapHeaders/Route2TradeHouse.asm b/data/mapHeaders/Route2TradeHouse.asm index 33693943..98dc7aed 100755 --- a/data/mapHeaders/Route2TradeHouse.asm +++ b/data/mapHeaders/Route2TradeHouse.asm @@ -1,4 +1,4 @@ -Route2TradeHouse_h: +Route2TradeHouse_h:: db HOUSE ; tileset db ROUTE_2_TRADE_HOUSE_HEIGHT, ROUTE_2_TRADE_HOUSE_WIDTH ; dimensions (y, x) dw Route2TradeHouse_Blocks ; blocks diff --git a/data/mapHeaders/Route3.asm b/data/mapHeaders/Route3.asm index c611e4b8..a84b5bf9 100755 --- a/data/mapHeaders/Route3.asm +++ b/data/mapHeaders/Route3.asm @@ -1,4 +1,4 @@ -Route3_h: +Route3_h:: db OVERWORLD ; tileset db ROUTE_3_HEIGHT, ROUTE_3_WIDTH ; dimensions (y, x) dw Route3_Blocks ; blocks diff --git a/data/mapHeaders/Route4.asm b/data/mapHeaders/Route4.asm index 999a1207..d0d27d9c 100755 --- a/data/mapHeaders/Route4.asm +++ b/data/mapHeaders/Route4.asm @@ -1,4 +1,4 @@ -Route4_h: +Route4_h:: db OVERWORLD ; tileset db ROUTE_4_HEIGHT, ROUTE_4_WIDTH ; dimensions (y, x) dw Route4_Blocks ; blocks diff --git a/data/mapHeaders/Route5.asm b/data/mapHeaders/Route5.asm index 6480aebd..5a0e0cd4 100755 --- a/data/mapHeaders/Route5.asm +++ b/data/mapHeaders/Route5.asm @@ -1,4 +1,4 @@ -Route5_h: +Route5_h:: db OVERWORLD ; tileset db ROUTE_5_HEIGHT, ROUTE_5_WIDTH ; dimensions (y, x) dw Route5_Blocks ; blocks diff --git a/data/mapHeaders/Route5Gate.asm b/data/mapHeaders/Route5Gate.asm index bb418182..d5de72b4 100755 --- a/data/mapHeaders/Route5Gate.asm +++ b/data/mapHeaders/Route5Gate.asm @@ -1,4 +1,4 @@ -Route5Gate_h: +Route5Gate_h:: db GATE ; tileset db ROUTE_5_GATE_HEIGHT, ROUTE_5_GATE_WIDTH ; dimensions (y, x) dw Route5Gate_Blocks ; blocks diff --git a/data/mapHeaders/Route6.asm b/data/mapHeaders/Route6.asm index 9385ce5f..85cb1054 100755 --- a/data/mapHeaders/Route6.asm +++ b/data/mapHeaders/Route6.asm @@ -1,4 +1,4 @@ -Route6_h: +Route6_h:: db OVERWORLD ; tileset db ROUTE_6_HEIGHT, ROUTE_6_WIDTH ; dimensions (y, x) dw Route6_Blocks ; blocks diff --git a/data/mapHeaders/Route6Gate.asm b/data/mapHeaders/Route6Gate.asm index 282cc5b6..e5896518 100755 --- a/data/mapHeaders/Route6Gate.asm +++ b/data/mapHeaders/Route6Gate.asm @@ -1,4 +1,4 @@ -Route6Gate_h: +Route6Gate_h:: db GATE ; tileset db ROUTE_6_GATE_HEIGHT, ROUTE_6_GATE_WIDTH ; dimensions (y, x) dw Route6Gate_Blocks ; blocks diff --git a/data/mapHeaders/Route7.asm b/data/mapHeaders/Route7.asm index 9b34ea1f..cb12c75a 100755 --- a/data/mapHeaders/Route7.asm +++ b/data/mapHeaders/Route7.asm @@ -1,4 +1,4 @@ -Route7_h: +Route7_h:: db OVERWORLD ; tileset db ROUTE_7_HEIGHT, ROUTE_7_WIDTH ; dimensions (y, x) dw Route7_Blocks ; blocks diff --git a/data/mapHeaders/Route7Gate.asm b/data/mapHeaders/Route7Gate.asm index 61771e42..d8400dae 100755 --- a/data/mapHeaders/Route7Gate.asm +++ b/data/mapHeaders/Route7Gate.asm @@ -1,4 +1,4 @@ -Route7Gate_h: +Route7Gate_h:: db GATE ; tileset db ROUTE_7_GATE_HEIGHT, ROUTE_7_GATE_WIDTH ; dimensions (y, x) dw Route7Gate_Blocks ; blocks diff --git a/data/mapHeaders/Route8.asm b/data/mapHeaders/Route8.asm index bd2ee71e..482e12f9 100755 --- a/data/mapHeaders/Route8.asm +++ b/data/mapHeaders/Route8.asm @@ -1,4 +1,4 @@ -Route8_h: +Route8_h:: db OVERWORLD ; tileset db ROUTE_8_HEIGHT, ROUTE_8_WIDTH ; dimensions (y, x) dw Route8_Blocks ; blocks diff --git a/data/mapHeaders/Route8Gate.asm b/data/mapHeaders/Route8Gate.asm index dd14a237..7599276b 100755 --- a/data/mapHeaders/Route8Gate.asm +++ b/data/mapHeaders/Route8Gate.asm @@ -1,4 +1,4 @@ -Route8Gate_h: +Route8Gate_h:: db GATE ; tileset db ROUTE_8_GATE_HEIGHT, ROUTE_8_GATE_WIDTH ; dimensions (y, x) dw Route8Gate_Blocks ; blocks diff --git a/data/mapHeaders/Route9.asm b/data/mapHeaders/Route9.asm index 3dec3b0a..a0aef316 100755 --- a/data/mapHeaders/Route9.asm +++ b/data/mapHeaders/Route9.asm @@ -1,4 +1,4 @@ -Route9_h: +Route9_h:: db OVERWORLD ; tileset db ROUTE_9_HEIGHT, ROUTE_9_WIDTH ; dimensions (y, x) dw Route9_Blocks ; blocks diff --git a/data/mapHeaders/SSAnne1F.asm b/data/mapHeaders/SSAnne1F.asm index a69423d6..3b82a4ed 100755 --- a/data/mapHeaders/SSAnne1F.asm +++ b/data/mapHeaders/SSAnne1F.asm @@ -1,4 +1,4 @@ -SSAnne1F_h: +SSAnne1F_h:: db SHIP ; tileset db SS_ANNE_1F_HEIGHT, SS_ANNE_1F_WIDTH ; dimensions (y, x) dw SSAnne1F_Blocks ; blocks diff --git a/data/mapHeaders/SSAnne1FRooms.asm b/data/mapHeaders/SSAnne1FRooms.asm index 1f8af23d..14260765 100755 --- a/data/mapHeaders/SSAnne1FRooms.asm +++ b/data/mapHeaders/SSAnne1FRooms.asm @@ -1,4 +1,4 @@ -SSAnne1FRooms_h: +SSAnne1FRooms_h:: db SHIP ; tileset db SS_ANNE_1F_ROOMS_HEIGHT, SS_ANNE_1F_ROOMS_WIDTH ; dimensions (y, x) dw SSAnne1FRooms_Blocks ; blocks diff --git a/data/mapHeaders/SSAnne2F.asm b/data/mapHeaders/SSAnne2F.asm index d42d16f4..aef34599 100755 --- a/data/mapHeaders/SSAnne2F.asm +++ b/data/mapHeaders/SSAnne2F.asm @@ -1,4 +1,4 @@ -SSAnne2F_h: +SSAnne2F_h:: db SHIP ; tileset db SS_ANNE_2F_HEIGHT, SS_ANNE_2F_WIDTH ; dimensions (y, x) dw SSAnne2F_Blocks ; blocks diff --git a/data/mapHeaders/SSAnne2FRooms.asm b/data/mapHeaders/SSAnne2FRooms.asm index f22de0fa..12ecca80 100755 --- a/data/mapHeaders/SSAnne2FRooms.asm +++ b/data/mapHeaders/SSAnne2FRooms.asm @@ -1,4 +1,4 @@ -SSAnne2FRooms_h: +SSAnne2FRooms_h:: db SHIP ; tileset db SS_ANNE_2F_ROOMS_HEIGHT, SS_ANNE_2F_ROOMS_WIDTH ; dimensions (y, x) dw SSAnne2FRooms_Blocks ; blocks diff --git a/data/mapHeaders/SSAnne3F.asm b/data/mapHeaders/SSAnne3F.asm index 1c5dafea..22ddfa03 100755 --- a/data/mapHeaders/SSAnne3F.asm +++ b/data/mapHeaders/SSAnne3F.asm @@ -1,4 +1,4 @@ -SSAnne3F_h: +SSAnne3F_h:: db SHIP ; tileset db SS_ANNE_3F_HEIGHT, SS_ANNE_3F_WIDTH ; dimensions (y, x) dw SSAnne3F_Blocks ; blocks diff --git a/data/mapHeaders/SSAnneB1F.asm b/data/mapHeaders/SSAnneB1F.asm index a3ca6dfa..28f0bbe3 100755 --- a/data/mapHeaders/SSAnneB1F.asm +++ b/data/mapHeaders/SSAnneB1F.asm @@ -1,4 +1,4 @@ -SSAnneB1F_h: +SSAnneB1F_h:: db SHIP ; tileset db SS_ANNE_B1F_HEIGHT, SS_ANNE_B1F_WIDTH ; dimensions (y, x) dw SSAnneB1F_Blocks ; blocks diff --git a/data/mapHeaders/SSAnneB1FRooms.asm b/data/mapHeaders/SSAnneB1FRooms.asm index f08e343b..3d439984 100755 --- a/data/mapHeaders/SSAnneB1FRooms.asm +++ b/data/mapHeaders/SSAnneB1FRooms.asm @@ -1,4 +1,4 @@ -SSAnneB1FRooms_h: +SSAnneB1FRooms_h:: db SHIP ; tileset db SS_ANNE_B1F_ROOMS_HEIGHT, SS_ANNE_B1F_ROOMS_WIDTH ; dimensions (y, x) dw SSAnneB1FRooms_Blocks ; blocks diff --git a/data/mapHeaders/SSAnneBow.asm b/data/mapHeaders/SSAnneBow.asm index baa71147..1b1be8cb 100755 --- a/data/mapHeaders/SSAnneBow.asm +++ b/data/mapHeaders/SSAnneBow.asm @@ -1,4 +1,4 @@ -SSAnneBow_h: +SSAnneBow_h:: db SHIP ; tileset db SS_ANNE_BOW_HEIGHT, SS_ANNE_BOW_WIDTH ; dimensions (y, x) dw SSAnneBow_Blocks ; blocks diff --git a/data/mapHeaders/SSAnneCaptainsRoom.asm b/data/mapHeaders/SSAnneCaptainsRoom.asm index 433f060a..78522804 100755 --- a/data/mapHeaders/SSAnneCaptainsRoom.asm +++ b/data/mapHeaders/SSAnneCaptainsRoom.asm @@ -1,4 +1,4 @@ -SSAnneCaptainsRoom_h: +SSAnneCaptainsRoom_h:: db SHIP ; tileset db SS_ANNE_CAPTAINS_ROOM_HEIGHT, SS_ANNE_CAPTAINS_ROOM_WIDTH ; dimensions (y, x) dw SSAnneCaptainsRoom_Blocks ; blocks diff --git a/data/mapHeaders/SSAnneKitchen.asm b/data/mapHeaders/SSAnneKitchen.asm index eacbbfb8..e4c6c472 100755 --- a/data/mapHeaders/SSAnneKitchen.asm +++ b/data/mapHeaders/SSAnneKitchen.asm @@ -1,4 +1,4 @@ -SSAnneKitchen_h: +SSAnneKitchen_h:: db SHIP ; tileset db SS_ANNE_KITCHEN_HEIGHT, SS_ANNE_KITCHEN_WIDTH ; dimensions (y, x) dw SSAnneKitchen_Blocks ; blocks diff --git a/data/mapHeaders/SafariZoneCenter.asm b/data/mapHeaders/SafariZoneCenter.asm index 8ec6c890..a6e98bc3 100755 --- a/data/mapHeaders/SafariZoneCenter.asm +++ b/data/mapHeaders/SafariZoneCenter.asm @@ -1,4 +1,4 @@ -SafariZoneCenter_h: +SafariZoneCenter_h:: db FOREST ; tileset db SAFARI_ZONE_CENTER_HEIGHT, SAFARI_ZONE_CENTER_WIDTH ; dimensions (y, x) dw SafariZoneCenter_Blocks ; blocks diff --git a/data/mapHeaders/SafariZoneCenterRestHouse.asm b/data/mapHeaders/SafariZoneCenterRestHouse.asm index 9b1064f2..3dc9fba2 100755 --- a/data/mapHeaders/SafariZoneCenterRestHouse.asm +++ b/data/mapHeaders/SafariZoneCenterRestHouse.asm @@ -1,4 +1,4 @@ -SafariZoneCenterRestHouse_h: +SafariZoneCenterRestHouse_h:: db GATE ; tileset db SAFARI_ZONE_CENTER_REST_HOUSE_HEIGHT, SAFARI_ZONE_CENTER_REST_HOUSE_WIDTH ; dimensions (y, x) dw SafariZoneCenterRestHouse_Blocks ; blocks diff --git a/data/mapHeaders/SafariZoneEast.asm b/data/mapHeaders/SafariZoneEast.asm index 99556473..4f9c0989 100755 --- a/data/mapHeaders/SafariZoneEast.asm +++ b/data/mapHeaders/SafariZoneEast.asm @@ -1,4 +1,4 @@ -SafariZoneEast_h: +SafariZoneEast_h:: db FOREST ; tileset db SAFARI_ZONE_EAST_HEIGHT, SAFARI_ZONE_EAST_WIDTH ; dimensions (y, x) dw SafariZoneEast_Blocks ; blocks diff --git a/data/mapHeaders/SafariZoneEastRestHouse.asm b/data/mapHeaders/SafariZoneEastRestHouse.asm index b9f219c5..4afa17c4 100755 --- a/data/mapHeaders/SafariZoneEastRestHouse.asm +++ b/data/mapHeaders/SafariZoneEastRestHouse.asm @@ -1,4 +1,4 @@ -SafariZoneEastRestHouse_h: +SafariZoneEastRestHouse_h:: db GATE ; tileset db SAFARI_ZONE_EAST_REST_HOUSE_HEIGHT, SAFARI_ZONE_EAST_REST_HOUSE_WIDTH ; dimensions (y, x) dw SafariZoneEastRestHouse_Blocks ; blocks diff --git a/data/mapHeaders/SafariZoneGate.asm b/data/mapHeaders/SafariZoneGate.asm index ed306ad0..49d56b52 100755 --- a/data/mapHeaders/SafariZoneGate.asm +++ b/data/mapHeaders/SafariZoneGate.asm @@ -1,4 +1,4 @@ -SafariZoneGate_h: +SafariZoneGate_h:: db GATE ; tileset db SAFARI_ZONE_GATE_HEIGHT, SAFARI_ZONE_GATE_WIDTH ; dimensions (y, x) dw SafariZoneGate_Blocks ; blocks diff --git a/data/mapHeaders/SafariZoneNorth.asm b/data/mapHeaders/SafariZoneNorth.asm index 3d1a2f51..a8364c74 100755 --- a/data/mapHeaders/SafariZoneNorth.asm +++ b/data/mapHeaders/SafariZoneNorth.asm @@ -1,4 +1,4 @@ -SafariZoneNorth_h: +SafariZoneNorth_h:: db FOREST ; tileset db SAFARI_ZONE_NORTH_HEIGHT, SAFARI_ZONE_NORTH_WIDTH ; dimensions (y, x) dw SafariZoneNorth_Blocks ; blocks diff --git a/data/mapHeaders/SafariZoneNorthRestHouse.asm b/data/mapHeaders/SafariZoneNorthRestHouse.asm index 938c15cf..faf16451 100755 --- a/data/mapHeaders/SafariZoneNorthRestHouse.asm +++ b/data/mapHeaders/SafariZoneNorthRestHouse.asm @@ -1,4 +1,4 @@ -SafariZoneNorthRestHouse_h: +SafariZoneNorthRestHouse_h:: db GATE ; tileset db SAFARI_ZONE_NORTH_REST_HOUSE_HEIGHT, SAFARI_ZONE_NORTH_REST_HOUSE_WIDTH ; dimensions (y, x) dw SafariZoneNorthRestHouse_Blocks ; blocks diff --git a/data/mapHeaders/SafariZoneSecretHouse.asm b/data/mapHeaders/SafariZoneSecretHouse.asm index 91068691..1db35d37 100755 --- a/data/mapHeaders/SafariZoneSecretHouse.asm +++ b/data/mapHeaders/SafariZoneSecretHouse.asm @@ -1,4 +1,4 @@ -SafariZoneSecretHouse_h: +SafariZoneSecretHouse_h:: db LAB ; tileset db SAFARI_ZONE_SECRET_HOUSE_HEIGHT, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; dimensions (y, x) dw SafariZoneSecretHouse_Blocks ; blocks diff --git a/data/mapHeaders/SafariZoneWest.asm b/data/mapHeaders/SafariZoneWest.asm index 876169d1..00fd7d91 100755 --- a/data/mapHeaders/SafariZoneWest.asm +++ b/data/mapHeaders/SafariZoneWest.asm @@ -1,4 +1,4 @@ -SafariZoneWest_h: +SafariZoneWest_h:: db FOREST ; tileset db SAFARI_ZONE_WEST_HEIGHT, SAFARI_ZONE_WEST_WIDTH ; dimensions (y, x) dw SafariZoneWest_Blocks ; blocks diff --git a/data/mapHeaders/SafariZoneWestRestHouse.asm b/data/mapHeaders/SafariZoneWestRestHouse.asm index 886382ec..6b630df3 100755 --- a/data/mapHeaders/SafariZoneWestRestHouse.asm +++ b/data/mapHeaders/SafariZoneWestRestHouse.asm @@ -1,4 +1,4 @@ -SafariZoneWestRestHouse_h: +SafariZoneWestRestHouse_h:: db GATE ; tileset db SAFARI_ZONE_WEST_REST_HOUSE_HEIGHT, SAFARI_ZONE_WEST_REST_HOUSE_WIDTH ; dimensions (y, x) dw SafariZoneWestRestHouse_Blocks ; blocks diff --git a/data/mapHeaders/SaffronCity.asm b/data/mapHeaders/SaffronCity.asm index 13239891..c7a498de 100755 --- a/data/mapHeaders/SaffronCity.asm +++ b/data/mapHeaders/SaffronCity.asm @@ -1,4 +1,4 @@ -SaffronCity_h: +SaffronCity_h:: db OVERWORLD ; tileset db SAFFRON_CITY_HEIGHT, SAFFRON_CITY_WIDTH ; dimensions (y, x) dw SaffronCity_Blocks ; blocks diff --git a/data/mapHeaders/SaffronGym.asm b/data/mapHeaders/SaffronGym.asm index 6cbadb2c..d9ca460d 100755 --- a/data/mapHeaders/SaffronGym.asm +++ b/data/mapHeaders/SaffronGym.asm @@ -1,4 +1,4 @@ -SaffronGym_h: +SaffronGym_h:: db FACILITY ; tileset db SAFFRON_GYM_HEIGHT, SAFFRON_GYM_WIDTH ; dimensions (y, x) dw SaffronGym_Blocks ; blocks diff --git a/data/mapHeaders/SaffronMart.asm b/data/mapHeaders/SaffronMart.asm index abd537b6..d8c477a4 100755 --- a/data/mapHeaders/SaffronMart.asm +++ b/data/mapHeaders/SaffronMart.asm @@ -1,4 +1,4 @@ -SaffronMart_h: +SaffronMart_h:: db MART ; tileset db SAFFRON_MART_HEIGHT, SAFFRON_MART_WIDTH ; dimensions (y, x) dw SaffronMart_Blocks ; blocks diff --git a/data/mapHeaders/SaffronPidgeyHouse.asm b/data/mapHeaders/SaffronPidgeyHouse.asm index 5d6e21ae..8e2e8b47 100755 --- a/data/mapHeaders/SaffronPidgeyHouse.asm +++ b/data/mapHeaders/SaffronPidgeyHouse.asm @@ -1,4 +1,4 @@ -SaffronPidgeyHouse_h: +SaffronPidgeyHouse_h:: db HOUSE ; tileset db SAFFRON_PIDGEY_HOUSE_HEIGHT, SAFFRON_PIDGEY_HOUSE_WIDTH ; dimensions (y, x) dw SaffronPidgeyHouse_Blocks ; blocks diff --git a/data/mapHeaders/SaffronPokecenter.asm b/data/mapHeaders/SaffronPokecenter.asm index 32f1ec71..18f7a7de 100755 --- a/data/mapHeaders/SaffronPokecenter.asm +++ b/data/mapHeaders/SaffronPokecenter.asm @@ -1,4 +1,4 @@ -SaffronPokecenter_h: +SaffronPokecenter_h:: db POKECENTER ; tileset db SAFFRON_POKECENTER_HEIGHT, SAFFRON_POKECENTER_WIDTH ; dimensions (y, x) dw SaffronPokecenter_Blocks ; blocks diff --git a/data/mapHeaders/SeafoamIslands1F.asm b/data/mapHeaders/SeafoamIslands1F.asm index f5260cda..67df46fa 100755 --- a/data/mapHeaders/SeafoamIslands1F.asm +++ b/data/mapHeaders/SeafoamIslands1F.asm @@ -1,4 +1,4 @@ -SeafoamIslands1F_h: +SeafoamIslands1F_h:: db CAVERN ; tileset db SEAFOAM_ISLANDS_1F_HEIGHT, SEAFOAM_ISLANDS_1F_WIDTH ; dimensions (y, x) dw SeafoamIslands1F_Blocks ; blocks diff --git a/data/mapHeaders/SeafoamIslandsB1F.asm b/data/mapHeaders/SeafoamIslandsB1F.asm index 23116f74..e1a667b6 100755 --- a/data/mapHeaders/SeafoamIslandsB1F.asm +++ b/data/mapHeaders/SeafoamIslandsB1F.asm @@ -1,4 +1,4 @@ -SeafoamIslandsB1F_h: +SeafoamIslandsB1F_h:: db CAVERN ; tileset db SEAFOAM_ISLANDS_B1F_HEIGHT, SEAFOAM_ISLANDS_B1F_WIDTH ; dimensions (y, x) dw SeafoamIslandsB1F_Blocks ; blocks diff --git a/data/mapHeaders/SeafoamIslandsB2F.asm b/data/mapHeaders/SeafoamIslandsB2F.asm index 10d45dad..d8074e20 100755 --- a/data/mapHeaders/SeafoamIslandsB2F.asm +++ b/data/mapHeaders/SeafoamIslandsB2F.asm @@ -1,4 +1,4 @@ -SeafoamIslandsB2F_h: +SeafoamIslandsB2F_h:: db CAVERN ; tileset db SEAFOAM_ISLANDS_B2F_HEIGHT, SEAFOAM_ISLANDS_B2F_WIDTH ; dimensions (y, x) dw SeafoamIslandsB2F_Blocks ; blocks diff --git a/data/mapHeaders/SeafoamIslandsB3F.asm b/data/mapHeaders/SeafoamIslandsB3F.asm index 812d1121..2976a45b 100755 --- a/data/mapHeaders/SeafoamIslandsB3F.asm +++ b/data/mapHeaders/SeafoamIslandsB3F.asm @@ -1,4 +1,4 @@ -SeafoamIslandsB3F_h: +SeafoamIslandsB3F_h:: db CAVERN ; tileset db SEAFOAM_ISLANDS_B3F_HEIGHT, SEAFOAM_ISLANDS_B3F_WIDTH ; dimensions (y, x) dw SeafoamIslandsB3F_Blocks ; blocks diff --git a/data/mapHeaders/SeafoamIslandsB4F.asm b/data/mapHeaders/SeafoamIslandsB4F.asm index 96c25e06..fcc98db5 100755 --- a/data/mapHeaders/SeafoamIslandsB4F.asm +++ b/data/mapHeaders/SeafoamIslandsB4F.asm @@ -1,4 +1,4 @@ -SeafoamIslandsB4F_h: +SeafoamIslandsB4F_h:: db CAVERN ; tileset db SEAFOAM_ISLANDS_B4F_HEIGHT, SEAFOAM_ISLANDS_B4F_WIDTH ; dimensions (y, x) dw SeafoamIslandsB4F_Blocks ; blocks diff --git a/data/mapHeaders/SilphCo10F.asm b/data/mapHeaders/SilphCo10F.asm index ad040479..be016e65 100755 --- a/data/mapHeaders/SilphCo10F.asm +++ b/data/mapHeaders/SilphCo10F.asm @@ -1,4 +1,4 @@ -SilphCo10F_h: +SilphCo10F_h:: db FACILITY ; tileset db SILPH_CO_10F_HEIGHT, SILPH_CO_10F_WIDTH ; dimensions (y, x) dw SilphCo10F_Blocks ; blocks diff --git a/data/mapHeaders/SilphCo11F.asm b/data/mapHeaders/SilphCo11F.asm index 08d6d650..c16255dd 100755 --- a/data/mapHeaders/SilphCo11F.asm +++ b/data/mapHeaders/SilphCo11F.asm @@ -1,4 +1,4 @@ -SilphCo11F_h: +SilphCo11F_h:: db INTERIOR ; tileset db SILPH_CO_11F_HEIGHT, SILPH_CO_11F_WIDTH ; dimensions (y, x) dw SilphCo11F_Blocks ; blocks diff --git a/data/mapHeaders/SilphCo1F.asm b/data/mapHeaders/SilphCo1F.asm index 45e6c5bf..0109677e 100755 --- a/data/mapHeaders/SilphCo1F.asm +++ b/data/mapHeaders/SilphCo1F.asm @@ -1,4 +1,4 @@ -SilphCo1F_h: +SilphCo1F_h:: db FACILITY ; tileset db SILPH_CO_1F_HEIGHT, SILPH_CO_1F_WIDTH ; dimensions (y, x) dw SilphCo1F_Blocks ; blocks diff --git a/data/mapHeaders/SilphCo2F.asm b/data/mapHeaders/SilphCo2F.asm index 69c2fb51..c9a21b17 100755 --- a/data/mapHeaders/SilphCo2F.asm +++ b/data/mapHeaders/SilphCo2F.asm @@ -1,4 +1,4 @@ -SilphCo2F_h: +SilphCo2F_h:: db FACILITY ; tileset db SILPH_CO_2F_HEIGHT, SILPH_CO_2F_WIDTH ; dimensions (y, x) dw SilphCo2F_Blocks ; blocks diff --git a/data/mapHeaders/SilphCo3F.asm b/data/mapHeaders/SilphCo3F.asm index 6911a604..bd027dba 100755 --- a/data/mapHeaders/SilphCo3F.asm +++ b/data/mapHeaders/SilphCo3F.asm @@ -1,4 +1,4 @@ -SilphCo3F_h: +SilphCo3F_h:: db FACILITY ; tileset db SILPH_CO_3F_HEIGHT, SILPH_CO_3F_WIDTH ; dimensions (y, x) dw SilphCo3F_Blocks ; blocks diff --git a/data/mapHeaders/SilphCo4F.asm b/data/mapHeaders/SilphCo4F.asm index 591ddc07..6f45da8d 100755 --- a/data/mapHeaders/SilphCo4F.asm +++ b/data/mapHeaders/SilphCo4F.asm @@ -1,4 +1,4 @@ -SilphCo4F_h: +SilphCo4F_h:: db FACILITY ; tileset db SILPH_CO_4F_HEIGHT, SILPH_CO_4F_WIDTH ; dimensions (y, x) dw SilphCo4F_Blocks ; blocks diff --git a/data/mapHeaders/SilphCo5F.asm b/data/mapHeaders/SilphCo5F.asm index 0303ceba..355aa258 100755 --- a/data/mapHeaders/SilphCo5F.asm +++ b/data/mapHeaders/SilphCo5F.asm @@ -1,4 +1,4 @@ -SilphCo5F_h: +SilphCo5F_h:: db FACILITY ; tileset db SILPH_CO_5F_HEIGHT, SILPH_CO_5F_WIDTH ; dimensions (y, x) dw SilphCo5F_Blocks ; blocks diff --git a/data/mapHeaders/SilphCo6F.asm b/data/mapHeaders/SilphCo6F.asm index b26a7587..732248ac 100755 --- a/data/mapHeaders/SilphCo6F.asm +++ b/data/mapHeaders/SilphCo6F.asm @@ -1,4 +1,4 @@ -SilphCo6F_h: +SilphCo6F_h:: db FACILITY ; tileset db SILPH_CO_6F_HEIGHT, SILPH_CO_6F_WIDTH ; dimensions (y, x) dw SilphCo6F_Blocks ; blocks diff --git a/data/mapHeaders/SilphCo7F.asm b/data/mapHeaders/SilphCo7F.asm index 5c6ea959..116e0342 100755 --- a/data/mapHeaders/SilphCo7F.asm +++ b/data/mapHeaders/SilphCo7F.asm @@ -1,4 +1,4 @@ -SilphCo7F_h: +SilphCo7F_h:: db FACILITY ; tileset db SILPH_CO_7F_HEIGHT, SILPH_CO_7F_WIDTH ; dimensions (y, x) dw SilphCo7F_Blocks ; blocks diff --git a/data/mapHeaders/SilphCo8F.asm b/data/mapHeaders/SilphCo8F.asm index e467298e..6d1c7faf 100755 --- a/data/mapHeaders/SilphCo8F.asm +++ b/data/mapHeaders/SilphCo8F.asm @@ -1,4 +1,4 @@ -SilphCo8F_h: +SilphCo8F_h:: db FACILITY ; tileset db SILPH_CO_8F_HEIGHT, SILPH_CO_8F_WIDTH ; dimensions (y, x) dw SilphCo8F_Blocks ; blocks diff --git a/data/mapHeaders/SilphCo9F.asm b/data/mapHeaders/SilphCo9F.asm index ec591e51..3465e2fc 100755 --- a/data/mapHeaders/SilphCo9F.asm +++ b/data/mapHeaders/SilphCo9F.asm @@ -1,4 +1,4 @@ -SilphCo9F_h: +SilphCo9F_h:: db FACILITY ; tileset db SILPH_CO_9F_HEIGHT, SILPH_CO_9F_WIDTH ; dimensions (y, x) dw SilphCo9F_Blocks ; blocks diff --git a/data/mapHeaders/SilphCoElevator.asm b/data/mapHeaders/SilphCoElevator.asm index 0abe2810..5bf164da 100755 --- a/data/mapHeaders/SilphCoElevator.asm +++ b/data/mapHeaders/SilphCoElevator.asm @@ -1,4 +1,4 @@ -SilphCoElevator_h: +SilphCoElevator_h:: db LOBBY ; tileset db SILPH_CO_ELEVATOR_HEIGHT, SILPH_CO_ELEVATOR_WIDTH ; dimensions (y, x) dw SilphCoElevator_Blocks ; blocks diff --git a/data/mapHeaders/TradeCenter.asm b/data/mapHeaders/TradeCenter.asm index 39981c35..584cf3c6 100755 --- a/data/mapHeaders/TradeCenter.asm +++ b/data/mapHeaders/TradeCenter.asm @@ -1,4 +1,4 @@ -TradeCenter_h: +TradeCenter_h:: db CLUB ; tileset db TRADE_CENTER_HEIGHT, TRADE_CENTER_WIDTH ; dimensions (y, x) dw TradeCenter_Blocks ; blocks diff --git a/data/mapHeaders/UndergroundPathNorthSouth.asm b/data/mapHeaders/UndergroundPathNorthSouth.asm index 5dd8cdf8..1443d875 100755 --- a/data/mapHeaders/UndergroundPathNorthSouth.asm +++ b/data/mapHeaders/UndergroundPathNorthSouth.asm @@ -1,4 +1,4 @@ -UndergroundPathNorthSouth_h: +UndergroundPathNorthSouth_h:: db UNDERGROUND ; tileset db UNDERGROUND_PATH_NORTH_SOUTH_HEIGHT, UNDERGROUND_PATH_NORTH_SOUTH_WIDTH ; dimensions (y, x) dw UndergroundPathNorthSouth_Blocks ; blocks diff --git a/data/mapHeaders/UndergroundPathRoute5.asm b/data/mapHeaders/UndergroundPathRoute5.asm index 14c6aa4d..769bd1c0 100755 --- a/data/mapHeaders/UndergroundPathRoute5.asm +++ b/data/mapHeaders/UndergroundPathRoute5.asm @@ -1,4 +1,4 @@ -UndergroundPathRoute5_h: +UndergroundPathRoute5_h:: db GATE ; tileset db UNDERGROUND_PATH_ROUTE_5_HEIGHT, UNDERGROUND_PATH_ROUTE_5_WIDTH ; dimensions (y, x) dw UndergroundPathRoute5_Blocks ; blocks diff --git a/data/mapHeaders/UndergroundPathRoute6.asm b/data/mapHeaders/UndergroundPathRoute6.asm index 6aea459c..f2a5beb7 100755 --- a/data/mapHeaders/UndergroundPathRoute6.asm +++ b/data/mapHeaders/UndergroundPathRoute6.asm @@ -1,4 +1,4 @@ -UndergroundPathRoute6_h: +UndergroundPathRoute6_h:: db GATE ; tileset db UNDERGROUND_PATH_ROUTE_6_HEIGHT, UNDERGROUND_PATH_ROUTE_6_WIDTH ; dimensions (y, x) dw UndergroundPathRoute6_Blocks ; blocks diff --git a/data/mapHeaders/UndergroundPathRoute7.asm b/data/mapHeaders/UndergroundPathRoute7.asm index 91495ea3..b8120ef4 100755 --- a/data/mapHeaders/UndergroundPathRoute7.asm +++ b/data/mapHeaders/UndergroundPathRoute7.asm @@ -1,4 +1,4 @@ -UndergroundPathRoute7_h: +UndergroundPathRoute7_h:: db GATE ; tileset db UNDERGROUND_PATH_ROUTE_7_HEIGHT, UNDERGROUND_PATH_ROUTE_7_WIDTH ; dimensions (y, x) dw UndergroundPathRoute7_Blocks ; blocks diff --git a/data/mapHeaders/UndergroundPathRoute7Copy.asm b/data/mapHeaders/UndergroundPathRoute7Copy.asm index 9d3f4c62..2ccdac57 100755 --- a/data/mapHeaders/UndergroundPathRoute7Copy.asm +++ b/data/mapHeaders/UndergroundPathRoute7Copy.asm @@ -1,4 +1,4 @@ -UndergroundPathRoute7Copy_h: +UndergroundPathRoute7Copy_h:: db GATE ; tileset db UNDERGROUND_PATH_ROUTE_7_HEIGHT, UNDERGROUND_PATH_ROUTE_7_WIDTH ; dimensions (y, x) dw UndergroundPathRoute7Copy_Blocks ; blocks diff --git a/data/mapHeaders/UndergroundPathRoute8.asm b/data/mapHeaders/UndergroundPathRoute8.asm index f34265b8..a1971c3c 100755 --- a/data/mapHeaders/UndergroundPathRoute8.asm +++ b/data/mapHeaders/UndergroundPathRoute8.asm @@ -1,4 +1,4 @@ -UndergroundPathRoute8_h: +UndergroundPathRoute8_h:: db GATE ; tileset db UNDERGROUND_PATH_ROUTE_8_HEIGHT, UNDERGROUND_PATH_ROUTE_8_WIDTH ; dimensions (y, x) dw UndergroundPathRoute8_Blocks ; blocks diff --git a/data/mapHeaders/UndergroundPathWestEast.asm b/data/mapHeaders/UndergroundPathWestEast.asm index d084bd73..1d50c103 100755 --- a/data/mapHeaders/UndergroundPathWestEast.asm +++ b/data/mapHeaders/UndergroundPathWestEast.asm @@ -1,4 +1,4 @@ -UndergroundPathWestEast_h: +UndergroundPathWestEast_h:: db UNDERGROUND ; tileset db UNDERGROUND_PATH_WEST_EAST_HEIGHT, UNDERGROUND_PATH_WEST_EAST_WIDTH ; dimensions (y, x) dw UndergroundPathWestEast_Blocks ; blocks diff --git a/data/mapHeaders/VermilionCity.asm b/data/mapHeaders/VermilionCity.asm index 6521ad89..8026c214 100755 --- a/data/mapHeaders/VermilionCity.asm +++ b/data/mapHeaders/VermilionCity.asm @@ -1,4 +1,4 @@ -VermilionCity_h: +VermilionCity_h:: db OVERWORLD ; tileset db VERMILION_CITY_HEIGHT, VERMILION_CITY_WIDTH ; dimensions (y, x) dw VermilionCity_Blocks ; blocks diff --git a/data/mapHeaders/VermilionDock.asm b/data/mapHeaders/VermilionDock.asm index f7dca8e6..0eb0edac 100755 --- a/data/mapHeaders/VermilionDock.asm +++ b/data/mapHeaders/VermilionDock.asm @@ -1,4 +1,4 @@ -VermilionDock_h: +VermilionDock_h:: db SHIP_PORT ; tileset db VERMILION_DOCK_HEIGHT, VERMILION_DOCK_WIDTH ; dimensions (y, x) dw VermilionDock_Blocks ; blocks diff --git a/data/mapHeaders/VermilionGym.asm b/data/mapHeaders/VermilionGym.asm index fe304a2e..0b5913f1 100755 --- a/data/mapHeaders/VermilionGym.asm +++ b/data/mapHeaders/VermilionGym.asm @@ -1,4 +1,4 @@ -VermilionGym_h: +VermilionGym_h:: db GYM ; tileset db VERMILION_GYM_HEIGHT, VERMILION_GYM_WIDTH ; dimensions (y, x) dw VermilionGym_Blocks ; blocks diff --git a/data/mapHeaders/VermilionMart.asm b/data/mapHeaders/VermilionMart.asm index 67f24f59..2fc1c79a 100755 --- a/data/mapHeaders/VermilionMart.asm +++ b/data/mapHeaders/VermilionMart.asm @@ -1,4 +1,4 @@ -VermilionMart_h: +VermilionMart_h:: db MART ; tileset db VERMILION_MART_HEIGHT, VERMILION_MART_WIDTH ; dimensions (y, x) dw VermilionMart_Blocks ; blocks diff --git a/data/mapHeaders/VermilionOldRodHouse.asm b/data/mapHeaders/VermilionOldRodHouse.asm index f4b69110..88a6e5d8 100755 --- a/data/mapHeaders/VermilionOldRodHouse.asm +++ b/data/mapHeaders/VermilionOldRodHouse.asm @@ -1,4 +1,4 @@ -VermilionOldRodHouse_h: +VermilionOldRodHouse_h:: db HOUSE ; tileset db VERMILION_OLD_ROD_HOUSE_HEIGHT, VERMILION_OLD_ROD_HOUSE_WIDTH ; dimensions (y, x) dw VermilionOldRodHouse_Blocks ; blocks diff --git a/data/mapHeaders/VermilionPidgeyHouse.asm b/data/mapHeaders/VermilionPidgeyHouse.asm index af052fa6..d355805a 100755 --- a/data/mapHeaders/VermilionPidgeyHouse.asm +++ b/data/mapHeaders/VermilionPidgeyHouse.asm @@ -1,4 +1,4 @@ -VermilionPidgeyHouse_h: +VermilionPidgeyHouse_h:: db HOUSE ; tileset db VERMILION_PIDGEY_HOUSE_HEIGHT, VERMILION_PIDGEY_HOUSE_WIDTH ; dimensions (y, x) dw VermilionPidgeyHouse_Blocks ; blocks diff --git a/data/mapHeaders/VermilionPokecenter.asm b/data/mapHeaders/VermilionPokecenter.asm index 3d4c23ec..face28d6 100755 --- a/data/mapHeaders/VermilionPokecenter.asm +++ b/data/mapHeaders/VermilionPokecenter.asm @@ -1,4 +1,4 @@ -VermilionPokecenter_h: +VermilionPokecenter_h:: db POKECENTER ; tileset db VERMILION_POKECENTER_HEIGHT, VERMILION_POKECENTER_WIDTH ; dimensions (y, x) dw VermilionPokecenter_Blocks ; blocks diff --git a/data/mapHeaders/VermilionTradeHouse.asm b/data/mapHeaders/VermilionTradeHouse.asm index 21d30049..cadd14b2 100755 --- a/data/mapHeaders/VermilionTradeHouse.asm +++ b/data/mapHeaders/VermilionTradeHouse.asm @@ -1,4 +1,4 @@ -VermilionTradeHouse_h: +VermilionTradeHouse_h:: db HOUSE ; tileset db VERMILION_TRADE_HOUSE_HEIGHT, VERMILION_TRADE_HOUSE_WIDTH ; dimensions (y, x) dw VermilionTradeHouse_Blocks ; blocks diff --git a/data/mapHeaders/VictoryRoad1F.asm b/data/mapHeaders/VictoryRoad1F.asm index 3508d782..239a8de3 100755 --- a/data/mapHeaders/VictoryRoad1F.asm +++ b/data/mapHeaders/VictoryRoad1F.asm @@ -1,4 +1,4 @@ -VictoryRoad1F_h: +VictoryRoad1F_h:: db CAVERN ; tileset db VICTORY_ROAD_1F_HEIGHT, VICTORY_ROAD_1F_WIDTH ; dimensions (y, x) dw VictoryRoad1F_Blocks ; blocks diff --git a/data/mapHeaders/VictoryRoad2F.asm b/data/mapHeaders/VictoryRoad2F.asm index 31693c1c..a0138cb2 100755 --- a/data/mapHeaders/VictoryRoad2F.asm +++ b/data/mapHeaders/VictoryRoad2F.asm @@ -1,4 +1,4 @@ -VictoryRoad2F_h: +VictoryRoad2F_h:: db CAVERN ; tileset db VICTORY_ROAD_2F_HEIGHT, VICTORY_ROAD_2F_WIDTH ; dimensions (y, x) dw VictoryRoad2F_Blocks ; blocks diff --git a/data/mapHeaders/VictoryRoad3F.asm b/data/mapHeaders/VictoryRoad3F.asm index 3f5e21d2..32133afa 100755 --- a/data/mapHeaders/VictoryRoad3F.asm +++ b/data/mapHeaders/VictoryRoad3F.asm @@ -1,4 +1,4 @@ -VictoryRoad3F_h: +VictoryRoad3F_h:: db CAVERN ; tileset db VICTORY_ROAD_3F_HEIGHT, VICTORY_ROAD_3F_WIDTH ; dimensions (y, x) dw VictoryRoad3F_Blocks ; blocks diff --git a/data/mapHeaders/ViridianCity.asm b/data/mapHeaders/ViridianCity.asm index 09f7b9f4..5dc56820 100755 --- a/data/mapHeaders/ViridianCity.asm +++ b/data/mapHeaders/ViridianCity.asm @@ -1,4 +1,4 @@ -ViridianCity_h: +ViridianCity_h:: db OVERWORLD ; tileset db VIRIDIAN_CITY_HEIGHT, VIRIDIAN_CITY_WIDTH ; dimensions (y, x) dw ViridianCity_Blocks ; blocks diff --git a/data/mapHeaders/ViridianForest.asm b/data/mapHeaders/ViridianForest.asm index a8df3e6e..557b99ed 100755 --- a/data/mapHeaders/ViridianForest.asm +++ b/data/mapHeaders/ViridianForest.asm @@ -1,4 +1,4 @@ -ViridianForest_h: +ViridianForest_h:: db FOREST ; tileset db VIRIDIAN_FOREST_HEIGHT, VIRIDIAN_FOREST_WIDTH ; dimensions (y, x) dw ViridianForest_Blocks ; blocks diff --git a/data/mapHeaders/ViridianForestNorthGate.asm b/data/mapHeaders/ViridianForestNorthGate.asm index 48535977..1fd4ac7d 100755 --- a/data/mapHeaders/ViridianForestNorthGate.asm +++ b/data/mapHeaders/ViridianForestNorthGate.asm @@ -1,4 +1,4 @@ -ViridianForestNorthGate_h: +ViridianForestNorthGate_h:: db FOREST_GATE ; tileset db VIRIDIAN_FOREST_NORTH_GATE_HEIGHT, VIRIDIAN_FOREST_NORTH_GATE_WIDTH ; dimensions (y, x) dw ViridianForestNorthGate_Blocks ; blocks diff --git a/data/mapHeaders/ViridianForestSouthGate.asm b/data/mapHeaders/ViridianForestSouthGate.asm index b134ebea..65d587f8 100755 --- a/data/mapHeaders/ViridianForestSouthGate.asm +++ b/data/mapHeaders/ViridianForestSouthGate.asm @@ -1,4 +1,4 @@ -ViridianForestSouthGate_h: +ViridianForestSouthGate_h:: db FOREST_GATE ; tileset db VIRIDIAN_FOREST_SOUTH_GATE_HEIGHT, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH ; dimensions (y, x) dw ViridianForestSouthGate_Blocks ; blocks diff --git a/data/mapHeaders/ViridianGym.asm b/data/mapHeaders/ViridianGym.asm index 9b27845c..136a13b5 100755 --- a/data/mapHeaders/ViridianGym.asm +++ b/data/mapHeaders/ViridianGym.asm @@ -1,4 +1,4 @@ -ViridianGym_h: +ViridianGym_h:: db GYM ; tileset db VIRIDIAN_GYM_HEIGHT, VIRIDIAN_GYM_WIDTH ; dimensions (y, x) dw ViridianGym_Blocks ; blocks diff --git a/data/mapHeaders/ViridianMart.asm b/data/mapHeaders/ViridianMart.asm index 063f3327..341caa86 100755 --- a/data/mapHeaders/ViridianMart.asm +++ b/data/mapHeaders/ViridianMart.asm @@ -1,4 +1,4 @@ -ViridianMart_h: +ViridianMart_h:: db MART ; tileset db VIRIDIAN_MART_HEIGHT, VIRIDIAN_MART_WIDTH ; dimensions (y, x) dw ViridianMart_Blocks ; blocks diff --git a/data/mapHeaders/ViridianNicknameHouse.asm b/data/mapHeaders/ViridianNicknameHouse.asm index b6a00392..db817b2f 100755 --- a/data/mapHeaders/ViridianNicknameHouse.asm +++ b/data/mapHeaders/ViridianNicknameHouse.asm @@ -1,4 +1,4 @@ -ViridianNicknameHouse_h: +ViridianNicknameHouse_h:: db HOUSE ; tileset db VIRIDIAN_NICKNAME_HOUSE_HEIGHT, VIRIDIAN_NICKNAME_HOUSE_WIDTH ; dimensions (y, x) dw ViridianNicknameHouse_Blocks ; blocks diff --git a/data/mapHeaders/ViridianPokecenter.asm b/data/mapHeaders/ViridianPokecenter.asm index 25c569d8..203abf06 100755 --- a/data/mapHeaders/ViridianPokecenter.asm +++ b/data/mapHeaders/ViridianPokecenter.asm @@ -1,4 +1,4 @@ -ViridianPokecenter_h: +ViridianPokecenter_h:: db POKECENTER ; tileset db VIRIDIAN_POKECENTER_HEIGHT, VIRIDIAN_POKECENTER_WIDTH ; dimensions (y, x) dw ViridianPokecenter_Blocks ; blocks diff --git a/data/mapHeaders/ViridianSchoolHouse.asm b/data/mapHeaders/ViridianSchoolHouse.asm index 15e5c88f..fdf1090a 100755 --- a/data/mapHeaders/ViridianSchoolHouse.asm +++ b/data/mapHeaders/ViridianSchoolHouse.asm @@ -1,4 +1,4 @@ -ViridianSchoolHouse_h: +ViridianSchoolHouse_h:: db HOUSE ; tileset db VIRIDIAN_SCHOOL_HOUSE_HEIGHT, VIRIDIAN_SCHOOL_HOUSE_WIDTH ; dimensions (y, x) dw ViridianSchoolHouse_Blocks ; blocks diff --git a/data/mapHeaders/WardensHouse.asm b/data/mapHeaders/WardensHouse.asm index 128e357a..6c6b0f6c 100755 --- a/data/mapHeaders/WardensHouse.asm +++ b/data/mapHeaders/WardensHouse.asm @@ -1,4 +1,4 @@ -WardensHouse_h: +WardensHouse_h:: db LAB ; tileset db WARDENS_HOUSE_HEIGHT, WARDENS_HOUSE_WIDTH ; dimensions (y, x) dw WardensHouse_Blocks ; blocks diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 3dc1988a..d698cfee 100755 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -1,5 +1,5 @@ ; see also MapHeaderPointers -MapHeaderBanks: +MapHeaderBanks:: db BANK(PalletTown_h) db BANK(ViridianCity_h) db BANK(PewterCity_h) diff --git a/data/map_songs.asm b/data/map_songs.asm index 55ec5abf..28e17223 100755 --- a/data/map_songs.asm +++ b/data/map_songs.asm @@ -1,4 +1,4 @@ -MapSongBanks: +MapSongBanks:: db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; PALLET_TOWN db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_CITY db MUSIC_CITIES1, BANK(Music_Cities1) ; PEWTER_CITY diff --git a/data/trainer_pic_money_pointers.asm b/data/trainer_pic_money_pointers.asm index 37678e74..85f34497 100755 --- a/data/trainer_pic_money_pointers.asm +++ b/data/trainer_pic_money_pointers.asm @@ -1,4 +1,4 @@ -TrainerPicAndMoneyPointers: +TrainerPicAndMoneyPointers:: ; trainer pic pointers and base money. ; money received after battle = base money × level of highest-level enemy mon dw YoungsterPic |