summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-27 22:27:35 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-27 22:27:35 -0400
commite51658fed09fa1247fb1d61c76f7f0441bf9f388 (patch)
treef5e1a240057605a86cb695b1397a7438726a21b1 /main.asm
parent38d57913867d66d30bca12070d2cbc2bc5fc25ba (diff)
Red's House 1F
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 f4e6d582..bd9d8322 100755
--- a/main.asm
+++ b/main.asm
@@ -705,9 +705,13 @@ Route7Blocks: ; 48051
INCBIN "maps/route7.blk"
dr $480ab,$480eb
INCLUDE "scripts/route7.asm"
-; INCLUDE "data/mapHeaders/redshouse1f.asm"
-; INCLUDE "data/mapObjects/redshouse1f.asm"
- dr $480f6,$4a540
+
+INCLUDE "data/mapHeaders/redshouse1f.asm"
+INCLUDE "scripts/redshouse1f.asm"
+INCLUDE "data/mapObjects/redshouse1f.asm"
+RedsHouse1FBlocks:
+INCBIN "maps/redshouse1f.blk"
+ dr $48157,$4a540
SECTION "bank13",ROMX,BANK[$13]
@@ -899,6 +903,8 @@ INCLUDE "scripts/route14.asm"
INCLUDE "scripts/route17.asm"
INCLUDE "scripts/route19.asm"
INCLUDE "scripts/route21.asm"
+
+; vermilion house 2
dr $56054,$56714
INCLUDE "engine/menu/diploma_1.asm"