summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-28 22:53:44 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-28 22:53:44 -0400
commite48e466f39da7f386417233530c3193249c58d36 (patch)
tree67852598cfe18fc624c1a9dbb0fe28e690fa2a27 /data
parent7c59b94897641af737b6df5e2c2787799c867432 (diff)
Various interior maps on route 2
Diffstat (limited to 'data')
-rwxr-xr-xdata/mapObjects/viridianforestentrance.asm2
-rw-r--r--data/map_header_banks.asm10
-rw-r--r--data/map_header_pointers.asm10
3 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/viridianforestentrance.asm b/data/mapObjects/viridianforestentrance.asm
index fc676a6d..891c0636 100755
--- a/data/mapObjects/viridianforestentrance.asm
+++ b/data/mapObjects/viridianforestentrance.asm
@@ -3,7 +3,7 @@ ViridianForestEntranceObject: ; 0x5d66d (size=48)
db $4 ; warps
db $0, $4, $3, VIRIDIAN_FOREST
- db $0, $5, $4, VIRIDIAN_FOREST
+ db $0, $5, $3, VIRIDIAN_FOREST
db $7, $4, $5, $ff
db $7, $5, $5, $ff
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 501b3730..2d57ccff 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -46,11 +46,11 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
db BANK(School_h)
db BANK(ViridianHouse_h)
db BANK(ViridianGym_h)
- db $07 ; db BANK(DiglettsCaveRoute2_h)
- db $17 ; db BANK(ViridianForestExit_h)
- db $07 ; db BANK(Route2House_h)
- db $17 ; db BANK(Route2Gate_h)
- db $17 ; db BANK(ViridianForestEntrance_h)
+ db BANK(DiglettsCaveRoute2_h)
+ db BANK(ViridianForestExit_h)
+ db BANK(Route2House_h)
+ db BANK(Route2Gate_h)
+ db BANK(ViridianForestEntrance_h)
db $18 ; db BANK(ViridianForest_h)
db $17 ; db BANK(Museum1F_h)
db $17 ; db BANK(Museum2F_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 48702db9..1c151398 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -46,11 +46,11 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
dw School_h
dw ViridianHouse_h
dw ViridianGym_h
- dw $57ae ; dw DiglettsCaveRoute2_h
- dw $5485 ; dw ViridianForestExit_h
- dw $57eb ; dw Route2House_h
- dw $54d2 ; dw Route2Gate_h
- dw $555a ; dw ViridianForestEntrance_h ;id=50
+ dw DiglettsCaveRoute2_h
+ dw ViridianForestExit_h
+ dw Route2House_h
+ dw Route2Gate_h
+ dw ViridianForestEntrance_h ;id=50
dw $50ed ; dw ViridianForest_h
dw $40e3 ; dw Museum1F_h
dw $41b4 ; dw Museum2F_h