diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-03-23 09:39:46 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-03-23 09:39:46 -0500 |
| commit | 65391a1eb2979dc050dd4a98afea02bb0ef310ea (patch) | |
| tree | e31a90d0966cec7e8713ead9ca8083d439c8d9b5 /include/field_control_avatar.h | |
| parent | eb48cc2f7eefc1e56c2dcec21c38381b4534b897 (diff) | |
| parent | abe56579c107af58e6f3a43968ba2257ff358189 (diff) | |
Merge remote-tracking branch 'upstream/master' into use_pokeblock
# Conflicts:
# src/use_pokeblock.c
Diffstat (limited to 'include/field_control_avatar.h')
| -rw-r--r-- | include/field_control_avatar.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h index 3cc4a8324..feb20cef6 100644 --- a/include/field_control_avatar.h +++ b/include/field_control_avatar.h @@ -37,5 +37,8 @@ u8 sub_8068F18(void); bool8 dive_warp(struct MapPosition *position, u16 b); int SetCableClubWarp(void); u8 TrySetDiveWarp(void); +const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatileBehavior, u8 direction); +u8 *GetCoordEventScriptAtMapPosition(struct MapPosition *position); +void ClearPoisonStepCounter(void); #endif // GUARD_FIELDCONTROLAVATAR_H |