pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-08 12:02:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup & fix another offset

Browse Source
This commit is contained in:
Ethan Roseman 2021-02-16 00:33:05 +09:00
parent 7385170d42
commit a9cdcd8d23
12 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
asm/data/battle/move/earthquake_jump_785C10.data.s
View File

File diff suppressed because one or more lines are too long

6
asm/data/battle/move/earthquake_jump_785C20.data.s Normal file
View File

File diff suppressed because one or more lines are too long

4
src/battle/move/d_down_pound_74AD90.c
View File

@ -13,9 +13,9 @@ ApiStatus func_802A10A4_74AE34(ScriptInstance* script, s32 isInitialCall) {
s32 var2 = get_variable(script, *args++);
if (script->varTable[10] == 0) {
func_80070B50(TRUE, (var0 + 30), (var1 + 25), var2, 45.0f);
func_80070B50(TRUE, var0 + 30, var1 + 25, var2, 45.0f);
} else {
func_80070B50(FALSE, (var0 + 30), (var1 + 25), var2, 45.0f);
func_80070B50(FALSE, var0 + 30, var1 + 25, var2, 45.0f);
}
return ApiStatus_DONE2;

4
src/battle/move/earthquake_jump_785B20.c
View File

@ -4,11 +4,7 @@
#include "world/common/UnkMoveFunc1.inc.c"
#ifdef NON_MATCHING
ApiStatus func_802A10E4_785C04(ScriptInstance* script, s32 isInitialCall) {
script->varTable[0] = 3;
return ApiStatus_DONE2;
}
#else
INCLUDE_ASM(s32, "battle/move/earthquake_jump_785B20", func_802A10E4_785C04);
#endif

5
src/battle/move/hammer_charge_0_74F130.c
View File

@ -23,7 +23,8 @@ ApiStatus func_802A10C8_74F1F8(ScriptInstance* script, s32 isInitialCall) {
}
battleStatus->jumpCharge = 0;
battleStatus->flags1 = ((battleStatus->flags1 | 0x10000000) & ~0x20000000);
battleStatus->flags1 |= 0x10000000;
battleStatus->flags1 &= ~0x20000000;
return ApiStatus_DONE2;
}
@ -35,7 +36,7 @@ ApiStatus func_802A11CC_74F2FC(ScriptInstance* script, s32 isInitialCall) {
s32 var2 = get_variable(script, *args++);
f32 var3 = get_float_variable(script, *args++);
func_800720B0(6, (var0 + 10), (var1 + 18), var2, var3, 45);
func_800720B0(6, var0 + 10, var1 + 18, var2, var3, 45);
return ApiStatus_DONE2;
}

9
src/battle/move/hammer_charge_1_7595B0.c
View File

