aboutsummaryrefslogtreecommitdiffstats
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-31 18:31:40 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-31 18:31:40 -0400
commit676cfc329e40d6c9233933bae82f86cc09f5b1c2 (patch)
tree86437146184e9a16e2c03f5ed6e2f2f4eb95b22f /main.asm
parentCeladon Mart 1F (diff)
downloadpokeyellow-676cfc329e40d6c9233933bae82f86cc09f5b1c2.tar.gz
pokeyellow-676cfc329e40d6c9233933bae82f86cc09f5b1c2.tar.xz
pokeyellow-676cfc329e40d6c9233933bae82f86cc09f5b1c2.zip
Celadon Mart 2F
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm9
1 files changed, 8 insertions, 1 deletions
diff --git a/main.asm b/main.asm
index 1de4969d..5b84e777 100755
--- a/main.asm
+++ b/main.asm
@@ -1155,7 +1155,14 @@ INCLUDE "scripts/route19.asm"
INCLUDE "scripts/route21.asm"
; vermilion house 2
- dr $56054,$56233
+ dr $56054,$560d9
+
+INCLUDE "data/mapHeaders/celadonmart2.asm"
+INCLUDE "scripts/celadonmart2.asm"
+INCLUDE "data/mapObjects/celadonmart2.asm"
+CeladonMart2Blocks:
+INCBIN "maps/celadonmart2.blk"
+ dr $56160,$56233
INCLUDE "data/mapHeaders/daycarem.asm"
INCLUDE "scripts/daycarem.asm"