script fixes, updated music, patches

PiaCarrot · Apr 30, 2024 · f64eba0 · f64eba0
1 parent fb80d4f
commit f64eba0
Show file tree

Hide file tree

Showing 8 changed files with 2,013 additions and 367 deletions.
diff --git a/audio/music/hoohbattle.asm b/audio/music/hoohbattle.asm
diff --git a/audio/music/xdbattlesimtheme.asm b/audio/music/xdbattlesimtheme.asm
diff --git a/maps/Route51.asm b/maps/Route51.asm
@@ -88,7 +88,7 @@ Route51Ho_ohScript:
 	cry HO_OH
 	pause 15
 	closetext
-	writecode VAR_BATTLETYPE, BATTLETYPE_SNORLAX
+	writecode VAR_BATTLETYPE, BATTLETYPE_HOOH
 	loadwildmon HO_OH, 70
 	startbattle
 	disappear ROUTE51_HO_OH
@@ -195,13 +195,14 @@ CrossRoute51Text:
 	
 	para "CROSS produces the" 
 	line "RAINBOW WING, but"
-	cont "its covered in a"
+	cont "it's covered in a"
 	cont "dark miasma."
 	
 	para "HO-OH: Ayiiiehh!!"
+	done
 	
 CrossRoute51Text2:
-	para "CROSS: Oh, I see<...>"
+	text "CROSS: Oh, I see<...>"
 	line "You wish for me to"
 	cont "prove myself by"
 	cont "beating the ORANGE"

diff --git a/patches/deprecated-historical-only/DO NOT USE THESE PATCHES.txt b/patches/deprecated-historical-only/DO NOT USE THESE PATCHES.txt
@@ -0,0 +1,7 @@
+DO NOT USE THE PATCHES IN THIS FOLDER
+UNLESS YOU DONT WANT TO COMPLETE THE GAME
+OR SEE ALL OF THE BUGFIXES
+
+THANK YOU <3
+
+USE THE SULOKU PATCH FEATURED IN THE PREVIOUS FOLDER KTHXBYE
diff --git a/patches/movie-2000-no-pss.ips → ...ted-historical-only/movie-2000-no-pss.ips b/patches/movie-2000-no-pss.ips → ...ted-historical-only/movie-2000-no-pss.ips
diff --git a/patches/movie-2000-pss.ips → ...ecated-historical-only/movie-2000-pss.ips b/patches/movie-2000-pss.ips → ...ecated-historical-only/movie-2000-pss.ips
diff --git a/patches/suloku-patch-no-pss.ips b/patches/suloku-patch-no-pss.ips
diff --git a/patches/suloku-patch-pss.ips b/patches/suloku-patch-pss.ips