From fb423f957dc8944edf0b822a7aaa1949434ac65e Mon Sep 17 00:00:00 2001 From: scnorton Date: Tue, 9 Apr 2019 14:30:54 -0400 Subject: sub_812EB58; port scanline_effect --- include/help_system.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/help_system.h') diff --git a/include/help_system.h b/include/help_system.h index 632788148..0192809fc 100644 --- a/include/help_system.h +++ b/include/help_system.h @@ -6,5 +6,6 @@ extern bool8 gUnknown_3005ECC; void sub_812B484(void); +void sub_812B1F0(u8); #endif //GUARD_HELP_SYSTEM_H -- cgit v1.2.3 From 915694e8a7a5967d76bcbe544d671bb2f962f608 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 11 Apr 2019 18:26:02 -0400 Subject: Documentation of oak_speech --- include/help_system.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/help_system.h') diff --git a/include/help_system.h b/include/help_system.h index 0192809fc..3ef5f53e4 100644 --- a/include/help_system.h +++ b/include/help_system.h @@ -6,6 +6,6 @@ extern bool8 gUnknown_3005ECC; void sub_812B484(void); -void sub_812B1F0(u8); +void HelpSystem_SetSomeVariable2(u8); #endif //GUARD_HELP_SYSTEM_H -- cgit v1.2.3 From 2ef974d7766f899bbe3c3d4af8974232c6a13610 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 24 Apr 2019 17:14:11 -0400 Subject: Decompile seagallop --- include/help_system.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/help_system.h') diff --git a/include/help_system.h b/include/help_system.h index 3ef5f53e4..6398d306b 100644 --- a/include/help_system.h +++ b/include/help_system.h @@ -7,5 +7,6 @@ extern bool8 gUnknown_3005ECC; void sub_812B484(void); void HelpSystem_SetSomeVariable2(u8); +void sub_812B478(void); #endif //GUARD_HELP_SYSTEM_H -- cgit v1.2.3 From 12191612cd7a050283e37278fac1c02a2ef3776d Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Mon, 10 Jun 2019 09:03:39 +0800 Subject: TeachyTvLoadMapPalette and fixes --- include/help_system.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/help_system.h') diff --git a/include/help_system.h b/include/help_system.h index 6398d306b..97acec45e 100644 --- a/include/help_system.h +++ b/include/help_system.h @@ -5,6 +5,7 @@ extern bool8 gUnknown_3005ECC; +void sub_812B1E0(u16); void sub_812B484(void); void HelpSystem_SetSomeVariable2(u8); void sub_812B478(void); -- cgit v1.2.3 From 71d017a2bc12b584dad5e2d3a165e361e7866512 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 11 Jun 2019 17:32:33 -0400 Subject: help_system_812B1E0: through sub_812B4D8 --- include/help_system.h | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'include/help_system.h') diff --git a/include/help_system.h b/include/help_system.h index 97acec45e..6eee0dcb3 100644 --- a/include/help_system.h +++ b/include/help_system.h @@ -3,11 +3,38 @@ #include "global.h" +struct HelpSystemStruct_203F1AC +{ + +}; + +struct HelpSystemStruct_203F190_sub +{ + struct HelpSystemStruct_203F1AC * field_00; + u16 field_04; + u16 field_06; + u8 field_08; + u8 field_09; + +}; + +struct HelpSystemStruct_203F190 +{ + struct HelpSystemStruct_203F190_sub field_00; + u8 filler_0C[0x10]; +}; + +extern struct HelpSystemStruct_203F190 gUnknown_203F190; +extern struct HelpSystemStruct_203F1AC gUnknown_203F1AC; extern bool8 gUnknown_3005ECC; +extern u8 gUnknown_203F175; -void sub_812B1E0(u16); +void sub_812B1E0(u8); void sub_812B484(void); void HelpSystem_SetSomeVariable2(u8); void sub_812B478(void); +void sub_813C64C(struct HelpSystemStruct_203F190_sub *, u8, u8); +void sub_813BDA4(u8); +void sub_813BD5C(u8); #endif //GUARD_HELP_SYSTEM_H -- cgit v1.2.3 From b6709608f53d788db517f2abeaddb6284d64e199 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 11 Jun 2019 19:32:23 -0400 Subject: help_system_812B1E0: through sub_812B5A8 --- include/help_system.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'include/help_system.h') diff --git a/include/help_system.h b/include/help_system.h index 6eee0dcb3..f9aaba907 100644 --- a/include/help_system.h +++ b/include/help_system.h @@ -2,30 +2,27 @@ #define GUARD_HELP_SYSTEM_H #include "global.h" - -struct HelpSystemStruct_203F1AC -{ - -}; +#include "list_menu.h" struct HelpSystemStruct_203F190_sub { - struct HelpSystemStruct_203F1AC * field_00; + struct ListMenuItem * field_00; u16 field_04; u16 field_06; u8 field_08; u8 field_09; - }; struct HelpSystemStruct_203F190 { - struct HelpSystemStruct_203F190_sub field_00; - u8 filler_0C[0x10]; + struct HelpSystemStruct_203F190_sub sub; + u8 field_0C; + u8 field_0D; + u8 filler_10[0xC]; }; extern struct HelpSystemStruct_203F190 gUnknown_203F190; -extern struct HelpSystemStruct_203F1AC gUnknown_203F1AC; +extern struct ListMenuItem gUnknown_203F1AC[]; extern bool8 gUnknown_3005ECC; extern u8 gUnknown_203F175; @@ -33,8 +30,12 @@ void sub_812B1E0(u8); void sub_812B484(void); void HelpSystem_SetSomeVariable2(u8); void sub_812B478(void); -void sub_813C64C(struct HelpSystemStruct_203F190_sub *, u8, u8); +void sub_813C64C(struct HelpSystemStruct_203F190 *, u8, u8); +void sub_813C4CC(const u8 *, u8, u8); void sub_813BDA4(u8); void sub_813BD5C(u8); +void sub_813BDE8(u8); +void sub_813BFC0(u8); +void sub_813BE78(u8); #endif //GUARD_HELP_SYSTEM_H -- cgit v1.2.3 From 85aeb8d476459da4615949e287294658c8e9e3c5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 12 Jun 2019 16:43:34 -0400 Subject: help_system_812B1E0: through sub_812BDEC --- include/help_system.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include/help_system.h') diff --git a/include/help_system.h b/include/help_system.h index f9aaba907..2f82c4cf0 100644 --- a/include/help_system.h +++ b/include/help_system.h @@ -18,6 +18,7 @@ struct HelpSystemStruct_203F190 struct HelpSystemStruct_203F190_sub sub; u8 field_0C; u8 field_0D; + u8 field_0E; u8 filler_10[0xC]; }; @@ -37,5 +38,9 @@ void sub_813BD5C(u8); void sub_813BDE8(u8); void sub_813BFC0(u8); void sub_813BE78(u8); +s32 sub_813C690(void); +void sub_813C75C(void); +void sub_813C684(u8); +void sub_813C004(u8, u8); #endif //GUARD_HELP_SYSTEM_H -- cgit v1.2.3 From 63defaa95f88bf4e296eb9f9b4be64bf847f9157 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 12 Jun 2019 17:08:46 -0400 Subject: Finish help_system_812B1E0 decomp --- include/help_system.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'include/help_system.h') diff --git a/include/help_system.h b/include/help_system.h index 2f82c4cf0..1c8fb643e 100644 --- a/include/help_system.h +++ b/include/help_system.h @@ -42,5 +42,12 @@ s32 sub_813C690(void); void sub_813C75C(void); void sub_813C684(u8); void sub_813C004(u8, u8); +void sub_813C50C(const u8 *a0, const u8 *a1); +void sub_813BEE4(u8); +void sub_813C624(void); +void sub_813C5FC(void); +void sub_813C488(const u8 *str); +void sub_813C584(const u8 *str); +void sub_813BE30(u8); #endif //GUARD_HELP_SYSTEM_H -- cgit v1.2.3 From c993f5db4e0ab8052875ab80f980d4100b809764 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 12 Jun 2019 17:25:36 -0400 Subject: A little bit of cleanup --- include/help_system.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'include/help_system.h') diff --git a/include/help_system.h b/include/help_system.h index 1c8fb643e..1f8b7bbbb 100644 --- a/include/help_system.h +++ b/include/help_system.h @@ -29,8 +29,19 @@ extern u8 gUnknown_203F175; void sub_812B1E0(u8); void sub_812B484(void); +void sub_812B4B8(void); void HelpSystem_SetSomeVariable2(u8); void sub_812B478(void); +bool8 sub_812BC54(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1); +bool8 sub_812BC80(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1); +bool8 sub_812BCA8(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1); +bool8 sub_812BCD0(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1); +bool8 sub_812BD2C(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1); +bool8 sub_812BD64(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1); +bool8 sub_812BD98(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1); +bool8 sub_812BE10(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1); +bool8 sub_812BEEC(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1); +bool8 sub_812BF18(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1); void sub_813C64C(struct HelpSystemStruct_203F190 *, u8, u8); void sub_813C4CC(const u8 *, u8, u8); void sub_813BDA4(u8); -- cgit v1.2.3 From 63b2153402e68856e56fbacdc0d74daf53cfa9fc Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 13 Jun 2019 09:56:44 -0400 Subject: help_system: sub_813B870 --- include/help_system.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'include/help_system.h') diff --git a/include/help_system.h b/include/help_system.h index 1f8b7bbbb..ff45125b2 100644 --- a/include/help_system.h +++ b/include/help_system.h @@ -27,11 +27,15 @@ extern struct ListMenuItem gUnknown_203F1AC[]; extern bool8 gUnknown_3005ECC; extern u8 gUnknown_203F175; +// help_system_812B1E0 void sub_812B1E0(u8); -void sub_812B484(void); -void sub_812B4B8(void); void HelpSystem_SetSomeVariable2(u8); +bool8 sub_812B40C(void); +bool8 sub_812B45C(void); void sub_812B478(void); +void sub_812B484(void); +void sub_812B4B8(void); +bool8 sub_812BB9C(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1); bool8 sub_812BC54(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1); bool8 sub_812BC80(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1); bool8 sub_812BCA8(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1); @@ -42,6 +46,8 @@ bool8 sub_812BD98(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1 bool8 sub_812BE10(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1); bool8 sub_812BEEC(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1); bool8 sub_812BF18(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1); + +// help_system void sub_813C64C(struct HelpSystemStruct_203F190 *, u8, u8); void sub_813C4CC(const u8 *, u8, u8); void sub_813BDA4(u8); -- cgit v1.2.3 From 9aac6112a2205a84cc89022a9dcb7140ad060c66 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 13 Jun 2019 16:34:18 -0400 Subject: Some symbol renaming --- include/help_system.h | 93 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 58 insertions(+), 35 deletions(-) (limited to 'include/help_system.h') diff --git a/include/help_system.h b/include/help_system.h index ff45125b2..3ba0cf475 100644 --- a/include/help_system.h +++ b/include/help_system.h @@ -3,27 +3,28 @@ #include "global.h" #include "list_menu.h" +#include "blit.h" -struct HelpSystemStruct_203F190_sub +struct HelpSystemListMenu_sub { - struct ListMenuItem * field_00; - u16 field_04; - u16 field_06; - u8 field_08; - u8 field_09; + struct ListMenuItem * items; + u16 totalItems; + u16 maxShowed; + u8 left; + u8 top; }; -struct HelpSystemStruct_203F190 +struct HelpSystemListMenu { - struct HelpSystemStruct_203F190_sub sub; + struct HelpSystemListMenu_sub sub; u8 field_0C; u8 field_0D; u8 field_0E; u8 filler_10[0xC]; }; -extern struct HelpSystemStruct_203F190 gUnknown_203F190; -extern struct ListMenuItem gUnknown_203F1AC[]; +extern struct HelpSystemListMenu gHelpSystemListMenu; +extern struct ListMenuItem gHelpSystemListMenuItems[]; extern bool8 gUnknown_3005ECC; extern u8 gUnknown_203F175; @@ -35,36 +36,58 @@ bool8 sub_812B45C(void); void sub_812B478(void); void sub_812B484(void); void sub_812B4B8(void); -bool8 sub_812BB9C(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1); -bool8 sub_812BC54(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1); -bool8 sub_812BC80(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1); -bool8 sub_812BCA8(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1); -bool8 sub_812BCD0(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1); -bool8 sub_812BD2C(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1); -bool8 sub_812BD64(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1); -bool8 sub_812BD98(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1); -bool8 sub_812BE10(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1); -bool8 sub_812BEEC(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1); -bool8 sub_812BF18(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1); +bool8 sub_812BB9C(struct HelpSystemListMenu * a0, struct ListMenuItem * a1); +bool8 sub_812BC54(struct HelpSystemListMenu * a0, struct ListMenuItem * a1); +bool8 sub_812BC80(struct HelpSystemListMenu * a0, struct ListMenuItem * a1); +bool8 sub_812BCA8(struct HelpSystemListMenu * a0, struct ListMenuItem * a1); +bool8 sub_812BCD0(struct HelpSystemListMenu * a0, struct ListMenuItem * a1); +bool8 sub_812BD2C(struct HelpSystemListMenu * a0, struct ListMenuItem * a1); +bool8 sub_812BD64(struct HelpSystemListMenu * a0, struct ListMenuItem * a1); +bool8 sub_812BD98(struct HelpSystemListMenu * a0, struct ListMenuItem * a1); +void sub_812BDEC(void); +bool8 sub_812BE10(struct HelpSystemListMenu * a0, struct ListMenuItem * a1); +bool8 sub_812BEEC(struct HelpSystemListMenu * a0, struct ListMenuItem * a1); +bool8 sub_812BF18(struct HelpSystemListMenu * a0, struct ListMenuItem * a1); +bool8 sub_812BF88(void); // help_system -void sub_813C64C(struct HelpSystemStruct_203F190 *, u8, u8); -void sub_813C4CC(const u8 *, u8, u8); -void sub_813BDA4(u8); +bool8 RunHelpSystemCallback(void); +void SaveCallbacks(void); +void SaveMapGPURegs(void); +void SaveMapTiles(void); +void SaveMapTextColors(void); +void RestoreCallbacks(void); +void RestoreGPURegs(void); +void RestoreMapTiles(void); +void RestoreMapTextColors(void); +void CommitTilemap(void); +void sub_813BCF4(void); +void sub_813BD14(u8); void sub_813BD5C(u8); +void sub_813BDA4(u8); void sub_813BDE8(u8); -void sub_813BFC0(u8); +void sub_813BE30(u8); void sub_813BE78(u8); -s32 sub_813C690(void); -void sub_813C75C(void); -void sub_813C684(u8); -void sub_813C004(u8, u8); -void sub_813C50C(const u8 *a0, const u8 *a1); void sub_813BEE4(u8); -void sub_813C624(void); -void sub_813C5FC(void); -void sub_813C488(const u8 *str); -void sub_813C584(const u8 *str); -void sub_813BE30(u8); +void sub_813BF50(u8); +void sub_813BFC0(u8); +void sub_813C004(u8, u8); +void HelpSystem_PrintTextRightAlign_Row52(const u8 *str); +void HelpSystem_PrintTextAt(const u8 *, u8, u8); +void HelpSystem_PrintTwoStrings(const u8 *a0, const u8 *a1); +void HelpSystem_PrintText_813C584(const u8 *str); +void HelpSystem_FillPanel2(void); +void HelpSystem_FillPanel1(void); +void HelpSystem_InitListMenuController(struct HelpSystemListMenu *, u8, u8); +void HelpSystem_SetInputDelay(u8); +s32 HelpSystem_GetMenuInput(void); +void sub_813C75C(void); + +void DecompressAndRenderGlyph(u8 font, u16 glyph, struct Bitmap *srcBlit, struct Bitmap *destBlit, u8 *destBuffer, u8 x, u8 y, u8 width, u8 height); +void HelpSystem_PrintText_Row61(const u8 * str); +void HelpSystem_FillPanel3(void); +void PrintListMenuItems(void); +void PlaceListMenuCursor(void); +bool8 MoveCursor(u8 by, u8 dirn); #endif //GUARD_HELP_SYSTEM_H -- cgit v1.2.3