diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-30 14:57:12 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-30 14:57:12 -0400 |
| commit | 31c0460e683aaf52524b086968b535fa5e5c248c (patch) | |
| tree | 8a1ff06d52251547830dad2a53ea0337ae81baef | |
| parent | 76aba242515e5ed5528758f8c5f279e9eefa71cd (diff) | |
Route 7 underground path entrance
| -rw-r--r-- | data/map_header_banks.asm | 4 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 4 | ||||
| -rwxr-xr-x | main.asm | 12 |
3 files changed, 15 insertions, 5 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 7ff0e938..47b49442 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -77,8 +77,8 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(UndergroundPathEntranceRoute6_h) db BANK(UndergroundPathEntranceRoute6_h) ;FREEZE db $07 ; db BANK(Route7Gate_h) - db $17 ; db BANK(UndergroundPathEntranceRoute7_h) - db $17 ; db BANK(UndergroundPathEntranceRoute7Copy_h) ;FREEZE + db BANK(UndergroundPathEntranceRoute7_h) + db BANK(UndergroundPathEntranceRoute7Copy_h) ;FREEZE db $07 ; db BANK(Route8Gate_h) db $07 ; db BANK(UndergroundPathEntranceRoute8_h) db $12 ; db BANK(RockTunnelPokecenter_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 7cd69725..be1bda24 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -77,8 +77,8 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw UndergroundPathEntranceRoute6_h dw UndergroundPathEntranceRoute6_h ; unused dw $59fe ; dw Route7Gate_h - dw $562b ; dw UndergroundPathEntranceRoute7_h - dw $5668 ; dw UndergroundPathEntranceRoute7Copy_h + dw UndergroundPathEntranceRoute7_h + dw UndergroundPathEntranceRoute7Copy_h dw $5ac5 ; dw Route8Gate_h dw $5b87 ; dw UndergroundPathEntranceRoute8_h ;id=80 dw $5330 ; dw RockTunnelPokecenter_h @@ -1153,6 +1153,8 @@ PewterPokecenterBlocks: INCBIN "maps/pewterpokecenter.blk" UndergroundPathEntranceRoute5Blocks: UndergroundPathEntranceRoute6Blocks: +UndergroundPathEntranceRoute7Blocks: +UndergroundPathEntranceRoute7CopyBlocks: INCBIN "maps/undergroundpathentranceroute5.blk" ViridianForestEntranceBlocks: ViridianForestExitBlocks: @@ -1227,7 +1229,15 @@ INCLUDE "data/mapHeaders/undergroundpathentranceroute6.asm" INCLUDE "scripts/undergroundpathentranceroute6.asm" INCLUDE "data/mapObjects/undergroundpathentranceroute6.asm" - dr $5d62b,$5da70 +INCLUDE "data/mapHeaders/undergroundpathentranceroute7.asm" +INCLUDE "scripts/undergroundpathentranceroute7.asm" +INCLUDE "data/mapObjects/undergroundpathentranceroute7.asm" + +INCLUDE "data/mapHeaders/undergroundpathentranceroute7copy.asm" +INCLUDE "scripts/undergroundpathentranceroute7copy.asm" +INCLUDE "data/mapObjects/undergroundpathentranceroute7copy.asm" + + dr $5d6ba,$5da70 INCLUDE "engine/evolution.asm" |