summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-30 16:12:31 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-30 16:12:31 -0400
commitd00b70b33ee909ad163f2cb1c639ce799db118d0 (patch)
treedae9a2f40425a236a3ef6ecce453cf16b4359c26
parentf5ba8e618e8a06ab94d46ad001e5266e4465064a (diff)
Digletts Cave Route 11 Entrance
-rw-r--r--data/map_header_banks.asm2
-rw-r--r--data/map_header_pointers.asm2
-rwxr-xr-xmain.asm8
3 files changed, 9 insertions, 3 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 6d7f758f..40cd151f 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -85,7 +85,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
db BANK(RockTunnel1_h)
db BANK(PowerPlant_h)
db $12 ; db BANK(Route11Gate_h)
- db $07 ; db BANK(DiglettsCaveEntranceRoute11_h)
+ db BANK(DiglettsCaveEntranceRoute11_h)
db $12 ; db BANK(Route11GateUpstairs_h)
db $12 ; db BANK(Route12Gate_h)
db $07 ; db BANK(BillsHouse_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 1087206b..c8e41d14 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -85,7 +85,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
dw RockTunnel1_h
dw PowerPlant_h
dw $5396 ; dw Route11Gate_h
- dw $5eb8 ; dw DiglettsCaveEntranceRoute11_h
+ dw DiglettsCaveEntranceRoute11_h
dw $53de ; dw Route11GateUpstairs_h
dw $548f ; dw Route12Gate_h
dw $606e ; dw BillsHouse_h
diff --git a/main.asm b/main.asm
index ef1a9b6d..a7b573cb 100755
--- a/main.asm
+++ b/main.asm
@@ -289,6 +289,7 @@ INCLUDE "data/mapHeaders/route1.asm"
INCLUDE "data/mapObjects/route1.asm"
Route1Blocks: ; 1c0fc
INCBIN "maps/route1.blk"
+
UndergroundPathEntranceRoute8Blocks:
INCBIN "maps/undergroundpathentranceroute8.blk"
OaksLabBlocks:
@@ -304,6 +305,7 @@ INCBIN "maps/school.blk"
CeruleanHouseTrashedBlocks:
INCBIN "maps/ceruleanhousetrashed.blk"
DiglettsCaveRoute2Blocks:
+DiglettsCaveEntranceRoute11Blocks:
INCBIN "maps/diglettscaveroute2.blk"
INCLUDE "engine/clear_save.asm"
@@ -400,7 +402,11 @@ INCLUDE "scripts/powerplant.asm"
INCLUDE "data/mapObjects/powerplant.asm"
PowerPlantBlocks:
INCBIN "maps/powerplant.blk"
- dr $1deb8,$1e2ae ; map scripts
+
+INCLUDE "data/mapHeaders/diglettscaveroute11.asm"
+INCLUDE "scripts/diglettscaveroute11.asm"
+INCLUDE "data/mapObjects/diglettscaveroute11.asm"
+ dr $1def6,$1e2ae ; map scripts
INCLUDE "engine/menu/oaks_pc.asm"