shithub: pokecrystal

Download patch

ref: 6439706943b53ad756d481dea683fa8ee97f4981
parent: 91e89a29a20d075ffbdd3a2f75b507c8202b1dce
author: yenatch <yenatch@gmail.com>
date: Mon Sep 9 18:02:26 EDT 2013

split spikes effect into effects/spikes.asm

--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -9548,34 +9548,7 @@
 
 INCLUDE "battle/effects/endure.asm"
 
-
-BattleCommand56: ; 37683
-; spikes
-
-	ld hl, EnemyScreens
-	ld a, [hBattleTurn]
-	and a
-	jr z, .asm_3768e
-	ld hl, PlayerScreens
-.asm_3768e
-
-; Fails if spikes are already down!
-
-	bit SCREENS_SPIKES, [hl]
-	jr nz, .failed
-
-; Nothing else stops it from working.
-
-	set SCREENS_SPIKES, [hl]
-
-	call Function0x37e01
-
-	ld hl, SpikesText
-	jp StdBattleTextBox
-
-.failed
-	jp Function0x37354
-; 376a0
+INCLUDE "battle/effects/spikes.asm"
 
 
 BattleCommand57: ; 376a0
--- /dev/null
+++ b/battle/effects/spikes.asm
@@ -1,0 +1,28 @@
+BattleCommand56: ; 37683
+; spikes
+
+	ld hl, EnemyScreens
+	ld a, [hBattleTurn]
+	and a
+	jr z, .asm_3768e
+	ld hl, PlayerScreens
+.asm_3768e
+
+; Fails if spikes are already down!
+
+	bit SCREENS_SPIKES, [hl]
+	jr nz, .failed
+
+; Nothing else stops it from working.
+
+	set SCREENS_SPIKES, [hl]
+
+	call Function0x37e01
+
+	ld hl, SpikesText
+	jp StdBattleTextBox
+
+.failed
+	jp Function0x37354
+; 376a0
+
--