diff options
author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-30 16:08:26 -0400 |
---|---|---|
committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-30 16:08:26 -0400 |
commit | f5ba8e618e8a06ab94d46ad001e5266e4465064a (patch) | |
tree | 99fe73cc8f7f518c5fa15642183700fd14e180de | |
parent | 38f3f3b6ea5d81e6eb1a12132759824891099194 (diff) |
Power Plant
-rw-r--r-- | data/map_header_banks.asm | 2 | ||||
-rw-r--r-- | data/map_header_pointers.asm | 2 | ||||
-rwxr-xr-x | main.asm | 7 |
3 files changed, 8 insertions, 3 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 86e7e0e3..6d7f758f 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -83,7 +83,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(UndergroundPathEntranceRoute8_h) db BANK(RockTunnelPokecenter_h) db BANK(RockTunnel1_h) - db $07 ; db BANK(PowerPlant_h) + db BANK(PowerPlant_h) db $12 ; db BANK(Route11Gate_h) db $07 ; db BANK(DiglettsCaveEntranceRoute11_h) db $12 ; db BANK(Route11GateUpstairs_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 28938fa4..1087206b 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -83,7 +83,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw UndergroundPathEntranceRoute8_h ;id=80 dw RockTunnelPokecenter_h dw RockTunnel1_h - dw $5bc4 ; dw PowerPlant_h + dw PowerPlant_h dw $5396 ; dw Route11Gate_h dw $5eb8 ; dw DiglettsCaveEntranceRoute11_h dw $53de ; dw Route11GateUpstairs_h @@ -395,7 +395,12 @@ INCLUDE "data/mapHeaders/undergroundpathentranceroute8.asm" INCLUDE "scripts/undergroundpathentranceroute8.asm" INCLUDE "data/mapObjects/undergroundpathentranceroute8.asm" - dr $1dbc4,$1e2ae ; map scripts +INCLUDE "data/mapHeaders/powerplant.asm" +INCLUDE "scripts/powerplant.asm" +INCLUDE "data/mapObjects/powerplant.asm" +PowerPlantBlocks: +INCBIN "maps/powerplant.blk" + dr $1deb8,$1e2ae ; map scripts INCLUDE "engine/menu/oaks_pc.asm" |