diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-13 15:13:30 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-13 15:13:30 -0500 |
commit | 3b2eaeedbc4c658389c7fceb93e6bbd07e8a6283 (patch) | |
tree | e9a403e858cf8d93cfee9eb80b5d8c79cc4e4159 /include/field_control_avatar.h | |
parent | cafbffd5b82836d779ec446e2362a9885fd18c4a (diff) | |
parent | b4f4d2c0f03462dcdf3492aad27890294600eb2e (diff) |
Merge branch 'master' into modern_gcc
Diffstat (limited to 'include/field_control_avatar.h')
-rw-r--r-- | include/field_control_avatar.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h index df6482688..bcb2b449e 100644 --- a/include/field_control_avatar.h +++ b/include/field_control_avatar.h @@ -30,7 +30,7 @@ const u8 *GetInteractedLinkPlayerScript(struct MapPosition *, u8, u8); void ClearPoisonStepCounter(void); void RestartWildEncounterImmunitySteps(void); u8 *GetCoordEventScriptAtMapPosition(struct MapPosition *); -const u8 *GetEventObjectScriptPointerPlayerFacing(void); +const u8 *GetObjectEventScriptPointerPlayerFacing(void); u8 TrySetDiveWarp(void); bool8 dive_warp(struct MapPosition*, u16); |