summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-31 14:01:10 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-31 14:01:10 -0400
commit9298c87bc6d689e23f910ca97991760984dbd4f9 (patch)
tree13d9bb3f40782306abf5a4c589bd1ed1b5c971fe /main.asm
parent799b0ad911ae85ed89f3a571f62eef3bc6e5fc4a (diff)
The rest of SS Anne
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm16
1 files changed, 11 insertions, 5 deletions
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"