Route 22

6 files changed, 54 insertions, 100 deletions

diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm
index a710b5fa..fde4d42a 100755
--- a/constants/trainer_constants.asm
+++ b/constants/trainer_constants.asm
@@ -41,7 +41,7 @@ const_value = 1
 	trainer_const BRUNO         ; $21
 	trainer_const BROCK         ; $22
 	trainer_const MISTY         ; $23
-	trainer_const LT_SURGE     ; $24
+	trainer_const LT_SURGE      ; $24
 	trainer_const ERIKA         ; $25
 	trainer_const KOGA          ; $26
 	trainer_const BLAINE        ; $27
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 2fff5f22..1f3e4967 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -33,7 +33,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db $15 ; db BANK(Route19_h) ; ROUTE_19
 	db $14 ; db BANK(Route20_h) ; ROUTE_20
 	db $15 ; db BANK(Route21_h) ; ROUTE_21
-	db $14 ; db BANK(Route22_h) ; ROUTE_22
+	db BANK(Route22_h) ; ROUTE_22
 	db $14 ; db BANK(Route23_h) ; ROUTE_23
 	db BANK(Route24_h) ; ROUTE_24
 	db BANK(Route25_h) ; ROUTE_25
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 6721a8a5..e93c3def 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -33,7 +33,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw $4e80 ; dw Route19_h
 	dw $40f1 ; dw Route20_h
 	dw $500f ; dw Route21_h
-	dw $4000 ; dw Route22_h
+	dw Route22_h
 	dw $433f ; dw Route23_h
 	dw Route24_h
 	dw Route25_h
diff --git a/engine/bank3c.asm b/engine/bank3c.asm
index 35be938e..61096d27 100644
--- a/engine/bank3c.asm
+++ b/engine/bank3c.asm
@@ -348,8 +348,8 @@ INCLUDE "scripts/viridiancity2.asm"
 INCLUDE "scripts/vermilioncity2.asm"
 INCLUDE "scripts/celadoncity2.asm"
 INCLUDE "scripts/route1_2.asm"
-
-	dr $f1b27, $f220e
+INCLUDE "scripts/route22_2.asm"
+	dr $f1b73, $f220e
 
 INCLUDE "data/mapHeaders/beach_house.asm"
 INCLUDE "scripts/beach_house.asm"
diff --git a/main.asm b/main.asm
index cfcfa6c0..803dc68c 100755
--- a/main.asm
+++ b/main.asm
@@ -778,10 +778,13 @@ INCBIN "maps/colosseum.blk"
 
 SECTION "bank14",ROMX,BANK[$14]
 
-	dr $50000,$5003d
+INCLUDE "data/mapHeaders/route22.asm"
+INCLUDE "data/mapObjects/route22.asm"
 Route22Blocks:
 INCBIN "maps/route22.blk"
-	dr $500f1,$50682
+	dr $500f1,$503b2
+Route23Blocks:
+INCBIN "maps/route23.blk"
 
 INCLUDE "data/mapHeaders/route24.asm"
 INCLUDE "data/mapObjects/route24.asm"
@@ -802,7 +805,9 @@ SaffronCityBlocks: ; 50a98 (14:4a98)
 INCBIN "maps/saffroncity.blk"
 INCLUDE "scripts/saffroncity.asm"
 
-	dr $50ca9,$51366
+	dr $50ca9,$50eb2
+INCLUDE "scripts/route22.asm"
+	dr $51193,$51366
 INCLUDE "scripts/route24.asm"
 INCLUDE "scripts/route25.asm"
 
diff --git a/scripts/route22.asm b/scripts/route22.asm
index 5c3d2b21..a7c61903 100755
--- a/scripts/route22.asm
+++ b/scripts/route22.asm
@@ -22,16 +22,17 @@ Route22Script7: ; 50ed5 (14:4ed5)
 	ret
 
 Route22Script_50ed6: ; 50ed6 (14:4ed6)
+	ld a, OPP_SONY1
+	ld [wCurOpponent], a
+	ld a, $2
+	ld [wTrainerNo], a
+	ret
+
+Route22Script_50ee1:
+	ld a, OPP_SONY2
+	ld [wCurOpponent], a
 	ld a, [W_RIVALSTARTER]
-	ld b, a
-.asm_50eda
-	ld a, [hli]
-	cp b
-	jr z, .asm_50ee1
-	inc hl
-	jr .asm_50eda
-.asm_50ee1
-	ld a, [hl]
+	add 7
 	ld [wTrainerNo], a
 	ret
 
@@ -88,9 +89,7 @@ Route22Script0: ; 50f00 (14:4f00)
 	ld a, [wWalkBikeSurfState]
 	and a
 	jr z, .asm_50f4e
-	ld a, $ff
-	ld [wNewSoundID], a
-	call PlaySound
+	call StopAllMusic
 .asm_50f4e
 	ld c, BANK(Music_MeetRival)
 	ld a, MUSIC_MEET_RIVAL
@@ -131,24 +130,29 @@ Route22Script1: ; 50f62 (14:4f62)
 	ld hl, Route22RivalDefeatedText1
 	ld de, Route22Text_511bc
 	call SaveEndBattleTextPointers
-	ld a, OPP_SONY1
-	ld [wCurOpponent], a
-	ld hl, StarterMons_50faf
 	call Route22Script_50ed6
 	ld a, $2
 	ld [W_ROUTE22CURSCRIPT], a
 	ret
 
