Move Contest struct into unk_020933F8.h

CharlesFolz4 · CharlesFolz4 · commit a554a435e798 · 2026-03-03T22:31:44.000-05:00
diff --git a/include/overlay006/ov6_022489E4.h b/include/overlay006/ov6_022489E4.h
@@ -1,14 +1,14 @@
 #ifndef POKEPLATINUM_OV6_022489E4_H
 #define POKEPLATINUM_OV6_022489E4_H
 
-#include "struct_defs/contest.h"
 #include "struct_defs/struct_020954F0.h"
 
 #include "overlay006/struct_ov6_02248BE8.h"
 #include "overlay006/struct_ov6_02248DD8.h"
 
 #include "pokemon.h"
 #include "string_gf.h"
+#include "unk_020933F8.h"
 
 void ov6_022489E4(int param0, int param1, void *param2, void *param3);
 BOOL ov6_02248A64(Contest *param0);
diff --git a/include/overlay017/ov17_0223F118.h b/include/overlay017/ov17_0223F118.h
@@ -2,7 +2,6 @@
 #define POKEPLATINUM_OV17_0223F118_H
 
 #include "struct_decls/struct_02012744_decl.h"
-#include "struct_defs/contest.h"
 
 #include "overlay017/struct_ov17_0223F2E4.h"
 #include "overlay017/struct_ov17_0223F6E8.h"
@@ -14,6 +13,7 @@
 #include "sprite_system.h"
 #include "string_gf.h"
 #include "text.h"
+#include "unk_020933F8.h"
 
 G3DPipelineBuffers *ov17_0223F140(enum HeapID heapID);
 void ov17_0223F1E0(G3DPipelineBuffers *param0);
diff --git a/include/overlay017/ov17_0223F7E4.h b/include/overlay017/ov17_0223F7E4.h
@@ -1,13 +1,12 @@
 #ifndef POKEPLATINUM_OV17_0223F7E4_H
 #define POKEPLATINUM_OV17_0223F7E4_H
 
-#include "struct_defs/contest.h"
-
 #include "overlay017/struct_ov17_0223F7E4_decl.h"
 #include "overlay017/struct_ov17_0223F88C.h"
 #include "overlay017/struct_ov17_022472F8.h"
 
 #include "bg_window.h"
+#include "unk_020933F8.h"
 
 void ov17_0223F80C(BgConfig *param0);
 void ov17_0223F864(BgConfig *param0);
diff --git a/include/overlay017/ov17_022413D8.h b/include/overlay017/ov17_022413D8.h
@@ -4,8 +4,6 @@
 #include "generated/pokemon_contest_ranks.h"
 #include "generated/pokemon_contest_types.h"
 
-#include "struct_defs/contest.h"
-
 #include "overlay017/struct_ov17_0223F88C.h"
 #include "overlay017/struct_ov17_0224145C.h"
 #include "overlay017/struct_ov17_0224365C.h"
@@ -17,6 +15,7 @@
 #include "narc.h"
 #include "palette.h"
 #include "sprite_system.h"
