diff options
| author | paul <nintendo6496@googlemail.com> | 2018-11-24 19:57:36 +0100 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-11-24 19:57:36 +0100 |
| commit | 4744a7d96ec21fc9480165061990ba98a774a469 (patch) | |
| tree | 0c24d7e392d5cc4302e6ed6381b2a2dc047a2b3a /include/event_data.h | |
| parent | 284bbf91af43b0c9928865894cbc1d3001e57c16 (diff) | |
| parent | fecda40501d39c633435fe2777ebc93d92233ca1 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/event_data.h')
| -rw-r--r-- | include/event_data.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/event_data.h b/include/event_data.h index f28ed4f75..2e340f073 100644 --- a/include/event_data.h +++ b/include/event_data.h @@ -1,6 +1,8 @@ #ifndef GUARD_EVENT_DATA_H #define GUARD_EVENT_DATA_H +#include "global.h" + #include "constants/flags.h" #include "constants/vars.h" @@ -29,8 +31,9 @@ u8 *GetFlagPointer(u16 id); u8 FlagSet(u16 id); u8 FlagClear(u16 id); bool8 FlagGet(u16 id); -u16 * sub_806E454(u16 id); +u16 * GetVarPointer(u16 id); bool32 sub_806E2BC(void); +void sub_806E6FC(void); extern u16 gSpecialVar_0x8000; extern u16 gSpecialVar_0x8001; @@ -52,5 +55,6 @@ extern u16 gSpecialVar_MonBoxPos; extern u16 gSpecialVar_0x8014; extern u16 gUnknown_20370D0; +extern u16 gUnknown_20370C0; #endif // GUARD_EVENT_DATA_H |