From 26679ce499c042fdedd27b362db4cce23ee6002d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Fa=C3=9Fbender?=
 <31699028+Brotenko@users.noreply.github.com>
Date: Sat, 4 Dec 2021 15:00:24 +0100
Subject: [PATCH] Cleanup charge moves (#542)

---
 src/battle/move/hammer_charge_1/7595B0.c | 7 +++----
 src/battle/move/hammer_charge_2/75E5D0.c | 9 ++++-----
 src/battle/move/jump_charge_1/75C980.c   | 9 ++++-----
 src/battle/move/jump_charge_2/761920.c   | 9 ++++-----
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/battle/move/hammer_charge_1/7595B0.c b/src/battle/move/hammer_charge_1/7595B0.c
index 82884a1046..073c2bd96d 100644
--- a/src/battle/move/hammer_charge_1/7595B0.c
+++ b/src/battle/move/hammer_charge_1/7595B0.c
@@ -14,7 +14,6 @@ extern s32 D_802A43D0;
 ApiStatus func_802A10C8_759678(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     BattleStatus* battleStatus = &gBattleStatus;
-    BattleStatus* battleStatus2 = battleStatus; // TODO: macro?
     s32 var1 = evt_get_variable(script, *args++);
     s32 var2 = evt_get_variable(script, *args++);
     s32 var3 = evt_get_variable(script, *args++);
@@ -27,10 +26,10 @@ ApiStatus func_802A10C8_759678(Evt* script, s32 isInitialCall) {
         *var4 = 1;
     }
 
-    battleStatus2->hammerCharge += 2;
+    battleStatus->hammerCharge += 2;
 
-    if (battleStatus2->hammerCharge > 99) {
-        (* &battleStatus)->hammerCharge = 99; // TODO: macro?
+    if (battleStatus->hammerCharge > 99) {
+        battleStatus->hammerCharge = 99;
     }
 
     battleStatus->jumpCharge = 0;
diff --git a/src/battle/move/hammer_charge_2/75E5D0.c b/src/battle/move/hammer_charge_2/75E5D0.c
index 1537907b50..308c3d18ec 100644
--- a/src/battle/move/hammer_charge_2/75E5D0.c
+++ b/src/battle/move/hammer_charge_2/75E5D0.c
@@ -14,7 +14,6 @@ extern s32 D_802A4350;
 ApiStatus func_802A10C8_75E698(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     BattleStatus* battleStatus = &gBattleStatus;
-    BattleStatus* battleStatus2 = battleStatus; // TODO: macro?
     s32 var1 = evt_get_variable(script, *args++);
     s32 var2 = evt_get_variable(script, *args++);
     s32 var3 = evt_get_variable(script, *args++);
@@ -23,14 +22,14 @@ ApiStatus func_802A10C8_75E698(Evt* script, s32 isInitialCall) {
     playFX_56(2, var1, var2, var3, 1.0f, 60);
     var4 = &D_802A4350;
     *var4 = 0;
-    if (battleStatus2->hammerCharge > 0) {
+    if (battleStatus->hammerCharge > 0) {
         *var4 = 1;
     }
 
-    battleStatus2->hammerCharge += 3;
+    battleStatus->hammerCharge += 3;
 
-    if (battleStatus2->hammerCharge > 99) {
-        (* &battleStatus)->hammerCharge = 99; // TODO: macro?
+    if (battleStatus->hammerCharge > 99) {
+        battleStatus->hammerCharge = 99;
     }
 
     battleStatus->jumpCharge = 0;
diff --git a/src/battle/move/jump_charge_1/75C980.c b/src/battle/move/jump_charge_1/75C980.c
index ce4b182d93..9061b71e9e 100644
--- a/src/battle/move/jump_charge_1/75C980.c
+++ b/src/battle/move/jump_charge_1/75C980.c
@@ -12,7 +12,6 @@ extern s32 D_802A2C50;
 ApiStatus func_802A1108_75CA88(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     BattleStatus* battleStatus = &gBattleStatus;
-    BattleStatus* battleStatus2 = battleStatus;
     s32 var1 = evt_get_variable(script, *args++);
     s32 var2 = evt_get_variable(script, *args++);
     s32 var3 = evt_get_variable(script, *args++);
@@ -21,14 +20,14 @@ ApiStatus func_802A1108_75CA88(Evt* script, s32 isInitialCall) {
     playFX_56(1, var1, var2, var3, 1.0f, 60);
     var4 = &D_802A2C50;
     *var4 = 0;
-    if (battleStatus2->jumpCharge > 0) {
+    if (battleStatus->jumpCharge > 0) {
         *var4 = 1;
     }
 
-    battleStatus2->jumpCharge += 2;
+    battleStatus->jumpCharge += 2;
 
-    if (battleStatus2->jumpCharge > 99) {
-        (* &battleStatus)->jumpCharge = 99; // TODO: macro?
+    if (battleStatus->jumpCharge > 99) {
+        battleStatus->jumpCharge = 99;
     }
 
     battleStatus->hammerCharge = 0;
diff --git a/src/battle/move/jump_charge_2/761920.c b/src/battle/move/jump_charge_2/761920.c
index be75d64dbf..1caf9b630c 100644
--- a/src/battle/move/jump_charge_2/761920.c
+++ b/src/battle/move/jump_charge_2/761920.c
@@ -12,7 +12,6 @@ extern s32 D_802A2C20;
 ApiStatus func_802A1108_761A28(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     BattleStatus* battleStatus = &gBattleStatus;
-    BattleStatus* battleStatus2 = battleStatus; // TODO: macro?
     s32 var1 = evt_get_variable(script, *args++);
     s32 var2 = evt_get_variable(script, *args++);
     s32 var3 = evt_get_variable(script, *args++);
@@ -21,14 +20,14 @@ ApiStatus func_802A1108_761A28(Evt* script, s32 isInitialCall) {
     playFX_56(2, var1, var2, var3, 1.0f, 60);
     var4 = &D_802A2C20;
     *var4 = 0;
-    if (battleStatus2->jumpCharge > 0) {
+    if (battleStatus->jumpCharge > 0) {
         *var4 = 1;
     }
 
-    battleStatus2->jumpCharge += 3;
+    battleStatus->jumpCharge += 3;
 
-    if (battleStatus2->jumpCharge > 99) {
-        (* &battleStatus)->jumpCharge = 99; // TODO: macro?
+    if (battleStatus->jumpCharge > 99) {
+        battleStatus->jumpCharge = 99;
     }
 
     battleStatus->hammerCharge = 0;