diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-30 14:49:09 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-30 14:49:09 -0400 |
| commit | 76aba242515e5ed5528758f8c5f279e9eefa71cd (patch) | |
| tree | 9a3a99c0942b5cc8ecd96311ce0bb4513ce38d42 | |
| parent | f2b312778d2227ffe20c983680f0fba2c38a64a8 (diff) | |
Route 6 underground entrance
| -rw-r--r-- | data/map_header_banks.asm | 4 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 4 | ||||
| -rwxr-xr-x | main.asm | 7 |
3 files changed, 10 insertions, 5 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 1f228386..7ff0e938 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -74,8 +74,8 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(UndergroundPathEntranceRoute5_h) db BANK(DayCareM_h) db BANK(Route6Gate_h) - db $17 ; db BANK(UndergroundPathEntranceRoute6_h) - db $17 ; db BANK(UndergroundPathEntranceRoute6_h) ;FREEZE + 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 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 1f3f9a63..7cd69725 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -74,8 +74,8 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw UndergroundPathEntranceRoute5_h dw DayCareM_h dw Route6Gate_h - dw $55ee ; dw UndergroundPathEntranceRoute6_h - dw $55ee ; dw UndergroundPathEntranceRoute6_h ; unused + dw UndergroundPathEntranceRoute6_h + dw UndergroundPathEntranceRoute6_h ; unused dw $59fe ; dw Route7Gate_h dw $562b ; dw UndergroundPathEntranceRoute7_h dw $5668 ; dw UndergroundPathEntranceRoute7Copy_h @@ -1152,6 +1152,7 @@ INCBIN "maps/museum2f.blk" PewterPokecenterBlocks: INCBIN "maps/pewterpokecenter.blk" UndergroundPathEntranceRoute5Blocks: +UndergroundPathEntranceRoute6Blocks: INCBIN "maps/undergroundpathentranceroute5.blk" ViridianForestEntranceBlocks: ViridianForestExitBlocks: @@ -1222,7 +1223,11 @@ INCLUDE "data/mapHeaders/undergroundpathentranceroute5.asm" INCLUDE "scripts/undergroundpathentranceroute5.asm" INCLUDE "data/mapObjects/undergroundpathentranceroute5.asm" - dr $5d5ee,$5da70 +INCLUDE "data/mapHeaders/undergroundpathentranceroute6.asm" +INCLUDE "scripts/undergroundpathentranceroute6.asm" +INCLUDE "data/mapObjects/undergroundpathentranceroute6.asm" + + dr $5d62b,$5da70 INCLUDE "engine/evolution.asm" |