diff options
| author | paul <nintendo6496@googlemail.com> | 2018-10-10 22:54:23 +0200 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-10-10 22:54:23 +0200 |
| commit | 3f0827128a6ba39577dbaa1ea28f8641e4a20780 (patch) | |
| tree | bb4cb2804a27325561a65e133f31a1e4d2671fbe /include/event_data.h | |
| parent | 1ee1ebe23a49bbbc040a43e0e6fb81badc588f22 (diff) | |
| parent | 10fff9c6f2d29899952d1751d3de827e7e98bb60 (diff) | |
resolve merge conflict about graphics_file_rules.mk and prepare for adding pokemon graphics
Diffstat (limited to 'include/event_data.h')
| -rw-r--r-- | include/event_data.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/event_data.h b/include/event_data.h index f829d3b87..f28ed4f75 100644 --- a/include/event_data.h +++ b/include/event_data.h @@ -29,6 +29,8 @@ u8 *GetFlagPointer(u16 id); u8 FlagSet(u16 id); u8 FlagClear(u16 id); bool8 FlagGet(u16 id); +u16 * sub_806E454(u16 id); +bool32 sub_806E2BC(void); extern u16 gSpecialVar_0x8000; extern u16 gSpecialVar_0x8001; @@ -49,4 +51,6 @@ extern u16 gSpecialVar_MonBoxId; extern u16 gSpecialVar_MonBoxPos; extern u16 gSpecialVar_0x8014; +extern u16 gUnknown_20370D0; + #endif // GUARD_EVENT_DATA_H |