From 9b40cdaeb98c85baaf2ac34004b1a1ab91a3e061 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 2 May 2019 14:27:59 -0400 Subject: through sub_81C99FC --- include/pokenav.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/pokenav.h b/include/pokenav.h index 0d46f04f3..da17d1e69 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -162,7 +162,7 @@ const u8 *sub_81CAFD8(int index, int textType); u16 sub_81CB01C(void); u16 sub_81CB02C(int arg0); void sub_81CB050(u32 arg0, u8 *str); -int sub_81CB0C8(int rematchIndex); +u8 sub_81CB0C8(int rematchIndex); int sub_81CB0E4(int index); bool32 sub_81CAE08(int); int sub_81CB128(int index); -- cgit v1.2.3 From 518865d8d9d6d35ca40478570c51c33ca1477d6d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 2 May 2019 16:19:25 -0400 Subject: sub_81C9A10 --- include/graphics.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index 4e558b508..9b7bc1e0e 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4941,4 +4941,9 @@ extern const u16 gPokenavConditionCancel_Pal[]; extern const u32 gUnknown_08DE34B8[]; extern const u16 gUnknown_08DE3398[]; +// Pokenav +extern const u32 gPokenavMessageBox_Gfx[]; +extern const u32 gPokenavMessageBox_Tilemap[]; +extern const u16 gPokenavMessageBox_Pal[]; + #endif //GUARD_GRAPHICS_H -- cgit v1.2.3 From a14162eb9fdc0ac4f196b078b05be7ca6b7c73f9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 2 May 2019 16:43:32 -0400 Subject: through sub_81C9F28 --- include/pokenav.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include') diff --git a/include/pokenav.h b/include/pokenav.h index da17d1e69..470f00db7 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -125,6 +125,8 @@ void sub_81C7B40(void); struct Sprite *PauseSpinningPokenavSprite(void); void ResumeSpinningPokenavSprite(void); void sub_81C7E14(u32 arg0); +void sub_81C7FC4(u32 arg0, bool32 arg1); +void sub_81C7880(void); // pokenav_unk_1.c bool32 sub_81C9298(void); @@ -136,6 +138,7 @@ u32 sub_81C941C(void); void sub_81C9430(void); int sub_81C9894(void); const u8 *sub_81CAF78(int index, u8 *arg1); +u16 sub_81C98C4(void); // pokenav_unk_2.c void sub_81C99D4(void); -- cgit v1.2.3 From f13e1c78b23c5b9bccb8288ff1ba575f66e53afc Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 2 May 2019 17:50:42 -0400 Subject: through sub_81CA0EC --- include/graphics.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index 9b7bc1e0e..161633e17 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4945,5 +4945,7 @@ extern const u16 gUnknown_08DE3398[]; extern const u32 gPokenavMessageBox_Gfx[]; extern const u32 gPokenavMessageBox_Tilemap[]; extern const u16 gPokenavMessageBox_Pal[]; +extern const u32 gPokenavOptions_Gfx[]; +extern const u16 gPokenavOptions_Pal[]; #endif //GUARD_GRAPHICS_H -- cgit v1.2.3 From a08cbaee0a5f06f2e6d11ceb958e36430175f220 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 30 Jul 2019 19:46:56 -0400 Subject: pokenav_unk_2 staging --- include/pokenav.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/pokenav.h b/include/pokenav.h index 470f00db7..e181b592c 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -139,6 +139,7 @@ void sub_81C9430(void); int sub_81C9894(void); const u8 *sub_81CAF78(int index, u8 *arg1); u16 sub_81C98C4(void); +int sub_81C98A4(void); // pokenav_unk_2.c void sub_81C99D4(void); -- cgit v1.2.3 From 299c3cf1dcd5f93e7d12ec9d084da9d01431d5ec Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 4 Aug 2019 20:39:36 -0400 Subject: Finish pokenav_unk_2 --- include/pokenav.h | 3 ++- include/strings.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/pokenav.h b/include/pokenav.h index ecf66de51..75f08a9e9 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -152,8 +152,9 @@ u32 sub_81C941C(void); void sub_81C9430(void); int sub_81C9894(void); const u8 *sub_81CAF78(int index, u8 *arg1); -u16 sub_81C98C4(void); int sub_81C98A4(void); +int sub_81C98B4(void); +u16 sub_81C98C4(void); // pokenav_unk_2.c void sub_81C99D4(void); diff --git a/include/strings.h b/include/strings.h index 97285b051..f2d3f23ad 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2766,6 +2766,7 @@ extern const u8 gUnknown_085EBE06[]; extern const u8 gUnknown_085EBE19[]; extern const u8 gUnknown_085EBE2D[]; extern const u8 gUnknown_085EBE41[]; +extern const u8 gText_NoRibbonWinners[]; // pokenav_unk_4 extern const u8 gUnknown_085EC017[]; -- cgit v1.2.3 From ff2166b8fe5680d5b7339465eb37371d4fec810c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 4 Aug 2019 21:10:08 -0400 Subject: pokenav_unk_2: unclutter global namespace --- include/pokenav.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include') diff --git a/include/pokenav.h b/include/pokenav.h index 75f08a9e9..31cb5cb17 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -157,6 +157,10 @@ int sub_81C98B4(void); u16 sub_81C98C4(void); // pokenav_unk_2.c +bool32 sub_81C9924(void); +bool32 sub_81C9940(void); +void sub_81C9990(s32 ltIdx); +bool32 sub_81C99C0(void); void sub_81C99D4(void); void sub_81CAADC(void); -- cgit v1.2.3 From 329670e16e18b1ca53195e02c6bc72c0e68af8fa Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 5 Aug 2019 08:46:52 -0400 Subject: Minor fixes --- include/global.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include') diff --git a/include/global.h b/include/global.h index 16f08c895..14377d8bb 100644 --- a/include/global.h +++ b/include/global.h @@ -32,6 +32,10 @@ #define ARRAY_COUNT(array) (size_t)(sizeof(array) / sizeof((array)[0])) +// GameFreak used a macro called "NELEMS", as evidenced by +// AgbAssert calls. +#define NELEMS(arr) (sizeof(arr)/sizeof(*(arr))) + #define SWAP(a, b, temp) \ { \ temp = a; \ -- cgit v1.2.3