summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-30 14:46:21 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-30 14:46:21 -0400
commitf2b312778d2227ffe20c983680f0fba2c38a64a8 (patch)
tree6ca23725ba6d4ba537de5ea89186a125fd83d268
parent3eae968b305cbc80fa7d09447046001aa0bd39f6 (diff)
Route 6 gate
-rw-r--r--data/map_header_banks.asm2
-rw-r--r--data/map_header_pointers.asm2
-rwxr-xr-xmain.asm8
3 files changed, 9 insertions, 3 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 1d0e53e5..1f228386 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -73,7 +73,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
db BANK(Route5Gate_h)
db BANK(UndergroundPathEntranceRoute5_h)
db BANK(DayCareM_h)
- db $07 ; db BANK(Route6Gate_h)
+ db BANK(Route6Gate_h)
db $17 ; db BANK(UndergroundPathEntranceRoute6_h)
db $17 ; db BANK(UndergroundPathEntranceRoute6_h) ;FREEZE
db $07 ; db BANK(Route7Gate_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index edc33a9a..1f3f9a63 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -73,7 +73,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
dw Route5Gate_h
dw UndergroundPathEntranceRoute5_h
dw DayCareM_h
- dw $593b ; dw Route6Gate_h
+ dw Route6Gate_h
dw $55ee ; dw UndergroundPathEntranceRoute6_h
dw $55ee ; dw UndergroundPathEntranceRoute6_h ; unused
dw $59fe ; dw Route7Gate_h
diff --git a/main.asm b/main.asm
index dcdba3e0..4d069468 100755
--- a/main.asm
+++ b/main.asm
@@ -373,7 +373,13 @@ INCLUDE "data/mapObjects/route5gate.asm"
Route5GateBlocks: ; 1d92f
INCBIN "maps/route5gate.blk"
- dr $1d93b,$1e2ae ; map scripts
+INCLUDE "data/mapHeaders/route6gate.asm"
+INCLUDE "scripts/route6gate.asm"
+INCLUDE "data/mapObjects/route6gate.asm"
+Route6GateBlocks: ; 1d9f2
+INCBIN "maps/route6gate.blk"
+
+ dr $1d9fe,$1e2ae ; map scripts
INCLUDE "engine/menu/oaks_pc.asm"