@ -22,18 +22,19 @@ ApiStatus func_802A10C8_759678(ScriptInstance* script, s32 isInitialCall) {
func_800718D0(1, var1, var2, var3, 1.0f, 60);
var4 = &D_802A43D0;
*var4 = 0;
if (battleStatus2->hammerCharge > 0) {
if (battleStatus->hammerCharge > 0) {
*var4 = 1;
}
battleStatus2->hammerCharge += 2;
if (battleStatus2->hammerCharge >= 100) {
if (battleStatus2->hammerCharge > 99) {
(*&battleStatus)->hammerCharge = 99; // TODO: macro?
}
battleStatus2->jumpCharge = 0;
battleStatus->flags1 = (battleStatus->flags1 | 0x10000000) & ~0x20000000;
battleStatus->jumpCharge = 0;
battleStatus->flags1 |= 0x10000000;
battleStatus->flags1 &= ~0x20000000;
return ApiStatus_DONE2;
}

7
src/battle/move/hammer_charge_2_75E5D0.c
View File

@ -28,12 +28,13 @@ ApiStatus func_802A10C8_75E698(ScriptInstance* script, s32 isInitialCall) {
battleStatus2->hammerCharge += 3;
if (battleStatus2->hammerCharge >= 100) {
if (battleStatus2->hammerCharge > 99) {
(*&battleStatus)->hammerCharge = 99; // TODO: macro?
}
battleStatus2->jumpCharge = 0;
battleStatus->flags1 = (battleStatus->flags1 | 0x10000000) & ~0x20000000;
battleStatus->jumpCharge = 0;
battleStatus->flags1 |= 0x10000000;
battleStatus->flags1 &= ~0x20000000;
return ApiStatus_DONE2;
}

6
src/battle/move/jump_73D860.c
View File

@ -5,11 +5,9 @@
#include "world/common/UnkMoveFunc1.inc.c"
ApiStatus func_802A10E4_73D944(ScriptInstance* script, s32 isInitialCall) {
PlayerData* playerData = &gPlayerData;
script->varTable[15] = 1;
switch (playerData->bootsLevel) {
switch (gPlayerData.bootsLevel) {
case 0:
script->varTable[15] = 1;
break;
@ -19,8 +17,6 @@ ApiStatus func_802A10E4_73D944(ScriptInstance* script, s32 isInitialCall) {
case 2:
script->varTable[15] = 3;
break;
default:
break;
}
return ApiStatus_DONE2;

7
src/battle/move/jump_charge_0_74D570.c
View File

@ -16,12 +16,13 @@ ApiStatus func_802A1108_74D678(ScriptInstance* script, s32 isInitialCall) {
func_800718D0(0, var1, var2, var3, 1.0f, 60);
battleStatus->jumpCharge += 1;
if (battleStatus->jumpCharge >= 100) {
if (battleStatus->jumpCharge > 99) {
(*&battleStatus)->jumpCharge = 99; // TODO: macro?
}
battleStatus->hammerCharge = 0;
battleStatus->flags1 = ((battleStatus->flags1 | 0x20000000) & ~0x10000000);
battleStatus->flags1 |= 0x20000000;
battleStatus->flags1 &= ~0x10000000;
return ApiStatus_DONE2;
}
@ -33,7 +34,7 @@ ApiStatus func_802A120C_74D77C(ScriptInstance* script, s32 isInitialCall) {
s32 var2 = get_variable(script, *args++);
f32 var3 = get_float_variable(script, *args++);
func_800720B0(6, (var0 + 10), (var1 + 18), var2, var3, 45);
func_800720B0(6, var0 + 10, var1 + 18, var2, var3, 45);
return ApiStatus_DONE2;
}

7
src/battle/move/jump_charge_1_75C980.c
View File

@ -26,12 +26,13 @@ ApiStatus func_802A1108_75CA88(ScriptInstance* script, s32 isInitialCall) {
battleStatus2->jumpCharge += 2;
if (battleStatus2->jumpCharge >= 100) {
if (battleStatus2->jumpCharge > 99) {
(*&battleStatus)->jumpCharge = 99; // TODO: macro?
}
battleStatus2->hammerCharge = 0;
battleStatus->flags1 = (battleStatus->flags1 | 0x20000000) & ~0x10000000;
battleStatus->hammerCharge = 0;
battleStatus->flags1 |= 0x20000000;
battleStatus->flags1 &= ~0x10000000;
return ApiStatus_DONE2;
}

7
src/battle/move/jump_charge_2_761920.c
View File

@ -26,12 +26,13 @@ ApiStatus func_802A1108_761A28(ScriptInstance* script, s32 isInitialCall) {
battleStatus2->jumpCharge += 3;
if (battleStatus2->jumpCharge >= 100) {
if (battleStatus2->jumpCharge > 99) {
(*&battleStatus)->jumpCharge = 99; // TODO: macro?
}
battleStatus2->hammerCharge = 0;
battleStatus->flags1 = (battleStatus->flags1 | 0x20000000) & ~0x10000000;
battleStatus->hammerCharge = 0;
battleStatus->flags1 |= 0x20000000;
battleStatus->flags1 &= ~0x10000000;
return ApiStatus_DONE2;
}

2
tools/splat.yaml
View File

@ -2672,7 +2672,7 @@ segments:
overlay: True
subsections:
- [0x785B20, c]
- [0x785C10, data]
- [0x785C20, data]
- name: battle/star/focus
type: code
start: 0x789E60