diff options
author | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-21 21:15:54 -0400 |
---|---|---|
committer | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-21 21:15:54 -0400 |
commit | 6ee1bd06218bd80ca9cce754d34ba8cdd9701dc8 (patch) | |
tree | 57f2fe829364eec01a5033f439399d225a6b4cd6 /include | |
parent | 8df72e4da6223f5d284029cb8503850523978a76 (diff) |
Decompile event_data.s
Diffstat (limited to 'include')
-rw-r--r-- | include/constants/flags.h | 4 | ||||
-rw-r--r-- | include/constants/vars.h | 5 | ||||
-rw-r--r-- | include/event_data.h | 8 | ||||
-rw-r--r-- | include/quest_log.h | 2 |
4 files changed, 14 insertions, 5 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h index 9a7bb3108..994221afd 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -573,6 +573,7 @@ #define FLAG_0x22F 0x22F // Story flags +#define STORY_FLAGS_START 0x230 #define FLAG_GOT_POTION_ON_ROUTE_1 0x230 #define FLAG_GOT_TM34_FROM_SURGE 0x231 #define FLAG_GOT_FOSSIL_FROM_MT_MOON 0x232 @@ -1325,6 +1326,7 @@ #define FLAG_SYS_FLASH_ACTIVE (SYS_FLAGS + 0x6) #define FLAG_SYS_SPECIAL_WILD_BATTLE (SYS_FLAGS + 0x7) +#define PERMA_SYS_FLAGS_START 0x820 #define FLAG_BADGE01_GET (SYS_FLAGS + 0x20) #define FLAG_BADGE02_GET (SYS_FLAGS + 0x21) #define FLAG_BADGE03_GET (SYS_FLAGS + 0x22) @@ -1429,6 +1431,8 @@ #define FLAG_0x8E0 (SYS_FLAGS + 0xE0) // SPECIAL FLAGS (unknown purpose) +#define SPECIAL_FLAGS_START 0x4000 +#define SPECIAL_FLAGS_COUNT 16 #define FLAG_SPECIAL_FLAG_0x4000 0x4000 #define FLAG_SPECIAL_FLAG_0x4001 0x4001 #define FLAG_SPECIAL_FLAG_0x4002 0x4002 diff --git a/include/constants/vars.h b/include/constants/vars.h index 50ffa9681..e288ee292 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -3,6 +3,8 @@ #define VAR_0x3F20 0x3F20 +#define VARS_START 0x4000 + #define VAR_0x4000 0x4000 #define VAR_0x4001 0x4001 #define VAR_0x4002 0x4002 @@ -267,6 +269,7 @@ #define VAR_0x40FE 0x40FE #define VAR_0x40FF 0x40FF +#define SPECIAL_VARS_START 0x8000 #define VAR_0x8000 0x8000 #define VAR_0x8001 0x8001 #define VAR_0x8002 0x8002 @@ -287,6 +290,6 @@ #define VAR_CONTEST_CATEGORY 0x8011 #define VAR_MON_BOX_ID 0x8012 #define VAR_MON_BOX_POS 0x8013 -#define VAR_0x8014 0x8014 +#define VAR_TEXT_COLOR 0x8014 #endif // GUARD_CONSTANTS_VARS_H diff --git a/include/event_data.h b/include/event_data.h index 7c62ac92b..5a386a412 100644 --- a/include/event_data.h +++ b/include/event_data.h @@ -32,8 +32,8 @@ u8 FlagSet(u16 id); u8 FlagClear(u16 id); bool8 FlagGet(u16 id); u16 * GetVarPointer(u16 id); -bool32 Flag_0x839_IsSet(void); -void sub_806E6FC(void); +bool32 IsMysteryGiftEnabled(void); +void ResetSpecialVars(void); void sub_806E2D0(void); void sub_806E370(void); bool32 IsNationalPokedexEnabled(void); @@ -60,7 +60,7 @@ extern u16 gSpecialVar_0x8014; extern u16 gSpecialVar_Result; extern u16 gSpecialVar_0x8004; -extern u16 gUnknown_20370DA; -extern u16 gUnknown_20370DC; +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 d3ccbe3da..5c915f997 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -40,6 +40,8 @@ void sub_8112450(void); void sub_8112364(void); u8 sub_8112CAC(void); void sub_81138F8(void); +void *sub_8112D40(u8 a0, u16 a1); +void sub_8112DB0(u8 a0, u16 a1, u16 a2); extern u8 gUnknown_203ADFA; |