mirror of
https://github.com/pret/pmd-red.git
synced 2024-11-27 06:50:30 +00:00
Fix typo in FixedPoint_Subtract
This commit is contained in:
parent
9500058b1e
commit
aadea917d2
@ -2733,7 +2733,7 @@ _0805397C:
|
||||
ldr r2, [sp, 0x8]
|
||||
ldr r0, [sp, 0x40]
|
||||
adds r1, r4, 0
|
||||
bl FixedPoint_Substract
|
||||
bl FixedPoint_Subtract
|
||||
ldr r0, [sp, 0xC]
|
||||
ldr r3, [sp, 0x3C]
|
||||
str r0, [r3]
|
||||
|
@ -447,7 +447,7 @@ _0806A664:
|
||||
mov r0, sp
|
||||
adds r1, r5, 0
|
||||
movs r2, 0x5
|
||||
bl FixedPoint_Substract
|
||||
bl FixedPoint_Subtract
|
||||
ldr r0, [sp]
|
||||
str r0, [r4]
|
||||
movs r1, 0
|
||||
@ -529,7 +529,7 @@ _0806A70E:
|
||||
ldr r2, [sp]
|
||||
add r0, sp, 0x4
|
||||
adds r1, r4, 0
|
||||
bl FixedPoint_Substract
|
||||
bl FixedPoint_Subtract
|
||||
ldr r0, [sp, 0x4]
|
||||
str r0, [r5]
|
||||
b _0806A744
|
||||
|
@ -14,7 +14,7 @@ struct unkStruct_80943A8
|
||||
} unkStruct_80943A8;
|
||||
|
||||
FixedPoint FixedPoint_Add(FixedPoint a, FixedPoint b);
|
||||
FixedPoint FixedPoint_Substract(FixedPoint a, FixedPoint b);
|
||||
FixedPoint FixedPoint_Subtract(FixedPoint a, FixedPoint b);
|
||||
FixedPoint FixedPoint_Min(FixedPoint a, FixedPoint b);
|
||||
FixedPoint FixedPoint_Max(FixedPoint a, FixedPoint b);
|
||||
FixedPoint sub_8094370(FixedPoint param_1, FixedPoint param_2);
|
||||
|
@ -348,7 +348,7 @@ void sub_8074094(Entity *entity)
|
||||
|
||||
bellyBefore = entityInfo->belly;
|
||||
var_38 = FixedPoint_SetFromUnk(&sp10);
|
||||
entityInfo->belly = FixedPoint_Substract(bellyBefore, var_38);
|
||||
entityInfo->belly = FixedPoint_Subtract(bellyBefore, var_38);
|
||||
sound = TRUE;
|
||||
if (FixedPointToInt(bellyBefore) > 19 && FixedPointToInt(entityInfo->belly) <= 19)
|
||||
str = gUnknown_80FD594;
|
||||
|
@ -15,7 +15,7 @@ FixedPoint FixedPoint_Add(FixedPoint a, FixedPoint b)
|
||||
return a;
|
||||
}
|
||||
|
||||
FixedPoint FixedPoint_Substract(FixedPoint a, FixedPoint b)
|
||||
FixedPoint FixedPoint_Subtract(FixedPoint a, FixedPoint b)
|
||||
{
|
||||
a.unk2 -= b.unk2;
|
||||
a.unk0 -= b.unk0;
|
||||
|
@ -1249,7 +1249,7 @@ void sub_8078A58(struct Entity *pokemon, struct Entity *target, s32 param_3, s32
|
||||
if (param_4 != 0) {
|
||||
FixedPoint sp0 = IntToFixedPoint(param_4);
|
||||
bellyBefore = targetInfo->maxBelly;
|
||||
targetInfo->maxBelly = FixedPoint_Substract(bellyBefore, sp0);
|
||||
targetInfo->maxBelly = FixedPoint_Subtract(bellyBefore, sp0);
|
||||
targetInfo->belly = FixedPoint_Min(targetInfo->belly, targetInfo->maxBelly);
|
||||
SetMessageArgument(gAvailablePokemonNames, target, 0);
|
||||
|
||||
@ -1263,7 +1263,7 @@ void sub_8078A58(struct Entity *pokemon, struct Entity *target, s32 param_3, s32
|
||||
else {
|
||||
FixedPoint sp8 = IntToFixedPoint(param_3);
|
||||
bellyBefore = targetInfo->belly;
|
||||
targetInfo->belly = FixedPoint_Substract(bellyBefore, sp8);
|
||||
targetInfo->belly = FixedPoint_Subtract(bellyBefore, sp8);
|
||||
|
||||
SetMessageArgument(gAvailablePokemonNames, target, 0);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user