summaryrefslogtreecommitdiff
path: root/include/event_data.h
diff options
context:
space:
mode:
authorPaul Sander <nintendo6496@googlemail.com>2018-12-17 16:26:00 +0100
committerPaul Sander <nintendo6496@googlemail.com>2018-12-17 16:26:00 +0100
commit478c7b5421f596ac9c1e6f4faedfe3faec6a68cf (patch)
tree255fa2842f0020dbcd498d87ba8f61456fc804a9 /include/event_data.h
parentfc1fd9c983b0ea35414f699ab6c4b4fdd617e8d0 (diff)
parent4cd02d59b4dfef1129f0e2f23e6409e75848af24 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/event_data.h')
-rw-r--r--include/event_data.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/event_data.h b/include/event_data.h
index 2e340f073..13e388bf2 100644
--- a/include/event_data.h
+++ b/include/event_data.h
@@ -34,6 +34,8 @@ bool8 FlagGet(u16 id);
u16 * GetVarPointer(u16 id);
bool32 sub_806E2BC(void);
void sub_806E6FC(void);
+void sub_806E2D0(void);
+void sub_806E370(void);
extern u16 gSpecialVar_0x8000;
extern u16 gSpecialVar_0x8001;
@@ -54,7 +56,7 @@ extern u16 gSpecialVar_MonBoxId;
extern u16 gSpecialVar_MonBoxPos;
extern u16 gSpecialVar_0x8014;
-extern u16 gUnknown_20370D0;
-extern u16 gUnknown_20370C0;
+extern u16 gSpecialVar_Result;
+extern u16 gSpecialVar_0x8004;
#endif // GUARD_EVENT_DATA_H