summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/map_header_banks.asm2
-rw-r--r--data/map_header_pointers.asm2
-rwxr-xr-xmain.asm9
3 files changed, 9 insertions, 4 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 44795d97..29f04f55 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -71,7 +71,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
db BANK(MtMoonPokecenter_h)
db BANK(CeruleanHouseTrashed_h)
db BANK(Route5Gate_h)
- db $17 ; db BANK(UndergroundPathEntranceRoute5_h)
+ db BANK(UndergroundPathEntranceRoute5_h)
db $15 ; db BANK(DayCareM_h)
db $07 ; db BANK(Route6Gate_h)
db $17 ; db BANK(UndergroundPathEntranceRoute6_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index b6ec84ca..792fd1a3 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -71,7 +71,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
dw MtMoonPokecenter_h
dw CeruleanHouseTrashed_h ; copy
dw Route5Gate_h
- dw $55a8 ; dw UndergroundPathEntranceRoute5_h
+ dw UndergroundPathEntranceRoute5_h
dw $6233 ; dw DayCareM_h
dw $593b ; dw Route6Gate_h
dw $55ee ; dw UndergroundPathEntranceRoute6_h
diff --git a/main.asm b/main.asm
index 890cb726..34547349 100755
--- a/main.asm
+++ b/main.asm
@@ -1137,7 +1137,8 @@ Museum2FBlocks:
INCBIN "maps/museum2f.blk"
PewterPokecenterBlocks:
INCBIN "maps/pewterpokecenter.blk"
- dr $5c080,$5c090
+UndergroundPathEntranceRoute5Blocks:
+INCBIN "maps/undergroundpathentranceroute5.blk"
ViridianForestEntranceBlocks:
ViridianForestExitBlocks:
Route2GateBlocks:
@@ -1203,7 +1204,11 @@ INCLUDE "data/mapHeaders/viridianforestentrance.asm"
INCLUDE "scripts/viridianforestentrance.asm"
INCLUDE "data/mapObjects/viridianforestentrance.asm"
- dr $5d5a8,$5da70
+INCLUDE "data/mapHeaders/undergroundpathentranceroute5.asm"
+INCLUDE "scripts/undergroundpathentranceroute5.asm"
+INCLUDE "data/mapObjects/undergroundpathentranceroute5.asm"
+
+ dr $5d5ee,$5da70
INCLUDE "engine/evolution.asm"