aboutsummaryrefslogtreecommitdiffstats
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-31 14:25:37 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-31 14:25:37 -0400
commit170d64252d483590d49063c0e72b52e3f5fb9bb3 (patch)
tree6f5e0fef2ca7294e1b67e88489c4e5aaeaa3dbd4 /main.asm
parentVictory Road 1F (diff)
downloadpokeyellow-170d64252d483590d49063c0e72b52e3f5fb9bb3.tar.gz
pokeyellow-170d64252d483590d49063c0e72b52e3f5fb9bb3.tar.xz
pokeyellow-170d64252d483590d49063c0e72b52e3f5fb9bb3.zip
Lance's room and its clones
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm9
1 files changed, 8 insertions, 1 deletions
diff --git a/main.asm b/main.asm
index 27717bf8..d97a2e18 100755
--- a/main.asm
+++ b/main.asm
@@ -1224,7 +1224,14 @@ INCLUDE "scripts/fanclub.asm"
INCLUDE "data/mapObjects/fanclub.asm"
FanClubBlocks:
INCBIN "maps/fanclub.blk"
- dr $59c80,$5a53a
+ dr $59c80,$5a23d
+
+INCLUDE "data/mapHeaders/lance.asm"
+INCLUDE "scripts/lance.asm"
+INCLUDE "data/mapObjects/lance.asm"
+LanceBlocks:
+INCBIN "maps/lance.blk"
+ dr $5a42d,$5a53a
INCLUDE "engine/overworld/saffron_guards.asm"