aboutsummaryrefslogtreecommitdiffstats
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-06-02 13:13:31 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-06-02 13:13:31 -0400
commit34061c6d0fae84b4a572bb2792ec6c09ede95e20 (patch)
treeb5a0b650800942c18aa37bcce9ff0e379df19cae /main.asm
parentCinnabar Mart (diff)
downloadpokeyellow-34061c6d0fae84b4a572bb2792ec6c09ede95e20.tar.gz
pokeyellow-34061c6d0fae84b4a572bb2792ec6c09ede95e20.tar.xz
pokeyellow-34061c6d0fae84b4a572bb2792ec6c09ede95e20.zip
Copycat's House 1F
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm8
1 files changed, 5 insertions, 3 deletions
diff --git a/main.asm b/main.asm
index 3354d6e9..060d6162 100755
--- a/main.asm
+++ b/main.asm
@@ -1596,8 +1596,7 @@ INCLUDE "engine/save.asm"
SECTION "bank1D",ROMX,BANK[$1D]
- dr $74000,$74010
-
+CopycatsHouse1FBlocks: INCBIN "maps/copycatshouse1f.blk"
PewterMartBlocks:
CinnabarMartBlocks: INCBIN "maps/pewtermart.blk"
FuchsiaHouse1Blocks: INCBIN "maps/fuchsiahouse1.blk"
@@ -1700,7 +1699,10 @@ INCLUDE "data/mapObjects/cinnabarpokecenter.asm"
INCLUDE "data/mapHeaders/cinnabarmart.asm"
INCLUDE "scripts/cinnabarmart.asm"
INCLUDE "data/mapObjects/cinnabarmart.asm"
- dr $75746,$757a0
+
+INCLUDE "data/mapHeaders/copycatshouse1f.asm"
+INCLUDE "scripts/copycatshouse1f.asm"
+INCLUDE "data/mapObjects/copycatshouse1f.asm"
INCLUDE "data/mapHeaders/gary.asm"
INCLUDE "scripts/gary.asm"