diff options
| author | yenatch <yenatch@gmail.com> | 2017-06-20 20:41:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-20 20:41:33 -0400 |
| commit | 4ba573ed1eba7c37160ce6107d95447f42902385 (patch) | |
| tree | 5973f1e72156bb75cb6561a11dd7f333b90fcb3f /include/field_control_avatar.h | |
| parent | 13b02fc8232ce61062afe46ca13a1930a3bbc286 (diff) | |
| parent | b22e5219ba01c70da9a03397430bff10d0b99060 (diff) | |
Merge branch 'master' into patch-1
Diffstat (limited to 'include/field_control_avatar.h')
| -rw-r--r-- | include/field_control_avatar.h | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h index 0f8b74d59..a85e02132 100644 --- a/include/field_control_avatar.h +++ b/include/field_control_avatar.h @@ -1,7 +1,27 @@ #ifndef GUARD_FIELDCONTROLAVATAR_H #define GUARD_FIELDCONTROLAVATAR_H -#include "asm.h" +struct FieldInput +{ + u8 pressedAButton:1; + u8 input_field_0_1:1; + u8 pressedStartButton:1; + u8 pressedSelectButton:1; + u8 input_field_0_4:1; + u8 input_field_0_5:1; + u8 input_field_0_6:1; + u8 pressedBButton:1; + u8 input_field_1_0:1; + u8 input_field_1_1:1; + u8 input_field_1_2:1; + u8 input_field_1_3:1; + u8 input_field_1_4:1; + u8 input_field_1_5:1; + u8 input_field_1_6:1; + u8 input_field_1_7:1; + u8 dpadDirection; + u8 input_field_3; +}; void FieldClearPlayerInput(struct FieldInput *pStruct); void FieldGetPlayerInput(struct FieldInput *pStruct, u16 keys, u16 heldKeys); @@ -11,5 +31,10 @@ void overworld_poison_timer_set(void); void prev_quest_postbuffer_cursor_backup_reset(void); u8 *sub_8068E24(struct MapPosition *); u8 *GetFieldObjectScriptPointerForComparison(); +bool8 mapheader_trigger_activate_at__run_now(struct MapPosition *); +bool8 sub_8068870(u16 a); +bool8 sub_8068894(void); +bool8 sub_8068A64(struct MapPosition *, u16); +u8 sub_8068F18(void); #endif |