diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/global.h | 30 | ||||
-rw-r--r-- | include/quest_log.h | 6 |
2 files changed, 3 insertions, 33 deletions
diff --git a/include/global.h b/include/global.h index 2b8da3c14..67084f2ef 100644 --- a/include/global.h +++ b/include/global.h @@ -544,42 +544,12 @@ struct QuestLogNPCData u32 movementType:8; }; -struct UnkStruct_203B024 -{ - u16 unk_00; - u16 unk_02; - u16 unk_04[14]; -}; - -union QuestLogScene -{ - u8 allocation[32]; - u16 ident; -}; - -typedef union QuestLogScene QuestLogScene; - -// This name is a complete guess and may change. - #define BERRY_TREES_COUNT 128 #define FLAGS_COUNT 288 // 300 #define VARS_COUNT 256 #define MAIL_COUNT (PARTY_SIZE + 10) #define PC_MAIL_NUM(i) (PARTY_SIZE + (i)) -// Declare here so that it can be recursively referenced. -union QuestLogMovement; - -// Define here -union QuestLogMovement -{ - u16 ident_raw; - struct { - u16 ident:12; - u16 flags:4; - } ident_struct; -}; - struct QuestLogObjectEvent { /*0x00*/ u8 active:1; diff --git a/include/quest_log.h b/include/quest_log.h index 415ed2f0e..7c20f2de4 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -18,7 +18,7 @@ struct QuestLogEntry struct UnkStruct_203B044 { - u8 unk_0; + u8 id; u8 unk_1; u16 unk_2; }; @@ -34,7 +34,7 @@ extern u16 sQuestLogCursor; void sub_8112720(u8); void SetQuestLogEvent(u16, const u16 *); -void sub_811539C(void); +void SetQLPlayedTheSlots(void); void QuestLog_RecordEnteredMap(u16); u8 sub_8112CAC(void); bool8 QuestLog_SchedulePlaybackCB(void (*func)(void)); @@ -47,7 +47,7 @@ void TrySetUpQuestLogScenes_ElseContinueFromSave(u8 taskId); void SaveQuestLogData(void); void QuestLog_CutRecording(void); u8 sub_8112CAC(void); -void sub_81138F8(void); +void ResetDeferredLinkEvent(void); void FinishRecordingQuestLogScene(void); void sub_81139BC(void); void *QuestLogGetFlagOrVarPtr(bool8 isFlag, u16 idx); |