Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-09-11 02:25:57 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename GetMoveUnk12 to GetMoveMaxPowerBoost

Browse Source
This commit is contained in:
Seth Barberee
2022-05-30 10:03:08 -07:00
parent a73802a8e4
commit 217cd7774d
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/moves.h
View File

@@ -16,7 +16,7 @@ u32 GetMoveHitCount(struct PokemonMove *move);
s32 GetMovePower(struct PokemonMove *move);
s32 GetMoveAccuracy(struct PokemonMove *move, u32 accuracyType);
u32 GetMoveMaxPP(struct PokemonMove *move);
u32 GetMoveUnk12(struct PokemonMove *move);
u32 GetMoveMaxPowerBoost(struct PokemonMove *move);
u8 GetMoveCriticalHitChance(struct PokemonMove *move);
bool8 MoveCannotHitFrozen(struct PokemonMove *move);
bool8 MoveDealsDirectDamage(struct PokemonMove *move);

8
src/code_8048480.c
View File

@@ -212,7 +212,7 @@ void sub_80485B0(struct DungeonEntity *param_1, struct DungeonEntity * param_2)
register struct PokemonMove *movePtr2 asm("r5"); // r5
u8 cVar8;
s32 movePowerBoost;
s32 moveUnk12;
s32 maxPowerBoost;
isMoveBoosted = FALSE;
cVar8 = 1;
@@ -226,10 +226,10 @@ void sub_80485B0(struct DungeonEntity *param_1, struct DungeonEntity * param_2)
{
if(GetMovePower(movePtr2) == 0) continue;
movePowerBoost = movePtr1->powerBoost;
moveUnk12 = GetMoveUnk12(movePtr2);
maxPowerBoost = GetMoveMaxPowerBoost(movePtr2);
movePtr1->powerBoost += cVar8;
if(movePtr1->powerBoost >= moveUnk12)
movePtr1->powerBoost = moveUnk12;
if(movePtr1->powerBoost >= maxPowerBoost)
movePtr1->powerBoost = maxPowerBoost;
if(movePowerBoost != movePtr1->powerBoost)
isMoveBoosted = TRUE;
}