2 files changed, 7 insertions, 49 deletions
diff --git a/scripts/ssanne2.asm b/scripts/ssanne2.asm
index 7bdafe2c..3a2e207a 100755
--- a/scripts/ssanne2.asm
+++ b/scripts/ssanne2.asm
@@ -24,9 +24,7 @@ SSAnne2Script0: ; 613be (18:53be)
 	ld hl, CoordsData_61411
 	call ArePlayerCoordsInArray
 	ret nc
-	ld a, $ff
-	ld [wNewSoundID], a
-	call PlaySound
+	call StopAllMusic
 	ld c, BANK(Music_MeetRival)
 	ld a, MUSIC_MEET_RIVAL
 	call PlayMusic
@@ -99,23 +97,8 @@ SSAnne2Script1: ; 61430 (18:5430)
 	call Delay3
 	ld a, OPP_SONY2
 	ld [wCurOpponent], a
-
-	; select which team to use during the encounter
-	ld a, [W_RIVALSTARTER]
-	cp STARTER2
-	jr nz, .NotSquirtle
 	ld a, $1
-	jr .done
-.NotSquirtle
-	cp STARTER3
-	jr nz, .Charmander
-	ld a, $2
-	jr .done
-.Charmander
-	ld a, $3
-.done
 	ld [wTrainerNo], a
-
 	call SSAnne2Script_61416
 	ld a, $2
 	ld [W_SSANNE2CURSCRIPT], a
@@ -145,9 +128,7 @@ SSAnne2Script2: ; 6146d (18:546d)
 	ld a, $2
 	ld [H_SPRITEINDEX], a
 	call MoveSprite
-	ld a, $ff
-	ld [wNewSoundID], a
-	call PlaySound
+	call StopAllMusic
 	callba Music_RivalAlternateStart
 	ld a, $3
 	ld [W_SSANNE2CURSCRIPT], a
diff --git a/scripts/ssanne9.asm b/scripts/ssanne9.asm
index 525a2964..43c3991e 100755
--- a/scripts/ssanne9.asm
+++ b/scripts/ssanne9.asm
@@ -1,8 +1,5 @@
 SSAnne9Script: ; 61b4b (18:5b4b)
-	ld a, $1
-	ld [wAutoTextBoxDrawingControl], a
-	xor a
-	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
+	call DisableAutoTextBoxDrawing
 	ld hl, SSAnne9TrainerHeaders
 	ld de, SSAnne9ScriptPointers
 	ld a, [W_SSANNE9CURSCRIPT]
@@ -129,44 +126,24 @@ SSAnne9Text_61c10: ; 61c10 (18:5c10)
 
 SSAnne9Text10: ; 61c15 (18:5c15)
 	TX_ASM
-	ld hl, SSAnne9Text_61c1f
-	call PrintText
+	callba Func_f2570
 	jp TextScriptEnd
 
-SSAnne9Text_61c1f: ; 61c1f (18:5c1f)
-	TX_FAR _SSAnne9Text_61c1f
-	db "@"
-
 SSAnne9Text11: ; 61c24 (18:5c24)
 	TX_ASM
-	ld hl, SSAnne9Text_61c2e
-	call PrintText
+	callba Func_f257c
 	jp TextScriptEnd
 
-SSAnne9Text_61c2e: ; 61c2e (18:5c2e)
-	TX_FAR _SSAnne9Text_61c2e
-	db "@"
-
 SSAnne9Text12: ; 61c33 (18:5c33)
 	TX_ASM
-	ld hl, SSAnne9Text_61c3d
-	call PrintText
+	callba Func_f2588
 	jp TextScriptEnd
 
-SSAnne9Text_61c3d: ; 61c3d (18:5c3d)
-	TX_FAR _SSAnne9Text_61c3d
-	db "@"
-
 SSAnne9Text13: ; 61c42 (18:5c42)
 	TX_ASM
-	ld hl, SSAnne9Text_61c4c
-	call PrintText
+	callba Func_f2594
 	jp TextScriptEnd
 
-SSAnne9Text_61c4c: ; 61c4c (18:5c4c)
-	TX_FAR _SSAnne9Text_61c4c
-	db "@"
-
 SSAnne9BattleText1: ; 61c51 (18:5c51)
 	TX_FAR _SSAnne9BattleText1
 	db "@"