Rebase + clean-up PR#115 with current project state (#134)

* improving readability also seemingly located the party healing function * readability * clean it up * Update pokemon.h * add function names Adds names to many unnamed functions for readability. Also adds names to a couple structs. * add function names * add struct names * more functions with human names * rename chatotcrydata * doxygen documentation * update box mon function ProcessBoxPokemonWithTrainerInfo is now UpdateBoxMonStatusAndTrainerInfo and all params are labeled * fixing formatting --------- Co-authored-by: Jack <[email protected]>
pret · Jan 29, 2024 · b7fffbf · b7fffbf
1 parent 2443a13
commit b7fffbf
Show file tree

Hide file tree

Showing 516 changed files with 3,148 additions and 3,134 deletions.
diff --git a/build.sh b/build.sh
@@ -9,4 +9,5 @@ fi
 # Set up env variable to show % of completion during ninja build
 export NINJA_STATUS="[%p %f/%t] "
 
+# Build the project
 ninja -C build "$target" "$@"
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h
@@ -204,7 +204,7 @@ enum PokemonDataParam {
     MON_DATA_SP_DEF,
     MON_DATA_170,
     MON_DATA_171,
-    MON_DATA_172,
+    MON_DATA_172, //!< possible data sanity check
     MON_DATA_173,
     MON_DATA_SPECIES_EGG,
     MON_DATA_COMBINED_IVS,

diff --git a/include/functypes/funcptr_0207E634.h b/include/functypes/funcptr_0207E634.h
@@ -3,6 +3,6 @@
 
 #include "struct_defs/struct_0207F248.h"
 
-typedef void (* UnkFuncPtr_0207E634)(UnkStruct_0207F248 *, int *);
+typedef void (* UnkFuncPtr_0207E634)(GameWindowLayout *, int *);
 
 #endif // POKEPLATINUM_FUNCPTR_0207E634_H
diff --git a/include/functypes/funcptr_0207F248.h b/include/functypes/funcptr_0207F248.h
@@ -1,6 +1,6 @@
 #ifndef POKEPLATINUM_FUNCPTR_0207F248_H
 #define POKEPLATINUM_FUNCPTR_0207F248_H
 
-typedef int (* UnkFuncPtr_0207F248)(void *);
+typedef int (* GenericFunctionPtr)(void *);
 
 #endif // POKEPLATINUM_FUNCPTR_0207F248_H
diff --git a/include/functypes/struct_0207F248_1.h b/include/functypes/struct_0207F248_1.h
@@ -1,6 +1,6 @@
 #ifndef POKEPLATINUM_STRUCT_0207F248_1_H
 #define POKEPLATINUM_STRUCT_0207F248_1_H
 
-typedef int (* UnkStruct_0207F248_1)(void *);
+typedef int (* GameWindowLayout_1)(void *);
 
 #endif // POKEPLATINUM_STRUCT_0207F248_1_H
diff --git a/include/overlay005/ov5_021D2F14.h b/include/overlay005/ov5_021D2F14.h
@@ -12,7 +12,7 @@
 
 void ov5_021D2F14(UnkStruct_ov5_021D30A8 * param0, const UnkStruct_ov7_0224F2EC * param1, u32 param2, u32 param3);
 void ov5_021D30A8(UnkStruct_ov5_021D30A8 * param0);
-UnkStruct_02022550 * ov5_021D3104(UnkStruct_ov5_021D30A8 * param0, const UnkStruct_ov7_0224F358 * param1);
+GraphicElementData * ov5_021D3104(UnkStruct_ov5_021D30A8 * param0, const UnkStruct_ov7_0224F358 * param1);
 void ov5_021D3190(UnkStruct_ov5_021D30A8 * param0, UnkStruct_ov104_02241308 * param1, u32 param2, u32 param3);
 void ov5_021D3270(UnkStruct_ov5_021D30A8 * param0, int param1, int param2, int param3, int param4, int param5, int param6);
 void ov5_021D32E8(UnkStruct_ov5_021D30A8 * param0, NARC * param1, int param2, int param3, int param4, int param5, int param6);

diff --git a/include/overlay005/ov5_021DDBE8.h b/include/overlay005/ov5_021DDBE8.h
@@ -51,8 +51,8 @@ void ov5_021DE47C(UnkStruct_ov5_021DE47C * param0, int param1, int param2);
 void ov5_021DE4AC(UnkStruct_ov5_021DE47C * param0);
 void ov5_021DE4CC(NARC * param0, UnkStruct_ov5_021DE47C * param1, UnkStruct_ov5_021DE5A4 * param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
 void ov5_021DE5A4(UnkStruct_ov5_021DE47C * param0, UnkStruct_ov5_021DE5A4 * param1);
-void ov5_021DE5D0(UnkStruct_02022550 * param0, u32 param1, u32 param2, u8 param3, u16 param4);
-UnkStruct_02022550 * ov5_021DE62C(UnkStruct_ov5_021DE47C * param0, UnkStruct_ov5_021DE5A4 * param1, fx32 param2, fx32 param3, fx32 param4, int param5);
+void ov5_021DE5D0(GraphicElementData * param0, u32 param1, u32 param2, u8 param3, u16 param4);
+GraphicElementData * ov5_021DE62C(UnkStruct_ov5_021DE47C * param0, UnkStruct_ov5_021DE5A4 * param1, fx32 param2, fx32 param3, fx32 param4, int param5);
 VecFx32 ov5_021DE660(fx32 param0, fx32 param1, fx32 param2);
 UnkStruct_ov5_021DE6BC * ov5_021DE6A4(u32 param0);
 void ov5_021DE6BC(UnkStruct_ov5_021DE6BC * param0);

diff --git a/include/overlay005/struct_ov5_021D30A8.h b/include/overlay005/struct_ov5_021D30A8.h
@@ -8,7 +8,7 @@
 #include "struct_decls/struct_020218BC_decl.h"
 
 typedef struct {
-    UnkStruct_020218BC * unk_00;
+    GraphicElementManager * unk_00;
     UnkStruct_0200C738 unk_04;
     UnkStruct_02009508 * unk_190;
     UnkStruct_02009714 * unk_194[6];

diff --git a/include/overlay005/struct_ov5_021DE47C.h b/include/overlay005/struct_ov5_021DE47C.h
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_020218BC_decl.h"
 
 typedef struct {
-    UnkStruct_020218BC * unk_00;
+    GraphicElementManager * unk_00;
     UnkStruct_0200C738 unk_04;
     UnkStruct_02009714 * unk_190[4];
 } UnkStruct_ov5_021DE47C;

diff --git a/include/overlay006/battle_params.h b/include/overlay006/battle_params.h
@@ -34,7 +34,7 @@ typedef struct {
     ChatotCry * unk_F0[4];
     UnkStruct_02056B24 * unk_100;
     UnkStruct_0202C878 * unk_104;
-    UnkStruct_020279FC * unk_108;
+    AnimationControlFlags * unk_108;
     UnkStruct_0206D140 * unk_10C;
     BattleParams_sub1 unk_110;
     UnkStruct_0202CD88 * unk_11C;

diff --git a/include/overlay006/struct_ov6_02246254.h b/include/overlay006/struct_ov6_02246254.h
@@ -11,7 +11,7 @@ typedef struct {
     const TrainerInfo * unk_08;
     int unk_0C;
     int unk_10;
-    const UnkStruct_020279FC * unk_14;
+    const AnimationControlFlags * unk_14;
 } UnkStruct_ov6_02246254;
 
 #endif // POKEPLATINUM_STRUCT_OV6_02246254_H
diff --git a/include/overlay007/struct_ov7_0224D008.h b/include/overlay007/struct_ov7_0224D008.h
@@ -26,18 +26,18 @@ typedef struct {
     Window unk_08[6];
     Window unk_68;
     UnkStruct_0200112C * unk_78;
-    UnkStruct_02013A04 * unk_7C;
-    UnkStruct_02001AF4 * unk_80;
-    UnkStruct_02013A04 * unk_84;
+    ResourceMetadata * unk_7C;
+    UIControlData * unk_80;
+    ResourceMetadata * unk_84;
     MessageLoader * unk_88;
     UnkStruct_0200B358 * unk_8C;
     UnkStruct_020203AC * unk_90;
     UnkStruct_ov5_021D30A8 unk_94;
-    UnkStruct_02022550 * unk_25C[4];
+    GraphicElementData * unk_25C[4];
     u16 unk_26C[2];
     TrainerInfo * unk_270;
     void * unk_274;
-    UnkStruct_020279FC * unk_278;
+    AnimationControlFlags * unk_278;
     UnkStruct_0202B628 * unk_27C;
     UnkStruct_0202CD88 * unk_280;
     SaveData * unk_284;

diff --git a/include/overlay012/funcptr_ov12_02239E64_1.h b/include/overlay012/funcptr_ov12_02239E64_1.h
@@ -6,6 +6,6 @@
 #include "struct_decls/struct_02022550_decl.h"
 #include "overlay012/struct_ov12_0221FCDC_decl.h"
 
-typedef void (* UnkFuncPtr_ov12_02239E64_1)(UnkStruct_ov12_0221FCDC *, UnkStruct_0200C6E4 *, UnkStruct_0200C704 *, UnkStruct_02022550 *);
+typedef void (* UnkFuncPtr_ov12_02239E64_1)(UnkStruct_ov12_0221FCDC *, CellTransferStateData *, AnimationResourceCollection *, GraphicElementData *);
 
 #endif // POKEPLATINUM_FUNCPTR_OV12_02239E64_1_H
diff --git a/include/overlay012/funcptr_ov12_02239E68.h b/include/overlay012/funcptr_ov12_02239E68.h
@@ -6,6 +6,6 @@
 #include "struct_decls/cell_actor_data.h"
 #include "overlay012/struct_ov12_0221FCDC_decl.h"
 
-typedef void (* UnkFuncPtr_ov12_02239E68)(UnkStruct_ov12_0221FCDC *, UnkStruct_0200C6E4 *, UnkStruct_0200C704 *, CellActorData *);
+typedef void (* UnkFuncPtr_ov12_02239E68)(UnkStruct_ov12_0221FCDC *, CellTransferStateData *, AnimationResourceCollection *, CellActorData *);
 
 #endif // POKEPLATINUM_FUNCPTR_OV12_02239E68_H
diff --git a/include/overlay012/ov12_0221FC20.h b/include/overlay012/ov12_0221FC20.h
@@ -46,9 +46,9 @@ BGL * ov12_02220278(UnkStruct_ov12_0221FCDC * param0);
 s32 ov12_02220280(UnkStruct_ov12_0221FCDC * param0, int param1);
 CellActorData * ov12_02220298(UnkStruct_ov12_0221FCDC * param0, int param1);
 CellActorData * ov12_022202C0(UnkStruct_ov12_0221FCDC * param0, int param1);
-UnkStruct_0200C704 * ov12_022202EC(UnkStruct_ov12_0221FCDC * param0);
-UnkStruct_0200C704 * ov12_02220300(UnkStruct_ov12_0221FCDC * param0);
-UnkStruct_0200C6E4 * ov12_02220308(UnkStruct_ov12_0221FCDC * param0);
+AnimationResourceCollection * ov12_022202EC(UnkStruct_ov12_0221FCDC * param0);
+AnimationResourceCollection * ov12_02220300(UnkStruct_ov12_0221FCDC * param0);
+CellTransferStateData * ov12_02220308(UnkStruct_ov12_0221FCDC * param0);
 void ov12_02220474(void);
 int ov12_02220540(UnkStruct_ov12_0221FCDC * param0, int param1);
 void ov12_02220590(UnkStruct_ov12_0221FCDC * param0, UnkStruct_ov12_022380DC * param1, int param2);

diff --git a/include/overlay012/ov12_022269C0.h b/include/overlay012/ov12_022269C0.h
@@ -10,6 +10,6 @@ void ov12_022269C0(UnkStruct_ov12_0221FCDC * param0);
 void ov12_022269EC(UnkStruct_ov12_0221FCDC * param0);
 void ov12_02226A3C(UnkStruct_ov12_0221FCDC * param0);
 void ov12_02226A88(UnkStruct_ov12_0221FCDC * param0);
-void ov12_02226B1C(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_02226B1C(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 
 #endif // POKEPLATINUM_OV12_022269C0_H
diff --git a/include/overlay012/ov12_02226B84.h b/include/overlay012/ov12_02226B84.h
@@ -11,7 +11,7 @@ void ov12_02226EB0(UnkStruct_ov12_0221FCDC * param0);
 void ov12_022271D8(UnkStruct_ov12_0221FCDC * param0);
 void ov12_02227408(UnkStruct_ov12_0221FCDC * param0);
 void ov12_02227534(UnkStruct_ov12_0221FCDC * param0);
-void ov12_0222777C(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_0222777C(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 void ov12_02227828(UnkStruct_ov12_0221FCDC * param0);
 void ov12_0222797C(UnkStruct_ov12_0221FCDC * param0);
 void ov12_02227CBC(UnkStruct_ov12_0221FCDC * param0);
@@ -38,10 +38,10 @@ void ov12_02229B28(UnkStruct_ov12_0221FCDC * param0);
 void ov12_02229C5C(UnkStruct_ov12_0221FCDC * param0);
 void ov12_02229E54(UnkStruct_ov12_0221FCDC * param0);
 void ov12_0222A00C(UnkStruct_ov12_0221FCDC * param0);
-void ov12_0222A1AC(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_0222A34C(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_0222A410(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_0222A5C0(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_0222A1AC(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_0222A34C(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_0222A410(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_0222A5C0(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 void ov12_0222A604(UnkStruct_ov12_0221FCDC * param0);
 void ov12_0222A8F4(UnkStruct_ov12_0221FCDC * param0);
 void ov12_0222AB50(UnkStruct_ov12_0221FCDC * param0);

diff --git a/include/overlay012/ov12_0222AC70.h b/include/overlay012/ov12_0222AC70.h
@@ -6,7 +6,7 @@
 #include "struct_decls/cell_actor_data.h"
 #include "overlay012/struct_ov12_0221FCDC_decl.h"
 
-void ov12_0222AE68(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_0222AE68(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 void ov12_0222B194(UnkStruct_ov12_0221FCDC * param0);
 void ov12_0222B45C(UnkStruct_ov12_0221FCDC * param0);
 void ov12_0222B68C(UnkStruct_ov12_0221FCDC * param0);
@@ -22,8 +22,8 @@ void ov12_0222C6D4(UnkStruct_ov12_0221FCDC * param0);
 void ov12_0222C8F8(UnkStruct_ov12_0221FCDC * param0);
 void ov12_0222CA2C(UnkStruct_ov12_0221FCDC * param0);
 void ov12_0222CB90(UnkStruct_ov12_0221FCDC * param0);
-void ov12_0222CC54(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_0222CC54(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 void ov12_0222CFA0(UnkStruct_ov12_0221FCDC * param0);
-void ov12_0222D56C(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_0222D56C(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 
 #endif // POKEPLATINUM_OV12_0222AC70_H
diff --git a/include/overlay012/ov12_0222D6B0.h b/include/overlay012/ov12_0222D6B0.h
@@ -6,12 +6,12 @@
 #include "struct_decls/cell_actor_data.h"
 #include "overlay012/struct_ov12_0221FCDC_decl.h"
 
-void ov12_0222D7C0(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_0222DB60(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_0222DEFC(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_0222D7C0(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_0222DB60(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_0222DEFC(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 void ov12_0222E1A8(UnkStruct_ov12_0221FCDC * param0);
 void ov12_0222E248(CellActorData * param0);
-void ov12_0222E2F8(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_0222E61C(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_0222E2F8(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_0222E61C(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 
 #endif // POKEPLATINUM_OV12_0222D6B0_H
diff --git a/include/overlay012/ov12_0222E91C.h b/include/overlay012/ov12_0222E91C.h
@@ -7,7 +7,7 @@
 #include "overlay012/struct_ov12_0221FCDC_decl.h"
 
 void ov12_0222EAA0(UnkStruct_ov12_0221FCDC * param0);
-void ov12_0222EC90(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_0222EC90(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 void ov12_0222EFB0(UnkStruct_ov12_0221FCDC * param0);
 void ov12_0222F2F8(UnkStruct_ov12_0221FCDC * param0);
 void ov12_0222F5EC(UnkStruct_ov12_0221FCDC * param0);

diff --git a/include/overlay012/ov12_0222F700.h b/include/overlay012/ov12_0222F700.h
@@ -8,33 +8,33 @@
 
 void ov12_0222F770(UnkStruct_ov12_0221FCDC * param0);
 void ov12_0222F9E4(UnkStruct_ov12_0221FCDC * param0);
-void ov12_0222FE30(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_0222FE30(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 void ov12_022300C4(UnkStruct_ov12_0221FCDC * param0);
 void ov12_022303D0(UnkStruct_ov12_0221FCDC * param0);
 void ov12_02230754(UnkStruct_ov12_0221FCDC * param0);
 void ov12_02230804(UnkStruct_ov12_0221FCDC * param0);
 void ov12_02230A8C(UnkStruct_ov12_0221FCDC * param0);
-void ov12_02230CEC(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_02231010(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_022312A4(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_02230CEC(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_02231010(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_022312A4(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 void ov12_02231444(UnkStruct_ov12_0221FCDC * param0);
-void ov12_02231650(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_02231950(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_02231C1C(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_02231650(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_02231950(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_02231C1C(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 void ov12_02231E7C(UnkStruct_ov12_0221FCDC * param0);
 void ov12_02232024(UnkStruct_ov12_0221FCDC * param0);
-void ov12_02232378(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_02232378(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 void ov12_0223249C(UnkStruct_ov12_0221FCDC * param0);
 void ov12_022326AC(UnkStruct_ov12_0221FCDC * param0);
-void ov12_022329E0(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_02232CA8(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_022329E0(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_02232CA8(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 void ov12_02233178(UnkStruct_ov12_0221FCDC * param0);
-void ov12_02233454(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_02233734(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_022339C4(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_02233454(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_02233734(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_022339C4(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 void ov12_02233CD4(UnkStruct_ov12_0221FCDC * param0);
 void ov12_02233F30(UnkStruct_ov12_0221FCDC * param0);
-void ov12_02234008(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_02234008(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 void ov12_02234214(UnkStruct_ov12_0221FCDC * param0);
 void ov12_022342C4(UnkStruct_ov12_0221FCDC * param0);
 void ov12_022344D0(UnkStruct_ov12_0221FCDC * param0);

diff --git a/include/overlay012/ov12_022346A4.h b/include/overlay012/ov12_022346A4.h
@@ -6,9 +6,9 @@
 #include "struct_decls/cell_actor_data.h"
 #include "overlay012/struct_ov12_0221FCDC_decl.h"
 
-void ov12_022346A4(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_022348C8(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_02234A10(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_02234D98(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_022346A4(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_022348C8(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_02234A10(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_02234D98(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 
 #endif // POKEPLATINUM_OV12_022346A4_H
diff --git a/include/overlay012/struct_ov12_02223764_sub1.h b/include/overlay012/struct_ov12_02223764_sub1.h
@@ -6,8 +6,8 @@
 #include "struct_decls/struct_0200C704_decl.h"
 
 typedef struct {
-    UnkStruct_0200C6E4 * unk_00;
-    UnkStruct_0200C704 * unk_04;
+    CellTransferStateData * unk_00;
+    AnimationResourceCollection * unk_04;
     PaletteSys * unk_08;
 } UnkStruct_ov12_02223764_sub1;
 

diff --git a/include/overlay012/struct_ov12_0223595C.h b/include/overlay012/struct_ov12_0223595C.h
@@ -13,9 +13,9 @@ typedef struct {
     u8 unk_02;
     u8 unk_03;
     UnkStruct_ov12_0221FCDC * unk_04;
-    UnkStruct_0200C6E4 * unk_08;
-    UnkStruct_0200C704 * unk_0C;
-    UnkStruct_0200C704 * unk_10;
+    CellTransferStateData * unk_08;
+    AnimationResourceCollection * unk_0C;
+    AnimationResourceCollection * unk_10;
     BGL * unk_14;
     PaletteSys * unk_18;
 } UnkStruct_ov12_0223595C;

diff --git a/include/overlay012/struct_ov12_02237728.h b/include/overlay012/struct_ov12_02237728.h
@@ -13,7 +13,7 @@ typedef struct BallThrow {
     int ballID;
     int bgPrio;
     int surface;
-    UnkStruct_0200C6E4 *cellActorSys;
+    CellTransferStateData *cellActorSys;
     PaletteSys *paletteSys;
     BattleSystem *battleSys;
 } BallThrow;