From e51658fed09fa1247fb1d61c76f7f0441bf9f388 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 22:27:35 -0400 Subject: Red's House 1F --- main.asm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'main.asm') 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" -- cgit v1.3.1-sl0p