Routes 11 and 12 gates

4 files changed, 30 insertions, 9 deletions

diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 40cd151f..9fa97ec0 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -84,10 +84,10 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db BANK(RockTunnelPokecenter_h)
 	db BANK(RockTunnel1_h)
 	db BANK(PowerPlant_h)
-	db $12 ; db BANK(Route11Gate_h)
+	db BANK(Route11Gate_h)
 	db BANK(DiglettsCaveEntranceRoute11_h)
-	db $12 ; db BANK(Route11GateUpstairs_h)
-	db $12 ; db BANK(Route12Gate_h)
+	db BANK(Route11GateUpstairs_h)
+	db BANK(Route12Gate_h)
 	db $07 ; db BANK(BillsHouse_h)
 	db $17 ; db BANK(VermilionPokecenter_h)
 	db $16 ; db BANK(FanClub_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index c8e41d14..5f60a56d 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -84,10 +84,10 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw RockTunnelPokecenter_h
 	dw RockTunnel1_h
 	dw PowerPlant_h
-	dw $5396 ; dw Route11Gate_h
+	dw Route11Gate_h
 	dw DiglettsCaveEntranceRoute11_h
-	dw $53de ; dw Route11GateUpstairs_h
-	dw $548f ; dw Route12Gate_h
+	dw Route11GateUpstairs_h
+	dw Route12Gate_h
 	dw $606e ; dw BillsHouse_h
 	dw $4865 ; dw VermilionPokecenter_h
 	dw $5a00 ; dw FanClub_h ;id=90
diff --git a/main.asm b/main.asm
index a7b573cb..029f7d62 100755
--- a/main.asm
+++ b/main.asm
@@ -839,7 +839,11 @@ INCBIN "maps/route7.blk"
 MtMoonPokecenterBlocks:
 RockTunnelPokecenterBlocks:
 INCBIN "maps/mtmoonpokecenter.blk"
-	dr $480c7,$480eb
+Route11GateBlocks:
+INCBIN "maps/route11gate.blk"
+Route11GateUpstairsBlocks:
+Route12GateUpstairsBlocks:
+INCBIN "maps/route11gateupstairs.blk"
 INCLUDE "scripts/route7.asm"
 
 INCLUDE "data/mapHeaders/redshouse1f.asm"
@@ -857,7 +861,24 @@ INCLUDE "data/mapHeaders/rocktunnelpokecenter.asm"
 INCLUDE "scripts/rocktunnelpokecenter.asm"
 INCLUDE "data/mapObjects/rocktunnelpokecenter.asm"
 
-	dr $49396,$49953
+INCLUDE "data/mapHeaders/route11gate.asm"
+INCLUDE "scripts/route11gate.asm"
+INCLUDE "data/mapObjects/route11gate.asm"
+
+INCLUDE "data/mapHeaders/route11gateupstairs.asm"
+INCLUDE "scripts/route11gateupstairs.asm"
+INCLUDE "data/mapObjects/route11gateupstairs.asm"
+
+INCLUDE "data/mapHeaders/route12gate.asm"
+INCLUDE "scripts/route12gate.asm"
+INCLUDE "data/mapObjects/route12gate.asm"
+Route12GateBlocks:
+INCBIN "maps/route12gate.blk"
+
+INCLUDE "data/mapHeaders/route12gateupstairs.asm"
+INCLUDE "scripts/route12gateupstairs.asm"
+INCLUDE "data/mapObjects/route12gateupstairs.asm"
+	dr $4958d,$49953
 
 INCLUDE "data/mapHeaders/mtmoon1.asm"
 INCLUDE "scripts/mtmoon1.asm"
diff --git a/scripts/route11gateupstairs.asm b/scripts/route11gateupstairs.asm
index ec543a6a..e41e46e5 100755
--- a/scripts/route11gateupstairs.asm
+++ b/scripts/route11gateupstairs.asm
@@ -9,7 +9,7 @@ Route11GateUpstairsTextPointers: ; 49457 (12:5457)
 
 Route11GateUpstairsText1: ; 4945f (12:545f)
 	TX_ASM
-	xor a
+	ld a, $0
 	ld [wWhichTrade], a
 	predef DoInGameTradeDialogue
 Route11GateUpstairsScriptEnd: ; 49469 (12:5469)