aboutsummaryrefslogtreecommitdiffstats
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-31 14:49:24 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-31 14:49:24 -0400
commit45cb263360f3242db5538367ebf8035632d97534 (patch)
tree132c96d244b6066f934c58da38c5ea4f6efd6496 /main.asm
parentLance's room and its clones (diff)
downloadpokeyellow-45cb263360f3242db5538367ebf8035632d97534.tar.gz
pokeyellow-45cb263360f3242db5538367ebf8035632d97534.tar.xz
pokeyellow-45cb263360f3242db5538367ebf8035632d97534.zip
Hall of Fame Room (TEH URN)
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm7
1 files changed, 6 insertions, 1 deletions
diff --git a/main.asm b/main.asm
index d97a2e18..8518bfb6 100755
--- a/main.asm
+++ b/main.asm
@@ -1231,7 +1231,12 @@ INCLUDE "scripts/lance.asm"
INCLUDE "data/mapObjects/lance.asm"
LanceBlocks:
INCBIN "maps/lance.blk"
- dr $5a42d,$5a53a
+
+INCLUDE "data/mapHeaders/halloffameroom.asm"
+INCLUDE "scripts/halloffameroom.asm"
+INCLUDE "data/mapObjects/halloffameroom.asm"
+HallofFameRoomBlocks:
+INCBIN "maps/halloffameroom.blk"
INCLUDE "engine/overworld/saffron_guards.asm"