From b68ab6106d59902c7aef7bb2d7058a3945849ece Mon Sep 17 00:00:00 2001 From: garak Date: Fri, 19 Jul 2019 17:23:52 -0400 Subject: pokenav unk 2 data decomp --- include/strings.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'include') diff --git a/include/strings.h b/include/strings.h index e373a5660..3dd86f60a 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2723,4 +2723,20 @@ extern const u8 gText_NumberOfBattles[]; extern const u8 gText_Unknown[]; extern const u8 gText_TrainerCloseBy[]; +// pokenav_unk_2 +extern const u8 gUnknown_085EBCC5[]; +extern const u8 gUnknown_085EBCE8[]; +extern const u8 gUnknown_085EBD01[]; +extern const u8 gUnknown_085EBD1C[]; +extern const u8 gUnknown_085EBD34[]; +extern const u8 gUnknown_085EBD83[]; +extern const u8 gUnknown_085EBDA2[]; +extern const u8 gUnknown_085EBDBF[]; +extern const u8 gUnknown_085EBDDB[]; +extern const u8 gUnknown_085EBDEE[]; +extern const u8 gUnknown_085EBE06[]; +extern const u8 gUnknown_085EBE19[]; +extern const u8 gUnknown_085EBE2D[]; +extern const u8 gUnknown_085EBE41[]; + #endif // GUARD_STRINGS_H -- cgit v1.2.3 From 690a0c4390788aede68c30328f06ab5575bf0f9d Mon Sep 17 00:00:00 2001 From: garak Date: Fri, 19 Jul 2019 19:36:17 -0400 Subject: decompile pokenav_unk_4 rodata --- include/strings.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include') diff --git a/include/strings.h b/include/strings.h index 3dd86f60a..d8cdebec6 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2739,4 +2739,9 @@ extern const u8 gUnknown_085EBE19[]; extern const u8 gUnknown_085EBE2D[]; extern const u8 gUnknown_085EBE41[]; +// pokenav_unk_4 +extern const u8 gUnknown_085EC017[]; +extern const u8 gUnknown_085EC01C[]; +extern const u8 gUnknown_085EC022[]; + #endif // GUARD_STRINGS_H -- cgit v1.2.3 From 9a152f8fe600698fe7d63e6f3835d0154d60c42c Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Tue, 30 Jul 2019 17:21:17 -0700 Subject: Decompile data/use_pokeblock.s --- include/graphics.h | 3 +++ include/strings.h | 7 +++++++ 2 files changed, 10 insertions(+) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index d77e8e4c7..bbb70590d 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4939,6 +4939,9 @@ extern const u32 gLinkMiscMenu_Tilemap[]; // Use Pokeblock extern const u8 gPokenavConditionCancel_Gfx[]; extern const u16 gPokenavConditionCancel_Pal[]; +extern const u8 gUsePokeblockUpDown_Gfx[]; +extern const u16 gUsePokeblockUpDown_Pal[]; +extern const u16 gUsePokeblockCondition_Pal[]; // Berry Crush extern const u32 gUnknown_08DE34B8[]; diff --git a/include/strings.h b/include/strings.h index 5d8d2eb79..ffbdb4273 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2744,4 +2744,11 @@ extern const u8 gUnknown_085EC017[]; extern const u8 gUnknown_085EC01C[]; extern const u8 gUnknown_085EC022[]; +// use_pokeblock +extern const u8 gText_Coolness[]; +extern const u8 gText_Toughness[]; +extern const u8 gText_Smartness[]; +extern const u8 gText_Cuteness[]; +extern const u8 gText_Beauty3[]; + #endif // GUARD_STRINGS_H -- cgit v1.2.3 From 02cadbee60c7b1a4806f790416a21619391fef15 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 1 Aug 2019 19:01:50 +0200 Subject: MORE DODRIO BERRY PICKINGgit status! --- include/link_rfu.h | 2 +- include/strings.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/link_rfu.h b/include/link_rfu.h index 4bf106ec1..d6e1009e1 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -275,7 +275,7 @@ void sub_8010FCC(u32 a0, u32 a1, u32 a2); void sub_8011C84(void); void sub_8012188(const u8 *name, struct UnkLinkRfuStruct_02022B14 *structPtr, u8 a2); bool32 sub_8011B90(void); -void sub_800FE50(u16 *a0); +void sub_800FE50(void *a0); bool32 sub_800E540(u16 id, u8 *name); void sub_8011DE0(u32 arg0); u8 sub_801100C(s32 a0); diff --git a/include/strings.h b/include/strings.h index a959821d4..dfec425d5 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2723,4 +2723,10 @@ extern const u8 gText_NumberOfBattles[]; extern const u8 gText_Unknown[]; extern const u8 gText_TrainerCloseBy[]; +// Dodrio Berry Picking +extern const u8 gText_BerryPickingRecords[]; +extern const u8 gText_BerriesPicked[]; +extern const u8 gText_BerriesInRowFivePlayers[]; +extern const u8 gText_BestScore[]; + #endif // GUARD_STRINGS_H -- cgit v1.2.3 From 4d2d8779bfb56385b5e35d3010d28a248780f134 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 2 Aug 2019 00:41:55 +0200 Subject: Dodrio berry picking decompiled --- include/berry_crush.h | 2 ++ include/dodrio_berry_picking.h | 8 ++++++++ include/menu.h | 2 +- include/strings.h | 16 ++++++++++++++++ 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 include/dodrio_berry_picking.h (limited to 'include') diff --git a/include/berry_crush.h b/include/berry_crush.h index 101450a33..8909ae821 100755 --- a/include/berry_crush.h +++ b/include/berry_crush.h @@ -1,6 +1,8 @@ #ifndef GUARD_BERRY_CRUSH_H #define GUARD_BERRY_CRUSH_H +#include "main.h" + void sub_8020C70(MainCallback callback); #endif // GUARD_BERRY_CRUSH_H diff --git a/include/dodrio_berry_picking.h b/include/dodrio_berry_picking.h new file mode 100644 index 000000000..55e8fa880 --- /dev/null +++ b/include/dodrio_berry_picking.h @@ -0,0 +1,8 @@ +#ifndef GUARD_DODRIO_BERRY_PICKING_H +#define GUARD_DODRIO_BERRY_PICKING_H + +void sub_802493C(u16 a0, void (*callback)(void)); +void sub_8027A5C(void); +void sub_8027AAC(void); + +#endif // GUARD_DODRIO_BERRY_PICKING_H diff --git a/include/menu.h b/include/menu.h index 08cad40bd..62e2558dc 100644 --- a/include/menu.h +++ b/include/menu.h @@ -25,7 +25,7 @@ void InitStandardTextBoxWindows(void); void sub_8197200(void); u16 RunTextPrintersAndIsPrinter0Active(void); void sub_81973A4(void); -void DrawDialogueFrame(u8, u8); +void DrawDialogueFrame(u8 windowId, bool8 copyToVram); void ClearStdWindowAndFrame(u8 windowId, bool8 copyToVram); u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 fgColor, u8 bgColor, u8 shadowColor); void PrintPlayerNameOnWindow(u8, const u8*, u16, u16); diff --git a/include/strings.h b/include/strings.h index dfec425d5..7e80a2ac1 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2728,5 +2728,21 @@ extern const u8 gText_BerryPickingRecords[]; extern const u8 gText_BerriesPicked[]; extern const u8 gText_BerriesInRowFivePlayers[]; extern const u8 gText_BestScore[]; +extern const u8 gText_1Colon[]; +extern const u8 gText_2Colon[]; +extern const u8 gText_3Colon[]; +extern const u8 gText_4Colon[]; +extern const u8 gText_5Colon[]; +extern const u8 gText_SpacePoints[]; +extern const u8 gText_10P30P50P50P[]; +extern const u8 gText_AnnouncingPrizes[]; +extern const u8 gText_AnnouncingRankings[]; +extern const u8 gText_FirstPlacePrize[]; +extern const u8 gText_CantHoldAnyMore[]; +extern const u8 gText_FilledStorageSpace[]; +extern const u8 gText_BerryPickingResults[]; +extern const u8 gText_WantToPlayAgain[]; +extern const u8 gText_CommunicationStandby3[]; +extern const u8 gText_SomeoneDroppedOut[]; #endif // GUARD_STRINGS_H -- cgit v1.2.3 From 9c90ff65af183a50071094bc1c96df252447f1c1 Mon Sep 17 00:00:00 2001 From: GriffinR <25753467+GriffinRichards@users.noreply.github.com> Date: Fri, 2 Aug 2019 12:48:15 -0400 Subject: Update pokenav.h --- 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 d254858ac..69a9f1f58 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -107,7 +107,7 @@ void sub_81C8234(void); // pokenav_match_call_data.c bool32 sub_81D17E8(u32 idx); -u8 sub_81D16DC(u32 idx); +u8 MatchCallMapSecGetByIndex(u32 idx); bool32 sub_81D1BF8(u32 idx); bool32 MatchCallFlagGetByIndex(u32 idx); u32 MatchCall_GetRematchTableIdx(u32 idx); -- cgit v1.2.3