From 4dfc6699fedf01167987061e7cd63cc28245519a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 22 Oct 2019 20:09:08 -0400 Subject: Update code style in some places --- include/event_data.h | 44 ++++++++++++++++++++------------------------ include/quest_log.h | 4 ++-- 2 files changed, 22 insertions(+), 26 deletions(-) (limited to 'include') diff --git a/include/event_data.h b/include/event_data.h index 5a386a412..719ba37b2 100644 --- a/include/event_data.h +++ b/include/event_data.h @@ -6,6 +6,26 @@ #include "constants/flags.h" #include "constants/vars.h" +extern u16 gSpecialVar_0x8000; +extern u16 gSpecialVar_0x8001; +extern u16 gSpecialVar_0x8002; +extern u16 gSpecialVar_0x8003; +extern u16 gSpecialVar_0x8004; +extern u16 gSpecialVar_0x8005; +extern u16 gSpecialVar_0x8006; +extern u16 gSpecialVar_0x8007; +extern u16 gSpecialVar_0x8008; +extern u16 gSpecialVar_0x8009; +extern u16 gSpecialVar_0x800A; +extern u16 gSpecialVar_0x800B; +extern u16 gSpecialVar_Facing; +extern u16 gSpecialVar_Result; +extern u16 gSpecialVar_LastTalked; +extern u16 gSpecialVar_MonBoxId; +extern u16 gSpecialVar_MonBoxPos; +extern u16 gSpecialVar_TextColor; +extern u16 gSpecialVar_PrevTextColor; + void InitEventData(void); void ClearTempFieldEventData(void); void ClearUpperFlags(void); @@ -38,29 +58,5 @@ void sub_806E2D0(void); void sub_806E370(void); bool32 IsNationalPokedexEnabled(void); void sub_806E190(void); -extern u16 gSpecialVar_0x8000; -extern u16 gSpecialVar_0x8001; -extern u16 gSpecialVar_0x8002; -extern u16 gSpecialVar_0x8003; -extern u16 gSpecialVar_0x8004; -extern u16 gSpecialVar_0x8005; -extern u16 gSpecialVar_0x8006; -extern u16 gSpecialVar_0x8007; -extern u16 gSpecialVar_0x8008; -extern u16 gSpecialVar_0x8009; -extern u16 gSpecialVar_0x800A; -extern u16 gSpecialVar_0x800B; -extern u16 gSpecialVar_Result; -extern u16 gSpecialVar_LastTalked; -extern u16 gSpecialVar_Facing; -extern u16 gSpecialVar_MonBoxId; -extern u16 gSpecialVar_MonBoxPos; -extern u16 gSpecialVar_0x8014; - -extern u16 gSpecialVar_Result; -extern u16 gSpecialVar_0x8004; - -extern u16 gSpecialVar_TextColor; -extern u16 gSpecialVar_PrevTextColor; #endif // GUARD_EVENT_DATA_H diff --git a/include/quest_log.h b/include/quest_log.h index 45a66eaca..f5fd820b0 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -40,8 +40,8 @@ void sub_8112450(void); void sub_8112364(void); u8 sub_8112CAC(void); void sub_81138F8(void); -void *QuestLogGetFlagOrVarPtr(u8 isFlag, u16 idx); -void QuestLogSetFlagOrVar(u8 isFlag, u16 idx, u16 value); +void *QuestLogGetFlagOrVarPtr(bool8 isFlag, u16 idx); +void QuestLogSetFlagOrVar(bool8 isFlag, u16 idx, u16 value); extern u8 gUnknown_203ADFA; -- cgit v1.2.3