Most of SS Anne

4 files changed, 66 insertions, 52 deletions

diff --git a/data/mapObjects/ssanne8.asm b/data/mapObjects/ssanne8.asm
index 992230d8..f089b35d 100755
--- a/data/mapObjects/ssanne8.asm
+++ b/data/mapObjects/ssanne8.asm
@@ -19,7 +19,7 @@ SSAnne8Object: ; 0x61a60 (size=127)
 	object SPRITE_GIRL, $16, $3, WALK, $1, $5 ; person
 	object SPRITE_FAT_BALD_GUY, $0, $e, STAY, NONE, $6 ; person
 	object SPRITE_LITTLE_GIRL, $2, $b, STAY, DOWN, $7 ; person
-	object SPRITE_CLEFAIRY, $3, $b, STAY, DOWN, $8 ; person
+	object SPRITE_JIGGLYPUFF, $3, $b, STAY, DOWN, $8 ; person
 	object SPRITE_GIRL, $a, $d, STAY, RIGHT, $9 ; person
 	object SPRITE_BALL, $c, $f, STAY, NONE, $a, TM_08
 	object SPRITE_GENTLEMAN, $15, $d, WALK, $2, $b ; person
diff --git a/main.asm b/main.asm
index fcd33001..9e4672ff 100755
--- a/main.asm
+++ b/main.asm
@@ -1346,12 +1346,68 @@ INCLUDE "engine/hidden_object_functions17.asm"
 SECTION "bank18",ROMX,BANK[$18]
 ViridianForestBlocks:
 INCBIN "maps/viridianforest.blk"
-	dr $60198,$610ed
+	dr $60198,$603c0
+
+SSAnne9Blocks:
+SSAnne10Blocks:
+INCBIN "maps/ssanne9.blk"
+	dr $60420,$610ed
 
 INCLUDE "data/mapHeaders/viridianforest.asm"
 INCLUDE "scripts/viridianforest.asm"
 INCLUDE "data/mapObjects/viridianforest.asm"
-	dr $612a4,$625e8
+
+INCLUDE "data/mapHeaders/ssanne1.asm"
+INCLUDE "scripts/ssanne1.asm"
+INCLUDE "data/mapObjects/ssanne1.asm"
+SSAnne1Blocks:
+INCBIN "maps/ssanne1.blk"
+
+INCLUDE "data/mapHeaders/ssanne2.asm"
+INCLUDE "scripts/ssanne2.asm"
+INCLUDE "data/mapObjects/ssanne2.asm"
+SSAnne2Blocks:
+INCBIN "maps/ssanne2.blk"
+
+INCLUDE "data/mapHeaders/ssanne4.asm"
+INCLUDE "scripts/ssanne4.asm"
+INCLUDE "data/mapObjects/ssanne4.asm"
+SSAnne4Blocks:
+INCBIN "maps/ssanne4.blk"
+
+INCLUDE "data/mapHeaders/ssanne5.asm"
+INCLUDE "scripts/ssanne5.asm"
+INCLUDE "data/mapObjects/ssanne5.asm"
+SSAnne5Blocks:
+INCBIN "maps/ssanne5.blk"
+
+INCLUDE "data/mapHeaders/ssanne6.asm"
+INCLUDE "scripts/ssanne6.asm"
+INCLUDE "data/mapObjects/ssanne6.asm"
+SSAnne6Blocks:
+INCBIN "maps/ssanne6.blk"
+
+; INCLUDE "data/mapHeaders/ssanne7.asm"
+; INCLUDE "scripts/ssanne7.asm"
+; INCLUDE "data/mapObjects/ssanne7.asm"
+	dr $618b7,$61987
+SSAnne7Blocks:
+INCBIN "maps/ssanne7.blk"
+
+INCLUDE "data/mapHeaders/ssanne8.asm"
+INCLUDE "scripts/ssanne8.asm"
+INCLUDE "data/mapObjects/ssanne8.asm"
+SSAnne8Blocks:
+INCBIN "maps/ssanne8.blk"
+
+INCLUDE "data/mapHeaders/ssanne9.asm"
+INCLUDE "scripts/ssanne9.asm"
+INCLUDE "data/mapObjects/ssanne9.asm"
+
+INCLUDE "data/mapHeaders/ssanne10.asm"
+INCLUDE "scripts/ssanne10.asm"
+INCLUDE "data/mapObjects/ssanne10.asm"
+	dr $61f31,$625e8
 INCLUDE "engine/hidden_object_functions18.asm"
 
 SECTION "bank19",ROMX,BANK[$19]
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 "@"