UnkStruct_0203CDB0 -> FieldSystem

2026-09-29 21:08:22 -05:00 · 2024-04-01 12:44:02 -04:00
parent a89a1a211b
commit 360517a451
342 changed files with 2804 additions and 2804 deletions
--- a/include/functypes/funcptr_020EC57C.h
+++ b/include/functypes/funcptr_020EC57C.h
@@ -3,6 +3,6 @@

 #include "struct_decls/struct_0203CDB0_decl.h"

-typedef void (* UnkFuncPtr_020EC57C)(UnkStruct_0203CDB0 *);
+typedef void (* UnkFuncPtr_020EC57C)(FieldSystem *);

 #endif // POKEPLATINUM_FUNCPTR_020EC57C_H
--- a/include/functypes/funcptr_020EF718.h
+++ b/include/functypes/funcptr_020EF718.h
@@ -3,6 +3,6 @@

 #include "struct_decls/struct_0203CDB0_decl.h"

-typedef void (* UnkFuncPtr_020EF718)(UnkStruct_0203CDB0 *);
+typedef void (* UnkFuncPtr_020EF718)(FieldSystem *);

 #endif // POKEPLATINUM_FUNCPTR_020EF718_H
--- a/include/functypes/funcptr_020EF744.h
+++ b/include/functypes/funcptr_020EF744.h
@@ -3,6 +3,6 @@

 #include "struct_decls/struct_0203CDB0_decl.h"

-typedef void (* UnkFuncPtr_020EF744)(UnkStruct_0203CDB0 *);
+typedef void (* UnkFuncPtr_020EF744)(FieldSystem *);

 #endif // POKEPLATINUM_FUNCPTR_020EF744_H
--- a/include/functypes/funcptr_020EF770.h
+++ b/include/functypes/funcptr_020EF770.h
@@ -3,6 +3,6 @@

 #include "struct_decls/struct_0203CDB0_decl.h"

-typedef BOOL (* UnkFuncPtr_020EF770)(UnkStruct_0203CDB0 *, const int, const int, const fx32, BOOL *);
+typedef BOOL (* UnkFuncPtr_020EF770)(FieldSystem *, const int, const int, const fx32, BOOL *);

 #endif // POKEPLATINUM_FUNCPTR_020EF770_H
--- a/include/inlines.h
+++ b/include/inlines.h
@@ -131,7 +131,7 @@ static inline void inline_ov61_0222C3B0_sub (SysTask * param0, void * param1)
    }
 }

-static inline void inline_ov47_0225621C_sub (UnkStruct_0203CDB0 * param0, int * param1, int * param2)
+static inline void inline_ov47_0225621C_sub (FieldSystem * param0, int * param1, int * param2)
 {
    UnkStruct_0203A790 * v0 = sub_0203A790(param0->unk_0C);
    UnkStruct_02049FA8 * v1 = sub_0203A72C(v0);
@@ -145,7 +145,7 @@ static inline void inline_ov47_0225621C_sub (UnkStruct_0203CDB0 * param0, int *
    }
 }

