Route 9 incl. AJ fight

5 files changed, 18 insertions, 17 deletions

diff --git a/data/mapObjects/route9.asm b/data/mapObjects/route9.asm
index 79d0d5ed..6a759608 100755
--- a/data/mapObjects/route9.asm
+++ b/data/mapObjects/route9.asm
@@ -8,7 +8,7 @@ Route9Object: ; 0x546a8 (size=86)
 
 	db $a ; objects
 	object SPRITE_LASS, $d, $a, STAY, LEFT, $1, OPP_JR_TRAINER_F, $5
-	object SPRITE_BLACK_HAIR_BOY_1, $18, $7, STAY, LEFT, $2, OPP_JR_TRAINER_M, $7
+	object SPRITE_BLACK_HAIR_BOY_1, $18, $7, STAY, LEFT, $2, OPP_YOUNGSTER, $e
 	object SPRITE_BLACK_HAIR_BOY_1, $1f, $7, STAY, RIGHT, $3, OPP_JR_TRAINER_M, $8
 	object SPRITE_LASS, $30, $8, STAY, RIGHT, $4, OPP_JR_TRAINER_F, $6
 	object SPRITE_HIKER, $10, $f, STAY, LEFT, $5, OPP_HIKER, $b
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 338bd71c..3268cdf8 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -20,7 +20,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db BANK(Route6_h) ; ROUTE_6
 	db BANK(Route7_h) ; ROUTE_7
 	db $16 ; db BANK(Route8_h) ; ROUTE_8
-	db $15 ; db BANK(Route9_h) ; ROUTE_9
+	db BANK(Route9_h) ; ROUTE_9
 	db BANK(Route10_h) ; ROUTE_10
 	db BANK(Route11_h) ; ROUTE_11
 	db BANK(Route12_h) ; ROUTE_12
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 5359721f..70fa7aa0 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -20,7 +20,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw Route6_h
 	dw Route7_h
 	dw $412d ; dw Route8_h
-	dw $468e ; dw Route9_h
+	dw Route9_h
 	dw Route10_h
 	dw Route11_h
 	dw Route12_h
diff --git a/main.asm b/main.asm
index 916f978d..46696cec 100755
--- a/main.asm
+++ b/main.asm
@@ -857,7 +857,8 @@ INCLUDE "data/mapObjects/route5.asm"
 Route5Blocks: ; 545da
 INCBIN "maps/route5.blk"
 
-	dr $5468e,$54706
+INCLUDE "data/mapHeaders/route9.asm"
+INCLUDE "data/mapObjects/route9.asm"
 Route9Blocks: ; 54706
 INCBIN "maps/route9.blk"
 
@@ -892,7 +893,7 @@ INCLUDE "scripts/route2.asm"
 INCLUDE "scripts/route3.asm"
 INCLUDE "scripts/route4.asm"
 INCLUDE "scripts/route5.asm"
-	dr $556d0,$55832
+INCLUDE "scripts/route9.asm"
 INCLUDE "scripts/route13.asm"
 INCLUDE "scripts/route14.asm"
 INCLUDE "scripts/route17.asm"
diff --git a/scripts/route9.asm b/scripts/route9.asm
index 9d26ee96..5de98173 100755
--- a/scripts/route9.asm
+++ b/scripts/route9.asm
@@ -14,7 +14,7 @@ Route9ScriptPointers: ; 556cf (15:56cf)
 
 Route9TextPointers: ; 556d5 (15:56d5)
 	dw Route9Text1
-	dw Route9Text2
+	dw Route9TextAJ
 	dw Route9Text3
 	dw Route9Text4
 	dw Route9Text5
@@ -39,10 +39,10 @@ Route9TrainerHeader2: ; 556f7 (15:56f7)
 	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_2
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_2
-	dw Route9BattleText2 ; TextBeforeBattle
-	dw Route9AfterBattleText2 ; TextAfterBattle
-	dw Route9EndBattleText2 ; TextEndBattle
-	dw Route9EndBattleText2 ; TextEndBattle
+	dw Route9BattleTextAJ ; TextBeforeBattle
+	dw Route9AfterBattleTextAJ ; TextAfterBattle
+	dw Route9EndBattleTextAJ ; TextEndBattle
+	dw Route9EndBattleTextAJ ; TextEndBattle
 
 Route9TrainerHeader3: ; 55703 (15:5703)
 	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_3
@@ -114,7 +114,7 @@ Route9Text1: ; 55758 (15:5758)
 	ld hl, Route9TrainerHeader0
 	jr Route9TalkToTrainer
 
-Route9Text2: ; 5575e (15:575e)
+Route9TextAJ: ; 5575e (15:575e)
 	TX_ASM
 	ld hl, Route9TrainerHeader2
 	jr Route9TalkToTrainer
@@ -168,16 +168,16 @@ Route9AfterBattleText1: ; 5579c (15:579c)
 	TX_FAR _Route9AfterBattleText1
 	db "@"
 
-Route9BattleText2: ; 557a1 (15:57a1)
-	TX_FAR _Route9BattleText2
+Route9BattleTextAJ: ; 557a1 (15:57a1)
+	TX_FAR _Route9BattleTextAJ
 	db "@"
 
-Route9EndBattleText2: ; 557a6 (15:57a6)
-	TX_FAR _Route9EndBattleText2
+Route9EndBattleTextAJ: ; 557a6 (15:57a6)
+	TX_FAR _Route9EndBattleTextAJ
 	db "@"
 
-Route9AfterBattleText2: ; 557ab (15:57ab)
-	TX_FAR _Route9AfterBattleText2
+Route9AfterBattleTextAJ: ; 557ab (15:57ab)
+	TX_FAR _Route9AfterBattleTextAJ
 	db "@"
 
 Route9BattleText3: ; 557b0 (15:57b0)