summaryrefslogtreecommitdiff
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
parent170d64252d483590d49063c0e72b52e3f5fb9bb3 (diff)
Hall of Fame Room (TEH URN)
-rw-r--r--data/map_header_banks.asm2
-rw-r--r--data/map_header_pointers.asm2
-rwxr-xr-xmain.asm7
3 files changed, 8 insertions, 3 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 92d75610..20b1e875 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -118,7 +118,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
db $1d ; unused
db $1d ; unused
db $1d ; unused
- db $16 ; db BANK(HallofFameRoom_h)
+ db BANK(HallofFameRoom_h)
db $18 ; db BANK(UndergroundPathNS_h)
db $1d ; db BANK(Gary_h)
db $18 ; db BANK(UndergroundPathWE_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 81753ba0..cbaa5da9 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -118,7 +118,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
dw Lance_h ; unused
dw Lance_h ; unused
dw Lance_h ; unused
- dw $642d ; dw HallofFameRoom_h
+ dw HallofFameRoom_h
dw $5f31 ; dw UndergroundPathNS_h
dw $57a0 ; dw Gary_h ;id=120
dw $5f55 ; dw UndergroundPathWE_h
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"