Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-07-19 09:21:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Renamed some boolean move functions

Browse Source
This commit is contained in:
AnonymousRandomPerson 2022-02-13 23:17:46 -05:00
parent 2a2a0805b4
commit ece475a480
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/code_8057144.s
View File

@ -392,7 +392,7 @@ IsMoveUsable_2:
cmp r1, 0x5
bne _08057414
adds r0, r4, 0
bl GetMoveDealsDirectDamage
bl MoveDealsDirectDamage
lsls r0, 24
cmp r0, 0
beq _0805743E
@ -460,7 +460,7 @@ sub_805744C:
cmp r1, 0x5
bne _0805748E
adds r0, r4, 0
bl GetMoveDealsDirectDamage
bl MoveDealsDirectDamage
lsls r0, 24
cmp r0, 0
beq _080574B6

2
asm/code_8057824.s
View File

@ -10965,7 +10965,7 @@ CanUseWithStatusChecker_2:
cmp r0, 0x1
bne _0805CEE0
adds r0, r7, 0
bl GetMoveCannotHitFrozen
bl MoveCannotHitFrozen
lsls r0, 24
cmp r0, 0
beq _0805CEE0

2
include/moves.h
View File

@ -14,6 +14,6 @@ s32 GetMovePower(struct PokemonMove *move);
// 0x92BF4
u32 GetMoveMaxPP(struct PokemonMove *move);
// 0x92C54
bool8 GetMoveDealsDirectDamage(struct PokemonMove *move);
bool8 MoveDealsDirectDamage(struct PokemonMove *move);
#endif

2
src/dungeon_ai_attack.c
View File

@ -348,7 +348,7 @@ s32 FindMoveTarget(struct MoveTargetResults *moveTargetResults, struct DungeonEn
targetingFlags = GetMoveTargetingFlagsForPokemon(pokemon, move, TRUE);
hasStatusChecker = HasIQSkill(pokemon, IQ_SKILL_STATUS_CHECKER);
moveTargetResults->moveUsable = FALSE;
if ((pokemonData->volatileStatus == VOLATILE_STATUS_TAUNTED && !GetMoveDealsDirectDamage(move)) ||
if ((pokemonData->volatileStatus == VOLATILE_STATUS_TAUNTED && !MoveDealsDirectDamage(move)) ||
(hasStatusChecker && !CanUseWithStatusChecker(pokemon, move)))
{
return 1;

4
src/moves.c
View File

@ -271,12 +271,12 @@ u8 GetMoveCriticalHitChance(struct PokemonMove *move)
return gMovesData[move->moveID].criticalHitChance;
}
bool8 GetMoveCannotHitFrozen(struct PokemonMove *move)
bool8 MoveCannotHitFrozen(struct PokemonMove *move)
{
return gMovesData[move->moveID].cannotHitFrozen;
}
bool8 GetMoveDealsDirectDamage(struct PokemonMove *move)
bool8 MoveDealsDirectDamage(struct PokemonMove *move)
{
return gMovesData[move->moveID].dealsDirectDamage;
}