+#include "unk_020933F8.h"
 
 enum ActingCompetitionMessagesID {
     ACTING_COMPETITION_MESSAGE_NONE,
diff --git a/include/overlay017/ov17_022492DC.h b/include/overlay017/ov17_022492DC.h
@@ -1,12 +1,11 @@
 #ifndef POKEPLATINUM_OV17_022492DC_H
 #define POKEPLATINUM_OV17_022492DC_H
 
-#include "struct_defs/contest.h"
-
 #include "overlay017/struct_ov17_022492DC_decl.h"
 #include "overlay017/struct_ov17_0224A1EC.h"
 
 #include "bg_window.h"
+#include "unk_020933F8.h"
 
 void ov17_02249300(BgConfig *param0);
 void ov17_02249358(BgConfig *param0);
diff --git a/include/overlay017/ov17_02250744.h b/include/overlay017/ov17_02250744.h
@@ -1,13 +1,12 @@
 #ifndef POKEPLATINUM_OV17_02250744_H
 #define POKEPLATINUM_OV17_02250744_H
 
-#include "struct_defs/contest.h"
-
 #include "overlay017/struct_ov17_0224FCA0.h"
 #include "overlay017/struct_ov17_022507C4.h"
 #include "overlay017/struct_ov17_022508E4.h"
 
 #include "narc.h"
+#include "unk_020933F8.h"
 
 enum ContestAnnouncerMessagesIDs {
     CONTEST_ANNOUNCER_MESSAGE_NONE,
diff --git a/include/overlay017/struct_ov17_02246F24.h b/include/overlay017/struct_ov17_02246F24.h
@@ -1,8 +1,6 @@
 #ifndef POKEPLATINUM_STRUCT_OV17_02246F24_H
 #define POKEPLATINUM_STRUCT_OV17_02246F24_H
 
-#include "struct_defs/contest.h"
-
 #include "overlay017/struct_ov17_0223BCE8.h"
 #include "overlay017/struct_ov17_0223F88C.h"
 #include "overlay017/struct_ov17_02246F24_sub1.h"
@@ -12,6 +10,7 @@
 
 #include "g3d_pipeline.h"
 #include "sys_task_manager.h"
+#include "unk_020933F8.h"
 
 typedef struct {
     Contest *unk_00;
diff --git a/include/overlay017/struct_ov17_02247A48.h b/include/overlay017/struct_ov17_02247A48.h
@@ -3,8 +3,6 @@
 
 #include "constants/contests.h"
 
-#include "struct_defs/contest.h"
-
 #include "overlay017/struct_ov17_0223D60C.h"
 #include "overlay017/struct_ov17_022476F8.h"
 #include "overlay017/struct_ov17_02247A48_sub1.h"
@@ -15,6 +13,7 @@
 
 #include "g3d_pipeline.h"
 #include "sys_task_manager.h"
+#include "unk_020933F8.h"
 
 typedef struct {
     Contest *unk_00;
diff --git a/include/overlay017/struct_ov17_0224DF54.h b/include/overlay017/struct_ov17_0224DF54.h
@@ -1,8 +1,6 @@
 #ifndef POKEPLATINUM_STRUCT_OV17_0224DF54_H
 #define POKEPLATINUM_STRUCT_OV17_0224DF54_H
 
-#include "struct_defs/contest.h"
-
 #include "overlay017/struct_ov17_0223E838.h"
 #include "overlay017/struct_ov17_0224A1EC.h"
 #include "overlay017/struct_ov17_0224B5C8.h"
@@ -18,6 +16,7 @@
 #include "g3d_pipeline.h"
 #include "particle_system.h"
 #include "sys_task_manager.h"
+#include "unk_020933F8.h"
 
 typedef struct UnkStruct_ov17_0224DF54_t {
     Contest *unk_00;
diff --git a/include/overlay017/struct_ov17_0224FCA0.h b/include/overlay017/struct_ov17_0224FCA0.h
@@ -1,8 +1,6 @@
 #ifndef POKEPLATINUM_STRUCT_OV17_0224FCA0_H
 #define POKEPLATINUM_STRUCT_OV17_0224FCA0_H
 
-#include "struct_defs/contest.h"
-
 #include "overlay017/struct_ov17_0224F30C.h"
 #include "overlay017/struct_ov17_0224FCA0_sub1.h"
 #include "overlay017/struct_ov17_0224FCA0_sub2.h"
@@ -12,6 +10,7 @@
 
 #include "g3d_pipeline.h"
 #include "sys_task_manager.h"
+#include "unk_020933F8.h"
 
 typedef struct {
     Contest *unk_00;
diff --git a/include/struct_defs/contest.h b/include/struct_defs/contest.h
diff --git a/include/unk_020933F8.h b/include/unk_020933F8.h
@@ -1,13 +1,56 @@
 #ifndef POKEPLATINUM_UNK_020933F8_H
 #define POKEPLATINUM_UNK_020933F8_H
 
-#include "struct_defs/contest.h"
+#include "struct_defs/contest_camera_flash_task.h"
 #include "struct_defs/contest_player_mon_dto.h"
+#include "struct_defs/image_clips.h"
+#include "struct_defs/struct_02095C48_sub1.h"
+#include "struct_defs/struct_02095C60.h"
+#include "struct_defs/visual_competition_app_args.h"
 
 #include "field_task.h"
+#include "game_options.h"
 #include "journal.h"
+#include "party.h"
+#include "pokemon.h"
 #include "savedata.h"
 #include "string_template.h"
+#include "sys_task_manager.h"
+#include "trainer_info.h"
+#include "unk_020933F8.h"
+
+typedef struct Contest {
+    UnkStruct_02095C48_sub1 unk_00;
+    Party *party;
+    void *chatotCry[CONTEST_NUM_PARTICIPANTS];
+    void *unk_150;
+    u8 unk_154;
+    u8 isLinkContest;
+    u8 unk_156[4];
+    u8 linkState;
+    u8 unk_15B;
+    int unk_15C;
+    int padding_160;
+    SysTask *commTask;
+    u8 unk_168[4][256];
+    u8 unk_568;
+    u8 unk_569[1024];
+    u8 unk_969[4][1024];
+    u8 padding_1969[3];
+    const Options *options;
+    SaveData *saveData;
+    Pokemon *playerMon;
+    const TrainerInfo *trainerInfo;
+    u8 monPartySlot;
+    u8 isGameCompleted;
+    u8 isNatDexObtained;
+    u8 padding_197F;
+    ImageClips *imageClips;
+    UnkStruct_02095C60 unk_1984;
+    VisualCompetitionAppArgs *visualCompetitionAppArgs;
+    ContestCameraFlashTask *cameraFlashTask;
+    u32 rngSeed;
+} Contest;
 
 void FieldTask_InitRunContestTask(FieldTask *fieldTask, Contest *contest);
 Contest *Contest_Init(const PlayerMonContestDTO *playerMonContestDTO);
diff --git a/include/unk_02094EDC.h b/include/unk_02094EDC.h
@@ -5,13 +5,12 @@
 #include "generated/pokemon_contest_ranks.h"
 #include "generated/pokemon_contest_types.h"
 
-#include "struct_defs/contest.h"
-
 #include "battle/pokemon_sprite_data.h"
 #include "overlay006/struct_ov6_02248BE8.h"
 
 #include "pokemon.h"
 #include "pokemon_sprite.h"
+#include "unk_020933F8.h"
 
 BOOL sub_02094EDC(Contest *contest);
 void sub_02094F04(Contest *contest, enum HeapID heapID, int param2, enum PokemonContestType contestType, enum PokemonContestRank contestRank, int competitionType, BOOL isGameCompleted, BOOL isNatDexObtained);
diff --git a/include/unk_02095AF0.h b/include/unk_02095AF0.h
@@ -1,10 +1,11 @@
 #ifndef POKEPLATINUM_UNK_02095AF0_H
 #define POKEPLATINUM_UNK_02095AF0_H
 
-#include "struct_defs/contest.h"
 #include "struct_defs/struct_02029C88.h"
 #include "struct_defs/struct_02095C60.h"
 
+#include "unk_020933F8.h"
+
 void sub_02095AF0(void *param0);
 BOOL sub_02095B5C(Contest *param0, int param1, const UnkStruct_02029C88 *param2);
 BOOL sub_02095BEC(Contest *param0, UnkStruct_02029C88 **param1);
diff --git a/src/overlay006/ov6_022489E4.c b/src/overlay006/ov6_022489E4.c
@@ -3,7 +3,6 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_defs/contest.h"
 #include "struct_defs/struct_020954F0.h"
 
 #include "overlay006/struct_ov6_02248BE8.h"
@@ -14,6 +13,7 @@
 #include "heap.h"
 #include "pokemon.h"
 #include "string_gf.h"
+#include "unk_020933F8.h"
 
 typedef struct {
     u8 unk_00;
diff --git a/src/overlay017/ov17_0223F118.c b/src/overlay017/ov17_0223F118.c
@@ -9,7 +9,6 @@
 
 #include "struct_decls/font_oam.h"
 #include "struct_decls/struct_02012744_decl.h"
-#include "struct_defs/contest.h"
 #include "struct_defs/struct_020127E8.h"
 
 #include "overlay017/ov17_02252A70.h"
@@ -35,6 +34,7 @@
 #include "sys_task_manager.h"
 #include "text.h"
 #include "unk_02012744.h"
+#include "unk_020933F8.h"
 
 FS_EXTERN_OVERLAY(overlay11);
 FS_EXTERN_OVERLAY(battle_anim);
diff --git a/src/overlay017/ov17_0223F7E4.c b/src/overlay017/ov17_0223F7E4.c
@@ -5,7 +5,6 @@
 
 #include "struct_decls/font_oam.h"
 #include "struct_decls/struct_02012744_decl.h"
-#include "struct_defs/contest.h"
 #include "struct_defs/struct_020127E8.h"
 
 #include "overlay017/ov17_0223F118.h"
@@ -38,6 +37,7 @@
 #include "text.h"
 #include "touch_screen.h"
 #include "unk_02012744.h"
+#include "unk_020933F8.h"
 #include "unk_02094EDC.h"
 
 #include "res/text/bank/contest_text.h"
diff --git a/src/overlay017/ov17_022413D8.c b/src/overlay017/ov17_022413D8.c
@@ -3,7 +3,6 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_defs/contest.h"
 #include "struct_defs/struct_020954F0.h"
 
 #include "battle_anim/is_form_symmetrical.h"
@@ -42,6 +41,7 @@
 #include "text.h"
 #include "unk_02012744.h"
 #include "unk_0208C098.h"
+#include "unk_020933F8.h"
 #include "unk_02094EDC.h"
 
 #include "res/text/bank/contest_text.h"
diff --git a/src/overlay017/ov17_022492DC.c b/src/overlay017/ov17_022492DC.c
@@ -5,7 +5,6 @@
 
 #include "struct_decls/font_oam.h"
 #include "struct_decls/struct_02012744_decl.h"
-#include "struct_defs/contest.h"
 #include "struct_defs/struct_020127E8.h"
 
 #include "overlay017/struct_ov17_0224A1EC.h"
@@ -25,6 +24,7 @@
 #include "text.h"
 #include "touch_screen.h"
 #include "unk_02012744.h"
+#include "unk_020933F8.h"
 #include "unk_02094EDC.h"
 
 #include "res/text/bank/contest_dance_competition.h"
diff --git a/src/overlay017/ov17_02250744.c b/src/overlay017/ov17_02250744.c
@@ -5,8 +5,6 @@
 
 #include "constants/narc.h"
 
-#include "struct_defs/contest.h"
-
 #include "overlay017/ov17_0223F118.h"
 #include "overlay017/struct_ov17_0224FCA0.h"
 #include "overlay017/struct_ov17_022507C4.h"
diff --git a/src/overlay017/ov17_02252CEC.c b/src/overlay017/ov17_02252CEC.c
diff --git a/src/unk_020933F8.c b/src/unk_020933F8.c
diff --git a/src/unk_02094EDC.c b/src/unk_02094EDC.c
diff --git a/src/unk_02095AF0.c b/src/unk_02095AF0.c