-StarterMons_50faf: ; 50faf (14:4faf)
-; starter the rival picked, rival trainer number
-	db STARTER2,$04
-	db STARTER3,$05
-	db STARTER1,$06
+Route22RivalDefeatedText1: ; 511b7 (14:51b7)
+	TX_FAR _Route22RivalDefeatedText1
+	db "@"
+
+Route22Text_511bc: ; 511bc (14:51bc)
+	TX_FAR _Route22Text_511bc
+	db "@"
 
 Route22Script2: ; 50fb5 (14:4fb5)
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, Route22Script_50ece
+	ld a, [W_RIVALSTARTER]
+	cp 2
+	jr nz, .asm_50fc9
+	ld a, $1
+	ld [W_RIVALSTARTER], a
+.asm_50fc9
 	ld a, [wSpriteStateData1 + 9]
 	and a ; cp SPRITE_FACING_DOWN
 	jr nz, .notDown
@@ -167,9 +171,7 @@ Route22Script2: ; 50fb5 (14:4fb5)
 	ld a, $1
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
-	ld a, $ff
-	ld [wNewSoundID], a
-	call PlaySound
+	call StopAllMusic
 	callba Music_RivalAlternateStart
 	ld a, [wcf0d]
 	cp $1
@@ -241,13 +243,9 @@ Route22Script_5104e: ; 5104e (14:504e)
 	ld a, [wWalkBikeSurfState]
 	and a
 	jr z, .skipYVisibilityTesta
-	ld a, $ff
-	ld [wNewSoundID], a
-	call PlaySound
+	call StopAllMusic
 .skipYVisibilityTesta
-	ld a, $ff
-	ld [wNewSoundID], a
-	call PlaySound
+	call StopAllMusic
 	callba Music_RivalAlternateTempo
 	ld a, $2
 	ld [H_SPRITEINDEX], a
@@ -287,18 +285,18 @@ Route22Script4: ; 51087 (14:5087)
 	ld hl, Route22RivalDefeatedText2
 	ld de, Route22Text_511d0
 	call SaveEndBattleTextPointers
-	ld a, OPP_SONY2
-	ld [wCurOpponent], a
-	ld hl, StarterMons_510d9
-	call Route22Script_50ed6
+	call Route22Script_50ee1
 	ld a, $5
 	ld [W_ROUTE22CURSCRIPT], a
 	ret
 
-StarterMons_510d9: ; 510d9 (14:50d9)
-	db STARTER2,$0a
-	db STARTER3,$0b
-	db STARTER1,$0c
+Route22RivalDefeatedText2: ; 511cb (14:51cb)
+	TX_FAR _Route22RivalDefeatedText2
+	db "@"
+
+Route22Text_511d0: ; 511d0 (14:51d0)
+	TX_FAR _Route22Text_511d0
+	db "@"
 
 Route22Script5: ; 510df (14:50df)
 	ld a, [wIsInBattle]
@@ -326,9 +324,7 @@ Route22Script5: ; 510df (14:50df)
 	ld a, $2
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
-	ld a, $ff
-	ld [wNewSoundID], a
-	call PlaySound
+	call StopAllMusic
 	callba Music_RivalAlternateStartAndTempo
 	ld a, [wcf0d]
 	cp $1
@@ -384,62 +380,15 @@ Route22TextPointers: ; 51175 (14:5175)
 
 Route22Text1: ; 5117b (14:517b)
 	TX_ASM
-	CheckEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE
-	jr z, .asm_5118b
-	ld hl, Route22RivalAfterBattleText1
-	call PrintText
-	jr .asm_51191
-.asm_5118b
-	ld hl, Route22RivalBeforeBattleText1
-	call PrintText
-.asm_51191
+	callba Func_f1b27
 	jp TextScriptEnd
 
 Route22Text2: ; 51194 (14:5194)
 	TX_ASM
-	CheckEvent EVENT_BEAT_ROUTE22_RIVAL_2ND_BATTLE
-	jr z, .asm_511a4
-	ld hl, Route22RivalAfterBattleText2
-	call PrintText
-	jr .asm_511aa
-.asm_511a4
-	ld hl, Route22RivalBeforeBattleText2
-	call PrintText
-.asm_511aa
+	callba Func_f1b47
 	jp TextScriptEnd
 
-Route22RivalBeforeBattleText1: ; 511ad (14:51ad)
-	TX_FAR _Route22RivalBeforeBattleText1
-	db "@"
-
-Route22RivalAfterBattleText1: ; 511b2 (14:51b2)
-	TX_FAR _Route22RivalAfterBattleText1
-	db "@"
-
-Route22RivalDefeatedText1: ; 511b7 (14:51b7)
-	TX_FAR _Route22RivalDefeatedText1
-	db "@"
-
-Route22Text_511bc: ; 511bc (14:51bc)
-	TX_FAR _Route22Text_511bc
-	db "@"
-
-Route22RivalBeforeBattleText2: ; 511c1 (14:51c1)
-	TX_FAR _Route22RivalBeforeBattleText2
-	db "@"
-
-Route22RivalAfterBattleText2: ; 511c6 (14:51c6)
-	TX_FAR _Route22RivalAfterBattleText2
-	db "@"
-
-Route22RivalDefeatedText2: ; 511cb (14:51cb)
-	TX_FAR _Route22RivalDefeatedText2
-	db "@"
-
-Route22Text_511d0: ; 511d0 (14:51d0)
-	TX_FAR _Route22Text_511d0
-	db "@"
-
 Route22FrontGateText: ; 511d5 (14:51d5)
-	TX_FAR _Route22FrontGateText
-	db "@"
+	TX_ASM
+	callba Func_f1b67
+	jp TextScriptEnd