diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2022-01-31 15:57:02 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-31 15:57:02 -0800 |
| commit | 1d64db5214b455bbd6f50ad6369ec04420e03984 (patch) | |
| tree | 1a78046d52129ea3ddafc06d391706590a54ceaf /src/status_checks.c | |
| parent | 408fe77d7b9440d7eb5d46eda5f920572d516d67 (diff) | |
| parent | 5dc5b3b1f97f9467005dadd63f5f6e052f984bc3 (diff) | |
Merge pull request #94 from AnonymousRandomPerson/master
Dungeon movement decomp
Diffstat (limited to 'src/status_checks.c')
| -rw-r--r-- | src/status_checks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/status_checks.c b/src/status_checks.c index ed39e99..b371934 100644 --- a/src/status_checks.c +++ b/src/status_checks.c @@ -6,6 +6,7 @@ #include "constants/status.h" #include "code_80521D0.h" #include "dungeon_action.h" +#include "dungeon_capabilities_1.h" #include "dungeon_random.h" extern char *gPtrFrozenMessage; @@ -17,7 +18,6 @@ extern char *gPtrInfatuatedMessage; extern char gAvailablePokemonNames[]; extern void SetMessageArgument(char[], struct DungeonEntity*, u32); -extern bool8 CanMoveForward2(struct DungeonEntity*, u8); extern void DecideAttack(struct DungeonEntity*); bool8 HasStatusAffectingActions(struct DungeonEntity *pokemon) @@ -74,7 +74,7 @@ bool8 HasStatusAffectingActions(struct DungeonEntity *pokemon) } if (pokemonData->eyesightStatus == EYESIGHT_STATUS_BLINKER) { - if (!CanMoveForward2(pokemon, pokemonData->action.facingDir)) + if (!CanMoveInDirection(pokemon, pokemonData->action.facingDir)) { if (DungeonRandomCapped(2) != 0) { |