diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-30 11:44:44 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-30 11:44:44 -0400 |
| commit | 8b52fbcfb03b559979b6f480d49fd4e9764aee4b (patch) | |
| tree | cbb515c863af7a3f5f4844692aa57fe048421484 | |
| parent | 6e3581df4b9cbc8cf14fc7948df5df70002cc062 (diff) | |
Route 5 gate
| -rw-r--r-- | data/map_header_banks.asm | 2 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 2 | ||||
| -rwxr-xr-x | main.asm | 9 |
3 files changed, 10 insertions, 3 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index ca060492..44795d97 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -70,7 +70,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(CeruleanMart_h) db BANK(MtMoonPokecenter_h) db BANK(CeruleanHouseTrashed_h) - db $07 ; db BANK(Route5Gate_h) + db BANK(Route5Gate_h) db $17 ; db BANK(UndergroundPathEntranceRoute5_h) db $15 ; db BANK(DayCareM_h) db $07 ; db BANK(Route6Gate_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index d2ecea33..b6ec84ca 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -70,7 +70,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw CeruleanMart_h dw MtMoonPokecenter_h dw CeruleanHouseTrashed_h ; copy - dw $5831 ; dw Route5Gate_h + dw Route5Gate_h dw $55a8 ; dw UndergroundPathEntranceRoute5_h dw $6233 ; dw DayCareM_h dw $593b ; dw Route6Gate_h @@ -366,7 +366,14 @@ INCLUDE "data/mapObjects/diglettscaveroute2.asm" INCLUDE "data/mapHeaders/route2house.asm" INCLUDE "scripts/route2house.asm" INCLUDE "data/mapObjects/route2house.asm" - dr $1d831,$1e2ae ; map scripts + +INCLUDE "data/mapHeaders/route5gate.asm" +INCLUDE "scripts/route5gate.asm" +INCLUDE "data/mapObjects/route5gate.asm" +Route5GateBlocks: ; 1d92f +INCBIN "maps/route5gate.blk" + + dr $1d93b,$1e2ae ; map scripts INCLUDE "engine/menu/oaks_pc.asm" |