Made DoubleSpeed in OW and retained 30fps

SoupPotato · Jun 29, 2024 · b28bc20 · b28bc20
1 parent caad43d
commit b28bc20
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
@@ -8349,6 +8349,11 @@ StartBattle:
 ; This check prevents you from entering a battle without any Pokemon.
 ; Those using walk-through-walls to bypass getting a Pokemon experience
 ; the effects of this check.
+	ldh a, [rIE]
+	push af
+	call NormalSpeed
+	pop af
+	ldh [rIE], a
 	ld a, [wPartyCount]
 	and a
 	ret z
@@ -8360,6 +8365,11 @@ StartBattle:
 	call ExitBattle
 	pop af
 	ld [wTimeOfDayPal], a
+	ldh a, [rIE]
+	push af
+	call DoubleSpeed
+	pop af
+	ldh [rIE], a
 	scf
 	ret
 

diff --git a/engine/pc/bills_pc_ui.asm b/engine/pc/bills_pc_ui.asm
@@ -66,7 +66,7 @@ _BillsPC:
 	; Restore regular speed.
 	ldh a, [rIE]
 	push af
-	call NormalSpeed
+	call DoubleSpeed
 	pop af
 	ldh [rIE], a
 

diff --git a/home/init.asm b/home/init.asm
@@ -157,7 +157,7 @@ Init::
 	ldh a, [hCGB]
 	and a
 	jr z, .no_double_speed
-	call NormalSpeed
+	call DoubleSpeed
 .no_double_speed
 
 	xor a