From 76510d58bb66a2e0fb0909330ac0d3ac97c083e1 Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Wed, 19 Dec 2018 08:53:43 -0800 Subject: Matched up to sub_80DBF68, sub_80DBF90 WIP. --- include/contest.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'include/contest.h') diff --git a/include/contest.h b/include/contest.h index 73ebb79fa..4ab4d350c 100644 --- a/include/contest.h +++ b/include/contest.h @@ -385,6 +385,14 @@ struct UnknownContestStruct4 u8 unk2_2:1; }; +struct UnknownContestStruct6 +{ + s32 unk0; + s32 unk4; + s32 unk8; + s32 unkC; +}; + struct ContestResourcesField1C { u8 filler_00[0x40]; -- cgit v1.2.3 From 284751e7610f5e9cf266bd0a8bb148464753afa1 Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Sat, 5 Jan 2019 23:02:28 -0800 Subject: Decompile through ClearContestWinnerPicsInContestHall, 10 NONMATCHINGs present. --- include/contest.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'include/contest.h') diff --git a/include/contest.h b/include/contest.h index 4ab4d350c..65db7b0bc 100644 --- a/include/contest.h +++ b/include/contest.h @@ -429,9 +429,13 @@ extern struct ContestResources *gContestResources; #define shared19328 (*gContestResources->field_10) #define shared19338 (*gContestResources->field_14) + + #define shared15800 (gHeap + 0x18000) +#define shared16800 (gHeap + 0x19000) #define shared18000 (*(struct Shared18000 *)(gHeap + 0x1a000)) + extern u32 gContestRngValue; extern u8 gUnknown_02039F26[4]; @@ -445,7 +449,7 @@ bool8 sub_80DE1E8(u8 a); void SetStartledString(u8 a, u8 b); s8 Contest_GetMoveExcitement(u16); u8 sub_80DAE0C(struct Pokemon *); -void sub_80DEDA8(u8); +bool8 sub_80DEDA8(u8); void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame); void sub_80DB09C(u8 contestCategory); void sub_80DCE58(u8); -- cgit v1.2.3