summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-06-01 10:07:32 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-06-01 10:07:32 -0400
commitae64f34263738b8cb5125c0d710f0076bc72e9ee (patch)
tree3b0ba24ad4f2c8116f7201f66df4e85196d8cf0f /main.asm
parentb50e74d0d93cef3298f095bafa1522217a6966c2 (diff)
Celadon Hotel
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm7
1 files changed, 6 insertions, 1 deletions
diff --git a/main.asm b/main.asm
index 2ec12a88..2e48c103 100755
--- a/main.asm
+++ b/main.asm
@@ -973,7 +973,12 @@ INCLUDE "scripts/celadonhouse.asm"
INCLUDE "data/mapObjects/celadonhouse.asm"
CeladonHouseBlocks:
INCBIN "maps/celadonhouse.blk"
- dr $49243,$492a9
+
+INCLUDE "data/mapHeaders/celadonhotel.asm"
+INCLUDE "scripts/celadonhotel.asm"
+INCLUDE "data/mapObjects/celadonhotel.asm"
+CeladonHotelBlocks:
+INCBIN "maps/celadonhotel.blk"
INCLUDE "data/mapHeaders/mtmoonpokecenter.asm"
INCLUDE "scripts/mtmoonpokecenter.asm"