summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-30 15:16:58 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-30 15:16:58 -0400
commit5f729c22b5b8bafc520f4f23f8577bcb18a8a452 (patch)
tree4c8bd9c17db53cf9c4813a167e6cab1fd3f362ce /data
parent31c0460e683aaf52524b086968b535fa5e5c248c (diff)
Add missing file; route 7/8 gates and route 8 path entrance
Diffstat (limited to 'data')
-rwxr-xr-xdata/mapObjects/route7gate.asm2
-rwxr-xr-xdata/mapObjects/route8gate.asm4
-rw-r--r--data/map_header_banks.asm6
-rw-r--r--data/map_header_pointers.asm6
4 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/route7gate.asm b/data/mapObjects/route7gate.asm
index 8c618fc1..9e80ca39 100755
--- a/data/mapObjects/route7gate.asm
+++ b/data/mapObjects/route7gate.asm
@@ -4,7 +4,7 @@ Route7GateObject: ; 0x1e185 (size=42)
db $4 ; warps
db $3, $0, $3, $ff
db $4, $0, $3, $ff
- db $3, $5, $0, $ff
+ db $3, $5, $1, $ff
db $4, $5, $1, $ff
db $0 ; signs
diff --git a/data/mapObjects/route8gate.asm b/data/mapObjects/route8gate.asm
index 8c3fb54f..61d70dfc 100755
--- a/data/mapObjects/route8gate.asm
+++ b/data/mapObjects/route8gate.asm
@@ -2,9 +2,9 @@ Route8GateObject: ; 0x1e247 (size=42)
db $a ; border block
db $4 ; warps
- db $3, $0, $0, $ff
+ db $3, $0, $1, $ff
db $4, $0, $1, $ff
- db $3, $5, $2, $ff
+ db $3, $5, $3, $ff
db $4, $5, $3, $ff
db $0 ; signs
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 47b49442..074b5982 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -76,11 +76,11 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
db BANK(Route6Gate_h)
db BANK(UndergroundPathEntranceRoute6_h)
db BANK(UndergroundPathEntranceRoute6_h) ;FREEZE
- db $07 ; db BANK(Route7Gate_h)
+ db BANK(Route7Gate_h)
db BANK(UndergroundPathEntranceRoute7_h)
db BANK(UndergroundPathEntranceRoute7Copy_h) ;FREEZE
- db $07 ; db BANK(Route8Gate_h)
- db $07 ; db BANK(UndergroundPathEntranceRoute8_h)
+ db BANK(Route8Gate_h)
+ db BANK(UndergroundPathEntranceRoute8_h)
db $12 ; db BANK(RockTunnelPokecenter_h)
db $11 ; db BANK(RockTunnel1_h)
db $07 ; db BANK(PowerPlant_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index be1bda24..a736462b 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -76,11 +76,11 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
dw Route6Gate_h
dw UndergroundPathEntranceRoute6_h
dw UndergroundPathEntranceRoute6_h ; unused
- dw $59fe ; dw Route7Gate_h
+ dw Route7Gate_h
dw UndergroundPathEntranceRoute7_h
dw UndergroundPathEntranceRoute7Copy_h
- dw $5ac5 ; dw Route8Gate_h
- dw $5b87 ; dw UndergroundPathEntranceRoute8_h ;id=80
+ dw Route8Gate_h
+ dw UndergroundPathEntranceRoute8_h ;id=80
dw $5330 ; dw RockTunnelPokecenter_h
dw $4571 ; dw RockTunnel1_h
dw $5bc4 ; dw PowerPlant_h