shithub: pokecrystal

Download patch

ref: c210f052a8097b1cef277d7cd008408ff6c21323
parent: 725cee7371f1b1862225e940e5c7271dc9444a1c
author: mid-kid <esteve.varela@gmail.com>
date: Wed Nov 21 09:14:34 EST 2018

Move BattleSideCopy to transform.asm

--- a/engine/battle/effect_commands.asm
+++ b/engine/battle/effect_commands.asm
@@ -6220,21 +6220,6 @@
 
 INCLUDE "engine/battle/move_effects/transform.asm"
 
-BattleSideCopy:
-; Copy bc bytes from hl to de if it's the player's turn.
-; Copy bc bytes from de to hl if it's the enemy's turn.
-	ldh a, [hBattleTurn]
-	and a
-	jr z, .copy
-
-; Swap hl and de
-	push hl
-	ld h, d
-	ld l, e
-	pop de
-.copy
-	jp CopyBytes
-
 BattleEffect_ButItFailed:
 	call AnimateFailedMove
 	jp PrintButItFailed
--- a/engine/battle/move_effects/transform.asm
+++ b/engine/battle/move_effects/transform.asm
@@ -1,4 +1,3 @@
-
 BattleCommand_Transform:
 ; transform
 
@@ -137,3 +136,18 @@
 	call nz, LoadAnim
 	ld hl, TransformedText
 	jp StdBattleTextBox
+
+BattleSideCopy:
+; Copy bc bytes from hl to de if it's the player's turn.
+; Copy bc bytes from de to hl if it's the enemy's turn.
+	ldh a, [hBattleTurn]
+	and a
+	jr z, .copy
+
+; Swap hl and de
+	push hl
+	ld h, d
+	ld l, e
+	pop de
+.copy
+	jp CopyBytes