From aba9da027c04de404c5d746bb5023459855d86c7 Mon Sep 17 00:00:00 2001
From: MementoMartha <harleyrayquaza@gmail.com>
Date: Mon, 12 Sep 2022 22:16:45 +0100
Subject: [PATCH] Struggle fixes

---
 constants/move_constants.asm | 28 ++++++++++++++--------------
 data/moves/animations.asm    |  2 +-
 data/moves/moves.asm         |  2 +-
 data/moves/names.asm         |  2 +-
 data/moves/sfx.asm           |  2 +-
 engine/battle/core.asm       |  2 +-
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/constants/move_constants.asm b/constants/move_constants.asm
index cd43175b..8e5e8856 100644
--- a/constants/move_constants.asm
+++ b/constants/move_constants.asm
@@ -170,20 +170,20 @@
 	const SUPER_FANG   ; a2
 	const SLASH        ; a3
 	const SUBSTITUTE   ; a4
-	const STRUGGLE     ; a5
-	const FAIRY_WIND   ; a6
-	const DRAININGKISS ; a7
-	const METAL_SOUND  ; a8
-	const MAGNET_BOMB  ; a9
-	const IRON_DEFENSE ; aa
-	const DAZZLE_GLEAM ; ab
-	const NIGHT_SLASH  ; ac
-	const FEINT_ATTACK ; ad
-	const IRON_HEAD    ; ae
-	const BRUTAL_SWING ; af
-	const CHARM 	 ; b0
-	const SWEET_KISS   ; b1
-	const BULLET_PUNCH ; b2
+	const FAIRY_WIND   ; a5
+	const DRAININGKISS ; a6
+	const METAL_SOUND  ; a7
+	const MAGNET_BOMB  ; a8
+	const IRON_DEFENSE ; a9
+	const DAZZLE_GLEAM ; aa
+	const NIGHT_SLASH  ; ab
+	const FEINT_ATTACK ; ac
+	const IRON_HEAD    ; ad
+	const BRUTAL_SWING ; ae
+	const CHARM 	 ; af
+	const SWEET_KISS   ; b0
+	const BULLET_PUNCH ; b1
+	const STRUGGLE     ; formerly a5, now b2
 DEF NUM_ATTACKS EQU const_value - 1
 
 	; Moves do double duty as animation identifiers.
diff --git a/data/moves/animations.asm b/data/moves/animations.asm
index 10374381..0fa307a6 100644
--- a/data/moves/animations.asm
+++ b/data/moves/animations.asm
@@ -164,7 +164,6 @@ AttackAnimationPointers:
 	dw SuperFangAnim
 	dw SlashAnim
 	dw SubstituteAnim
-	dw StruggleAnim
 	dw FairyWindAnim
 	dw DrainingKissAnim
 	dw MetalSoundAnim
@@ -178,6 +177,7 @@ AttackAnimationPointers:
 	dw CharmAnim
 	dw SweetKissAnim
 	dw BulletPunchAnim
+	dw StruggleAnim
 	assert_table_length NUM_ATTACKS
 	dw ShowPicAnim
 	dw EnemyFlashAnim
diff --git a/data/moves/moves.asm b/data/moves/moves.asm
index 413c99b9..86462bbc 100644
--- a/data/moves/moves.asm
+++ b/data/moves/moves.asm
@@ -175,7 +175,6 @@ Moves:
 	move SUPER_FANG,   SUPER_FANG_EFFECT,            1, NORMAL,        90, 10
 	move SLASH,        NO_ADDITIONAL_EFFECT,        70, NORMAL,       100, 20
 	move SUBSTITUTE,   SUBSTITUTE_EFFECT,            0, NORMAL,       100, 10
-	move STRUGGLE,     RECOIL_EFFECT,               50, NORMAL,       100, 10
 	move FAIRY_WIND,   NO_ADDITIONAL_EFFECT,        40, FAIRY,        100, 30
 	move DRAININGKISS, DRAIN_HP_EFFECT,             50, FAIRY,        100, 10
 	move METAL_SOUND,  SPECIAL_DOWN2_EFFECT,         0, STEEL,         85, 40
@@ -189,4 +188,5 @@ Moves:
 	move CHARM,        ATTACK_DOWN2_EFFECT,          0, FAIRY,        100, 20
 	move SWEET_KISS,   CONFUSION_EFFECT,             0, FAIRY,         75, 10
 	move BULLET_PUNCH, NO_ADDITIONAL_EFFECT,        40, STEEL,        100, 30
+	move STRUGGLE,     RECOIL_EFFECT,               50, NORMAL,       100, 10
 	assert_table_length NUM_ATTACKS
diff --git a/data/moves/names.asm b/data/moves/names.asm
index 66604163..12c24409 100644
--- a/data/moves/names.asm
+++ b/data/moves/names.asm
@@ -164,7 +164,6 @@ MoveNames::
 	li "SUPER FANG"
 	li "SLASH"
 	li "SUBSTITUTE"
-	li "STRUGGLE"
 	li "FAIRY WIND"
 	li "DRAININGKISS"
 	li "METAL SOUND"
@@ -178,4 +177,5 @@ MoveNames::
 	li "CHARM"
 	li "SWEET KISS"
 	li "BULLET PUNCH"
+	li "STRUGGLE"
 	assert_list_length NUM_ATTACKS
diff --git a/data/moves/sfx.asm b/data/moves/sfx.asm
index 2cf52108..8ccddadf 100644
--- a/data/moves/sfx.asm
+++ b/data/moves/sfx.asm
@@ -165,7 +165,6 @@ MoveSoundTable:
 	db SFX_BATTLE_26,          $f0, $ff ; SUPER_FANG
 	db SFX_NOT_VERY_EFFECTIVE, $01, $ff ; SLASH
 	db SFX_BATTLE_2C,          $d8, $04 ; SUBSTITUTE
-	db SFX_BATTLE_0B,          $00, $80 ; STRUGGLE
 	db SFX_BATTLE_12,          $00, $c0 ; FAIRY_WIND
 	db SFX_BATTLE_24,          $00, $80 ; DRAININGKISS
 	db SFX_BATTLE_31,          $00, $80 ; METAL_SOUND
@@ -179,5 +178,6 @@ MoveSoundTable:
 	db SFX_BATTLE_09,          $88, $10 ; CHARM
 	db SFX_BATTLE_09,          $88, $10 ; SWEET_KISS
 	db SFX_BATTLE_0B,          $01, $80 ; BULLET_PUNCH
+	db SFX_BATTLE_0B,          $00, $80 ; STRUGGLE
 	assert_table_length NUM_ATTACKS
 	db SFX_BATTLE_0B,          $00, $80
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index e0215adc..8bc1ebae 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -5172,7 +5172,7 @@ MetronomePickMove:
 	and a
 	jr z, .pickMoveLoop
 	cp STRUGGLE
-	assert NUM_ATTACKS == BULLET_PUNCH ; rerolls if greater than the last move in index
+	assert NUM_ATTACKS == STRUGGLE 
 	jr nc, .pickMoveLoop
 	cp METRONOME
 	jr z, .pickMoveLoop