From 901fceec188ff640f32b22343e5a0b6e7e4c9c42 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 17 Mar 2020 20:59:39 -0400 Subject: through GetInteractedObjectEventScript --- include/script.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'include/script.h') diff --git a/include/script.h b/include/script.h index 2fb732396..38da71774 100644 --- a/include/script.h +++ b/include/script.h @@ -53,12 +53,12 @@ void mapheader_run_script_with_tag_x3(void); void mapheader_run_script_with_tag_x5(void); void mapheader_run_script_with_tag_x7(void); void mapheader_run_script_with_tag_x6(void); -bool8 mapheader_run_first_tag2_script_list_match(void); +bool8 TryRunOnFrameMapScript(void); void mapheader_run_first_tag4_script_list_match(void); u32 CalculateRamScriptChecksum(void); void ClearRamScript(void); bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId); -u8 *GetRamScript(u8 objectId, u8 *script); +const u8 *GetRamScript(u8 objectId, const u8 *script); bool32 sub_80991F8(void); u8 *sub_8099244(void); void sub_80992A0(u8 *script, u16 scriptSize); @@ -73,7 +73,12 @@ void sub_8069970(void); void sub_8069A20(void); void sub_8069A2C(void); bool8 IsMsgSignPost(void); +bool8 sub_806997C(void); +u8 sub_80699B0(void); +void sub_8069A54(void); +bool8 sub_8069A04(void); extern const u8 *gRAMScriptPtr; +extern u8 gUnknown_20370A0; #endif // GUARD_SCRIPT_H -- cgit v1.2.3 From 4516c63652686344160015ea91ee8729c2f355c5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 18 Mar 2020 08:49:31 -0400 Subject: through TryStartWarpEventScript --- include/script.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/script.h') diff --git a/include/script.h b/include/script.h index 38da71774..b56fedec9 100644 --- a/include/script.h +++ b/include/script.h @@ -77,6 +77,7 @@ bool8 sub_806997C(void); u8 sub_80699B0(void); void sub_8069A54(void); bool8 sub_8069A04(void); +void sub_80699E0(void); extern const u8 *gRAMScriptPtr; extern u8 gUnknown_20370A0; -- cgit v1.2.3 From 15a3adefa01b0bff99cd13442026551ce7ef1ac2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 18 Mar 2020 21:32:09 -0400 Subject: Static syms in field_control_avatar --- include/script.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/script.h') diff --git a/include/script.h b/include/script.h index b56fedec9..46746ddd8 100644 --- a/include/script.h +++ b/include/script.h @@ -78,6 +78,7 @@ u8 sub_80699B0(void); void sub_8069A54(void); bool8 sub_8069A04(void); void sub_80699E0(void); +bool8 sub_80699D4(void); extern const u8 *gRAMScriptPtr; extern u8 gUnknown_20370A0; -- cgit v1.2.3 From e078e4b315532c5a309425df6bf450abbf7bba04 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 19 Mar 2020 08:45:32 -0400 Subject: Some documentation of field_control_avatar and related routines --- include/script.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'include/script.h') diff --git a/include/script.h b/include/script.h index 46746ddd8..3dd91ca59 100644 --- a/include/script.h +++ b/include/script.h @@ -65,22 +65,22 @@ void sub_80992A0(u8 *script, u16 scriptSize); bool32 ValidateRamScript(void); void MEventSetRamScript(u8 * script, u16 scriptSize); u8 * sub_8069E48(void); -void sub_8069998(u8 var); -void sub_80699F8(void); -void sub_8069964(void); -void sub_80699A4(void); -void sub_8069970(void); -void sub_8069A20(void); -void sub_8069A2C(void); +void RegisterQuestLogInput(u8 var); +void ClearMsgBoxCancelableState(void); +void SetQuestLogInputIsDpadFlag(void); +void ClearQuestLogInput(void); +void ClearQuestLogInputIsDpadFlag(void); +void MsgSetSignPost(void); +void MsgSetNotSignPost(void); bool8 IsMsgSignPost(void); -bool8 sub_806997C(void); -u8 sub_80699B0(void); -void sub_8069A54(void); -bool8 sub_8069A04(void); -void sub_80699E0(void); +bool8 IsQuestLogInputDpad(void); +u8 GetRegisteredQuestLogInput(void); +void ResetFacingNpcOrSignPostVars(void); +bool8 CanWalkAwayToCancelMsgBox(void); +void SetWalkingIntoSignVars(void); bool8 sub_80699D4(void); extern const u8 *gRAMScriptPtr; -extern u8 gUnknown_20370A0; +extern u8 gWalkAwayFromSignInhibitTimer; #endif // GUARD_SCRIPT_H -- cgit v1.2.3