From 9298c87bc6d689e23f910ca97991760984dbd4f9 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Tue, 31 May 2016 14:01:10 -0400 Subject: The rest of SS Anne --- main.asm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 9e4672ff..32094d86 100755 --- a/main.asm +++ b/main.asm @@ -840,8 +840,15 @@ INCLUDE "scripts/rocktunnel1.asm" INCLUDE "data/mapObjects/rocktunnel1.asm" RockTunnel1Blocks: INCBIN "maps/rocktunnel1.blk" + dr $4487e,$449bf + +INCLUDE "data/mapHeaders/ssanne3.asm" +INCLUDE "scripts/ssanne3.asm" +INCLUDE "data/mapObjects/ssanne3.asm" +SSAnne3Blocks: +INCBIN "maps/ssanne3.blk" + dr $44a0d,$45077 - dr $4487e,$45077 LoadSpinnerArrowTiles: ; 45077 (11:5077) dr $45077,$46bf3 @@ -1387,10 +1394,9 @@ INCLUDE "data/mapObjects/ssanne6.asm" SSAnne6Blocks: INCBIN "maps/ssanne6.blk" -; INCLUDE "data/mapHeaders/ssanne7.asm" -; INCLUDE "scripts/ssanne7.asm" -; INCLUDE "data/mapObjects/ssanne7.asm" - dr $618b7,$61987 +INCLUDE "data/mapHeaders/ssanne7.asm" +INCLUDE "scripts/ssanne7.asm" +INCLUDE "data/mapObjects/ssanne7.asm" SSAnne7Blocks: INCBIN "maps/ssanne7.blk" -- cgit v1.3.1-sl0p