ref: 4b853ad676e061a6c4b0fcc030855a2705776864
parent: ff927ba730e45a843c1e183b5f05646f96378af0
author: Rangi <35663410+Rangi42@users.noreply.github.com>
date: Sat Jun 27 11:32:24 EDT 2020
Separate maps.asm, pics.asm, sprites.asm, and tilesets.asm from main.asm (#251) Each new file builds its own .o, along with separate main.o and home.o, which necessitates many more "exported::" labels.
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,20 @@
roms := pokered.gbc pokeblue.gbc
-pokered_obj := audio_red.o main_red.o text_red.o wram_red.o
-pokeblue_obj := audio_blue.o main_blue.o text_blue.o wram_blue.o
+rom_obj := \
+audio.o \
+home.o \
+main.o \
+maps.o \
+pics.o \
+sprites.o \
+text.o \
+tilesets.o \
+wram.o \
+pokered_obj := $(rom_obj:.o=_red.o)
+pokeblue_obj := $(rom_obj:.o=_blue.o)
+
### Build tools
MD5 := md5sum -c
@@ -65,7 +76,7 @@
pokeblue_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON BLUE"
%.gbc: $$(%_obj)
- $(RGBLINK) -d -n $*.sym -l pokered.link -o $@ $^
+ $(RGBLINK) -d -n $*.sym -l layout.link -o $@ $^
$(RGBFIX) $($*_opt) $@
sort $*.sym -o $*.sym
--- a/audio.asm
+++ b/audio.asm
@@ -1,27 +1,27 @@
INCLUDE "constants.asm"
-SECTION "Sound Effect Headers 1", ROMX ; BANK $02
+SECTION "Sound Effect Headers 1", ROMX
INCLUDE "audio/headers/sfxheaders1.asm"
-SECTION "Sound Effect Headers 2", ROMX ; BANK $08
+SECTION "Sound Effect Headers 2", ROMX
INCLUDE "audio/headers/sfxheaders2.asm"
-SECTION "Sound Effect Headers 3", ROMX ; BANK $1f
+SECTION "Sound Effect Headers 3", ROMX
INCLUDE "audio/headers/sfxheaders3.asm"
-SECTION "Music Headers 1", ROMX ; BANK $02
+SECTION "Music Headers 1", ROMX
INCLUDE "audio/headers/musicheaders1.asm"
-SECTION "Music Headers 2", ROMX ; BANK $08
+SECTION "Music Headers 2", ROMX
INCLUDE "audio/headers/musicheaders2.asm"
-SECTION "Music Headers 3", ROMX ; BANK $1f
+SECTION "Music Headers 3", ROMX
INCLUDE "audio/headers/musicheaders3.asm"
-SECTION "Sound Effects 1", ROMX ; BANK $02
+SECTION "Sound Effects 1", ROMX
INCLUDE "audio/sfx/noise_instrument01_1.asm"
INCLUDE "audio/sfx/noise_instrument02_1.asm"
@@ -120,7 +120,7 @@
INCLUDE "audio/sfx/cry22_1.asm"
-SECTION "Sound Effects 2", ROMX ; BANK $08
+SECTION "Sound Effects 2", ROMX
INCLUDE "audio/sfx/noise_instrument01_2.asm"
INCLUDE "audio/sfx/noise_instrument02_2.asm"
@@ -245,7 +245,7 @@
INCLUDE "audio/sfx/cry22_2.asm"
-SECTION "Sound Effects 3", ROMX ; BANK $1f
+SECTION "Sound Effects 3", ROMX
INCLUDE "audio/sfx/noise_instrument01_3.asm"
INCLUDE "audio/sfx/noise_instrument02_3.asm"
@@ -353,7 +353,7 @@
-SECTION "Audio Engine 1", ROMX ; BANK $02
+SECTION "Audio Engine 1", ROMX
PlayBattleMusic::
xor a
@@ -446,7 +446,7 @@
jp Audio1_OverwriteChannelPointer
-SECTION "Audio Engine 2", ROMX ; BANK $08
+SECTION "Audio Engine 2", ROMX
Music_DoLowHealthAlarm::
ld a, [wLowHealthAlarm]
@@ -550,7 +550,7 @@
ret
-SECTION "Audio Engine 3", ROMX ; BANK $1f
+SECTION "Audio Engine 3", ROMX
PlayPokedexRatingSfx::
ld a, [$ffdc]
@@ -594,7 +594,7 @@
-SECTION "Music 1", ROMX ; BANK $02
+SECTION "Music 1", ROMX
INCLUDE "audio/music/pkmnhealed.asm"
INCLUDE "audio/music/routes1.asm"
@@ -623,7 +623,7 @@
INCLUDE "audio/music/pokecenter.asm"
-SECTION "Music 2", ROMX ; BANK $08
+SECTION "Music 2", ROMX
INCLUDE "audio/sfx/pokeflute_ch5_ch6.asm"
INCLUDE "audio/sfx/unused2_2.asm"
@@ -639,7 +639,7 @@
INCLUDE "audio/music/defeatedgymleader.asm"
-SECTION "Music 3", ROMX ; BANK $1f
+SECTION "Music 3", ROMX
INCLUDE "audio/music/bikeriding.asm"
INCLUDE "audio/music/dungeon1.asm"
--- 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 @@
tmlearn 44
tmlearn 50,51
db 0 ; padding
-MonBaseStatsEnd:
--- 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
--- 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"
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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
--- 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
--- a/engine/add_mon.asm
+++ b/engine/add_mon.asm
@@ -1,4 +1,4 @@
-_AddPartyMon:
+_AddPartyMon::
; Adds a new mon to the player's or enemy's party.
; [wMonDataLocation] is used in an unusual way in this function.
; If the lower nybble is 0, the mon is added to the player's party, else the enemy's.
@@ -277,7 +277,7 @@
; adds enemy mon [wcf91] (at position [wWhichPokemon] in enemy list) to own party
; used in the cable club trade center
-_AddEnemyMonToPlayerParty:
+_AddEnemyMonToPlayerParty::
ld hl, wPartyCount
ld a, [hl]
cp PARTY_LENGTH
@@ -338,7 +338,7 @@
and a
ret ; return success
-_MoveMon:
+_MoveMon::
ld a, [wMoveMonType]
and a ; BOX_TO_PARTY
jr z, .checkPartyMonSlots
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -1451,7 +1451,7 @@
; tests if the player has any pokemon that are not fainted
; sets d = 0 if all fainted, d != 0 if some mons are still alive
-AnyPartyAlive:
+AnyPartyAlive::
ld a, [wPartyCount]
ld e, a
xor a
@@ -1996,7 +1996,7 @@
pop de
ret
-DisplayBattleMenu:
+DisplayBattleMenu::
call LoadScreenTilesFromBuffer1 ; restore saved screen
ld a, [wBattleType]
and a
@@ -6718,7 +6718,7 @@
call Delay3
predef_jump MoveAnimation
-InitBattle:
+InitBattle::
ld a, [wCurOpponent]
and a
jr z, DetermineWildOpponent
@@ -6934,7 +6934,7 @@
ld a, [wPredefRegisters + 1]
ld l, a
ld a, [hStartTileID]
-CopyUncompressedPicToHL:
+CopyUncompressedPicToHL::
lb bc, 7, 7
ld de, SCREEN_WIDTH
push af
--- a/engine/battle/get_trainer_name.asm
+++ b/engine/battle/get_trainer_name.asm
@@ -1,4 +1,4 @@
-GetTrainerName_:
+GetTrainerName_::
ld hl, wGrassRate
ld a, [wLinkState]
and a
--- a/engine/battle/save_trainer_name.asm
+++ b/engine/battle/save_trainer_name.asm
@@ -1,4 +1,4 @@
-SaveTrainerName:
+SaveTrainerName::
ld hl, TrainerNamePointers
ld a, [wTrainerClass]
dec a
--- a/engine/display_pokedex.asm
+++ b/engine/display_pokedex.asm
@@ -1,4 +1,4 @@
-_DisplayPokedex:
+_DisplayPokedex::
ld hl, wd730
set 6, [hl]
predef ShowPokedexData
--- a/engine/display_text_id_init.asm
+++ b/engine/display_text_id_init.asm
@@ -1,5 +1,5 @@
; function that performs initialization for DisplayTextID
-DisplayTextIDInit:
+DisplayTextIDInit::
xor a
ld [wListMenuID], a
ld a, [wAutoTextBoxDrawingControl]
--- a/engine/experience.asm
+++ b/engine/experience.asm
@@ -1,5 +1,5 @@
; calculates the level a mon should be based on its current exp
-CalcLevelFromExperience:
+CalcLevelFromExperience::
ld a, [wLoadedMonSpecies]
ld [wd0b5], a
call GetMonHeader
@@ -28,7 +28,7 @@
ret
; calculates the amount of experience needed for level d
-CalcExperience:
+CalcExperience::
ld a, [wMonHGrowthRate]
add a
add a
--- a/engine/game_corner_slots.asm
+++ b/engine/game_corner_slots.asm
@@ -41,14 +41,14 @@
call PrintPredefTextID
ret
-GameCornerOutOfOrderText:
+GameCornerOutOfOrderText::
TX_FAR _GameCornerOutOfOrderText
db "@"
-GameCornerOutToLunchText:
+GameCornerOutToLunchText::
TX_FAR _GameCornerOutToLunchText
db "@"
-GameCornerSomeonesKeysText:
+GameCornerSomeonesKeysText::
TX_FAR _GameCornerSomeonesKeysText
db "@"
--- a/engine/game_corner_slots2.asm
+++ b/engine/game_corner_slots2.asm
@@ -22,10 +22,10 @@
ld [wCanPlaySlots], a
ret
-GameCornerCoinCaseText:
+GameCornerCoinCaseText::
TX_FAR _GameCornerCoinCaseText
db "@"
-GameCornerNoCoinsText:
+GameCornerNoCoinsText::
TX_FAR _GameCornerNoCoinsText
db "@"
--- a/engine/give_pokemon.asm
+++ b/engine/give_pokemon.asm
@@ -1,4 +1,4 @@
-_GivePokemon:
+_GivePokemon::
; returns success in carry
; and whether the mon was added to the party in [wAddedToParty]
call EnableAutoTextBoxDrawing
--- a/engine/hidden_object_functions14.asm
+++ b/engine/hidden_object_functions14.asm
@@ -5,12 +5,12 @@
ld a, [wHiddenObjectFunctionArgument]
jp PrintPredefTextID
-TMNotebook:
+TMNotebook::
TX_FAR TMNotebookText
TX_WAIT
db "@"
-ViridianSchoolNotebook:
+ViridianSchoolNotebook::
TX_ASM
ld hl, ViridianSchoolNotebookText1
call PrintText
@@ -68,7 +68,7 @@
call EnableAutoTextBoxDrawing
tx_pre_jump EnemiesOnEverySideText
-EnemiesOnEverySideText:
+EnemiesOnEverySideText::
TX_FAR _EnemiesOnEverySideText
db "@"
@@ -76,7 +76,7 @@
call EnableAutoTextBoxDrawing
tx_pre_jump WhatGoesAroundComesAroundText
-WhatGoesAroundComesAroundText:
+WhatGoesAroundComesAroundText::
TX_FAR _WhatGoesAroundComesAroundText
db "@"
@@ -84,7 +84,7 @@
call EnableAutoTextBoxDrawing
tx_pre_jump FightingDojoText
-FightingDojoText:
+FightingDojoText::
TX_FAR _FightingDojoText
db "@"
@@ -95,6 +95,6 @@
call EnableAutoTextBoxDrawing
tx_pre_jump IndigoPlateauHQText
-IndigoPlateauHQText:
+IndigoPlateauHQText::
TX_FAR _IndigoPlateauHQText
db "@"
--- a/engine/hidden_object_functions17.asm
+++ b/engine/hidden_object_functions17.asm
@@ -2,7 +2,7 @@
call EnableAutoTextBoxDrawing
tx_pre_jump RedBedroomSNESText
-RedBedroomSNESText:
+RedBedroomSNESText::
TX_FAR _RedBedroomSNESText
db "@"
@@ -10,7 +10,7 @@
call EnableAutoTextBoxDrawing
tx_pre_jump RedBedroomPCText
-RedBedroomPCText:
+RedBedroomPCText::
TX_PLAYERS_PC
Route15GateLeftBinoculars:
@@ -24,7 +24,7 @@
call PlayCry
jp DisplayMonFrontSpriteInBox
-Route15UpstairsBinocularsText:
+Route15UpstairsBinocularsText::
TX_FAR _Route15UpstairsBinocularsText
db "@"
@@ -36,7 +36,7 @@
tx_pre AerodactylFossilText
ret
-AerodactylFossilText:
+AerodactylFossilText::
TX_FAR _AerodactylFossilText
db "@"
@@ -48,7 +48,7 @@
tx_pre KabutopsFossilText
ret
-KabutopsFossilText:
+KabutopsFossilText::
TX_FAR _KabutopsFossilText
db "@"
@@ -89,7 +89,7 @@
call PrintPredefTextID
ret
-LinkCableHelp:
+LinkCableHelp::
TX_ASM
call SaveScreenTilesToBuffer1
ld hl, LinkCableHelpText1
@@ -173,7 +173,7 @@
TX_FAR _LinkCableInfoText3
db "@"
-ViridianSchoolBlackboard:
+ViridianSchoolBlackboard::
TX_ASM
call SaveScreenTilesToBuffer1
ld hl, ViridianSchoolBlackboardText1
@@ -308,7 +308,7 @@
call EnableAutoTextBoxDrawing
tx_pre_jump VermilionGymTrashText
-VermilionGymTrashText:
+VermilionGymTrashText::
TX_FAR _VermilionGymTrashText
db "@"
@@ -433,7 +433,7 @@
db 3, 10, 12, 14, 0 ; 13
db 2, 11, 13, 0, 0 ; 14
-VermilionGymTrashSuccessText1:
+VermilionGymTrashSuccessText1::
TX_FAR _VermilionGymTrashSuccessText1
TX_ASM
call WaitForSoundToFinish
@@ -443,7 +443,7 @@
jp TextScriptEnd
; unused
-VermilionGymTrashSuccessText2:
+VermilionGymTrashSuccessText2::
TX_FAR _VermilionGymTrashSuccessText2
db "@"
@@ -456,7 +456,7 @@
call WaitForSoundToFinish
jp TextScriptEnd
-VermilionGymTrashSuccessText3:
+VermilionGymTrashSuccessText3::
TX_FAR _VermilionGymTrashSuccessText3
TX_ASM
call WaitForSoundToFinish
@@ -465,7 +465,7 @@
call WaitForSoundToFinish
jp TextScriptEnd
-VermilionGymTrashFailText:
+VermilionGymTrashFailText::
TX_FAR _VermilionGymTrashFailText
TX_ASM
call WaitForSoundToFinish
--- a/engine/hidden_object_functions18.asm
+++ b/engine/hidden_object_functions18.asm
@@ -39,11 +39,11 @@
db VIRIDIAN_GYM, %10000000
db $ff
-GymStatueText1:
+GymStatueText1::
TX_FAR _GymStatueText1
db "@"
-GymStatueText2:
+GymStatueText2::
TX_FAR _GymStatueText2
db "@"
@@ -98,59 +98,59 @@
db_tx_pre RockTunnelPokecenterBenchGuyText
db $FF
-ViridianCityPokecenterBenchGuyText:
+ViridianCityPokecenterBenchGuyText::
TX_FAR _ViridianCityPokecenterGuyText
db "@"
-PewterCityPokecenterBenchGuyText:
+PewterCityPokecenterBenchGuyText::
TX_FAR _PewterCityPokecenterGuyText
db "@"
-CeruleanCityPokecenterBenchGuyText:
+CeruleanCityPokecenterBenchGuyText::
TX_FAR _CeruleanPokecenterGuyText
db "@"
-LavenderCityPokecenterBenchGuyText:
+LavenderCityPokecenterBenchGuyText::
TX_FAR _LavenderPokecenterGuyText
db "@"
-MtMoonPokecenterBenchGuyText:
+MtMoonPokecenterBenchGuyText::
TX_FAR _MtMoonPokecenterBenchGuyText
db "@"
-RockTunnelPokecenterBenchGuyText:
+RockTunnelPokecenterBenchGuyText::
TX_FAR _RockTunnelPokecenterGuyText
db "@"
-UnusedBenchGuyText1:
+UnusedBenchGuyText1::
TX_FAR _UnusedBenchGuyText1
db "@"
-UnusedBenchGuyText2:
+UnusedBenchGuyText2::
TX_FAR _UnusedBenchGuyText2
db "@"
-UnusedBenchGuyText3:
+UnusedBenchGuyText3::
TX_FAR _UnusedBenchGuyText3
db "@"
-VermilionCityPokecenterBenchGuyText:
+VermilionCityPokecenterBenchGuyText::
TX_FAR _VermilionPokecenterGuyText
db "@"
-CeladonCityPokecenterBenchGuyText:
+CeladonCityPokecenterBenchGuyText::
TX_FAR _CeladonCityPokecenterGuyText
db "@"
-FuchsiaCityPokecenterBenchGuyText:
+FuchsiaCityPokecenterBenchGuyText::
TX_FAR _FuchsiaCityPokecenterGuyText
db "@"
-CinnabarIslandPokecenterBenchGuyText:
+CinnabarIslandPokecenterBenchGuyText::
TX_FAR _CinnabarPokecenterGuyText
db "@"
-SaffronCityPokecenterBenchGuyText:
+SaffronCityPokecenterBenchGuyText::
TX_ASM
CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
ld hl, SaffronCityPokecenterBenchGuyText2
@@ -168,13 +168,13 @@
TX_FAR _SaffronCityPokecenterGuyText2
db "@"
-CeladonCityHotelText:
+CeladonCityHotelText::
TX_FAR _CeladonCityHotelText
db "@"
ret
-UnusedPredefText:
+UnusedPredefText::
db "@"
PrintBookcaseText:
@@ -181,7 +181,7 @@
call EnableAutoTextBoxDrawing
tx_pre_jump BookcaseText
-BookcaseText:
+BookcaseText::
TX_FAR _BookcaseText
db "@"
@@ -194,5 +194,5 @@
ld [wAutoTextBoxDrawingControl], a
tx_pre_jump PokemonCenterPCText
-PokemonCenterPCText:
+PokemonCenterPCText::
TX_POKECENTER_PC
--- a/engine/hidden_object_functions3.asm
+++ b/engine/hidden_object_functions3.asm
@@ -1,5 +1,5 @@
; prints text for bookshelves in buildings without sign events
-PrintBookshelfText:
+PrintBookshelfText::
ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction
cp SPRITE_FACING_UP
jr nz, .noMatch
@@ -38,7 +38,7 @@
INCLUDE "data/bookshelf_tile_ids.asm"
-IndigoPlateauStatues:
+IndigoPlateauStatues::
TX_ASM
ld hl, IndigoPlateauStatuesText1
call PrintText
@@ -63,7 +63,7 @@
TX_FAR _IndigoPlateauStatuesText3
db "@"
-BookOrSculptureText:
+BookOrSculptureText::
TX_ASM
ld hl, PokemonBooksText
ld a, [wCurMapTileset]
@@ -85,11 +85,11 @@
TX_FAR _DiglettSculptureText
db "@"
-ElevatorText:
+ElevatorText::
TX_FAR _ElevatorText
db "@"
-TownMapText:
+TownMapText::
TX_FAR _TownMapText
TX_BLINK
TX_ASM
@@ -112,6 +112,6 @@
push af
jp CloseTextDisplay
-PokemonStuffText:
+PokemonStuffText::
TX_FAR _PokemonStuffText
db "@"
--- a/engine/hidden_object_functions7.asm
+++ b/engine/hidden_object_functions7.asm
@@ -2,7 +2,7 @@
call EnableAutoTextBoxDrawing
tx_pre_jump NewBicycleText
-NewBicycleText:
+NewBicycleText::
TX_FAR _NewBicycleText
db "@"
@@ -10,7 +10,7 @@
call EnableAutoTextBoxDrawing
tx_pre_jump PushStartText
-PushStartText:
+PushStartText::
TX_FAR _PushStartText
db "@"
@@ -28,15 +28,15 @@
.ownLessThanTwo
jp PrintPredefTextID
-SaveOptionText:
+SaveOptionText::
TX_FAR _SaveOptionText
db "@"
-StrengthsAndWeaknessesText:
+StrengthsAndWeaknessesText::
TX_FAR _StrengthsAndWeaknessesText
db "@"
-SafariZoneCheck:
+SafariZoneCheck::
CheckEventHL EVENT_IN_SAFARI_ZONE ; if we are not in the Safari Zone,
jr z, SafariZoneGameStillGoing ; don't bother printing game over text
ld a, [wNumSafariBalls]
@@ -44,7 +44,7 @@
jr z, SafariZoneGameOver
jr SafariZoneGameStillGoing
-SafariZoneCheckSteps:
+SafariZoneCheckSteps::
ld a, [wSafariSteps]
ld b, a
ld a, [wSafariSteps + 1]
@@ -90,7 +90,7 @@
ld [wSafariZoneGameOver], a
ret
-PrintSafariGameOverText:
+PrintSafariGameOverText::
xor a
ld [wJoyIgnore], a
ld hl, SafariGameOverText
@@ -123,7 +123,7 @@
call EnableAutoTextBoxDrawing
tx_pre_jump CinnabarGymQuiz
-CinnabarGymQuiz:
+CinnabarGymQuiz::
TX_ASM
xor a
ld [wOpponentAfterWrongAnswer], a
@@ -258,7 +258,7 @@
TX_FAR _CinnabarGymQuizIncorrectText
db "@"
-UpdateCinnabarGymGateTileBlocks_:
+UpdateCinnabarGymGateTileBlocks_::
; Update the overworld map with open floor blocks or locked gate blocks
; depending on event flags.
ld a, 6
@@ -316,7 +316,7 @@
tx_pre MagazinesText
ret
-MagazinesText:
+MagazinesText::
TX_FAR _MagazinesText
db "@"
@@ -366,11 +366,11 @@
tx_pre BillsHousePokemonList
ret
-BillsHouseMonitorText:
+BillsHouseMonitorText::
TX_FAR _BillsHouseMonitorText
db "@"
-BillsHouseInitiatedText:
+BillsHouseInitiatedText::
TX_FAR _BillsHouseInitiatedText
TX_BLINK
TX_ASM
@@ -386,7 +386,7 @@
call DelayFrames
jp TextScriptEnd
-BillsHousePokemonList:
+BillsHousePokemonList::
TX_ASM
call SaveScreenTilesToBuffer1
ld hl, BillsHousePokemonListText1
@@ -462,6 +462,6 @@
call EnableAutoTextBoxDrawing
tx_pre_jump OakLabEmailText
-OakLabEmailText:
+OakLabEmailText::
TX_FAR _OakLabEmailText
db "@"
--- a/engine/items/inventory.asm
+++ b/engine/items/inventory.asm
@@ -4,7 +4,7 @@
; [wcf91] = item ID
; [wItemQuantity] = item quantity
; sets carry flag if successful, unsets carry flag if unsuccessful
-AddItemToInventory_:
+AddItemToInventory_::
ld a, [wItemQuantity] ; a = item quantity
push af
push bc
@@ -97,7 +97,7 @@
; hl = address of inventory (either wNumBagItems or wNumBoxItems)
; [wWhichPokemon] = index (within the inventory) of the item to remove
; [wItemQuantity] = quantity to remove
-RemoveItemFromInventory_:
+RemoveItemFromInventory_::
push hl
inc hl
ld a, [wWhichPokemon] ; index (within the inventory) of the item being removed
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -1,4 +1,4 @@
-UseItem_:
+UseItem_::
ld a, 1
ld [wActionResultOrTookBattleTurn], a ; initialise to success value
ld a, [wcf91] ;contains item_ID
@@ -2588,7 +2588,7 @@
; [wItemQuantity] = quantity to toss
; OUTPUT:
; clears carry flag if the item is tossed, sets carry flag if not
-TossItem_:
+TossItem_::
push hl
ld a, [wcf91]
call IsItemHM
@@ -2657,7 +2657,7 @@
; [wIsKeyItem] = result
; 00: item is not key item
; 01: item is key item
-IsKeyItem_:
+IsKeyItem_::
ld a, $01
ld [wIsKeyItem], a
ld a, [wcf91]
--- a/engine/items/tm_prices.asm
+++ b/engine/items/tm_prices.asm
@@ -1,4 +1,4 @@
-GetMachinePrice:
+GetMachinePrice::
; Input: [wcf91] = Item Id of a TM
; Output: Stores the TM price at hItemPrice
ld a, [wcf91] ; a contains TM item id
--- a/engine/load_mon_data.asm
+++ b/engine/load_mon_data.asm
@@ -1,4 +1,4 @@
-LoadMonData_:
+LoadMonData_::
; Load monster [wWhichPokemon] from list [wMonDataLocation]:
; 0: partymon
; 1: enemymon
--- a/engine/menu/diploma.asm
+++ b/engine/menu/diploma.asm
@@ -1,4 +1,4 @@
-DisplayDiploma:
+DisplayDiploma::
call SaveScreenTilesToBuffer2
call GBPalWhiteOutWithDelay3
call ClearScreen
--- a/engine/menu/draw_start_menu.asm
+++ b/engine/menu/draw_start_menu.asm
@@ -1,5 +1,5 @@
; function that displays the start menu
-DrawStartMenu:
+DrawStartMenu::
CheckEvent EVENT_GOT_POKEDEX
; menu with pokedex
coord hl, 10, 0
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -312,7 +312,7 @@
call DelayFrames
; enter map after using a special warp or loading the game from the main menu
-SpecialEnterMap:
+SpecialEnterMap::
xor a
ld [hJoyPressed], a
ld [hJoyHeld], a
--- a/engine/menu/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
@@ -53,7 +53,7 @@
TX_FAR _DoYouWantToNicknameText
db "@"
-DisplayNameRaterScreen:
+DisplayNameRaterScreen::
ld hl, wBuffer
xor a
ld [wUpdateSpritesEnabled], a
--- a/engine/menu/party_menu.asm
+++ b/engine/menu/party_menu.asm
@@ -17,7 +17,7 @@
; f6: health returned
; f7: revitalized
; f8: leveled up
-DrawPartyMenu_:
+DrawPartyMenu_::
xor a
ld [H_AUTOBGTRANSFERENABLED], a
call ClearScreen
@@ -24,7 +24,7 @@
call UpdateSprites
callba LoadMonPartySpriteGfxWithLCDDisabled ; load pokemon icon graphics
-RedrawPartyMenu_:
+RedrawPartyMenu_::
ld a, [wPartyMenuTypeOrMessageID]
cp SWAP_MONS_PARTY_MENU
jp z, .printMessage
--- a/engine/menu/pc.asm
+++ b/engine/menu/pc.asm
@@ -1,4 +1,4 @@
-ActivatePC:
+ActivatePC::
call SaveScreenTilesToBuffer2
ld a, SFX_TURN_ON_PC
call PlaySound
@@ -115,7 +115,7 @@
db "@"
; removes one of the specified item ID [hItemToRemoveID] from bag (if existent)
-RemoveItemByID:
+RemoveItemByID::
ld hl, wBagItems
ld a, [hItemToRemoveID]
ld b, a
--- a/engine/menu/players_pc.asm
+++ b/engine/menu/players_pc.asm
@@ -1,4 +1,4 @@
-PlayerPC:
+PlayerPC::
ld hl, wd730
set 6, [hl]
ld a, ITEM_NAME
--- a/engine/menu/prize_menu.asm
+++ b/engine/menu/prize_menu.asm
@@ -1,4 +1,4 @@
-CeladonPrizeMenu:
+CeladonPrizeMenu::
ld b, COIN_CASE
call IsItemInBag
jr nz, .havingCoinCase
--- a/engine/menu/start_sub_menus.asm
+++ b/engine/menu/start_sub_menus.asm
@@ -1,4 +1,4 @@
-StartMenu_Pokedex:
+StartMenu_Pokedex::
predef ShowPokedexMenu
call LoadScreenTilesFromBuffer2 ; restore saved screen
call Delay3
@@ -6,7 +6,7 @@
call UpdateSprites
jp RedisplayStartMenu
-StartMenu_Pokemon:
+StartMenu_Pokemon::
ld a, [wPartyCount]
and a
jp z, RedisplayStartMenu
@@ -284,7 +284,7 @@
db "@"
; writes a blank tile to all possible menu cursor positions on the party menu
-ErasePartyMenuCursors:
+ErasePartyMenuCursors::
coord hl, 0, 1
ld bc, 2 * 20 ; menu cursor positions are 2 rows apart
ld a, 6 ; 6 menu cursor positions
@@ -299,7 +299,7 @@
call LoadScreenTilesFromBuffer2DisableBGTransfer ; restore saved screen
call RunDefaultPaletteCommand
-StartMenu_Item:
+StartMenu_Item::
ld a, [wLinkState]
dec a ; is the player in the Colosseum or Trade Centre?
jr nz, .notInCableClubRoom
@@ -450,7 +450,7 @@
INCLUDE "data/overworld_items.asm"
-StartMenu_TrainerInfo:
+StartMenu_TrainerInfo::
call GBPalWhiteOut
call ClearScreen
call UpdateSprites
@@ -638,7 +638,7 @@
jr nz, .loop
ret
-StartMenu_SaveReset:
+StartMenu_SaveReset::
ld a, [wd72e]
bit 6, a ; is the player using the link feature?
jp nz, Init
@@ -646,7 +646,7 @@
call LoadScreenTilesFromBuffer2 ; restore saved screen
jp HoldTextDisplayOpen
-StartMenu_Option:
+StartMenu_Option::
xor a
ld [H_AUTOBGTRANSFERENABLED], a
call ClearScreen
@@ -657,7 +657,7 @@
call UpdateSprites
jp RedisplayStartMenu
-SwitchPartyMon:
+SwitchPartyMon::
call SwitchPartyMon_InitVarOrSwapData ; swap data
ld a, [wSwappedMenuItem]
call SwitchPartyMon_ClearGfx
--- a/engine/menu/swap_items.asm
+++ b/engine/menu/swap_items.asm
@@ -1,4 +1,4 @@
-HandleItemListSwapping:
+HandleItemListSwapping::
ld a, [wListMenuID]
cp ITEMLISTMENU
jp nz, DisplayListMenuIDLoop ; only rearrange item list menus
--- a/engine/menu/text_box.asm
+++ b/engine/menu/text_box.asm
@@ -1,5 +1,5 @@
; function to draw various text boxes
-DisplayTextBoxID_:
+DisplayTextBoxID_::
ld a, [wTextBoxID]
cp TWO_OPTION_MENU
jp z, DisplayTwoOptionMenu
--- a/engine/menu/vending_machine.asm
+++ b/engine/menu/vending_machine.asm
@@ -1,4 +1,4 @@
-VendingMachineMenu:
+VendingMachineMenu::
ld hl, VendingMachineText1
call PrintText
ld a, MONEY_BOX
--- a/engine/mon_party_sprites.asm
+++ b/engine/mon_party_sprites.asm
@@ -9,7 +9,7 @@
; 0: green
; 1: yellow
; 2: red
-AnimatePartyMon:
+AnimatePartyMon::
ld hl, wPartyMenuHPBarColors
ld a, [wCurrentMenuItem]
ld c, a
--- a/engine/multiply_divide.asm
+++ b/engine/multiply_divide.asm
@@ -1,4 +1,4 @@
-_Multiply:
+_Multiply::
ld a, $8
ld b, a
xor a
@@ -59,7 +59,7 @@
ld [H_PRODUCT], a
ret
-_Divide:
+_Divide::
xor a
ld [H_DIVIDEBUFFER], a
ld [H_DIVIDEBUFFER+1], a
--- a/engine/oam_dma.asm
+++ b/engine/oam_dma.asm
@@ -1,4 +1,4 @@
-WriteDMACodeToHRAM:
+WriteDMACodeToHRAM::
; Since no other memory is available during OAM DMA,
; DMARoutine is copied to HRAM and executed there.
ld c, $ff80 % $100
--- a/engine/overworld/cable_club_npc.asm
+++ b/engine/overworld/cable_club_npc.asm
@@ -1,4 +1,4 @@
-CableClubNPC:
+CableClubNPC::
ld hl, CableClubNPCWelcomeText
call PrintText
CheckEvent EVENT_GOT_POKEDEX
--- a/engine/overworld/card_key.asm
+++ b/engine/overworld/card_key.asm
@@ -71,13 +71,13 @@
db SILPH_CO_11F
db $FF
-CardKeySuccessText:
+CardKeySuccessText::
TX_FAR _CardKeySuccessText1
TX_SFX_ITEM_1
TX_FAR _CardKeySuccessText2
db "@"
-CardKeyFailText:
+CardKeyFailText::
TX_FAR _CardKeyFailText
db "@"
--- a/engine/overworld/cinnabar_lab.asm
+++ b/engine/overworld/cinnabar_lab.asm
@@ -1,4 +1,4 @@
-GiveFossilToCinnabarLab:
+GiveFossilToCinnabarLab::
ld hl, wd730
set 6, [hl]
xor a
@@ -112,7 +112,7 @@
jr .loop
; loads the names of the fossil item and the resulting mon
-LoadFossilItemAndMonName:
+LoadFossilItemAndMonName::
ld a, [wFossilMon]
ld [wd11e], a
call GetMonName
--- a/engine/overworld/clear_variables.asm
+++ b/engine/overworld/clear_variables.asm
@@ -1,4 +1,4 @@
-ClearVariablesOnEnterMap:
+ClearVariablesOnEnterMap::
ld a, SCREEN_HEIGHT_PIXELS
ld [hWY], a
ld [rWY], a
--- a/engine/overworld/elevator.asm
+++ b/engine/overworld/elevator.asm
@@ -1,4 +1,4 @@
-ShakeElevator:
+ShakeElevator::
ld de, -$20
call ShakeElevatorRedrawRow
ld de, SCREEN_HEIGHT * $20
--- a/engine/overworld/hidden_items.asm
+++ b/engine/overworld/hidden_items.asm
@@ -20,7 +20,7 @@
INCLUDE "data/hidden_item_coords.asm"
-FoundHiddenItemText:
+FoundHiddenItemText::
TX_FAR _FoundHiddenItemText
TX_ASM
ld a, [wHiddenObjectFunctionArgument] ; item ID
@@ -45,7 +45,7 @@
call PrintText
jp TextScriptEnd
-HiddenItemBagFullText:
+HiddenItemBagFullText::
TX_FAR _HiddenItemBagFullText
db "@"
@@ -120,12 +120,12 @@
INCLUDE "data/hidden_coins.asm"
-FoundHiddenCoinsText:
+FoundHiddenCoinsText::
TX_FAR _FoundHiddenCoinsText
TX_SFX_ITEM_2
db "@"
-DroppedHiddenCoinsText:
+DroppedHiddenCoinsText::
TX_FAR _FoundHiddenCoins2Text
TX_SFX_ITEM_2
TX_FAR _DroppedHiddenCoinsText
--- a/engine/overworld/hidden_objects.asm
+++ b/engine/overworld/hidden_objects.asm
@@ -1,4 +1,4 @@
-IsPlayerOnDungeonWarp:
+IsPlayerOnDungeonWarp::
xor a
ld [wWhichDungeonWarp], a
ld a, [wd72d]
@@ -15,7 +15,7 @@
ret
; if a hidden object was found, stores $00 in [$ffee], else stores $ff
-CheckForHiddenObject:
+CheckForHiddenObject::
ld hl, $ffeb
xor a
ld [hli], a
--- a/engine/overworld/ledges.asm
+++ b/engine/overworld/ledges.asm
@@ -1,4 +1,4 @@
-HandleLedges:
+HandleLedges::
ld a, [wd736]
bit 6, a ; already jumping down ledge
ret nz
--- a/engine/overworld/map_sprite_functions1.asm
+++ b/engine/overworld/map_sprite_functions1.asm
@@ -1,4 +1,4 @@
-_UpdateSprites:
+_UpdateSprites::
ld h, $c1
inc h
ld a, $e ; wSpriteStateData2 + $0e
--- a/engine/overworld/map_sprites.asm
+++ b/engine/overworld/map_sprites.asm
@@ -8,7 +8,7 @@
; fields, respectively, within loops. The X is the loop index.
; If there is an inner loop, Y is the inner loop index, i.e. $C1Y* and $C2Y*
; denote fields of the sprite slots iterated over in the inner loop.
-InitMapSprites:
+InitMapSprites::
call InitOutsideMapSprites
ret c ; return if the map is an outside map (already handled by above call)
; if the map is an inside map (i.e. mapID >= $25)
--- a/engine/overworld/missable_objects.asm
+++ b/engine/overworld/missable_objects.asm
@@ -1,4 +1,4 @@
-MarkTownVisitedAndLoadMissableObjects:
+MarkTownVisitedAndLoadMissableObjects::
ld a, [wCurMap]
cp ROUTE_1
jr nc, .notInTown
--- a/engine/overworld/npc_movement.asm
+++ b/engine/overworld/npc_movement.asm
@@ -1,4 +1,4 @@
-PlayerStepOutFromDoor:
+PlayerStepOutFromDoor::
ld hl, wd730
res 1, [hl]
call IsPlayerStandingOnDoorTile
@@ -27,7 +27,7 @@
res 7, [hl]
ret
-_EndNPCMovementScript:
+_EndNPCMovementScript::
ld hl, wd730
res 7, [hl]
ld hl, wd72e
@@ -44,7 +44,7 @@
ld [wSimulatedJoypadStatesEnd], a
ret
-PalletMovementScriptPointerTable:
+PalletMovementScriptPointerTable::
dw PalletMovementScript_OakMoveLeft
dw PalletMovementScript_PlayerMoveLeft
dw PalletMovementScript_WaitAndWalkToLab
@@ -157,7 +157,7 @@
res 7, [hl]
jp EndNPCMovementScript
-PewterMuseumGuyMovementScriptPointerTable:
+PewterMuseumGuyMovementScriptPointerTable::
dw PewterMovementScript_WalkToMuseum
dw PewterMovementScript_Done
@@ -213,7 +213,7 @@
res 7, [hl]
jp EndNPCMovementScript
-PewterGymGuyMovementScriptPointerTable:
+PewterGymGuyMovementScriptPointerTable::
dw PewterMovementScript_WalkToGym
dw PewterMovementScript_Done
@@ -266,7 +266,7 @@
db NPC_MOVEMENT_RIGHT, $03
db $FF
-FreezeEnemyTrainerSprite:
+FreezeEnemyTrainerSprite::
ld a, [wCurMap]
cp POKEMON_TOWER_7F
ret z ; the Rockets on Pokemon Tower 7F leave after battling, so don't freeze them
--- a/engine/overworld/oam.asm
+++ b/engine/overworld/oam.asm
@@ -1,4 +1,4 @@
-PrepareOAMData:
+PrepareOAMData::
; Determine OAM data for currently visible
; sprites and write it to wOAMBuffer.
--- a/engine/overworld/player_animations.asm
+++ b/engine/overworld/player_animations.asm
@@ -1,4 +1,4 @@
-EnterMapAnim:
+EnterMapAnim::
call InitFacingDirectionList
ld a, $ec
ld [wSpriteStateData1 + 4], a ; player's sprite Y screen position
@@ -90,7 +90,7 @@
ld [hl], a ; wPlayerSpinWhileMovingUpOrDownAnimFrameDelay
jp PlayerSpinWhileMovingUpOrDown
-_LeaveMapAnim:
+_LeaveMapAnim::
call InitFacingDirectionList
call IsPlayerStandingOnWarpPadOrHole
ld a, b
@@ -347,7 +347,7 @@
inc a
ret
-IsPlayerStandingOnWarpPadOrHole:
+IsPlayerStandingOnWarpPadOrHole::
ld b, 0
ld hl, WarpPadAndHoleData
ld a, [wCurMapTileset]
@@ -496,7 +496,7 @@
db 3, BANK(RedFishingRodTiles)
dw vNPCSprites2 + $7d0
-_HandleMidJump:
+_HandleMidJump::
ld a, [wPlayerJumpingYScreenCoordsIndex]
ld c, a
inc a
--- a/engine/overworld/player_state.asm
+++ b/engine/overworld/player_state.asm
@@ -1,5 +1,5 @@
; only used for setting bit 2 of wd736 upon entering a new map
-IsPlayerStandingOnWarp:
+IsPlayerStandingOnWarp::
ld a, [wNumberOfWarps]
and a
ret z
@@ -31,7 +31,7 @@
jr nz, .loop
ret
-CheckForceBikeOrSurf:
+CheckForceBikeOrSurf::
ld hl, wd732
bit 5, [hl]
ret nz
@@ -84,7 +84,7 @@
INCLUDE "data/force_bike_surf.asm"
-IsPlayerFacingEdgeOfMap:
+IsPlayerFacingEdgeOfMap::
push hl
push de
push bc
@@ -150,7 +150,7 @@
scf
ret
-IsWarpTileInFrontOfPlayer:
+IsWarpTileInFrontOfPlayer::
push hl
push de
push bc
@@ -188,7 +188,7 @@
and a
jr IsWarpTileInFrontOfPlayer.done
-IsPlayerStandingOnDoorTileOrWarpTile:
+IsPlayerStandingOnDoorTileOrWarpTile::
push hl
push de
push bc
@@ -217,7 +217,7 @@
INCLUDE "data/warp_tile_ids.asm"
-PrintSafariZoneSteps:
+PrintSafariZoneSteps::
ld a, [wCurMap]
cp SAFARI_ZONE_EAST
ret c
--- a/engine/overworld/pokecenter.asm
+++ b/engine/overworld/pokecenter.asm
@@ -1,4 +1,4 @@
-DisplayPokemonCenterDialogue_:
+DisplayPokemonCenterDialogue_::
call SaveScreenTilesToBuffer1 ; save screen
ld hl, PokemonCenterWelcomeText
call PrintText
--- a/engine/overworld/pokemart.asm
+++ b/engine/overworld/pokemart.asm
@@ -1,4 +1,4 @@
-DisplayPokemartDialogue_:
+DisplayPokemartDialogue_::
ld a, [wListScrollOffset]
ld [wSavedListScrollOffset], a
call UpdateSprites
--- a/engine/overworld/push_boulder.asm
+++ b/engine/overworld/push_boulder.asm
@@ -1,4 +1,4 @@
-TryPushingBoulder:
+TryPushingBoulder::
ld a, [wd728]
bit 0, a ; using Strength?
ret z
@@ -82,7 +82,7 @@
PushBoulderRightMovementData:
db NPC_MOVEMENT_RIGHT,$FF
-DoBoulderDustAnimation:
+DoBoulderDustAnimation::
ld a, [wd730]
bit 0, a
ret nz
--- a/engine/overworld/saffron_guards.asm
+++ b/engine/overworld/saffron_guards.asm
@@ -1,4 +1,4 @@
-RemoveGuardDrink:
+RemoveGuardDrink::
ld hl, GuardDrinksList
.drinkLoop
ld a, [hli]
--- a/engine/overworld/ssanne.asm
+++ b/engine/overworld/ssanne.asm
@@ -68,7 +68,7 @@
db $FF,$01
dw AdjustOAMBlockXPos
-LoadSmokeTileFourTimes:
+LoadSmokeTileFourTimes::
ld hl, vChars1 + $7c0
ld c, $4
.loop
--- a/engine/overworld/trainers.asm
+++ b/engine/overworld/trainers.asm
@@ -1,4 +1,4 @@
-_GetSpritePosition1:
+_GetSpritePosition1::
ld hl, wSpriteStateData1
ld de, $4
ld a, [wSpriteIndex]
@@ -17,7 +17,7 @@
ld [$ffee], a
ret
-_GetSpritePosition2:
+_GetSpritePosition2::
ld hl, wSpriteStateData1
ld de, $4
ld a, [wSpriteIndex]
@@ -36,7 +36,7 @@
ld [wSavedSpriteMapX], a
ret
-_SetSpritePosition1:
+_SetSpritePosition1::
ld hl, wSpriteStateData1
ld de, $4
ld a, [wSpriteIndex]
@@ -55,7 +55,7 @@
ld [hl], a
ret
-_SetSpritePosition2:
+_SetSpritePosition2::
ld hl, wSpriteStateData1
ld de, 4
ld a, [wSpriteIndex]
@@ -74,7 +74,7 @@
ld [hl], a ; c2x5 (map X pos)
ret
-TrainerWalkUpToPlayer:
+TrainerWalkUpToPlayer::
ld a, [wSpriteIndex]
swap a
ld [wTrainerSpriteOffset], a
--- a/engine/overworld/wild_mons.asm
+++ b/engine/overworld/wild_mons.asm
@@ -1,4 +1,4 @@
-LoadWildData:
+LoadWildData::
ld hl, WildDataPointers
ld a, [wCurMap]
--- a/engine/play_time.asm
+++ b/engine/play_time.asm
@@ -1,4 +1,4 @@
-TrackPlayTime:
+TrackPlayTime::
call CountDownIgnoreInputBitReset
ld a, [wd732]
bit 0, a
--- a/engine/predefs.asm
+++ b/engine/predefs.asm
@@ -1,4 +1,4 @@
-GetPredefPointer:
+GetPredefPointer::
; Store the contents of the register
; pairs (hl, de, bc) at wPredefRegisters.
; Then put the bank and address of predef
--- a/engine/print_waiting_text.asm
+++ b/engine/print_waiting_text.asm
@@ -1,4 +1,4 @@
-PrintWaitingText:
+PrintWaitingText::
coord hl, 3, 10
ld b, $1
ld c, $b
--- a/engine/remove_pokemon.asm
+++ b/engine/remove_pokemon.asm
@@ -1,4 +1,4 @@
-_RemovePokemon:
+_RemovePokemon::
ld hl, wPartyCount
ld a, [wRemoveMonFromBox]
and a
--- a/engine/save.asm
+++ b/engine/save.asm
@@ -271,7 +271,7 @@
ld [MBC1SRamEnable], a
ret
-SaveSAVtoSRAM:
+SaveSAVtoSRAM::
ld a, $2
ld [wSaveFileStatus], a
call SaveSAVtoSRAM0
--- a/engine/special_warps.asm
+++ b/engine/special_warps.asm
@@ -1,4 +1,4 @@
-SpecialWarpIn:
+SpecialWarpIn::
call LoadSpecialWarpData
predef LoadTilesetHeader
ld hl, wd732
--- a/engine/status_ailments.asm
+++ b/engine/status_ailments.asm
@@ -1,4 +1,4 @@
-PrintStatusAilment:
+PrintStatusAilment::
ld a, [de]
bit PSN, a
jr nz, .psn
--- a/engine/subtract_paid_money.asm
+++ b/engine/subtract_paid_money.asm
@@ -1,6 +1,6 @@
; subtracts the amount the player paid from their money
; OUTPUT: carry = 0(success) or 1(fail because there is not enough money)
-SubtractAmountPaidFromMoney_:
+SubtractAmountPaidFromMoney_::
ld de, wPlayerMoney
ld hl, hMoney ; total price of items
ld c, 3 ; length of money in bytes
--- a/engine/titlescreen.asm
+++ b/engine/titlescreen.asm
@@ -3,7 +3,7 @@
ld bc, NAME_LENGTH
jp CopyData
-SetDefaultNamesBeforeTitlescreen:
+SetDefaultNamesBeforeTitlescreen::
ld hl, NintenText
ld de, wPlayerName
call CopyFixedLengthText
--- a/engine/town_map.asm
+++ b/engine/town_map.asm
@@ -134,7 +134,7 @@
MonsNestText:
db "'s NEST@"
-LoadTownMap_Fly:
+LoadTownMap_Fly::
call ClearSprites
call LoadTownMap
call LoadPlayerSpriteGraphics
@@ -590,7 +590,7 @@
INCBIN "gfx/mon_nest_icon.1bpp"
MonNestIconEnd:
-TownMapSpriteBlinkingAnimation:
+TownMapSpriteBlinkingAnimation::
ld a, [wAnimCounter]
inc a
cp 25
--- a/engine/turn_sprite.asm
+++ b/engine/turn_sprite.asm
@@ -1,4 +1,4 @@
-UpdateSpriteFacingOffsetAndDelayMovement:
+UpdateSpriteFacingOffsetAndDelayMovement::
ld h, $c2
ld a, [H_CURRENTSPRITEOFFSET]
add $8
--- a/home.asm
+++ b/home.asm
@@ -1,3 +1,6 @@
+INCLUDE "constants.asm"
+
+
; The rst vectors are unused.
SECTION "rst 00", ROM0
rst $38
@@ -492,7 +495,7 @@
and a
ret
-PrintStatusConditionNotFainted:
+PrintStatusConditionNotFainted::
ld a, [H_LOADEDROMBANK]
push af
ld a, BANK(PrintStatusAilment)
--- a/home/init.asm
+++ b/home/init.asm
@@ -118,7 +118,7 @@
jp SetDefaultNamesBeforeTitlescreen
-ClearVram:
+ClearVram::
ld hl, $8000
ld bc, $2000
xor a
--- /dev/null
+++ b/layout.link
@@ -1,0 +1,305 @@
+ROM0
+ org $0000
+ "rst 00"
+
+ org $0008
+ "rst 08"
+
+ org $0010
+ "rst 10"
+
+ org $0018
+ "rst 18"
+
+ org $0020
+ "rst 20"
+
+ org $0028
+ "rst 28"
+
+ org $0030
+ "rst 30"
+
+ org $0038
+ "rst 38"
+
+ org $0040
+ "vblank"
+
+ org $0048
+ "hblank"
+
+ org $0050
+ "timer"
+
+ org $0058
+ "serial"
+
+ org $0060
+ "joypad"
+ ; $0061
+ "Home"
+
+ org $100
+ "Entry"
+ ; $0104
+ "Header"
+
+ org $150
+ "Main"
+
+ROMX $1
+ org $4000
+ "bank1"
+
+ROMX $2
+ org $4000
+ "Sound Effect Headers 1"
+ "Music Headers 1"
+ "Sound Effects 1"
+ "Audio Engine 1"
+ "Music 1"
+
+ROMX $3
+ org $4000
+ "bank3"
+
+ROMX $4
+ org $4000
+ "NPC Sprites 1"
+ "Graphics (BANK 4)"
+ "Battle (BANK 4)"
+
+ROMX $5
+ org $4000
+ "NPC Sprites 2"
+ "Battle (BANK 5)"
+
+ROMX $6
+ org $4000
+ "Maps 1"
+ "bank6_1"
+ "Maps 2"
+ "bank6_2"
+
+ROMX $7
+ org $4000
+ "Maps 3"
+ "bank7_1"
+ "Maps 4"
+ "bank7_2"
+
+ROMX $8
+ org $4000
+ "Sound Effect Headers 2"
+ "Music Headers 2"
+ "Sound Effects 2"
+ "Audio Engine 2"
+ "Music 2"
+
+ROMX $9
+ org $4000
+ "Pics 1"
+ "Battle (BANK 9)"
+
+ROMX $A
+ org $4000
+ "Pics 2"
+ "Battle (BANK A)"
+
+ROMX $B
+ org $4000
+ "Pics 3"
+ "Battle (BANK B)"
+
+ROMX $C
+ org $4000
+ "Pics 4"
+ "Battle (BANK C)"
+
+ROMX $D
+ org $4000
+ "Pics 5"
+ "Battle (BANK D)"
+
+ROMX $E
+ org $4000
+ "bankE"
+
+ROMX $F
+ org $4000
+ "bankF"
+
+ROMX $10
+ org $4000
+ "bank10"
+
+ROMX $11
+ org $4000
+ "Maps 5"
+ "bank11_1"
+ "Maps 6"
+ "bank11_2"
+
+ROMX $12
+ org $4000
+ "Maps 7"
+ "bank12"
+ "Maps 8"
+
+ROMX $13
+ org $4000
+ "Pics 6"
+ "Maps 9"
+ "bank13"
+
+ROMX $14
+ org $4000
+ "Maps 10"
+ "bank14"
+
+ROMX $15
+ org $4000
+ "Maps 11"
+ "bank15_1"
+ "Maps 12"
+ "bank15_2"
+
+ROMX $16
+ org $4000
+ "Maps 13"
+ "bank16_1"
+ "Maps 14"
+ "bank16_2"
+
+ROMX $17
+ org $4000
+ "Maps 15"
+ "bank17_1"
+ "Maps 16"
+ "bank17_2"
+
+ROMX $18
+ org $4000
+ "Maps 17"
+ "bank18_1"
+ "Maps 18"
+ "bank18_2"
+
+ROMX $19
+ org $4000
+ "Tilesets 1"
+
+ROMX $1A
+ org $4000
+ "bank1A"
+ "Tilesets 2"
+
+ROMX $1B
+ org $4000
+ "Tilesets 3"
+
+ROMX $1C
+ org $4000
+ "bank1C"
+
+ROMX $1D
+ org $4000
+ "Maps 19"
+ "bank1D_1"
+ "Maps 20"
+ "bank1D_2"
+ "Maps 21"
+ "bank1D_3"
+
+ROMX $1E
+ org $4000
+ "bank1E"
+
+ROMX $1F
+ org $4000
+ "Sound Effect Headers 3"
+ "Music Headers 3"
+ "Sound Effects 3"
+ "Audio Engine 3"
+ "Music 3"
+
+ROMX $20
+ org $4000
+ "Text 1"
+
+ROMX $21
+ org $4000
+ "Text 2"
+
+ROMX $22
+ org $4000
+ "Text 3"
+
+ROMX $23
+ org $4000
+ "Text 4"
+
+ROMX $24
+ org $4000
+ "Text 5"
+
+ROMX $25
+ org $4000
+ "Text 6"
+
+ROMX $26
+ org $4000
+ "Text 7"
+
+ROMX $27
+ org $4000
+ "Text 8"
+
+ROMX $28
+ org $4000
+ "Text 9"
+
+ROMX $29
+ org $4000
+ "Text 10"
+
+ROMX $2A
+ org $4000
+ "Text 11"
+
+ROMX $2B
+ org $4000
+ "Pokedex Text"
+
+ROMX $2C
+ org $4000
+ "Move Names"
+
+WRAM0
+ org $c000
+ "WRAM Bank 0"
+
+ org $c100
+ "Sprite State Data"
+ "OAM Buffer"
+
+ org $dfff
+ "Stack"
+
+SRAM 0
+ org $a000
+ "Sprite Buffers"
+
+SRAM 1
+ org $a000
+ "Save Data"
+
+SRAM 2
+ org $a000
+ "Saved Boxes 1"
+
+SRAM 3
+ org $a000
+ "Saved Boxes 2"
+
--- a/main.asm
+++ b/main.asm
@@ -1,23 +1,9 @@
INCLUDE "constants.asm"
-NPC_SPRITES_1 EQU $4
-NPC_SPRITES_2 EQU $5
-GFX EQU $4
-
-PICS_1 EQU $9
-PICS_2 EQU $A
-PICS_3 EQU $B
-PICS_4 EQU $C
-PICS_5 EQU $D
-
-INCLUDE "home.asm"
-
-
SECTION "bank1", ROMX
INCLUDE "data/facing.asm"
-
INCLUDE "engine/black_out.asm"
MewPicFront:: INCBIN "pic/bmon/mew.pic"
@@ -25,65 +11,38 @@
INCLUDE "data/baseStats/mew.asm"
INCLUDE "engine/battle/safari_zone.asm"
-
INCLUDE "engine/titlescreen.asm"
INCLUDE "engine/load_mon_data.asm"
-
INCLUDE "data/item_prices.asm"
INCLUDE "text/item_names.asm"
INCLUDE "text/unused_names.asm"
-
INCLUDE "engine/overworld/oam.asm"
INCLUDE "engine/oam_dma.asm"
-
INCLUDE "engine/print_waiting_text.asm"
-
INCLUDE "engine/overworld/map_sprite_functions1.asm"
-
INCLUDE "engine/test_battle.asm"
-
INCLUDE "engine/overworld/item.asm"
INCLUDE "engine/overworld/movement.asm"
-
INCLUDE "engine/cable_club.asm"
-
INCLUDE "engine/menu/main_menu.asm"
-
INCLUDE "engine/oak_speech.asm"
-
INCLUDE "engine/special_warps.asm"
-
INCLUDE "engine/debug1.asm"
-
INCLUDE "engine/menu/naming_screen.asm"
-
INCLUDE "engine/oak_speech2.asm"
-
INCLUDE "engine/subtract_paid_money.asm"
-
INCLUDE "engine/menu/swap_items.asm"
-
INCLUDE "engine/overworld/pokemart.asm"
-
INCLUDE "engine/learn_move.asm"
-
INCLUDE "engine/overworld/pokecenter.asm"
-
INCLUDE "engine/overworld/set_blackout_map.asm"
-
INCLUDE "engine/display_text_id_init.asm"
INCLUDE "engine/menu/draw_start_menu.asm"
-
INCLUDE "engine/overworld/cable_club_npc.asm"
-
INCLUDE "engine/menu/text_box.asm"
-
INCLUDE "engine/battle/moveEffects/drain_hp_effect.asm"
-
INCLUDE "engine/menu/players_pc.asm"
-
INCLUDE "engine/remove_pokemon.asm"
-
INCLUDE "engine/display_pokedex.asm"
@@ -90,34 +49,23 @@
SECTION "bank3", ROMX
INCLUDE "engine/joypad.asm"
-
INCLUDE "data/map_songs.asm"
-
INCLUDE "data/map_header_banks.asm"
-
INCLUDE "engine/overworld/clear_variables.asm"
INCLUDE "engine/overworld/player_state.asm"
INCLUDE "engine/overworld/poison.asm"
INCLUDE "engine/overworld/tileset_header.asm"
INCLUDE "engine/overworld/daycare_exp.asm"
-
INCLUDE "data/hide_show_data.asm"
-
INCLUDE "engine/overworld/field_move_messages.asm"
-
INCLUDE "engine/items/inventory.asm"
-
INCLUDE "engine/overworld/wild_mons.asm"
-
INCLUDE "engine/items/items.asm"
-
INCLUDE "engine/menu/draw_badges.asm"
-
INCLUDE "engine/overworld/update_map.asm"
INCLUDE "engine/overworld/cut.asm"
INCLUDE "engine/overworld/missable_objects.asm"
INCLUDE "engine/overworld/push_boulder.asm"
-
INCLUDE "engine/add_mon.asm"
INCLUDE "engine/flag_action.asm"
INCLUDE "engine/heal_party.asm"
@@ -129,45 +77,14 @@
INCLUDE "engine/hidden_object_functions3.asm"
-SECTION "NPC Sprites 1", ROMX ; BANK $04
-
-OakAideSprite: INCBIN "gfx/sprites/oak_aide.2bpp"
-RockerSprite: INCBIN "gfx/sprites/rocker.2bpp"
-SwimmerSprite: INCBIN "gfx/sprites/swimmer.2bpp"
-WhitePlayerSprite: INCBIN "gfx/sprites/white_player.2bpp"
-GymHelperSprite: INCBIN "gfx/sprites/gym_helper.2bpp"
-OldPersonSprite: INCBIN "gfx/sprites/old_person.2bpp"
-MartGuySprite: INCBIN "gfx/sprites/mart_guy.2bpp"
-FisherSprite: INCBIN "gfx/sprites/fisher.2bpp"
-OldMediumWomanSprite: INCBIN "gfx/sprites/old_medium_woman.2bpp"
-NurseSprite: INCBIN "gfx/sprites/nurse.2bpp"
-CableClubWomanSprite: INCBIN "gfx/sprites/cable_club_woman.2bpp"
-MrMasterballSprite: INCBIN "gfx/sprites/mr_masterball.2bpp"
-LaprasGiverSprite: INCBIN "gfx/sprites/lapras_giver.2bpp"
-WardenSprite: INCBIN "gfx/sprites/warden.2bpp"
-SsCaptainSprite: INCBIN "gfx/sprites/ss_captain.2bpp"
-Fisher2Sprite: INCBIN "gfx/sprites/fisher2.2bpp"
-BlackbeltSprite: INCBIN "gfx/sprites/blackbelt.2bpp"
-GuardSprite: INCBIN "gfx/sprites/guard.2bpp"
-BallSprite: INCBIN "gfx/sprites/ball.2bpp"
-OmanyteSprite: INCBIN "gfx/sprites/omanyte.2bpp"
-BoulderSprite: INCBIN "gfx/sprites/boulder.2bpp"
-PaperSheetSprite: INCBIN "gfx/sprites/paper_sheet.2bpp"
-BookMapDexSprite: INCBIN "gfx/sprites/book_map_dex.2bpp"
-ClipboardSprite: INCBIN "gfx/sprites/clipboard.2bpp"
-SnorlaxSprite: INCBIN "gfx/sprites/snorlax.2bpp"
-OldAmberSprite: INCBIN "gfx/sprites/old_amber.2bpp"
-LyingOldManSprite: INCBIN "gfx/sprites/lying_old_man.2bpp"
-
-
SECTION "Graphics (BANK 4)", ROMX
PokemonLogoGraphics: INCBIN "gfx/pokemon_logo.2bpp"
-FontGraphics: INCBIN "gfx/font.1bpp"
-FontGraphicsEnd:
+FontGraphics:: INCBIN "gfx/font.1bpp"
+FontGraphicsEnd::
ABTiles: INCBIN "gfx/AB.2bpp"
-HpBarAndStatusGraphics: INCBIN "gfx/hp_bar_and_status.2bpp"
-HpBarAndStatusGraphicsEnd:
+HpBarAndStatusGraphics:: INCBIN "gfx/hp_bar_and_status.2bpp"
+HpBarAndStatusGraphicsEnd::
BattleHudTiles1: INCBIN "gfx/battle_hud1.1bpp"
BattleHudTiles1End:
BattleHudTiles2: INCBIN "gfx/battle_hud2.1bpp"
@@ -176,8 +93,8 @@
NintendoCopyrightLogoGraphics: INCBIN "gfx/copyright.2bpp"
GamefreakLogoGraphics: INCBIN "gfx/gamefreak.2bpp"
GamefreakLogoGraphicsEnd:
-TextBoxGraphics: INCBIN "gfx/text_box.2bpp"
-TextBoxGraphicsEnd:
+TextBoxGraphics:: INCBIN "gfx/text_box.2bpp"
+TextBoxGraphicsEnd::
PokedexTileGraphics: INCBIN "gfx/pokedex.2bpp"
PokedexTileGraphicsEnd:
WorldMapTileGraphics: INCBIN "gfx/town_map.2bpp"
@@ -208,50 +125,6 @@
INCLUDE "engine/random.asm"
-SECTION "NPC Sprites 2", ROMX ; BANK $05
-
-RedCyclingSprite: INCBIN "gfx/sprites/cycling.2bpp"
-RedSprite: INCBIN "gfx/sprites/red.2bpp"
-BlueSprite: INCBIN "gfx/sprites/blue.2bpp"
-OakSprite: INCBIN "gfx/sprites/oak.2bpp"
-BugCatcherSprite: INCBIN "gfx/sprites/bug_catcher.2bpp"
-SlowbroSprite: INCBIN "gfx/sprites/slowbro.2bpp"
-LassSprite: INCBIN "gfx/sprites/lass.2bpp"
-BlackHairBoy1Sprite: INCBIN "gfx/sprites/black_hair_boy_1.2bpp"
-LittleGirlSprite: INCBIN "gfx/sprites/little_girl.2bpp"
-BirdSprite: INCBIN "gfx/sprites/bird.2bpp"
-FatBaldGuySprite: INCBIN "gfx/sprites/fat_bald_guy.2bpp"
-GamblerSprite: INCBIN "gfx/sprites/gambler.2bpp"
-BlackHairBoy2Sprite: INCBIN "gfx/sprites/black_hair_boy_2.2bpp"
-GirlSprite: INCBIN "gfx/sprites/girl.2bpp"
-HikerSprite: INCBIN "gfx/sprites/hiker.2bpp"
-FoulardWomanSprite: INCBIN "gfx/sprites/foulard_woman.2bpp"
-GentlemanSprite: INCBIN "gfx/sprites/gentleman.2bpp"
-DaisySprite: INCBIN "gfx/sprites/daisy.2bpp"
-BikerSprite: INCBIN "gfx/sprites/biker.2bpp"
-SailorSprite: INCBIN "gfx/sprites/sailor.2bpp"
-CookSprite: INCBIN "gfx/sprites/cook.2bpp"
-BikeShopGuySprite: INCBIN "gfx/sprites/bike_shop_guy.2bpp"
-MrFujiSprite: INCBIN "gfx/sprites/mr_fuji.2bpp"
-GiovanniSprite: INCBIN "gfx/sprites/giovanni.2bpp"
-RocketSprite: INCBIN "gfx/sprites/rocket.2bpp"
-MediumSprite: INCBIN "gfx/sprites/medium.2bpp"
-WaiterSprite: INCBIN "gfx/sprites/waiter.2bpp"
-ErikaSprite: INCBIN "gfx/sprites/erika.2bpp"
-MomGeishaSprite: INCBIN "gfx/sprites/mom_geisha.2bpp"
-BrunetteGirlSprite: INCBIN "gfx/sprites/brunette_girl.2bpp"
-LanceSprite: INCBIN "gfx/sprites/lance.2bpp"
-MomSprite: INCBIN "gfx/sprites/mom.2bpp"
-BaldingGuySprite: INCBIN "gfx/sprites/balding_guy.2bpp"
-YoungBoySprite: INCBIN "gfx/sprites/young_boy.2bpp"
-GameboyKidSprite: INCBIN "gfx/sprites/gameboy_kid.2bpp"
-ClefairySprite: INCBIN "gfx/sprites/clefairy.2bpp"
-AgathaSprite: INCBIN "gfx/sprites/agatha.2bpp"
-BrunoSprite: INCBIN "gfx/sprites/bruno.2bpp"
-LoreleiSprite: INCBIN "gfx/sprites/lorelei.2bpp"
-SeelSprite: INCBIN "gfx/sprites/seel.2bpp"
-
-
SECTION "Battle (BANK 5)", ROMX
INCLUDE "engine/load_pokedex_tiles.asm"
@@ -262,326 +135,31 @@
INCLUDE "engine/menu/pc.asm"
-SECTION "bank6", ROMX
+SECTION "bank6_1", ROMX
-INCLUDE "data/mapHeaders/CeladonCity.asm"
-INCLUDE "data/mapObjects/CeladonCity.asm"
-CeladonCity_Blocks: INCBIN "maps/CeladonCity.blk"
-
-INCLUDE "data/mapHeaders/PalletTown.asm"
-INCLUDE "data/mapObjects/PalletTown.asm"
-PalletTown_Blocks: INCBIN "maps/PalletTown.blk"
-
-INCLUDE "data/mapHeaders/ViridianCity.asm"
-INCLUDE "data/mapObjects/ViridianCity.asm"
-ViridianCity_Blocks: INCBIN "maps/ViridianCity.blk"
-
-INCLUDE "data/mapHeaders/PewterCity.asm"
- ds 1
-INCLUDE "data/mapObjects/PewterCity.asm"
-PewterCity_Blocks: INCBIN "maps/PewterCity.blk"
-
-INCLUDE "data/mapHeaders/CeruleanCity.asm"
-INCLUDE "data/mapObjects/CeruleanCity.asm"
-CeruleanCity_Blocks: INCBIN "maps/CeruleanCity.blk"
-
-INCLUDE "data/mapHeaders/VermilionCity.asm"
-INCLUDE "data/mapObjects/VermilionCity.asm"
-VermilionCity_Blocks: INCBIN "maps/VermilionCity.blk"
-
-INCLUDE "data/mapHeaders/FuchsiaCity.asm"
-INCLUDE "data/mapObjects/FuchsiaCity.asm"
-FuchsiaCity_Blocks: INCBIN "maps/FuchsiaCity.blk"
-
INCLUDE "engine/play_time.asm"
-INCLUDE "scripts/PalletTown.asm"
-INCLUDE "scripts/ViridianCity.asm"
-INCLUDE "scripts/PewterCity.asm"
-INCLUDE "scripts/CeruleanCity.asm"
-INCLUDE "scripts/VermilionCity.asm"
-INCLUDE "scripts/CeladonCity.asm"
-INCLUDE "scripts/FuchsiaCity.asm"
-INCLUDE "data/mapHeaders/BluesHouse.asm"
-INCLUDE "scripts/BluesHouse.asm"
-INCLUDE "data/mapObjects/BluesHouse.asm"
-BluesHouse_Blocks: INCBIN "maps/BluesHouse.blk"
+SECTION "bank6_2", ROMX
-INCLUDE "data/mapHeaders/VermilionTradeHouse.asm"
-INCLUDE "scripts/VermilionTradeHouse.asm"
-INCLUDE "data/mapObjects/VermilionTradeHouse.asm"
-VermilionTradeHouse_Blocks: INCBIN "maps/VermilionTradeHouse.blk"
-
-INCLUDE "data/mapHeaders/IndigoPlateauLobby.asm"
-INCLUDE "scripts/IndigoPlateauLobby.asm"
-INCLUDE "data/mapObjects/IndigoPlateauLobby.asm"
-IndigoPlateauLobby_Blocks: INCBIN "maps/IndigoPlateauLobby.blk"
-
-INCLUDE "data/mapHeaders/SilphCo4F.asm"
-INCLUDE "scripts/SilphCo4F.asm"
-INCLUDE "data/mapObjects/SilphCo4F.asm"
-SilphCo4F_Blocks: INCBIN "maps/SilphCo4F.blk"
-
-INCLUDE "data/mapHeaders/SilphCo5F.asm"
-INCLUDE "scripts/SilphCo5F.asm"
-INCLUDE "data/mapObjects/SilphCo5F.asm"
-SilphCo5F_Blocks: INCBIN "maps/SilphCo5F.blk"
-
-INCLUDE "data/mapHeaders/SilphCo6F.asm"
-INCLUDE "scripts/SilphCo6F.asm"
-INCLUDE "data/mapObjects/SilphCo6F.asm"
-SilphCo6F_Blocks: INCBIN "maps/SilphCo6F.blk"
-
INCLUDE "engine/overworld/npc_movement.asm"
INCLUDE "engine/overworld/doors.asm"
INCLUDE "engine/overworld/ledges.asm"
-SECTION "bank7", ROMX
+SECTION "bank7_1", ROMX
-INCLUDE "data/mapHeaders/CinnabarIsland.asm"
-INCLUDE "data/mapObjects/CinnabarIsland.asm"
-CinnabarIsland_Blocks: INCBIN "maps/CinnabarIsland.blk"
-
-INCLUDE "data/mapHeaders/Route1.asm"
-INCLUDE "data/mapObjects/Route1.asm"
-Route1_Blocks: INCBIN "maps/Route1.blk"
-
-UndergroundPathRoute8_Blocks: INCBIN "maps/UndergroundPathRoute8.blk"
-
-OaksLab_Blocks: INCBIN "maps/OaksLab.blk"
-
-MrPsychicsHouse_Blocks:
-NameRatersHouse_Blocks:
-MrFujisHouse_Blocks:
-Route16FlyHouse_Blocks:
-Route2TradeHouse_Blocks:
-SaffronPidgeyHouse_Blocks:
-VermilionPidgeyHouse_Blocks:
-LavenderCuboneHouse_Blocks:
-CeruleanTradeHouse_Blocks:
-PewterNidoranHouse_Blocks:
-PewterSpeechHouse_Blocks:
-ViridianNicknameHouse_Blocks: INCBIN "maps/ViridianNicknameHouse.blk"
-
-CeladonMansionRoofHouse_Blocks:
-ViridianSchoolHouse_Blocks: INCBIN "maps/ViridianSchoolHouse.blk"
-
-CeruleanTrashedHouse_Blocks: INCBIN "maps/CeruleanTrashedHouse.blk"
-
-DiglettsCaveRoute11_Blocks:
-DiglettsCaveRoute2_Blocks: INCBIN "maps/DiglettsCaveRoute2.blk"
-
INCLUDE "text/monster_names.asm"
-
INCLUDE "engine/clear_save.asm"
-
INCLUDE "engine/predefs7.asm"
-INCLUDE "scripts/CinnabarIsland.asm"
-INCLUDE "scripts/Route1.asm"
+SECTION "bank7_2", ROMX
-INCLUDE "data/mapHeaders/OaksLab.asm"
-INCLUDE "scripts/OaksLab.asm"
-INCLUDE "data/mapObjects/OaksLab.asm"
-
-INCLUDE "data/mapHeaders/ViridianMart.asm"
-INCLUDE "scripts/ViridianMart.asm"
-INCLUDE "data/mapObjects/ViridianMart.asm"
-ViridianMart_Blocks: INCBIN "maps/ViridianMart.blk"
-
-INCLUDE "data/mapHeaders/ViridianSchoolHouse.asm"
-INCLUDE "scripts/ViridianSchoolHouse.asm"
-INCLUDE "data/mapObjects/ViridianSchoolHouse.asm"
-
-INCLUDE "data/mapHeaders/ViridianNicknameHouse.asm"
- ds 1
-INCLUDE "scripts/ViridianNicknameHouse.asm"
-INCLUDE "data/mapObjects/ViridianNicknameHouse.asm"
-
-INCLUDE "data/mapHeaders/PewterNidoranHouse.asm"
-INCLUDE "scripts/PewterNidoranHouse.asm"
-INCLUDE "data/mapObjects/PewterNidoranHouse.asm"
-
-INCLUDE "data/mapHeaders/PewterSpeechHouse.asm"
-INCLUDE "scripts/PewterSpeechHouse.asm"
-INCLUDE "data/mapObjects/PewterSpeechHouse.asm"
-
-INCLUDE "data/mapHeaders/CeruleanTrashedHouse.asm"
-INCLUDE "scripts/CeruleanTrashedHouse.asm"
-INCLUDE "data/mapObjects/CeruleanTrashedHouse.asm"
-
-INCLUDE "data/mapHeaders/CeruleanTradeHouse.asm"
-INCLUDE "scripts/CeruleanTradeHouse.asm"
-INCLUDE "data/mapObjects/CeruleanTradeHouse.asm"
-
-INCLUDE "data/mapHeaders/BikeShop.asm"
-INCLUDE "scripts/BikeShop.asm"
-INCLUDE "data/mapObjects/BikeShop.asm"
-BikeShop_Blocks: INCBIN "maps/BikeShop.blk"
-
-INCLUDE "data/mapHeaders/MrFujisHouse.asm"
-INCLUDE "scripts/MrFujisHouse.asm"
-INCLUDE "data/mapObjects/MrFujisHouse.asm"
-
-INCLUDE "data/mapHeaders/LavenderCuboneHouse.asm"
-INCLUDE "scripts/LavenderCuboneHouse.asm"
-INCLUDE "data/mapObjects/LavenderCuboneHouse.asm"
-
-INCLUDE "data/mapHeaders/NameRatersHouse.asm"
-INCLUDE "scripts/NameRatersHouse.asm"
-INCLUDE "data/mapObjects/NameRatersHouse.asm"
-
-INCLUDE "data/mapHeaders/VermilionPidgeyHouse.asm"
-INCLUDE "scripts/VermilionPidgeyHouse.asm"
-INCLUDE "data/mapObjects/VermilionPidgeyHouse.asm"
-
-INCLUDE "data/mapHeaders/VermilionDock.asm"
-INCLUDE "scripts/VermilionDock.asm"
-INCLUDE "data/mapObjects/VermilionDock.asm"
-VermilionDock_Blocks: INCBIN "maps/VermilionDock.blk"
-
-INCLUDE "data/mapHeaders/CeladonMansionRoofHouse.asm"
-INCLUDE "scripts/CeladonMansionRoofHouse.asm"
-INCLUDE "data/mapObjects/CeladonMansionRoofHouse.asm"
-
-INCLUDE "data/mapHeaders/FuchsiaMart.asm"
-INCLUDE "scripts/FuchsiaMart.asm"
-INCLUDE "data/mapObjects/FuchsiaMart.asm"
-FuchsiaMart_Blocks: INCBIN "maps/FuchsiaMart.blk"
-
-INCLUDE "data/mapHeaders/SaffronPidgeyHouse.asm"
-INCLUDE "scripts/SaffronPidgeyHouse.asm"
-INCLUDE "data/mapObjects/SaffronPidgeyHouse.asm"
-
-INCLUDE "data/mapHeaders/MrPsychicsHouse.asm"
-INCLUDE "scripts/MrPsychicsHouse.asm"
-INCLUDE "data/mapObjects/MrPsychicsHouse.asm"
-
-INCLUDE "data/mapHeaders/DiglettsCaveRoute2.asm"
-INCLUDE "scripts/DiglettsCaveRoute2.asm"
-INCLUDE "data/mapObjects/DiglettsCaveRoute2.asm"
-
-INCLUDE "data/mapHeaders/Route2TradeHouse.asm"
-INCLUDE "scripts/Route2TradeHouse.asm"
-INCLUDE "data/mapObjects/Route2TradeHouse.asm"
-
-INCLUDE "data/mapHeaders/Route5Gate.asm"
-INCLUDE "scripts/Route5Gate.asm"
-INCLUDE "data/mapObjects/Route5Gate.asm"
-Route5Gate_Blocks: INCBIN "maps/Route5Gate.blk"
-
-INCLUDE "data/mapHeaders/Route6Gate.asm"
-INCLUDE "scripts/Route6Gate.asm"
-INCLUDE "data/mapObjects/Route6Gate.asm"
-Route6Gate_Blocks: INCBIN "maps/Route6Gate.blk"
-
-INCLUDE "data/mapHeaders/Route7Gate.asm"
-INCLUDE "scripts/Route7Gate.asm"
-INCLUDE "data/mapObjects/Route7Gate.asm"
-Route7Gate_Blocks: INCBIN "maps/Route7Gate.blk"
-
-INCLUDE "data/mapHeaders/Route8Gate.asm"
-INCLUDE "scripts/Route8Gate.asm"
-INCLUDE "data/mapObjects/Route8Gate.asm"
-Route8Gate_Blocks: INCBIN "maps/Route8Gate.blk"
-
-INCLUDE "data/mapHeaders/UndergroundPathRoute8.asm"
-INCLUDE "scripts/UndergroundPathRoute8.asm"
-INCLUDE "data/mapObjects/UndergroundPathRoute8.asm"
-
-INCLUDE "data/mapHeaders/PowerPlant.asm"
-INCLUDE "scripts/PowerPlant.asm"
-INCLUDE "data/mapObjects/PowerPlant.asm"
-PowerPlant_Blocks: INCBIN "maps/PowerPlant.blk"
-
-INCLUDE "data/mapHeaders/DiglettsCaveRoute11.asm"
-INCLUDE "scripts/DiglettsCaveRoute11.asm"
-INCLUDE "data/mapObjects/DiglettsCaveRoute11.asm"
-
-INCLUDE "data/mapHeaders/Route16FlyHouse.asm"
-INCLUDE "scripts/Route16FlyHouse.asm"
-INCLUDE "data/mapObjects/Route16FlyHouse.asm"
-
-INCLUDE "data/mapHeaders/Route22Gate.asm"
-INCLUDE "scripts/Route22Gate.asm"
-INCLUDE "data/mapObjects/Route22Gate.asm"
-Route22Gate_Blocks: INCBIN "maps/Route22Gate.blk"
-
-INCLUDE "data/mapHeaders/BillsHouse.asm"
-INCLUDE "scripts/BillsHouse.asm"
-INCLUDE "data/mapObjects/BillsHouse.asm"
-BillsHouse_Blocks: INCBIN "maps/BillsHouse.blk"
-
INCLUDE "engine/menu/oaks_pc.asm"
-
INCLUDE "engine/hidden_object_functions7.asm"
-SECTION "Pics 1", ROMX ; BANK $09
-
-RhydonPicFront:: INCBIN "pic/bmon/rhydon.pic"
-RhydonPicBack:: INCBIN "pic/monback/rhydonb.pic"
-KangaskhanPicFront:: INCBIN "pic/bmon/kangaskhan.pic"
-KangaskhanPicBack:: INCBIN "pic/monback/kangaskhanb.pic"
-NidoranMPicFront:: INCBIN "pic/bmon/nidoranm.pic"
-NidoranMPicBack:: INCBIN "pic/monback/nidoranmb.pic"
-ClefairyPicFront:: INCBIN "pic/bmon/clefairy.pic"
-ClefairyPicBack:: INCBIN "pic/monback/clefairyb.pic"
-SpearowPicFront:: INCBIN "pic/bmon/spearow.pic"
-SpearowPicBack:: INCBIN "pic/monback/spearowb.pic"
-VoltorbPicFront:: INCBIN "pic/bmon/voltorb.pic"
-VoltorbPicBack:: INCBIN "pic/monback/voltorbb.pic"
-NidokingPicFront:: INCBIN "pic/bmon/nidoking.pic"
-NidokingPicBack:: INCBIN "pic/monback/nidokingb.pic"
-SlowbroPicFront:: INCBIN "pic/bmon/slowbro.pic"
-SlowbroPicBack:: INCBIN "pic/monback/slowbrob.pic"
-IvysaurPicFront:: INCBIN "pic/bmon/ivysaur.pic"
-IvysaurPicBack:: INCBIN "pic/monback/ivysaurb.pic"
-ExeggutorPicFront:: INCBIN "pic/bmon/exeggutor.pic"
-ExeggutorPicBack:: INCBIN "pic/monback/exeggutorb.pic"
-LickitungPicFront:: INCBIN "pic/bmon/lickitung.pic"
-LickitungPicBack:: INCBIN "pic/monback/lickitungb.pic"
-ExeggcutePicFront:: INCBIN "pic/bmon/exeggcute.pic"
-ExeggcutePicBack:: INCBIN "pic/monback/exeggcuteb.pic"
-GrimerPicFront:: INCBIN "pic/bmon/grimer.pic"
-GrimerPicBack:: INCBIN "pic/monback/grimerb.pic"
-GengarPicFront:: INCBIN "pic/bmon/gengar.pic"
-GengarPicBack:: INCBIN "pic/monback/gengarb.pic"
-NidoranFPicFront:: INCBIN "pic/bmon/nidoranf.pic"
-NidoranFPicBack:: INCBIN "pic/monback/nidoranfb.pic"
-NidoqueenPicFront:: INCBIN "pic/bmon/nidoqueen.pic"
-NidoqueenPicBack:: INCBIN "pic/monback/nidoqueenb.pic"
-CubonePicFront:: INCBIN "pic/bmon/cubone.pic"
-CubonePicBack:: INCBIN "pic/monback/cuboneb.pic"
-RhyhornPicFront:: INCBIN "pic/bmon/rhyhorn.pic"
-RhyhornPicBack:: INCBIN "pic/monback/rhyhornb.pic"
-LaprasPicFront:: INCBIN "pic/bmon/lapras.pic"
-LaprasPicBack:: INCBIN "pic/monback/laprasb.pic"
-ArcaninePicFront:: INCBIN "pic/bmon/arcanine.pic"
-ArcaninePicBack:: INCBIN "pic/monback/arcanineb.pic"
-GyaradosPicFront:: INCBIN "pic/bmon/gyarados.pic"
-GyaradosPicBack:: INCBIN "pic/monback/gyaradosb.pic"
-ShellderPicFront:: INCBIN "pic/bmon/shellder.pic"
-ShellderPicBack:: INCBIN "pic/monback/shellderb.pic"
-TentacoolPicFront:: INCBIN "pic/bmon/tentacool.pic"
-TentacoolPicBack:: INCBIN "pic/monback/tentacoolb.pic"
-GastlyPicFront:: INCBIN "pic/bmon/gastly.pic"
-GastlyPicBack:: INCBIN "pic/monback/gastlyb.pic"
-ScytherPicFront:: INCBIN "pic/bmon/scyther.pic"
-ScytherPicBack:: INCBIN "pic/monback/scytherb.pic"
-StaryuPicFront:: INCBIN "pic/bmon/staryu.pic"
-StaryuPicBack:: INCBIN "pic/monback/staryub.pic"
-BlastoisePicFront:: INCBIN "pic/bmon/blastoise.pic"
-BlastoisePicBack:: INCBIN "pic/monback/blastoiseb.pic"
-PinsirPicFront:: INCBIN "pic/bmon/pinsir.pic"
-PinsirPicBack:: INCBIN "pic/monback/pinsirb.pic"
-TangelaPicFront:: INCBIN "pic/bmon/tangela.pic"
-TangelaPicBack:: INCBIN "pic/monback/tangelab.pic"
-
-
SECTION "Battle (BANK 9)", ROMX
INCLUDE "engine/battle/print_type.asm"
@@ -589,153 +167,11 @@
INCLUDE "engine/battle/moveEffects/focus_energy_effect.asm"
-SECTION "Pics 2", ROMX ; BANK $0A
-
-GrowlithePicFront:: INCBIN "pic/bmon/growlithe.pic"
-GrowlithePicBack:: INCBIN "pic/monback/growlitheb.pic"
-OnixPicFront:: INCBIN "pic/bmon/onix.pic"
-OnixPicBack:: INCBIN "pic/monback/onixb.pic"
-FearowPicFront:: INCBIN "pic/bmon/fearow.pic"
-FearowPicBack:: INCBIN "pic/monback/fearowb.pic"
-PidgeyPicFront:: INCBIN "pic/bmon/pidgey.pic"
-PidgeyPicBack:: INCBIN "pic/monback/pidgeyb.pic"
-SlowpokePicFront:: INCBIN "pic/bmon/slowpoke.pic"
-SlowpokePicBack:: INCBIN "pic/monback/slowpokeb.pic"
-KadabraPicFront:: INCBIN "pic/bmon/kadabra.pic"
-KadabraPicBack:: INCBIN "pic/monback/kadabrab.pic"
-GravelerPicFront:: INCBIN "pic/bmon/graveler.pic"
-GravelerPicBack:: INCBIN "pic/monback/gravelerb.pic"
-ChanseyPicFront:: INCBIN "pic/bmon/chansey.pic"
-ChanseyPicBack:: INCBIN "pic/monback/chanseyb.pic"
-MachokePicFront:: INCBIN "pic/bmon/machoke.pic"
-MachokePicBack:: INCBIN "pic/monback/machokeb.pic"
-MrMimePicFront:: INCBIN "pic/bmon/mr.mime.pic"
-MrMimePicBack:: INCBIN "pic/monback/mr.mimeb.pic"
-HitmonleePicFront:: INCBIN "pic/bmon/hitmonlee.pic"
-HitmonleePicBack:: INCBIN "pic/monback/hitmonleeb.pic"
-HitmonchanPicFront:: INCBIN "pic/bmon/hitmonchan.pic"
-HitmonchanPicBack:: INCBIN "pic/monback/hitmonchanb.pic"
-ArbokPicFront:: INCBIN "pic/bmon/arbok.pic"
-ArbokPicBack:: INCBIN "pic/monback/arbokb.pic"
-ParasectPicFront:: INCBIN "pic/bmon/parasect.pic"
-ParasectPicBack:: INCBIN "pic/monback/parasectb.pic"
-PsyduckPicFront:: INCBIN "pic/bmon/psyduck.pic"
-PsyduckPicBack:: INCBIN "pic/monback/psyduckb.pic"
-DrowzeePicFront:: INCBIN "pic/bmon/drowzee.pic"
-DrowzeePicBack:: INCBIN "pic/monback/drowzeeb.pic"
-GolemPicFront:: INCBIN "pic/bmon/golem.pic"
-GolemPicBack:: INCBIN "pic/monback/golemb.pic"
-MagmarPicFront:: INCBIN "pic/bmon/magmar.pic"
-MagmarPicBack:: INCBIN "pic/monback/magmarb.pic"
-ElectabuzzPicFront:: INCBIN "pic/bmon/electabuzz.pic"
-ElectabuzzPicBack:: INCBIN "pic/monback/electabuzzb.pic"
-MagnetonPicFront:: INCBIN "pic/bmon/magneton.pic"
-MagnetonPicBack:: INCBIN "pic/monback/magnetonb.pic"
-KoffingPicFront:: INCBIN "pic/bmon/koffing.pic"
-KoffingPicBack:: INCBIN "pic/monback/koffingb.pic"
-MankeyPicFront:: INCBIN "pic/bmon/mankey.pic"
-MankeyPicBack:: INCBIN "pic/monback/mankeyb.pic"
-SeelPicFront:: INCBIN "pic/bmon/seel.pic"
-SeelPicBack:: INCBIN "pic/monback/seelb.pic"
-DiglettPicFront:: INCBIN "pic/bmon/diglett.pic"
-DiglettPicBack:: INCBIN "pic/monback/diglettb.pic"
-TaurosPicFront:: INCBIN "pic/bmon/tauros.pic"
-TaurosPicBack:: INCBIN "pic/monback/taurosb.pic"
-FarfetchdPicFront:: INCBIN "pic/bmon/farfetchd.pic"
-FarfetchdPicBack:: INCBIN "pic/monback/farfetchdb.pic"
-VenonatPicFront:: INCBIN "pic/bmon/venonat.pic"
-VenonatPicBack:: INCBIN "pic/monback/venonatb.pic"
-DragonitePicFront:: INCBIN "pic/bmon/dragonite.pic"
-DragonitePicBack:: INCBIN "pic/monback/dragoniteb.pic"
-DoduoPicFront:: INCBIN "pic/bmon/doduo.pic"
-DoduoPicBack:: INCBIN "pic/monback/doduob.pic"
-PoliwagPicFront:: INCBIN "pic/bmon/poliwag.pic"
-PoliwagPicBack:: INCBIN "pic/monback/poliwagb.pic"
-JynxPicFront:: INCBIN "pic/bmon/jynx.pic"
-JynxPicBack:: INCBIN "pic/monback/jynxb.pic"
-MoltresPicFront:: INCBIN "pic/bmon/moltres.pic"
-MoltresPicBack:: INCBIN "pic/monback/moltresb.pic"
-
-
SECTION "Battle (BANK A)", ROMX
INCLUDE "engine/battle/moveEffects/leech_seed_effect.asm"
-SECTION "Pics 3", ROMX ; BANK $0B
-
-ArticunoPicFront:: INCBIN "pic/bmon/articuno.pic"
-ArticunoPicBack:: INCBIN "pic/monback/articunob.pic"
-ZapdosPicFront:: INCBIN "pic/bmon/zapdos.pic"
-ZapdosPicBack:: INCBIN "pic/monback/zapdosb.pic"
-DittoPicFront:: INCBIN "pic/bmon/ditto.pic"
-DittoPicBack:: INCBIN "pic/monback/dittob.pic"
-MeowthPicFront:: INCBIN "pic/bmon/meowth.pic"
-MeowthPicBack:: INCBIN "pic/monback/meowthb.pic"
-KrabbyPicFront:: INCBIN "pic/bmon/krabby.pic"
-KrabbyPicBack:: INCBIN "pic/monback/krabbyb.pic"
-VulpixPicFront:: INCBIN "pic/bmon/vulpix.pic"
-VulpixPicBack:: INCBIN "pic/monback/vulpixb.pic"
-NinetalesPicFront:: INCBIN "pic/bmon/ninetales.pic"
-NinetalesPicBack:: INCBIN "pic/monback/ninetalesb.pic"
-PikachuPicFront:: INCBIN "pic/bmon/pikachu.pic"
-PikachuPicBack:: INCBIN "pic/monback/pikachub.pic"
-RaichuPicFront:: INCBIN "pic/bmon/raichu.pic"
-RaichuPicBack:: INCBIN "pic/monback/raichub.pic"
-DratiniPicFront:: INCBIN "pic/bmon/dratini.pic"
-DratiniPicBack:: INCBIN "pic/monback/dratinib.pic"
-DragonairPicFront:: INCBIN "pic/bmon/dragonair.pic"
-DragonairPicBack:: INCBIN "pic/monback/dragonairb.pic"
-KabutoPicFront:: INCBIN "pic/bmon/kabuto.pic"
-KabutoPicBack:: INCBIN "pic/monback/kabutob.pic"
-KabutopsPicFront:: INCBIN "pic/bmon/kabutops.pic"
-KabutopsPicBack:: INCBIN "pic/monback/kabutopsb.pic"
-HorseaPicFront:: INCBIN "pic/bmon/horsea.pic"
-HorseaPicBack:: INCBIN "pic/monback/horseab.pic"
-SeadraPicFront:: INCBIN "pic/bmon/seadra.pic"
-SeadraPicBack:: INCBIN "pic/monback/seadrab.pic"
-SandshrewPicFront:: INCBIN "pic/bmon/sandshrew.pic"
-SandshrewPicBack:: INCBIN "pic/monback/sandshrewb.pic"
-SandslashPicFront:: INCBIN "pic/bmon/sandslash.pic"
-SandslashPicBack:: INCBIN "pic/monback/sandslashb.pic"
-OmanytePicFront:: INCBIN "pic/bmon/omanyte.pic"
-OmanytePicBack:: INCBIN "pic/monback/omanyteb.pic"
-OmastarPicFront:: INCBIN "pic/bmon/omastar.pic"
-OmastarPicBack:: INCBIN "pic/monback/omastarb.pic"
-JigglypuffPicFront:: INCBIN "pic/bmon/jigglypuff.pic"
-JigglypuffPicBack:: INCBIN "pic/monback/jigglypuffb.pic"
-WigglytuffPicFront:: INCBIN "pic/bmon/wigglytuff.pic"
-WigglytuffPicBack:: INCBIN "pic/monback/wigglytuffb.pic"
-EeveePicFront:: INCBIN "pic/bmon/eevee.pic"
-EeveePicBack:: INCBIN "pic/monback/eeveeb.pic"
-FlareonPicFront:: INCBIN "pic/bmon/flareon.pic"
-FlareonPicBack:: INCBIN "pic/monback/flareonb.pic"
-JolteonPicFront:: INCBIN "pic/bmon/jolteon.pic"
-JolteonPicBack:: INCBIN "pic/monback/jolteonb.pic"
-VaporeonPicFront:: INCBIN "pic/bmon/vaporeon.pic"
-VaporeonPicBack:: INCBIN "pic/monback/vaporeonb.pic"
-MachopPicFront:: INCBIN "pic/bmon/machop.pic"
-MachopPicBack:: INCBIN "pic/monback/machopb.pic"
-ZubatPicFront:: INCBIN "pic/bmon/zubat.pic"
-ZubatPicBack:: INCBIN "pic/monback/zubatb.pic"
-EkansPicFront:: INCBIN "pic/bmon/ekans.pic"
-EkansPicBack:: INCBIN "pic/monback/ekansb.pic"
-ParasPicFront:: INCBIN "pic/bmon/paras.pic"
-ParasPicBack:: INCBIN "pic/monback/parasb.pic"
-PoliwhirlPicFront:: INCBIN "pic/bmon/poliwhirl.pic"
-PoliwhirlPicBack:: INCBIN "pic/monback/poliwhirlb.pic"
-PoliwrathPicFront:: INCBIN "pic/bmon/poliwrath.pic"
-PoliwrathPicBack:: INCBIN "pic/monback/poliwrathb.pic"
-WeedlePicFront:: INCBIN "pic/bmon/weedle.pic"
-WeedlePicBack:: INCBIN "pic/monback/weedleb.pic"
-KakunaPicFront:: INCBIN "pic/bmon/kakuna.pic"
-KakunaPicBack:: INCBIN "pic/monback/kakunab.pic"
-BeedrillPicFront:: INCBIN "pic/bmon/beedrill.pic"
-BeedrillPicBack:: INCBIN "pic/monback/beedrillb.pic"
-
-FossilKabutopsPic:: INCBIN "pic/bmon/fossilkabutops.pic"
-
-
SECTION "Battle (BANK B)", ROMX
INCLUDE "engine/battle/display_effectiveness.asm"
@@ -752,71 +188,6 @@
INCLUDE "engine/game_corner_slots2.asm"
-SECTION "Pics 4", ROMX ; BANK $0C
-
-DodrioPicFront:: INCBIN "pic/bmon/dodrio.pic"
-DodrioPicBack:: INCBIN "pic/monback/dodriob.pic"
-PrimeapePicFront:: INCBIN "pic/bmon/primeape.pic"
-PrimeapePicBack:: INCBIN "pic/monback/primeapeb.pic"
-DugtrioPicFront:: INCBIN "pic/bmon/dugtrio.pic"
-DugtrioPicBack:: INCBIN "pic/monback/dugtriob.pic"
-VenomothPicFront:: INCBIN "pic/bmon/venomoth.pic"
-VenomothPicBack:: INCBIN "pic/monback/venomothb.pic"
-DewgongPicFront:: INCBIN "pic/bmon/dewgong.pic"
-DewgongPicBack:: INCBIN "pic/monback/dewgongb.pic"
-CaterpiePicFront:: INCBIN "pic/bmon/caterpie.pic"
-CaterpiePicBack:: INCBIN "pic/monback/caterpieb.pic"
-MetapodPicFront:: INCBIN "pic/bmon/metapod.pic"
-MetapodPicBack:: INCBIN "pic/monback/metapodb.pic"
-ButterfreePicFront:: INCBIN "pic/bmon/butterfree.pic"
-ButterfreePicBack:: INCBIN "pic/monback/butterfreeb.pic"
-MachampPicFront:: INCBIN "pic/bmon/machamp.pic"
-MachampPicBack:: INCBIN "pic/monback/machampb.pic"
-GolduckPicFront:: INCBIN "pic/bmon/golduck.pic"
-GolduckPicBack:: INCBIN "pic/monback/golduckb.pic"
-HypnoPicFront:: INCBIN "pic/bmon/hypno.pic"
-HypnoPicBack:: INCBIN "pic/monback/hypnob.pic"
-GolbatPicFront:: INCBIN "pic/bmon/golbat.pic"
-GolbatPicBack:: INCBIN "pic/monback/golbatb.pic"
-MewtwoPicFront:: INCBIN "pic/bmon/mewtwo.pic"
-MewtwoPicBack:: INCBIN "pic/monback/mewtwob.pic"
-SnorlaxPicFront:: INCBIN "pic/bmon/snorlax.pic"
-SnorlaxPicBack:: INCBIN "pic/monback/snorlaxb.pic"
-MagikarpPicFront:: INCBIN "pic/bmon/magikarp.pic"
-MagikarpPicBack:: INCBIN "pic/monback/magikarpb.pic"
-MukPicFront:: INCBIN "pic/bmon/muk.pic"
-MukPicBack:: INCBIN "pic/monback/mukb.pic"
-KinglerPicFront:: INCBIN "pic/bmon/kingler.pic"
-KinglerPicBack:: INCBIN "pic/monback/kinglerb.pic"
-CloysterPicFront:: INCBIN "pic/bmon/cloyster.pic"
-CloysterPicBack:: INCBIN "pic/monback/cloysterb.pic"
-ElectrodePicFront:: INCBIN "pic/bmon/electrode.pic"
-ElectrodePicBack:: INCBIN "pic/monback/electrodeb.pic"
-ClefablePicFront:: INCBIN "pic/bmon/clefable.pic"
-ClefablePicBack:: INCBIN "pic/monback/clefableb.pic"
-WeezingPicFront:: INCBIN "pic/bmon/weezing.pic"
-WeezingPicBack:: INCBIN "pic/monback/weezingb.pic"
-PersianPicFront:: INCBIN "pic/bmon/persian.pic"
-PersianPicBack:: INCBIN "pic/monback/persianb.pic"
-MarowakPicFront:: INCBIN "pic/bmon/marowak.pic"
-MarowakPicBack:: INCBIN "pic/monback/marowakb.pic"
-HaunterPicFront:: INCBIN "pic/bmon/haunter.pic"
-HaunterPicBack:: INCBIN "pic/monback/haunterb.pic"
-AbraPicFront:: INCBIN "pic/bmon/abra.pic"
-AbraPicBack:: INCBIN "pic/monback/abrab.pic"
-AlakazamPicFront:: INCBIN "pic/bmon/alakazam.pic"
-AlakazamPicBack:: INCBIN "pic/monback/alakazamb.pic"
-PidgeottoPicFront:: INCBIN "pic/bmon/pidgeotto.pic"
-PidgeottoPicBack:: INCBIN "pic/monback/pidgeottob.pic"
-PidgeotPicFront:: INCBIN "pic/bmon/pidgeot.pic"
-PidgeotPicBack:: INCBIN "pic/monback/pidgeotb.pic"
-StarmiePicFront:: INCBIN "pic/bmon/starmie.pic"
-StarmiePicBack:: INCBIN "pic/monback/starmieb.pic"
-
-RedPicBack:: INCBIN "pic/trainer/redb.pic"
-OldManPic:: INCBIN "pic/trainer/oldman.pic"
-
-
SECTION "Battle (BANK C)", ROMX
INCLUDE "engine/battle/moveEffects/mist_effect.asm"
@@ -823,64 +194,6 @@
INCLUDE "engine/battle/moveEffects/one_hit_ko_effect.asm"
-SECTION "Pics 5", ROMX ; BANK $0D
-
-BulbasaurPicFront:: INCBIN "pic/bmon/bulbasaur.pic"
-BulbasaurPicBack:: INCBIN "pic/monback/bulbasaurb.pic"
-VenusaurPicFront:: INCBIN "pic/bmon/venusaur.pic"
-VenusaurPicBack:: INCBIN "pic/monback/venusaurb.pic"
-TentacruelPicFront:: INCBIN "pic/bmon/tentacruel.pic"
-TentacruelPicBack:: INCBIN "pic/monback/tentacruelb.pic"
-GoldeenPicFront:: INCBIN "pic/bmon/goldeen.pic"
-GoldeenPicBack:: INCBIN "pic/monback/goldeenb.pic"
-SeakingPicFront:: INCBIN "pic/bmon/seaking.pic"
-SeakingPicBack:: INCBIN "pic/monback/seakingb.pic"
-PonytaPicFront:: INCBIN "pic/bmon/ponyta.pic"
-RapidashPicFront:: INCBIN "pic/bmon/rapidash.pic"
-PonytaPicBack:: INCBIN "pic/monback/ponytab.pic"
-RapidashPicBack:: INCBIN "pic/monback/rapidashb.pic"
-RattataPicFront:: INCBIN "pic/bmon/rattata.pic"
-RattataPicBack:: INCBIN "pic/monback/rattatab.pic"
-RaticatePicFront:: INCBIN "pic/bmon/raticate.pic"
-RaticatePicBack:: INCBIN "pic/monback/raticateb.pic"
-NidorinoPicFront:: INCBIN "pic/bmon/nidorino.pic"
-NidorinoPicBack:: INCBIN "pic/monback/nidorinob.pic"
-NidorinaPicFront:: INCBIN "pic/bmon/nidorina.pic"
-NidorinaPicBack:: INCBIN "pic/monback/nidorinab.pic"
-GeodudePicFront:: INCBIN "pic/bmon/geodude.pic"
-GeodudePicBack:: INCBIN "pic/monback/geodudeb.pic"
-PorygonPicFront:: INCBIN "pic/bmon/porygon.pic"
-PorygonPicBack:: INCBIN "pic/monback/porygonb.pic"
-AerodactylPicFront:: INCBIN "pic/bmon/aerodactyl.pic"
-AerodactylPicBack:: INCBIN "pic/monback/aerodactylb.pic"
-MagnemitePicFront:: INCBIN "pic/bmon/magnemite.pic"
-MagnemitePicBack:: INCBIN "pic/monback/magnemiteb.pic"
-CharmanderPicFront:: INCBIN "pic/bmon/charmander.pic"
-CharmanderPicBack:: INCBIN "pic/monback/charmanderb.pic"
-SquirtlePicFront:: INCBIN "pic/bmon/squirtle.pic"
-SquirtlePicBack:: INCBIN "pic/monback/squirtleb.pic"
-CharmeleonPicFront:: INCBIN "pic/bmon/charmeleon.pic"
-CharmeleonPicBack:: INCBIN "pic/monback/charmeleonb.pic"
-WartortlePicFront:: INCBIN "pic/bmon/wartortle.pic"
-WartortlePicBack:: INCBIN "pic/monback/wartortleb.pic"
-CharizardPicFront:: INCBIN "pic/bmon/charizard.pic"
-CharizardPicBack:: INCBIN "pic/monback/charizardb.pic"
-FossilAerodactylPic:: INCBIN "pic/bmon/fossilaerodactyl.pic"
-GhostPic:: INCBIN "pic/other/ghost.pic"
-OddishPicFront:: INCBIN "pic/bmon/oddish.pic"
-OddishPicBack:: INCBIN "pic/monback/oddishb.pic"
-GloomPicFront:: INCBIN "pic/bmon/gloom.pic"
-GloomPicBack:: INCBIN "pic/monback/gloomb.pic"
-VileplumePicFront:: INCBIN "pic/bmon/vileplume.pic"
-VileplumePicBack:: INCBIN "pic/monback/vileplumeb.pic"
-BellsproutPicFront:: INCBIN "pic/bmon/bellsprout.pic"
-BellsproutPicBack:: INCBIN "pic/monback/bellsproutb.pic"
-WeepinbellPicFront:: INCBIN "pic/bmon/weepinbell.pic"
-WeepinbellPicBack:: INCBIN "pic/monback/weepinbellb.pic"
-VictreebelPicFront:: INCBIN "pic/bmon/victreebel.pic"
-VictreebelPicBack:: INCBIN "pic/monback/victreebelb.pic"
-
-
SECTION "Battle (BANK D)", ROMX
INCLUDE "engine/titlescreen2.asm"
@@ -894,7 +207,7 @@
SECTION "bankE", ROMX
INCLUDE "data/moves.asm"
-BaseStats: INCLUDE "data/base_stats.asm"
+INCLUDE "data/base_stats.asm"
INCLUDE "data/cries.asm"
INCLUDE "engine/battle/unused_stats_functions.asm"
INCLUDE "engine/battle/scroll_draw_trainer_pic.asm"
@@ -930,951 +243,80 @@
INCLUDE "engine/trade2.asm"
-SECTION "bank11", ROMX
+SECTION "bank11_1", ROMX
-INCLUDE "data/mapHeaders/LavenderTown.asm"
-INCLUDE "data/mapObjects/LavenderTown.asm"
-LavenderTown_Blocks: INCBIN "maps/LavenderTown.blk"
-
-ViridianPokecenter_Blocks: INCBIN "maps/ViridianPokecenter.blk"
-
-SafariZoneCenterRestHouse_Blocks:
-SafariZoneWestRestHouse_Blocks:
-SafariZoneEastRestHouse_Blocks:
-SafariZoneNorthRestHouse_Blocks: INCBIN "maps/SafariZoneCenterRestHouse.blk"
-
-INCLUDE "scripts/LavenderTown.asm"
-
INCLUDE "engine/pokedex_rating.asm"
-INCLUDE "data/mapHeaders/ViridianPokecenter.asm"
-INCLUDE "scripts/ViridianPokecenter.asm"
-INCLUDE "data/mapObjects/ViridianPokecenter.asm"
-INCLUDE "data/mapHeaders/PokemonMansion1F.asm"
-INCLUDE "scripts/PokemonMansion1F.asm"
-INCLUDE "data/mapObjects/PokemonMansion1F.asm"
-PokemonMansion1F_Blocks: INCBIN "maps/PokemonMansion1F.blk"
+SECTION "bank11_2", ROMX
-INCLUDE "data/mapHeaders/RockTunnel1F.asm"
-INCLUDE "scripts/RockTunnel1F.asm"
-INCLUDE "data/mapObjects/RockTunnel1F.asm"
-RockTunnel1F_Blocks: INCBIN "maps/RockTunnel1F.blk"
-
-INCLUDE "data/mapHeaders/SeafoamIslands1F.asm"
-INCLUDE "scripts/SeafoamIslands1F.asm"
-INCLUDE "data/mapObjects/SeafoamIslands1F.asm"
-SeafoamIslands1F_Blocks: INCBIN "maps/SeafoamIslands1F.blk"
-
-INCLUDE "data/mapHeaders/SSAnne3F.asm"
-INCLUDE "scripts/SSAnne3F.asm"
-INCLUDE "data/mapObjects/SSAnne3F.asm"
-SSAnne3F_Blocks: INCBIN "maps/SSAnne3F.blk"
-
-INCLUDE "data/mapHeaders/VictoryRoad3F.asm"
-INCLUDE "scripts/VictoryRoad3F.asm"
-INCLUDE "data/mapObjects/VictoryRoad3F.asm"
-VictoryRoad3F_Blocks: INCBIN "maps/VictoryRoad3F.blk"
-
-INCLUDE "data/mapHeaders/RocketHideoutB1F.asm"
-INCLUDE "scripts/RocketHideoutB1F.asm"
-INCLUDE "data/mapObjects/RocketHideoutB1F.asm"
-RocketHideoutB1F_Blocks: INCBIN "maps/RocketHideoutB1F.blk"
-
-INCLUDE "data/mapHeaders/RocketHideoutB2F.asm"
-INCLUDE "scripts/RocketHideoutB2F.asm"
-INCLUDE "data/mapObjects/RocketHideoutB2F.asm"
-RocketHideoutB2F_Blocks: INCBIN "maps/RocketHideoutB2F.blk"
-
-INCLUDE "data/mapHeaders/RocketHideoutB3F.asm"
-INCLUDE "scripts/RocketHideoutB3F.asm"
-INCLUDE "data/mapObjects/RocketHideoutB3F.asm"
-RocketHideoutB3F_Blocks: INCBIN "maps/RocketHideoutB3F.blk"
-
-INCLUDE "data/mapHeaders/RocketHideoutB4F.asm"
-INCLUDE "scripts/RocketHideoutB4F.asm"
-INCLUDE "data/mapObjects/RocketHideoutB4F.asm"
-RocketHideoutB4F_Blocks: INCBIN "maps/RocketHideoutB4F.blk"
-
-INCLUDE "data/mapHeaders/RocketHideoutElevator.asm"
-INCLUDE "scripts/RocketHideoutElevator.asm"
-INCLUDE "data/mapObjects/RocketHideoutElevator.asm"
-RocketHideoutElevator_Blocks: INCBIN "maps/RocketHideoutElevator.blk"
-
-INCLUDE "data/mapHeaders/SilphCoElevator.asm"
-INCLUDE "scripts/SilphCoElevator.asm"
-INCLUDE "data/mapObjects/SilphCoElevator.asm"
-SilphCoElevator_Blocks: INCBIN "maps/SilphCoElevator.blk"
-
-INCLUDE "data/mapHeaders/SafariZoneEast.asm"
-INCLUDE "scripts/SafariZoneEast.asm"
-INCLUDE "data/mapObjects/SafariZoneEast.asm"
-SafariZoneEast_Blocks: INCBIN "maps/SafariZoneEast.blk"
-
-INCLUDE "data/mapHeaders/SafariZoneNorth.asm"
-INCLUDE "scripts/SafariZoneNorth.asm"
-INCLUDE "data/mapObjects/SafariZoneNorth.asm"
-SafariZoneNorth_Blocks: INCBIN "maps/SafariZoneNorth.blk"
-
-INCLUDE "data/mapHeaders/SafariZoneCenter.asm"
-INCLUDE "scripts/SafariZoneCenter.asm"
-INCLUDE "data/mapObjects/SafariZoneCenter.asm"
-SafariZoneCenter_Blocks: INCBIN "maps/SafariZoneCenter.blk"
-
-INCLUDE "data/mapHeaders/SafariZoneCenterRestHouse.asm"
-INCLUDE "scripts/SafariZoneCenterRestHouse.asm"
-INCLUDE "data/mapObjects/SafariZoneCenterRestHouse.asm"
-
-INCLUDE "data/mapHeaders/SafariZoneWestRestHouse.asm"
-INCLUDE "scripts/SafariZoneWestRestHouse.asm"
-INCLUDE "data/mapObjects/SafariZoneWestRestHouse.asm"
-
-INCLUDE "data/mapHeaders/SafariZoneEastRestHouse.asm"
-INCLUDE "scripts/SafariZoneEastRestHouse.asm"
-INCLUDE "data/mapObjects/SafariZoneEastRestHouse.asm"
-
-INCLUDE "data/mapHeaders/SafariZoneNorthRestHouse.asm"
-INCLUDE "scripts/SafariZoneNorthRestHouse.asm"
-INCLUDE "data/mapObjects/SafariZoneNorthRestHouse.asm"
-
-INCLUDE "data/mapHeaders/CeruleanCave2F.asm"
-INCLUDE "scripts/CeruleanCave2F.asm"
-INCLUDE "data/mapObjects/CeruleanCave2F.asm"
-CeruleanCave2F_Blocks: INCBIN "maps/CeruleanCave2F.blk"
-
-INCLUDE "data/mapHeaders/CeruleanCaveB1F.asm"
-INCLUDE "scripts/CeruleanCaveB1F.asm"
-INCLUDE "data/mapObjects/CeruleanCaveB1F.asm"
-CeruleanCaveB1F_Blocks: INCBIN "maps/CeruleanCaveB1F.blk"
-
-INCLUDE "data/mapHeaders/RockTunnelB1F.asm"
-INCLUDE "scripts/RockTunnelB1F.asm"
-INCLUDE "data/mapObjects/RockTunnelB1F.asm"
-RockTunnelB1F_Blocks: INCBIN "maps/RockTunnelB1F.blk"
-
-INCLUDE "data/mapHeaders/SeafoamIslandsB1F.asm"
-INCLUDE "scripts/SeafoamIslandsB1F.asm"
-INCLUDE "data/mapObjects/SeafoamIslandsB1F.asm"
-SeafoamIslandsB1F_Blocks: INCBIN "maps/SeafoamIslandsB1F.blk"
-
-INCLUDE "data/mapHeaders/SeafoamIslandsB2F.asm"
-INCLUDE "scripts/SeafoamIslandsB2F.asm"
-INCLUDE "data/mapObjects/SeafoamIslandsB2F.asm"
-SeafoamIslandsB2F_Blocks: INCBIN "maps/SeafoamIslandsB2F.blk"
-
-INCLUDE "data/mapHeaders/SeafoamIslandsB3F.asm"
-INCLUDE "scripts/SeafoamIslandsB3F.asm"
-INCLUDE "data/mapObjects/SeafoamIslandsB3F.asm"
-SeafoamIslandsB3F_Blocks: INCBIN "maps/SeafoamIslandsB3F.blk"
-
-INCLUDE "data/mapHeaders/SeafoamIslandsB4F.asm"
-INCLUDE "scripts/SeafoamIslandsB4F.asm"
-INCLUDE "data/mapObjects/SeafoamIslandsB4F.asm"
-SeafoamIslandsB4F_Blocks: INCBIN "maps/SeafoamIslandsB4F.blk"
-
INCLUDE "engine/overworld/hidden_objects.asm"
SECTION "bank12", ROMX
-INCLUDE "data/mapHeaders/Route7.asm"
-INCLUDE "data/mapObjects/Route7.asm"
-Route7_Blocks: INCBIN "maps/Route7.blk"
-
-CeladonPokecenter_Blocks:
-RockTunnelPokecenter_Blocks:
-MtMoonPokecenter_Blocks: INCBIN "maps/MtMoonPokecenter.blk"
-
-Route18Gate1F_Blocks:
-Route15Gate1F_Blocks:
-Route11Gate1F_Blocks: INCBIN "maps/Route11Gate1F.blk"
-
-Route18Gate2F_Blocks:
-Route16Gate2F_Blocks:
-Route15Gate2F_Blocks:
-Route12Gate2F_Blocks:
-Route11Gate2F_Blocks: INCBIN "maps/Route11Gate2F.blk"
-
INCLUDE "engine/predefs12.asm"
-INCLUDE "scripts/Route7.asm"
-INCLUDE "data/mapHeaders/RedsHouse1F.asm"
-INCLUDE "scripts/RedsHouse1F.asm"
-INCLUDE "data/mapObjects/RedsHouse1F.asm"
-RedsHouse1F_Blocks: INCBIN "maps/RedsHouse1F.blk"
-
-INCLUDE "data/mapHeaders/CeladonMart3F.asm"
-INCLUDE "scripts/CeladonMart3F.asm"
-INCLUDE "data/mapObjects/CeladonMart3F.asm"
-CeladonMart3F_Blocks: INCBIN "maps/CeladonMart3F.blk"
-
-INCLUDE "data/mapHeaders/CeladonMart4F.asm"
-INCLUDE "scripts/CeladonMart4F.asm"
-INCLUDE "data/mapObjects/CeladonMart4F.asm"
-CeladonMart4F_Blocks: INCBIN "maps/CeladonMart4F.blk"
-
-INCLUDE "data/mapHeaders/CeladonMartRoof.asm"
-INCLUDE "scripts/CeladonMartRoof.asm"
-INCLUDE "data/mapObjects/CeladonMartRoof.asm"
-CeladonMartRoof_Blocks: INCBIN "maps/CeladonMartRoof.blk"
-
-INCLUDE "data/mapHeaders/CeladonMartElevator.asm"
-INCLUDE "scripts/CeladonMartElevator.asm"
-INCLUDE "data/mapObjects/CeladonMartElevator.asm"
-CeladonMartElevator_Blocks: INCBIN "maps/CeladonMartElevator.blk"
-
-INCLUDE "data/mapHeaders/CeladonMansion1F.asm"
-INCLUDE "scripts/CeladonMansion1F.asm"
-INCLUDE "data/mapObjects/CeladonMansion1F.asm"
-CeladonMansion1F_Blocks: INCBIN "maps/CeladonMansion1F.blk"
-
-INCLUDE "data/mapHeaders/CeladonMansion2F.asm"
-INCLUDE "scripts/CeladonMansion2F.asm"
-INCLUDE "data/mapObjects/CeladonMansion2F.asm"
-CeladonMansion2F_Blocks: INCBIN "maps/CeladonMansion2F.blk"
-
-INCLUDE "data/mapHeaders/CeladonMansion3F.asm"
-INCLUDE "scripts/CeladonMansion3F.asm"
-INCLUDE "data/mapObjects/CeladonMansion3F.asm"
-CeladonMansion3F_Blocks: INCBIN "maps/CeladonMansion3F.blk"
-
-INCLUDE "data/mapHeaders/CeladonMansionRoof.asm"
-INCLUDE "scripts/CeladonMansionRoof.asm"
-INCLUDE "data/mapObjects/CeladonMansionRoof.asm"
-CeladonMansionRoof_Blocks: INCBIN "maps/CeladonMansionRoof.blk"
-
-INCLUDE "data/mapHeaders/CeladonPokecenter.asm"
-INCLUDE "scripts/CeladonPokecenter.asm"
-INCLUDE "data/mapObjects/CeladonPokecenter.asm"
-
-INCLUDE "data/mapHeaders/CeladonGym.asm"
-INCLUDE "scripts/CeladonGym.asm"
-INCLUDE "data/mapObjects/CeladonGym.asm"
-CeladonGym_Blocks: INCBIN "maps/CeladonGym.blk"
-
-INCLUDE "data/mapHeaders/GameCorner.asm"
-INCLUDE "scripts/GameCorner.asm"
-INCLUDE "data/mapObjects/GameCorner.asm"
-GameCorner_Blocks: INCBIN "maps/GameCorner.blk"
-
-INCLUDE "data/mapHeaders/CeladonMart5F.asm"
-INCLUDE "scripts/CeladonMart5F.asm"
-INCLUDE "data/mapObjects/CeladonMart5F.asm"
-CeladonMart5F_Blocks: INCBIN "maps/CeladonMart5F.blk"
-
-INCLUDE "data/mapHeaders/GameCornerPrizeRoom.asm"
-INCLUDE "scripts/GameCornerPrizeRoom.asm"
-INCLUDE "data/mapObjects/GameCornerPrizeRoom.asm"
-GameCornerPrizeRoom_Blocks: INCBIN "maps/GameCornerPrizeRoom.blk"
-
-INCLUDE "data/mapHeaders/CeladonDiner.asm"
-INCLUDE "scripts/CeladonDiner.asm"
-INCLUDE "data/mapObjects/CeladonDiner.asm"
-CeladonDiner_Blocks: INCBIN "maps/CeladonDiner.blk"
-
-INCLUDE "data/mapHeaders/CeladonChiefHouse.asm"
-INCLUDE "scripts/CeladonChiefHouse.asm"
-INCLUDE "data/mapObjects/CeladonChiefHouse.asm"
-CeladonChiefHouse_Blocks: INCBIN "maps/CeladonChiefHouse.blk"
-
-INCLUDE "data/mapHeaders/CeladonHotel.asm"
-INCLUDE "scripts/CeladonHotel.asm"
-INCLUDE "data/mapObjects/CeladonHotel.asm"
-CeladonHotel_Blocks: INCBIN "maps/CeladonHotel.blk"
-
-INCLUDE "data/mapHeaders/MtMoonPokecenter.asm"
-INCLUDE "scripts/MtMoonPokecenter.asm"
-INCLUDE "data/mapObjects/MtMoonPokecenter.asm"
-
-INCLUDE "data/mapHeaders/RockTunnelPokecenter.asm"
-INCLUDE "scripts/RockTunnelPokecenter.asm"
-INCLUDE "data/mapObjects/RockTunnelPokecenter.asm"
-
-INCLUDE "data/mapHeaders/Route11Gate1F.asm"
-INCLUDE "scripts/Route11Gate1F.asm"
-INCLUDE "data/mapObjects/Route11Gate1F.asm"
-
-INCLUDE "data/mapHeaders/Route11Gate2F.asm"
-INCLUDE "scripts/Route11Gate2F.asm"
-INCLUDE "data/mapObjects/Route11Gate2F.asm"
-
-INCLUDE "data/mapHeaders/Route12Gate1F.asm"
-INCLUDE "scripts/Route12Gate1F.asm"
-INCLUDE "data/mapObjects/Route12Gate1F.asm"
-Route12Gate1F_Blocks: INCBIN "maps/Route12Gate1F.blk"
-
-INCLUDE "data/mapHeaders/Route12Gate2F.asm"
-INCLUDE "scripts/Route12Gate2F.asm"
-INCLUDE "data/mapObjects/Route12Gate2F.asm"
-
-INCLUDE "data/mapHeaders/Route15Gate1F.asm"
-INCLUDE "scripts/Route15Gate1F.asm"
-INCLUDE "data/mapObjects/Route15Gate1F.asm"
-
-INCLUDE "data/mapHeaders/Route15Gate2F.asm"
-INCLUDE "scripts/Route15Gate2F.asm"
-INCLUDE "data/mapObjects/Route15Gate2F.asm"
-
-INCLUDE "data/mapHeaders/Route16Gate1F.asm"
-INCLUDE "scripts/Route16Gate1F.asm"
-INCLUDE "data/mapObjects/Route16Gate1F.asm"
-Route16Gate1F_Blocks: INCBIN "maps/Route16Gate1F.blk"
-
-INCLUDE "data/mapHeaders/Route16Gate2F.asm"
-INCLUDE "scripts/Route16Gate2F.asm"
-INCLUDE "data/mapObjects/Route16Gate2F.asm"
-
-INCLUDE "data/mapHeaders/Route18Gate1F.asm"
-INCLUDE "scripts/Route18Gate1F.asm"
-INCLUDE "data/mapObjects/Route18Gate1F.asm"
-
-INCLUDE "data/mapHeaders/Route18Gate2F.asm"
-INCLUDE "scripts/Route18Gate2F.asm"
-INCLUDE "data/mapObjects/Route18Gate2F.asm"
-
-INCLUDE "data/mapHeaders/MtMoon1F.asm"
-INCLUDE "scripts/MtMoon1F.asm"
-INCLUDE "data/mapObjects/MtMoon1F.asm"
-MtMoon1F_Blocks: INCBIN "maps/MtMoon1F.blk"
-
-INCLUDE "data/mapHeaders/MtMoonB2F.asm"
-INCLUDE "scripts/MtMoonB2F.asm"
-INCLUDE "data/mapObjects/MtMoonB2F.asm"
-MtMoonB2F_Blocks: INCBIN "maps/MtMoonB2F.blk"
-
-INCLUDE "data/mapHeaders/SafariZoneWest.asm"
-INCLUDE "scripts/SafariZoneWest.asm"
-INCLUDE "data/mapObjects/SafariZoneWest.asm"
-SafariZoneWest_Blocks: INCBIN "maps/SafariZoneWest.blk"
-
-INCLUDE "data/mapHeaders/SafariZoneSecretHouse.asm"
-INCLUDE "scripts/SafariZoneSecretHouse.asm"
-INCLUDE "data/mapObjects/SafariZoneSecretHouse.asm"
-SafariZoneSecretHouse_Blocks: INCBIN "maps/SafariZoneSecretHouse.blk"
-
-
SECTION "bank13", ROMX
-TrainerPics::
-YoungsterPic:: INCBIN "pic/trainer/youngster.pic"
-BugCatcherPic:: INCBIN "pic/trainer/bugcatcher.pic"
-LassPic:: INCBIN "pic/trainer/lass.pic"
-SailorPic:: INCBIN "pic/trainer/sailor.pic"
-JrTrainerMPic:: INCBIN "pic/trainer/jr.trainerm.pic"
-JrTrainerFPic:: INCBIN "pic/trainer/jr.trainerf.pic"
-PokemaniacPic:: INCBIN "pic/trainer/pokemaniac.pic"
-SuperNerdPic:: INCBIN "pic/trainer/supernerd.pic"
-HikerPic:: INCBIN "pic/trainer/hiker.pic"
-BikerPic:: INCBIN "pic/trainer/biker.pic"
-BurglarPic:: INCBIN "pic/trainer/burglar.pic"
-EngineerPic:: INCBIN "pic/trainer/engineer.pic"
-FisherPic:: INCBIN "pic/trainer/fisher.pic"
-SwimmerPic:: INCBIN "pic/trainer/swimmer.pic"
-CueBallPic:: INCBIN "pic/trainer/cueball.pic"
-GamblerPic:: INCBIN "pic/trainer/gambler.pic"
-BeautyPic:: INCBIN "pic/trainer/beauty.pic"
-PsychicPic:: INCBIN "pic/trainer/psychic.pic"
-RockerPic:: INCBIN "pic/trainer/rocker.pic"
-JugglerPic:: INCBIN "pic/trainer/juggler.pic"
-TamerPic:: INCBIN "pic/trainer/tamer.pic"
-BirdKeeperPic:: INCBIN "pic/trainer/birdkeeper.pic"
-BlackbeltPic:: INCBIN "pic/trainer/blackbelt.pic"
-Rival1Pic:: INCBIN "pic/trainer/rival1.pic"
-ProfOakPic:: INCBIN "pic/trainer/prof.oak.pic"
-ChiefPic::
-ScientistPic:: INCBIN "pic/trainer/scientist.pic"
-GiovanniPic:: INCBIN "pic/trainer/giovanni.pic"
-RocketPic:: INCBIN "pic/trainer/rocket.pic"
-CooltrainerMPic:: INCBIN "pic/trainer/cooltrainerm.pic"
-CooltrainerFPic:: INCBIN "pic/trainer/cooltrainerf.pic"
-BrunoPic:: INCBIN "pic/trainer/bruno.pic"
-BrockPic:: INCBIN "pic/trainer/brock.pic"
-MistyPic:: INCBIN "pic/trainer/misty.pic"
-LtSurgePic:: INCBIN "pic/trainer/lt.surge.pic"
-ErikaPic:: INCBIN "pic/trainer/erika.pic"
-KogaPic:: INCBIN "pic/trainer/koga.pic"
-BlainePic:: INCBIN "pic/trainer/blaine.pic"
-SabrinaPic:: INCBIN "pic/trainer/sabrina.pic"
-GentlemanPic:: INCBIN "pic/trainer/gentleman.pic"
-Rival2Pic:: INCBIN "pic/trainer/rival2.pic"
-Rival3Pic:: INCBIN "pic/trainer/rival3.pic"
-LoreleiPic:: INCBIN "pic/trainer/lorelei.pic"
-ChannelerPic:: INCBIN "pic/trainer/channeler.pic"
-AgathaPic:: INCBIN "pic/trainer/agatha.pic"
-LancePic:: INCBIN "pic/trainer/lance.pic"
-
-INCLUDE "data/mapHeaders/TradeCenter.asm"
-INCLUDE "scripts/TradeCenter.asm"
-INCLUDE "data/mapObjects/TradeCenter.asm"
-TradeCenter_Blocks: INCBIN "maps/TradeCenter.blk"
-
-INCLUDE "data/mapHeaders/Colosseum.asm"
-INCLUDE "scripts/Colosseum.asm"
-INCLUDE "data/mapObjects/Colosseum.asm"
-Colosseum_Blocks: INCBIN "maps/Colosseum.blk"
-
INCLUDE "engine/give_pokemon.asm"
-
INCLUDE "engine/predefs.asm"
SECTION "bank14", ROMX
-INCLUDE "data/mapHeaders/Route22.asm"
-INCLUDE "data/mapObjects/Route22.asm"
-Route22_Blocks: INCBIN "maps/Route22.blk"
-
-INCLUDE "data/mapHeaders/Route20.asm"
-INCLUDE "data/mapObjects/Route20.asm"
-Route20_Blocks: INCBIN "maps/Route20.blk"
-
-INCLUDE "data/mapHeaders/Route23.asm"
-INCLUDE "data/mapObjects/Route23.asm"
-Route23_Blocks: INCBIN "maps/Route23.blk"
-
-INCLUDE "data/mapHeaders/Route24.asm"
-INCLUDE "data/mapObjects/Route24.asm"
-Route24_Blocks: INCBIN "maps/Route24.blk"
-
-INCLUDE "data/mapHeaders/Route25.asm"
-INCLUDE "data/mapObjects/Route25.asm"
-Route25_Blocks: INCBIN "maps/Route25.blk"
-
-INCLUDE "data/mapHeaders/IndigoPlateau.asm"
-INCLUDE "scripts/IndigoPlateau.asm"
-INCLUDE "data/mapObjects/IndigoPlateau.asm"
-IndigoPlateau_Blocks: INCBIN "maps/IndigoPlateau.blk"
-
-INCLUDE "data/mapHeaders/SaffronCity.asm"
-INCLUDE "data/mapObjects/SaffronCity.asm"
-SaffronCity_Blocks: INCBIN "maps/SaffronCity.blk"
-INCLUDE "scripts/SaffronCity.asm"
-
-INCLUDE "scripts/Route20.asm"
-INCLUDE "scripts/Route22.asm"
-INCLUDE "scripts/Route23.asm"
-INCLUDE "scripts/Route24.asm"
-INCLUDE "scripts/Route25.asm"
-
-INCLUDE "data/mapHeaders/VictoryRoad2F.asm"
-INCLUDE "scripts/VictoryRoad2F.asm"
-INCLUDE "data/mapObjects/VictoryRoad2F.asm"
-VictoryRoad2F_Blocks: INCBIN "maps/VictoryRoad2F.blk"
-
-INCLUDE "data/mapHeaders/MtMoonB1F.asm"
-INCLUDE "scripts/MtMoonB1F.asm"
-INCLUDE "data/mapObjects/MtMoonB1F.asm"
-MtMoonB1F_Blocks: INCBIN "maps/MtMoonB1F.blk"
-
-INCLUDE "data/mapHeaders/SilphCo7F.asm"
-INCLUDE "scripts/SilphCo7F.asm"
-INCLUDE "data/mapObjects/SilphCo7F.asm"
-SilphCo7F_Blocks: INCBIN "maps/SilphCo7F.blk"
-
-INCLUDE "data/mapHeaders/PokemonMansion2F.asm"
-INCLUDE "scripts/PokemonMansion2F.asm"
-INCLUDE "data/mapObjects/PokemonMansion2F.asm"
-PokemonMansion2F_Blocks: INCBIN "maps/PokemonMansion2F.blk"
-
-INCLUDE "data/mapHeaders/PokemonMansion3F.asm"
-INCLUDE "scripts/PokemonMansion3F.asm"
-INCLUDE "data/mapObjects/PokemonMansion3F.asm"
-PokemonMansion3F_Blocks: INCBIN "maps/PokemonMansion3F.blk"
-
-INCLUDE "data/mapHeaders/PokemonMansionB1F.asm"
-INCLUDE "scripts/PokemonMansionB1F.asm"
-INCLUDE "data/mapObjects/PokemonMansionB1F.asm"
-PokemonMansionB1F_Blocks: INCBIN "maps/PokemonMansionB1F.blk"
-
INCLUDE "engine/battle/init_battle_variables.asm"
INCLUDE "engine/battle/moveEffects/paralyze_effect.asm"
-
INCLUDE "engine/overworld/card_key.asm"
-
INCLUDE "engine/menu/prize_menu.asm"
-
INCLUDE "engine/hidden_object_functions14.asm"
-SECTION "bank15", ROMX
+SECTION "bank15_1", ROMX
-INCLUDE "data/mapHeaders/Route2.asm"
-INCLUDE "data/mapObjects/Route2.asm"
-Route2_Blocks: INCBIN "maps/Route2.blk"
-
-INCLUDE "data/mapHeaders/Route3.asm"
-INCLUDE "data/mapObjects/Route3.asm"
-Route3_Blocks: INCBIN "maps/Route3.blk"
-
-INCLUDE "data/mapHeaders/Route4.asm"
-INCLUDE "data/mapObjects/Route4.asm"
-Route4_Blocks: INCBIN "maps/Route4.blk"
-
-INCLUDE "data/mapHeaders/Route5.asm"
-INCLUDE "data/mapObjects/Route5.asm"
-Route5_Blocks: INCBIN "maps/Route5.blk"
-
-INCLUDE "data/mapHeaders/Route9.asm"
-INCLUDE "data/mapObjects/Route9.asm"
-Route9_Blocks: INCBIN "maps/Route9.blk"
-
-INCLUDE "data/mapHeaders/Route13.asm"
-INCLUDE "data/mapObjects/Route13.asm"
-Route13_Blocks: INCBIN "maps/Route13.blk"
-
-INCLUDE "data/mapHeaders/Route14.asm"
-INCLUDE "data/mapObjects/Route14.asm"
-Route14_Blocks: INCBIN "maps/Route14.blk"
-
-INCLUDE "data/mapHeaders/Route17.asm"
-INCLUDE "data/mapObjects/Route17.asm"
-Route17_Blocks: INCBIN "maps/Route17.blk"
-
-INCLUDE "data/mapHeaders/Route19.asm"
-INCLUDE "data/mapObjects/Route19.asm"
-Route19_Blocks: INCBIN "maps/Route19.blk"
-
-INCLUDE "data/mapHeaders/Route21.asm"
-INCLUDE "data/mapObjects/Route21.asm"
-Route21_Blocks: INCBIN "maps/Route21.blk"
-
-VermilionOldRodHouse_Blocks:
-Route12SuperRodHouse_Blocks:
-Daycare_Blocks: INCBIN "maps/Daycare.blk"
-
-FuchsiaGoodRodHouse_Blocks: INCBIN "maps/FuchsiaGoodRodHouse.blk"
-
INCLUDE "engine/battle/experience.asm"
-INCLUDE "scripts/Route2.asm"
-INCLUDE "scripts/Route3.asm"
-INCLUDE "scripts/Route4.asm"
-INCLUDE "scripts/Route5.asm"
-INCLUDE "scripts/Route9.asm"
-INCLUDE "scripts/Route13.asm"
-INCLUDE "scripts/Route14.asm"
-INCLUDE "scripts/Route17.asm"
-INCLUDE "scripts/Route19.asm"
-INCLUDE "scripts/Route21.asm"
-INCLUDE "data/mapHeaders/VermilionOldRodHouse.asm"
-INCLUDE "scripts/VermilionOldRodHouse.asm"
-INCLUDE "data/mapObjects/VermilionOldRodHouse.asm"
+SECTION "bank15_2", ROMX
-INCLUDE "data/mapHeaders/CeladonMart2F.asm"
-INCLUDE "scripts/CeladonMart2F.asm"
-INCLUDE "data/mapObjects/CeladonMart2F.asm"
-CeladonMart2F_Blocks: INCBIN "maps/CeladonMart2F.blk"
-
-INCLUDE "data/mapHeaders/FuchsiaGoodRodHouse.asm"
-INCLUDE "scripts/FuchsiaGoodRodHouse.asm"
-INCLUDE "data/mapObjects/FuchsiaGoodRodHouse.asm"
-
-INCLUDE "data/mapHeaders/Daycare.asm"
-INCLUDE "scripts/Daycare.asm"
-INCLUDE "data/mapObjects/Daycare.asm"
-
-INCLUDE "data/mapHeaders/Route12SuperRodHouse.asm"
-INCLUDE "scripts/Route12SuperRodHouse.asm"
-INCLUDE "data/mapObjects/Route12SuperRodHouse.asm"
-
-INCLUDE "data/mapHeaders/SilphCo8F.asm"
-INCLUDE "scripts/SilphCo8F.asm"
-INCLUDE "data/mapObjects/SilphCo8F.asm"
-SilphCo8F_Blocks: INCBIN "maps/SilphCo8F.blk"
-
INCLUDE "engine/menu/diploma.asm"
-
INCLUDE "engine/overworld/trainers.asm"
-SECTION "bank16", ROMX
+SECTION "bank16_1", ROMX
-INCLUDE "data/mapHeaders/Route6.asm"
-INCLUDE "data/mapObjects/Route6.asm"
-Route6_Blocks: INCBIN "maps/Route6.blk"
-
-INCLUDE "data/mapHeaders/Route8.asm"
-INCLUDE "data/mapObjects/Route8.asm"
-Route8_Blocks: INCBIN "maps/Route8.blk"
-
-INCLUDE "data/mapHeaders/Route10.asm"
-INCLUDE "data/mapObjects/Route10.asm"
-Route10_Blocks: INCBIN "maps/Route10.blk"
-
-INCLUDE "data/mapHeaders/Route11.asm"
-INCLUDE "data/mapObjects/Route11.asm"
-Route11_Blocks: INCBIN "maps/Route11.blk"
-
-INCLUDE "data/mapHeaders/Route12.asm"
-INCLUDE "data/mapObjects/Route12.asm"
-Route12_Blocks: INCBIN "maps/Route12.blk"
-
-INCLUDE "data/mapHeaders/Route15.asm"
-INCLUDE "data/mapObjects/Route15.asm"
-Route15_Blocks: INCBIN "maps/Route15.blk"
-
-INCLUDE "data/mapHeaders/Route16.asm"
-INCLUDE "data/mapObjects/Route16.asm"
-Route16_Blocks: INCBIN "maps/Route16.blk"
-
-INCLUDE "data/mapHeaders/Route18.asm"
-INCLUDE "data/mapObjects/Route18.asm"
-Route18_Blocks: INCBIN "maps/Route18.blk"
-
- INCBIN "maps/UnusedPokecenterCopy.blk"
-
INCLUDE "engine/battle/common_text.asm"
-
INCLUDE "engine/experience.asm"
-
INCLUDE "engine/overworld/oaks_aide.asm"
-INCLUDE "scripts/Route6.asm"
-INCLUDE "scripts/Route8.asm"
-INCLUDE "scripts/Route10.asm"
-INCLUDE "scripts/Route11.asm"
-INCLUDE "scripts/Route12.asm"
-INCLUDE "scripts/Route15.asm"
-INCLUDE "scripts/Route16.asm"
-INCLUDE "scripts/Route18.asm"
-INCLUDE "data/mapHeaders/PokemonFanClub.asm"
-INCLUDE "scripts/PokemonFanClub.asm"
-INCLUDE "data/mapObjects/PokemonFanClub.asm"
-PokemonFanClub_Blocks: INCBIN "maps/PokemonFanClub.blk"
+SECTION "bank16_2", ROMX
-INCLUDE "data/mapHeaders/SilphCo2F.asm"
-INCLUDE "scripts/SilphCo2F.asm"
-INCLUDE "data/mapObjects/SilphCo2F.asm"
-SilphCo2F_Blocks: INCBIN "maps/SilphCo2F.blk"
-
-INCLUDE "data/mapHeaders/SilphCo3F.asm"
-INCLUDE "scripts/SilphCo3F.asm"
-INCLUDE "data/mapObjects/SilphCo3F.asm"
-SilphCo3F_Blocks: INCBIN "maps/SilphCo3F.blk"
-
-INCLUDE "data/mapHeaders/SilphCo10F.asm"
-INCLUDE "scripts/SilphCo10F.asm"
-INCLUDE "data/mapObjects/SilphCo10F.asm"
-SilphCo10F_Blocks: INCBIN "maps/SilphCo10F.blk"
-
-INCLUDE "data/mapHeaders/LancesRoom.asm"
-INCLUDE "scripts/LancesRoom.asm"
-INCLUDE "data/mapObjects/LancesRoom.asm"
-LancesRoom_Blocks: INCBIN "maps/LancesRoom.blk"
-
-INCLUDE "data/mapHeaders/HallOfFame.asm"
-INCLUDE "scripts/HallOfFame.asm"
-INCLUDE "data/mapObjects/HallOfFame.asm"
-HallOfFame_Blocks: INCBIN "maps/HallOfFame.blk"
-
INCLUDE "engine/overworld/saffron_guards.asm"
-SECTION "bank17", ROMX
+SECTION "bank17_1", ROMX
-SaffronMart_Blocks:
-LavenderMart_Blocks:
-CeruleanMart_Blocks:
-VermilionMart_Blocks: INCBIN "maps/VermilionMart.blk"
-
-CopycatsHouse2F_Blocks:
-RedsHouse2F_Blocks: INCBIN "maps/RedsHouse2F.blk"
-
-Museum1F_Blocks: INCBIN "maps/Museum1F.blk"
-
-Museum2F_Blocks: INCBIN "maps/Museum2F.blk"
-
-SaffronPokecenter_Blocks:
-VermilionPokecenter_Blocks:
-LavenderPokecenter_Blocks:
-PewterPokecenter_Blocks: INCBIN "maps/PewterPokecenter.blk"
-
-UndergroundPathRoute7_Blocks:
-UndergroundPathRoute7Copy_Blocks:
-UndergroundPathRoute6_Blocks:
-UndergroundPathRoute5_Blocks: INCBIN "maps/UndergroundPathRoute5.blk"
-
-Route2Gate_Blocks:
-ViridianForestSouthGate_Blocks:
-ViridianForestNorthGate_Blocks: INCBIN "maps/ViridianForestNorthGate.blk"
-
-INCLUDE "data/mapHeaders/RedsHouse2F.asm"
-INCLUDE "scripts/RedsHouse2F.asm"
-INCLUDE "data/mapObjects/RedsHouse2F.asm"
-
INCLUDE "engine/predefs17.asm"
-INCLUDE "data/mapHeaders/Museum1F.asm"
-INCLUDE "scripts/Museum1F.asm"
-INCLUDE "data/mapObjects/Museum1F.asm"
-INCLUDE "data/mapHeaders/Museum2F.asm"
-INCLUDE "scripts/Museum2F.asm"
-INCLUDE "data/mapObjects/Museum2F.asm"
+SECTION "bank17_2", ROMX
-INCLUDE "data/mapHeaders/PewterGym.asm"
-INCLUDE "scripts/PewterGym.asm"
-INCLUDE "data/mapObjects/PewterGym.asm"
-PewterGym_Blocks: INCBIN "maps/PewterGym.blk"
-
-INCLUDE "data/mapHeaders/PewterPokecenter.asm"
-INCLUDE "scripts/PewterPokecenter.asm"
-INCLUDE "data/mapObjects/PewterPokecenter.asm"
-
-INCLUDE "data/mapHeaders/CeruleanPokecenter.asm"
-INCLUDE "scripts/CeruleanPokecenter.asm"
-INCLUDE "data/mapObjects/CeruleanPokecenter.asm"
-CeruleanPokecenter_Blocks: INCBIN "maps/CeruleanPokecenter.blk"
-
-INCLUDE "data/mapHeaders/CeruleanGym.asm"
-INCLUDE "scripts/CeruleanGym.asm"
-INCLUDE "data/mapObjects/CeruleanGym.asm"
-CeruleanGym_Blocks: INCBIN "maps/CeruleanGym.blk"
-
-INCLUDE "data/mapHeaders/CeruleanMart.asm"
-INCLUDE "scripts/CeruleanMart.asm"
-INCLUDE "data/mapObjects/CeruleanMart.asm"
-
-INCLUDE "data/mapHeaders/LavenderPokecenter.asm"
-INCLUDE "scripts/LavenderPokecenter.asm"
-INCLUDE "data/mapObjects/LavenderPokecenter.asm"
-
-INCLUDE "data/mapHeaders/LavenderMart.asm"
-INCLUDE "scripts/LavenderMart.asm"
-INCLUDE "data/mapObjects/LavenderMart.asm"
-
-INCLUDE "data/mapHeaders/VermilionPokecenter.asm"
-INCLUDE "scripts/VermilionPokecenter.asm"
-INCLUDE "data/mapObjects/VermilionPokecenter.asm"
-
-INCLUDE "data/mapHeaders/VermilionMart.asm"
-INCLUDE "scripts/VermilionMart.asm"
-INCLUDE "data/mapObjects/VermilionMart.asm"
-
-INCLUDE "data/mapHeaders/VermilionGym.asm"
-INCLUDE "scripts/VermilionGym.asm"
-INCLUDE "data/mapObjects/VermilionGym.asm"
-VermilionGym_Blocks: INCBIN "maps/VermilionGym.blk"
-
-INCLUDE "data/mapHeaders/CopycatsHouse2F.asm"
-INCLUDE "scripts/CopycatsHouse2F.asm"
-INCLUDE "data/mapObjects/CopycatsHouse2F.asm"
-
-INCLUDE "data/mapHeaders/FightingDojo.asm"
-INCLUDE "scripts/FightingDojo.asm"
-INCLUDE "data/mapObjects/FightingDojo.asm"
-FightingDojo_Blocks: INCBIN "maps/FightingDojo.blk"
-
-INCLUDE "data/mapHeaders/SaffronGym.asm"
-INCLUDE "scripts/SaffronGym.asm"
-INCLUDE "data/mapObjects/SaffronGym.asm"
-SaffronGym_Blocks: INCBIN "maps/SaffronGym.blk"
-
-INCLUDE "data/mapHeaders/SaffronMart.asm"
-INCLUDE "scripts/SaffronMart.asm"
-INCLUDE "data/mapObjects/SaffronMart.asm"
-
-INCLUDE "data/mapHeaders/SilphCo1F.asm"
-INCLUDE "scripts/SilphCo1F.asm"
-INCLUDE "data/mapObjects/SilphCo1F.asm"
-SilphCo1F_Blocks: INCBIN "maps/SilphCo1F.blk"
-
-INCLUDE "data/mapHeaders/SaffronPokecenter.asm"
-INCLUDE "scripts/SaffronPokecenter.asm"
-INCLUDE "data/mapObjects/SaffronPokecenter.asm"
-
-INCLUDE "data/mapHeaders/ViridianForestNorthGate.asm"
-INCLUDE "scripts/ViridianForestNorthGate.asm"
-INCLUDE "data/mapObjects/ViridianForestNorthGate.asm"
-
-INCLUDE "data/mapHeaders/Route2Gate.asm"
-INCLUDE "scripts/Route2Gate.asm"
-INCLUDE "data/mapObjects/Route2Gate.asm"
-
-INCLUDE "data/mapHeaders/ViridianForestSouthGate.asm"
-INCLUDE "scripts/ViridianForestSouthGate.asm"
-INCLUDE "data/mapObjects/ViridianForestSouthGate.asm"
-
-INCLUDE "data/mapHeaders/UndergroundPathRoute5.asm"
-INCLUDE "scripts/UndergroundPathRoute5.asm"
-INCLUDE "data/mapObjects/UndergroundPathRoute5.asm"
-
-INCLUDE "data/mapHeaders/UndergroundPathRoute6.asm"
-INCLUDE "scripts/UndergroundPathRoute6.asm"
-INCLUDE "data/mapObjects/UndergroundPathRoute6.asm"
-
-INCLUDE "data/mapHeaders/UndergroundPathRoute7.asm"
-INCLUDE "scripts/UndergroundPathRoute7.asm"
-INCLUDE "data/mapObjects/UndergroundPathRoute7.asm"
-
-INCLUDE "data/mapHeaders/UndergroundPathRoute7Copy.asm"
-INCLUDE "scripts/UndergroundPathRoute7Copy.asm"
-INCLUDE "data/mapObjects/UndergroundPathRoute7Copy.asm"
-
-INCLUDE "data/mapHeaders/SilphCo9F.asm"
-INCLUDE "scripts/SilphCo9F.asm"
-INCLUDE "data/mapObjects/SilphCo9F.asm"
-SilphCo9F_Blocks: INCBIN "maps/SilphCo9F.blk"
-
-INCLUDE "data/mapHeaders/VictoryRoad1F.asm"
-INCLUDE "scripts/VictoryRoad1F.asm"
-INCLUDE "data/mapObjects/VictoryRoad1F.asm"
-VictoryRoad1F_Blocks: INCBIN "maps/VictoryRoad1F.blk"
-
INCLUDE "engine/predefs17_2.asm"
-
INCLUDE "engine/hidden_object_functions17.asm"
-SECTION "bank18", ROMX
+SECTION "bank18_1", ROMX
-ViridianForest_Blocks: INCBIN "maps/ViridianForest.blk"
-UndergroundPathNorthSouth_Blocks: INCBIN "maps/UndergroundPathNorthSouth.blk"
-UndergroundPathWestEast_Blocks: INCBIN "maps/UndergroundPathWestEast.blk"
-
- INCBIN "maps/UnusedDiglettsCaveCopy.blk"
-
-SSAnneB1FRooms_Blocks:
-SSAnne2FRooms_Blocks: INCBIN "maps/SSAnne2FRooms.blk"
-
-INCLUDE "data/mapHeaders/PokemonTower1F.asm"
-INCLUDE "scripts/PokemonTower1F.asm"
-INCLUDE "data/mapObjects/PokemonTower1F.asm"
-PokemonTower1F_Blocks: INCBIN "maps/PokemonTower1F.blk"
-
-INCLUDE "data/mapHeaders/PokemonTower2F.asm"
-INCLUDE "scripts/PokemonTower2F.asm"
-INCLUDE "data/mapObjects/PokemonTower2F.asm"
-PokemonTower2F_Blocks: INCBIN "maps/PokemonTower2F.blk"
-
-INCLUDE "data/mapHeaders/PokemonTower3F.asm"
-INCLUDE "scripts/PokemonTower3F.asm"
-INCLUDE "data/mapObjects/PokemonTower3F.asm"
-PokemonTower3F_Blocks: INCBIN "maps/PokemonTower3F.blk"
-
-INCLUDE "data/mapHeaders/PokemonTower4F.asm"
-INCLUDE "scripts/PokemonTower4F.asm"
-INCLUDE "data/mapObjects/PokemonTower4F.asm"
-PokemonTower4F_Blocks: INCBIN "maps/PokemonTower4F.blk"
-
-INCLUDE "data/mapHeaders/PokemonTower5F.asm"
-INCLUDE "scripts/PokemonTower5F.asm"
-INCLUDE "data/mapObjects/PokemonTower5F.asm"
-PokemonTower5F_Blocks: INCBIN "maps/PokemonTower5F.blk"
-
-INCLUDE "data/mapHeaders/PokemonTower6F.asm"
-INCLUDE "scripts/PokemonTower6F.asm"
-INCLUDE "data/mapObjects/PokemonTower6F.asm"
-PokemonTower6F_Blocks: INCBIN "maps/PokemonTower6F.blk"
-
- INCBIN "maps/UnusedEmptyMap.blk"
-
-INCLUDE "data/mapHeaders/PokemonTower7F.asm"
-INCLUDE "scripts/PokemonTower7F.asm"
-INCLUDE "data/mapObjects/PokemonTower7F.asm"
-PokemonTower7F_Blocks: INCBIN "maps/PokemonTower7F.blk"
-
-INCLUDE "data/mapHeaders/CeladonMart1F.asm"
-INCLUDE "scripts/CeladonMart1F.asm"
-INCLUDE "data/mapObjects/CeladonMart1F.asm"
-CeladonMart1F_Blocks: INCBIN "maps/CeladonMart1F.blk"
-
INCLUDE "engine/overworld/cinnabar_lab.asm"
-INCLUDE "data/mapHeaders/ViridianForest.asm"
-INCLUDE "scripts/ViridianForest.asm"
-INCLUDE "data/mapObjects/ViridianForest.asm"
-INCLUDE "data/mapHeaders/SSAnne1F.asm"
-INCLUDE "scripts/SSAnne1F.asm"
-INCLUDE "data/mapObjects/SSAnne1F.asm"
-SSAnne1F_Blocks: INCBIN "maps/SSAnne1F.blk"
+SECTION "bank18_2", ROMX
-INCLUDE "data/mapHeaders/SSAnne2F.asm"
-INCLUDE "scripts/SSAnne2F.asm"
-INCLUDE "data/mapObjects/SSAnne2F.asm"
-SSAnne2F_Blocks: INCBIN "maps/SSAnne2F.blk"
-
-INCLUDE "data/mapHeaders/SSAnneB1F.asm"
-INCLUDE "scripts/SSAnneB1F.asm"
-INCLUDE "data/mapObjects/SSAnneB1F.asm"
-SSAnneB1F_Blocks: INCBIN "maps/SSAnneB1F.blk"
-
-INCLUDE "data/mapHeaders/SSAnneBow.asm"
-INCLUDE "scripts/SSAnneBow.asm"
-INCLUDE "data/mapObjects/SSAnneBow.asm"
-SSAnneBow_Blocks: INCBIN "maps/SSAnneBow.blk"
-
-INCLUDE "data/mapHeaders/SSAnneKitchen.asm"
-INCLUDE "scripts/SSAnneKitchen.asm"
-INCLUDE "data/mapObjects/SSAnneKitchen.asm"
-SSAnneKitchen_Blocks: INCBIN "maps/SSAnneKitchen.blk"
-
-INCLUDE "data/mapHeaders/SSAnneCaptainsRoom.asm"
-INCLUDE "scripts/SSAnneCaptainsRoom.asm"
-INCLUDE "data/mapObjects/SSAnneCaptainsRoom.asm"
-SSAnneCaptainsRoom_Blocks: INCBIN "maps/SSAnneCaptainsRoom.blk"
-
-INCLUDE "data/mapHeaders/SSAnne1FRooms.asm"
-INCLUDE "scripts/SSAnne1FRooms.asm"
-INCLUDE "data/mapObjects/SSAnne1FRooms.asm"
-SSAnne1FRooms_Blocks: INCBIN "maps/SSAnne1FRooms.blk"
-
-INCLUDE "data/mapHeaders/SSAnne2FRooms.asm"
-INCLUDE "scripts/SSAnne2FRooms.asm"
-INCLUDE "data/mapObjects/SSAnne2FRooms.asm"
-
-INCLUDE "data/mapHeaders/SSAnneB1FRooms.asm"
-INCLUDE "scripts/SSAnneB1FRooms.asm"
-INCLUDE "data/mapObjects/SSAnneB1FRooms.asm"
-
-INCLUDE "data/mapHeaders/UndergroundPathNorthSouth.asm"
-INCLUDE "scripts/UndergroundPathNorthSouth.asm"
-INCLUDE "data/mapObjects/UndergroundPathNorthSouth.asm"
-
-INCLUDE "data/mapHeaders/UndergroundPathWestEast.asm"
-INCLUDE "scripts/UndergroundPathWestEast.asm"
-INCLUDE "data/mapObjects/UndergroundPathWestEast.asm"
-
-INCLUDE "data/mapHeaders/DiglettsCave.asm"
-INCLUDE "scripts/DiglettsCave.asm"
-INCLUDE "data/mapObjects/DiglettsCave.asm"
-DiglettsCave_Blocks: INCBIN "maps/DiglettsCave.blk"
-
-INCLUDE "data/mapHeaders/SilphCo11F.asm"
-INCLUDE "scripts/SilphCo11F.asm"
-INCLUDE "data/mapObjects/SilphCo11F.asm"
-SilphCo11F_Blocks: INCBIN "maps/SilphCo11F.blk"
-
INCLUDE "engine/hidden_object_functions18.asm"
-SECTION "bank19", ROMX
-
-Overworld_GFX: INCBIN "gfx/tilesets/overworld.2bpp"
-Overworld_Block: INCBIN "gfx/blocksets/overworld.bst"
-
-RedsHouse1_GFX:
-RedsHouse2_GFX: INCBIN "gfx/tilesets/reds_house.2bpp"
- ds 16
-RedsHouse1_Block:
-RedsHouse2_Block: INCBIN "gfx/blocksets/reds_house.bst"
-
-House_GFX: INCBIN "gfx/tilesets/house.2bpp"
-House_Block: INCBIN "gfx/blocksets/house.bst"
-Mansion_GFX: INCBIN "gfx/tilesets/mansion.2bpp"
-Mansion_Block: INCBIN "gfx/blocksets/mansion.bst"
-ShipPort_GFX: INCBIN "gfx/tilesets/ship_port.2bpp"
-ShipPort_Block: INCBIN "gfx/blocksets/ship_port.bst"
-Interior_GFX: INCBIN "gfx/tilesets/interior.2bpp"
-Interior_Block: INCBIN "gfx/blocksets/interior.bst"
-Plateau_GFX: INCBIN "gfx/tilesets/plateau.2bpp"
-Plateau_Block: INCBIN "gfx/blocksets/plateau.bst"
-
-
SECTION "bank1A", ROMX
INCLUDE "engine/battle/decrement_pp.asm"
@@ -1888,48 +330,7 @@
ENDC
Version_GFXEnd:
-Dojo_GFX:
-Gym_GFX: INCBIN "gfx/tilesets/gym.2bpp"
-Dojo_Block:
-Gym_Block: INCBIN "gfx/blocksets/gym.bst"
-Mart_GFX:
-Pokecenter_GFX: INCBIN "gfx/tilesets/pokecenter.2bpp"
-Mart_Block:
-Pokecenter_Block: INCBIN "gfx/blocksets/pokecenter.bst"
-
-ForestGate_GFX:
-Museum_GFX:
-Gate_GFX: INCBIN "gfx/tilesets/gate.2bpp"
-ForestGate_Block:
-Museum_Block:
-Gate_Block: INCBIN "gfx/blocksets/gate.bst"
-
-Forest_GFX: INCBIN "gfx/tilesets/forest.2bpp"
-Forest_Block: INCBIN "gfx/blocksets/forest.bst"
-Facility_GFX: INCBIN "gfx/tilesets/facility.2bpp"
-Facility_Block: INCBIN "gfx/blocksets/facility.bst"
- ds 1
-
-
-SECTION "bank1B", ROMX
-
-Cemetery_GFX: INCBIN "gfx/tilesets/cemetery.2bpp"
-Cemetery_Block: INCBIN "gfx/blocksets/cemetery.bst"
-Cavern_GFX: INCBIN "gfx/tilesets/cavern.2bpp"
-Cavern_Block: INCBIN "gfx/blocksets/cavern.bst"
-Lobby_GFX: INCBIN "gfx/tilesets/lobby.2bpp"
-Lobby_Block: INCBIN "gfx/blocksets/lobby.bst"
-Ship_GFX: INCBIN "gfx/tilesets/ship.2bpp"
-Ship_Block: INCBIN "gfx/blocksets/ship.bst"
-Lab_GFX: INCBIN "gfx/tilesets/lab.2bpp"
-Lab_Block: INCBIN "gfx/blocksets/lab.bst"
-Club_GFX: INCBIN "gfx/tilesets/club.2bpp"
-Club_Block: INCBIN "gfx/blocksets/club.bst"
-Underground_GFX: INCBIN "gfx/tilesets/underground.2bpp"
-Underground_Block: INCBIN "gfx/blocksets/underground.bst"
-
-
SECTION "bank1C", ROMX
INCLUDE "engine/gamefreak.asm"
@@ -1945,135 +346,21 @@
INCLUDE "engine/save.asm"
-SECTION "bank1D", ROMX
+SECTION "bank1D_1", ROMX
-CopycatsHouse1F_Blocks: INCBIN "maps/CopycatsHouse1F.blk"
-
-CinnabarMart_Blocks:
-PewterMart_Blocks: INCBIN "maps/PewterMart.blk"
-
-FuchsiaBillsGrandpasHouse_Blocks: INCBIN "maps/FuchsiaBillsGrandpasHouse.blk"
-
-CinnabarPokecenter_Blocks:
-FuchsiaPokecenter_Blocks: INCBIN "maps/FuchsiaPokecenter.blk"
-
-CeruleanBadgeHouse_Blocks: INCBIN "maps/CeruleanBadgeHouse.blk"
-
INCLUDE "engine/HoF_room_pc.asm"
-
INCLUDE "engine/status_ailments.asm"
-
INCLUDE "engine/items/itemfinder.asm"
-INCLUDE "scripts/CeruleanCity_2.asm"
-INCLUDE "data/mapHeaders/ViridianGym.asm"
-INCLUDE "scripts/ViridianGym.asm"
-INCLUDE "data/mapObjects/ViridianGym.asm"
-ViridianGym_Blocks: INCBIN "maps/ViridianGym.blk"
+SECTION "bank1D_2", ROMX
-INCLUDE "data/mapHeaders/PewterMart.asm"
-INCLUDE "scripts/PewterMart.asm"
-INCLUDE "data/mapObjects/PewterMart.asm"
-
-INCLUDE "data/mapHeaders/CeruleanCave1F.asm"
-INCLUDE "scripts/CeruleanCave1F.asm"
-INCLUDE "data/mapObjects/CeruleanCave1F.asm"
-CeruleanCave1F_Blocks: INCBIN "maps/CeruleanCave1F.blk"
-
-INCLUDE "data/mapHeaders/CeruleanBadgeHouse.asm"
-INCLUDE "scripts/CeruleanBadgeHouse.asm"
-INCLUDE "data/mapObjects/CeruleanBadgeHouse.asm"
-
INCLUDE "engine/menu/vending_machine.asm"
-INCLUDE "data/mapHeaders/FuchsiaBillsGrandpasHouse.asm"
-INCLUDE "scripts/FuchsiaBillsGrandpasHouse.asm"
-INCLUDE "data/mapObjects/FuchsiaBillsGrandpasHouse.asm"
-INCLUDE "data/mapHeaders/FuchsiaPokecenter.asm"
-INCLUDE "scripts/FuchsiaPokecenter.asm"
-INCLUDE "data/mapObjects/FuchsiaPokecenter.asm"
+SECTION "bank1D_3", ROMX
-INCLUDE "data/mapHeaders/WardensHouse.asm"
-INCLUDE "scripts/WardensHouse.asm"
-INCLUDE "data/mapObjects/WardensHouse.asm"
-WardensHouse_Blocks: INCBIN "maps/WardensHouse.blk"
-
-INCLUDE "data/mapHeaders/SafariZoneGate.asm"
-INCLUDE "scripts/SafariZoneGate.asm"
-INCLUDE "data/mapObjects/SafariZoneGate.asm"
-SafariZoneGate_Blocks: INCBIN "maps/SafariZoneGate.blk"
-
-INCLUDE "data/mapHeaders/FuchsiaGym.asm"
-INCLUDE "scripts/FuchsiaGym.asm"
-INCLUDE "data/mapObjects/FuchsiaGym.asm"
-FuchsiaGym_Blocks: INCBIN "maps/FuchsiaGym.blk"
-
-INCLUDE "data/mapHeaders/FuchsiaMeetingRoom.asm"
-INCLUDE "scripts/FuchsiaMeetingRoom.asm"
-INCLUDE "data/mapObjects/FuchsiaMeetingRoom.asm"
-FuchsiaMeetingRoom_Blocks: INCBIN "maps/FuchsiaMeetingRoom.blk"
-
-INCLUDE "data/mapHeaders/CinnabarGym.asm"
-INCLUDE "scripts/CinnabarGym.asm"
-INCLUDE "data/mapObjects/CinnabarGym.asm"
-CinnabarGym_Blocks: INCBIN "maps/CinnabarGym.blk"
-
-INCLUDE "data/mapHeaders/CinnabarLab.asm"
-INCLUDE "scripts/CinnabarLab.asm"
-INCLUDE "data/mapObjects/CinnabarLab.asm"
-CinnabarLab_Blocks: INCBIN "maps/CinnabarLab.blk"
-
-INCLUDE "data/mapHeaders/CinnabarLabTradeRoom.asm"
-INCLUDE "scripts/CinnabarLabTradeRoom.asm"
-INCLUDE "data/mapObjects/CinnabarLabTradeRoom.asm"
-CinnabarLabTradeRoom_Blocks: INCBIN "maps/CinnabarLabTradeRoom.blk"
-
-INCLUDE "data/mapHeaders/CinnabarLabMetronomeRoom.asm"
-INCLUDE "scripts/CinnabarLabMetronomeRoom.asm"
-INCLUDE "data/mapObjects/CinnabarLabMetronomeRoom.asm"
-CinnabarLabMetronomeRoom_Blocks: INCBIN "maps/CinnabarLabMetronomeRoom.blk"
-
-INCLUDE "data/mapHeaders/CinnabarLabFossilRoom.asm"
-INCLUDE "scripts/CinnabarLabFossilRoom.asm"
-INCLUDE "data/mapObjects/CinnabarLabFossilRoom.asm"
-CinnabarLabFossilRoom_Blocks: INCBIN "maps/CinnabarLabFossilRoom.blk"
-
-INCLUDE "data/mapHeaders/CinnabarPokecenter.asm"
-INCLUDE "scripts/CinnabarPokecenter.asm"
-INCLUDE "data/mapObjects/CinnabarPokecenter.asm"
-
-INCLUDE "data/mapHeaders/CinnabarMart.asm"
-INCLUDE "scripts/CinnabarMart.asm"
-INCLUDE "data/mapObjects/CinnabarMart.asm"
-
-INCLUDE "data/mapHeaders/CopycatsHouse1F.asm"
-INCLUDE "scripts/CopycatsHouse1F.asm"
-INCLUDE "data/mapObjects/CopycatsHouse1F.asm"
-
-INCLUDE "data/mapHeaders/ChampionsRoom.asm"
-INCLUDE "scripts/ChampionsRoom.asm"
-INCLUDE "data/mapObjects/ChampionsRoom.asm"
-ChampionsRoom_Blocks: INCBIN "maps/ChampionsRoom.blk"
-
-INCLUDE "data/mapHeaders/LoreleisRoom.asm"
-INCLUDE "scripts/LoreleisRoom.asm"
-INCLUDE "data/mapObjects/LoreleisRoom.asm"
-LoreleisRoom_Blocks: INCBIN "maps/LoreleisRoom.blk"
-
-INCLUDE "data/mapHeaders/BrunosRoom.asm"
-INCLUDE "scripts/BrunosRoom.asm"
-INCLUDE "data/mapObjects/BrunosRoom.asm"
-BrunosRoom_Blocks: INCBIN "maps/BrunosRoom.blk"
-
-INCLUDE "data/mapHeaders/AgathasRoom.asm"
-INCLUDE "scripts/AgathasRoom.asm"
-INCLUDE "data/mapObjects/AgathasRoom.asm"
-AgathasRoom_Blocks: INCBIN "maps/AgathasRoom.blk"
-
INCLUDE "engine/menu/league_pc.asm"
-
INCLUDE "engine/overworld/hidden_items.asm"
@@ -2080,9 +367,7 @@
SECTION "bank1E", ROMX
INCLUDE "engine/battle/animations.asm"
-
INCLUDE "engine/overworld/cut2.asm"
-
INCLUDE "engine/overworld/ssanne.asm"
RedFishingTilesFront: INCBIN "gfx/red_fishing_tile_front.2bpp"
@@ -2091,9 +376,6 @@
RedFishingRodTiles: INCBIN "gfx/red_fishingrod_tiles.2bpp"
INCLUDE "data/animations.asm"
-
INCLUDE "engine/evolution.asm"
-
INCLUDE "engine/overworld/elevator.asm"
-
INCLUDE "engine/items/tm_prices.asm"
--- /dev/null
+++ b/maps.asm
@@ -1,0 +1,1224 @@
+INCLUDE "constants.asm"
+
+
+SECTION "Maps 1", ROMX
+
+INCLUDE "data/mapHeaders/CeladonCity.asm"
+INCLUDE "data/mapObjects/CeladonCity.asm"
+CeladonCity_Blocks: INCBIN "maps/CeladonCity.blk"
+
+INCLUDE "data/mapHeaders/PalletTown.asm"
+INCLUDE "data/mapObjects/PalletTown.asm"
+PalletTown_Blocks: INCBIN "maps/PalletTown.blk"
+
+INCLUDE "data/mapHeaders/ViridianCity.asm"
+INCLUDE "data/mapObjects/ViridianCity.asm"
+ViridianCity_Blocks: INCBIN "maps/ViridianCity.blk"
+
+INCLUDE "data/mapHeaders/PewterCity.asm"
+ ds 1
+INCLUDE "data/mapObjects/PewterCity.asm"
+PewterCity_Blocks: INCBIN "maps/PewterCity.blk"
+
+INCLUDE "data/mapHeaders/CeruleanCity.asm"
+INCLUDE "data/mapObjects/CeruleanCity.asm"
+CeruleanCity_Blocks: INCBIN "maps/CeruleanCity.blk"
+
+INCLUDE "data/mapHeaders/VermilionCity.asm"
+INCLUDE "data/mapObjects/VermilionCity.asm"
+VermilionCity_Blocks: INCBIN "maps/VermilionCity.blk"
+
+INCLUDE "data/mapHeaders/FuchsiaCity.asm"
+INCLUDE "data/mapObjects/FuchsiaCity.asm"
+FuchsiaCity_Blocks: INCBIN "maps/FuchsiaCity.blk"
+
+
+SECTION "Maps 2", ROMX
+
+INCLUDE "scripts/PalletTown.asm"
+INCLUDE "scripts/ViridianCity.asm"
+INCLUDE "scripts/PewterCity.asm"
+INCLUDE "scripts/CeruleanCity.asm"
+INCLUDE "scripts/VermilionCity.asm"
+INCLUDE "scripts/CeladonCity.asm"
+INCLUDE "scripts/FuchsiaCity.asm"
+
+INCLUDE "data/mapHeaders/BluesHouse.asm"
+INCLUDE "scripts/BluesHouse.asm"
+INCLUDE "data/mapObjects/BluesHouse.asm"
+BluesHouse_Blocks: INCBIN "maps/BluesHouse.blk"
+
+INCLUDE "data/mapHeaders/VermilionTradeHouse.asm"
+INCLUDE "scripts/VermilionTradeHouse.asm"
+INCLUDE "data/mapObjects/VermilionTradeHouse.asm"
+VermilionTradeHouse_Blocks: INCBIN "maps/VermilionTradeHouse.blk"
+
+INCLUDE "data/mapHeaders/IndigoPlateauLobby.asm"
+INCLUDE "scripts/IndigoPlateauLobby.asm"
+INCLUDE "data/mapObjects/IndigoPlateauLobby.asm"
+IndigoPlateauLobby_Blocks: INCBIN "maps/IndigoPlateauLobby.blk"
+
+INCLUDE "data/mapHeaders/SilphCo4F.asm"
+INCLUDE "scripts/SilphCo4F.asm"
+INCLUDE "data/mapObjects/SilphCo4F.asm"
+SilphCo4F_Blocks: INCBIN "maps/SilphCo4F.blk"
+
+INCLUDE "data/mapHeaders/SilphCo5F.asm"
+INCLUDE "scripts/SilphCo5F.asm"
+INCLUDE "data/mapObjects/SilphCo5F.asm"
+SilphCo5F_Blocks: INCBIN "maps/SilphCo5F.blk"
+
+INCLUDE "data/mapHeaders/SilphCo6F.asm"
+INCLUDE "scripts/SilphCo6F.asm"
+INCLUDE "data/mapObjects/SilphCo6F.asm"
+SilphCo6F_Blocks: INCBIN "maps/SilphCo6F.blk"
+
+
+SECTION "Maps 3", ROMX
+
+INCLUDE "data/mapHeaders/CinnabarIsland.asm"
+INCLUDE "data/mapObjects/CinnabarIsland.asm"
+CinnabarIsland_Blocks: INCBIN "maps/CinnabarIsland.blk"
+
+INCLUDE "data/mapHeaders/Route1.asm"
+INCLUDE "data/mapObjects/Route1.asm"
+Route1_Blocks: INCBIN "maps/Route1.blk"
+
+UndergroundPathRoute8_Blocks: INCBIN "maps/UndergroundPathRoute8.blk"
+
+OaksLab_Blocks: INCBIN "maps/OaksLab.blk"
+
+MrPsychicsHouse_Blocks:
+NameRatersHouse_Blocks:
+MrFujisHouse_Blocks:
+Route16FlyHouse_Blocks:
+Route2TradeHouse_Blocks:
+SaffronPidgeyHouse_Blocks:
+VermilionPidgeyHouse_Blocks:
+LavenderCuboneHouse_Blocks:
+CeruleanTradeHouse_Blocks:
+PewterNidoranHouse_Blocks:
+PewterSpeechHouse_Blocks:
+ViridianNicknameHouse_Blocks: INCBIN "maps/ViridianNicknameHouse.blk"
+
+CeladonMansionRoofHouse_Blocks:
+ViridianSchoolHouse_Blocks: INCBIN "maps/ViridianSchoolHouse.blk"
+
+CeruleanTrashedHouse_Blocks: INCBIN "maps/CeruleanTrashedHouse.blk"
+
+DiglettsCaveRoute11_Blocks:
+DiglettsCaveRoute2_Blocks: INCBIN "maps/DiglettsCaveRoute2.blk"
+
+
+SECTION "Maps 4", ROMX
+
+INCLUDE "scripts/CinnabarIsland.asm"
+
+INCLUDE "scripts/Route1.asm"
+
+INCLUDE "data/mapHeaders/OaksLab.asm"
+INCLUDE "scripts/OaksLab.asm"
+INCLUDE "data/mapObjects/OaksLab.asm"
+
+INCLUDE "data/mapHeaders/ViridianMart.asm"
+INCLUDE "scripts/ViridianMart.asm"
+INCLUDE "data/mapObjects/ViridianMart.asm"
+ViridianMart_Blocks: INCBIN "maps/ViridianMart.blk"
+
+INCLUDE "data/mapHeaders/ViridianSchoolHouse.asm"
+INCLUDE "scripts/ViridianSchoolHouse.asm"
+INCLUDE "data/mapObjects/ViridianSchoolHouse.asm"
+
+INCLUDE "data/mapHeaders/ViridianNicknameHouse.asm"
+ ds 1
+INCLUDE "scripts/ViridianNicknameHouse.asm"
+INCLUDE "data/mapObjects/ViridianNicknameHouse.asm"
+
+INCLUDE "data/mapHeaders/PewterNidoranHouse.asm"
+INCLUDE "scripts/PewterNidoranHouse.asm"
+INCLUDE "data/mapObjects/PewterNidoranHouse.asm"
+
+INCLUDE "data/mapHeaders/PewterSpeechHouse.asm"
+INCLUDE "scripts/PewterSpeechHouse.asm"
+INCLUDE "data/mapObjects/PewterSpeechHouse.asm"
+
+INCLUDE "data/mapHeaders/CeruleanTrashedHouse.asm"
+INCLUDE "scripts/CeruleanTrashedHouse.asm"
+INCLUDE "data/mapObjects/CeruleanTrashedHouse.asm"
+
+INCLUDE "data/mapHeaders/CeruleanTradeHouse.asm"
+INCLUDE "scripts/CeruleanTradeHouse.asm"
+INCLUDE "data/mapObjects/CeruleanTradeHouse.asm"
+
+INCLUDE "data/mapHeaders/BikeShop.asm"
+INCLUDE "scripts/BikeShop.asm"
+INCLUDE "data/mapObjects/BikeShop.asm"
+BikeShop_Blocks: INCBIN "maps/BikeShop.blk"
+
+INCLUDE "data/mapHeaders/MrFujisHouse.asm"
+INCLUDE "scripts/MrFujisHouse.asm"
+INCLUDE "data/mapObjects/MrFujisHouse.asm"
+
+INCLUDE "data/mapHeaders/LavenderCuboneHouse.asm"
+INCLUDE "scripts/LavenderCuboneHouse.asm"
+INCLUDE "data/mapObjects/LavenderCuboneHouse.asm"
+
+INCLUDE "data/mapHeaders/NameRatersHouse.asm"
+INCLUDE "scripts/NameRatersHouse.asm"
+INCLUDE "data/mapObjects/NameRatersHouse.asm"
+
+INCLUDE "data/mapHeaders/VermilionPidgeyHouse.asm"
+INCLUDE "scripts/VermilionPidgeyHouse.asm"
+INCLUDE "data/mapObjects/VermilionPidgeyHouse.asm"
+
+INCLUDE "data/mapHeaders/VermilionDock.asm"
+INCLUDE "scripts/VermilionDock.asm"
+INCLUDE "data/mapObjects/VermilionDock.asm"
+VermilionDock_Blocks: INCBIN "maps/VermilionDock.blk"
+
+INCLUDE "data/mapHeaders/CeladonMansionRoofHouse.asm"
+INCLUDE "scripts/CeladonMansionRoofHouse.asm"
+INCLUDE "data/mapObjects/CeladonMansionRoofHouse.asm"
+
+INCLUDE "data/mapHeaders/FuchsiaMart.asm"
+INCLUDE "scripts/FuchsiaMart.asm"
+INCLUDE "data/mapObjects/FuchsiaMart.asm"
+FuchsiaMart_Blocks: INCBIN "maps/FuchsiaMart.blk"
+
+INCLUDE "data/mapHeaders/SaffronPidgeyHouse.asm"
+INCLUDE "scripts/SaffronPidgeyHouse.asm"
+INCLUDE "data/mapObjects/SaffronPidgeyHouse.asm"
+
+INCLUDE "data/mapHeaders/MrPsychicsHouse.asm"
+INCLUDE "scripts/MrPsychicsHouse.asm"
+INCLUDE "data/mapObjects/MrPsychicsHouse.asm"
+
+INCLUDE "data/mapHeaders/DiglettsCaveRoute2.asm"
+INCLUDE "scripts/DiglettsCaveRoute2.asm"
+INCLUDE "data/mapObjects/DiglettsCaveRoute2.asm"
+
+INCLUDE "data/mapHeaders/Route2TradeHouse.asm"
+INCLUDE "scripts/Route2TradeHouse.asm"
+INCLUDE "data/mapObjects/Route2TradeHouse.asm"
+
+INCLUDE "data/mapHeaders/Route5Gate.asm"
+INCLUDE "scripts/Route5Gate.asm"
+INCLUDE "data/mapObjects/Route5Gate.asm"
+Route5Gate_Blocks: INCBIN "maps/Route5Gate.blk"
+
+INCLUDE "data/mapHeaders/Route6Gate.asm"
+INCLUDE "scripts/Route6Gate.asm"
+INCLUDE "data/mapObjects/Route6Gate.asm"
+Route6Gate_Blocks: INCBIN "maps/Route6Gate.blk"
+
+INCLUDE "data/mapHeaders/Route7Gate.asm"
+INCLUDE "scripts/Route7Gate.asm"
+INCLUDE "data/mapObjects/Route7Gate.asm"
+Route7Gate_Blocks: INCBIN "maps/Route7Gate.blk"
+
+INCLUDE "data/mapHeaders/Route8Gate.asm"
+INCLUDE "scripts/Route8Gate.asm"
+INCLUDE "data/mapObjects/Route8Gate.asm"
+Route8Gate_Blocks: INCBIN "maps/Route8Gate.blk"
+
+INCLUDE "data/mapHeaders/UndergroundPathRoute8.asm"
+INCLUDE "scripts/UndergroundPathRoute8.asm"
+INCLUDE "data/mapObjects/UndergroundPathRoute8.asm"
+
+INCLUDE "data/mapHeaders/PowerPlant.asm"
+INCLUDE "scripts/PowerPlant.asm"
+INCLUDE "data/mapObjects/PowerPlant.asm"
+PowerPlant_Blocks: INCBIN "maps/PowerPlant.blk"
+
+INCLUDE "data/mapHeaders/DiglettsCaveRoute11.asm"
+INCLUDE "scripts/DiglettsCaveRoute11.asm"
+INCLUDE "data/mapObjects/DiglettsCaveRoute11.asm"
+
+INCLUDE "data/mapHeaders/Route16FlyHouse.asm"
+INCLUDE "scripts/Route16FlyHouse.asm"
+INCLUDE "data/mapObjects/Route16FlyHouse.asm"
+
+INCLUDE "data/mapHeaders/Route22Gate.asm"
+INCLUDE "scripts/Route22Gate.asm"
+INCLUDE "data/mapObjects/Route22Gate.asm"
+Route22Gate_Blocks: INCBIN "maps/Route22Gate.blk"
+
+INCLUDE "data/mapHeaders/BillsHouse.asm"
+INCLUDE "scripts/BillsHouse.asm"
+INCLUDE "data/mapObjects/BillsHouse.asm"
+BillsHouse_Blocks: INCBIN "maps/BillsHouse.blk"
+
+
+SECTION "Maps 5", ROMX
+
+INCLUDE "data/mapHeaders/LavenderTown.asm"
+INCLUDE "data/mapObjects/LavenderTown.asm"
+LavenderTown_Blocks: INCBIN "maps/LavenderTown.blk"
+
+ViridianPokecenter_Blocks: INCBIN "maps/ViridianPokecenter.blk"
+
+SafariZoneCenterRestHouse_Blocks:
+SafariZoneWestRestHouse_Blocks:
+SafariZoneEastRestHouse_Blocks:
+SafariZoneNorthRestHouse_Blocks: INCBIN "maps/SafariZoneCenterRestHouse.blk"
+
+INCLUDE "scripts/LavenderTown.asm"
+
+
+SECTION "Maps 6", ROMX
+
+INCLUDE "data/mapHeaders/ViridianPokecenter.asm"
+INCLUDE "scripts/ViridianPokecenter.asm"
+INCLUDE "data/mapObjects/ViridianPokecenter.asm"
+
+INCLUDE "data/mapHeaders/PokemonMansion1F.asm"
+INCLUDE "scripts/PokemonMansion1F.asm"
+INCLUDE "data/mapObjects/PokemonMansion1F.asm"
+PokemonMansion1F_Blocks: INCBIN "maps/PokemonMansion1F.blk"
+
+INCLUDE "data/mapHeaders/RockTunnel1F.asm"
+INCLUDE "scripts/RockTunnel1F.asm"
+INCLUDE "data/mapObjects/RockTunnel1F.asm"
+RockTunnel1F_Blocks: INCBIN "maps/RockTunnel1F.blk"
+
+INCLUDE "data/mapHeaders/SeafoamIslands1F.asm"
+INCLUDE "scripts/SeafoamIslands1F.asm"
+INCLUDE "data/mapObjects/SeafoamIslands1F.asm"
+SeafoamIslands1F_Blocks: INCBIN "maps/SeafoamIslands1F.blk"
+
+INCLUDE "data/mapHeaders/SSAnne3F.asm"
+INCLUDE "scripts/SSAnne3F.asm"
+INCLUDE "data/mapObjects/SSAnne3F.asm"
+SSAnne3F_Blocks: INCBIN "maps/SSAnne3F.blk"
+
+INCLUDE "data/mapHeaders/VictoryRoad3F.asm"
+INCLUDE "scripts/VictoryRoad3F.asm"
+INCLUDE "data/mapObjects/VictoryRoad3F.asm"
+VictoryRoad3F_Blocks: INCBIN "maps/VictoryRoad3F.blk"
+
+INCLUDE "data/mapHeaders/RocketHideoutB1F.asm"
+INCLUDE "scripts/RocketHideoutB1F.asm"
+INCLUDE "data/mapObjects/RocketHideoutB1F.asm"
+RocketHideoutB1F_Blocks: INCBIN "maps/RocketHideoutB1F.blk"
+
+INCLUDE "data/mapHeaders/RocketHideoutB2F.asm"
+INCLUDE "scripts/RocketHideoutB2F.asm"
+INCLUDE "data/mapObjects/RocketHideoutB2F.asm"
+RocketHideoutB2F_Blocks: INCBIN "maps/RocketHideoutB2F.blk"
+
+INCLUDE "data/mapHeaders/RocketHideoutB3F.asm"
+INCLUDE "scripts/RocketHideoutB3F.asm"
+INCLUDE "data/mapObjects/RocketHideoutB3F.asm"
+RocketHideoutB3F_Blocks: INCBIN "maps/RocketHideoutB3F.blk"
+
+INCLUDE "data/mapHeaders/RocketHideoutB4F.asm"
+INCLUDE "scripts/RocketHideoutB4F.asm"
+INCLUDE "data/mapObjects/RocketHideoutB4F.asm"
+RocketHideoutB4F_Blocks: INCBIN "maps/RocketHideoutB4F.blk"
+
+INCLUDE "data/mapHeaders/RocketHideoutElevator.asm"
+INCLUDE "scripts/RocketHideoutElevator.asm"
+INCLUDE "data/mapObjects/RocketHideoutElevator.asm"
+RocketHideoutElevator_Blocks: INCBIN "maps/RocketHideoutElevator.blk"
+
+INCLUDE "data/mapHeaders/SilphCoElevator.asm"
+INCLUDE "scripts/SilphCoElevator.asm"
+INCLUDE "data/mapObjects/SilphCoElevator.asm"
+SilphCoElevator_Blocks: INCBIN "maps/SilphCoElevator.blk"
+
+INCLUDE "data/mapHeaders/SafariZoneEast.asm"
+INCLUDE "scripts/SafariZoneEast.asm"
+INCLUDE "data/mapObjects/SafariZoneEast.asm"
+SafariZoneEast_Blocks: INCBIN "maps/SafariZoneEast.blk"
+
+INCLUDE "data/mapHeaders/SafariZoneNorth.asm"
+INCLUDE "scripts/SafariZoneNorth.asm"
+INCLUDE "data/mapObjects/SafariZoneNorth.asm"
+SafariZoneNorth_Blocks: INCBIN "maps/SafariZoneNorth.blk"
+
+INCLUDE "data/mapHeaders/SafariZoneCenter.asm"
+INCLUDE "scripts/SafariZoneCenter.asm"
+INCLUDE "data/mapObjects/SafariZoneCenter.asm"
+SafariZoneCenter_Blocks: INCBIN "maps/SafariZoneCenter.blk"
+
+INCLUDE "data/mapHeaders/SafariZoneCenterRestHouse.asm"
+INCLUDE "scripts/SafariZoneCenterRestHouse.asm"
+INCLUDE "data/mapObjects/SafariZoneCenterRestHouse.asm"
+
+INCLUDE "data/mapHeaders/SafariZoneWestRestHouse.asm"
+INCLUDE "scripts/SafariZoneWestRestHouse.asm"
+INCLUDE "data/mapObjects/SafariZoneWestRestHouse.asm"
+
+INCLUDE "data/mapHeaders/SafariZoneEastRestHouse.asm"
+INCLUDE "scripts/SafariZoneEastRestHouse.asm"
+INCLUDE "data/mapObjects/SafariZoneEastRestHouse.asm"
+
+INCLUDE "data/mapHeaders/SafariZoneNorthRestHouse.asm"
+INCLUDE "scripts/SafariZoneNorthRestHouse.asm"
+INCLUDE "data/mapObjects/SafariZoneNorthRestHouse.asm"
+
+INCLUDE "data/mapHeaders/CeruleanCave2F.asm"
+INCLUDE "scripts/CeruleanCave2F.asm"
+INCLUDE "data/mapObjects/CeruleanCave2F.asm"
+CeruleanCave2F_Blocks: INCBIN "maps/CeruleanCave2F.blk"
+
+INCLUDE "data/mapHeaders/CeruleanCaveB1F.asm"
+INCLUDE "scripts/CeruleanCaveB1F.asm"
+INCLUDE "data/mapObjects/CeruleanCaveB1F.asm"
+CeruleanCaveB1F_Blocks: INCBIN "maps/CeruleanCaveB1F.blk"
+
+INCLUDE "data/mapHeaders/RockTunnelB1F.asm"
+INCLUDE "scripts/RockTunnelB1F.asm"
+INCLUDE "data/mapObjects/RockTunnelB1F.asm"
+RockTunnelB1F_Blocks: INCBIN "maps/RockTunnelB1F.blk"
+
+INCLUDE "data/mapHeaders/SeafoamIslandsB1F.asm"
+INCLUDE "scripts/SeafoamIslandsB1F.asm"
+INCLUDE "data/mapObjects/SeafoamIslandsB1F.asm"
+SeafoamIslandsB1F_Blocks: INCBIN "maps/SeafoamIslandsB1F.blk"
+
+INCLUDE "data/mapHeaders/SeafoamIslandsB2F.asm"
+INCLUDE "scripts/SeafoamIslandsB2F.asm"
+INCLUDE "data/mapObjects/SeafoamIslandsB2F.asm"
+SeafoamIslandsB2F_Blocks: INCBIN "maps/SeafoamIslandsB2F.blk"
+
+INCLUDE "data/mapHeaders/SeafoamIslandsB3F.asm"
+INCLUDE "scripts/SeafoamIslandsB3F.asm"
+INCLUDE "data/mapObjects/SeafoamIslandsB3F.asm"
+SeafoamIslandsB3F_Blocks: INCBIN "maps/SeafoamIslandsB3F.blk"
+
+INCLUDE "data/mapHeaders/SeafoamIslandsB4F.asm"
+INCLUDE "scripts/SeafoamIslandsB4F.asm"
+INCLUDE "data/mapObjects/SeafoamIslandsB4F.asm"
+SeafoamIslandsB4F_Blocks: INCBIN "maps/SeafoamIslandsB4F.blk"
+
+
+SECTION "Maps 7", ROMX
+
+INCLUDE "data/mapHeaders/Route7.asm"
+INCLUDE "data/mapObjects/Route7.asm"
+Route7_Blocks: INCBIN "maps/Route7.blk"
+
+CeladonPokecenter_Blocks:
+RockTunnelPokecenter_Blocks:
+MtMoonPokecenter_Blocks: INCBIN "maps/MtMoonPokecenter.blk"
+
+Route18Gate1F_Blocks:
+Route15Gate1F_Blocks:
+Route11Gate1F_Blocks: INCBIN "maps/Route11Gate1F.blk"
+
+Route18Gate2F_Blocks:
+Route16Gate2F_Blocks:
+Route15Gate2F_Blocks:
+Route12Gate2F_Blocks:
+Route11Gate2F_Blocks: INCBIN "maps/Route11Gate2F.blk"
+
+
+SECTION "Maps 8", ROMX
+
+INCLUDE "scripts/Route7.asm"
+
+INCLUDE "data/mapHeaders/RedsHouse1F.asm"
+INCLUDE "scripts/RedsHouse1F.asm"
+INCLUDE "data/mapObjects/RedsHouse1F.asm"
+RedsHouse1F_Blocks: INCBIN "maps/RedsHouse1F.blk"
+
+INCLUDE "data/mapHeaders/CeladonMart3F.asm"
+INCLUDE "scripts/CeladonMart3F.asm"
+INCLUDE "data/mapObjects/CeladonMart3F.asm"
+CeladonMart3F_Blocks: INCBIN "maps/CeladonMart3F.blk"
+
+INCLUDE "data/mapHeaders/CeladonMart4F.asm"
+INCLUDE "scripts/CeladonMart4F.asm"
+INCLUDE "data/mapObjects/CeladonMart4F.asm"
+CeladonMart4F_Blocks: INCBIN "maps/CeladonMart4F.blk"
+
+INCLUDE "data/mapHeaders/CeladonMartRoof.asm"
+INCLUDE "scripts/CeladonMartRoof.asm"
+INCLUDE "data/mapObjects/CeladonMartRoof.asm"
+CeladonMartRoof_Blocks: INCBIN "maps/CeladonMartRoof.blk"
+
+INCLUDE "data/mapHeaders/CeladonMartElevator.asm"
+INCLUDE "scripts/CeladonMartElevator.asm"
+INCLUDE "data/mapObjects/CeladonMartElevator.asm"
+CeladonMartElevator_Blocks: INCBIN "maps/CeladonMartElevator.blk"
+
+INCLUDE "data/mapHeaders/CeladonMansion1F.asm"
+INCLUDE "scripts/CeladonMansion1F.asm"
+INCLUDE "data/mapObjects/CeladonMansion1F.asm"
+CeladonMansion1F_Blocks: INCBIN "maps/CeladonMansion1F.blk"
+
+INCLUDE "data/mapHeaders/CeladonMansion2F.asm"
+INCLUDE "scripts/CeladonMansion2F.asm"
+INCLUDE "data/mapObjects/CeladonMansion2F.asm"
+CeladonMansion2F_Blocks: INCBIN "maps/CeladonMansion2F.blk"
+
+INCLUDE "data/mapHeaders/CeladonMansion3F.asm"
+INCLUDE "scripts/CeladonMansion3F.asm"
+INCLUDE "data/mapObjects/CeladonMansion3F.asm"
+CeladonMansion3F_Blocks: INCBIN "maps/CeladonMansion3F.blk"
+
+INCLUDE "data/mapHeaders/CeladonMansionRoof.asm"
+INCLUDE "scripts/CeladonMansionRoof.asm"
+INCLUDE "data/mapObjects/CeladonMansionRoof.asm"
+CeladonMansionRoof_Blocks: INCBIN "maps/CeladonMansionRoof.blk"
+
+INCLUDE "data/mapHeaders/CeladonPokecenter.asm"
+INCLUDE "scripts/CeladonPokecenter.asm"
+INCLUDE "data/mapObjects/CeladonPokecenter.asm"
+
+INCLUDE "data/mapHeaders/CeladonGym.asm"
+INCLUDE "scripts/CeladonGym.asm"
+INCLUDE "data/mapObjects/CeladonGym.asm"
+CeladonGym_Blocks: INCBIN "maps/CeladonGym.blk"
+
+INCLUDE "data/mapHeaders/GameCorner.asm"
+INCLUDE "scripts/GameCorner.asm"
+INCLUDE "data/mapObjects/GameCorner.asm"
+GameCorner_Blocks: INCBIN "maps/GameCorner.blk"
+
+INCLUDE "data/mapHeaders/CeladonMart5F.asm"
+INCLUDE "scripts/CeladonMart5F.asm"
+INCLUDE "data/mapObjects/CeladonMart5F.asm"
+CeladonMart5F_Blocks: INCBIN "maps/CeladonMart5F.blk"
+
+INCLUDE "data/mapHeaders/GameCornerPrizeRoom.asm"
+INCLUDE "scripts/GameCornerPrizeRoom.asm"
+INCLUDE "data/mapObjects/GameCornerPrizeRoom.asm"
+GameCornerPrizeRoom_Blocks: INCBIN "maps/GameCornerPrizeRoom.blk"
+
+INCLUDE "data/mapHeaders/CeladonDiner.asm"
+INCLUDE "scripts/CeladonDiner.asm"
+INCLUDE "data/mapObjects/CeladonDiner.asm"
+CeladonDiner_Blocks: INCBIN "maps/CeladonDiner.blk"
+
+INCLUDE "data/mapHeaders/CeladonChiefHouse.asm"
+INCLUDE "scripts/CeladonChiefHouse.asm"
+INCLUDE "data/mapObjects/CeladonChiefHouse.asm"
+CeladonChiefHouse_Blocks: INCBIN "maps/CeladonChiefHouse.blk"
+
+INCLUDE "data/mapHeaders/CeladonHotel.asm"
+INCLUDE "scripts/CeladonHotel.asm"
+INCLUDE "data/mapObjects/CeladonHotel.asm"
+CeladonHotel_Blocks: INCBIN "maps/CeladonHotel.blk"
+
+INCLUDE "data/mapHeaders/MtMoonPokecenter.asm"
+INCLUDE "scripts/MtMoonPokecenter.asm"
+INCLUDE "data/mapObjects/MtMoonPokecenter.asm"
+
+INCLUDE "data/mapHeaders/RockTunnelPokecenter.asm"
+INCLUDE "scripts/RockTunnelPokecenter.asm"
+INCLUDE "data/mapObjects/RockTunnelPokecenter.asm"
+
+INCLUDE "data/mapHeaders/Route11Gate1F.asm"
+INCLUDE "scripts/Route11Gate1F.asm"
+INCLUDE "data/mapObjects/Route11Gate1F.asm"
+
+INCLUDE "data/mapHeaders/Route11Gate2F.asm"
+INCLUDE "scripts/Route11Gate2F.asm"
+INCLUDE "data/mapObjects/Route11Gate2F.asm"
+
+INCLUDE "data/mapHeaders/Route12Gate1F.asm"
+INCLUDE "scripts/Route12Gate1F.asm"
+INCLUDE "data/mapObjects/Route12Gate1F.asm"
+Route12Gate1F_Blocks: INCBIN "maps/Route12Gate1F.blk"
+
+INCLUDE "data/mapHeaders/Route12Gate2F.asm"
+INCLUDE "scripts/Route12Gate2F.asm"
+INCLUDE "data/mapObjects/Route12Gate2F.asm"
+
+INCLUDE "data/mapHeaders/Route15Gate1F.asm"
+INCLUDE "scripts/Route15Gate1F.asm"
+INCLUDE "data/mapObjects/Route15Gate1F.asm"
+
+INCLUDE "data/mapHeaders/Route15Gate2F.asm"
+INCLUDE "scripts/Route15Gate2F.asm"
+INCLUDE "data/mapObjects/Route15Gate2F.asm"
+
+INCLUDE "data/mapHeaders/Route16Gate1F.asm"
+INCLUDE "scripts/Route16Gate1F.asm"
+INCLUDE "data/mapObjects/Route16Gate1F.asm"
+Route16Gate1F_Blocks: INCBIN "maps/Route16Gate1F.blk"
+
+INCLUDE "data/mapHeaders/Route16Gate2F.asm"
+INCLUDE "scripts/Route16Gate2F.asm"
+INCLUDE "data/mapObjects/Route16Gate2F.asm"
+
+INCLUDE "data/mapHeaders/Route18Gate1F.asm"
+INCLUDE "scripts/Route18Gate1F.asm"
+INCLUDE "data/mapObjects/Route18Gate1F.asm"
+
+INCLUDE "data/mapHeaders/Route18Gate2F.asm"
+INCLUDE "scripts/Route18Gate2F.asm"
+INCLUDE "data/mapObjects/Route18Gate2F.asm"
+
+INCLUDE "data/mapHeaders/MtMoon1F.asm"
+INCLUDE "scripts/MtMoon1F.asm"
+INCLUDE "data/mapObjects/MtMoon1F.asm"
+MtMoon1F_Blocks: INCBIN "maps/MtMoon1F.blk"
+
+INCLUDE "data/mapHeaders/MtMoonB2F.asm"
+INCLUDE "scripts/MtMoonB2F.asm"
+INCLUDE "data/mapObjects/MtMoonB2F.asm"
+MtMoonB2F_Blocks: INCBIN "maps/MtMoonB2F.blk"
+
+INCLUDE "data/mapHeaders/SafariZoneWest.asm"
+INCLUDE "scripts/SafariZoneWest.asm"
+INCLUDE "data/mapObjects/SafariZoneWest.asm"
+SafariZoneWest_Blocks: INCBIN "maps/SafariZoneWest.blk"
+
+INCLUDE "data/mapHeaders/SafariZoneSecretHouse.asm"
+INCLUDE "scripts/SafariZoneSecretHouse.asm"
+INCLUDE "data/mapObjects/SafariZoneSecretHouse.asm"
+SafariZoneSecretHouse_Blocks: INCBIN "maps/SafariZoneSecretHouse.blk"
+
+
+SECTION "Maps 9", ROMX
+
+INCLUDE "data/mapHeaders/TradeCenter.asm"
+INCLUDE "scripts/TradeCenter.asm"
+INCLUDE "data/mapObjects/TradeCenter.asm"
+TradeCenter_Blocks: INCBIN "maps/TradeCenter.blk"
+
+INCLUDE "data/mapHeaders/Colosseum.asm"
+INCLUDE "scripts/Colosseum.asm"
+INCLUDE "data/mapObjects/Colosseum.asm"
+Colosseum_Blocks: INCBIN "maps/Colosseum.blk"
+
+
+SECTION "Maps 10", ROMX
+
+INCLUDE "data/mapHeaders/Route22.asm"
+INCLUDE "data/mapObjects/Route22.asm"
+Route22_Blocks: INCBIN "maps/Route22.blk"
+
+INCLUDE "data/mapHeaders/Route20.asm"
+INCLUDE "data/mapObjects/Route20.asm"
+Route20_Blocks: INCBIN "maps/Route20.blk"
+
+INCLUDE "data/mapHeaders/Route23.asm"
+INCLUDE "data/mapObjects/Route23.asm"
+Route23_Blocks: INCBIN "maps/Route23.blk"
+
+INCLUDE "data/mapHeaders/Route24.asm"
+INCLUDE "data/mapObjects/Route24.asm"
+Route24_Blocks: INCBIN "maps/Route24.blk"
+
+INCLUDE "data/mapHeaders/Route25.asm"
+INCLUDE "data/mapObjects/Route25.asm"
+Route25_Blocks: INCBIN "maps/Route25.blk"
+
+INCLUDE "data/mapHeaders/IndigoPlateau.asm"
+INCLUDE "scripts/IndigoPlateau.asm"
+INCLUDE "data/mapObjects/IndigoPlateau.asm"
+IndigoPlateau_Blocks: INCBIN "maps/IndigoPlateau.blk"
+
+INCLUDE "data/mapHeaders/SaffronCity.asm"
+INCLUDE "data/mapObjects/SaffronCity.asm"
+SaffronCity_Blocks: INCBIN "maps/SaffronCity.blk"
+INCLUDE "scripts/SaffronCity.asm"
+
+INCLUDE "scripts/Route20.asm"
+INCLUDE "scripts/Route22.asm"
+INCLUDE "scripts/Route23.asm"
+INCLUDE "scripts/Route24.asm"
+INCLUDE "scripts/Route25.asm"
+
+INCLUDE "data/mapHeaders/VictoryRoad2F.asm"
+INCLUDE "scripts/VictoryRoad2F.asm"
+INCLUDE "data/mapObjects/VictoryRoad2F.asm"
+VictoryRoad2F_Blocks: INCBIN "maps/VictoryRoad2F.blk"
+
+INCLUDE "data/mapHeaders/MtMoonB1F.asm"
+INCLUDE "scripts/MtMoonB1F.asm"
+INCLUDE "data/mapObjects/MtMoonB1F.asm"
+MtMoonB1F_Blocks: INCBIN "maps/MtMoonB1F.blk"
+
+INCLUDE "data/mapHeaders/SilphCo7F.asm"
+INCLUDE "scripts/SilphCo7F.asm"
+INCLUDE "data/mapObjects/SilphCo7F.asm"
+SilphCo7F_Blocks: INCBIN "maps/SilphCo7F.blk"
+
+INCLUDE "data/mapHeaders/PokemonMansion2F.asm"
+INCLUDE "scripts/PokemonMansion2F.asm"
+INCLUDE "data/mapObjects/PokemonMansion2F.asm"
+PokemonMansion2F_Blocks: INCBIN "maps/PokemonMansion2F.blk"
+
+INCLUDE "data/mapHeaders/PokemonMansion3F.asm"
+INCLUDE "scripts/PokemonMansion3F.asm"
+INCLUDE "data/mapObjects/PokemonMansion3F.asm"
+PokemonMansion3F_Blocks: INCBIN "maps/PokemonMansion3F.blk"
+
+INCLUDE "data/mapHeaders/PokemonMansionB1F.asm"
+INCLUDE "scripts/PokemonMansionB1F.asm"
+INCLUDE "data/mapObjects/PokemonMansionB1F.asm"
+PokemonMansionB1F_Blocks: INCBIN "maps/PokemonMansionB1F.blk"
+
+
+SECTION "Maps 11", ROMX
+
+INCLUDE "data/mapHeaders/Route2.asm"
+INCLUDE "data/mapObjects/Route2.asm"
+Route2_Blocks: INCBIN "maps/Route2.blk"
+
+INCLUDE "data/mapHeaders/Route3.asm"
+INCLUDE "data/mapObjects/Route3.asm"
+Route3_Blocks: INCBIN "maps/Route3.blk"
+
+INCLUDE "data/mapHeaders/Route4.asm"
+INCLUDE "data/mapObjects/Route4.asm"
+Route4_Blocks: INCBIN "maps/Route4.blk"
+
+INCLUDE "data/mapHeaders/Route5.asm"
+INCLUDE "data/mapObjects/Route5.asm"
+Route5_Blocks: INCBIN "maps/Route5.blk"
+
+INCLUDE "data/mapHeaders/Route9.asm"
+INCLUDE "data/mapObjects/Route9.asm"
+Route9_Blocks: INCBIN "maps/Route9.blk"
+
+INCLUDE "data/mapHeaders/Route13.asm"
+INCLUDE "data/mapObjects/Route13.asm"
+Route13_Blocks: INCBIN "maps/Route13.blk"
+
+INCLUDE "data/mapHeaders/Route14.asm"
+INCLUDE "data/mapObjects/Route14.asm"
+Route14_Blocks: INCBIN "maps/Route14.blk"
+
+INCLUDE "data/mapHeaders/Route17.asm"
+INCLUDE "data/mapObjects/Route17.asm"
+Route17_Blocks: INCBIN "maps/Route17.blk"
+
+INCLUDE "data/mapHeaders/Route19.asm"
+INCLUDE "data/mapObjects/Route19.asm"
+Route19_Blocks: INCBIN "maps/Route19.blk"
+
+INCLUDE "data/mapHeaders/Route21.asm"
+INCLUDE "data/mapObjects/Route21.asm"
+Route21_Blocks: INCBIN "maps/Route21.blk"
+
+VermilionOldRodHouse_Blocks:
+Route12SuperRodHouse_Blocks:
+Daycare_Blocks: INCBIN "maps/Daycare.blk"
+
+FuchsiaGoodRodHouse_Blocks: INCBIN "maps/FuchsiaGoodRodHouse.blk"
+
+
+SECTION "Maps 12", ROMX
+
+INCLUDE "scripts/Route2.asm"
+INCLUDE "scripts/Route3.asm"
+INCLUDE "scripts/Route4.asm"
+INCLUDE "scripts/Route5.asm"
+INCLUDE "scripts/Route9.asm"
+INCLUDE "scripts/Route13.asm"
+INCLUDE "scripts/Route14.asm"
+INCLUDE "scripts/Route17.asm"
+INCLUDE "scripts/Route19.asm"
+INCLUDE "scripts/Route21.asm"
+
+INCLUDE "data/mapHeaders/VermilionOldRodHouse.asm"
+INCLUDE "scripts/VermilionOldRodHouse.asm"
+INCLUDE "data/mapObjects/VermilionOldRodHouse.asm"
+
+INCLUDE "data/mapHeaders/CeladonMart2F.asm"
+INCLUDE "scripts/CeladonMart2F.asm"
+INCLUDE "data/mapObjects/CeladonMart2F.asm"
+CeladonMart2F_Blocks: INCBIN "maps/CeladonMart2F.blk"
+
+INCLUDE "data/mapHeaders/FuchsiaGoodRodHouse.asm"
+INCLUDE "scripts/FuchsiaGoodRodHouse.asm"
+INCLUDE "data/mapObjects/FuchsiaGoodRodHouse.asm"
+
+INCLUDE "data/mapHeaders/Daycare.asm"
+INCLUDE "scripts/Daycare.asm"
+INCLUDE "data/mapObjects/Daycare.asm"
+
+INCLUDE "data/mapHeaders/Route12SuperRodHouse.asm"
+INCLUDE "scripts/Route12SuperRodHouse.asm"
+INCLUDE "data/mapObjects/Route12SuperRodHouse.asm"
+
+INCLUDE "data/mapHeaders/SilphCo8F.asm"
+INCLUDE "scripts/SilphCo8F.asm"
+INCLUDE "data/mapObjects/SilphCo8F.asm"
+SilphCo8F_Blocks: INCBIN "maps/SilphCo8F.blk"
+
+
+SECTION "Maps 13", ROMX
+
+INCLUDE "data/mapHeaders/Route6.asm"
+INCLUDE "data/mapObjects/Route6.asm"
+Route6_Blocks: INCBIN "maps/Route6.blk"
+
+INCLUDE "data/mapHeaders/Route8.asm"
+INCLUDE "data/mapObjects/Route8.asm"
+Route8_Blocks: INCBIN "maps/Route8.blk"
+
+INCLUDE "data/mapHeaders/Route10.asm"
+INCLUDE "data/mapObjects/Route10.asm"
+Route10_Blocks: INCBIN "maps/Route10.blk"
+
+INCLUDE "data/mapHeaders/Route11.asm"
+INCLUDE "data/mapObjects/Route11.asm"
+Route11_Blocks: INCBIN "maps/Route11.blk"
+
+INCLUDE "data/mapHeaders/Route12.asm"
+INCLUDE "data/mapObjects/Route12.asm"
+Route12_Blocks: INCBIN "maps/Route12.blk"
+
+INCLUDE "data/mapHeaders/Route15.asm"
+INCLUDE "data/mapObjects/Route15.asm"
+Route15_Blocks: INCBIN "maps/Route15.blk"
+
+INCLUDE "data/mapHeaders/Route16.asm"
+INCLUDE "data/mapObjects/Route16.asm"
+Route16_Blocks: INCBIN "maps/Route16.blk"
+
+INCLUDE "data/mapHeaders/Route18.asm"
+INCLUDE "data/mapObjects/Route18.asm"
+Route18_Blocks: INCBIN "maps/Route18.blk"
+
+ INCBIN "maps/UnusedPokecenterCopy.blk"
+
+
+SECTION "Maps 14", ROMX
+
+INCLUDE "scripts/Route6.asm"
+INCLUDE "scripts/Route8.asm"
+INCLUDE "scripts/Route10.asm"
+INCLUDE "scripts/Route11.asm"
+INCLUDE "scripts/Route12.asm"
+INCLUDE "scripts/Route15.asm"
+INCLUDE "scripts/Route16.asm"
+INCLUDE "scripts/Route18.asm"
+
+INCLUDE "data/mapHeaders/PokemonFanClub.asm"
+INCLUDE "scripts/PokemonFanClub.asm"
+INCLUDE "data/mapObjects/PokemonFanClub.asm"
+PokemonFanClub_Blocks: INCBIN "maps/PokemonFanClub.blk"
+
+INCLUDE "data/mapHeaders/SilphCo2F.asm"
+INCLUDE "scripts/SilphCo2F.asm"
+INCLUDE "data/mapObjects/SilphCo2F.asm"
+SilphCo2F_Blocks: INCBIN "maps/SilphCo2F.blk"
+
+INCLUDE "data/mapHeaders/SilphCo3F.asm"
+INCLUDE "scripts/SilphCo3F.asm"
+INCLUDE "data/mapObjects/SilphCo3F.asm"
+SilphCo3F_Blocks: INCBIN "maps/SilphCo3F.blk"
+
+INCLUDE "data/mapHeaders/SilphCo10F.asm"
+INCLUDE "scripts/SilphCo10F.asm"
+INCLUDE "data/mapObjects/SilphCo10F.asm"
+SilphCo10F_Blocks: INCBIN "maps/SilphCo10F.blk"
+
+INCLUDE "data/mapHeaders/LancesRoom.asm"
+INCLUDE "scripts/LancesRoom.asm"
+INCLUDE "data/mapObjects/LancesRoom.asm"
+LancesRoom_Blocks: INCBIN "maps/LancesRoom.blk"
+
+INCLUDE "data/mapHeaders/HallOfFame.asm"
+INCLUDE "scripts/HallOfFame.asm"
+INCLUDE "data/mapObjects/HallOfFame.asm"
+HallOfFame_Blocks: INCBIN "maps/HallOfFame.blk"
+
+
+SECTION "Maps 15", ROMX
+
+SaffronMart_Blocks:
+LavenderMart_Blocks:
+CeruleanMart_Blocks:
+VermilionMart_Blocks: INCBIN "maps/VermilionMart.blk"
+
+CopycatsHouse2F_Blocks:
+RedsHouse2F_Blocks: INCBIN "maps/RedsHouse2F.blk"
+
+Museum1F_Blocks: INCBIN "maps/Museum1F.blk"
+
+Museum2F_Blocks: INCBIN "maps/Museum2F.blk"
+
+SaffronPokecenter_Blocks:
+VermilionPokecenter_Blocks:
+LavenderPokecenter_Blocks:
+PewterPokecenter_Blocks: INCBIN "maps/PewterPokecenter.blk"
+
+UndergroundPathRoute7_Blocks:
+UndergroundPathRoute7Copy_Blocks:
+UndergroundPathRoute6_Blocks:
+UndergroundPathRoute5_Blocks: INCBIN "maps/UndergroundPathRoute5.blk"
+
+Route2Gate_Blocks:
+ViridianForestSouthGate_Blocks:
+ViridianForestNorthGate_Blocks: INCBIN "maps/ViridianForestNorthGate.blk"
+
+INCLUDE "data/mapHeaders/RedsHouse2F.asm"
+INCLUDE "scripts/RedsHouse2F.asm"
+INCLUDE "data/mapObjects/RedsHouse2F.asm"
+
+
+SECTION "Maps 16", ROMX
+
+INCLUDE "data/mapHeaders/Museum1F.asm"
+INCLUDE "scripts/Museum1F.asm"
+INCLUDE "data/mapObjects/Museum1F.asm"
+
+INCLUDE "data/mapHeaders/Museum2F.asm"
+INCLUDE "scripts/Museum2F.asm"
+INCLUDE "data/mapObjects/Museum2F.asm"
+
+INCLUDE "data/mapHeaders/PewterGym.asm"
+INCLUDE "scripts/PewterGym.asm"
+INCLUDE "data/mapObjects/PewterGym.asm"
+PewterGym_Blocks: INCBIN "maps/PewterGym.blk"
+
+INCLUDE "data/mapHeaders/PewterPokecenter.asm"
+INCLUDE "scripts/PewterPokecenter.asm"
+INCLUDE "data/mapObjects/PewterPokecenter.asm"
+
+INCLUDE "data/mapHeaders/CeruleanPokecenter.asm"
+INCLUDE "scripts/CeruleanPokecenter.asm"
+INCLUDE "data/mapObjects/CeruleanPokecenter.asm"
+CeruleanPokecenter_Blocks: INCBIN "maps/CeruleanPokecenter.blk"
+
+INCLUDE "data/mapHeaders/CeruleanGym.asm"
+INCLUDE "scripts/CeruleanGym.asm"
+INCLUDE "data/mapObjects/CeruleanGym.asm"
+CeruleanGym_Blocks: INCBIN "maps/CeruleanGym.blk"
+
+INCLUDE "data/mapHeaders/CeruleanMart.asm"
+INCLUDE "scripts/CeruleanMart.asm"
+INCLUDE "data/mapObjects/CeruleanMart.asm"
+
+INCLUDE "data/mapHeaders/LavenderPokecenter.asm"
+INCLUDE "scripts/LavenderPokecenter.asm"
+INCLUDE "data/mapObjects/LavenderPokecenter.asm"
+
+INCLUDE "data/mapHeaders/LavenderMart.asm"
+INCLUDE "scripts/LavenderMart.asm"
+INCLUDE "data/mapObjects/LavenderMart.asm"
+
+INCLUDE "data/mapHeaders/VermilionPokecenter.asm"
+INCLUDE "scripts/VermilionPokecenter.asm"
+INCLUDE "data/mapObjects/VermilionPokecenter.asm"
+
+INCLUDE "data/mapHeaders/VermilionMart.asm"
+INCLUDE "scripts/VermilionMart.asm"
+INCLUDE "data/mapObjects/VermilionMart.asm"
+
+INCLUDE "data/mapHeaders/VermilionGym.asm"
+INCLUDE "scripts/VermilionGym.asm"
+INCLUDE "data/mapObjects/VermilionGym.asm"
+VermilionGym_Blocks: INCBIN "maps/VermilionGym.blk"
+
+INCLUDE "data/mapHeaders/CopycatsHouse2F.asm"
+INCLUDE "scripts/CopycatsHouse2F.asm"
+INCLUDE "data/mapObjects/CopycatsHouse2F.asm"
+
+INCLUDE "data/mapHeaders/FightingDojo.asm"
+INCLUDE "scripts/FightingDojo.asm"
+INCLUDE "data/mapObjects/FightingDojo.asm"
+FightingDojo_Blocks: INCBIN "maps/FightingDojo.blk"
+
+INCLUDE "data/mapHeaders/SaffronGym.asm"
+INCLUDE "scripts/SaffronGym.asm"
+INCLUDE "data/mapObjects/SaffronGym.asm"
+SaffronGym_Blocks: INCBIN "maps/SaffronGym.blk"
+
+INCLUDE "data/mapHeaders/SaffronMart.asm"
+INCLUDE "scripts/SaffronMart.asm"
+INCLUDE "data/mapObjects/SaffronMart.asm"
+
+INCLUDE "data/mapHeaders/SilphCo1F.asm"
+INCLUDE "scripts/SilphCo1F.asm"
+INCLUDE "data/mapObjects/SilphCo1F.asm"
+SilphCo1F_Blocks: INCBIN "maps/SilphCo1F.blk"
+
+INCLUDE "data/mapHeaders/SaffronPokecenter.asm"
+INCLUDE "scripts/SaffronPokecenter.asm"
+INCLUDE "data/mapObjects/SaffronPokecenter.asm"
+
+INCLUDE "data/mapHeaders/ViridianForestNorthGate.asm"
+INCLUDE "scripts/ViridianForestNorthGate.asm"
+INCLUDE "data/mapObjects/ViridianForestNorthGate.asm"
+
+INCLUDE "data/mapHeaders/Route2Gate.asm"
+INCLUDE "scripts/Route2Gate.asm"
+INCLUDE "data/mapObjects/Route2Gate.asm"
+
+INCLUDE "data/mapHeaders/ViridianForestSouthGate.asm"
+INCLUDE "scripts/ViridianForestSouthGate.asm"
+INCLUDE "data/mapObjects/ViridianForestSouthGate.asm"
+
+INCLUDE "data/mapHeaders/UndergroundPathRoute5.asm"
+INCLUDE "scripts/UndergroundPathRoute5.asm"
+INCLUDE "data/mapObjects/UndergroundPathRoute5.asm"
+
+INCLUDE "data/mapHeaders/UndergroundPathRoute6.asm"
+INCLUDE "scripts/UndergroundPathRoute6.asm"
+INCLUDE "data/mapObjects/UndergroundPathRoute6.asm"
+
+INCLUDE "data/mapHeaders/UndergroundPathRoute7.asm"
+INCLUDE "scripts/UndergroundPathRoute7.asm"
+INCLUDE "data/mapObjects/UndergroundPathRoute7.asm"
+
+INCLUDE "data/mapHeaders/UndergroundPathRoute7Copy.asm"
+INCLUDE "scripts/UndergroundPathRoute7Copy.asm"
+INCLUDE "data/mapObjects/UndergroundPathRoute7Copy.asm"
+
+INCLUDE "data/mapHeaders/SilphCo9F.asm"
+INCLUDE "scripts/SilphCo9F.asm"
+INCLUDE "data/mapObjects/SilphCo9F.asm"
+SilphCo9F_Blocks: INCBIN "maps/SilphCo9F.blk"
+
+INCLUDE "data/mapHeaders/VictoryRoad1F.asm"
+INCLUDE "scripts/VictoryRoad1F.asm"
+INCLUDE "data/mapObjects/VictoryRoad1F.asm"
+VictoryRoad1F_Blocks: INCBIN "maps/VictoryRoad1F.blk"
+
+
+SECTION "Maps 17", ROMX
+
+ViridianForest_Blocks: INCBIN "maps/ViridianForest.blk"
+UndergroundPathNorthSouth_Blocks: INCBIN "maps/UndergroundPathNorthSouth.blk"
+UndergroundPathWestEast_Blocks: INCBIN "maps/UndergroundPathWestEast.blk"
+
+ INCBIN "maps/UnusedDiglettsCaveCopy.blk"
+
+SSAnneB1FRooms_Blocks:
+SSAnne2FRooms_Blocks: INCBIN "maps/SSAnne2FRooms.blk"
+
+INCLUDE "data/mapHeaders/PokemonTower1F.asm"
+INCLUDE "scripts/PokemonTower1F.asm"
+INCLUDE "data/mapObjects/PokemonTower1F.asm"
+PokemonTower1F_Blocks: INCBIN "maps/PokemonTower1F.blk"
+
+INCLUDE "data/mapHeaders/PokemonTower2F.asm"
+INCLUDE "scripts/PokemonTower2F.asm"
+INCLUDE "data/mapObjects/PokemonTower2F.asm"
+PokemonTower2F_Blocks: INCBIN "maps/PokemonTower2F.blk"
+
+INCLUDE "data/mapHeaders/PokemonTower3F.asm"
+INCLUDE "scripts/PokemonTower3F.asm"
+INCLUDE "data/mapObjects/PokemonTower3F.asm"
+PokemonTower3F_Blocks: INCBIN "maps/PokemonTower3F.blk"
+
+INCLUDE "data/mapHeaders/PokemonTower4F.asm"
+INCLUDE "scripts/PokemonTower4F.asm"
+INCLUDE "data/mapObjects/PokemonTower4F.asm"
+PokemonTower4F_Blocks: INCBIN "maps/PokemonTower4F.blk"
+
+INCLUDE "data/mapHeaders/PokemonTower5F.asm"
+INCLUDE "scripts/PokemonTower5F.asm"
+INCLUDE "data/mapObjects/PokemonTower5F.asm"
+PokemonTower5F_Blocks: INCBIN "maps/PokemonTower5F.blk"
+
+INCLUDE "data/mapHeaders/PokemonTower6F.asm"
+INCLUDE "scripts/PokemonTower6F.asm"
+INCLUDE "data/mapObjects/PokemonTower6F.asm"
+PokemonTower6F_Blocks: INCBIN "maps/PokemonTower6F.blk"
+
+ INCBIN "maps/UnusedEmptyMap.blk"
+
+INCLUDE "data/mapHeaders/PokemonTower7F.asm"
+INCLUDE "scripts/PokemonTower7F.asm"
+INCLUDE "data/mapObjects/PokemonTower7F.asm"
+PokemonTower7F_Blocks: INCBIN "maps/PokemonTower7F.blk"
+
+INCLUDE "data/mapHeaders/CeladonMart1F.asm"
+INCLUDE "scripts/CeladonMart1F.asm"
+INCLUDE "data/mapObjects/CeladonMart1F.asm"
+CeladonMart1F_Blocks: INCBIN "maps/CeladonMart1F.blk"
+
+
+SECTION "Maps 18", ROMX
+
+INCLUDE "data/mapHeaders/ViridianForest.asm"
+INCLUDE "scripts/ViridianForest.asm"
+INCLUDE "data/mapObjects/ViridianForest.asm"
+
+INCLUDE "data/mapHeaders/SSAnne1F.asm"
+INCLUDE "scripts/SSAnne1F.asm"
+INCLUDE "data/mapObjects/SSAnne1F.asm"
+SSAnne1F_Blocks: INCBIN "maps/SSAnne1F.blk"
+
+INCLUDE "data/mapHeaders/SSAnne2F.asm"
+INCLUDE "scripts/SSAnne2F.asm"
+INCLUDE "data/mapObjects/SSAnne2F.asm"
+SSAnne2F_Blocks: INCBIN "maps/SSAnne2F.blk"
+
+INCLUDE "data/mapHeaders/SSAnneB1F.asm"
+INCLUDE "scripts/SSAnneB1F.asm"
+INCLUDE "data/mapObjects/SSAnneB1F.asm"
+SSAnneB1F_Blocks: INCBIN "maps/SSAnneB1F.blk"
+
+INCLUDE "data/mapHeaders/SSAnneBow.asm"
+INCLUDE "scripts/SSAnneBow.asm"
+INCLUDE "data/mapObjects/SSAnneBow.asm"
+SSAnneBow_Blocks: INCBIN "maps/SSAnneBow.blk"
+
+INCLUDE "data/mapHeaders/SSAnneKitchen.asm"
+INCLUDE "scripts/SSAnneKitchen.asm"
+INCLUDE "data/mapObjects/SSAnneKitchen.asm"
+SSAnneKitchen_Blocks: INCBIN "maps/SSAnneKitchen.blk"
+
+INCLUDE "data/mapHeaders/SSAnneCaptainsRoom.asm"
+INCLUDE "scripts/SSAnneCaptainsRoom.asm"
+INCLUDE "data/mapObjects/SSAnneCaptainsRoom.asm"
+SSAnneCaptainsRoom_Blocks: INCBIN "maps/SSAnneCaptainsRoom.blk"
+
+INCLUDE "data/mapHeaders/SSAnne1FRooms.asm"
+INCLUDE "scripts/SSAnne1FRooms.asm"
+INCLUDE "data/mapObjects/SSAnne1FRooms.asm"
+SSAnne1FRooms_Blocks: INCBIN "maps/SSAnne1FRooms.blk"
+
+INCLUDE "data/mapHeaders/SSAnne2FRooms.asm"
+INCLUDE "scripts/SSAnne2FRooms.asm"
+INCLUDE "data/mapObjects/SSAnne2FRooms.asm"
+
+INCLUDE "data/mapHeaders/SSAnneB1FRooms.asm"
+INCLUDE "scripts/SSAnneB1FRooms.asm"
+INCLUDE "data/mapObjects/SSAnneB1FRooms.asm"
+
+INCLUDE "data/mapHeaders/UndergroundPathNorthSouth.asm"
+INCLUDE "scripts/UndergroundPathNorthSouth.asm"
+INCLUDE "data/mapObjects/UndergroundPathNorthSouth.asm"
+
+INCLUDE "data/mapHeaders/UndergroundPathWestEast.asm"
+INCLUDE "scripts/UndergroundPathWestEast.asm"
+INCLUDE "data/mapObjects/UndergroundPathWestEast.asm"
+
+INCLUDE "data/mapHeaders/DiglettsCave.asm"
+INCLUDE "scripts/DiglettsCave.asm"
+INCLUDE "data/mapObjects/DiglettsCave.asm"
+DiglettsCave_Blocks: INCBIN "maps/DiglettsCave.blk"
+
+INCLUDE "data/mapHeaders/SilphCo11F.asm"
+INCLUDE "scripts/SilphCo11F.asm"
+INCLUDE "data/mapObjects/SilphCo11F.asm"
+SilphCo11F_Blocks: INCBIN "maps/SilphCo11F.blk"
+
+
+SECTION "Maps 19", ROMX
+
+CopycatsHouse1F_Blocks: INCBIN "maps/CopycatsHouse1F.blk"
+
+CinnabarMart_Blocks:
+PewterMart_Blocks: INCBIN "maps/PewterMart.blk"
+
+FuchsiaBillsGrandpasHouse_Blocks: INCBIN "maps/FuchsiaBillsGrandpasHouse.blk"
+
+CinnabarPokecenter_Blocks:
+FuchsiaPokecenter_Blocks: INCBIN "maps/FuchsiaPokecenter.blk"
+
+CeruleanBadgeHouse_Blocks: INCBIN "maps/CeruleanBadgeHouse.blk"
+
+
+SECTION "Maps 20", ROMX
+
+INCLUDE "scripts/CeruleanCity_2.asm"
+
+INCLUDE "data/mapHeaders/ViridianGym.asm"
+INCLUDE "scripts/ViridianGym.asm"
+INCLUDE "data/mapObjects/ViridianGym.asm"
+ViridianGym_Blocks: INCBIN "maps/ViridianGym.blk"
+
+INCLUDE "data/mapHeaders/PewterMart.asm"
+INCLUDE "scripts/PewterMart.asm"
+INCLUDE "data/mapObjects/PewterMart.asm"
+
+INCLUDE "data/mapHeaders/CeruleanCave1F.asm"
+INCLUDE "scripts/CeruleanCave1F.asm"
+INCLUDE "data/mapObjects/CeruleanCave1F.asm"
+CeruleanCave1F_Blocks: INCBIN "maps/CeruleanCave1F.blk"
+
+INCLUDE "data/mapHeaders/CeruleanBadgeHouse.asm"
+INCLUDE "scripts/CeruleanBadgeHouse.asm"
+INCLUDE "data/mapObjects/CeruleanBadgeHouse.asm"
+
+
+SECTION "Maps 21", ROMX
+
+INCLUDE "data/mapHeaders/FuchsiaBillsGrandpasHouse.asm"
+INCLUDE "scripts/FuchsiaBillsGrandpasHouse.asm"
+INCLUDE "data/mapObjects/FuchsiaBillsGrandpasHouse.asm"
+
+INCLUDE "data/mapHeaders/FuchsiaPokecenter.asm"
+INCLUDE "scripts/FuchsiaPokecenter.asm"
+INCLUDE "data/mapObjects/FuchsiaPokecenter.asm"
+
+INCLUDE "data/mapHeaders/WardensHouse.asm"
+INCLUDE "scripts/WardensHouse.asm"
+INCLUDE "data/mapObjects/WardensHouse.asm"
+WardensHouse_Blocks: INCBIN "maps/WardensHouse.blk"
+
+INCLUDE "data/mapHeaders/SafariZoneGate.asm"
+INCLUDE "scripts/SafariZoneGate.asm"
+INCLUDE "data/mapObjects/SafariZoneGate.asm"
+SafariZoneGate_Blocks: INCBIN "maps/SafariZoneGate.blk"
+
+INCLUDE "data/mapHeaders/FuchsiaGym.asm"
+INCLUDE "scripts/FuchsiaGym.asm"
+INCLUDE "data/mapObjects/FuchsiaGym.asm"
+FuchsiaGym_Blocks: INCBIN "maps/FuchsiaGym.blk"
+
+INCLUDE "data/mapHeaders/FuchsiaMeetingRoom.asm"
+INCLUDE "scripts/FuchsiaMeetingRoom.asm"
+INCLUDE "data/mapObjects/FuchsiaMeetingRoom.asm"
+FuchsiaMeetingRoom_Blocks: INCBIN "maps/FuchsiaMeetingRoom.blk"
+
+INCLUDE "data/mapHeaders/CinnabarGym.asm"
+INCLUDE "scripts/CinnabarGym.asm"
+INCLUDE "data/mapObjects/CinnabarGym.asm"
+CinnabarGym_Blocks: INCBIN "maps/CinnabarGym.blk"
+
+INCLUDE "data/mapHeaders/CinnabarLab.asm"
+INCLUDE "scripts/CinnabarLab.asm"
+INCLUDE "data/mapObjects/CinnabarLab.asm"
+CinnabarLab_Blocks: INCBIN "maps/CinnabarLab.blk"
+
+INCLUDE "data/mapHeaders/CinnabarLabTradeRoom.asm"
+INCLUDE "scripts/CinnabarLabTradeRoom.asm"
+INCLUDE "data/mapObjects/CinnabarLabTradeRoom.asm"
+CinnabarLabTradeRoom_Blocks: INCBIN "maps/CinnabarLabTradeRoom.blk"
+
+INCLUDE "data/mapHeaders/CinnabarLabMetronomeRoom.asm"
+INCLUDE "scripts/CinnabarLabMetronomeRoom.asm"
+INCLUDE "data/mapObjects/CinnabarLabMetronomeRoom.asm"
+CinnabarLabMetronomeRoom_Blocks: INCBIN "maps/CinnabarLabMetronomeRoom.blk"
+
+INCLUDE "data/mapHeaders/CinnabarLabFossilRoom.asm"
+INCLUDE "scripts/CinnabarLabFossilRoom.asm"
+INCLUDE "data/mapObjects/CinnabarLabFossilRoom.asm"
+CinnabarLabFossilRoom_Blocks: INCBIN "maps/CinnabarLabFossilRoom.blk"
+
+INCLUDE "data/mapHeaders/CinnabarPokecenter.asm"
+INCLUDE "scripts/CinnabarPokecenter.asm"
+INCLUDE "data/mapObjects/CinnabarPokecenter.asm"
+
+INCLUDE "data/mapHeaders/CinnabarMart.asm"
+INCLUDE "scripts/CinnabarMart.asm"
+INCLUDE "data/mapObjects/CinnabarMart.asm"
+
+INCLUDE "data/mapHeaders/CopycatsHouse1F.asm"
+INCLUDE "scripts/CopycatsHouse1F.asm"
+INCLUDE "data/mapObjects/CopycatsHouse1F.asm"
+
+INCLUDE "data/mapHeaders/ChampionsRoom.asm"
+INCLUDE "scripts/ChampionsRoom.asm"
+INCLUDE "data/mapObjects/ChampionsRoom.asm"
+ChampionsRoom_Blocks: INCBIN "maps/ChampionsRoom.blk"
+
+INCLUDE "data/mapHeaders/LoreleisRoom.asm"
+INCLUDE "scripts/LoreleisRoom.asm"
+INCLUDE "data/mapObjects/LoreleisRoom.asm"
+LoreleisRoom_Blocks: INCBIN "maps/LoreleisRoom.blk"
+
+INCLUDE "data/mapHeaders/BrunosRoom.asm"
+INCLUDE "scripts/BrunosRoom.asm"
+INCLUDE "data/mapObjects/BrunosRoom.asm"
+BrunosRoom_Blocks: INCBIN "maps/BrunosRoom.blk"
+
+INCLUDE "data/mapHeaders/AgathasRoom.asm"
+INCLUDE "scripts/AgathasRoom.asm"
+INCLUDE "data/mapObjects/AgathasRoom.asm"
+AgathasRoom_Blocks: INCBIN "maps/AgathasRoom.blk"
--- /dev/null
+++ b/pics.asm
@@ -1,0 +1,376 @@
+SECTION "Pics 1", ROMX
+
+RhydonPicFront:: INCBIN "pic/bmon/rhydon.pic"
+RhydonPicBack:: INCBIN "pic/monback/rhydonb.pic"
+KangaskhanPicFront:: INCBIN "pic/bmon/kangaskhan.pic"
+KangaskhanPicBack:: INCBIN "pic/monback/kangaskhanb.pic"
+NidoranMPicFront:: INCBIN "pic/bmon/nidoranm.pic"
+NidoranMPicBack:: INCBIN "pic/monback/nidoranmb.pic"
+ClefairyPicFront:: INCBIN "pic/bmon/clefairy.pic"
+ClefairyPicBack:: INCBIN "pic/monback/clefairyb.pic"
+SpearowPicFront:: INCBIN "pic/bmon/spearow.pic"
+SpearowPicBack:: INCBIN "pic/monback/spearowb.pic"
+VoltorbPicFront:: INCBIN "pic/bmon/voltorb.pic"
+VoltorbPicBack:: INCBIN "pic/monback/voltorbb.pic"
+NidokingPicFront:: INCBIN "pic/bmon/nidoking.pic"
+NidokingPicBack:: INCBIN "pic/monback/nidokingb.pic"
+SlowbroPicFront:: INCBIN "pic/bmon/slowbro.pic"
+SlowbroPicBack:: INCBIN "pic/monback/slowbrob.pic"
+IvysaurPicFront:: INCBIN "pic/bmon/ivysaur.pic"
+IvysaurPicBack:: INCBIN "pic/monback/ivysaurb.pic"
+ExeggutorPicFront:: INCBIN "pic/bmon/exeggutor.pic"
+ExeggutorPicBack:: INCBIN "pic/monback/exeggutorb.pic"
+LickitungPicFront:: INCBIN "pic/bmon/lickitung.pic"
+LickitungPicBack:: INCBIN "pic/monback/lickitungb.pic"
+ExeggcutePicFront:: INCBIN "pic/bmon/exeggcute.pic"
+ExeggcutePicBack:: INCBIN "pic/monback/exeggcuteb.pic"
+GrimerPicFront:: INCBIN "pic/bmon/grimer.pic"
+GrimerPicBack:: INCBIN "pic/monback/grimerb.pic"
+GengarPicFront:: INCBIN "pic/bmon/gengar.pic"
+GengarPicBack:: INCBIN "pic/monback/gengarb.pic"
+NidoranFPicFront:: INCBIN "pic/bmon/nidoranf.pic"
+NidoranFPicBack:: INCBIN "pic/monback/nidoranfb.pic"
+NidoqueenPicFront:: INCBIN "pic/bmon/nidoqueen.pic"
+NidoqueenPicBack:: INCBIN "pic/monback/nidoqueenb.pic"
+CubonePicFront:: INCBIN "pic/bmon/cubone.pic"
+CubonePicBack:: INCBIN "pic/monback/cuboneb.pic"
+RhyhornPicFront:: INCBIN "pic/bmon/rhyhorn.pic"
+RhyhornPicBack:: INCBIN "pic/monback/rhyhornb.pic"
+LaprasPicFront:: INCBIN "pic/bmon/lapras.pic"
+LaprasPicBack:: INCBIN "pic/monback/laprasb.pic"
+ArcaninePicFront:: INCBIN "pic/bmon/arcanine.pic"
+ArcaninePicBack:: INCBIN "pic/monback/arcanineb.pic"
+GyaradosPicFront:: INCBIN "pic/bmon/gyarados.pic"
+GyaradosPicBack:: INCBIN "pic/monback/gyaradosb.pic"
+ShellderPicFront:: INCBIN "pic/bmon/shellder.pic"
+ShellderPicBack:: INCBIN "pic/monback/shellderb.pic"
+TentacoolPicFront:: INCBIN "pic/bmon/tentacool.pic"
+TentacoolPicBack:: INCBIN "pic/monback/tentacoolb.pic"
+GastlyPicFront:: INCBIN "pic/bmon/gastly.pic"
+GastlyPicBack:: INCBIN "pic/monback/gastlyb.pic"
+ScytherPicFront:: INCBIN "pic/bmon/scyther.pic"
+ScytherPicBack:: INCBIN "pic/monback/scytherb.pic"
+StaryuPicFront:: INCBIN "pic/bmon/staryu.pic"
+StaryuPicBack:: INCBIN "pic/monback/staryub.pic"
+BlastoisePicFront:: INCBIN "pic/bmon/blastoise.pic"
+BlastoisePicBack:: INCBIN "pic/monback/blastoiseb.pic"
+PinsirPicFront:: INCBIN "pic/bmon/pinsir.pic"
+PinsirPicBack:: INCBIN "pic/monback/pinsirb.pic"
+TangelaPicFront:: INCBIN "pic/bmon/tangela.pic"
+TangelaPicBack:: INCBIN "pic/monback/tangelab.pic"
+
+
+SECTION "Pics 2", ROMX
+
+GrowlithePicFront:: INCBIN "pic/bmon/growlithe.pic"
+GrowlithePicBack:: INCBIN "pic/monback/growlitheb.pic"
+OnixPicFront:: INCBIN "pic/bmon/onix.pic"
+OnixPicBack:: INCBIN "pic/monback/onixb.pic"
+FearowPicFront:: INCBIN "pic/bmon/fearow.pic"
+FearowPicBack:: INCBIN "pic/monback/fearowb.pic"
+PidgeyPicFront:: INCBIN "pic/bmon/pidgey.pic"
+PidgeyPicBack:: INCBIN "pic/monback/pidgeyb.pic"
+SlowpokePicFront:: INCBIN "pic/bmon/slowpoke.pic"
+SlowpokePicBack:: INCBIN "pic/monback/slowpokeb.pic"
+KadabraPicFront:: INCBIN "pic/bmon/kadabra.pic"
+KadabraPicBack:: INCBIN "pic/monback/kadabrab.pic"
+GravelerPicFront:: INCBIN "pic/bmon/graveler.pic"
+GravelerPicBack:: INCBIN "pic/monback/gravelerb.pic"
+ChanseyPicFront:: INCBIN "pic/bmon/chansey.pic"
+ChanseyPicBack:: INCBIN "pic/monback/chanseyb.pic"
+MachokePicFront:: INCBIN "pic/bmon/machoke.pic"
+MachokePicBack:: INCBIN "pic/monback/machokeb.pic"
+MrMimePicFront:: INCBIN "pic/bmon/mr.mime.pic"
+MrMimePicBack:: INCBIN "pic/monback/mr.mimeb.pic"
+HitmonleePicFront:: INCBIN "pic/bmon/hitmonlee.pic"
+HitmonleePicBack:: INCBIN "pic/monback/hitmonleeb.pic"
+HitmonchanPicFront:: INCBIN "pic/bmon/hitmonchan.pic"
+HitmonchanPicBack:: INCBIN "pic/monback/hitmonchanb.pic"
+ArbokPicFront:: INCBIN "pic/bmon/arbok.pic"
+ArbokPicBack:: INCBIN "pic/monback/arbokb.pic"
+ParasectPicFront:: INCBIN "pic/bmon/parasect.pic"
+ParasectPicBack:: INCBIN "pic/monback/parasectb.pic"
+PsyduckPicFront:: INCBIN "pic/bmon/psyduck.pic"
+PsyduckPicBack:: INCBIN "pic/monback/psyduckb.pic"
+DrowzeePicFront:: INCBIN "pic/bmon/drowzee.pic"
+DrowzeePicBack:: INCBIN "pic/monback/drowzeeb.pic"
+GolemPicFront:: INCBIN "pic/bmon/golem.pic"
+GolemPicBack:: INCBIN "pic/monback/golemb.pic"
+MagmarPicFront:: INCBIN "pic/bmon/magmar.pic"
+MagmarPicBack:: INCBIN "pic/monback/magmarb.pic"
+ElectabuzzPicFront:: INCBIN "pic/bmon/electabuzz.pic"
+ElectabuzzPicBack:: INCBIN "pic/monback/electabuzzb.pic"
+MagnetonPicFront:: INCBIN "pic/bmon/magneton.pic"
+MagnetonPicBack:: INCBIN "pic/monback/magnetonb.pic"
+KoffingPicFront:: INCBIN "pic/bmon/koffing.pic"
+KoffingPicBack:: INCBIN "pic/monback/koffingb.pic"
+MankeyPicFront:: INCBIN "pic/bmon/mankey.pic"
+MankeyPicBack:: INCBIN "pic/monback/mankeyb.pic"
+SeelPicFront:: INCBIN "pic/bmon/seel.pic"
+SeelPicBack:: INCBIN "pic/monback/seelb.pic"
+DiglettPicFront:: INCBIN "pic/bmon/diglett.pic"
+DiglettPicBack:: INCBIN "pic/monback/diglettb.pic"
+TaurosPicFront:: INCBIN "pic/bmon/tauros.pic"
+TaurosPicBack:: INCBIN "pic/monback/taurosb.pic"
+FarfetchdPicFront:: INCBIN "pic/bmon/farfetchd.pic"
+FarfetchdPicBack:: INCBIN "pic/monback/farfetchdb.pic"
+VenonatPicFront:: INCBIN "pic/bmon/venonat.pic"
+VenonatPicBack:: INCBIN "pic/monback/venonatb.pic"
+DragonitePicFront:: INCBIN "pic/bmon/dragonite.pic"
+DragonitePicBack:: INCBIN "pic/monback/dragoniteb.pic"
+DoduoPicFront:: INCBIN "pic/bmon/doduo.pic"
+DoduoPicBack:: INCBIN "pic/monback/doduob.pic"
+PoliwagPicFront:: INCBIN "pic/bmon/poliwag.pic"
+PoliwagPicBack:: INCBIN "pic/monback/poliwagb.pic"
+JynxPicFront:: INCBIN "pic/bmon/jynx.pic"
+JynxPicBack:: INCBIN "pic/monback/jynxb.pic"
+MoltresPicFront:: INCBIN "pic/bmon/moltres.pic"
+MoltresPicBack:: INCBIN "pic/monback/moltresb.pic"
+
+
+SECTION "Pics 3", ROMX
+
+ArticunoPicFront:: INCBIN "pic/bmon/articuno.pic"
+ArticunoPicBack:: INCBIN "pic/monback/articunob.pic"
+ZapdosPicFront:: INCBIN "pic/bmon/zapdos.pic"
+ZapdosPicBack:: INCBIN "pic/monback/zapdosb.pic"
+DittoPicFront:: INCBIN "pic/bmon/ditto.pic"
+DittoPicBack:: INCBIN "pic/monback/dittob.pic"
+MeowthPicFront:: INCBIN "pic/bmon/meowth.pic"
+MeowthPicBack:: INCBIN "pic/monback/meowthb.pic"
+KrabbyPicFront:: INCBIN "pic/bmon/krabby.pic"
+KrabbyPicBack:: INCBIN "pic/monback/krabbyb.pic"
+VulpixPicFront:: INCBIN "pic/bmon/vulpix.pic"
+VulpixPicBack:: INCBIN "pic/monback/vulpixb.pic"
+NinetalesPicFront:: INCBIN "pic/bmon/ninetales.pic"
+NinetalesPicBack:: INCBIN "pic/monback/ninetalesb.pic"
+PikachuPicFront:: INCBIN "pic/bmon/pikachu.pic"
+PikachuPicBack:: INCBIN "pic/monback/pikachub.pic"
+RaichuPicFront:: INCBIN "pic/bmon/raichu.pic"
+RaichuPicBack:: INCBIN "pic/monback/raichub.pic"
+DratiniPicFront:: INCBIN "pic/bmon/dratini.pic"
+DratiniPicBack:: INCBIN "pic/monback/dratinib.pic"
+DragonairPicFront:: INCBIN "pic/bmon/dragonair.pic"
+DragonairPicBack:: INCBIN "pic/monback/dragonairb.pic"
+KabutoPicFront:: INCBIN "pic/bmon/kabuto.pic"
+KabutoPicBack:: INCBIN "pic/monback/kabutob.pic"
+KabutopsPicFront:: INCBIN "pic/bmon/kabutops.pic"
+KabutopsPicBack:: INCBIN "pic/monback/kabutopsb.pic"
+HorseaPicFront:: INCBIN "pic/bmon/horsea.pic"
+HorseaPicBack:: INCBIN "pic/monback/horseab.pic"
+SeadraPicFront:: INCBIN "pic/bmon/seadra.pic"
+SeadraPicBack:: INCBIN "pic/monback/seadrab.pic"
+SandshrewPicFront:: INCBIN "pic/bmon/sandshrew.pic"
+SandshrewPicBack:: INCBIN "pic/monback/sandshrewb.pic"
+SandslashPicFront:: INCBIN "pic/bmon/sandslash.pic"
+SandslashPicBack:: INCBIN "pic/monback/sandslashb.pic"
+OmanytePicFront:: INCBIN "pic/bmon/omanyte.pic"
+OmanytePicBack:: INCBIN "pic/monback/omanyteb.pic"
+OmastarPicFront:: INCBIN "pic/bmon/omastar.pic"
+OmastarPicBack:: INCBIN "pic/monback/omastarb.pic"
+JigglypuffPicFront:: INCBIN "pic/bmon/jigglypuff.pic"
+JigglypuffPicBack:: INCBIN "pic/monback/jigglypuffb.pic"
+WigglytuffPicFront:: INCBIN "pic/bmon/wigglytuff.pic"
+WigglytuffPicBack:: INCBIN "pic/monback/wigglytuffb.pic"
+EeveePicFront:: INCBIN "pic/bmon/eevee.pic"
+EeveePicBack:: INCBIN "pic/monback/eeveeb.pic"
+FlareonPicFront:: INCBIN "pic/bmon/flareon.pic"
+FlareonPicBack:: INCBIN "pic/monback/flareonb.pic"
+JolteonPicFront:: INCBIN "pic/bmon/jolteon.pic"
+JolteonPicBack:: INCBIN "pic/monback/jolteonb.pic"
+VaporeonPicFront:: INCBIN "pic/bmon/vaporeon.pic"
+VaporeonPicBack:: INCBIN "pic/monback/vaporeonb.pic"
+MachopPicFront:: INCBIN "pic/bmon/machop.pic"
+MachopPicBack:: INCBIN "pic/monback/machopb.pic"
+ZubatPicFront:: INCBIN "pic/bmon/zubat.pic"
+ZubatPicBack:: INCBIN "pic/monback/zubatb.pic"
+EkansPicFront:: INCBIN "pic/bmon/ekans.pic"
+EkansPicBack:: INCBIN "pic/monback/ekansb.pic"
+ParasPicFront:: INCBIN "pic/bmon/paras.pic"
+ParasPicBack:: INCBIN "pic/monback/parasb.pic"
+PoliwhirlPicFront:: INCBIN "pic/bmon/poliwhirl.pic"
+PoliwhirlPicBack:: INCBIN "pic/monback/poliwhirlb.pic"
+PoliwrathPicFront:: INCBIN "pic/bmon/poliwrath.pic"
+PoliwrathPicBack:: INCBIN "pic/monback/poliwrathb.pic"
+WeedlePicFront:: INCBIN "pic/bmon/weedle.pic"
+WeedlePicBack:: INCBIN "pic/monback/weedleb.pic"
+KakunaPicFront:: INCBIN "pic/bmon/kakuna.pic"
+KakunaPicBack:: INCBIN "pic/monback/kakunab.pic"
+BeedrillPicFront:: INCBIN "pic/bmon/beedrill.pic"
+BeedrillPicBack:: INCBIN "pic/monback/beedrillb.pic"
+
+FossilKabutopsPic:: INCBIN "pic/bmon/fossilkabutops.pic"
+
+
+SECTION "Pics 4", ROMX
+
+DodrioPicFront:: INCBIN "pic/bmon/dodrio.pic"
+DodrioPicBack:: INCBIN "pic/monback/dodriob.pic"
+PrimeapePicFront:: INCBIN "pic/bmon/primeape.pic"
+PrimeapePicBack:: INCBIN "pic/monback/primeapeb.pic"
+DugtrioPicFront:: INCBIN "pic/bmon/dugtrio.pic"
+DugtrioPicBack:: INCBIN "pic/monback/dugtriob.pic"
+VenomothPicFront:: INCBIN "pic/bmon/venomoth.pic"
+VenomothPicBack:: INCBIN "pic/monback/venomothb.pic"
+DewgongPicFront:: INCBIN "pic/bmon/dewgong.pic"
+DewgongPicBack:: INCBIN "pic/monback/dewgongb.pic"
+CaterpiePicFront:: INCBIN "pic/bmon/caterpie.pic"
+CaterpiePicBack:: INCBIN "pic/monback/caterpieb.pic"
+MetapodPicFront:: INCBIN "pic/bmon/metapod.pic"
+MetapodPicBack:: INCBIN "pic/monback/metapodb.pic"
+ButterfreePicFront:: INCBIN "pic/bmon/butterfree.pic"
+ButterfreePicBack:: INCBIN "pic/monback/butterfreeb.pic"
+MachampPicFront:: INCBIN "pic/bmon/machamp.pic"
+MachampPicBack:: INCBIN "pic/monback/machampb.pic"
+GolduckPicFront:: INCBIN "pic/bmon/golduck.pic"
+GolduckPicBack:: INCBIN "pic/monback/golduckb.pic"
+HypnoPicFront:: INCBIN "pic/bmon/hypno.pic"
+HypnoPicBack:: INCBIN "pic/monback/hypnob.pic"
+GolbatPicFront:: INCBIN "pic/bmon/golbat.pic"
+GolbatPicBack:: INCBIN "pic/monback/golbatb.pic"
+MewtwoPicFront:: INCBIN "pic/bmon/mewtwo.pic"
+MewtwoPicBack:: INCBIN "pic/monback/mewtwob.pic"
+SnorlaxPicFront:: INCBIN "pic/bmon/snorlax.pic"
+SnorlaxPicBack:: INCBIN "pic/monback/snorlaxb.pic"
+MagikarpPicFront:: INCBIN "pic/bmon/magikarp.pic"
+MagikarpPicBack:: INCBIN "pic/monback/magikarpb.pic"
+MukPicFront:: INCBIN "pic/bmon/muk.pic"
+MukPicBack:: INCBIN "pic/monback/mukb.pic"
+KinglerPicFront:: INCBIN "pic/bmon/kingler.pic"
+KinglerPicBack:: INCBIN "pic/monback/kinglerb.pic"
+CloysterPicFront:: INCBIN "pic/bmon/cloyster.pic"
+CloysterPicBack:: INCBIN "pic/monback/cloysterb.pic"
+ElectrodePicFront:: INCBIN "pic/bmon/electrode.pic"
+ElectrodePicBack:: INCBIN "pic/monback/electrodeb.pic"
+ClefablePicFront:: INCBIN "pic/bmon/clefable.pic"
+ClefablePicBack:: INCBIN "pic/monback/clefableb.pic"
+WeezingPicFront:: INCBIN "pic/bmon/weezing.pic"
+WeezingPicBack:: INCBIN "pic/monback/weezingb.pic"
+PersianPicFront:: INCBIN "pic/bmon/persian.pic"
+PersianPicBack:: INCBIN "pic/monback/persianb.pic"
+MarowakPicFront:: INCBIN "pic/bmon/marowak.pic"
+MarowakPicBack:: INCBIN "pic/monback/marowakb.pic"
+HaunterPicFront:: INCBIN "pic/bmon/haunter.pic"
+HaunterPicBack:: INCBIN "pic/monback/haunterb.pic"
+AbraPicFront:: INCBIN "pic/bmon/abra.pic"
+AbraPicBack:: INCBIN "pic/monback/abrab.pic"
+AlakazamPicFront:: INCBIN "pic/bmon/alakazam.pic"
+AlakazamPicBack:: INCBIN "pic/monback/alakazamb.pic"
+PidgeottoPicFront:: INCBIN "pic/bmon/pidgeotto.pic"
+PidgeottoPicBack:: INCBIN "pic/monback/pidgeottob.pic"
+PidgeotPicFront:: INCBIN "pic/bmon/pidgeot.pic"
+PidgeotPicBack:: INCBIN "pic/monback/pidgeotb.pic"
+StarmiePicFront:: INCBIN "pic/bmon/starmie.pic"
+StarmiePicBack:: INCBIN "pic/monback/starmieb.pic"
+
+RedPicBack:: INCBIN "pic/trainer/redb.pic"
+OldManPic:: INCBIN "pic/trainer/oldman.pic"
+
+
+SECTION "Pics 5", ROMX
+
+BulbasaurPicFront:: INCBIN "pic/bmon/bulbasaur.pic"
+BulbasaurPicBack:: INCBIN "pic/monback/bulbasaurb.pic"
+VenusaurPicFront:: INCBIN "pic/bmon/venusaur.pic"
+VenusaurPicBack:: INCBIN "pic/monback/venusaurb.pic"
+TentacruelPicFront:: INCBIN "pic/bmon/tentacruel.pic"
+TentacruelPicBack:: INCBIN "pic/monback/tentacruelb.pic"
+GoldeenPicFront:: INCBIN "pic/bmon/goldeen.pic"
+GoldeenPicBack:: INCBIN "pic/monback/goldeenb.pic"
+SeakingPicFront:: INCBIN "pic/bmon/seaking.pic"
+SeakingPicBack:: INCBIN "pic/monback/seakingb.pic"
+PonytaPicFront:: INCBIN "pic/bmon/ponyta.pic"
+RapidashPicFront:: INCBIN "pic/bmon/rapidash.pic"
+PonytaPicBack:: INCBIN "pic/monback/ponytab.pic"
+RapidashPicBack:: INCBIN "pic/monback/rapidashb.pic"
+RattataPicFront:: INCBIN "pic/bmon/rattata.pic"
+RattataPicBack:: INCBIN "pic/monback/rattatab.pic"
+RaticatePicFront:: INCBIN "pic/bmon/raticate.pic"
+RaticatePicBack:: INCBIN "pic/monback/raticateb.pic"
+NidorinoPicFront:: INCBIN "pic/bmon/nidorino.pic"
+NidorinoPicBack:: INCBIN "pic/monback/nidorinob.pic"
+NidorinaPicFront:: INCBIN "pic/bmon/nidorina.pic"
+NidorinaPicBack:: INCBIN "pic/monback/nidorinab.pic"
+GeodudePicFront:: INCBIN "pic/bmon/geodude.pic"
+GeodudePicBack:: INCBIN "pic/monback/geodudeb.pic"
+PorygonPicFront:: INCBIN "pic/bmon/porygon.pic"
+PorygonPicBack:: INCBIN "pic/monback/porygonb.pic"
+AerodactylPicFront:: INCBIN "pic/bmon/aerodactyl.pic"
+AerodactylPicBack:: INCBIN "pic/monback/aerodactylb.pic"
+MagnemitePicFront:: INCBIN "pic/bmon/magnemite.pic"
+MagnemitePicBack:: INCBIN "pic/monback/magnemiteb.pic"
+CharmanderPicFront:: INCBIN "pic/bmon/charmander.pic"
+CharmanderPicBack:: INCBIN "pic/monback/charmanderb.pic"
+SquirtlePicFront:: INCBIN "pic/bmon/squirtle.pic"
+SquirtlePicBack:: INCBIN "pic/monback/squirtleb.pic"
+CharmeleonPicFront:: INCBIN "pic/bmon/charmeleon.pic"
+CharmeleonPicBack:: INCBIN "pic/monback/charmeleonb.pic"
+WartortlePicFront:: INCBIN "pic/bmon/wartortle.pic"
+WartortlePicBack:: INCBIN "pic/monback/wartortleb.pic"
+CharizardPicFront:: INCBIN "pic/bmon/charizard.pic"
+CharizardPicBack:: INCBIN "pic/monback/charizardb.pic"
+FossilAerodactylPic:: INCBIN "pic/bmon/fossilaerodactyl.pic"
+GhostPic:: INCBIN "pic/other/ghost.pic"
+OddishPicFront:: INCBIN "pic/bmon/oddish.pic"
+OddishPicBack:: INCBIN "pic/monback/oddishb.pic"
+GloomPicFront:: INCBIN "pic/bmon/gloom.pic"
+GloomPicBack:: INCBIN "pic/monback/gloomb.pic"
+VileplumePicFront:: INCBIN "pic/bmon/vileplume.pic"
+VileplumePicBack:: INCBIN "pic/monback/vileplumeb.pic"
+BellsproutPicFront:: INCBIN "pic/bmon/bellsprout.pic"
+BellsproutPicBack:: INCBIN "pic/monback/bellsproutb.pic"
+WeepinbellPicFront:: INCBIN "pic/bmon/weepinbell.pic"
+WeepinbellPicBack:: INCBIN "pic/monback/weepinbellb.pic"
+VictreebelPicFront:: INCBIN "pic/bmon/victreebel.pic"
+VictreebelPicBack:: INCBIN "pic/monback/victreebelb.pic"
+
+
+SECTION "Pics 6", ROMX
+
+TrainerPics::
+YoungsterPic:: INCBIN "pic/trainer/youngster.pic"
+BugCatcherPic:: INCBIN "pic/trainer/bugcatcher.pic"
+LassPic:: INCBIN "pic/trainer/lass.pic"
+SailorPic:: INCBIN "pic/trainer/sailor.pic"
+JrTrainerMPic:: INCBIN "pic/trainer/jr.trainerm.pic"
+JrTrainerFPic:: INCBIN "pic/trainer/jr.trainerf.pic"
+PokemaniacPic:: INCBIN "pic/trainer/pokemaniac.pic"
+SuperNerdPic:: INCBIN "pic/trainer/supernerd.pic"
+HikerPic:: INCBIN "pic/trainer/hiker.pic"
+BikerPic:: INCBIN "pic/trainer/biker.pic"
+BurglarPic:: INCBIN "pic/trainer/burglar.pic"
+EngineerPic:: INCBIN "pic/trainer/engineer.pic"
+FisherPic:: INCBIN "pic/trainer/fisher.pic"
+SwimmerPic:: INCBIN "pic/trainer/swimmer.pic"
+CueBallPic:: INCBIN "pic/trainer/cueball.pic"
+GamblerPic:: INCBIN "pic/trainer/gambler.pic"
+BeautyPic:: INCBIN "pic/trainer/beauty.pic"
+PsychicPic:: INCBIN "pic/trainer/psychic.pic"
+RockerPic:: INCBIN "pic/trainer/rocker.pic"
+JugglerPic:: INCBIN "pic/trainer/juggler.pic"
+TamerPic:: INCBIN "pic/trainer/tamer.pic"
+BirdKeeperPic:: INCBIN "pic/trainer/birdkeeper.pic"
+BlackbeltPic:: INCBIN "pic/trainer/blackbelt.pic"
+Rival1Pic:: INCBIN "pic/trainer/rival1.pic"
+ProfOakPic:: INCBIN "pic/trainer/prof.oak.pic"
+ChiefPic::
+ScientistPic:: INCBIN "pic/trainer/scientist.pic"
+GiovanniPic:: INCBIN "pic/trainer/giovanni.pic"
+RocketPic:: INCBIN "pic/trainer/rocket.pic"
+CooltrainerMPic:: INCBIN "pic/trainer/cooltrainerm.pic"
+CooltrainerFPic:: INCBIN "pic/trainer/cooltrainerf.pic"
+BrunoPic:: INCBIN "pic/trainer/bruno.pic"
+BrockPic:: INCBIN "pic/trainer/brock.pic"
+MistyPic:: INCBIN "pic/trainer/misty.pic"
+LtSurgePic:: INCBIN "pic/trainer/lt.surge.pic"
+ErikaPic:: INCBIN "pic/trainer/erika.pic"
+KogaPic:: INCBIN "pic/trainer/koga.pic"
+BlainePic:: INCBIN "pic/trainer/blaine.pic"
+SabrinaPic:: INCBIN "pic/trainer/sabrina.pic"
+GentlemanPic:: INCBIN "pic/trainer/gentleman.pic"
+Rival2Pic:: INCBIN "pic/trainer/rival2.pic"
+Rival3Pic:: INCBIN "pic/trainer/rival3.pic"
+LoreleiPic:: INCBIN "pic/trainer/lorelei.pic"
+ChannelerPic:: INCBIN "pic/trainer/channeler.pic"
+AgathaPic:: INCBIN "pic/trainer/agatha.pic"
+LancePic:: INCBIN "pic/trainer/lance.pic"
--- a/pokered.link
+++ /dev/null
@@ -1,273 +1,0 @@
-ROM0
- org $0000
- "rst 00"
-
- org $0008
- "rst 08"
-
- org $0010
- "rst 10"
-
- org $0018
- "rst 18"
-
- org $0020
- "rst 20"
-
- org $0028
- "rst 28"
-
- org $0030
- "rst 30"
-
- org $0038
- "rst 38"
-
- org $0040
- "vblank"
-
- org $0048
- "hblank"
-
- org $0050
- "timer"
-
- org $0058
- "serial"
-
- org $0060
- "joypad"
- ; $0061
- "Home"
-
- org $100
- "Entry"
- ; $0104
- "Header"
-
- org $150
- "Main"
-
-ROMX $1
- org $4000
- "bank1"
-
-ROMX $2
- org $4000
- "Sound Effect Headers 1" ; AUDIO_1
- "Music Headers 1"
- "Sound Effects 1"
- "Audio Engine 1"
- "Music 1"
-
-ROMX $3
- org $4000
- "bank3"
-
-ROMX $4
- org $4000
- "NPC Sprites 1" ; NPC_SPRITES_1
- "Graphics (BANK 4)" ; GFX
- "Battle (BANK 4)"
-
-ROMX $5
- org $4000
- "NPC Sprites 2" ; NPC_SPRITES_2
- "Battle (BANK 5)"
-
-ROMX $6
- org $4000
- "bank6"
-
-ROMX $7
- org $4000
- "bank7"
-
-ROMX $8
- org $4000
- "Sound Effect Headers 2" ; AUDIO_2
- "Music Headers 2"
- "Sound Effects 2"
- "Audio Engine 2"
- "Music 2"
-
-ROMX $9
- org $4000
- "Pics 1" ; PICS_1
- "Battle (BANK 9)"
-
-ROMX $A
- org $4000
- "Pics 2" ; PICS_2
- "Battle (BANK A)"
-
-ROMX $B
- org $4000
- "Pics 3" ; PICS_3
- "Battle (BANK B)"
-
-ROMX $C
- org $4000
- "Pics 4" ; PICS_4
- "Battle (BANK C)"
-
-ROMX $D
- org $4000
- "Pics 5" ; PICS_5
- "Battle (BANK D)"
-
-ROMX $E
- org $4000
- "bankE"
-
-ROMX $F
- org $4000
- "bankF"
-
-ROMX $10
- org $4000
- "bank10"
-
-ROMX $11
- org $4000
- "bank11"
-
-ROMX $12
- org $4000
- "bank12"
-
-ROMX $13
- org $4000
- "bank13"
-
-ROMX $14
- org $4000
- "bank14"
-
-ROMX $15
- org $4000
- "bank15"
-
-ROMX $16
- org $4000
- "bank16"
-
-ROMX $17
- org $4000
- "bank17"
-
-ROMX $18
- org $4000
- "bank18"
-
-ROMX $19
- org $4000
- "bank19"
-
-ROMX $1A
- org $4000
- "bank1A"
-
-ROMX $1B
- org $4000
- "bank1B"
-
-ROMX $1C
- org $4000
- "bank1C"
-
-ROMX $1D
- org $4000
- "bank1D"
-
-ROMX $1E
- org $4000
- "bank1E"
-
-ROMX $1F
- org $4000
- "Sound Effect Headers 3" ; AUDIO_3
- "Music Headers 3"
- "Sound Effects 3"
- "Audio Engine 3"
- "Music 3"
-
-ROMX $20
- org $4000
- "Text 1" ; TEXT_1
-
-ROMX $21
- org $4000
- "Text 2" ; TEXT_2
-
-ROMX $22
- org $4000
- "Text 3" ; TEXT_3
-
-ROMX $23
- org $4000
- "Text 4" ; TEXT_4
-
-ROMX $24
- org $4000
- "Text 5" ; TEXT_5
-
-ROMX $25
- org $4000
- "Text 6" ; TEXT_6
-
-ROMX $26
- org $4000
- "Text 7" ; TEXT_7
-
-ROMX $27
- org $4000
- "Text 8" ; TEXT_8
-
-ROMX $28
- org $4000
- "Text 9" ; TEXT_9
-
-ROMX $29
- org $4000
- "Text 10" ; TEXT_10
-
-ROMX $2A
- org $4000
- "Text 11" ; TEXT_11
-
-ROMX $2B
- org $4000
- "Pokedex Text" ; POKEDEX_TEXT
-
-ROMX $2C
- org $4000
- "Move Names" ; MOVE_NAMES
-
-WRAM0
- org $c000
- "WRAM Bank 0"
-
- org $c100
- "Sprite State Data"
- "OAM Buffer"
-
- org $dfff
- "Stack"
-
-SRAM 0
- org $a000
- "Sprite Buffers"
-
-SRAM 1
- org $a000
- "Save Data"
-
-SRAM 2
- org $a000
- "Saved Boxes 1"
-
-SRAM 3
- org $a000
- "Saved Boxes 2"
-
--- a/scripts/PokemonMansion1F.asm
+++ b/scripts/PokemonMansion1F.asm
@@ -45,7 +45,7 @@
predef ReplaceTileBlock
ret
-Mansion1Script_Switches:
+Mansion1Script_Switches::
ld a, [wSpriteStateData1 + 9]
cp SPRITE_FACING_UP
ret nz
--- a/scripts/PokemonMansion2F.asm
+++ b/scripts/PokemonMansion2F.asm
@@ -41,7 +41,7 @@
ld [wNewTileBlockID], a
predef_jump ReplaceTileBlock
-Mansion2Script_Switches:
+Mansion2Script_Switches::
ld a, [wSpriteStateData1 + 9]
cp SPRITE_FACING_UP
ret nz
--- a/scripts/PokemonMansion3F.asm
+++ b/scripts/PokemonMansion3F.asm
@@ -72,7 +72,7 @@
set 4, [hl]
ret
-Mansion3Script_Switches:
+Mansion3Script_Switches::
ld a, [wSpriteStateData1 + 9]
cp SPRITE_FACING_UP
ret nz
--- a/scripts/PokemonMansionB1F.asm
+++ b/scripts/PokemonMansionB1F.asm
@@ -43,7 +43,7 @@
call Mansion2Script_5202f
ret
-Mansion4Script_Switches:
+Mansion4Script_Switches::
ld a, [wSpriteStateData1 + 9]
cp SPRITE_FACING_UP
ret nz
--- a/scripts/RocketHideoutB2F.asm
+++ b/scripts/RocketHideoutB2F.asm
@@ -313,7 +313,7 @@
ld [wCurMapScript], a
ret
-LoadSpinnerArrowTiles:
+LoadSpinnerArrowTiles::
ld a, [wSpriteStateData1 + 2]
srl a
srl a
--- /dev/null
+++ b/sprites.asm
@@ -1,0 +1,73 @@
+SECTION "NPC Sprites 1", ROMX
+
+OakAideSprite:: INCBIN "gfx/sprites/oak_aide.2bpp"
+RockerSprite:: INCBIN "gfx/sprites/rocker.2bpp"
+SwimmerSprite:: INCBIN "gfx/sprites/swimmer.2bpp"
+WhitePlayerSprite:: INCBIN "gfx/sprites/white_player.2bpp"
+GymHelperSprite:: INCBIN "gfx/sprites/gym_helper.2bpp"
+OldPersonSprite:: INCBIN "gfx/sprites/old_person.2bpp"
+MartGuySprite:: INCBIN "gfx/sprites/mart_guy.2bpp"
+FisherSprite:: INCBIN "gfx/sprites/fisher.2bpp"
+OldMediumWomanSprite:: INCBIN "gfx/sprites/old_medium_woman.2bpp"
+NurseSprite:: INCBIN "gfx/sprites/nurse.2bpp"
+CableClubWomanSprite:: INCBIN "gfx/sprites/cable_club_woman.2bpp"
+MrMasterballSprite:: INCBIN "gfx/sprites/mr_masterball.2bpp"
+LaprasGiverSprite:: INCBIN "gfx/sprites/lapras_giver.2bpp"
+WardenSprite:: INCBIN "gfx/sprites/warden.2bpp"
+SsCaptainSprite:: INCBIN "gfx/sprites/ss_captain.2bpp"
+Fisher2Sprite:: INCBIN "gfx/sprites/fisher2.2bpp"
+BlackbeltSprite:: INCBIN "gfx/sprites/blackbelt.2bpp"
+GuardSprite:: INCBIN "gfx/sprites/guard.2bpp"
+BallSprite:: INCBIN "gfx/sprites/ball.2bpp"
+OmanyteSprite:: INCBIN "gfx/sprites/omanyte.2bpp"
+BoulderSprite:: INCBIN "gfx/sprites/boulder.2bpp"
+PaperSheetSprite:: INCBIN "gfx/sprites/paper_sheet.2bpp"
+BookMapDexSprite:: INCBIN "gfx/sprites/book_map_dex.2bpp"
+ClipboardSprite:: INCBIN "gfx/sprites/clipboard.2bpp"
+SnorlaxSprite:: INCBIN "gfx/sprites/snorlax.2bpp"
+OldAmberSprite:: INCBIN "gfx/sprites/old_amber.2bpp"
+LyingOldManSprite:: INCBIN "gfx/sprites/lying_old_man.2bpp"
+
+
+SECTION "NPC Sprites 2", ROMX
+
+RedCyclingSprite:: INCBIN "gfx/sprites/cycling.2bpp"
+RedSprite:: INCBIN "gfx/sprites/red.2bpp"
+BlueSprite:: INCBIN "gfx/sprites/blue.2bpp"
+OakSprite:: INCBIN "gfx/sprites/oak.2bpp"
+BugCatcherSprite:: INCBIN "gfx/sprites/bug_catcher.2bpp"
+SlowbroSprite:: INCBIN "gfx/sprites/slowbro.2bpp"
+LassSprite:: INCBIN "gfx/sprites/lass.2bpp"
+BlackHairBoy1Sprite:: INCBIN "gfx/sprites/black_hair_boy_1.2bpp"
+LittleGirlSprite:: INCBIN "gfx/sprites/little_girl.2bpp"
+BirdSprite:: INCBIN "gfx/sprites/bird.2bpp"
+FatBaldGuySprite:: INCBIN "gfx/sprites/fat_bald_guy.2bpp"
+GamblerSprite:: INCBIN "gfx/sprites/gambler.2bpp"
+BlackHairBoy2Sprite:: INCBIN "gfx/sprites/black_hair_boy_2.2bpp"
+GirlSprite:: INCBIN "gfx/sprites/girl.2bpp"
+HikerSprite:: INCBIN "gfx/sprites/hiker.2bpp"
+FoulardWomanSprite:: INCBIN "gfx/sprites/foulard_woman.2bpp"
+GentlemanSprite:: INCBIN "gfx/sprites/gentleman.2bpp"
+DaisySprite:: INCBIN "gfx/sprites/daisy.2bpp"
+BikerSprite:: INCBIN "gfx/sprites/biker.2bpp"
+SailorSprite:: INCBIN "gfx/sprites/sailor.2bpp"
+CookSprite:: INCBIN "gfx/sprites/cook.2bpp"
+BikeShopGuySprite:: INCBIN "gfx/sprites/bike_shop_guy.2bpp"
+MrFujiSprite:: INCBIN "gfx/sprites/mr_fuji.2bpp"
+GiovanniSprite:: INCBIN "gfx/sprites/giovanni.2bpp"
+RocketSprite:: INCBIN "gfx/sprites/rocket.2bpp"
+MediumSprite:: INCBIN "gfx/sprites/medium.2bpp"
+WaiterSprite:: INCBIN "gfx/sprites/waiter.2bpp"
+ErikaSprite:: INCBIN "gfx/sprites/erika.2bpp"
+MomGeishaSprite:: INCBIN "gfx/sprites/mom_geisha.2bpp"
+BrunetteGirlSprite:: INCBIN "gfx/sprites/brunette_girl.2bpp"
+LanceSprite:: INCBIN "gfx/sprites/lance.2bpp"
+MomSprite:: INCBIN "gfx/sprites/mom.2bpp"
+BaldingGuySprite:: INCBIN "gfx/sprites/balding_guy.2bpp"
+YoungBoySprite:: INCBIN "gfx/sprites/young_boy.2bpp"
+GameboyKidSprite:: INCBIN "gfx/sprites/gameboy_kid.2bpp"
+ClefairySprite:: INCBIN "gfx/sprites/clefairy.2bpp"
+AgathaSprite:: INCBIN "gfx/sprites/agatha.2bpp"
+BrunoSprite:: INCBIN "gfx/sprites/bruno.2bpp"
+LoreleiSprite:: INCBIN "gfx/sprites/lorelei.2bpp"
+SeelSprite:: INCBIN "gfx/sprites/seel.2bpp"
--- a/text.asm
+++ b/text.asm
@@ -1,29 +1,13 @@
+INCLUDE "macros.asm"
INCLUDE "charmap.asm"
-INCLUDE "constants/text_constants.asm"
-
-TEXT_1 EQU $20
-TEXT_2 EQU TEXT_1 + 1
-TEXT_3 EQU TEXT_2 + 1
-TEXT_4 EQU TEXT_3 + 1
-TEXT_5 EQU TEXT_4 + 1
-TEXT_6 EQU TEXT_5 + 1
-TEXT_7 EQU TEXT_6 + 1
-TEXT_8 EQU TEXT_7 + 1
-TEXT_9 EQU TEXT_8 + 1
-TEXT_10 EQU TEXT_9 + 1
-TEXT_11 EQU TEXT_10 + 1
-
-POKEDEX_TEXT EQU TEXT_11 + 1
-MOVE_NAMES EQU POKEDEX_TEXT + 1
-
-INCLUDE "macros.asm"
-
INCLUDE "hram.asm"
+INCLUDE "constants/text_constants.asm"
-SECTION "Text 1", ROMX ; BANK $20
+SECTION "Text 1", ROMX
+
_CardKeySuccessText1::
text "Bingo!@@"
@@ -195,7 +179,7 @@
INCLUDE "text/maps/SilphCo5F.asm"
-SECTION "Text 2", ROMX ; BANK $21
+SECTION "Text 2", ROMX
INCLUDE "text/maps/SilphCo5F_2.asm"
INCLUDE "text/maps/SilphCo6F.asm"
@@ -227,7 +211,7 @@
INCLUDE "text/maps/RockTunnelB1F.asm"
-SECTION "Text 3", ROMX ; BANK $22
+SECTION "Text 3", ROMX
INCLUDE "text/maps/RockTunnelB1F_2.asm"
INCLUDE "text/maps/SeafoamIslandsB4F.asm"
@@ -1942,7 +1926,7 @@
INCLUDE "text/maps/Daycare.asm"
-SECTION "Text 4", ROMX ; BANK $23
+SECTION "Text 4", ROMX
INCLUDE "text/maps/Daycare_2.asm"
INCLUDE "text/maps/UndergroundPathRoute6.asm"
@@ -1981,7 +1965,7 @@
INCLUDE "text/maps/Route11.asm"
-SECTION "Text 5", ROMX ; BANK $24
+SECTION "Text 5", ROMX
INCLUDE "text/maps/Route11_2.asm"
INCLUDE "text/maps/Route12.asm"
@@ -1999,7 +1983,7 @@
INCLUDE "text/maps/Route24.asm"
-SECTION "Text 6", ROMX ; BANK $25
+SECTION "Text 6", ROMX
INCLUDE "text/maps/Route24_2.asm"
INCLUDE "text/maps/Route25.asm"
@@ -2342,7 +2326,7 @@
INCLUDE "text/maps/PewterGym.asm"
-SECTION "Text 7", ROMX ; BANK $26
+SECTION "Text 7", ROMX
INCLUDE "text/maps/PewterGym_2.asm"
INCLUDE "text/maps/PewterNidoranHouse.asm"
@@ -2374,7 +2358,7 @@
INCLUDE "text/maps/VermilionGym.asm"
-SECTION "Text 8", ROMX ; BANK $27
+SECTION "Text 8", ROMX
INCLUDE "text/maps/VermilionGym_2.asm"
INCLUDE "text/maps/VermilionPidgeyHouse.asm"
@@ -2406,7 +2390,7 @@
INCLUDE "text/maps/FuchsiaGym.asm"
-SECTION "Text 9", ROMX ; BANK $28
+SECTION "Text 9", ROMX
INCLUDE "text/maps/FuchsiaGym_2.asm"
INCLUDE "text/maps/FuchsiaMeetingRoom.asm"
@@ -2649,7 +2633,7 @@
done
-SECTION "Text 10", ROMX ; BANK $29
+SECTION "Text 10", ROMX
_CableClubNPCPleaseComeAgainText::
text "Please come again!"
@@ -2995,7 +2979,7 @@
prompt
-SECTION "Text 11", ROMX ; BANK $2a
+SECTION "Text 11", ROMX
_ItemUseText001::
text "<PLAYER> used@@"
@@ -3195,11 +3179,11 @@
prompt
-SECTION "Pokedex Text", ROMX ; BANK $2b
+SECTION "Pokedex Text", ROMX
INCLUDE "text/pokedex.asm"
-SECTION "Move Names", ROMX ; BANK $2c
+SECTION "Move Names", ROMX
INCLUDE "text/move_names.asm"
--- a/text/item_names.asm
+++ b/text/item_names.asm
@@ -1,4 +1,4 @@
-ItemNames:
+ItemNames::
db "MASTER BALL@"
db "ULTRA BALL@"
db "GREAT BALL@"
--- a/text/monster_names.asm
+++ b/text/monster_names.asm
@@ -1,4 +1,4 @@
-MonsterNames:
+MonsterNames::
db "RHYDON@@@@"
db "KANGASKHAN"
db "NIDORAN♂@@"
--- a/text/trainer_names.asm
+++ b/text/trainer_names.asm
@@ -1,4 +1,4 @@
-TrainerNames:
+TrainerNames::
db "YOUNGSTER@"
db "BUG CATCHER@"
db "LASS@"
--- /dev/null
+++ b/tilesets.asm
@@ -1,0 +1,64 @@
+SECTION "Tilesets 1", ROMX
+
+Overworld_GFX:: INCBIN "gfx/tilesets/overworld.2bpp"
+Overworld_Block:: INCBIN "gfx/blocksets/overworld.bst"
+
+RedsHouse1_GFX::
+RedsHouse2_GFX:: INCBIN "gfx/tilesets/reds_house.2bpp"
+ ds 16
+RedsHouse1_Block::
+RedsHouse2_Block:: INCBIN "gfx/blocksets/reds_house.bst"
+
+House_GFX:: INCBIN "gfx/tilesets/house.2bpp"
+House_Block:: INCBIN "gfx/blocksets/house.bst"
+Mansion_GFX:: INCBIN "gfx/tilesets/mansion.2bpp"
+Mansion_Block:: INCBIN "gfx/blocksets/mansion.bst"
+ShipPort_GFX:: INCBIN "gfx/tilesets/ship_port.2bpp"
+ShipPort_Block:: INCBIN "gfx/blocksets/ship_port.bst"
+Interior_GFX:: INCBIN "gfx/tilesets/interior.2bpp"
+Interior_Block:: INCBIN "gfx/blocksets/interior.bst"
+Plateau_GFX:: INCBIN "gfx/tilesets/plateau.2bpp"
+Plateau_Block:: INCBIN "gfx/blocksets/plateau.bst"
+
+
+SECTION "Tilesets 2", ROMX
+
+Dojo_GFX::
+Gym_GFX:: INCBIN "gfx/tilesets/gym.2bpp"
+Dojo_Block::
+Gym_Block:: INCBIN "gfx/blocksets/gym.bst"
+
+Mart_GFX::
+Pokecenter_GFX:: INCBIN "gfx/tilesets/pokecenter.2bpp"
+Mart_Block::
+Pokecenter_Block:: INCBIN "gfx/blocksets/pokecenter.bst"
+
+ForestGate_GFX::
+Museum_GFX::
+Gate_GFX:: INCBIN "gfx/tilesets/gate.2bpp"
+ForestGate_Block::
+Museum_Block::
+Gate_Block:: INCBIN "gfx/blocksets/gate.bst"
+
+Forest_GFX:: INCBIN "gfx/tilesets/forest.2bpp"
+Forest_Block:: INCBIN "gfx/blocksets/forest.bst"
+Facility_GFX:: INCBIN "gfx/tilesets/facility.2bpp"
+Facility_Block:: INCBIN "gfx/blocksets/facility.bst"
+
+
+SECTION "Tilesets 3", ROMX
+
+Cemetery_GFX:: INCBIN "gfx/tilesets/cemetery.2bpp"
+Cemetery_Block:: INCBIN "gfx/blocksets/cemetery.bst"
+Cavern_GFX:: INCBIN "gfx/tilesets/cavern.2bpp"
+Cavern_Block:: INCBIN "gfx/blocksets/cavern.bst"
+Lobby_GFX:: INCBIN "gfx/tilesets/lobby.2bpp"
+Lobby_Block:: INCBIN "gfx/blocksets/lobby.bst"
+Ship_GFX:: INCBIN "gfx/tilesets/ship.2bpp"
+Ship_Block:: INCBIN "gfx/blocksets/ship.bst"
+Lab_GFX:: INCBIN "gfx/tilesets/lab.2bpp"
+Lab_Block:: INCBIN "gfx/blocksets/lab.bst"
+Club_GFX:: INCBIN "gfx/tilesets/club.2bpp"
+Club_Block:: INCBIN "gfx/blocksets/club.bst"
+Underground_GFX:: INCBIN "gfx/tilesets/underground.2bpp"
+Underground_Block:: INCBIN "gfx/blocksets/underground.bst"