falso
/
papermario
mirror of https://github.com/pmret/papermario.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup charge moves (#542)

This commit is contained in:
Alexander Faßbender 2021-12-04 15:00:24 +01:00 committed by GitHub
parent 72b2e593f6
commit 26679ce499
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/battle/move/hammer_charge_1/7595B0.c
View File

@ -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;

9
src/battle/move/hammer_charge_2/75E5D0.c
View File

@ -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;

9
src/battle/move/jump_charge_1/75C980.c
View File

@ -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;

9
src/battle/move/jump_charge_2/761920.c
View File

@ -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;