From 1862f70466d6047d1585fe2487de5aa4fa1e8324 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Thu, 17 Oct 2019 12:26:01 +0800 Subject: thru BattleIntroDrawTrainersOrMonsSprites --- include/quest_log.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/quest_log.h') diff --git a/include/quest_log.h b/include/quest_log.h index d3ccbe3da..3d9dfb86d 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -40,6 +40,7 @@ void sub_8112450(void); void sub_8112364(void); u8 sub_8112CAC(void); void sub_81138F8(void); +void sub_812C224(void); extern u8 gUnknown_203ADFA; -- cgit v1.2.3 From a28bb81ab714da3da457734fcce93879f3d121a9 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Fri, 18 Oct 2019 09:55:23 +0800 Subject: battle_main remaining funcs --- include/quest_log.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/quest_log.h') diff --git a/include/quest_log.h b/include/quest_log.h index 3d9dfb86d..3a2f31780 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -14,6 +14,7 @@ struct UnkStruct_3005E90 u8 unk_2; }; +extern u8 gUnknown_203ADFA; extern u8 gUnknown_3005E88; extern u16 gUnknown_3005E8C; extern struct UnkStruct_3005E90 gUnknown_3005E90; @@ -41,7 +42,6 @@ void sub_8112364(void); u8 sub_8112CAC(void); void sub_81138F8(void); void sub_812C224(void); - -extern u8 gUnknown_203ADFA; +void sub_812BFDC(void); #endif //GUARD_QUEST_LOG_H -- cgit v1.2.3 From b0400ef6ba6e6cf49ad2bdc19a29eb2abef26701 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Mon, 21 Oct 2019 03:07:59 +0800 Subject: battle_setup funcs --- include/quest_log.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/quest_log.h') diff --git a/include/quest_log.h b/include/quest_log.h index 3a2f31780..ddcbb1bf0 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -43,5 +43,7 @@ u8 sub_8112CAC(void); void sub_81138F8(void); void sub_812C224(void); void sub_812BFDC(void); +void sub_811231C(void); +void sub_81139BC(void); #endif //GUARD_QUEST_LOG_H -- cgit v1.2.3 From 6ee1bd06218bd80ca9cce754d34ba8cdd9701dc8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 21 Oct 2019 21:15:54 -0400 Subject: Decompile event_data.s --- include/quest_log.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/quest_log.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; -- cgit v1.2.3 From faedabb106aec7dc7bf63b2958d58e469a956e87 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 22 Oct 2019 09:03:19 -0400 Subject: Document quest log flag/var funcs --- include/quest_log.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/quest_log.h') diff --git a/include/quest_log.h b/include/quest_log.h index 5c915f997..45a66eaca 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -15,7 +15,7 @@ struct UnkStruct_3005E90 }; extern u8 gUnknown_3005E88; -extern u16 gUnknown_3005E8C; +extern u16 sNumQuestLogs; extern struct UnkStruct_3005E90 gUnknown_3005E90; extern struct UnkStruct_203AE98 * gUnknown_3005E94; extern const u16 gUnknown_84566A8[]; @@ -40,8 +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); +void *QuestLogGetFlagOrVarPtr(u8 isFlag, u16 idx); +void QuestLogSetFlagOrVar(u8 isFlag, u16 idx, u16 value); extern u8 gUnknown_203ADFA; -- cgit v1.2.3 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/quest_log.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/quest_log.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 From 0a440d658b2d4a311381b1d297872e7eece7486f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 25 Oct 2019 11:10:08 -0400 Subject: Finish script_menu code decomp --- include/quest_log.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/quest_log.h') diff --git a/include/quest_log.h b/include/quest_log.h index f5fd820b0..b7dcec871 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -25,7 +25,7 @@ void sub_8113550(u16, const u16 *); void sub_811539C(void); void sub_8115748(u16); u8 sub_8112CAC(void); -bool8 sub_81119D4(void (*func)(void)); +bool8 QuestLog_ScheduleRoutineIfNotInPlaybackMode(void (*func)(void)); void sub_8111F38(u16, u16); void sub_8111134(void); void DestroyHelpMessageWindow(u8 a0); -- cgit v1.2.3 From 00675eaafba7605bdbf5c16984975e4ed6ad6bde Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 25 Oct 2019 13:23:46 -0400 Subject: script_menu data --- include/quest_log.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/quest_log.h') diff --git a/include/quest_log.h b/include/quest_log.h index b7dcec871..adfe27e1b 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -25,7 +25,7 @@ void sub_8113550(u16, const u16 *); void sub_811539C(void); void sub_8115748(u16); u8 sub_8112CAC(void); -bool8 QuestLog_ScheduleRoutineIfNotInPlaybackMode(void (*func)(void)); +bool8 QuestLog_SchedulePlaybackCB(void (*func)(void)); void sub_8111F38(u16, u16); void sub_8111134(void); void DestroyHelpMessageWindow(u8 a0); -- cgit v1.2.3 From 1230a5c48a465d42ae7035ca9c1a6e2152c54d1a Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sat, 26 Oct 2019 00:33:42 +0800 Subject: clean up --- include/quest_log.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include/quest_log.h') diff --git a/include/quest_log.h b/include/quest_log.h index a5352db1f..adab57526 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -2,6 +2,7 @@ #define GUARD_QUEST_LOG_H #include "global.h" +#include "quest_log_battle.h" struct UnkStruct_3005E90 { @@ -41,8 +42,6 @@ void sub_8112450(void); void sub_8112364(void); u8 sub_8112CAC(void); void sub_81138F8(void); -void sub_812C224(void); -void sub_812BFDC(void); void sub_811231C(void); void sub_81139BC(void); void *QuestLogGetFlagOrVarPtr(bool8 isFlag, u16 idx); -- cgit v1.2.3