diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-10 13:10:44 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-10 13:10:44 -0400 |
| commit | b22d3a821d8656d9fb88000ce02e5b885a59e1c3 (patch) | |
| tree | 7d4054b0df9f5746b3e31623868bf7d604ae7328 /include/field_control_avatar.h | |
| parent | 8626240b54d87449e5db70345840ccf20717d8c7 (diff) | |
| parent | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into modern_gcc
Diffstat (limited to 'include/field_control_avatar.h')
| -rw-r--r-- | include/field_control_avatar.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h index e0873aa52..25eaf45ae 100644 --- a/include/field_control_avatar.h +++ b/include/field_control_avatar.h @@ -26,15 +26,15 @@ extern struct FieldInput gInputToStoreInQuestLogMaybe; void RestartWildEncounterImmunitySteps(void); void ClearPoisonStepCounter(void); int SetCableClubWarp(void); -void sub_806DE28(struct ObjectEvent *); +void HandleBoulderFallThroughHole(struct ObjectEvent *); bool8 dive_warp(struct MapPosition * pos, u16 behavior); -bool8 sub_806DB84(u16 metatileBehavior, u8 playerDirection); +bool8 IsDirectionalStairWarpMetatileBehavior(u16 metatileBehavior, u8 playerDirection); const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatileBehavior, u8 direction); const u8 *GetCoordEventScriptAtMapPosition(struct MapPosition *position); void FieldClearPlayerInput(struct FieldInput *input); int ProcessPlayerFieldInput(struct FieldInput *input); void FieldInput_HandleCancelSignpost(struct FieldInput * input); void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys); -void sub_806DE70(u16 x, u16 y); +void HandleBoulderActivateVictoryRoadSwitch(u16 x, u16 y); #endif //GUARD_FIELD_CONTROL_AVATAR_H |