aboutsummaryrefslogtreecommitdiffstats
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-29 16:24:41 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-29 16:24:41 -0400
commit9abb62033819774d7b256ee0222f7c6ece987bfe (patch)
treeade69ea7b4186c8438592bca84c1968c2d41fcbd /main.asm
parentPewter houses, Pewter mart (diff)
downloadpokeyellow-9abb62033819774d7b256ee0222f7c6ece987bfe.tar.gz
pokeyellow-9abb62033819774d7b256ee0222f7c6ece987bfe.tar.xz
pokeyellow-9abb62033819774d7b256ee0222f7c6ece987bfe.zip
Pewter Pokecenter
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm12
1 files changed, 9 insertions, 3 deletions
diff --git a/main.asm b/main.asm
index 3ba53669..33332dff 100755
--- a/main.asm
+++ b/main.asm
@@ -746,7 +746,6 @@ INCLUDE "data/mapObjects/lavendertown.asm"
LavenderTownBlocks:
INCBIN "maps/lavendertown.blk"
ViridianPokecenterBlocks:
-PewterPokecenterBlocks:
CeruleanPokecenterBlocks:
VermilionPokecenterBlocks:
SaffronPokecenterBlocks:
@@ -1059,7 +1058,9 @@ Museum1FBlocks:
INCBIN "maps/museum1f.blk"
Museum2FBlocks:
INCBIN "maps/museum2f.blk"
- dr $5c064,$5c090
+PewterPokecenterBlocks:
+INCBIN "maps/pewterpokecenter.blk"
+ dr $5c080,$5c090
ViridianForestEntranceBlocks:
ViridianForestExitBlocks:
Route2GateBlocks:
@@ -1083,7 +1084,12 @@ INCLUDE "scripts/pewtergym.asm"
INCLUDE "data/mapObjects/pewtergym.asm"
PewterGymBlocks:
INCBIN "maps/pewtergym.blk"
- dr $5c46e,$5d485
+
+INCLUDE "data/mapHeaders/pewterpokecenter.asm"
+INCLUDE "scripts/pewterpokecenter.asm"
+INCLUDE "data/mapObjects/pewterpokecenter.asm"
+
+ dr $5c4f5,$5d485
INCLUDE "data/mapHeaders/viridianforestexit.asm"
INCLUDE "scripts/viridianforestexit.asm"