From eb48cc2f7eefc1e56c2dcec21c38381b4534b897 Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Sat, 23 Feb 2019 09:08:07 -0800 Subject: Decompile through sub_8167930. --- include/graphics.h | 5 +++++ include/strings.h | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index f7eaa394d..47962110d 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4762,6 +4762,11 @@ extern const u32 gBattleAnimBackgroundImageMuddyWater_Pal[]; extern const u32 gBattleAnimFogTilemap[]; +extern const u32 gUsePokeblockGraph_Gfx[]; +extern const u32 gUsePokeblockGraph_Tilemap[]; +extern const u16 gUsePokeblockGraph_Pal[]; +extern const u16 gUsePokeblockNatureWin_Pal[]; + // Berry blender extern const u32 gBerryBlenderArrowTiles[]; extern const u32 gBerryBlenderStartTiles[]; diff --git a/include/strings.h b/include/strings.h index 74f3ca727..2c3d966b7 100644 --- a/include/strings.h +++ b/include/strings.h @@ -9,6 +9,11 @@ extern const u8 gText_OpenLevel[]; extern const u8 gText_Mom[]; extern const u8 gText_Dad[]; +extern const u8 gText_GetsAPokeBlockQuestion[]; +extern const u8 gText_WontEatAnymore[]; +extern const u8 gText_WasEnhanced[]; +extern const u8 gText_NothingChanged[]; + extern const u8 gText_Cool[]; extern const u8 gText_Beauty[]; extern const u8 gText_Cute[]; -- cgit v1.2.3 From 91fa5faf4acf617db0625992b2caf116e64f0888 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 23 Mar 2019 10:10:51 -0500 Subject: Match sub_8166564 --- include/menu_specialized.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/menu_specialized.h b/include/menu_specialized.h index afc89a149..2ad3bb8c8 100644 --- a/include/menu_specialized.h +++ b/include/menu_specialized.h @@ -39,7 +39,7 @@ void sub_81D20AC(struct UnknownStruct_81D1ED4 *arg0); void sub_81D2230(struct UnknownStruct_81D1ED4 *arg0); bool8 sub_81D20BC(struct UnknownStruct_81D1ED4 *arg0); void sub_81D3464(void *arg0); -void sub_81D3480(void *arg0, u8 arg1); +void sub_81D3480(void *arg0, u8 arg1, u8 arg2); void sub_81D2754(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 *arg1); void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 arg1[4][5], struct UnknownSubStruct_81D1ED4 arg2[4][5]); void MoveRelearnerPrintText(u8 *str); -- cgit v1.2.3 From 511ff2f20f14a1e74109416a0b0d704c8c2692fc Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 23 Mar 2019 10:41:09 -0500 Subject: Match sub_8166BEC and do some cleanup --- include/menu_specialized.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/menu_specialized.h b/include/menu_specialized.h index 51f54759d..70891772a 100644 --- a/include/menu_specialized.h +++ b/include/menu_specialized.h @@ -1,6 +1,7 @@ #ifndef GUARD_MENU_SPECIALIZED_H #define GUARD_MENU_SPECIALIZED_H +#include "sprite.h" #include "player_pc.h" #include "list_menu.h" #include "pokemon.h" @@ -37,9 +38,11 @@ void sub_81D1ED4(struct UnknownStruct_81D1ED4 *a0); void sub_81D2108(struct UnknownStruct_81D1ED4 *arg0); void sub_81D20AC(struct UnknownStruct_81D1ED4 *arg0); void sub_81D2230(struct UnknownStruct_81D1ED4 *arg0); +void sub_81D3520(struct Sprite **); bool8 sub_81D20BC(struct UnknownStruct_81D1ED4 *arg0); -void sub_81D3464(void *arg0); -void sub_81D3480(void *arg0, u8 arg1, u8 arg2); +void sub_81D354C(struct Sprite **); +void sub_81D3464(struct Sprite **arg0); +void sub_81D3480(struct Sprite **arg0, u8 arg1, u8 arg2); void sub_81D2754(u8 *arg0, struct UnknownSubStruct_81D1ED4 *arg1); void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 *arg1, struct UnknownSubStruct_81D1ED4 *arg2); void MoveRelearnerPrintText(u8 *str); -- cgit v1.2.3