From e6ef86e4b0a66440c3339c8d63c13dcd11521984 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Wed, 8 Nov 2017 15:20:10 -0600 Subject: Update variable and flag names --- include/event_data.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'include/event_data.h') diff --git a/include/event_data.h b/include/event_data.h index 0bd11fdcd..4030d5ec0 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_ScriptResult; +extern u16 gSpecialVar_ScriptLastTalked; +extern u16 gSpecialVar_ScriptFacing; +extern u16 gSpecialVar_MonBoxId; +extern u16 gSpecialVar_MonBoxPos; extern u16 gSpecialVar_0x8014; #endif // GUARD_EVENT_DATA_H -- cgit v1.2.3 From 2e40384fa22725de06a5293454b8962ab4de8f4d Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Fri, 10 Nov 2017 18:12:18 -0600 Subject: Extract baseroms from event_scripts --- include/event_data.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/event_data.h') diff --git a/include/event_data.h b/include/event_data.h index 4030d5ec0..f0ab90ae4 100644 --- a/include/event_data.h +++ b/include/event_data.h @@ -42,9 +42,9 @@ extern u16 gSpecialVar_0x8008; extern u16 gSpecialVar_0x8009; extern u16 gSpecialVar_0x800A; extern u16 gSpecialVar_0x800B; -extern u16 gSpecialVar_ScriptResult; -extern u16 gSpecialVar_ScriptLastTalked; -extern u16 gSpecialVar_ScriptFacing; +extern u16 gSpecialVar_Result; +extern u16 gSpecialVar_LastTalked; +extern u16 gSpecialVar_Facing; extern u16 gSpecialVar_MonBoxId; extern u16 gSpecialVar_MonBoxPos; extern u16 gSpecialVar_0x8014; -- cgit v1.2.3