diff --git a/asm/code_80521D0.s b/asm/code_80521D0.s index bbdaf8c08..2acfee959 100644 --- a/asm/code_80521D0.s +++ b/asm/code_80521D0.s @@ -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] diff --git a/asm/code_8069E0C.s b/asm/code_8069E0C.s index b3816fe02..879b8ae64 100644 --- a/asm/code_8069E0C.s +++ b/asm/code_8069E0C.s @@ -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 diff --git a/include/number_util.h b/include/number_util.h index 9d186bee2..e3e7b4a1a 100644 --- a/include/number_util.h +++ b/include/number_util.h @@ -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); diff --git a/src/code_8073CF0.c b/src/code_8073CF0.c index 570d021d9..ed8af85c4 100644 --- a/src/code_8073CF0.c +++ b/src/code_8073CF0.c @@ -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; diff --git a/src/number_util.c b/src/number_util.c index ed52e18d0..6e693455c 100644 --- a/src/number_util.c +++ b/src/number_util.c @@ -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; diff --git a/src/status.c b/src/status.c index b34f24f83..1506daf40 100644 --- a/src/status.c +++ b/src/status.c @@ -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);