summaryrefslogtreecommitdiff
path: root/include/field_control_avatar.h
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2017-06-16 23:59:58 -0400
committeryenatch <yenatch@gmail.com>2017-06-16 23:59:58 -0400
commit8b97aa28047d5bbc24448b47cbda901a3adb9d0e (patch)
tree9e9a793c7dc9a4af7992e6b65c0418d16b25a400 /include/field_control_avatar.h
parentdda361afb7e2abafc15a498968580be6d1a83cfe (diff)
parentf568060cae85a1e8c70a0216ea5d1c6e79d6a528 (diff)
Merge remote-tracking branch 'marijn/clean/headers'
Diffstat (limited to 'include/field_control_avatar.h')
-rw-r--r--include/field_control_avatar.h27
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