diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-15 17:18:05 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-15 17:18:05 +0100 |
commit | 1e79d53d2f913c65295b2547549d2c4ed849122b (patch) | |
tree | de6e74a23a65f5d7ebc7e4a7305742b08b6e71c0 /include/event_data.h | |
parent | 0310be30079c657f3a21da64683bdf9ac1d4d394 (diff) | |
parent | 055a419830c0725a629f971b0299c89082c192fd (diff) |
merge daycare with master
Diffstat (limited to 'include/event_data.h')
-rw-r--r-- | include/event_data.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/event_data.h b/include/event_data.h index 0bd11fdcd..f0ab90ae4 100644 --- a/include/event_data.h +++ b/include/event_data.h @@ -42,11 +42,11 @@ extern u16 gSpecialVar_0x8008; extern u16 gSpecialVar_0x8009; extern u16 gSpecialVar_0x800A; extern u16 gSpecialVar_0x800B; -extern u16 gScriptResult; -extern u16 gScriptLastTalked; -extern u16 gScriptFacing; -extern u16 gSpecialVar_0x8012; -extern u16 gSpecialVar_0x8013; +extern u16 gSpecialVar_Result; +extern u16 gSpecialVar_LastTalked; +extern u16 gSpecialVar_Facing; +extern u16 gSpecialVar_MonBoxId; +extern u16 gSpecialVar_MonBoxPos; extern u16 gSpecialVar_0x8014; #endif // GUARD_EVENT_DATA_H |