-static inline void inline_ov47_0225621C (UnkStruct_0203CDB0 * param0, int * param1, int * param2)
+static inline void inline_ov47_0225621C (FieldSystem * param0, int * param1, int * param2)
 {
    inline_ov47_0225621C_sub(param0, param1, param2);
    *param1 /= 32;
--- a/include/overlay005/ov5_021D0D80.h
+++ b/include/overlay005/ov5_021D0D80.h
@@ -4,11 +4,11 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0203CDB0_decl.h"

-void ov5_021D12D0(UnkStruct_0203CDB0 * param0, u32 param1);
+void ov5_021D12D0(FieldSystem * param0, u32 param1);
 void ov5_021D1434(BGL * param0);
 void ov5_021D143C(BGL * param0);
-void ov5_021D16F4(UnkStruct_0203CDB0 * param0, BOOL param1);
-void ov5_021D1718(UnkStruct_0203CDB0 * param0, BOOL param1);
+void ov5_021D16F4(FieldSystem * param0, BOOL param1);
+void ov5_021D1718(FieldSystem * param0, BOOL param1);
 void ov5_021D1744(const u8 param0);

 #endif // POKEPLATINUM_OV5_021D0D80_H
--- a/include/overlay005/ov5_021D1A94.h
+++ b/include/overlay005/ov5_021D1A94.h
@@ -6,7 +6,7 @@
 #include "overlay005/struct_ov5_021D1BEC_decl.h"
 #include "overlay006/struct_ov6_0223E6EC.h"

-UnkStruct_ov5_021D1A94 * ov5_021D1A94(UnkStruct_0203CDB0 * param0, int param1, int param2);
+UnkStruct_ov5_021D1A94 * ov5_021D1A94(FieldSystem * param0, int param1, int param2);
 void ov5_021D1AE4(UnkStruct_ov5_021D1A94 * param0);
 void ov5_021D1B18(UnkStruct_ov5_021D1A94 * param0);
 UnkStruct_ov5_021D1BEC * ov5_021D1B6C(UnkStruct_ov5_021D1A94 * param0, const UnkStruct_ov6_0223E6EC * param1);
--- a/include/overlay005/ov5_021D1C30.h
+++ b/include/overlay005/ov5_021D1C30.h
@@ -4,11 +4,11 @@
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "overlay005/struct_ov5_021D1CAC.h"

-void ov5_021D1CAC(UnkStruct_ov5_021D1CAC * param0, UnkStruct_0203CDB0 * param1, u16 param2, u16 param3);
-int ov5_021D1DA4(const UnkStruct_ov5_021D1CAC * param0, UnkStruct_0203CDB0 * param1);
-BOOL ov5_021D213C(UnkStruct_ov5_021D1CAC * param0, UnkStruct_0203CDB0 * param1);
-BOOL ov5_021D219C(UnkStruct_ov5_021D1CAC * param0, UnkStruct_0203CDB0 * param1);
-BOOL ov5_021D2298(const UnkStruct_ov5_021D1CAC * param0, UnkStruct_0203CDB0 * param1);
-int ov5_021D2368(const UnkStruct_ov5_021D1CAC * param0, UnkStruct_0203CDB0 * param1);
+void ov5_021D1CAC(UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1, u16 param2, u16 param3);
+int ov5_021D1DA4(const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1);
+BOOL ov5_021D213C(UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1);
+BOOL ov5_021D219C(UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1);
+BOOL ov5_021D2298(const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1);
+int ov5_021D2368(const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1);

 #endif // POKEPLATINUM_OV5_021D1C30_H
--- a/include/overlay005/ov5_021D431C.h
+++ b/include/overlay005/ov5_021D431C.h
@@ -9,16 +9,16 @@
 UnkStruct_ov5_021D432C * ov5_021D431C(void);
 void ov5_021D432C(UnkStruct_ov5_021D432C * param0);
 void ov5_021D4334(const int param0, const int param1, UnkStruct_ov5_021D432C * param2);
-BOOL ov5_021D433C(UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021D432C * param1);
-BOOL ov5_021D453C(UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021D432C * param1);
-BOOL ov5_021D4858(UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021D432C * param1, const u8 param2);
-BOOL ov5_021D4A24(UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021D432C * param1, const u8 param2);
-void ov5_021D4BF4(UnkStruct_0203CDB0 * param0, const int param1, const int param2, const u8 param3);
-void ov5_021D4C88(UnkStruct_0203CDB0 * param0, const u8 param1);
-void ov5_021D4CEC(UnkStruct_0203CDB0 * param0, const u8 param1);
-void ov5_021D4D48(UnkStruct_0203CDB0 * param0, const u8 param1);
-void ov5_021D4D68(UnkStruct_0203CDB0 * param0, const u8 param1);
-void ov5_021D4D78(const int param0, const int param1, const int param2, UnkStruct_0203CDB0 * param3);
+BOOL ov5_021D433C(FieldSystem * param0, UnkStruct_ov5_021D432C * param1);
+BOOL ov5_021D453C(FieldSystem * param0, UnkStruct_ov5_021D432C * param1);
+BOOL ov5_021D4858(FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const u8 param2);
+BOOL ov5_021D4A24(FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const u8 param2);
+void ov5_021D4BF4(FieldSystem * param0, const int param1, const int param2, const u8 param3);
+void ov5_021D4C88(FieldSystem * param0, const u8 param1);
+void ov5_021D4CEC(FieldSystem * param0, const u8 param1);
+void ov5_021D4D48(FieldSystem * param0, const u8 param1);
+void ov5_021D4D68(FieldSystem * param0, const u8 param1);
+void ov5_021D4D78(const int param0, const int param1, const int param2, FieldSystem * param3);
 UnkStruct_ov5_021D4E00 * ov5_021D4E00(void);
 BOOL ov5_021D4E10(UnkStruct_020508D4 * param0);
 BOOL ov5_021D4F14(UnkStruct_020508D4 * param0);
--- a/include/overlay005/ov5_021D5B40.h
+++ b/include/overlay005/ov5_021D5B40.h
@@ -5,7 +5,7 @@

 #include <nitro/fx/fx.h>

-void ov5_021D5B40(const VecFx32 * param0, UnkStruct_0203CDB0 * param1, const int param2, const BOOL param3);
-void ov5_021D5BA8(UnkStruct_0203CDB0 * param0);
+void ov5_021D5B40(const VecFx32 * param0, FieldSystem * param1, const int param2, const BOOL param3);
+void ov5_021D5BA8(FieldSystem * param0);

 #endif // POKEPLATINUM_OV5_021D5B40_H
--- a/include/overlay005/ov5_021D5BC0.h
+++ b/include/overlay005/ov5_021D5BC0.h
@@ -3,9 +3,9 @@

 #include "struct_decls/struct_0203CDB0_decl.h"

-void ov5_021D5BD8(UnkStruct_0203CDB0 * param0);
-BOOL ov5_021D5BF4(UnkStruct_0203CDB0 * param0);
-void ov5_021D5C14(UnkStruct_0203CDB0 * param0);
-BOOL ov5_021D5C30(UnkStruct_0203CDB0 * param0);
+void ov5_021D5BD8(FieldSystem * param0);
+BOOL ov5_021D5BF4(FieldSystem * param0);
+void ov5_021D5C14(FieldSystem * param0);
+BOOL ov5_021D5C30(FieldSystem * param0);

 #endif // POKEPLATINUM_OV5_021D5BC0_H
--- a/include/overlay005/ov5_021D5EB8.h
+++ b/include/overlay005/ov5_021D5EB8.h
@@ -5,12 +5,12 @@
 #include "overlay005/struct_ov5_021D5EF8_decl.h"
 #include "overlay005/struct_ov5_021D6594_decl.h"

-UnkStruct_ov5_021D5EF8 * ov5_021D5EB8(UnkStruct_0203CDB0 * param0);
+UnkStruct_ov5_021D5EF8 * ov5_021D5EB8(FieldSystem * param0);
 void ov5_021D5EF8(UnkStruct_ov5_021D5EF8 * param0);
 void ov5_021D5F24(UnkStruct_ov5_021D5EF8 * param0, int param1);
 BOOL ov5_021D5F7C(UnkStruct_ov5_021D5EF8 * param0, int param1);
 u32 ov5_021D5FE0(UnkStruct_ov5_021D5EF8 * param0);
-UnkStruct_ov5_021D6594 * ov5_021D6364(UnkStruct_0203CDB0 * param0);
+UnkStruct_ov5_021D6594 * ov5_021D6364(FieldSystem * param0);
 void ov5_021D63A4(UnkStruct_ov5_021D6594 ** param0);
 BOOL ov5_021D6418(UnkStruct_ov5_021D6594 * param0, int param1, int param2);
 int ov5_021D64D0(UnkStruct_ov5_021D6594 * param0, int param1);
--- a/include/overlay005/ov5_021DB888.h
+++ b/include/overlay005/ov5_021DB888.h
@@ -7,8 +7,8 @@
 #include "struct_decls/struct_02061AB4_decl.h"

 void ov5_021DB888(UnkStruct_020508D4 * param0, StringFormatter * param1, u16 * param2);
-BOOL ov5_021DBB94(UnkStruct_0203CDB0 * param0);
-u16 ov5_021DBD98(UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1, u16 param2);
-void ov5_021DBED4(UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1);
+BOOL ov5_021DBB94(FieldSystem * param0);
+u16 ov5_021DBD98(FieldSystem * param0, UnkStruct_02061AB4 * param1, u16 param2);
+void ov5_021DBED4(FieldSystem * param0, UnkStruct_02061AB4 * param1);

 #endif // POKEPLATINUM_OV5_021DB888_H
--- a/include/overlay005/ov5_021DC018.h
+++ b/include/overlay005/ov5_021DC018.h
@@ -7,27 +7,27 @@
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay005/struct_ov5_021DC1A4_decl.h"

-UnkStruct_ov5_021DC1A4 * ov5_021DC150(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringFormatter * param6, Window * param7, MessageLoader * param8);
+UnkStruct_ov5_021DC1A4 * ov5_021DC150(FieldSystem * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringFormatter * param6, Window * param7, MessageLoader * param8);
 void ov5_021DC1A4(UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param2);
 void ov5_021DC1AC(UnkStruct_ov5_021DC1A4 * param0);
 void ov5_021DC424(UnkStruct_ov5_021DC1A4 * param0);
-UnkStruct_ov5_021DC1A4 * ov5_021DC48C(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringFormatter * param6, Window * param7, MessageLoader * param8);
+UnkStruct_ov5_021DC1A4 * ov5_021DC48C(FieldSystem * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringFormatter * param6, Window * param7, MessageLoader * param8);
 void ov5_021DC4B0(UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param2, u32 param3);
 void ov5_021DC4B8(UnkStruct_ov5_021DC1A4 * param0);
 void ov5_021DC528(UnkStruct_ov5_021DC1A4 * param0, u16 param1);
 void ov5_021DC600(UnkStruct_ov5_021DC1A4 * param0, u16 * param1, u16 * param2);
-void ov5_021DCB24(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u16 * param3, StringFormatter * param4, u16 param5);
+void ov5_021DCB24(FieldSystem * param0, u8 param1, u8 param2, u16 * param3, StringFormatter * param4, u16 param5);
 u16 ov5_021DCCC8(int param0);
 void ov5_021DCD94(UnkStruct_ov5_021DC1A4 * param0, u8 param1);
-Window * ov5_021DCEB0(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2);
+Window * ov5_021DCEB0(FieldSystem * param0, u8 param1, u8 param2);
 void ov5_021DCF58(Window * param0);
-void ov5_021DCF6C(UnkStruct_0203CDB0 * param0, Window * param1);
-Window * ov5_021DD020(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2);
+void ov5_021DCF6C(FieldSystem * param0, Window * param1);
+Window * ov5_021DD020(FieldSystem * param0, u8 param1, u8 param2);
 void ov5_021DD084(Window * param0);
-void ov5_021DD098(UnkStruct_0203CDB0 * param0, Window * param1);
-Window * ov5_021DD140(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2);
-void ov5_021DD1A4(UnkStruct_0203CDB0 * param0, Window * param1);
-UnkStruct_ov5_021DC1A4 * ov5_021DD250(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u16 * param3, StringFormatter * param4, u8 param5, u8 param6, u8 param7, u8 param8);
+void ov5_021DD098(FieldSystem * param0, Window * param1);
+Window * ov5_021DD140(FieldSystem * param0, u8 param1, u8 param2);
+void ov5_021DD1A4(FieldSystem * param0, Window * param1);
+UnkStruct_ov5_021DC1A4 * ov5_021DD250(FieldSystem * param0, u8 param1, u8 param2, u16 * param3, StringFormatter * param4, u8 param5, u8 param6, u8 param7, u8 param8);
 void ov5_021DD3A8(UnkStruct_ov5_021DC1A4 * param0);
 void ov5_021DD3F4(UnkStruct_ov5_021DC1A4 * param0, BOOL param1);
 void ov5_021DD410(UnkStruct_ov5_021DC1A4 * param0, BOOL param1);
--- a/include/overlay005/ov5_021DD6FC.h
+++ b/include/overlay005/ov5_021DD6FC.h
@@ -9,6 +9,6 @@ UnkStruct_ov5_021DD9C8 * ov5_021DD98C(BGL * param0);
 void ov5_021DD9C8(UnkStruct_ov5_021DD9C8 * param0);
 void ov5_021DD9E8(UnkStruct_ov5_021DD9C8 * param0, const int param1, const int param2);
 void ov5_021DDA78(UnkStruct_ov5_021DD9C8 * param0);
-void ov5_021DDAA4(UnkStruct_0203CDB0 * param0);
+void ov5_021DDAA4(FieldSystem * param0);

 #endif // POKEPLATINUM_OV5_021DD6FC_H
--- a/include/overlay005/ov5_021DDBE8.h
+++ b/include/overlay005/ov5_021DDBE8.h
@@ -26,7 +26,7 @@

 #include <nitro/fx/fx.h>

-void ov5_021DDBE8(int param0, UnkStruct_0203CDB0 * param1, BOOL * param2);
+void ov5_021DDBE8(int param0, FieldSystem * param1, BOOL * param2);
 void ov5_021DDC28(UnkStruct_ov5_021DDC28 * param0, SysTask * param1);
 void ov5_021DDC44(int param0, u32 param1, u32 param2, BOOL * param3, u32 param4);
 BOOL ov5_021DDD7C(UnkStruct_ov5_021DDC28 * param0);
@@ -79,7 +79,7 @@ void ov5_021DED04(UnkStruct_ov5_021DED04 * param0);
 void ov5_021DED20(UnkStruct_ov5_021DDC28 * param0, UnkStruct_ov5_021DED04 * param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6);
 u32 CutInEffects_ForBattle(const BattleParams * param0);
 void ov5_021DEF8C(int * param0);
-void ov5_021DEFA0(UnkStruct_0203CDB0 * param0);
+void ov5_021DEFA0(FieldSystem * param0);
 void ov5_021DF038(void);
 BOOL ov5_021DF054(void);
 void ov5_021DF070(void);
--- a/include/overlay005/ov5_021DF440.h
+++ b/include/overlay005/ov5_021DF440.h
@@ -14,7 +14,7 @@

 #include <nitro/fx/fx.h>

-UnkStruct_ov5_021DF47C * ov5_021DF440(UnkStruct_0203CDB0 * param0, u32 param1, u32 param2);
+UnkStruct_ov5_021DF47C * ov5_021DF440(FieldSystem * param0, u32 param1, u32 param2);
 void ov5_021DF47C(UnkStruct_ov5_021DF47C * param0, u32 param1);
 void ov5_021DF488(UnkStruct_ov5_021DF47C * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
 void ov5_021DF4A8(UnkStruct_ov5_021DF47C * param0, u32 param1);
@@ -26,7 +26,7 @@ void * ov5_021DF528(const UnkStruct_ov5_021DF47C * param0, u32 param1, int param
 void * ov5_021DF53C(const UnkStruct_ov5_021DF47C * param0, u32 param1, int param2, u32 param3);
 void ov5_021DF554(void * param0);
 void * ov5_021DF55C(UnkStruct_ov5_021DF47C * param0, u32 param1);
-UnkStruct_0203CDB0 * ov5_021DF574(const UnkStruct_ov5_021DF47C * param0);
+FieldSystem * ov5_021DF574(const UnkStruct_ov5_021DF47C * param0);
 UnkStruct_ov5_021DF47C * ov5_021DF578(const UnkStruct_02061AB4 * param0);
 u32 ov5_021DF5A8(UnkStruct_ov5_021DF47C * param0, u32 param1);
 void ov5_021DF5B4(UnkStruct_ov5_021DF47C * param0, u32 param1, void * param2);
--- a/include/overlay005/ov5_021DFB54.h
+++ b/include/overlay005/ov5_021DFB54.h
@@ -8,19 +8,19 @@

 void ov5_021DFB54(UnkStruct_0205E884 * param0, u32 param1);
 void ov5_021DFB5C(UnkStruct_0205E884 * param0);
-int ov5_021DFDE0(UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param1, int param2, int param3);
+int ov5_021DFDE0(FieldSystem * param0, UnkStruct_0205E884 * param1, int param2, int param3);
 void ov5_021E00EC(UnkStruct_020508D4 * param0, int param1, int param2);
 int ov5_021E0118(UnkStruct_0205E884 * param0, u32 param1, u32 param2);
 void ov5_021E0734(UnkStruct_020508D4 * param0, int param1, int param2);
 int ov5_021E0760(u32 param0, int param1);
-void ov5_021E097C(UnkStruct_0203CDB0 * param0, int param1);
+void ov5_021E097C(FieldSystem * param0, int param1);
 void ov5_021E0998(UnkStruct_020508D4 * param0, int param1, int param2);
 void ov5_021E0DD4(UnkStruct_020508D4 * param0);
 void ov5_021E0E94(UnkStruct_0205E884 * param0);
 void ov5_021E0EEC(UnkStruct_0205E884 * param0);
-SysTask * ov5_021E1000(UnkStruct_0203CDB0 * param0);
+SysTask * ov5_021E1000(FieldSystem * param0);
 void ov5_021E100C(SysTask * param0);
-SysTask * ov5_021E1014(UnkStruct_0203CDB0 * param0);
+SysTask * ov5_021E1014(FieldSystem * param0);
 void ov5_021E1020(SysTask * param0);

 #endif // POKEPLATINUM_OV5_021DFB54_H
--- a/include/overlay005/ov5_021E1154.h
+++ b/include/overlay005/ov5_021E1154.h
@@ -4,6 +4,6 @@
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "struct_decls/struct_0205E884_decl.h"

-int ov5_021E1154(UnkStruct_0203CDB0 * param0, UnkStruct_0205E884 * param1, int param2);
+int ov5_021E1154(FieldSystem * param0, UnkStruct_0205E884 * param1, int param2);

 #endif // POKEPLATINUM_OV5_021E1154_H
--- a/include/overlay005/ov5_021E135C.h
+++ b/include/overlay005/ov5_021E135C.h
@@ -3,6 +3,6 @@

 #include "struct_decls/struct_0203CDB0_decl.h"

-void ov5_021E15A8(UnkStruct_0203CDB0 * param0, BOOL param1, BOOL * param2);
+void ov5_021E15A8(FieldSystem * param0, BOOL param1, BOOL * param2);

 #endif // POKEPLATINUM_OV5_021E135C_H
--- a/include/overlay005/ov5_021E1B08.h
+++ b/include/overlay005/ov5_021E1B08.h
@@ -12,7 +12,7 @@ void ov5_021E1B40(UnkStruct_ov5_021E1B20 * param0, u8 param1);
 Window * ov5_021E1B50(UnkStruct_ov5_021E1B20 * param0);
 u8 ov5_021E1B54(UnkStruct_ov5_021E1B20 * param0);
 BOOL ov5_021E1B58(UnkStruct_ov5_021E1B20 * param0);
-void ov5_021E1B68(UnkStruct_0203CDB0 * param0);
-void ov5_021E1BCC(UnkStruct_0203CDB0 * param0, u8 param1);
+void ov5_021E1B68(FieldSystem * param0);
+void ov5_021E1BCC(FieldSystem * param0, u8 param1);

 #endif // POKEPLATINUM_OV5_021E1B08_H
--- a/include/overlay005/ov5_021E1D20.h
+++ b/include/overlay005/ov5_021E1D20.h
@@ -6,9 +6,9 @@

 void ov5_021E1F04(UnkStruct_ov5_021E1FF4 * param0);
 void ov5_021E1F7C(UnkStruct_ov5_021E1FF4 * param0);
-UnkStruct_ov5_021E1FF4 * ov5_021E1F98(UnkStruct_0203CDB0 * param0, int param1, u8 param2);
+UnkStruct_ov5_021E1FF4 * ov5_021E1F98(FieldSystem * param0, int param1, u8 param2);
 void ov5_021E1FF4(UnkStruct_ov5_021E1FF4 * param0);
-BOOL ov5_021E200C(UnkStruct_0203CDB0 * param0);
-void ov5_021E2064(UnkStruct_0203CDB0 * param0);
+BOOL ov5_021E200C(FieldSystem * param0);
+void ov5_021E2064(FieldSystem * param0);

 #endif // POKEPLATINUM_OV5_021E1D20_H
--- a/include/overlay005/ov5_021E622C.h
+++ b/include/overlay005/ov5_021E622C.h
@@ -26,7 +26,7 @@ void ov5_021E6B40(UnkStruct_02026310 * param0);
 void ov5_021E6CF0(Pokemon * param0, u16 param1, u8 param2, TrainerInfo * param3, int param4, int param5);
 void ov5_021E6DE8(Pokemon * param0, u16 param1, UnkStruct_02026310 * param2, u32 param3, u8 param4);
 void ov5_021E6EA8(UnkStruct_02026310 * param0, Party * param1, TrainerInfo * param2);
-BOOL ov5_021E7154(UnkStruct_02026310 * param0, Party * param1, UnkStruct_0203CDB0 * param2);
+BOOL ov5_021E7154(UnkStruct_02026310 * param0, Party * param1, FieldSystem * param2);
 Pokemon * ov5_021E7278(Party * param0);
 void ov5_021E72BC(UnkStruct_02026310 * param0, StringFormatter * param1);
 void ov5_021E7308(UnkStruct_02026310 * param0, u32 param1, u32 param2, u32 param3, u8 param4, StringFormatter * param5);
--- a/include/overlay005/ov5_021E779C.h
+++ b/include/overlay005/ov5_021E779C.h
@@ -15,7 +15,7 @@
 #include <nitro/fx/fx.h>

 void ov5_021E7A54(UnkStruct_ov5_021E8F60 * param0);
-void ov5_021E8188(UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021E8F60 * param1);
+void ov5_021E8188(FieldSystem * param0, UnkStruct_ov5_021E8F60 * param1);
 UnkStruct_ov5_021E8F60 * ov5_021E9084(UnkStruct_02039E30 * param0, UnkStruct_ov5_021EF76C * param1, UnkStruct_ov5_021D3CAC * param2, const int param3);
 void ov5_021E9150(UnkStruct_ov5_021E8F60 * param0, const int param1, const int param2);
 void ov5_021E9190(const u8 param0, UnkStruct_ov5_021E8F60 * param1);
@@ -48,7 +48,7 @@ void ov5_021E9C0C(const UnkStruct_ov5_021E8F60 * param0, const UnkStruct_ov5_021
 void ov5_021E9CD8(UnkStruct_ov5_021E8F60 * param0);
 void ov5_021E9D3C(UnkStruct_02039E30 * param0, UnkStruct_ov5_021EF76C * param1, UnkStruct_ov5_021E8F60 * param2, UnkStruct_ov5_021E8F60 * param3, const int param4, const int param5);
 void ov5_021E9F98(UnkStruct_ov5_021E8F60 * param0, UnkStruct_ov5_021E8F60 * param1);
-void ov5_021EA174(UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021E8F60 * param1);
+void ov5_021EA174(FieldSystem * param0, UnkStruct_ov5_021E8F60 * param1);
 void ov5_021EA540(UnkStruct_ov5_021E8F60 * param0, UnkStruct_02039E30 * param1, UnkStruct_ov5_021EF76C * param2);
 void ov5_021EA58C(UnkStruct_ov5_021E8F60 * param0, const int param1, const int param2, int * param3);
 void ov5_021EA5E0(UnkStruct_ov5_021E8F60 * param0, int param1, int param2);
--- a/include/overlay005/ov5_021EA714.h
+++ b/include/overlay005/ov5_021EA714.h
@@ -3,12 +3,12 @@

 #include "struct_decls/struct_0203CDB0_decl.h"

-void ov5_021EA714(UnkStruct_0203CDB0 * param0, int param1, u32 param2);
-void ov5_021EA728(UnkStruct_0203CDB0 * param0);
-void ov5_021EA790(UnkStruct_0203CDB0 * param0);
-u8 ov5_021EA7CC(UnkStruct_0203CDB0 * param0);
-void ov5_021EA830(UnkStruct_0203CDB0 * param0);
-void ov5_021EA848(UnkStruct_0203CDB0 * param0);
-BOOL ov5_021EA854(UnkStruct_0203CDB0 * param0);
+void ov5_021EA714(FieldSystem * param0, int param1, u32 param2);
+void ov5_021EA728(FieldSystem * param0);
+void ov5_021EA790(FieldSystem * param0);
+u8 ov5_021EA7CC(FieldSystem * param0);
+void ov5_021EA830(FieldSystem * param0);
+void ov5_021EA848(FieldSystem * param0);
+BOOL ov5_021EA854(FieldSystem * param0);

 #endif // POKEPLATINUM_OV5_021EA714_H
--- a/include/overlay005/ov5_021EA874.h
+++ b/include/overlay005/ov5_021EA874.h
@@ -3,6 +3,6 @@

 #include "struct_decls/struct_0203CDB0_decl.h"

-void ov5_021EAF50(UnkStruct_0203CDB0 * param0);
+void ov5_021EAF50(FieldSystem * param0);

 #endif // POKEPLATINUM_OV5_021EA874_H
--- a/include/overlay005/ov5_021EE75C.h
+++ b/include/overlay005/ov5_021EE75C.h
@@ -3,6 +3,6 @@

 #include "struct_decls/struct_0203CDB0_decl.h"

-void ov5_021EE7C0(UnkStruct_0203CDB0 * param0);
+void ov5_021EE7C0(FieldSystem * param0);

 #endif // POKEPLATINUM_OV5_021EE75C_H
--- a/include/overlay005/ov5_021EE7D4.h
+++ b/include/overlay005/ov5_021EE7D4.h
@@ -3,9 +3,9 @@

 #include "struct_decls/struct_0203CDB0_decl.h"

-u8 ov5_021EE920(UnkStruct_0203CDB0 * param0, u16 param1);
-void ov5_021EE9BC(UnkStruct_0203CDB0 * param0, u16 param1);
-void ov5_021EEA54(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u16 param3);
-void ov5_021EEA84(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u16 param3);
+u8 ov5_021EE920(FieldSystem * param0, u16 param1);
+void ov5_021EE9BC(FieldSystem * param0, u16 param1);
+void ov5_021EEA54(FieldSystem * param0, u8 param1, u8 param2, u16 param3);
+void ov5_021EEA84(FieldSystem * param0, u8 param1, u8 param2, u16 param3);

 #endif // POKEPLATINUM_OV5_021EE7D4_H
--- a/include/overlay005/ov5_021EFB0C.h
+++ b/include/overlay005/ov5_021EFB0C.h
@@ -7,12 +7,12 @@

 UnkStruct_ov5_021EFB30 * ov5_021EFB0C(void);
 void ov5_021EFB30(UnkStruct_ov5_021EFB30 ** param0);
-BOOL ov5_021EFB40(UnkStruct_0203CDB0 * param0, int * param1);
-u16 ov5_021EFB94(UnkStruct_0203CDB0 * param0);
-void ov5_021EFBDC(UnkStruct_0203CDB0 * param0);
-void ov5_021EFC90(UnkStruct_0203CDB0 * param0);
-int ov5_021EFFE4(UnkStruct_0203CDB0 * param0);
+BOOL ov5_021EFB40(FieldSystem * param0, int * param1);
+u16 ov5_021EFB94(FieldSystem * param0);
+void ov5_021EFBDC(FieldSystem * param0);
+void ov5_021EFC90(FieldSystem * param0);
+int ov5_021EFFE4(FieldSystem * param0);
 void ov5_021F0030(void * param0, const int param1, UnkStruct_ov5_021E1608 * const param2);
-void ov5_021F0040(UnkStruct_0203CDB0 * param0);
+void ov5_021F0040(FieldSystem * param0);

 #endif // POKEPLATINUM_OV5_021EFB0C_H
--- a/include/overlay005/ov5_021F007C.h
+++ b/include/overlay005/ov5_021F007C.h
@@ -5,12 +5,12 @@
 #include "struct_decls/struct_020508D4_decl.h"
 #include "overlay005/struct_ov5_021D1BEC_decl.h"

-UnkStruct_ov5_021D1BEC * ov5_021F01F0(UnkStruct_0203CDB0 * param0);
-UnkStruct_ov5_021D1BEC * ov5_021F0204(UnkStruct_0203CDB0 * param0);
+UnkStruct_ov5_021D1BEC * ov5_021F01F0(FieldSystem * param0);
+UnkStruct_ov5_021D1BEC * ov5_021F0204(FieldSystem * param0);
 void ov5_021F0218(UnkStruct_ov5_021D1BEC * param0);
 BOOL ov5_021F0220(UnkStruct_ov5_021D1BEC * param0);
-UnkStruct_ov5_021D1BEC * ov5_021F022C(UnkStruct_0203CDB0 * param0);
-UnkStruct_ov5_021D1BEC * ov5_021F0240(UnkStruct_0203CDB0 * param0);
+UnkStruct_ov5_021D1BEC * ov5_021F022C(FieldSystem * param0);
+UnkStruct_ov5_021D1BEC * ov5_021F0240(FieldSystem * param0);
 BOOL ov5_021F0254(UnkStruct_ov5_021D1BEC * param0);
 u32 ov5_021F0484(void);
 BOOL ov5_021F0488(UnkStruct_020508D4 * param0);
--- a/include/overlay005/ov5_021F0824.h
+++ b/include/overlay005/ov5_021F0824.h
@@ -3,6 +3,6 @@

 #include "struct_decls/struct_0203CDB0_decl.h"

-void ov5_021F0824(UnkStruct_0203CDB0 * param0);
+void ov5_021F0824(FieldSystem * param0);

 #endif // POKEPLATINUM_OV5_021F0824_H
--- a/include/overlay005/ov5_021F08CC.h
+++ b/include/overlay005/ov5_021F08CC.h
@@ -5,9 +5,9 @@
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "struct_decls/struct_020508D4_decl.h"

-void * ov5_021F08CC(UnkStruct_0203CDB0 * param0, u32 param1, int param2);
+void * ov5_021F08CC(FieldSystem * param0, u32 param1, int param2);
 BOOL ov5_021F08F8(UnkStruct_020508D4 * param0);
-SysTask * ov5_021F09B4(UnkStruct_0203CDB0 * param0, int param1, BOOL param2);
+SysTask * ov5_021F09B4(FieldSystem * param0, int param1, BOOL param2);
 int ov5_021F09D8(SysTask * param0);
 int ov5_021F09E4(SysTask * param0);
 void ov5_021F09F0(SysTask * param0);
--- a/include/overlay005/ov5_021F0EB0.h
+++ b/include/overlay005/ov5_021F0EB0.h
@@ -4,7 +4,7 @@
 #include "struct_decls/sys_task.h"
 #include "struct_decls/struct_0203CDB0_decl.h"

-SysTask * ov5_021F0EB0(UnkStruct_0203CDB0 * param0, u32 param1);
+SysTask * ov5_021F0EB0(FieldSystem * param0, u32 param1);
 BOOL ov5_021F0EF0(SysTask * param0);
 void ov5_021F0EFC(SysTask * param0);
 void ov5_021F0F10(SysTask * param0, int param1, fx32 param2, u32 param3);
--- a/include/overlay005/ov5_021F2D20.h
+++ b/include/overlay005/ov5_021F2D20.h
@@ -9,7 +9,7 @@
 void * ov5_021F2D20(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F2D3C(void * param0);
 void ov5_021F2EA4(UnkStruct_02061AB4 * param0, int param1);
-UnkStruct_ov101_021D5D90 * ov5_021F3154(UnkStruct_0203CDB0 * param0, int param1, int param2, int param3);
+UnkStruct_ov101_021D5D90 * ov5_021F3154(FieldSystem * param0, int param1, int param2, int param3);
 int ov5_021F31A8(UnkStruct_ov101_021D5D90 * param0);

 #endif // POKEPLATINUM_OV5_021F2D20_H
--- a/include/overlay005/ov5_021F4018.h
+++ b/include/overlay005/ov5_021F4018.h
@@ -6,7 +6,7 @@

 void * ov5_021F4018(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F4034(void * param0);
-void ov5_021F4098(UnkStruct_0203CDB0 * param0, int param1);
-void ov5_021F416C(UnkStruct_0203CDB0 * param0, int param1);
+void ov5_021F4098(FieldSystem * param0, int param1);
+void ov5_021F416C(FieldSystem * param0, int param1);

 #endif // POKEPLATINUM_OV5_021F4018_H
--- a/include/overlay005/ov5_021F428C.h
+++ b/include/overlay005/ov5_021F428C.h
@@ -8,10 +8,10 @@
 void * ov5_021F428C(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F42A8(void * param0);
 void ov5_021F42D8(UnkStruct_ov5_021DF47C * param0, int param1, int param2);
-UnkStruct_ov101_021D5D90 * ov5_021F4474(UnkStruct_0203CDB0 * param0, int param1, int param2, fx32 param3);
+UnkStruct_ov101_021D5D90 * ov5_021F4474(FieldSystem * param0, int param1, int param2, fx32 param3);
 void ov5_021F44A4(UnkStruct_ov101_021D5D90 * param0);
 BOOL ov5_021F453C(UnkStruct_ov101_021D5D90 * param0);
-UnkStruct_ov101_021D5D90 * ov5_021F4668(UnkStruct_0203CDB0 * param0, int param1, int param2, fx32 param3);
+UnkStruct_ov101_021D5D90 * ov5_021F4668(FieldSystem * param0, int param1, int param2, fx32 param3);
 void ov5_021F4698(UnkStruct_ov101_021D5D90 * param0, int param1, BOOL param2);
 void ov5_021F4714(UnkStruct_ov101_021D5D90 * param0, fx32 param1);
 BOOL ov5_021F4720(UnkStruct_ov101_021D5D90 * param0);
--- a/include/overlay005/ov5_021F4E08.h
+++ b/include/overlay005/ov5_021F4E08.h
@@ -7,7 +7,7 @@

 void * ov5_021F4E08(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F4E28(void * param0);
-UnkStruct_ov101_021D5D90 * ov5_021F4EAC(UnkStruct_0203CDB0 * param0, int param1, int param2, int param3, int param4);
-UnkStruct_ov101_021D5D90 * ov5_021F4F18(UnkStruct_0203CDB0 * param0, int param1, int param2, int param3, int param4);
+UnkStruct_ov101_021D5D90 * ov5_021F4EAC(FieldSystem * param0, int param1, int param2, int param3, int param4);
+UnkStruct_ov101_021D5D90 * ov5_021F4F18(FieldSystem * param0, int param1, int param2, int param3, int param4);

 #endif // POKEPLATINUM_OV5_021F4E08_H
--- a/include/overlay005/ov5_021F55CC.h
+++ b/include/overlay005/ov5_021F55CC.h
@@ -6,6 +6,6 @@

 void * ov5_021F55CC(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F55E8(void * param0);
-void ov5_021F5634(UnkStruct_0203CDB0 * param0, int param1, int param2, int param3);
+void ov5_021F5634(FieldSystem * param0, int param1, int param2, int param3);

 #endif // POKEPLATINUM_OV5_021F55CC_H
--- a/include/overlay005/ov5_021F575C.h
+++ b/include/overlay005/ov5_021F575C.h
@@ -6,6 +6,6 @@

 void * ov5_021F575C(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F5778(void * param0);
-void ov5_021F57C8(UnkStruct_0203CDB0 * param0, int param1, int param2);
+void ov5_021F57C8(FieldSystem * param0, int param1, int param2);

 #endif // POKEPLATINUM_OV5_021F575C_H
--- a/include/overlay005/ov5_021F5A10.h
+++ b/include/overlay005/ov5_021F5A10.h
@@ -8,7 +8,7 @@

 void * ov5_021F5A10(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F5A24(void * param0);
-void ov5_021F5AA4(UnkStruct_0203CDB0 * param0, BOOL param1);
+void ov5_021F5AA4(FieldSystem * param0, BOOL param1);
 int ov5_021F5C4C(UnkStruct_ov101_021D5D90 * param0);
 void ov5_021F5C58(UnkStruct_ov101_021D5D90 * param0);
 UnkStruct_ov101_021D5D90 * ov5_021F5D8C(UnkStruct_02061AB4 * param0, int param1, int param2, int param3);
--- a/include/overlay005/ov5_021F8370.h
+++ b/include/overlay005/ov5_021F8370.h
@@ -3,9 +3,9 @@

 #include "struct_decls/struct_0203CDB0_decl.h"

-void ov5_021F8370(UnkStruct_0203CDB0 * param0);
-void ov5_021F83C0(UnkStruct_0203CDB0 * param0);
-BOOL ov5_021F83D4(UnkStruct_0203CDB0 * param0, const int param1, const int param2, const fx32 param3, BOOL * param4);
-BOOL ov5_021F8410(UnkStruct_0203CDB0 * param0, const int param1, const int param2, const int param3);
+void ov5_021F8370(FieldSystem * param0);
+void ov5_021F83C0(FieldSystem * param0);
+BOOL ov5_021F83D4(FieldSystem * param0, const int param1, const int param2, const fx32 param3, BOOL * param4);
+BOOL ov5_021F8410(FieldSystem * param0, const int param1, const int param2, const int param3);

 #endif // POKEPLATINUM_OV5_021F8370_H
--- a/include/overlay005/struct_ov5_021DDC28.h
+++ b/include/overlay005/struct_ov5_021DDC28.h
@@ -9,7 +9,7 @@ typedef struct {
    int unk_04;
    int unk_08;
    void * unk_0C;
-    UnkStruct_0203CDB0 * unk_10;
+    FieldSystem * unk_10;
    BOOL * unk_14;
    BOOL unk_18;
    BOOL unk_1C;
--- a/include/overlay006/funcptr_ov6_0223E6EC.h
+++ b/include/overlay006/funcptr_ov6_0223E6EC.h
@@ -4,6 +4,6 @@
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "overlay005/struct_ov5_021D1BEC_decl.h"

-typedef void (* UnkFuncPtr_ov6_0223E6EC)(UnkStruct_ov5_021D1BEC *, UnkStruct_0203CDB0 *, void *);
+typedef void (* UnkFuncPtr_ov6_0223E6EC)(UnkStruct_ov5_021D1BEC *, FieldSystem *, void *);

 #endif // POKEPLATINUM_FUNCPTR_OV6_0223E6EC_H
--- a/include/overlay006/ov6_0223E140.h
+++ b/include/overlay006/ov6_0223E140.h
@@ -15,13 +15,13 @@

 void ov6_0223E384(UnkStruct_020508D4 * param0);
 void ov6_0223E4EC(UnkStruct_020508D4 * param0);
-UnkStruct_ov5_021D1BEC * ov6_0223E6EC(UnkStruct_0203CDB0 * param0);
+UnkStruct_ov5_021D1BEC * ov6_0223E6EC(FieldSystem * param0);
 void ov6_0223E700(UnkStruct_ov5_021D1BEC * param0);
 BOOL ov6_0223E708(UnkStruct_ov5_021D1BEC * param0);
-UnkStruct_ov5_021D1BEC * ov6_0223E814(UnkStruct_0203CDB0 * param0);
+UnkStruct_ov5_021D1BEC * ov6_0223E814(FieldSystem * param0);
 void ov6_0223E828(UnkStruct_ov5_021D1BEC * param0);
-UnkStruct_ov5_021D1BEC * ov6_0223EA74(UnkStruct_0203CDB0 * param0, u32 param1);
-UnkStruct_ov5_021D1BEC * ov6_0223FCCC(UnkStruct_0203CDB0 * param0);
+UnkStruct_ov5_021D1BEC * ov6_0223EA74(FieldSystem * param0, u32 param1);
+UnkStruct_ov5_021D1BEC * ov6_0223FCCC(FieldSystem * param0);
 void ov6_0223FCE0(UnkStruct_ov5_021D1BEC * param0);
 void ov6_0223FCE8(UnkStruct_ov5_021D1BEC * param0);
 u32 ov6_0223FCF4(UnkStruct_ov5_021D1BEC * param0);
@@ -35,10 +35,10 @@ fx32 ov6_0223FFF8(const UnkStruct_ov6_0223FDE4 * param0);
 void ov6_0223FFFC(UnkStruct_ov6_0223FDE4 * param0, fx32 param1);
 void ov6_02240000(UnkStruct_ov6_02240000 * param0, u32 param1, u32 param2, u32 param3);
 int ov6_02240060(const UnkStruct_ov6_02240000 * param0);
-UnkStruct_ov6_022400A8 * ov6_02240074(UnkStruct_0203CDB0 * param0);
+UnkStruct_ov6_022400A8 * ov6_02240074(FieldSystem * param0);
 void ov6_022400A8(UnkStruct_ov6_022400A8 * param0);
 void ov6_022400C4(UnkStruct_ov6_022400A8 * param0);
-UnkStruct_ov6_022401B8 * ov6_02240104(u32 param0, UnkStruct_0203CDB0 * param1);
+UnkStruct_ov6_022401B8 * ov6_02240104(u32 param0, FieldSystem * param1);
 void ov6_022401B8(UnkStruct_ov6_022401B8 * param0);
 void ov6_022401D0(UnkStruct_ov6_022401B8 * param0, u32 param1);
 BOOL ov6_02240214(UnkStruct_ov6_022401B8 * param0);
@@ -62,7 +62,7 @@ void ov6_02240AE4(UnkStruct_ov6_02240774 * param0);
 void ov6_02240AEC(UnkStruct_ov6_02240774 * param0, fx32 param1, fx32 param2, fx32 param3);
 void ov6_02240B24(UnkStruct_ov6_02240774 * param0, fx32 param1, fx32 param2, fx32 param3);
 void ov6_02240B60(UnkStruct_ov6_02240774 * param0, fx32 param1, fx32 param2, fx32 param3);
-UnkStruct_ov6_02240C44 * ov6_02240B9C(u32 param0, UnkStruct_0203CDB0 * param1);
+UnkStruct_ov6_02240C44 * ov6_02240B9C(u32 param0, FieldSystem * param1);
 void ov6_02240C44(UnkStruct_ov6_02240C44 * param0, u32 param1);
 BOOL ov6_02240C7C(UnkStruct_ov6_02240C44 * param0);
 void ov6_02240C94(UnkStruct_ov6_02240C44 * param0);
--- a/include/overlay006/ov6_02240C9C.h
+++ b/include/overlay006/ov6_02240C9C.h
@@ -7,12 +7,12 @@
 #include "overlay006/struct_ov6_02242634.h"

 void ov6_02240C9C(const UnkStruct_ov6_02242634 * param0, int * param1, int * param2);
-BOOL ov6_02240D5C(UnkStruct_0203CDB0 * param0);
-BOOL ov6_0224106C(UnkStruct_0203CDB0 * param0, const int param1, BattleParams ** param2);
-BOOL ov6_022411C8(UnkStruct_0203CDB0 * param0, UnkStruct_020508D4 * param1);
-BOOL ov6_022413E4(UnkStruct_0203CDB0 * param0, BattleParams ** param1);
-void ov6_02242034(UnkStruct_0203CDB0 * param0, BattleParams * param1);
-void ov6_022420D4(UnkStruct_0203CDB0 * param0, u16 param1, u8 param2, BattleParams * param3);
-BOOL ov6_02242110(UnkStruct_0203CDB0 * param0, u8 param1);
+BOOL ov6_02240D5C(FieldSystem * param0);
+BOOL ov6_0224106C(FieldSystem * param0, const int param1, BattleParams ** param2);
+BOOL ov6_022411C8(FieldSystem * param0, UnkStruct_020508D4 * param1);
+BOOL ov6_022413E4(FieldSystem * param0, BattleParams ** param1);
+void ov6_02242034(FieldSystem * param0, BattleParams * param1);
+void ov6_022420D4(FieldSystem * param0, u16 param1, u8 param2, BattleParams * param3);
+BOOL ov6_02242110(FieldSystem * param0, u8 param1);

 #endif // POKEPLATINUM_OV6_02240C9C_H
--- a/include/overlay006/ov6_02242984.h
+++ b/include/overlay006/ov6_02242984.h
@@ -5,8 +5,8 @@
 #include "struct_defs/struct_02049FA8.h"
 #include "overlay006/struct_ov6_02242A8C_decl.h"

-int ov6_02242984(UnkStruct_0203CDB0 * param0);
-UnkStruct_ov6_02242A8C * ov6_02242A10(const int param0, UnkStruct_0203CDB0 * param1);
+int ov6_02242984(FieldSystem * param0);
+UnkStruct_ov6_02242A8C * ov6_02242A10(const int param0, FieldSystem * param1);
 void ov6_02242A8C(UnkStruct_ov6_02242A8C * param0);
 void ov6_02242A94(const u8 param0, UnkStruct_ov6_02242A8C * param1);
 UnkStruct_02049FA8 * ov6_02242AEC(UnkStruct_ov6_02242A8C * param0);
--- a/include/overlay006/ov6_02242AF0.h
+++ b/include/overlay006/ov6_02242AF0.h
@@ -3,8 +3,8 @@

 #include "struct_decls/struct_0203CDB0_decl.h"

-void ov6_02242AF0(UnkStruct_0203CDB0 * param0);
-void ov6_02242B58(UnkStruct_0203CDB0 * param0, const u16 param1, const u16 param2);
-u32 ov6_02242C3C(UnkStruct_0203CDB0 * param0, const u16 param1);
+void ov6_02242AF0(FieldSystem * param0);
+void ov6_02242B58(FieldSystem * param0, const u16 param1, const u16 param2);
+u32 ov6_02242C3C(FieldSystem * param0, const u16 param1);

 #endif // POKEPLATINUM_OV6_02242AF0_H
--- a/include/overlay006/ov6_02243004.h
+++ b/include/overlay006/ov6_02243004.h
@@ -3,6 +3,6 @@

 #include "struct_decls/struct_0203CDB0_decl.h"

-BOOL ov6_02243004(UnkStruct_0203CDB0 * param0, int param1);
+BOOL ov6_02243004(FieldSystem * param0, int param1);

 #endif // POKEPLATINUM_OV6_02243004_H
--- a/include/overlay006/ov6_022430C4.h
+++ b/include/overlay006/ov6_022430C4.h
@@ -4,11 +4,11 @@
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "struct_defs/struct_020698E4.h"

-int ov6_022430C4(UnkStruct_0203CDB0 * param0);
-int ov6_022430E8(UnkStruct_0203CDB0 * param0, const u8 param1);
-int ov6_02243114(UnkStruct_0203CDB0 * param0, const u8 param1);
-int ov6_02243140(UnkStruct_0203CDB0 * param0);
-int GetRadarSpecies(UnkStruct_0203CDB0 * param0);
+int ov6_022430C4(FieldSystem * param0);
+int ov6_022430E8(FieldSystem * param0, const u8 param1);
+int ov6_02243114(FieldSystem * param0, const u8 param1);
+int ov6_02243140(FieldSystem * param0);
+int GetRadarSpecies(FieldSystem * param0);
 void ov6_02243160(UnkStruct_020698E4 * param0);

 #endif // POKEPLATINUM_OV6_022430C4_H
--- a/include/overlay006/ov6_02243258.h
+++ b/include/overlay006/ov6_02243258.h
@@ -5,10 +5,10 @@
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "pokemon.h"

-SysTask * ov6_02243F88(UnkStruct_0203CDB0 * param0, u32 param1, Pokemon * param2, int param3);
+SysTask * ov6_02243F88(FieldSystem * param0, u32 param1, Pokemon * param2, int param3);
 int ov6_02243FBC(SysTask * param0);
 void ov6_02243FC8(SysTask * param0);
-SysTask * ov6_02245CCC(UnkStruct_0203CDB0 * param0, int param1);
+SysTask * ov6_02245CCC(FieldSystem * param0, int param1);
 int ov6_02245CF0(SysTask * param0);
 void ov6_02245CFC(SysTask * param0);

--- a/include/overlay006/ov6_02246034.h
+++ b/include/overlay006/ov6_02246034.h
@@ -4,6 +4,6 @@
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "overlay006/battle_params.h"

-void ov6_02246034(UnkStruct_0203CDB0 * param0, BattleParams * param1);
+void ov6_02246034(FieldSystem * param0, BattleParams * param1);

 #endif // POKEPLATINUM_OV6_02246034_H
--- a/include/overlay006/ov6_02246184.h
+++ b/include/overlay006/ov6_02246184.h
@@ -10,7 +10,7 @@ UnkStruct_ov6_02246204 * ov6_02246184(u32 param0, u32 param1);
 void ov6_02246204(UnkStruct_ov6_02246204 * param0);
 u32 ov6_02246224(const UnkStruct_ov6_02246204 * param0);
 u32 ov6_0224622C(const UnkStruct_ov6_02246204 * param0);
-void ov6_02246234(UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02246204 * param1, int param2);
-void ov6_02246254(UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02246204 * param1, int param2, UnkStruct_ov6_02246254 * param3, Pokemon * param4, Pokemon * param5);
+void ov6_02246234(FieldSystem * param0, UnkStruct_ov6_02246204 * param1, int param2);
+void ov6_02246254(FieldSystem * param0, UnkStruct_ov6_02246204 * param1, int param2, UnkStruct_ov6_02246254 * param3, Pokemon * param4, Pokemon * param5);

 #endif // POKEPLATINUM_OV6_02246184_H
--- a/include/overlay006/ov6_02246444.h
+++ b/include/overlay006/ov6_02246444.h
@@ -10,7 +10,7 @@ int ov6_02246490(const UnkStruct_ov6_022465F4 * param0);
 const u16 * ov6_02246494(const UnkStruct_ov6_022465F4 * param0);
 void * ov6_02246498(UnkStruct_ov6_022465F4 * param0);
 int ov6_022464A4(const UnkStruct_ov6_022465F4 * param0);
-UnkStruct_ov6_022465F4 * ov6_022465A0(UnkStruct_0203CDB0 * param0, int param1, int param2);
+UnkStruct_ov6_022465F4 * ov6_022465A0(FieldSystem * param0, int param1, int param2);
 void ov6_022465F4(UnkStruct_ov6_022465F4 * param0);

 #endif // POKEPLATINUM_OV6_02246444_H
--- a/include/overlay006/ov6_022465FC.h
+++ b/include/overlay006/ov6_022465FC.h
@@ -4,11 +4,11 @@
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_0203CDB0_decl.h"

-void ov6_022465FC(UnkStruct_0203CDB0 * param0);
-int ov6_0224660C(UnkStruct_0203CDB0 * param0);
-int ov6_022468B0(UnkStruct_0203CDB0 * param0, BOOL param1, BOOL param2);
-int ov6_02246920(UnkStruct_0203CDB0 * param0);
-int ov6_02246978(UnkStruct_0203CDB0 * param0, int param1);
-BOOL ov6_022469E0(UnkStruct_0203CDB0 * param0, StringFormatter * param1, int param2, u16 * param3, u16 * param4);
+void ov6_022465FC(FieldSystem * param0);
+int ov6_0224660C(FieldSystem * param0);
+int ov6_022468B0(FieldSystem * param0, BOOL param1, BOOL param2);
+int ov6_02246920(FieldSystem * param0);
+int ov6_02246978(FieldSystem * param0, int param1);
+BOOL ov6_022469E0(FieldSystem * param0, StringFormatter * param1, int param2, u16 * param3, u16 * param4);

 #endif // POKEPLATINUM_OV6_022465FC_H
--- a/include/overlay006/ov6_02246A30.h
+++ b/include/overlay006/ov6_02246A30.h
@@ -3,6 +3,6 @@

 #include "struct_decls/struct_0203CDB0_decl.h"

-int ov6_02246B40(UnkStruct_0203CDB0 * param0);
+int ov6_02246B40(FieldSystem * param0);

 #endif // POKEPLATINUM_OV6_02246A30_H
--- a/include/overlay006/ov6_02246BF4.h
+++ b/include/overlay006/ov6_02246BF4.h
@@ -4,6 +4,6 @@
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "savedata.h"

-BOOL ov6_02246BF4(SaveData * param0, UnkStruct_0203CDB0 * param1);
+BOOL ov6_02246BF4(SaveData * param0, FieldSystem * param1);

 #endif // POKEPLATINUM_OV6_02246BF4_H
--- a/include/overlay006/ov6_02246C24.h
+++ b/include/overlay006/ov6_02246C24.h
@@ -3,6 +3,6 @@

 #include "struct_decls/struct_0203CDB0_decl.h"

-void ov6_02246C24(UnkStruct_0203CDB0 * param0, const u8 param1);
+void ov6_02246C24(FieldSystem * param0, const u8 param1);

 #endif // POKEPLATINUM_OV6_02246C24_H
--- a/include/overlay006/ov6_02246F00.h
+++ b/include/overlay006/ov6_02246F00.h
@@ -3,6 +3,6 @@

 #include "struct_decls/struct_0203CDB0_decl.h"

-void ov6_02246F00(UnkStruct_0203CDB0 * param0, const u8 param1, const u8 param2);
+void ov6_02246F00(FieldSystem * param0, const u8 param1, const u8 param2);

 #endif // POKEPLATINUM_OV6_02246F00_H
--- a/include/overlay006/ov6_02247078.h
+++ b/include/overlay006/ov6_02247078.h
@@ -3,8 +3,8 @@

 #include "struct_decls/struct_0203CDB0_decl.h"

-void ov6_02247078(UnkStruct_0203CDB0 * param0, const u8 param1);
-void ov6_022470E8(UnkStruct_0203CDB0 * param0, const u8 param1);
-void ov6_022470F4(UnkStruct_0203CDB0 * param0, const u8 param1);
+void ov6_02247078(FieldSystem * param0, const u8 param1);
+void ov6_022470E8(FieldSystem * param0, const u8 param1);
+void ov6_022470F4(FieldSystem * param0, const u8 param1);

 #endif // POKEPLATINUM_OV6_02247078_H
--- a/include/overlay006/ov6_02247100.h
+++ b/include/overlay006/ov6_02247100.h
@@ -5,13 +5,13 @@
 #include "struct_decls/struct_020508D4_decl.h"
 #include "pokemon.h"

-void * ov6_02247100(UnkStruct_0203CDB0 * param0, u32 param1);
+void * ov6_02247100(FieldSystem * param0, u32 param1);
 BOOL ov6_02247120(UnkStruct_020508D4 * param0);
-void * ov6_022472C8(UnkStruct_0203CDB0 * param0, u32 param1, int param2);
+void * ov6_022472C8(FieldSystem * param0, u32 param1, int param2);
 BOOL ov6_022472E8(UnkStruct_020508D4 * param0);
-void * ov6_02247488(UnkStruct_0203CDB0 *, Pokemon *, u32 param0);
+void * ov6_02247488(FieldSystem *, Pokemon *, u32 param0);
 BOOL ov6_022474AC(UnkStruct_020508D4 * param0);
-void * ov6_02247530(UnkStruct_0203CDB0 * param0, Pokemon * param1, u32 param2);
+void * ov6_02247530(FieldSystem * param0, Pokemon * param1, u32 param2);
 BOOL ov6_02247554(UnkStruct_020508D4 * param0);

 #endif // POKEPLATINUM_OV6_02247100_H
--- a/include/overlay006/ov6_02247660.h
+++ b/include/overlay006/ov6_02247660.h
@@ -3,7 +3,7 @@

 #include "struct_decls/struct_0203CDB0_decl.h"

-BOOL ov6_02247660(UnkStruct_0203CDB0 * param0);
+BOOL ov6_02247660(FieldSystem * param0);
 void ov6_02247794(u8 * param0, u8 * param1);
 void ov6_022477A0(int * param0);

--- a/include/overlay006/ov6_02247D30.h
+++ b/include/overlay006/ov6_02247D30.h
@@ -3,6 +3,6 @@

 #include "struct_decls/struct_0203CDB0_decl.h"

-void ov6_02247D30(UnkStruct_0203CDB0 * param0, const u8 param1);
+void ov6_02247D30(FieldSystem * param0, const u8 param1);

 #endif // POKEPLATINUM_OV6_02247D30_H
--- a/include/overlay006/ov6_02247F5C.h
+++ b/include/overlay006/ov6_02247F5C.h
@@ -3,7 +3,7 @@

 #include "struct_decls/struct_0203CDB0_decl.h"

-void ov6_02247F5C(UnkStruct_0203CDB0 * param0);
-void ov6_02247FBC(UnkStruct_0203CDB0 * param0);
+void ov6_02247F5C(FieldSystem * param0);
+void ov6_02247FBC(FieldSystem * param0);

 #endif // POKEPLATINUM_OV6_02247F5C_H
--- a/include/overlay006/ov6_02248050.h
+++ b/include/overlay006/ov6_02248050.h
@@ -4,16 +4,16 @@
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "overlay005/struct_ov5_021D1BEC_decl.h"

-UnkStruct_ov5_021D1BEC * ov6_0224830C(UnkStruct_0203CDB0 * param0);
+UnkStruct_ov5_021D1BEC * ov6_0224830C(FieldSystem * param0);
 void ov6_02248320(UnkStruct_ov5_021D1BEC * param0);
 BOOL ov6_02248328(UnkStruct_ov5_021D1BEC * param0);
-UnkStruct_ov5_021D1BEC * ov6_02248450(UnkStruct_0203CDB0 * param0);
-UnkStruct_ov5_021D1BEC * ov6_02248464(UnkStruct_0203CDB0 * param0);
+UnkStruct_ov5_021D1BEC * ov6_02248450(FieldSystem * param0);
+UnkStruct_ov5_021D1BEC * ov6_02248464(FieldSystem * param0);
 void ov6_02248478(UnkStruct_ov5_021D1BEC * param0);
 BOOL ov6_02248480(UnkStruct_ov5_021D1BEC * param0);
-UnkStruct_ov5_021D1BEC * ov6_022485F4(UnkStruct_0203CDB0 * param0);
+UnkStruct_ov5_021D1BEC * ov6_022485F4(FieldSystem * param0);
 void ov6_02248608(UnkStruct_ov5_021D1BEC * param0);
-UnkStruct_ov5_021D1BEC * ov6_0224892C(UnkStruct_0203CDB0 * param0);
+UnkStruct_ov5_021D1BEC * ov6_0224892C(FieldSystem * param0);
 void ov6_02248940(UnkStruct_ov5_021D1BEC * param0);

 #endif // POKEPLATINUM_OV6_02248050_H
--- a/include/overlay006/ov6_02248948.h
+++ b/include/overlay006/ov6_02248948.h
@@ -3,6 +3,6 @@

 #include "struct_decls/struct_0203CDB0_decl.h"

-void ov6_0224899C(UnkStruct_0203CDB0 * param0, u16 * param1, u32 param2, u32 param3);
+void ov6_0224899C(FieldSystem * param0, u16 * param1, u32 param2, u32 param3);

 #endif // POKEPLATINUM_OV6_02248948_H
--- a/include/overlay007/ov7_02249960.h
+++ b/include/overlay007/ov7_02249960.h
@@ -3,10 +3,10 @@

 #include "struct_decls/struct_0203CDB0_decl.h"

-void ov7_0224B414(UnkStruct_0203CDB0 * param0, int param1, int param2, int param3);
+void ov7_0224B414(FieldSystem * param0, int param1, int param2, int param3);
 void ov7_0224B450(void);
 u32 ov7_0224B460(void);
-void ov7_0224B47C(UnkStruct_0203CDB0 * param0, int param1, int param2, int param3);
+void ov7_0224B47C(FieldSystem * param0, int param1, int param2, int param3);
 void ov7_0224B4B8(void);
 u32 ov7_0224B4C8(void);
 BOOL ov7_0224B4E4(void);
--- a/include/overlay007/ov7_0224CD28.h
+++ b/include/overlay007/ov7_0224CD28.h
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "struct_decls/struct_020508D4_decl.h"

-void ov7_0224CDA4(UnkStruct_020508D4 * param0, UnkStruct_0203CDB0 * param1, u16 * param2, u8 param3, BOOL param4);
+void ov7_0224CDA4(UnkStruct_020508D4 * param0, FieldSystem * param1, u16 * param2, u8 param3, BOOL param4);
 BOOL ov7_0224CEAC(UnkStruct_020508D4 * param0);

 #endif // POKEPLATINUM_OV7_0224CD28_H
--- a/include/overlay008/ov8_02249960.h
+++ b/include/overlay008/ov8_02249960.h
@@ -6,31 +6,31 @@
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "struct_defs/struct_0205AA50.h"

-void ov8_0224997C(UnkStruct_0203CDB0 * param0);
-BOOL ov8_02249A40(UnkStruct_0203CDB0 * param0, const int param1, const int param2, const fx32 param3, BOOL * param4);
-void ov8_02249DBC(UnkStruct_0203CDB0 * param0);
-void ov8_02249FB8(UnkStruct_0203CDB0 * param0);
-void ov8_0224A8C8(UnkStruct_0203CDB0 * param0);
-BOOL ov8_0224AAA8(UnkStruct_0203CDB0 * param0);
-void ov8_0224AAE8(UnkStruct_0203CDB0 * param0);
-BOOL ov8_0224AAFC(UnkStruct_0203CDB0 * param0, const int param1, const int param2, const fx32 param3, BOOL * param4);
-void ov8_0224ABD4(UnkStruct_0203CDB0 * param0);
-void ov8_0224ACAC(UnkStruct_0203CDB0 * param0);
-BOOL ov8_0224ACC0(UnkStruct_0203CDB0 * param0, const int param1, const int param2, const fx32 param3, BOOL * param4);
-void ov8_0224AD34(UnkStruct_0203CDB0 * param0, const u8 param1);
-void ov8_0224B020(UnkStruct_0203CDB0 * param0);
-void ov8_0224B0FC(UnkStruct_0203CDB0 * param0);
-BOOL ov8_0224B110(UnkStruct_0203CDB0 * param0, const int param1, const int param2, const fx32 param3, BOOL * param4);
-BOOL ov8_0224B67C(UnkStruct_0203CDB0 * param0, Window * param1, MessageLoader * param2, Strbuf *param3);
-BOOL ov8_0224B714(UnkStruct_0203CDB0 * param0, int param1, int param2, int param3);
-void ov8_0224B764(UnkStruct_0203CDB0 * param0);
-void ov8_0224B7C0(UnkStruct_0203CDB0 * param0);
-BOOL ov8_0224B7D4(UnkStruct_0203CDB0 * param0, const int param1, const int param2, const fx32 param3, BOOL * param4);
-BOOL ov8_0224BF4C(UnkStruct_0203CDB0 * param0);
-void ov8_0224C198(UnkStruct_0203CDB0 * param0);
-void ov8_0224C388(UnkStruct_0203CDB0 * param0);
-BOOL ov8_0224C51C(UnkStruct_0203CDB0 * param0);
-BOOL ov8_0224C5DC(UnkStruct_0203CDB0 * param0, void * param1);
-BOOL ov8_0224C62C(UnkStruct_0203CDB0 * param0, int param1, int param2, int * param3);
+void ov8_0224997C(FieldSystem * param0);
+BOOL ov8_02249A40(FieldSystem * param0, const int param1, const int param2, const fx32 param3, BOOL * param4);
+void ov8_02249DBC(FieldSystem * param0);
+void ov8_02249FB8(FieldSystem * param0);
+void ov8_0224A8C8(FieldSystem * param0);
+BOOL ov8_0224AAA8(FieldSystem * param0);
+void ov8_0224AAE8(FieldSystem * param0);
+BOOL ov8_0224AAFC(FieldSystem * param0, const int param1, const int param2, const fx32 param3, BOOL * param4);
+void ov8_0224ABD4(FieldSystem * param0);
+void ov8_0224ACAC(FieldSystem * param0);
+BOOL ov8_0224ACC0(FieldSystem * param0, const int param1, const int param2, const fx32 param3, BOOL * param4);
+void ov8_0224AD34(FieldSystem * param0, const u8 param1);
+void ov8_0224B020(FieldSystem * param0);
+void ov8_0224B0FC(FieldSystem * param0);
+BOOL ov8_0224B110(FieldSystem * param0, const int param1, const int param2, const fx32 param3, BOOL * param4);
+BOOL ov8_0224B67C(FieldSystem * param0, Window * param1, MessageLoader * param2, Strbuf *param3);
+BOOL ov8_0224B714(FieldSystem * param0, int param1, int param2, int param3);
+void ov8_0224B764(FieldSystem * param0);
+void ov8_0224B7C0(FieldSystem * param0);
+BOOL ov8_0224B7D4(FieldSystem * param0, const int param1, const int param2, const fx32 param3, BOOL * param4);
+BOOL ov8_0224BF4C(FieldSystem * param0);
+void ov8_0224C198(FieldSystem * param0);
+void ov8_0224C388(FieldSystem * param0);
+BOOL ov8_0224C51C(FieldSystem * param0);
+BOOL ov8_0224C5DC(FieldSystem * param0, void * param1);
+BOOL ov8_0224C62C(FieldSystem * param0, int param1, int param2, int * param3);

 #endif // POKEPLATINUM_OV8_02249960_H
--- a/include/overlay009/ov9_02249960.h
+++ b/include/overlay009/ov9_02249960.h
@@ -7,36 +7,36 @@
 #include "struct_decls/struct_02061AB4_decl.h"
 #include "overlay009/struct_ov9_0224F6EC_decl.h"

-void ov9_02249960(UnkStruct_0203CDB0 * param0);
-void ov9_02249A60(UnkStruct_0203CDB0 * param0);
-BOOL ov9_02249E50(UnkStruct_0203CDB0 * param0, const int param1, const int param2, const fx32 param3, BOOL * param4);
-void ov9_02249F9C(UnkStruct_0203CDB0 * param0);
-void ov9_02249FD0(UnkStruct_0203CDB0 * param0);
-int ov9_0224A520(UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1);
-void ov9_0224A558(UnkStruct_0203CDB0 * param0, UnkStruct_020216E0 * param1, int param2);
-void ov9_0224A564(UnkStruct_0203CDB0 * param0, const UnkStruct_020216E0 * param1);
-BOOL ov9_0224A59C(UnkStruct_0203CDB0 * param0, int param1);
-BOOL ov9_0224A67C(UnkStruct_0203CDB0 * param0, int param1);
-BOOL ov9_0224A71C(UnkStruct_0203CDB0 * param0);
-BOOL ov9_0224A800(UnkStruct_0203CDB0 * param0, int param1);
-void ov9_0224CA50(UnkStruct_0203CDB0 * param0);
-void ov9_0224CA5C(UnkStruct_0203CDB0 * param0);
-void ov9_0224E884(UnkStruct_0203CDB0 * param0, u16 param1);
-void ov9_0224E8A8(UnkStruct_0203CDB0 * param0);
-void ov9_0224F158(UnkStruct_0203CDB0 * param0, u16 param1);
-void ov9_0224F16C(UnkStruct_0203CDB0 * param0, u16 param1);
+void ov9_02249960(FieldSystem * param0);
+void ov9_02249A60(FieldSystem * param0);
+BOOL ov9_02249E50(FieldSystem * param0, const int param1, const int param2, const fx32 param3, BOOL * param4);
+void ov9_02249F9C(FieldSystem * param0);
+void ov9_02249FD0(FieldSystem * param0);
+int ov9_0224A520(FieldSystem * param0, UnkStruct_02061AB4 * param1);
+void ov9_0224A558(FieldSystem * param0, UnkStruct_020216E0 * param1, int param2);
+void ov9_0224A564(FieldSystem * param0, const UnkStruct_020216E0 * param1);
+BOOL ov9_0224A59C(FieldSystem * param0, int param1);
+BOOL ov9_0224A67C(FieldSystem * param0, int param1);
+BOOL ov9_0224A71C(FieldSystem * param0);
+BOOL ov9_0224A800(FieldSystem * param0, int param1);
+void ov9_0224CA50(FieldSystem * param0);
+void ov9_0224CA5C(FieldSystem * param0);
+void ov9_0224E884(FieldSystem * param0, u16 param1);
+void ov9_0224E8A8(FieldSystem * param0);
+void ov9_0224F158(FieldSystem * param0, u16 param1);
+void ov9_0224F16C(FieldSystem * param0, u16 param1);
 BOOL ov9_0224F240(const UnkStruct_02061AB4 * param0, int param1);
 BOOL ov9_0224F2B0(const UnkStruct_02061AB4 * param0);
-UnkStruct_ov9_0224F6EC * ov9_0224F2BC(UnkStruct_0203CDB0 * param0, UnkStruct_020508D4 * param1, UnkStruct_02061AB4 * param2);
+UnkStruct_ov9_0224F6EC * ov9_0224F2BC(FieldSystem * param0, UnkStruct_020508D4 * param1, UnkStruct_02061AB4 * param2);
 BOOL ov9_0224F6EC(UnkStruct_ov9_0224F6EC * param0);
-void ov9_02250780(UnkStruct_0203CDB0 * param0);
-BOOL ov9_02250F74(UnkStruct_0203CDB0 * param0);
-BOOL ov9_02250F90(UnkStruct_0203CDB0 * param0, int param1, int param2, int param3);
-BOOL ov9_02250FBC(UnkStruct_0203CDB0 * param0, int param1, int param2, int param3);
-BOOL ov9_02250FD8(UnkStruct_0203CDB0 * param0, int param1, int param2, int param3);
-void ov9_02251000(UnkStruct_0203CDB0 * param0, int param1, int param2, int param3);
-BOOL ov9_02251044(UnkStruct_0203CDB0 * param0, int param1, int param2, int param3, u32 * param4);
+void ov9_02250780(FieldSystem * param0);
+BOOL ov9_02250F74(FieldSystem * param0);
+BOOL ov9_02250F90(FieldSystem * param0, int param1, int param2, int param3);
+BOOL ov9_02250FBC(FieldSystem * param0, int param1, int param2, int param3);
+BOOL ov9_02250FD8(FieldSystem * param0, int param1, int param2, int param3);
+void ov9_02251000(FieldSystem * param0, int param1, int param2, int param3);
+BOOL ov9_02251044(FieldSystem * param0, int param1, int param2, int param3, u32 * param4);
 void ov9_02251094(int param0, int * param1, int * param2, int * param3);
-BOOL ov9_022511A0(UnkStruct_0203CDB0 * param0, int param1, int param2, int param3);
+BOOL ov9_022511A0(FieldSystem * param0, int param1, int param2, int param3);

 #endif // POKEPLATINUM_OV9_02249960_H
--- a/include/overlay023/ov23_0223E140.h
+++ b/include/overlay023/ov23_0223E140.h
@@ -7,7 +7,7 @@

 #include <nitro/math.h>

-void ov23_0223E1E4(void * param0, UnkStruct_0203CDB0 * param1);
+void ov23_0223E1E4(void * param0, FieldSystem * param1);
 int ov23_0223E2E8(void);
 void ov23_0223E2F0(void);
 void ov23_0223E2F4(void);
--- a/include/overlay023/ov23_022416A8.h
+++ b/include/overlay023/ov23_022416A8.h
@@ -8,7 +8,7 @@

 #include <nitro/math.h>

-void ov23_022416E0(void * param0, UnkStruct_0203CDB0 * param1);
+void ov23_022416E0(void * param0, FieldSystem * param1);
 int ov23_022417C4(void);
 void ov23_022417CC(void);
 void ov23_022417E0(void);
--- a/include/overlay023/ov23_02241F74.h
+++ b/include/overlay023/ov23_02241F74.h
@@ -34,11 +34,11 @@ void ov23_02242830(u8 param0);
 int ov23_022428D4(void);
 void ov23_022428D8(int param0, int param1, void * param2, void * param3);
 void ov23_02242B14(void);
-void ov23_02242BC0(UnkStruct_0203CDB0 * param0);
+void ov23_02242BC0(FieldSystem * param0);
 void ov23_02242C78(void);
 void ov23_02242CB4(void);
 void ov23_02242D08(void);
-void ov23_02242D44(UnkStruct_0203CDB0 * param0);
+void ov23_02242D44(FieldSystem * param0);
 BOOL ov23_02242D60(Strbuf *param0);
 UnkStruct_02029894 * ov23_02242E10(SaveData * param0);
 int ov23_02242E28(void);
--- a/include/overlay023/ov23_0224340C.h
+++ b/include/overlay023/ov23_0224340C.h
@@ -8,11 +8,11 @@

 #include <nitro/math.h>

-void ov23_022434BC(void * param0, UnkStruct_0203CDB0 * param1);
+void ov23_022434BC(void * param0, FieldSystem * param1);
 void ov23_02243520(void);
 void ov23_022435A8(void);
 void ov23_022435DC(void);
-void ov23_02243670(UnkStruct_0203CDB0 * param0);
+void ov23_02243670(FieldSystem * param0);
 void ov23_022436F0(int param0);
 int ov23_02243858(void);
 int ov23_02243860(void);
@@ -64,7 +64,7 @@ void ov23_022457E4(int param0, int param1, void * param2, void * param3);
 void ov23_0224589C(int param0, int param1, void * param2, void * param3);
 int ov23_02245908(void);
 void ov23_022468A8(BGL * param0);
-void ov23_022489F8(UnkStruct_0203CDB0 * param0, int param1, int param2, int param3, int param4, u8 * param5, int param6, u8 * param7, int param8, u8 * param9, int param10);
+void ov23_022489F8(FieldSystem * param0, int param1, int param2, int param3, int param4, u8 * param5, int param6, u8 * param7, int param8, u8 * param9, int param10);
 void ov23_02248B98(int param0);

 #endif // POKEPLATINUM_OV23_0224340C_H
--- a/include/overlay023/ov23_02248F1C.h
+++ b/include/overlay023/ov23_02248F1C.h
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "overlay023/struct_ov23_0224942C_decl.h"

-UnkStruct_ov23_0224942C * ov23_02249404(UnkStruct_0203CDB0 * param0);
+UnkStruct_ov23_0224942C * ov23_02249404(FieldSystem * param0);
 void ov23_0224942C(UnkStruct_ov23_0224942C * param0);

 #endif // POKEPLATINUM_OV23_02248F1C_H
--- a/include/overlay023/ov23_022499E4.h
+++ b/include/overlay023/ov23_022499E4.h
@@ -3,7 +3,7 @@

 #include "struct_decls/struct_0203CDB0_decl.h"

-void ov23_022499E8(UnkStruct_0203CDB0 * param0);
+void ov23_022499E8(FieldSystem * param0);
 void ov23_02249A2C(void);
 void ov23_02249A5C(void);
 void ov23_02249A74(void);
--- a/include/overlay023/ov23_0224B05C.h
+++ b/include/overlay023/ov23_0224B05C.h
@@ -7,8 +7,8 @@
 #include "savedata.h"
 #include "overlay023/struct_ov23_0224271C_decl.h"

-void ov23_0224B144(void * param0, UnkStruct_0203CDB0 * param1);
-void ov23_0224B2C8(UnkStruct_0203CDB0 * param0);
+void ov23_0224B144(void * param0, FieldSystem * param1);
+void ov23_0224B2C8(FieldSystem * param0);
 void ov23_0224B430(void);
 void ov23_0224B460(void);
 void ov23_0224B4E4(void);
--- a/include/overlay023/ov23_0224DC40.h
+++ b/include/overlay023/ov23_0224DC40.h
@@ -4,8 +4,8 @@
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "overlay023/funcptr_ov23_0224DCB8.h"

-void ov23_0224DCB8(int param0, UnkFuncPtr_ov23_0224DCB8 param1, UnkStruct_0203CDB0 * param2);
-void ov23_0224F07C(int param0, int param1, UnkStruct_0203CDB0 * param2);
+void ov23_0224DCB8(int param0, UnkFuncPtr_ov23_0224DCB8 param1, FieldSystem * param2);
+void ov23_0224F07C(int param0, int param1, FieldSystem * param2);
 void ov23_0224F0F0(int param0, int param1, void * param2, void * param3);
 void ov23_0224F0FC(int param0, int param1, void * param2, void * param3);
 void ov23_0224F108(int param0, int param1, void * param2, void * param3);
--- a/include/overlay023/ov23_0224F294.h
+++ b/include/overlay023/ov23_0224F294.h
@@ -21,7 +21,7 @@ BOOL ov23_0224F6E0(int param0, int param1);
 BOOL ov23_0224F710(int param0);
 BOOL ov23_0224F730(int param0);
 BOOL ov23_0224F744(int param0);
-void ov23_0224F758(UnkFuncPtr_ov23_0224F758 param0, UnkStruct_0203CDB0 * param1);
+void ov23_0224F758(UnkFuncPtr_ov23_0224F758 param0, FieldSystem * param1);
 void ov23_0224FB7C(UnkStruct_ov23_02250CD4 * param0);
 void ov23_0224FD68(int param0);
 void ov23_0224FD84(UnkStruct_0200112C * param0, u32 param1, u8 param2);
@@ -32,14 +32,14 @@ void ov23_02250184(UnkStruct_ov23_02250CD4 * param0);
 void ov23_02250540(UnkStruct_0200112C * param0, u32 param1, u8 param2);
 void ov23_02250578(UnkStruct_ov23_02250CD4 * param0);
 void ov23_02250598(UnkStruct_ov23_02250CD4 * param0);
-void ov23_02250A50(UnkFuncPtr_ov23_0224F758 param0, UnkStruct_0203CDB0 * param1);
+void ov23_02250A50(UnkFuncPtr_ov23_0224F758 param0, FieldSystem * param1);
 void ov23_02250C3C(UnkStruct_0200112C * param0, u32 param1, u8 param2);
 void ov23_02250CB0(UnkStruct_ov23_02250CD4 * param0);
 void ov23_02250CD4(UnkStruct_ov23_02250CD4 * param0);
 void ov23_02250D2C(UnkStruct_ov23_02250CD4 * param0);
 void ov23_02250D5C(UnkStruct_ov23_02250CD4 * param0);
 void ov23_02251044(void * param0, u32 param1);
-void * ov23_022511B0(UnkFuncPtr_ov23_0224F758 param0, UnkStruct_0203CDB0 * param1);
+void * ov23_022511B0(UnkFuncPtr_ov23_0224F758 param0, FieldSystem * param1);
 void ov23_02251238(UnkStruct_ov23_02250CD4 * param0, int param1, int param2);
 void ov23_02251270(SysTask * param0, void * param1);

--- a/include/overlay023/ov23_022521F0.h
+++ b/include/overlay023/ov23_022521F0.h
@@ -5,7 +5,7 @@
 #include "overlay023/struct_ov23_02250CD4.h"

 int ov23_02252C70(void * param0);
-void * ov23_02252C98(BOOL param0, UnkStruct_0203CDB0 * param1, int param2);
+void * ov23_02252C98(BOOL param0, FieldSystem * param1, int param2);
 int ov23_02252C9C(int param0);
 void ov23_02252CD4(void);
 void ov23_02252CE0(int param0, int param1);
@@ -14,6 +14,6 @@ void ov23_02252D08(int param0, int param1);
 void ov23_02252D74(UnkStruct_ov23_02250CD4 * param0, int param1);
 void ov23_02252DF4(UnkStruct_ov23_02250CD4 * param0);
 void ov23_02252E18(UnkStruct_ov23_02250CD4 * param0);
-void ov23_022534A0(UnkStruct_0203CDB0 * param0);
+void ov23_022534A0(FieldSystem * param0);

 #endif // POKEPLATINUM_OV23_022521F0_H
--- a/include/overlay023/ov23_022542CC.h
+++ b/include/overlay023/ov23_022542CC.h
@@ -6,12 +6,12 @@
 #include "overlay023/struct_ov23_02254594_decl.h"

 UnkStruct_ov23_022542D8 * ov23_022542CC(void);
-void ov23_022542D8(UnkStruct_ov23_022542D8 * param0, UnkStruct_0203CDB0 * param1, u16 * param2, u16 * param3);
+void ov23_022542D8(UnkStruct_ov23_022542D8 * param0, FieldSystem * param1, u16 * param2, u16 * param3);
 void ov23_0225430C(UnkStruct_ov23_022542D8 * param0);
 const u32 ov23_02254314(UnkStruct_ov23_022542D8 * param0);
 BOOL ov23_02254318(UnkStruct_ov23_022542D8 * param0);
 UnkStruct_ov23_02254594 * ov23_02254588(void);
-void ov23_02254594(UnkStruct_ov23_02254594 * param0, UnkStruct_0203CDB0 * param1, u16 * param2, u16 * param3);
+void ov23_02254594(UnkStruct_ov23_02254594 * param0, FieldSystem * param1, u16 * param2, u16 * param3);
 void ov23_022545C4(UnkStruct_ov23_02254594 * param0, const u8 param1, const u8 param2);
 void ov23_022545D0(UnkStruct_ov23_02254594 * param0);
 const u32 ov23_022545D8(UnkStruct_ov23_02254594 * param0);
--- a/include/overlay023/ov23_02254A14.h
+++ b/include/overlay023/ov23_02254A14.h
@@ -4,6 +4,6 @@
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "struct_decls/struct_020508D4_decl.h"

-void ov23_02254D98(UnkStruct_0203CDB0 * param0, UnkStruct_020508D4 * param1);
+void ov23_02254D98(FieldSystem * param0, UnkStruct_020508D4 * param1);

 #endif // POKEPLATINUM_OV23_02254A14_H
--- a/include/overlay023/struct_ov23_0224A294.h
+++ b/include/overlay023/struct_ov23_0224A294.h
@@ -18,7 +18,7 @@ typedef struct {
    UnkStruct_ov101_021D5D90 * unk_28[8];
    u8 unk_48[8];
    SysTask * unk_50;
-    UnkStruct_0203CDB0 * unk_54;
+    FieldSystem * unk_54;
    UnkStruct_ov23_0224A294_sub1 unk_58;
    u8 unk_5A[8];
    UnkStruct_02057B48 unk_62[8];
--- a/include/overlay023/struct_ov23_02250CD4.h
+++ b/include/overlay023/struct_ov23_02250CD4.h
@@ -23,7 +23,7 @@ typedef struct {
    void * unk_00;
    SysTask * unk_04;
    UnkStruct_0206A844 * unk_08;
-    UnkStruct_0203CDB0 * unk_0C;
+    FieldSystem * unk_0C;
    Window unk_10;
    Window unk_20;
    Window unk_30;
--- a/include/overlay025/ov25_02253CE0.h
+++ b/include/overlay025/ov25_02253CE0.h
@@ -15,7 +15,7 @@

 #include <nnsys.h>

-void ov25_02253CE8(UnkStruct_0203CDB0 * param0, UnkStruct_ov25_02253CE0 ** param1, SaveData * param2, BGL * param3, NNSG2dOamManagerInstance * param4);
+void ov25_02253CE8(FieldSystem * param0, UnkStruct_ov25_02253CE0 ** param1, SaveData * param2, BGL * param3, NNSG2dOamManagerInstance * param4);
 void ov25_02253D5C(UnkStruct_ov25_02253CE0 * param0);
 BOOL ov25_02253D70(UnkStruct_ov25_02253CE0 * param0);
 void ov25_02253D7C(UnkStruct_ov25_02253CE0 * param0, int param1, u32 param2);
@@ -34,7 +34,7 @@ BOOL ov25_0225450C(const UnkStruct_ov25_0225424C * param0);
 void ov25_02254518(const UnkStruct_ov25_0225424C * param0, UnkStruct_ov25_02255B34 * param1);
 BOOL ov25_02254534(const UnkStruct_ov25_0225424C * param0);
 BOOL ov25_02254538(const UnkStruct_ov25_0225424C * param0);
-UnkStruct_0203CDB0 * ov25_0225453C(const UnkStruct_ov25_0225424C * param0);
+FieldSystem * ov25_0225453C(const UnkStruct_ov25_0225424C * param0);
 PoketchData * ov25_02254540(const UnkStruct_ov25_0225424C * param0);
 SaveData * ov25_02254544(const UnkStruct_ov25_0225424C * param0);
 int ov25_02254548(const UnkStruct_ov25_0225424C * param0);
--- a/include/overlay056/ov56_022561C0.h
+++ b/include/overlay056/ov56_022561C0.h
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "overlay056/struct_ov56_02256468_decl.h"

-UnkStruct_ov56_02256468 * ov56_02256410(UnkStruct_0203CDB0 * param0);
+UnkStruct_ov56_02256468 * ov56_02256410(FieldSystem * param0);
 void ov56_02256468(UnkStruct_ov56_02256468 * param0);

 #endif // POKEPLATINUM_OV56_022561C0_H
--- a/include/overlay088/struct_ov88_0223C370.h
+++ b/include/overlay088/struct_ov88_0223C370.h
@@ -14,7 +14,7 @@
 #include "savedata.h"

 typedef struct {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
    TrainerInfo * unk_04;
    Party * unk_08;
    UnkStruct_02027F8C * unk_0C;
--- a/include/overlay104/struct_ov104_02230BE4.h
+++ b/include/overlay104/struct_ov104_02230BE4.h
@@ -19,7 +19,7 @@ typedef struct {
    int unk_1C;
    UnkStruct_0209C370 * unk_20;
    u8 unk_24;
-    UnkStruct_0203CDB0 * unk_28;
+    FieldSystem * unk_28;
 } UnkStruct_ov104_02230BE4;

 #endif // POKEPLATINUM_STRUCT_OV104_02230BE4_H
--- a/include/pokeradar.h
+++ b/include/pokeradar.h
@@ -17,19 +17,19 @@ enum PatchShakeType {
 RadarChain *RadarChain_Init(const int heapID);
 void RadarChain_Free(RadarChain *chain);
 void RadarChain_Clear(RadarChain *chain);
-BOOL RadarSpawnPatches(UnkStruct_0203CDB0 *param0, const int param1, const int param2, RadarChain *chain);
-void SetupGrassPatches(UnkStruct_0203CDB0 *param0, const int param1, RadarChain *chain);
-void sub_02069638(UnkStruct_0203CDB0 *param0, RadarChain *chain);
+BOOL RadarSpawnPatches(FieldSystem *param0, const int param1, const int param2, RadarChain *chain);
+void SetupGrassPatches(FieldSystem *param0, const int param1, RadarChain *chain);
+void sub_02069638(FieldSystem *param0, RadarChain *chain);
 BOOL sub_02069690(RadarChain *chain);
-int sub_020696DC(const int param0, const int param1, UnkStruct_0203CDB0 *param2, RadarChain *chain, int *param4, BOOL *param5, BOOL *param6);
+int sub_020696DC(const int param0, const int param1, FieldSystem *param2, RadarChain *chain, int *param4, BOOL *param5, BOOL *param6);
 void SetRadarMon(RadarChain *chain, const int species, const int level);
 void GetRadarMon(RadarChain *chain, int *species, int *level);
 const BOOL sub_02069798(const RadarChain *chain);
-void sub_0206979C(UnkStruct_0203CDB0 *param0);
+void sub_0206979C(FieldSystem *param0);
 BOOL GetRadarChainActive(const RadarChain *chain);
 BOOL RefreshRadarChain(UnkStruct_020508D4 *param0);
-void sub_02069B74(UnkStruct_0203CDB0 *param0);
-int GetChainCount(UnkStruct_0203CDB0 *param0);
-void RadarChargeStep(UnkStruct_0203CDB0 *param0);
+void sub_02069B74(FieldSystem *param0);
+int GetChainCount(FieldSystem *param0);
+void RadarChargeStep(FieldSystem *param0);

 #endif // POKEPLATINUM_POKERADAR_H
--- a/include/struct_decls/struct_0203CDB0_decl.h
+++ b/include/struct_decls/struct_0203CDB0_decl.h
@@ -1,6 +1,6 @@
 #ifndef POKEPLATINUM_STRUCT_0203CDB0_DECL_H
 #define POKEPLATINUM_STRUCT_0203CDB0_DECL_H

-typedef struct UnkStruct_0203CDB0_t UnkStruct_0203CDB0;
+typedef struct UnkStruct_0203CDB0_t FieldSystem;

 #endif // POKEPLATINUM_STRUCT_0203CDB0_DECL_H
--- a/include/struct_defs/struct_0203CDB0.h
+++ b/include/struct_defs/struct_0203CDB0.h
@@ -95,6 +95,6 @@ typedef struct UnkStruct_0203CDB0_t {
    UnkStruct_0209C370 * unk_BC;
    u32 unk_C0;
    UnkStruct_ov66_0222DCE0_sub1 unk_C4;
-} UnkStruct_0203CDB0;
+} FieldSystem;

 #endif // POKEPLATINUM_STRUCT_0203CDB0_H
--- a/include/struct_defs/struct_0203E6C0.h
+++ b/include/struct_defs/struct_0203E6C0.h
@@ -5,7 +5,7 @@
 #include "savedata.h"

 typedef struct {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
    SaveData * unk_04;
    int unk_08;
    u8 unk_0C;
--- a/include/struct_defs/struct_0203E724_t.h
+++ b/include/struct_defs/struct_0203E724_t.h
@@ -19,7 +19,7 @@ struct UnkStruct_0203E724_t {
    void * unk_28;
    MessageLoader * unk_2C;
    u8 * unk_30;
-    UnkStruct_0203CDB0 * unk_34;
+    FieldSystem * unk_34;
 };

 #endif // POKEPLATINUM_STRUCT_0203E724_T_H
--- a/include/struct_defs/struct_0205964C.h
+++ b/include/struct_defs/struct_0205964C.h
@@ -13,7 +13,7 @@ typedef struct {
    UnkStruct_02072014 * unk_00[4];
    u8 unk_10[4];
    u8 padding_14[4];
-    UnkStruct_0203CDB0 * unk_18;
+    FieldSystem * unk_18;
    MATHRandContext32 unk_1C;
    UnkFuncPtr_020598EC unk_34;
    SysTask * unk_38;
--- a/include/struct_defs/struct_0205C22C.h
+++ b/include/struct_defs/struct_0205C22C.h
@@ -14,7 +14,7 @@ typedef struct UnkStruct_0205C22C_t {
    SysTask * unk_04;
    UnkStruct_0205E884 * unk_08;
    UnkStruct_0205C680 unk_0C[50 + 1];
-    UnkStruct_0203CDB0 * unk_470;
+    FieldSystem * unk_470;
    UnkStruct_02027F8C * unk_474;
    UnkStruct_0205C95C * unk_478;
    int unk_47C;
--- a/include/struct_defs/struct_020684D0.h
+++ b/include/struct_defs/struct_020684D0.h
@@ -13,7 +13,7 @@ typedef struct {
    u16 unk_10;
    u8 padding_12[2];
    UnkStruct_0205E884 * unk_14;
-    UnkStruct_0203CDB0 * unk_18;
+    FieldSystem * unk_18;
 } UnkStruct_020684D0;

 #endif // POKEPLATINUM_STRUCT_020684D0_H
--- a/include/struct_defs/struct_02070950.h
+++ b/include/struct_defs/struct_02070950.h
@@ -6,7 +6,7 @@

 typedef struct UnkStruct_02070950_t {
    u32 unk_00;
-    UnkStruct_0203CDB0 * unk_04;
+    FieldSystem * unk_04;
    UnkStruct_02061AB4 * unk_08;
    u16 unk_0C;
 } UnkStruct_02070950;
--- a/include/struct_defs/struct_02095E80_t.h
+++ b/include/struct_defs/struct_02095E80_t.h
@@ -35,7 +35,7 @@
 #include <nitro/fx/fx.h>

 struct UnkStruct_02095E80_t {
-    UnkStruct_0203CDB0 * unk_00;
+    FieldSystem * unk_00;
    SaveData * unk_04;
    UnkStruct_ov88_0223C370 * unk_08;
    PokemonSummary unk_0C;
--- a/include/struct_defs/struct_0209BBA4.h
+++ b/include/struct_defs/struct_0209BBA4.h
@@ -24,7 +24,7 @@ typedef struct {
    u16 unk_7E[4];
    u16 unk_86[4];
    u16 unk_8E[4];
-    UnkStruct_0203CDB0 * unk_98;
+    FieldSystem * unk_98;
    u8 unk_9C;
    u8 unk_9D;
    u8 unk_9E;
--- a/include/struct_defs/struct_0209C194_1.h
+++ b/include/struct_defs/struct_0209C194_1.h
@@ -16,7 +16,7 @@ typedef struct {
    Options * unk_10;
    UnkStruct_0202CD88 * unk_14;
    UnkStruct_0202B628 * unk_18;
-    UnkStruct_0203CDB0 * unk_1C;
+    FieldSystem * unk_1C;
 } UnkStruct_0209C194_1;

 #endif // POKEPLATINUM_STRUCT_0209C194_1_H
--- a/include/unk_0203A378.h
+++ b/include/unk_0203A378.h
@@ -8,28 +8,28 @@
 #include "struct_decls/struct_020619DC_decl.h"
 #include "overlay006/struct_ov6_02242634.h"

-void sub_0203A378(UnkStruct_0203CDB0 * param0, int param1);
-void sub_0203A398(UnkStruct_0203CDB0 * param0);
-void sub_0203A3B0(UnkStruct_0203CDB0 * param0, int param1);
-void sub_0203A418(UnkStruct_0203CDB0 * param0);
-const UnkStruct_0203A594 * sub_0203A440(const UnkStruct_0203CDB0 * param0);
-int sub_0203A448(const UnkStruct_0203CDB0 * param0);
-const UnkStruct_0203A55C * sub_0203A450(const UnkStruct_0203CDB0 * param0, int param1);
-int sub_0203A468(const UnkStruct_0203CDB0 * param0, int param1, int param2);
-int sub_0203A4A4(const UnkStruct_0203CDB0 * param0);
-const UnkStruct_0203A4AC * sub_0203A4AC(const UnkStruct_0203CDB0 * param0);
-u32 sub_0203A4B4(const UnkStruct_0203CDB0 * param0);
-const UnkStruct_020619DC * sub_0203A4BC(const UnkStruct_0203CDB0 * param0);
-BOOL sub_0203A4C4(UnkStruct_0203CDB0 * param0, int param1, u16 param2, u16 param3);
-BOOL sub_0203A4FC(UnkStruct_0203CDB0 * param0, int param1, int param2);
-BOOL sub_0203A52C(UnkStruct_0203CDB0 * param0, int param1, int param2);
-BOOL sub_0203A55C(UnkStruct_0203CDB0 * param0, u16 param1, u16 param2, u16 param3);
-BOOL sub_0203A574(UnkStruct_0203CDB0 * param0, u16 param1, u16 param2);
-BOOL sub_0203A584(UnkStruct_0203CDB0 * param0, u16 param1, u16 param2);
-BOOL sub_0203A594(UnkStruct_0203CDB0 * param0, u16 param1, u16 param2, u16 param3);
+void sub_0203A378(FieldSystem * param0, int param1);
+void sub_0203A398(FieldSystem * param0);
+void sub_0203A3B0(FieldSystem * param0, int param1);
+void sub_0203A418(FieldSystem * param0);
+const UnkStruct_0203A594 * sub_0203A440(const FieldSystem * param0);
+int sub_0203A448(const FieldSystem * param0);
+const UnkStruct_0203A55C * sub_0203A450(const FieldSystem * param0, int param1);
+int sub_0203A468(const FieldSystem * param0, int param1, int param2);
+int sub_0203A4A4(const FieldSystem * param0);
+const UnkStruct_0203A4AC * sub_0203A4AC(const FieldSystem * param0);
+u32 sub_0203A4B4(const FieldSystem * param0);
+const UnkStruct_020619DC * sub_0203A4BC(const FieldSystem * param0);
+BOOL sub_0203A4C4(FieldSystem * param0, int param1, u16 param2, u16 param3);
+BOOL sub_0203A4FC(FieldSystem * param0, int param1, int param2);
+BOOL sub_0203A52C(FieldSystem * param0, int param1, int param2);
+BOOL sub_0203A55C(FieldSystem * param0, u16 param1, u16 param2, u16 param3);
+BOOL sub_0203A574(FieldSystem * param0, u16 param1, u16 param2);
+BOOL sub_0203A584(FieldSystem * param0, u16 param1, u16 param2);
+BOOL sub_0203A594(FieldSystem * param0, u16 param1, u16 param2, u16 param3);
 void sub_0203A614(UnkStruct_ov6_02242634 * param0, int param1);
-const UnkStruct_ov6_02242634 * sub_0203A640(const UnkStruct_0203CDB0 * param0);
-void * sub_0203A68C(const UnkStruct_0203CDB0 * param0);
-BOOL sub_0203A6A4(const UnkStruct_0203CDB0 * param0, u16 param1, u16 param2);
+const UnkStruct_ov6_02242634 * sub_0203A640(const FieldSystem * param0);
+void * sub_0203A68C(const FieldSystem * param0);
+BOOL sub_0203A6A4(const FieldSystem * param0, u16 param1, u16 param2);

 #endif // POKEPLATINUM_UNK_0203A378_H
--- a/Show More
+++ b/Show More